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

Side by Side Diff: ui/views/widget/desktop_aura/x11_pointer_grab.cc

Issue 749063003: Fix grabbing capture when the mouse is pressed on Desktop Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « ui/events/devices/x11/touch_factory_x11.cc ('k') | 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "base/logging.h" 5 #include "base/logging.h"
6 #include "ui/base/x/x11_util.h"
7 #include "ui/events/devices/x11/device_data_manager_x11.h"
6 #include "ui/views/widget/desktop_aura/x11_pointer_grab.h" 8 #include "ui/views/widget/desktop_aura/x11_pointer_grab.h"
7 9
10 #include <X11/extensions/XInput2.h>
8 #include <X11/Xlib.h> 11 #include <X11/Xlib.h>
9 12
10 namespace views { 13 namespace views {
11 14
12 namespace { 15 namespace {
13 16
14 // The grab window. None if there are no active pointer grabs. 17 // The grab window. None if there are no active pointer grabs.
15 XID g_grab_window = None; 18 XID g_grab_window = None;
16 19
17 // The "owner events" parameter used to grab the pointer. 20 // The "owner events" parameter used to grab the pointer.
18 bool g_owner_events = false; 21 bool g_owner_events = false;
19 22
20 } // namespace 23 } // namespace
21 24
22 int GrabPointer(XID window, bool owner_events, ::Cursor cursor) { 25 int GrabPointer(XID window, bool owner_events, ::Cursor cursor) {
23 int event_mask = PointerMotionMask | ButtonReleaseMask | ButtonPressMask; 26 int result = GrabInvalidTime;
24 int result = XGrabPointer(gfx::GetXDisplay(), window, owner_events, 27 if (ui::IsXInput2Available()) {
25 event_mask, GrabModeAsync, GrabModeAsync, None, 28 // Do an XINPUT2 pointer grab. If there is an active XINPUT2 pointer grab
26 cursor, CurrentTime); 29 // as a result of normal button press, XGrabPointer() will fail.
30 const std::vector<int>& master_pointers =
31 ui::DeviceDataManagerX11::GetInstance()->master_pointers();
32 for (auto master_pointer : master_pointers) {
sadrul 2015/02/03 01:22:49 int
pkotwicz 2015/02/03 15:51:59 Done.
33 unsigned char mask[XIMaskLen(XI_LASTEVENT)];
34 memset(mask, 0, sizeof(mask));
35 XISetMask(mask, XI_ButtonPress);
36 XISetMask(mask, XI_ButtonRelease);
37 XISetMask(mask, XI_Motion);
38 XIEventMask evmask;
39 evmask.deviceid = master_pointer;
40 evmask.mask_len = sizeof(mask);
41 evmask.mask = mask;
sadrul 2015/02/03 01:22:48 Can you move initialization of |mask|/|evmask| out
pkotwicz 2015/02/03 15:51:59 Done.
42 result = XIGrabDevice(
43 gfx::GetXDisplay(), master_pointer, window, CurrentTime, cursor,
44 GrabModeAsync, GrabModeAsync, owner_events, &evmask);
45 // Assume that the grab will succeed on either all or none of the master
46 // pointers.
47 if (result != GrabSuccess) {
48 // Try core pointer grab.
49 break;
50 }
51 }
52 }
53
54 if (result != GrabSuccess) {
55 int event_mask = PointerMotionMask | ButtonReleaseMask | ButtonPressMask;
56 result =
57 XGrabPointer(gfx::GetXDisplay(), window, owner_events, event_mask,
58 GrabModeAsync, GrabModeAsync, None, cursor, CurrentTime);
59 }
60
27 if (result == GrabSuccess) { 61 if (result == GrabSuccess) {
28 g_grab_window = window; 62 g_grab_window = window;
29 g_owner_events = owner_events; 63 g_owner_events = owner_events;
30 } 64 }
31 return result; 65 return result;
32 } 66 }
33 67
34 void ChangeActivePointerGrabCursor(::Cursor cursor) { 68 void ChangeActivePointerGrabCursor(::Cursor cursor) {
35 DCHECK(g_grab_window != None); 69 DCHECK(g_grab_window != None);
36 GrabPointer(g_grab_window, g_owner_events, cursor); 70 GrabPointer(g_grab_window, g_owner_events, cursor);
37 } 71 }
38 72
39 void UngrabPointer() { 73 void UngrabPointer() {
40 g_grab_window = None; 74 g_grab_window = None;
41 XUngrabPointer(gfx::GetXDisplay(), CurrentTime); 75 if (ui::IsXInput2Available()) {
76 const std::vector<int>& master_pointers =
77 ui::DeviceDataManagerX11::GetInstance()->master_pointers();
78 for (auto master_pointer : master_pointers)
sadrul 2015/02/03 01:22:49 int
pkotwicz 2015/02/03 15:51:59 Done.
79 XIUngrabDevice(gfx::GetXDisplay(), master_pointer, CurrentTime);
sadrul 2015/02/03 01:22:49 What happens if GrabPointer() ended up calling XGr
pkotwicz 2015/02/03 15:51:59 Thanks for catching this. We need to call XUngrabP
80 } else {
81 XUngrabPointer(gfx::GetXDisplay(), CurrentTime);
82 }
42 } 83 }
43 84
44 } // namespace views 85 } // namespace views
OLDNEW
« no previous file with comments | « ui/events/devices/x11/touch_factory_x11.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698