sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Put an error trap around XIAllowTouchEvents()

Browse Source 
These calls are occasionally failing with BadAccess on seemingly
still valid (not yet notified upon) touch sequences. Workaround
this Xorg bug with error traps at the moment, those would catch
no error when this is working properly.

Fixing this bug will be tracked at SL #3981

Signed-off-by: Carlos Garnacho <carlos@lanedo.com>
Acked-by: Simon Schampijer <simon@laptop.org>
This commit is contained in:
Carlos Garnacho 2012-10-04 14:47:31 +00:00 committed by Simon Schampijer
parent 81ee0632c9
commit b79a391902
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sugar3/sugar-gesture-grabber.c
View File

@ -76,13 +76,15 @@ _sugar_gesture_grabber_notify_touch (SugarGestureGrabber *grabber,
if (data->consumed) if (data->consumed)
continue; continue;
gdk_error_trap_push ();
XIAllowTouchEvents (gdk_x11_display_get_xdisplay (display), XIAllowTouchEvents (gdk_x11_display_get_xdisplay (display),
gdk_x11_device_get_id (data->device), gdk_x11_device_get_id (data->device),
GPOINTER_TO_INT (data->sequence), GPOINTER_TO_INT (data->sequence),
gdk_x11_window_get_xid (priv->root_window), gdk_x11_window_get_xid (priv->root_window),
(handled) ? XIAcceptTouch : XIRejectTouch); (handled) ? XIAcceptTouch : XIRejectTouch);
data->consumed = TRUE; gdk_error_trap_pop_ignored ();
data->consumed = TRUE;
} }
} }
@ -307,10 +309,12 @@ filter_function (GdkXEvent *xevent,
handled = _sugar_gesture_grabber_run_controllers (grabber, event); handled = _sugar_gesture_grabber_run_controllers (grabber, event);
if (!handled) { if (!handled) {
gdk_error_trap_push ();
XIAllowTouchEvents (gdk_x11_display_get_xdisplay (display), XIAllowTouchEvents (gdk_x11_display_get_xdisplay (display),
ev->deviceid, ev->detail, ev->deviceid, ev->detail,
gdk_x11_window_get_xid (priv->root_window), gdk_x11_window_get_xid (priv->root_window),
XIRejectTouch); XIRejectTouch);
gdk_error_trap_pop_ignored ();
} else if (event->type == GDK_TOUCH_BEGIN) { } else if (event->type == GDK_TOUCH_BEGIN) {
_sugar_gesture_grabber_add_touch (grabber, _sugar_gesture_grabber_add_touch (grabber,
event->touch.device, event->touch.device,