diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2017-12-14 23:57:54 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2017-12-14 23:57:54 -0500 |
| commit | fd85ff0c7a8798703ccb6d7bce17cfee21a5479e (patch) | |
| tree | ec62cfa222485f55c0dfee5c77f8ec568e787448 /gtk/gtkimcontextsimple.c | |
| parent | 9194ee4973de9f3ff2a68d7135bf79d8c0e56ca3 (diff) | |
| download | gtk+-fd85ff0c7a8798703ccb6d7bce17cfee21a5479e.tar.gz | |
Drop gdk_keymap_get_default()
It is better to use the explicit keymap getter - the
default display may not even use the current gdk backend.
Diffstat (limited to 'gtk/gtkimcontextsimple.c')
| -rw-r--r-- | gtk/gtkimcontextsimple.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c index 46046009d2..e402ea67ee 100644 --- a/gtk/gtkimcontextsimple.c +++ b/gtk/gtkimcontextsimple.c @@ -1157,6 +1157,7 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context, GtkIMContextSimplePrivate *priv = context_simple->priv; GdkWindow *window = gdk_event_get_window ((GdkEvent *) event); GdkDisplay *display = gdk_window_get_display (window); + GdkKeymap *keymap = gdk_keymap_get_for_display (display); GSList *tmp_list; int n_compose = 0; GdkModifierType hex_mod_mask; @@ -1227,8 +1228,7 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context, if (keyval == gtk_compose_ignore[i]) return FALSE; - hex_mod_mask = gdk_keymap_get_modifier_mask (gdk_keymap_get_for_display (display), - GDK_MODIFIER_INTENT_PRIMARY_ACCELERATOR); + hex_mod_mask = gdk_keymap_get_modifier_mask (keymap, GDK_MODIFIER_INTENT_PRIMARY_ACCELERATOR); hex_mod_mask |= GDK_SHIFT_MASK; if ((priv->in_hex_sequence || priv->in_emoji_sequence) && priv->modifiers_dropped) @@ -1263,9 +1263,7 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context, { GdkModifierType no_text_input_mask; - no_text_input_mask = - gdk_keymap_get_modifier_mask (gdk_keymap_get_for_display (display), - GDK_MODIFIER_INTENT_NO_TEXT_INPUT); + no_text_input_mask = gdk_keymap_get_modifier_mask (keymap, GDK_MODIFIER_INTENT_NO_TEXT_INPUT); if (state & no_text_input_mask || ((priv->in_hex_sequence || priv->in_emoji_sequence) && priv->modifiers_dropped && @@ -1446,7 +1444,7 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context, guint16 output[2]; gsize output_size = 2; - switch (gdk_win32_keymap_check_compose (GDK_WIN32_KEYMAP (gdk_keymap_get_default ()), + switch (gdk_win32_keymap_check_compose (GDK_WIN32_KEYMAP (keymap), priv->compose_buffer, n_compose, output, &output_size)) |