takino
/
termite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "non us fix" and fix it properly 

This reverts commit 305f5cb938.

The old fix breaks it on US keyboards.  Instead, copy the case down to
be in both ifs.
This commit is contained in:
Johannes Löthberg 2016-10-20 20:50:13 +02:00
parent a54bdcc7b1
commit c08cd317ee
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
termite.cc
View File

@ -916,6 +916,12 @@ gboolean key_press_cb(VteTerminal *vte, GdkEventKey *event, keybind_info *info)
} }
if (modifiers == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) { if (modifiers == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) {
switch (gdk_keyval_to_lower(event->keyval)) { switch (gdk_keyval_to_lower(event->keyval)) {
case GDK_KEY_plus:
increase_font_scale(vte);
return TRUE;
case GDK_KEY_equal:
reset_font_scale(vte, info->config.font_scale);
return TRUE;
case GDK_KEY_t: case GDK_KEY_t:
launch_in_directory(vte); launch_in_directory(vte);
return TRUE; return TRUE;
@ -943,14 +949,12 @@ gboolean key_press_cb(VteTerminal *vte, GdkEventKey *event, keybind_info *info)
if (modify_key_feed(event, info, modify_table)) if (modify_key_feed(event, info, modify_table))
return TRUE; return TRUE;
} }
} } else if ((modifiers == (GDK_CONTROL_MASK|GDK_MOD1_MASK)) ||
if ((modifiers == (GDK_CONTROL_MASK|GDK_MOD1_MASK)) || (modifiers == (GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_SHIFT_MASK))) {
(modifiers == (GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_SHIFT_MASK))) {
if (modify_key_feed(event, info, modify_meta_table)) if (modify_key_feed(event, info, modify_meta_table))
return TRUE; return TRUE;
} } else if (modifiers == GDK_CONTROL_MASK) {
if (modifiers & GDK_CONTROL_MASK) { switch (gdk_keyval_to_lower(event->keyval)) {
switch (event->keyval) {
case GDK_KEY_Tab: case GDK_KEY_Tab:
overlay_show(&info->panel, overlay_mode::completion, vte); overlay_show(&info->panel, overlay_mode::completion, vte);
return TRUE; return TRUE;