[gtk+/touch-for-3.4-2: 42/44] gdk: Set correct GdkModifierType on pointer emulated events

[Matthias Clasen <matthiasc src gnome org>]

commit f115a81b50c87629ef84882da17f7bc01681a2e6
Author: Carlos Garnacho <carlosg gnome org>
Date:   Mon Feb 27 13:08:38 2012 +0100

    gdk: Set correct GdkModifierType on pointer emulated events

 gdk/gdkwindow.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index c286943..76dcea7 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -9402,6 +9402,9 @@ proxy_pointer_event (GdkDisplay                 *display,
             return TRUE;
         }
 
+      if (is_touch_type (source_event->type) && !is_touch_type (event_type))
+        state |= GDK_BUTTON1_MASK;
+
       if (event_win &&
           gdk_device_get_device_type (device) != GDK_DEVICE_TYPE_MASTER &&
           gdk_window_get_device_events (event_win, device) == 0)
@@ -9632,6 +9635,9 @@ proxy_button_event (GdkEvent *source_event,
         return TRUE;
     }
 
+  if (source_event->type == GDK_TOUCH_END && !is_touch_type (type))
+    state |= GDK_BUTTON1_MASK;
+
   if (event_win == NULL || display->ignore_core_events)
     return TRUE;