AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gdk: Don't mutate pointer events to touch events just because a grab says so

Browse Source 
If a grab with GDK_TOUCH_MASK kicks in due to a touch sequence emulating pointer
events, don't mutate the sequence into emitting touch events right away.
This commit is contained in:
Carlos Garnacho 2012-02-21 11:22:49 +01:00 committed by Matthias Clasen
parent 5942fee240
commit 9c6f71bfc7
1 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gdk/gdkwindow.c
View File

@ -8261,7 +8261,6 @@ _gdk_make_event (GdkWindow *window,
event->touch.state = the_state;
break;
case GDK_SCROLL:
event->scroll.time = the_time;
event->scroll.state = the_state;
@ -9389,8 +9388,20 @@ proxy_pointer_event (GdkDisplay *display,
source_event->type == GDK_TOUCH_UPDATE)
{
if (_gdk_event_get_pointer_emulated (source_event))
source_event->type = GDK_MOTION_NOTIFY;
else
{
/* Touch events emulating pointer events are transformed back
* to pointer events if:
* 1 - The event window doesn't select for touch events
* 2 - There's no touch grab for this sequence, which means
* it was started as a pointer sequence, but a device
* grab added touch events afterwards, the sequence must
* not mutate in this case.
*/
if ((evmask & GDK_TOUCH_MASK) == 0 ||
!_gdk_display_has_touch_grab (display, device, sequence, serial))
source_event->type = GDK_MOTION_NOTIFY;
}
else if ((evmask & GDK_TOUCH_MASK) == 0)
return TRUE;
}
@ -9584,6 +9595,23 @@ proxy_button_event (GdkEvent *source_event,
type, state,
&evmask, serial);
if (type == GDK_TOUCH_BEGIN || type == GDK_TOUCH_END)
{
if (_gdk_event_get_pointer_emulated (source_event))
{
if ((evmask & GDK_TOUCH_MASK) == 0 ||
!_gdk_display_has_touch_grab (display, device, sequence, serial))
{
if (type == GDK_TOUCH_BEGIN)
source_event->type = type = GDK_BUTTON_PRESS;
else if (type == GDK_TOUCH_END)
source_event->type = type = GDK_BUTTON_RELEASE;
}
}
else if ((evmask & GDK_TOUCH_MASK) == 0)
return TRUE;
}
if ((evmask & GDK_TOUCH_MASK) == 0 &&
(type == GDK_TOUCH_BEGIN || type == GDK_TOUCH_END))
{