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

x11/device-manager-xi2: Fix assertions with touch

Browse Source 
When getting touch events, the device manager would try
to pass an invalid device to translate_axes().

clutter_event_set_device() will only update event->touch.device
for touch events, not event->motion.device, as used.

Fixes Totem crashing on mouse motion/button press when using
a touchpad.

https://bugzilla.gnome.org/show_bug.cgi?id=675371
This commit is contained in:
Bastien Nocera 2012-05-03 18:58:12 +02:00
parent 217ff7c8fb
commit 2bb84d9169
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clutter/x11/clutter-device-manager-xi2.c
View File

@ -1045,7 +1045,7 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
GINT_TO_POINTER (xev->deviceid)); GINT_TO_POINTER (xev->deviceid));
clutter_event_set_device (event, device); clutter_event_set_device (event, device);
event->touch.axes = translate_axes (event->motion.device, event->touch.axes = translate_axes (event->touch.device,
event->motion.x, event->motion.x,
event->motion.y, event->motion.y,
stage_x11, stage_x11,
@ -1098,7 +1098,7 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
GINT_TO_POINTER (xev->deviceid)); GINT_TO_POINTER (xev->deviceid));
clutter_event_set_device (event, device); clutter_event_set_device (event, device);
event->touch.axes = translate_axes (event->motion.device, event->touch.axes = translate_axes (event->touch.device,
event->motion.x, event->motion.x,
event->motion.y, event->motion.y,
stage_x11, stage_x11,