| 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 1145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1156 | 1156 |
| 1157 bounds_in_pixels_ = ToPixelRect(params.bounds); | 1157 bounds_in_pixels_ = ToPixelRect(params.bounds); |
| 1158 bounds_in_pixels_.set_size(AdjustSize(bounds_in_pixels_.size())); | 1158 bounds_in_pixels_.set_size(AdjustSize(bounds_in_pixels_.size())); |
| 1159 xwindow_ = XCreateWindow(xdisplay_, x_root_window_, bounds_in_pixels_.x(), | 1159 xwindow_ = XCreateWindow(xdisplay_, x_root_window_, bounds_in_pixels_.x(), |
| 1160 bounds_in_pixels_.y(), bounds_in_pixels_.width(), | 1160 bounds_in_pixels_.y(), bounds_in_pixels_.width(), |
| 1161 bounds_in_pixels_.height(), | 1161 bounds_in_pixels_.height(), |
| 1162 0, // border width | 1162 0, // border width |
| 1163 depth, InputOutput, visual, attribute_mask, &swa); | 1163 depth, InputOutput, visual, attribute_mask, &swa); |
| 1164 if (ui::PlatformEventSource::GetInstance()) | 1164 if (ui::PlatformEventSource::GetInstance()) |
| 1165 ui::PlatformEventSource::GetInstance()->AddPlatformEventDispatcher(this); | 1165 ui::PlatformEventSource::GetInstance()->AddPlatformEventDispatcher(this); |
| 1166 open_windows().push_back(xwindow_); | 1166 open_windows().push_front(xwindow_); |
| 1167 | 1167 |
| 1168 // TODO(erg): Maybe need to set a ViewProp here like in RWHL::RWHL(). | 1168 // TODO(erg): Maybe need to set a ViewProp here like in RWHL::RWHL(). |
| 1169 | 1169 |
| 1170 long event_mask = ButtonPressMask | ButtonReleaseMask | FocusChangeMask | | 1170 long event_mask = ButtonPressMask | ButtonReleaseMask | FocusChangeMask | |
| 1171 KeyPressMask | KeyReleaseMask | | 1171 KeyPressMask | KeyReleaseMask | |
| 1172 EnterWindowMask | LeaveWindowMask | | 1172 EnterWindowMask | LeaveWindowMask | |
| 1173 ExposureMask | VisibilityChangeMask | | 1173 ExposureMask | VisibilityChangeMask | |
| 1174 StructureNotifyMask | PropertyChangeMask | | 1174 StructureNotifyMask | PropertyChangeMask | |
| 1175 PointerMotionMask; | 1175 PointerMotionMask; |
| 1176 XSelectInput(xdisplay_, xwindow_, event_mask); | 1176 XSelectInput(xdisplay_, xwindow_, event_mask); |
| (...skipping 893 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2070 if (linux_ui) { | 2070 if (linux_ui) { |
| 2071 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); | 2071 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); |
| 2072 if (native_theme) | 2072 if (native_theme) |
| 2073 return native_theme; | 2073 return native_theme; |
| 2074 } | 2074 } |
| 2075 | 2075 |
| 2076 return ui::NativeThemeAura::instance(); | 2076 return ui::NativeThemeAura::instance(); |
| 2077 } | 2077 } |
| 2078 | 2078 |
| 2079 } // namespace views | 2079 } // namespace views |
| OLD | NEW |