diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2014-12-02 16:52:03 +0100 |
|---|---|---|
| committer | William Hua <william@attente.ca> | 2015-02-05 17:26:17 +0100 |
| commit | a8b1e8181672d39d5f2955ebd256e6408730c303 (patch) | |
| tree | be0cf702abd7f78e506bc8c9c96d9eba97947faf /gdk | |
| parent | 9e2eb5d2f6c15ccca688194ed8c810c4f88ccdbe (diff) | |
| download | gtk+-a8b1e8181672d39d5f2955ebd256e6408730c303.tar.gz | |
mir: check (using simple keycode checking) if we're handling a modifier key
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/mir/gdkmireventsource.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/gdk/mir/gdkmireventsource.c b/gdk/mir/gdkmireventsource.c index 13f09bbd49..3f7d9b2f5d 100644 --- a/gdk/mir/gdkmireventsource.c +++ b/gdk/mir/gdkmireventsource.c @@ -17,6 +17,7 @@ #include "config.h" +#include <xkbcommon/xkbcommon.h> #include "gdkinternals.h" #include "gdkdisplayprivate.h" #include "gdkmir.h" @@ -246,22 +247,12 @@ get_modifier_state (unsigned int modifiers, unsigned int button_state) return modifier_state; } -/* - GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (event_data->window->impl); - MirMotionButton changed_button_state; - GdkEventType event_type; - gdouble x, y; - guint modifier_state; - gboolean is_modifier = FALSE; -*/ - static void handle_key_event (GdkWindow *window, const MirKeyEvent *event) { GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl); guint modifier_state; MirMotionButton button_state; - gboolean is_modifier = FALSE; _gdk_mir_window_impl_get_cursor_state (impl, NULL, NULL, NULL, &button_state); modifier_state = get_modifier_state (event->modifiers, button_state); @@ -271,13 +262,12 @@ handle_key_event (GdkWindow *window, const MirKeyEvent *event) case mir_key_action_down: case mir_key_action_up: // FIXME: Convert keycode - // FIXME: is_modifier generate_key_event (window, event->action == mir_key_action_down ? GDK_KEY_PRESS : GDK_KEY_RELEASE, modifier_state, event->key_code, event->scan_code, - is_modifier, + IsModifierKey (event->key_code), NANO_TO_MILLI (event->event_time)); break; default: |