window: query the guessed pointer's modifiers on _NET_WM_MOVERESIZE

This commit is contained in:
Carlos Garnacho 2011-07-03 21:21:34 +02:00
parent 38df2715f2
commit e0966e7499

View File

@ -6393,8 +6393,6 @@ meta_window_client_message (MetaWindow *window,
*/ */
if (button == 0) if (button == 0)
{ {
int x, y, query_root_x, query_root_y;
Window root, child;
guint mask; guint mask;
/* The race conditions in this _NET_WM_MOVERESIZE thing /* The race conditions in this _NET_WM_MOVERESIZE thing
@ -6402,11 +6400,10 @@ meta_window_client_message (MetaWindow *window,
*/ */
mask = 0; mask = 0;
meta_error_trap_push (window->display); meta_error_trap_push (window->display);
XQueryPointer (window->display->xdisplay, meta_device_pointer_query_position (META_DEVICE_POINTER (device),
window->xwindow, window->xwindow,
&root, &child, NULL, NULL, NULL,
&query_root_x, &query_root_y, NULL, NULL, NULL,
&x, &y,
&mask); &mask);
meta_error_trap_pop (window->display); meta_error_trap_pop (window->display);