Merge pull request #385 from mikkeloscar/bugfix/non-us-keyboard-layout

Make key commands work on non-US keyboard layouts
This commit is contained in:
jelle van der Waa 2016-10-02 19:12:10 +02:00 committed by GitHub
commit ea0bc59e38
1 changed files with 9 additions and 7 deletions

View File

@ -916,9 +916,6 @@ gboolean key_press_cb(VteTerminal *vte, GdkEventKey *event, keybind_info *info)
}
if (modifiers == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) {
switch (gdk_keyval_to_lower(event->keyval)) {
case GDK_KEY_plus:
increase_font_scale(vte);
return TRUE;
case GDK_KEY_t:
launch_in_directory(vte);
return TRUE;
@ -946,15 +943,20 @@ gboolean key_press_cb(VteTerminal *vte, GdkEventKey *event, keybind_info *info)
if (modify_key_feed(event, info, modify_table))
return TRUE;
}
} else if ((modifiers == (GDK_CONTROL_MASK|GDK_MOD1_MASK)) ||
(modifiers == (GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_SHIFT_MASK))) {
}
if ((modifiers == (GDK_CONTROL_MASK|GDK_MOD1_MASK)) ||
(modifiers == (GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_SHIFT_MASK))) {
if (modify_key_feed(event, info, modify_meta_table))
return TRUE;
} else if (modifiers == GDK_CONTROL_MASK) {
switch (gdk_keyval_to_lower(event->keyval)) {
}
if (modifiers & GDK_CONTROL_MASK) {
switch (event->keyval) {
case GDK_KEY_Tab:
overlay_show(&info->panel, overlay_mode::completion, vte);
return TRUE;
case GDK_KEY_plus:
increase_font_scale(vte);
return TRUE;
case GDK_KEY_minus:
decrease_font_scale(vte);
return TRUE;