3 files changed, 21 insertions, 0 deletions
diff --git a/src/include/all-keybindings.h b/src/include/all-keybindings.h
index ee9b5d37..26834454 100644
--- a/src/include/all-keybindings.h
+++ b/src/include/all-keybindings.h
@@ -158,6 +158,12 @@ keybind (switch_windows, handle_switch, META_TAB_LIST_NORMAL,
 keybind (switch_windows_backward, handle_switch, META_TAB_LIST_NORMAL,
 REVERSES_AND_REVERSED, NULL,
 _("Move backward between windows, using a popup window"))
+keybind (switch_windows_all, handle_switch, META_TAB_LIST_NORMAL_ALL_WORKSPACES,
+ BINDING_REVERSES, NULL,
+ _("Move between windows on all workspaces, using a popup window"))
+keybind (switch_windows_all_backward,handle_switch, META_TAB_LIST_NORMAL_ALL_WORKSPACES,
+ REVERSES_AND_REVERSED, NULL,
+ _("Move backward between windows on all workspaces, using a popup window"))
 keybind (switch_panels, handle_switch, META_TAB_LIST_DOCKS,
 BINDING_REVERSES, "<Control><Alt>Tab",
 _("Move between panels and the desktop, using a popup window"))
diff --git a/src/include/common.h b/src/include/common.h
index ccb592f6..a7eb89b1 100644
--- a/src/include/common.h
+++ b/src/include/common.h
@@ -116,9 +116,11 @@ typedef enum
 /* Alt+Tab */
 META_GRAB_OP_KEYBOARD_TABBING_NORMAL,
 META_GRAB_OP_KEYBOARD_TABBING_DOCK,
+ META_GRAB_OP_KEYBOARD_TABBING_NORMAL_ALL_WORKSPACES,
 
 /* Alt+Esc */
 META_GRAB_OP_KEYBOARD_ESCAPING_NORMAL,
+ META_GRAB_OP_KEYBOARD_ESCAPING_NORMAL_ALL_WORKSPACES,
 META_GRAB_OP_KEYBOARD_ESCAPING_DOCK,
 
 META_GRAB_OP_KEYBOARD_ESCAPING_GROUP,
@@ -131,7 +133,11 @@ typedef enum
 /* Frame button ops */
 META_GRAB_OP_CLICKING_MINIMIZE,
 META_GRAB_OP_CLICKING_MAXIMIZE,
+ META_GRAB_OP_CLICKING_MAXIMIZE_VERTICAL,
+ META_GRAB_OP_CLICKING_MAXIMIZE_HORIZONTAL,
 META_GRAB_OP_CLICKING_UNMAXIMIZE,
+ META_GRAB_OP_CLICKING_UNMAXIMIZE_VERTICAL,
+ META_GRAB_OP_CLICKING_UNMAXIMIZE_HORIZONTAL,
 META_GRAB_OP_CLICKING_DELETE,
 META_GRAB_OP_CLICKING_MENU,
 META_GRAB_OP_CLICKING_SHADE,
@@ -173,6 +179,13 @@ typedef enum
 
 typedef enum
 {
+ META_WRAP_NONE,
+ META_WRAP_CLASSIC,
+ META_WRAP_TOROIDAL
+} MetaWrapStyle;
+
+typedef enum
+{
 META_ACTION_TITLEBAR_TOGGLE_SHADE,
 META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE,
 META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE_HORIZONTALLY,
diff --git a/src/include/prefs.h b/src/include/prefs.h
index 39597f9f..58814130 100644
--- a/src/include/prefs.h
+++ b/src/include/prefs.h
@@ -43,6 +43,7 @@ typedef enum
 META_PREF_THEME,
 META_PREF_TITLEBAR_FONT,
 META_PREF_NUM_WORKSPACES,
+ META_PREF_WRAP_STYLE,
 META_PREF_APPLICATION_BASED,
 META_PREF_KEYBINDINGS,
 META_PREF_DISABLE_WORKAROUNDS,
@@ -88,6 +89,7 @@ gboolean meta_prefs_get_application_based (void);
 gboolean meta_prefs_get_disable_workarounds (void);
 gboolean meta_prefs_get_auto_raise (void);
 int meta_prefs_get_auto_raise_delay (void);
+MetaWrapStyle meta_prefs_get_wrap_style (void);
 gboolean meta_prefs_get_reduced_resources (void);
 gboolean meta_prefs_get_mate_accessibility (void);
 gboolean meta_prefs_get_mate_animations (void);