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

Side by Side Diff: ui/aura/desktop_host_linux.cc

Issue 8539032: Temporarily disables XI2 for aura until events are straightened out. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/aura/desktop_host.h" 5 #include "ui/aura/desktop_host.h"
6 6
7 #include <X11/cursorfont.h> 7 #include <X11/cursorfont.h>
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 9
10 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class. 10 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 0, 0, 0); 272 0, 0, 0);
273 273
274 long event_mask = ButtonPressMask | ButtonReleaseMask | 274 long event_mask = ButtonPressMask | ButtonReleaseMask |
275 KeyPressMask | KeyReleaseMask | 275 KeyPressMask | KeyReleaseMask |
276 ExposureMask | VisibilityChangeMask | 276 ExposureMask | VisibilityChangeMask |
277 StructureNotifyMask | PropertyChangeMask | 277 StructureNotifyMask | PropertyChangeMask |
278 PointerMotionMask; 278 PointerMotionMask;
279 XSelectInput(xdisplay_, xwindow_, event_mask); 279 XSelectInput(xdisplay_, xwindow_, event_mask);
280 XFlush(xdisplay_); 280 XFlush(xdisplay_);
281 281
282 // TODO(sadrul): reenable once 103981 is fixed.
283 #if defined(TOUCH_UI)
282 if (base::MessagePumpForUI::HasXInput2()) 284 if (base::MessagePumpForUI::HasXInput2())
283 ui::TouchFactory::GetInstance()->SetupXI2ForXWindow(xwindow_); 285 ui::TouchFactory::GetInstance()->SetupXI2ForXWindow(xwindow_);
286 #endif
284 } 287 }
285 288
286 DesktopHostLinux::~DesktopHostLinux() { 289 DesktopHostLinux::~DesktopHostLinux() {
287 XDestroyWindow(xdisplay_, xwindow_); 290 XDestroyWindow(xdisplay_, xwindow_);
288 } 291 }
289 292
290 base::MessagePumpDispatcher::DispatchStatus DesktopHostLinux::Dispatch( 293 base::MessagePumpDispatcher::DispatchStatus DesktopHostLinux::Dispatch(
291 XEvent* xev) { 294 XEvent* xev) {
292 bool handled = false; 295 bool handled = false;
293 switch (xev->type) { 296 switch (xev->type) {
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 return new DesktopHostLinux(bounds); 491 return new DesktopHostLinux(bounds);
489 } 492 }
490 493
491 // static 494 // static
492 gfx::Size DesktopHost::GetNativeDisplaySize() { 495 gfx::Size DesktopHost::GetNativeDisplaySize() {
493 ::Display* xdisplay = base::MessagePumpX::GetDefaultXDisplay(); 496 ::Display* xdisplay = base::MessagePumpX::GetDefaultXDisplay();
494 return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0)); 497 return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0));
495 } 498 }
496 499
497 } // namespace aura 500 } // namespace aura
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698