summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorSam Spilsbury <smspillaz@gmail.com>2011-01-13 11:10:05 +0800
committerSam Spilsbury <smspillaz@gmail.com>2011-01-13 11:10:05 +0800
commita8fd894b132f6e7a6dffa1fc3d3839ddf4a8d73b (patch)
tree2afcfe5a800fc6c70849367f8492fe1ae085d0e2 /src/include
parent5b8a93dcfd719eb1d084a6bb629cb41c7f65e5b2 (diff)
parente6964750909bbe8a5c5ca217f1acee2405a566b5 (diff)
downloadmetacity-a8fd894b132f6e7a6dffa1fc3d3839ddf4a8d73b.tar.gz
metacity-a8fd894b132f6e7a6dffa1fc3d3839ddf4a8d73b.tar.bz2
Merge branch 'master' of git://git.gnome.org/metacity
Diffstat (limited to 'src/include')
-rwxr-xr-xsrc/include/all-keybindings.h2
-rwxr-xr-xsrc/include/ui.h6
2 files changed, 7 insertions, 1 deletions
diff --git a/src/include/all-keybindings.h b/src/include/all-keybindings.h
index 378a7ac..0759ec3 100755
--- a/src/include/all-keybindings.h
+++ b/src/include/all-keybindings.h
@@ -167,7 +167,7 @@ keybind (switch_panels_backward, handle_switch, META_TAB_LIST_DOCKS,
"using a popup window"))
keybind (cycle_group, handle_cycle, META_TAB_LIST_GROUP,
- BINDING_REVERSES, "<Alt>F6",
+ BINDING_REVERSES, "<Alt>Above_Tab",
_("Move between windows of an application immediately"))
keybind (cycle_group_backward, handle_cycle, META_TAB_LIST_GROUP,
REVERSES_AND_REVERSED, NULL,
diff --git a/src/include/ui.h b/src/include/ui.h
index 6d98de8..386581e 100755
--- a/src/include/ui.h
+++ b/src/include/ui.h
@@ -185,6 +185,12 @@ void meta_ui_set_current_theme (const char *name,
gboolean force_reload);
gboolean meta_ui_have_a_theme (void);
+/* Not a real key symbol but means "key above the tab key"; this is
+ * used as the default keybinding for cycle_group.
+ * 0x2xxxxxxx is a range not used by GDK or X. the remaining digits are
+ * randomly chosen */
+#define META_KEY_ABOVE_TAB 0x2f7259c9
+
gboolean meta_ui_parse_accelerator (const char *accel,
unsigned int *keysym,
unsigned int *keycode,