isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 10:00:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

display: Use meta_device_grab() for pointer active grabs.

Browse Source
This commit is contained in:
Carlos Garnacho 2011-06-21 18:28:55 +02:00 committed by Jasper St. Pierre
parent df908e5256
commit 991fdeb9dd
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/core/display.c
View File

@ -3605,8 +3605,8 @@ meta_display_create_x_cursor (MetaDisplay *display,
return xcursor;
}
static Cursor
xcursor_for_op (MetaDisplay *display,
static MetaCursor
cursor_for_op (MetaDisplay *display,
MetaGrabOp op)
{
MetaCursor cursor = META_CURSOR_DEFAULT;
@ -3655,9 +3655,7 @@ xcursor_for_op (MetaDisplay *display,
break;
}
if (cursor == META_CURSOR_DEFAULT)
return None;
return meta_display_create_x_cursor (display, cursor);
return cursor;
}
void
@ -3670,9 +3668,9 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
guint32 timestamp)
{
MetaGrabInfo *grab_info;
Cursor cursor;
MetaCursor cursor;
cursor = xcursor_for_op (display, op);
cursor = cursor_for_op (display, op);
grab_info = meta_display_get_grab_info (display, device);
#define GRAB_MASK (PointerMotionMask | \
@ -3681,6 +3679,10 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
if (change_pointer)
{
Cursor xcursor;
xcursor = meta_display_create_x_cursor (display, cursor);
meta_error_trap_push_with_return (display);
XChangeActivePointerGrab (display->xdisplay,
GRAB_MASK,
@ -3697,39 +3699,37 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
if (grab_info->grab_have_pointer)
grab_info->grab_have_pointer = FALSE;
}
if (xcursor != None)
XFreeCursor (display->xdisplay, xcursor);
}
else
{
g_assert (screen != NULL);
meta_error_trap_push (display);
if (XGrabPointer (display->xdisplay,
if (meta_device_grab (grab_info->grab_pointer,
grab_xwindow,
False,
GRAB_MASK,
GrabModeAsync, GrabModeAsync,
screen->xroot,
cursor,
timestamp) == GrabSuccess)
FALSE,
FALSE,
timestamp))
{
grab_info->grab_have_pointer = TRUE;
meta_topic (META_DEBUG_WINDOW_OPS,
"XGrabPointer() returned GrabSuccess time %u\n",
"grabbing pointer succeeded time %u\n",
timestamp);
}
else
{
meta_topic (META_DEBUG_WINDOW_OPS,
"XGrabPointer() failed time %u\n",
"grabbing pointer failed time %u\n",
timestamp);
}
meta_error_trap_pop (display);
}
#undef GRAB_MASK
if (cursor != None)
XFreeCursor (display->xdisplay, cursor);
}
gboolean
@ -3815,7 +3815,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
if (!grab_info->grab_have_pointer && !grab_op_is_keyboard (op))
{
meta_topic (META_DEBUG_WINDOW_OPS,
"XGrabPointer() failed\n");
"grabbing pointer failed\n");
return FALSE;
}
@ -3838,7 +3838,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
{
meta_topic (META_DEBUG_WINDOW_OPS,
"grabbing all keys failed, ungrabbing pointer\n");
XUngrabPointer (display->xdisplay, timestamp);
meta_device_ungrab (grab_info->grab_pointer, timestamp);
grab_info->grab_have_pointer = FALSE;
return FALSE;
}
@ -4053,7 +4053,7 @@ meta_display_end_grab_op (MetaDisplay *display,
{
meta_topic (META_DEBUG_WINDOW_OPS,
"Ungrabbing pointer with timestamp %u\n", timestamp);
XUngrabPointer (display->xdisplay, timestamp);
meta_device_ungrab (grab_info->grab_pointer, timestamp);
}
if (grab_info->grab_have_keyboard)