diff options
| author | Kristian Rietveld <kris@gtk.org> | 2011-07-25 22:26:52 +0200 |
|---|---|---|
| committer | Kristian Rietveld <kris@gtk.org> | 2011-07-30 23:01:37 +0200 |
| commit | c9f6c7645c118618f4d157427f9b9430d7d77f64 (patch) | |
| tree | a138e085df4bc55dd1cf4c56737d13fab4b25f52 /gdk/quartz/gdkevents-quartz.c | |
| parent | ceca333309268f7782a891972f43d3fbcf77c51c (diff) | |
| download | gtk+-c9f6c7645c118618f4d157427f9b9430d7d77f64.tar.gz | |
quartz: return modifiers instead of an event mask ...
Diffstat (limited to 'gdk/quartz/gdkevents-quartz.c')
| -rw-r--r-- | gdk/quartz/gdkevents-quartz.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c index c611c0a106..d81f6f3002 100644 --- a/gdk/quartz/gdkevents-quartz.c +++ b/gdk/quartz/gdkevents-quartz.c @@ -49,8 +49,10 @@ static GdkWindow *current_keyboard_window; /* This is the event mask and button state from the last event */ -static GdkEventMask current_event_mask; -static int current_button_state; +static GdkEventMask current_event_mask; +static GdkModifierType current_keyboard_modifiers; +static GdkModifierType current_mouse_modifiers; +static int current_button_state; static void append_event (GdkEvent *event, gboolean windowing); @@ -1064,6 +1066,18 @@ _gdk_quartz_events_get_current_event_mask (void) return current_event_mask; } +GdkModifierType +_gdk_quartz_events_get_current_keyboard_modifiers (void) +{ + return current_keyboard_modifiers; +} + +GdkModifierType +_gdk_quartz_events_get_current_mouse_modifiers (void) +{ + return current_mouse_modifiers; +} + static gboolean gdk_event_translate (GdkEvent *event, NSEvent *nsevent) @@ -1197,6 +1211,8 @@ gdk_event_translate (GdkEvent *event, } current_event_mask = get_event_mask_from_ns_event (nsevent); + current_keyboard_modifiers = get_keyboard_modifiers_from_ns_event (nsevent); + current_mouse_modifiers = get_mouse_button_modifiers_from_ns_event (nsevent); return_val = TRUE; |