summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Kareh <[email protected]>2018-03-07 13:37:15 -0500
committerVictor Kareh <[email protected]>2018-03-08 09:33:09 -0500
commit03cffa36b4c89532873848064ef595e5d0ac9b9c (patch)
tree77127c68aaa54314c295ae877360c011b767b808
parent42410fe72d0ed2c654631e1755526482a80f4fca (diff)
downloadmarco-03cffa36b4c89532873848064ef595e5d0ac9b9c.tar.bz2
marco-03cffa36b4c89532873848064ef595e5d0ac9b9c.tar.xz
Fix mismatched enums in keybinding detection for switch-panels and switch-panels-backward
-rw-r--r--src/core/keybindings.c4
-rw-r--r--src/include/prefs.h2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 5b56fb2e..5eee03ee 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -2144,8 +2144,10 @@ process_tab_grab (MetaDisplay *display,
break;
case META_KEYBINDING_ACTION_SWITCH_PANELS:
case META_KEYBINDING_ACTION_SWITCH_WINDOWS:
+ case META_KEYBINDING_ACTION_SWITCH_WINDOWS_ALL:
case META_KEYBINDING_ACTION_SWITCH_PANELS_BACKWARD:
case META_KEYBINDING_ACTION_SWITCH_WINDOWS_BACKWARD:
+ case META_KEYBINDING_ACTION_SWITCH_WINDOWS_ALL_BACKWARD:
/* SWITCH_* are traditionally Tab-based actions,
* and should cancel traditionally Escape-based ones.
*/
@@ -2217,11 +2219,13 @@ process_tab_grab (MetaDisplay *display,
break;
case META_KEYBINDING_ACTION_SWITCH_PANELS:
case META_KEYBINDING_ACTION_SWITCH_WINDOWS:
+ case META_KEYBINDING_ACTION_SWITCH_WINDOWS_ALL:
case META_KEYBINDING_ACTION_SWITCH_GROUP:
key_used = TRUE;
break;
case META_KEYBINDING_ACTION_SWITCH_PANELS_BACKWARD:
case META_KEYBINDING_ACTION_SWITCH_WINDOWS_BACKWARD:
+ case META_KEYBINDING_ACTION_SWITCH_WINDOWS_ALL_BACKWARD:
case META_KEYBINDING_ACTION_SWITCH_GROUP_BACKWARD:
key_used = TRUE;
backward = TRUE;
diff --git a/src/include/prefs.h b/src/include/prefs.h
index 712d0651..29db2a10 100644
--- a/src/include/prefs.h
+++ b/src/include/prefs.h
@@ -179,6 +179,8 @@ typedef enum _MetaKeyBindingAction
META_KEYBINDING_ACTION_SWITCH_GROUP_BACKWARD,
META_KEYBINDING_ACTION_SWITCH_WINDOWS,
META_KEYBINDING_ACTION_SWITCH_WINDOWS_BACKWARD,
+ META_KEYBINDING_ACTION_SWITCH_WINDOWS_ALL,
+ META_KEYBINDING_ACTION_SWITCH_WINDOWS_ALL_BACKWARD,
META_KEYBINDING_ACTION_SWITCH_PANELS,
META_KEYBINDING_ACTION_SWITCH_PANELS_BACKWARD,
META_KEYBINDING_ACTION_CYCLE_GROUP,