isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-07-17 23:57:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove some server calls for core devices

Browse Source 
These were missed in the first porting.

https://bugzilla.gnome.org/show_bug.cgi?id=691363
This commit is contained in:
Jasper St. Pierre
2012-12-16 21:47:11 -05:00
parent f57d64337b
commit 3a3be74e37
4 changed files with 82 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/core/window.c
View File

@ -6670,28 +6670,30 @@ meta_window_client_message (MetaWindow *window,
*/
if (button == 0)
{
int x, y, query_root_x, query_root_y;
double x, y, query_root_x, query_root_y;
Window root, child;
guint mask;
XIButtonState buttons;
XIModifierState mods;
XIGroupState group;
/* The race conditions in this _NET_WM_MOVERESIZE thing
* are mind-boggling
*/
mask = 0;
meta_error_trap_push (window->display);
XQueryPointer (window->display->xdisplay,
window->xwindow,
&root, &child,
&query_root_x, &query_root_y,
&x, &y,
&mask);
XIQueryPointer (window->display->xdisplay,
META_VIRTUAL_CORE_POINTER_ID,
window->xwindow,
&root, &child,
&query_root_x, &query_root_y,
&x, &y,
&buttons, &mods, &group);
meta_error_trap_pop (window->display);
if (mask & Button1Mask)
if (mods.effective & Button1Mask)
button = 1;
else if (mask & Button2Mask)
else if (mods.effective & Button2Mask)
button = 2;
else if (mask & Button3Mask)
else if (mods.effective & Button3Mask)
button = 3;
else
button = 0;
@ -9850,11 +9852,12 @@ warp_grab_pointer (MetaWindow *window,
meta_window_get_client_root_coords (window,
&display->grab_anchor_window_pos);
XWarpPointer (display->xdisplay,
None,
window->screen->xroot,
0, 0, 0, 0,
*x, *y);
XIWarpPointer (display->xdisplay,
META_VIRTUAL_CORE_POINTER_ID,
None,
window->screen->xroot,
0, 0, 0, 0,
*x, *y);
if (meta_error_trap_pop_with_return (display) != Success)
{