summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorThomas Thurman <tthurman@gnome.org>2008-09-06 22:01:56 +0000
committerThomas James Alexander Thurman <tthurman@src.gnome.org>2008-09-06 22:01:56 +0000
commitcf484079722ea216de2ff84b14c7a998d3f65bd0 (patch)
tree7e6e3ca7da9dec1b6cb9a8b71d7a38d933e32812 /src/include
parentf227fc4872fc2bb95c43be0cab73368c290aea1d (diff)
downloadmetacity-cf484079722ea216de2ff84b14c7a998d3f65bd0.tar.gz
metacity-cf484079722ea216de2ff84b14c7a998d3f65bd0.tar.bz2
An attempt to keep all information about window bindings in the same
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
Diffstat (limited to 'src/include')
-rw-r--r--src/include/prefs.h44
1 files changed, 0 insertions, 44 deletions
diff --git a/src/include/prefs.h b/src/include/prefs.h
index 4a76f40..9a4d128 100644
--- a/src/include/prefs.h
+++ b/src/include/prefs.h
@@ -189,50 +189,6 @@ void meta_prefs_set_compositing_manager (gboolean whether);
#define META_KEYBINDING_RUN_COMMAND_TERMINAL "run_command_terminal"
#define META_KEYBINDING_SET_SPEW_MARK "set_spew_mark"
-/* Window bindings */
-#define META_KEYBINDING_WINDOW_MENU "activate_window_menu"
-#define META_KEYBINDING_TOGGLE_FULLSCREEN "toggle_fullscreen"
-#define META_KEYBINDING_TOGGLE_MAXIMIZE "toggle_maximized"
-#define META_KEYBINDING_TOGGLE_ABOVE "toggle_above"
-#define META_KEYBINDING_MAXIMIZE "maximize"
-#define META_KEYBINDING_UNMAXIMIZE "unmaximize"
-#define META_KEYBINDING_TOGGLE_SHADE "toggle_shaded"
-#define META_KEYBINDING_MINIMIZE "minimize"
-#define META_KEYBINDING_CLOSE "close"
-#define META_KEYBINDING_BEGIN_MOVE "begin_move"
-#define META_KEYBINDING_BEGIN_RESIZE "begin_resize"
-#define META_KEYBINDING_TOGGLE_STICKY "toggle_on_all_workspaces"
-#define META_KEYBINDING_MOVE_WORKSPACE_1 "move_to_workspace_1"
-#define META_KEYBINDING_MOVE_WORKSPACE_2 "move_to_workspace_2"
-#define META_KEYBINDING_MOVE_WORKSPACE_3 "move_to_workspace_3"
-#define META_KEYBINDING_MOVE_WORKSPACE_4 "move_to_workspace_4"
-#define META_KEYBINDING_MOVE_WORKSPACE_5 "move_to_workspace_5"
-#define META_KEYBINDING_MOVE_WORKSPACE_6 "move_to_workspace_6"
-#define META_KEYBINDING_MOVE_WORKSPACE_7 "move_to_workspace_7"
-#define META_KEYBINDING_MOVE_WORKSPACE_8 "move_to_workspace_8"
-#define META_KEYBINDING_MOVE_WORKSPACE_9 "move_to_workspace_9"
-#define META_KEYBINDING_MOVE_WORKSPACE_10 "move_to_workspace_10"
-#define META_KEYBINDING_MOVE_WORKSPACE_11 "move_to_workspace_11"
-#define META_KEYBINDING_MOVE_WORKSPACE_12 "move_to_workspace_12"
-#define META_KEYBINDING_MOVE_WORKSPACE_LEFT "move_to_workspace_left"
-#define META_KEYBINDING_MOVE_WORKSPACE_RIGHT "move_to_workspace_right"
-#define META_KEYBINDING_MOVE_WORKSPACE_UP "move_to_workspace_up"
-#define META_KEYBINDING_MOVE_WORKSPACE_DOWN "move_to_workspace_down"
-#define META_KEYBINDING_RAISE_OR_LOWER "raise_or_lower"
-#define META_KEYBINDING_RAISE "raise"
-#define META_KEYBINDING_LOWER "lower"
-#define META_KEYBINDING_MAXIMIZE_VERTICALLY "maximize_vertically"
-#define META_KEYBINDING_MAXIMIZE_HORIZONTALLY "maximize_horizontally"
-#define META_KEYBINDING_MOVE_TO_CORNER_NW "move_to_corner_nw"
-#define META_KEYBINDING_MOVE_TO_CORNER_NE "move_to_corner_ne"
-#define META_KEYBINDING_MOVE_TO_CORNER_SW "move_to_corner_sw"
-#define META_KEYBINDING_MOVE_TO_CORNER_SE "move_to_corner_se"
-#define META_KEYBINDING_MOVE_TO_SIDE_N "move_to_side_n"
-#define META_KEYBINDING_MOVE_TO_SIDE_S "move_to_side_s"
-#define META_KEYBINDING_MOVE_TO_SIDE_E "move_to_side_e"
-#define META_KEYBINDING_MOVE_TO_SIDE_W "move_to_side_w"
-#define META_KEYBINDING_MOVE_TO_CENTER "move_to_center"
-
typedef enum _MetaKeyBindingAction
{
META_KEYBINDING_ACTION_NONE = -1,