From c9e4c59676ad7f8e2821f2672ab6a7815c1a0215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Techet?= Date: Wed, 6 May 2020 09:53:07 -0700 Subject: [PATCH] vimode: Correctly ignore unwanted modifiers Use gtk_accelerator_get_default_mod_mask() which should ignore caps lock and num lock keys for us. Fixes #941. --- vimode/src/cmd-runner.c | 2 +- vimode/src/excmd-prompt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vimode/src/cmd-runner.c b/vimode/src/cmd-runner.c index 393ed80a2..2dc315402 100644 --- a/vimode/src/cmd-runner.c +++ b/vimode/src/cmd-runner.c @@ -431,7 +431,7 @@ static gboolean is_cmdpart(GSList *kpl, CmdDef *cmds) static gboolean is_printable(GSList *kpl) { - guint mask = GDK_MODIFIER_MASK & ~(GDK_SHIFT_MASK | GDK_LOCK_MASK); + guint mask = gtk_accelerator_get_default_mod_mask() & ~GDK_SHIFT_MASK; KeyPress *kp = g_slist_nth_data(kpl, 0); if (kp->modif & mask) diff --git a/vimode/src/excmd-prompt.c b/vimode/src/excmd-prompt.c index d3e13b556..93848ca88 100644 --- a/vimode/src/excmd-prompt.c +++ b/vimode/src/excmd-prompt.c @@ -71,7 +71,7 @@ static void set_prompt_text(const gchar *val) static gboolean on_prompt_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer dummy) { const gchar *text = gtk_entry_get_text(GTK_ENTRY(entry)); - guint modif_mask = GDK_MODIFIER_MASK & ~GDK_LOCK_MASK; + guint modif_mask = gtk_accelerator_get_default_mod_mask(); ignore_change = FALSE;