[gtk+/wip/garnacho/touchpad-gestures: 49/60] gdk: Add GDK_TOUCHPAD_GESTURE_MASK to GdkEventMask
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/garnacho/touchpad-gestures: 49/60] gdk: Add GDK_TOUCHPAD_GESTURE_MASK to GdkEventMask
- Date: Wed, 15 Jul 2015 17:53:30 +0000 (UTC)
commit 9c0e6118bff82d7039f5f27448cbf94cb75ce26e
Author: Carlos Garnacho <carlosg gnome org>
Date: Thu Jul 9 18:42:35 2015 +0200
gdk: Add GDK_TOUCHPAD_GESTURE_MASK to GdkEventMask
Users will need to manually select on this in order to receive gesture
events.
gdk/gdktypes.h | 1 +
gdk/gdkwindow.c | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index 6ff71a7..4c355aa 100644
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -440,6 +440,7 @@ typedef enum
GDK_SCROLL_MASK = 1 << 21,
GDK_TOUCH_MASK = 1 << 22,
GDK_SMOOTH_SCROLL_MASK = 1 << 23,
+ GDK_TOUCHPAD_GESTURE_MASK = 1 << 24,
GDK_ALL_EVENTS_MASK = 0xFFFFFE
} GdkEventMask;
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index af3d17a..b806dfa 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -7565,7 +7565,15 @@ static const guint type_masks[] = {
GDK_TOUCH_MASK, /* GDK_TOUCH_BEGIN = 37 */
GDK_TOUCH_MASK, /* GDK_TOUCH_UPDATE = 38 */
GDK_TOUCH_MASK, /* GDK_TOUCH_END = 39 */
- GDK_TOUCH_MASK /* GDK_TOUCH_CANCEL = 40 */
+ GDK_TOUCH_MASK, /* GDK_TOUCH_CANCEL = 40 */
+ GDK_TOUCHPAD_GESTURE_MASK, /* GDK_TOUCHPAD_SWIPE_BEGIN = 41 */
+ GDK_TOUCHPAD_GESTURE_MASK, /* GDK_TOUCHPAD_SWIPE_UPDATE = 42 */
+ GDK_TOUCHPAD_GESTURE_MASK, /* GDK_TOUCHPAD_SWIPE_END = 43 */
+ GDK_TOUCHPAD_GESTURE_MASK, /* GDK_TOUCHPAD_SWIPE_CANCEL = 44 */
+ GDK_TOUCHPAD_GESTURE_MASK, /* GDK_TOUCHPAD_PINCH_BEGIN = 45 */
+ GDK_TOUCHPAD_GESTURE_MASK, /* GDK_TOUCHPAD_PINCH_UPDATE = 46 */
+ GDK_TOUCHPAD_GESTURE_MASK, /* GDK_TOUCHPAD_PINCH_END = 47 */
+ GDK_TOUCHPAD_GESTURE_MASK /* GDK_TOUCHPAD_PINCH_CANCEL = 48 */
};
G_STATIC_ASSERT (G_N_ELEMENTS (type_masks) == GDK_EVENT_LAST);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]