4 files changed, 22 insertions, 1 deletions
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 041d96fc..821d432a 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -2288,6 +2288,14 @@ handle_switch_to_workspace (MetaDisplay *display,
 {
 gint which = binding->handler->data;
 MetaWorkspace *workspace;
+
+ if (which == META_MOTION_PREV)
+ {
+ workspace = screen->prev_workspace;
+ if (workspace)
+ meta_workspace_activate (workspace, event->xkey.time);
+ return;
+ }
 
 if (which < 0)
 {
diff --git a/src/core/screen-private.h b/src/core/screen-private.h
index ee014ff2..c1552ab0 100644
--- a/src/core/screen-private.h
+++ b/src/core/screen-private.h
@@ -85,6 +85,9 @@ struct _MetaScreen
 
 MetaWorkspace *active_workspace;
 
+ /* Previous active workspace */
+ MetaWorkspace *prev_workspace;
+
 /* This window holds the focus when we don't want to focus
 * any actual clients
 */
diff --git a/src/core/workspace.c b/src/core/workspace.c
index b85ab53c..d61529d2 100644
--- a/src/core/workspace.c
+++ b/src/core/workspace.c
@@ -385,6 +385,9 @@ meta_workspace_activate_with_focus (MetaWorkspace *workspace,
 /* Note that old can be NULL; e.g. when starting up */
 old = workspace->screen->active_workspace;
 
+ /* Save old workspace, to be able to switch back. */
+ workspace->screen->prev_workspace = old;
+
 workspace->screen->active_workspace = workspace;
 
 set_active_space_hint (workspace->screen);
@@ -798,6 +801,8 @@ meta_motion_direction_to_string (MetaMotionDirection direction)
 return "Left";
 case META_MOTION_RIGHT:
 return "Right";
+ case META_MOTION_PREV:
+ return "Previous";
 }
 
 return "Unknown";
@@ -838,6 +843,8 @@ meta_workspace_get_neighbor (MetaWorkspace *workspace,
 case META_MOTION_DOWN:
 layout.current_row += 1;
 break;
+ case META_MOTION_PREV:
+ break;
 }
 
 /* LEFT */
@@ -914,6 +921,8 @@ meta_workspace_get_neighbor (MetaWorkspace *workspace,
 if (wrap == META_WRAP_TOROIDAL)
 layout.current_col = layout.current_col < layout.cols - 1 ? layout.current_col + 1 : 0;
 break;
+ case META_MOTION_PREV:
+ break;
 }
 
 i = layout.grid[layout.current_row * layout.cols + layout.current_col];
diff --git a/src/core/workspace.h b/src/core/workspace.h
index 40942e1a..4b52f96e 100644
--- a/src/core/workspace.h
+++ b/src/core/workspace.h
@@ -43,7 +43,8 @@ typedef enum
 META_MOTION_UP = -1,
 META_MOTION_DOWN = -2,
 META_MOTION_LEFT = -3,
- META_MOTION_RIGHT = -4
+ META_MOTION_RIGHT = -4,
+ META_MOTION_PREV = -5
 } MetaMotionDirection;
 
 struct _MetaWorkspace