callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a blunder in grab handling

Browse Source 
This was causing segfaults which would go away when compiled with
debug options.
This commit is contained in:
Matthias Clasen
2010-12-21 18:42:30 -05:00
parent 4b10167ce6
commit b824cdd6db
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gdk/x11/gdkdisplay-x11.c
View File

@ -1588,6 +1588,16 @@ struct XPointerUngrabInfo {
guint32 time;
};
static void
device_grab_update_callback (GdkDisplay *display,
gpointer data,
gulong serial)
{
GdkDevice *device = data;
_gdk_display_device_grab_update (display, device, NULL, serial);
}
#define XSERVER_TIME_IS_LATER(time1, time2) \
( (( time1 > time2 ) && ( time1 - time2 < ((guint32)-1)/2 )) || \
(( time1 < time2 ) && ( time2 - time1 > ((guint32)-1)/2 )) \
@ -1599,9 +1609,7 @@ _gdk_x11_display_update_grab_info (GdkDisplay *display,
gint status)
{
if (status == GrabSuccess)
_gdk_x11_roundtrip_async (display,
(GdkRoundTripCallback)_gdk_display_device_grab_update,
device);
_gdk_x11_roundtrip_async (display, device_grab_update_callback, device);
}
void
@ -1621,9 +1629,7 @@ _gdk_x11_display_update_grab_info_ungrab (GdkDisplay *display,
!XSERVER_TIME_IS_LATER (grab->time, time)))
{
grab->serial_end = serial;
_gdk_x11_roundtrip_async (display,
(GdkRoundTripCallback)_gdk_display_device_grab_update,
device);
_gdk_x11_roundtrip_async (display, device_grab_update_callback, device);
}
}