| OLD | NEW |
| 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 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 0, 0, 0); | 274 0, 0, 0); |
| 275 | 275 |
| 276 long event_mask = ButtonPressMask | ButtonReleaseMask | | 276 long event_mask = ButtonPressMask | ButtonReleaseMask | |
| 277 KeyPressMask | KeyReleaseMask | | 277 KeyPressMask | KeyReleaseMask | |
| 278 ExposureMask | VisibilityChangeMask | | 278 ExposureMask | VisibilityChangeMask | |
| 279 StructureNotifyMask | PropertyChangeMask | | 279 StructureNotifyMask | PropertyChangeMask | |
| 280 PointerMotionMask; | 280 PointerMotionMask; |
| 281 XSelectInput(xdisplay_, xwindow_, event_mask); | 281 XSelectInput(xdisplay_, xwindow_, event_mask); |
| 282 XFlush(xdisplay_); | 282 XFlush(xdisplay_); |
| 283 | 283 |
| 284 // TODO(sadrul): reenable once 103981 is fixed. | |
| 285 #if defined(TOUCH_UI) | |
| 286 if (base::MessagePumpForUI::HasXInput2()) | 284 if (base::MessagePumpForUI::HasXInput2()) |
| 287 ui::TouchFactory::GetInstance()->SetupXI2ForXWindow(xwindow_); | 285 ui::TouchFactory::GetInstance()->SetupXI2ForXWindow(xwindow_); |
| 288 #endif | |
| 289 } | 286 } |
| 290 | 287 |
| 291 DesktopHostLinux::~DesktopHostLinux() { | 288 DesktopHostLinux::~DesktopHostLinux() { |
| 292 XDestroyWindow(xdisplay_, xwindow_); | 289 XDestroyWindow(xdisplay_, xwindow_); |
| 293 | 290 |
| 294 // Clears XCursorCache. | 291 // Clears XCursorCache. |
| 295 ui::GetXCursor(ui::kCursorClearXCursorCache); | 292 ui::GetXCursor(ui::kCursorClearXCursorCache); |
| 296 } | 293 } |
| 297 | 294 |
| 298 base::MessagePumpDispatcher::DispatchStatus DesktopHostLinux::Dispatch( | 295 base::MessagePumpDispatcher::DispatchStatus DesktopHostLinux::Dispatch( |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 505 return new DesktopHostLinux(bounds); | 502 return new DesktopHostLinux(bounds); |
| 506 } | 503 } |
| 507 | 504 |
| 508 // static | 505 // static |
| 509 gfx::Size DesktopHost::GetNativeDisplaySize() { | 506 gfx::Size DesktopHost::GetNativeDisplaySize() { |
| 510 ::Display* xdisplay = base::MessagePumpX::GetDefaultXDisplay(); | 507 ::Display* xdisplay = base::MessagePumpX::GetDefaultXDisplay(); |
| 511 return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0)); | 508 return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0)); |
| 512 } | 509 } |
| 513 | 510 |
| 514 } // namespace aura | 511 } // namespace aura |
| OLD | NEW |