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

An attempt to keep all information about window bindings in the same

Browse Source 
2008-09-06  Thomas Thurman  <tthurman@gnome.org>

        An attempt to keep all information about window bindings
        in the same place.  Screen bindings to come.

        * src/core/window-bindings.h: new file, list of all window bindings
        * src/include/prefs.h: drop all the existing window-binding macros

        * src/core/schema-bindings.c (): output all the schema blocks that
        would appear in metacity.schema for these window bindings.  This
        ought to become part of the build process, and hopefully will soon.
        When this works it will also close #469361.

        * src/core/keybindings.c: generate handle_* prototypes using
        x-macros;  populate window_handlers using x-macros;  rename several
        functions to have consistent names;  do_handle_move_to_workspace(),
        handle_move_to_workspace_flip(), and handle_move_to_workspace() all
        merged into handle_move_to_workspace.

        * src/core/prefs.c: generate window_bindings and window_string_bindings
        using x-macros;  (meta_prefs_set_compositing_manager) fix unrelated
        problem with use of GConf functions when GConf was disabled.

        * src/core/core.c (meta_core_get_menu_accelerator): binding names
        given as literals since this is the only place in the code they
        now appear



svn path=/trunk/; revision=3860
This commit is contained in:
Thomas Thurman
2008-09-06 22:01:56 +00:00
committed by Thomas James Alexander Thurman
parent f227fc4872
commit cf48407972
7 changed files with 548 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/core/core.c
View File

@@ -520,87 +520,87 @@ meta_core_get_menu_accelerator (MetaMenuOp menu_op,
switch (menu_op)
{
case META_MENU_OP_DELETE:
name = META_KEYBINDING_CLOSE;
name = "close";
break;
case META_MENU_OP_MINIMIZE:
name = META_KEYBINDING_MINIMIZE;
name = "minimize";
break;
case META_MENU_OP_UNMAXIMIZE:
name = META_KEYBINDING_UNMAXIMIZE;
name = "unmaximize";
break;
case META_MENU_OP_MAXIMIZE:
name = META_KEYBINDING_MAXIMIZE;
name = "maximize";
break;
case META_MENU_OP_UNSHADE:
case META_MENU_OP_SHADE:
name = META_KEYBINDING_TOGGLE_SHADE;
name = "toggle_shaded";
break;
case META_MENU_OP_UNSTICK:
case META_MENU_OP_STICK:
name = META_KEYBINDING_TOGGLE_STICKY;
name = "toggle_on_all_workspaces";
break;
case META_MENU_OP_ABOVE:
case META_MENU_OP_UNABOVE:
name = META_KEYBINDING_TOGGLE_ABOVE;
name = "toggle_above";
break;
case META_MENU_OP_WORKSPACES:
switch (workspace)
{
case 1:
name = META_KEYBINDING_MOVE_WORKSPACE_1;
name = "move_to_workspace_1";
break;
case 2:
name = META_KEYBINDING_MOVE_WORKSPACE_2;
name = "move_to_workspace_2";
break;
case 3:
name = META_KEYBINDING_MOVE_WORKSPACE_3;
name = "move_to_workspace_3";
break;
case 4:
name = META_KEYBINDING_MOVE_WORKSPACE_4;
name = "move_to_workspace_4";
break;
case 5:
name = META_KEYBINDING_MOVE_WORKSPACE_5;
name = "move_to_workspace_5";
break;
case 6:
name = META_KEYBINDING_MOVE_WORKSPACE_6;
name = "move_to_workspace_6";
break;
case 7:
name = META_KEYBINDING_MOVE_WORKSPACE_7;
name = "move_to_workspace_7";
break;
case 8:
name = META_KEYBINDING_MOVE_WORKSPACE_8;
name = "move_to_workspace_8";
break;
case 9:
name = META_KEYBINDING_MOVE_WORKSPACE_9;
name = "move_to_workspace_9";
break;
case 10:
name = META_KEYBINDING_MOVE_WORKSPACE_10;
name = "move_to_workspace_10";
break;
case 11:
name = META_KEYBINDING_MOVE_WORKSPACE_11;
name = "move_to_workspace_11";
break;
case 12:
name = META_KEYBINDING_MOVE_WORKSPACE_12;
name = "move_to_workspace_12";
break;
}
break;
case META_MENU_OP_MOVE:
name = META_KEYBINDING_BEGIN_MOVE;
name = "begin_move";
break;
case META_MENU_OP_RESIZE:
name = META_KEYBINDING_BEGIN_RESIZE;
name = "begin_resize";
break;
case META_MENU_OP_MOVE_LEFT:
name = META_KEYBINDING_MOVE_WORKSPACE_LEFT;
name = "move_to_workspace_left";
break;
case META_MENU_OP_MOVE_RIGHT:
name = META_KEYBINDING_MOVE_WORKSPACE_RIGHT;
name = "move_to_workspace_right";
break;
case META_MENU_OP_MOVE_UP:
name = META_KEYBINDING_MOVE_WORKSPACE_UP;
name = "move_to_workspace_up";
break;
case META_MENU_OP_MOVE_DOWN:
name = META_KEYBINDING_MOVE_WORKSPACE_DOWN;
name = "move_to_workspace_down";
break;
case META_MENU_OP_RECOVER:
/* No keybinding for this one */