Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(390)

Side by Side Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h

Issue 2319933002: X11: Remove calls to XSelectInput (Closed)
Patch Set: Comments Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 #include <X11/extensions/shape.h> 10 #include <X11/extensions/shape.h>
(...skipping 14 matching lines...) Expand all
25 #include "ui/views/views_export.h" 25 #include "ui/views/views_export.h"
26 #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h" 26 #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h"
27 27
28 namespace gfx { 28 namespace gfx {
29 class ImageSkia; 29 class ImageSkia;
30 class ImageSkiaRep; 30 class ImageSkiaRep;
31 } 31 }
32 32
33 namespace ui { 33 namespace ui {
34 class EventHandler; 34 class EventHandler;
35 class XScopedEventSelector;
35 } 36 }
36 37
37 namespace views { 38 namespace views {
38 class DesktopDragDropClientAuraX11; 39 class DesktopDragDropClientAuraX11;
39 class DesktopWindowTreeHostObserverX11; 40 class DesktopWindowTreeHostObserverX11;
40 class X11DesktopWindowMoveClient; 41 class X11DesktopWindowMoveClient;
41 class X11WindowEventFilter; 42 class X11WindowEventFilter;
42 43
43 class VIEWS_EXPORT DesktopWindowTreeHostX11 44 class VIEWS_EXPORT DesktopWindowTreeHostX11
44 : public DesktopWindowTreeHost, 45 : public DesktopWindowTreeHost,
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 264
264 gfx::Rect GetWorkAreaBoundsInPixels() const; 265 gfx::Rect GetWorkAreaBoundsInPixels() const;
265 gfx::Rect ToDIPRect(const gfx::Rect& rect_in_pixels) const; 266 gfx::Rect ToDIPRect(const gfx::Rect& rect_in_pixels) const;
266 gfx::Rect ToPixelRect(const gfx::Rect& rect_in_dip) const; 267 gfx::Rect ToPixelRect(const gfx::Rect& rect_in_dip) const;
267 268
268 // X11 things 269 // X11 things
269 // The display and the native X window hosting the root window. 270 // The display and the native X window hosting the root window.
270 XDisplay* xdisplay_; 271 XDisplay* xdisplay_;
271 ::Window xwindow_; 272 ::Window xwindow_;
272 273
274 // Events selected on |xwindow_|.
275 std::unique_ptr<ui::XScopedEventSelector> xwindow_events_;
276
273 // The native root window. 277 // The native root window.
274 ::Window x_root_window_; 278 ::Window x_root_window_;
275 279
276 ui::X11AtomCache atom_cache_; 280 ui::X11AtomCache atom_cache_;
277 281
278 // Is the window mapped to the screen? 282 // Is the window mapped to the screen?
279 bool window_mapped_; 283 bool window_mapped_;
280 284
281 // Should we wait for an UnmapNotify before trying to remap the window? 285 // Should we wait for an UnmapNotify before trying to remap the window?
282 // If |wait_for_unmap_| is true, we have sent an XUnmapWindow request to the 286 // If |wait_for_unmap_| is true, we have sent an XUnmapWindow request to the
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 base::CancelableCallback<void()> delayed_resize_task_; 413 base::CancelableCallback<void()> delayed_resize_task_;
410 414
411 base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_; 415 base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_;
412 416
413 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11); 417 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11);
414 }; 418 };
415 419
416 } // namespace views 420 } // namespace views
417 421
418 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ 422 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_
OLDNEW
« no previous file with comments | « ui/views/test/x11_property_change_waiter.cc ('k') | ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698