OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" | 5 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" |
6 | 6 |
7 #include <X11/extensions/shape.h> | 7 #include <X11/extensions/shape.h> |
8 #include <X11/extensions/XInput2.h> | 8 #include <X11/extensions/XInput2.h> |
9 #include <X11/Xatom.h> | 9 #include <X11/Xatom.h> |
10 #include <X11/Xregion.h> | 10 #include <X11/Xregion.h> |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "ui/aura/window.h" | 21 #include "ui/aura/window.h" |
22 #include "ui/aura/window_event_dispatcher.h" | 22 #include "ui/aura/window_event_dispatcher.h" |
23 #include "ui/aura/window_property.h" | 23 #include "ui/aura/window_property.h" |
24 #include "ui/base/dragdrop/os_exchange_data_provider_aurax11.h" | 24 #include "ui/base/dragdrop/os_exchange_data_provider_aurax11.h" |
25 #include "ui/base/hit_test.h" | 25 #include "ui/base/hit_test.h" |
26 #include "ui/base/x/x11_util.h" | 26 #include "ui/base/x/x11_util.h" |
27 #include "ui/events/devices/x11/device_data_manager_x11.h" | 27 #include "ui/events/devices/x11/device_data_manager_x11.h" |
28 #include "ui/events/devices/x11/device_list_cache_x11.h" | 28 #include "ui/events/devices/x11/device_list_cache_x11.h" |
29 #include "ui/events/devices/x11/touch_factory_x11.h" | 29 #include "ui/events/devices/x11/touch_factory_x11.h" |
30 #include "ui/events/event_utils.h" | 30 #include "ui/events/event_utils.h" |
| 31 #include "ui/events/null_event_targeter.h" |
31 #include "ui/events/platform/platform_event_source.h" | 32 #include "ui/events/platform/platform_event_source.h" |
32 #include "ui/events/platform/x11/x11_event_source.h" | 33 #include "ui/events/platform/x11/x11_event_source.h" |
33 #include "ui/gfx/display.h" | 34 #include "ui/gfx/display.h" |
34 #include "ui/gfx/geometry/insets.h" | 35 #include "ui/gfx/geometry/insets.h" |
35 #include "ui/gfx/geometry/size_conversions.h" | 36 #include "ui/gfx/geometry/size_conversions.h" |
36 #include "ui/gfx/image/image_skia.h" | 37 #include "ui/gfx/image/image_skia.h" |
37 #include "ui/gfx/image/image_skia_rep.h" | 38 #include "ui/gfx/image/image_skia_rep.h" |
38 #include "ui/gfx/path.h" | 39 #include "ui/gfx/path.h" |
39 #include "ui/gfx/path_x11.h" | 40 #include "ui/gfx/path_x11.h" |
40 #include "ui/gfx/screen.h" | 41 #include "ui/gfx/screen.h" |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
165 use_native_frame_(false), | 166 use_native_frame_(false), |
166 should_maximize_after_map_(false), | 167 should_maximize_after_map_(false), |
167 use_argb_visual_(false), | 168 use_argb_visual_(false), |
168 drag_drop_client_(NULL), | 169 drag_drop_client_(NULL), |
169 native_widget_delegate_(native_widget_delegate), | 170 native_widget_delegate_(native_widget_delegate), |
170 desktop_native_widget_aura_(desktop_native_widget_aura), | 171 desktop_native_widget_aura_(desktop_native_widget_aura), |
171 content_window_(NULL), | 172 content_window_(NULL), |
172 window_parent_(NULL), | 173 window_parent_(NULL), |
173 custom_window_shape_(false), | 174 custom_window_shape_(false), |
174 urgency_hint_set_(false), | 175 urgency_hint_set_(false), |
| 176 modal_dialog_xid_(0), |
175 close_widget_factory_(this) { | 177 close_widget_factory_(this) { |
176 } | 178 } |
177 | 179 |
178 DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() { | 180 DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() { |
179 window()->ClearProperty(kHostForRootWindow); | 181 window()->ClearProperty(kHostForRootWindow); |
180 aura::client::SetWindowMoveClient(window(), NULL); | 182 aura::client::SetWindowMoveClient(window(), NULL); |
181 desktop_native_widget_aura_->OnDesktopWindowTreeHostDestroyed(this); | 183 desktop_native_widget_aura_->OnDesktopWindowTreeHostDestroyed(this); |
182 DestroyDispatcher(); | 184 DestroyDispatcher(); |
183 } | 185 } |
184 | 186 |
(...skipping 1845 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2030 return gfx::ToEnclosingRect(rect_in_dip); | 2032 return gfx::ToEnclosingRect(rect_in_dip); |
2031 } | 2033 } |
2032 | 2034 |
2033 gfx::Rect DesktopWindowTreeHostX11::ToPixelRect( | 2035 gfx::Rect DesktopWindowTreeHostX11::ToPixelRect( |
2034 const gfx::Rect& rect_in_dip) const { | 2036 const gfx::Rect& rect_in_dip) const { |
2035 gfx::RectF rect_in_pixels = rect_in_dip; | 2037 gfx::RectF rect_in_pixels = rect_in_dip; |
2036 GetRootTransform().TransformRect(&rect_in_pixels); | 2038 GetRootTransform().TransformRect(&rect_in_pixels); |
2037 return gfx::ToEnclosingRect(rect_in_pixels); | 2039 return gfx::ToEnclosingRect(rect_in_pixels); |
2038 } | 2040 } |
2039 | 2041 |
| 2042 XID DesktopWindowTreeHostX11::GetModalDialog() { |
| 2043 return modal_dialog_xid_; |
| 2044 } |
| 2045 |
| 2046 void DesktopWindowTreeHostX11::DisableEventListening(XID dialog) { |
| 2047 DCHECK(modal_dialog_xid_); |
| 2048 modal_dialog_xid_ = dialog; |
| 2049 // ScopedWindowTargeter is used to temporarily replace the event-targeter |
| 2050 // with NullEventTargeter to make the dialog modal. |
| 2051 targeter_for_modal_.reset(new aura::ScopedWindowTargeter(window(), |
| 2052 scoped_ptr<ui::EventTargeter>(new ui::NullEventTargeter))); |
| 2053 } |
| 2054 |
| 2055 void DesktopWindowTreeHostX11::EnableEventListening() { |
| 2056 DCHECK(!modal_dialog_xid_); |
| 2057 modal_dialog_xid_ = 0; |
| 2058 targeter_for_modal_.reset(); |
| 2059 } |
| 2060 |
2040 //////////////////////////////////////////////////////////////////////////////// | 2061 //////////////////////////////////////////////////////////////////////////////// |
2041 // DesktopWindowTreeHost, public: | 2062 // DesktopWindowTreeHost, public: |
2042 | 2063 |
2043 // static | 2064 // static |
2044 DesktopWindowTreeHost* DesktopWindowTreeHost::Create( | 2065 DesktopWindowTreeHost* DesktopWindowTreeHost::Create( |
2045 internal::NativeWidgetDelegate* native_widget_delegate, | 2066 internal::NativeWidgetDelegate* native_widget_delegate, |
2046 DesktopNativeWidgetAura* desktop_native_widget_aura) { | 2067 DesktopNativeWidgetAura* desktop_native_widget_aura) { |
2047 return new DesktopWindowTreeHostX11(native_widget_delegate, | 2068 return new DesktopWindowTreeHostX11(native_widget_delegate, |
2048 desktop_native_widget_aura); | 2069 desktop_native_widget_aura); |
2049 } | 2070 } |
2050 | 2071 |
2051 // static | 2072 // static |
2052 ui::NativeTheme* DesktopWindowTreeHost::GetNativeTheme(aura::Window* window) { | 2073 ui::NativeTheme* DesktopWindowTreeHost::GetNativeTheme(aura::Window* window) { |
2053 const views::LinuxUI* linux_ui = views::LinuxUI::instance(); | 2074 const views::LinuxUI* linux_ui = views::LinuxUI::instance(); |
2054 if (linux_ui) { | 2075 if (linux_ui) { |
2055 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); | 2076 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); |
2056 if (native_theme) | 2077 if (native_theme) |
2057 return native_theme; | 2078 return native_theme; |
2058 } | 2079 } |
2059 | 2080 |
2060 return ui::NativeTheme::instance(); | 2081 return ui::NativeTheme::instance(); |
2061 } | 2082 } |
2062 | 2083 |
2063 } // namespace views | 2084 } // namespace views |
OLD | NEW |