brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keybindings: Handle switch-to-workspace-{up,down,left,right} again

Browse Source 
Commit 585fdd781c not only removed the tabpopup, but set invalid
handlers (a.k.a. NULL) for those shortcuts; add back handling of
basic handling of those shortcuts by switching instantly without any
popups.

https://bugzilla.gnome.org/show_bug.cgi?id=728423
This commit is contained in:
Florian Müllner 2014-04-17 16:54:37 +02:00
parent 8c0ef829c9
commit abd0ac2cc3
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/keybindings.c
View File

@ -2475,7 +2475,19 @@ handle_switch_to_workspace (MetaDisplay *display,
gint which = binding->handler->data; gint which = binding->handler->data;
MetaWorkspace *workspace; MetaWorkspace *workspace;
if (which < 0)
{
/* Negative workspace numbers are directions with respect to the
* current workspace.
*/
workspace = meta_workspace_get_neighbor (screen->active_workspace,
which);
}
else
{
workspace = meta_screen_get_workspace_by_index (screen, which); workspace = meta_screen_get_workspace_by_index (screen, which);
}
if (workspace) if (workspace)
{ {
@ -3350,28 +3362,28 @@ init_builtin_key_bindings (MetaDisplay *display)
common_keybindings, common_keybindings,
META_KEY_BINDING_NONE, META_KEY_BINDING_NONE,
META_KEYBINDING_ACTION_WORKSPACE_LEFT, META_KEYBINDING_ACTION_WORKSPACE_LEFT,
NULL, 0); handle_switch_to_workspace, META_MOTION_LEFT);
add_builtin_keybinding (display, add_builtin_keybinding (display,
"switch-to-workspace-right", "switch-to-workspace-right",
common_keybindings, common_keybindings,
META_KEY_BINDING_NONE, META_KEY_BINDING_NONE,
META_KEYBINDING_ACTION_WORKSPACE_RIGHT, META_KEYBINDING_ACTION_WORKSPACE_RIGHT,
NULL, 0); handle_switch_to_workspace, META_MOTION_RIGHT);
add_builtin_keybinding (display, add_builtin_keybinding (display,
"switch-to-workspace-up", "switch-to-workspace-up",
common_keybindings, common_keybindings,
META_KEY_BINDING_NONE, META_KEY_BINDING_NONE,
META_KEYBINDING_ACTION_WORKSPACE_UP, META_KEYBINDING_ACTION_WORKSPACE_UP,
NULL, 0); handle_switch_to_workspace, META_MOTION_UP);
add_builtin_keybinding (display, add_builtin_keybinding (display,
"switch-to-workspace-down", "switch-to-workspace-down",
common_keybindings, common_keybindings,
META_KEY_BINDING_NONE, META_KEY_BINDING_NONE,
META_KEYBINDING_ACTION_WORKSPACE_DOWN, META_KEYBINDING_ACTION_WORKSPACE_DOWN,
NULL, 0); handle_switch_to_workspace, META_MOTION_DOWN);
add_builtin_keybinding (display, add_builtin_keybinding (display,
"switch-to-workspace-last", "switch-to-workspace-last",