diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/all-keybindings.h | 357 | ||||
| -rw-r--r-- | src/include/common.h | 31 | ||||
| -rw-r--r-- | src/include/prefs.h | 42 |
3 files changed, 116 insertions, 314 deletions
diff --git a/src/include/all-keybindings.h b/src/include/all-keybindings.h index 9d3540a5..f1aa02d1 100644 --- a/src/include/all-keybindings.h +++ b/src/include/all-keybindings.h @@ -55,12 +55,6 @@ * explain this better) * or 0 if no flag applies. * - * 5) a string representing the default binding. - * If this is NULL, the action is unbound by default. - * Please use NULL and not "disabled". - * 6) a short description. - * It must be marked translatable (i.e. inside "_(...)"). - * * Don't try to do XML entity escaping anywhere in the strings. */ @@ -84,30 +78,18 @@ /* convenience, since in this file they must always be set together */ #define REVERSES_AND_REVERSED (BINDING_REVERSES | BINDING_IS_REVERSED) -keybind (switch_to_workspace_1, handle_switch_to_workspace, 0, 0, NULL, - _("Switch to workspace 1")) -keybind (switch_to_workspace_2, handle_switch_to_workspace, 1, 0, NULL, - _("Switch to workspace 2")) -keybind (switch_to_workspace_3, handle_switch_to_workspace, 2, 0, NULL, - _("Switch to workspace 3")) -keybind (switch_to_workspace_4, handle_switch_to_workspace, 3, 0, NULL, - _("Switch to workspace 4")) -keybind (switch_to_workspace_5, handle_switch_to_workspace, 4, 0, NULL, - _("Switch to workspace 5")) -keybind (switch_to_workspace_6, handle_switch_to_workspace, 5, 0, NULL, - _("Switch to workspace 6")) -keybind (switch_to_workspace_7, handle_switch_to_workspace, 6, 0, NULL, - _("Switch to workspace 7")) -keybind (switch_to_workspace_8, handle_switch_to_workspace, 7, 0, NULL, - _("Switch to workspace 8")) -keybind (switch_to_workspace_9, handle_switch_to_workspace, 8, 0, NULL, - _("Switch to workspace 9")) -keybind (switch_to_workspace_10, handle_switch_to_workspace, 9, 0, NULL, - _("Switch to workspace 10")) -keybind (switch_to_workspace_11, handle_switch_to_workspace, 10, 0, NULL, - _("Switch to workspace 11")) -keybind (switch_to_workspace_12, handle_switch_to_workspace, 11, 0, NULL, - _("Switch to workspace 12")) +keybind (switch-to-workspace-1, handle_switch_to_workspace, 0, 0) +keybind (switch-to-workspace-2, handle_switch_to_workspace, 1, 0) +keybind (switch-to-workspace-3, handle_switch_to_workspace, 2, 0) +keybind (switch-to-workspace-4, handle_switch_to_workspace, 3, 0) +keybind (switch-to-workspace-5, handle_switch_to_workspace, 4, 0) +keybind (switch-to-workspace-6, handle_switch_to_workspace, 5, 0) +keybind (switch-to-workspace-7, handle_switch_to_workspace, 6, 0) +keybind (switch-to-workspace-8, handle_switch_to_workspace, 7, 0) +keybind (switch-to-workspace-9, handle_switch_to_workspace, 8, 0) +keybind (switch-to-workspace-10, handle_switch_to_workspace, 9, 0) +keybind (switch-to-workspace-11, handle_switch_to_workspace, 10, 0) +keybind (switch-to-workspace-12, handle_switch_to_workspace, 11, 0) /* META_MOTION_* are negative, and so distinct from workspace numbers, * which are always zero or positive. @@ -117,21 +99,17 @@ keybind (switch_to_workspace_12, handle_switch_to_workspace, 11, 0, NULL, * workspace.h, of course. */ -keybind (switch_to_workspace_left, handle_switch_to_workspace, - META_MOTION_LEFT, 0, "<Control><Alt>Left", - _("Move to workspace left")) +keybind (switch-to-workspace-left, handle_switch_to_workspace, + META_MOTION_LEFT, 0) -keybind (switch_to_workspace_right, handle_switch_to_workspace, - META_MOTION_RIGHT, 0, "<Control><Alt>Right", - _("Move to workspace right")) +keybind (switch-to-workspace-right, handle_switch_to_workspace, + META_MOTION_RIGHT, 0) -keybind (switch_to_workspace_up, handle_switch_to_workspace, - META_MOTION_UP, 0, "<Control><Alt>Up", - _("Move to workspace above")) +keybind (switch-to-workspace-up, handle_switch_to_workspace, + META_MOTION_UP, 0) -keybind (switch_to_workspace_down, handle_switch_to_workspace, - META_MOTION_DOWN, 0, "<Control><Alt>Down", - _("Move to workspace below")) +keybind (switch-to-workspace-down, handle_switch_to_workspace, + META_MOTION_DOWN, 0) /***********************************/ @@ -145,102 +123,36 @@ keybind (switch_to_workspace_down, handle_switch_to_workspace, * same function checking a bit in the parameter for difference. */ -keybind (switch_group, handle_switch, META_TAB_LIST_GROUP, - BINDING_REVERSES, "<Alt>Above_Tab", - _("Switch windows of an application")) -keybind (switch_group_backward, handle_switch, META_TAB_LIST_GROUP, - REVERSES_AND_REVERSED, NULL, - _("Reverse switch windows of an application")) -keybind (switch_windows, handle_switch, META_TAB_LIST_NORMAL, - BINDING_REVERSES, "<Alt>Tab", - _("Switch applications")) -keybind (switch_windows_backward, handle_switch, META_TAB_LIST_NORMAL, - REVERSES_AND_REVERSED, NULL, - _("Reverse switch applications")) -keybind (switch_panels, handle_switch, META_TAB_LIST_DOCKS, - BINDING_REVERSES, "<Control><Alt>Tab", - _("Switch system controls")) -keybind (switch_panels_backward, handle_switch, META_TAB_LIST_DOCKS, - REVERSES_AND_REVERSED, NULL, - _("Reverse switch system controls")) - -keybind (cycle_group, handle_cycle, META_TAB_LIST_GROUP, - BINDING_REVERSES, "<Alt>F6", - _("Switch windows of an app directly")) -keybind (cycle_group_backward, handle_cycle, META_TAB_LIST_GROUP, - REVERSES_AND_REVERSED, NULL, - _("Reverse switch windows of an app directly")) -keybind (cycle_windows, handle_cycle, META_TAB_LIST_NORMAL, - BINDING_REVERSES, "<Alt>Escape", - _("Switch windows directly")) -keybind (cycle_windows_backward, handle_cycle, META_TAB_LIST_NORMAL, - REVERSES_AND_REVERSED, NULL, - _("Reverse switch windows directly")) -keybind (cycle_panels, handle_cycle, META_TAB_LIST_DOCKS, - BINDING_REVERSES, "<Control><Alt>Escape", - _("Switch system controls directly")) -keybind (cycle_panels_backward, handle_cycle, META_TAB_LIST_DOCKS, - REVERSES_AND_REVERSED, NULL, - _("Reverse switch system controls directly")) +keybind (switch-group, handle_switch, META_TAB_LIST_GROUP, BINDING_REVERSES) +keybind (switch-group-backward, handle_switch, META_TAB_LIST_GROUP, + REVERSES_AND_REVERSED) +keybind (switch-windows, handle_switch, META_TAB_LIST_NORMAL, BINDING_REVERSES) +keybind (switch-windows-backward, handle_switch, META_TAB_LIST_NORMAL, + REVERSES_AND_REVERSED) +keybind (switch-panels, handle_switch, META_TAB_LIST_DOCKS, BINDING_REVERSES) +keybind (switch-panels-backward, handle_switch, META_TAB_LIST_DOCKS, + REVERSES_AND_REVERSED) + +keybind (cycle-group, handle_cycle, META_TAB_LIST_GROUP, BINDING_REVERSES) +keybind (cycle-group-backward, handle_cycle, META_TAB_LIST_GROUP, + REVERSES_AND_REVERSED) +keybind (cycle-windows, handle_cycle, META_TAB_LIST_NORMAL, BINDING_REVERSES) +keybind (cycle-windows-backward, handle_cycle, META_TAB_LIST_NORMAL, + REVERSES_AND_REVERSED) +keybind (cycle-panels, handle_cycle, META_TAB_LIST_DOCKS, BINDING_REVERSES) +keybind (cycle-panels-backward, handle_cycle, META_TAB_LIST_DOCKS, + REVERSES_AND_REVERSED) /***********************************/ -keybind (show_desktop, handle_show_desktop, 0, 0, NULL, - _("Hide all normal windows")) -keybind (panel_main_menu, handle_panel, - META_KEYBINDING_ACTION_PANEL_MAIN_MENU, 0, "<Alt>F1", - _("Show the activities overview")) -keybind (panel_run_dialog, handle_panel, - META_KEYBINDING_ACTION_PANEL_RUN_DIALOG, 0, "<Alt>F2", - _("Show the run command prompt")) - -/* Yes, the param is offset by one. Historical reasons. (Maybe worth fixing - * at some point.) The description is NULL here because the stanza is - * irregularly shaped in metacity.schemas.in. This will probably be fixed - * as well. - */ -keybind (run_command_1, handle_run_command, 0, 0, NULL, NULL) -keybind (run_command_2, handle_run_command, 1, 0, NULL, NULL) -keybind (run_command_3, handle_run_command, 2, 0, NULL, NULL) -keybind (run_command_4, handle_run_command, 3, 0, NULL, NULL) -keybind (run_command_5, handle_run_command, 4, 0, NULL, NULL) -keybind (run_command_6, handle_run_command, 5, 0, NULL, NULL) -keybind (run_command_7, handle_run_command, 6, 0, NULL, NULL) -keybind (run_command_8, handle_run_command, 7, 0, NULL, NULL) -keybind (run_command_9, handle_run_command, 8, 0, NULL, NULL) -keybind (run_command_10, handle_run_command, 9, 0, NULL, NULL) -keybind (run_command_11, handle_run_command, 10, 0, NULL, NULL) -keybind (run_command_12, handle_run_command, 11, 0, NULL, NULL) -keybind (run_command_13, handle_run_command, 12, 0, NULL, NULL) -keybind (run_command_14, handle_run_command, 13, 0, NULL, NULL) -keybind (run_command_15, handle_run_command, 14, 0, NULL, NULL) -keybind (run_command_16, handle_run_command, 15, 0, NULL, NULL) -keybind (run_command_17, handle_run_command, 16, 0, NULL, NULL) -keybind (run_command_18, handle_run_command, 17, 0, NULL, NULL) -keybind (run_command_19, handle_run_command, 18, 0, NULL, NULL) -keybind (run_command_20, handle_run_command, 19, 0, NULL, NULL) -keybind (run_command_21, handle_run_command, 20, 0, NULL, NULL) -keybind (run_command_22, handle_run_command, 21, 0, NULL, NULL) -keybind (run_command_23, handle_run_command, 22, 0, NULL, NULL) -keybind (run_command_24, handle_run_command, 23, 0, NULL, NULL) -keybind (run_command_25, handle_run_command, 24, 0, NULL, NULL) -keybind (run_command_26, handle_run_command, 25, 0, NULL, NULL) -keybind (run_command_27, handle_run_command, 26, 0, NULL, NULL) -keybind (run_command_28, handle_run_command, 27, 0, NULL, NULL) -keybind (run_command_29, handle_run_command, 28, 0, NULL, NULL) -keybind (run_command_30, handle_run_command, 29, 0, NULL, NULL) -keybind (run_command_31, handle_run_command, 30, 0, NULL, NULL) -keybind (run_command_32, handle_run_command, 31, 0, NULL, NULL) - -keybind (run_command_screenshot, handle_run_command, 32, 0, "Print", - _("Take a screenshot")) -keybind (run_command_window_screenshot, handle_run_command, 33, 0,"<Alt>Print", - _("Take a screenshot of a window")) - -keybind (run_command_terminal, handle_run_terminal, 0, 0, NULL, _("Launch Terminal")) - -/* No description because this is undocumented */ -keybind (set_spew_mark, handle_set_spew_mark, 0, 0, NULL, NULL) +keybind (show-desktop, handle_show_desktop, 0, 0) +keybind (panel-main-menu, handle_panel, + META_KEYBINDING_ACTION_PANEL_MAIN_MENU, 0) +keybind (panel-run-dialog, handle_panel, + META_KEYBINDING_ACTION_PANEL_RUN_DIALOG, 0) + +/* FIXME: No description because this is undocumented */ +keybind (set-spew-mark, handle_set_spew_mark, 0, 0) #undef REVERSES_AND_REVERSED @@ -250,70 +162,33 @@ keybind (set_spew_mark, handle_set_spew_mark, 0, 0, NULL, NULL) * if no window is active. */ -keybind (activate_window_menu, handle_activate_window_menu, 0, - BINDING_PER_WINDOW, "<Alt>space", - _("Activate the window menu")) -keybind (toggle_fullscreen, handle_toggle_fullscreen, 0, BINDING_PER_WINDOW, - NULL, - _("Toggle fullscreen mode")) -keybind (toggle_maximized, handle_toggle_maximized, 0, BINDING_PER_WINDOW, "<Alt>F10", - _("Toggle maximization state")) -keybind (toggle_above, handle_toggle_above, 0, BINDING_PER_WINDOW, NULL, - _("Toggle window always appearing on top")) -keybind (maximize, handle_maximize, 0, BINDING_PER_WINDOW, NULL, - _("Maximize window")) -keybind (unmaximize, handle_unmaximize, 0, BINDING_PER_WINDOW, "<Alt>F5", - _("Restore window")) -keybind (toggle_shaded, handle_toggle_shaded, 0, BINDING_PER_WINDOW, NULL, - _("Toggle shaded state")) -keybind (minimize, handle_minimize, 0, BINDING_PER_WINDOW, NULL, - _("Minimize window")) -keybind (close, handle_close, 0, BINDING_PER_WINDOW, "<Alt>F4", - _("Close window")) -keybind (begin_move, handle_begin_move, 0, BINDING_PER_WINDOW, "<Alt>F7", - _("Move window")) -keybind (begin_resize, handle_begin_resize, 0, BINDING_PER_WINDOW, "<Alt>F8", - _("Resize window")) -keybind (toggle_on_all_workspaces, handle_toggle_on_all_workspaces, 0, - BINDING_PER_WINDOW, NULL, - _("Toggle window on all workspaces or one")) - -keybind (move_to_workspace_1, handle_move_to_workspace, 0, BINDING_PER_WINDOW, - NULL, - _("Move window to workspace 1")) -keybind (move_to_workspace_2, handle_move_to_workspace, 1, BINDING_PER_WINDOW, - NULL, - _("Move window to workspace 2")) -keybind (move_to_workspace_3, handle_move_to_workspace, 2, BINDING_PER_WINDOW, - NULL, - _("Move window to workspace 3")) -keybind (move_to_workspace_4, handle_move_to_workspace, 3, BINDING_PER_WINDOW, - NULL, - _("Move window to workspace 4")) -keybind (move_to_workspace_5, handle_move_to_workspace, 4, BINDING_PER_WINDOW, - NULL, - _("Move window to workspace 5")) -keybind (move_to_workspace_6, handle_move_to_workspace, 5, BINDING_PER_WINDOW, - NULL, - _("Move window to workspace 6")) -keybind (move_to_workspace_7, handle_move_to_workspace, 6, BINDING_PER_WINDOW, - NULL, - _("Move window to workspace 7")) -keybind (move_to_workspace_8, handle_move_to_workspace, 7, BINDING_PER_WINDOW, - NULL, - _("Move window to workspace 8")) -keybind (move_to_workspace_9, handle_move_to_workspace, 8, BINDING_PER_WINDOW, - NULL, - _("Move window to workspace 9")) -keybind (move_to_workspace_10, handle_move_to_workspace, 9, BINDING_PER_WINDOW, - NULL, - _("Move window to workspace 10")) -keybind (move_to_workspace_11, handle_move_to_workspace, 10, BINDING_PER_WINDOW, - NULL, - _("Move window to workspace 11")) -keybind (move_to_workspace_12, handle_move_to_workspace, 11, BINDING_PER_WINDOW, - NULL, - _("Move window to workspace 12")) +keybind (activate-window-menu, handle_activate_window_menu, 0, + BINDING_PER_WINDOW) +keybind (toggle-fullscreen, handle_toggle_fullscreen, 0, BINDING_PER_WINDOW) +keybind (toggle-maximized, handle_toggle_maximized, 0, BINDING_PER_WINDOW) +keybind (toggle-above, handle_toggle_above, 0, BINDING_PER_WINDOW) +keybind (maximize, handle_maximize, 0, BINDING_PER_WINDOW) +keybind (unmaximize, handle_unmaximize, 0, BINDING_PER_WINDOW) +keybind (toggle-shaded, handle_toggle_shaded, 0, BINDING_PER_WINDOW) +keybind (minimize, handle_minimize, 0, BINDING_PER_WINDOW) +keybind (close, handle_close, 0, BINDING_PER_WINDOW) +keybind (begin-move, handle_begin_move, 0, BINDING_PER_WINDOW) +keybind (begin-resize, handle_begin_resize, 0, BINDING_PER_WINDOW) +keybind (toggle-on-all-workspaces, handle_toggle_on_all_workspaces, 0, + BINDING_PER_WINDOW) + +keybind (move-to-workspace-1, handle_move_to_workspace, 0, BINDING_PER_WINDOW) +keybind (move-to-workspace-2, handle_move_to_workspace, 1, BINDING_PER_WINDOW) +keybind (move-to-workspace-3, handle_move_to_workspace, 2, BINDING_PER_WINDOW) +keybind (move-to-workspace-4, handle_move_to_workspace, 3, BINDING_PER_WINDOW) +keybind (move-to-workspace-5, handle_move_to_workspace, 4, BINDING_PER_WINDOW) +keybind (move-to-workspace-6, handle_move_to_workspace, 5, BINDING_PER_WINDOW) +keybind (move-to-workspace-7, handle_move_to_workspace, 6, BINDING_PER_WINDOW) +keybind (move-to-workspace-8, handle_move_to_workspace, 7, BINDING_PER_WINDOW) +keybind (move-to-workspace-9, handle_move_to_workspace, 8, BINDING_PER_WINDOW) +keybind (move-to-workspace-10, handle_move_to_workspace, 9, BINDING_PER_WINDOW) +keybind (move-to-workspace-11, handle_move_to_workspace, 10, BINDING_PER_WINDOW) +keybind (move-to-workspace-12, handle_move_to_workspace, 11, BINDING_PER_WINDOW) /* META_MOTION_* are negative, and so distinct from workspace numbers, * which are always zero or positive. @@ -323,62 +198,34 @@ keybind (move_to_workspace_12, handle_move_to_workspace, 11, BINDING_PER_WINDOW, * workspace.h, of course. */ -keybind (move_to_workspace_left, handle_move_to_workspace, - META_MOTION_LEFT, BINDING_PER_WINDOW, "<Control><Shift><Alt>Left", - _("Move window one workspace to the left")) -keybind (move_to_workspace_right, handle_move_to_workspace, - META_MOTION_RIGHT, BINDING_PER_WINDOW, "<Control><Shift><Alt>Right", - _("Move window one workspace to the right")) -keybind (move_to_workspace_up, handle_move_to_workspace, - META_MOTION_UP, BINDING_PER_WINDOW, "<Control><Shift><Alt>Up", - _("Move window one workspace up")) -keybind (move_to_workspace_down, handle_move_to_workspace, - META_MOTION_DOWN, BINDING_PER_WINDOW, "<Control><Shift><Alt>Down", - _("Move window one workspace down")) - -keybind (raise_or_lower, handle_raise_or_lower, 0, BINDING_PER_WINDOW, NULL, - _("Raise window if covered, otherwise lower it")) -keybind (raise, handle_raise, 0, BINDING_PER_WINDOW, NULL, - _("Raise window above other windows")) -keybind (lower, handle_lower, 0, BINDING_PER_WINDOW, NULL, - _("Lower window below other windows")) - -keybind (maximize_vertically, handle_maximize_vertically, 0, - BINDING_PER_WINDOW, NULL, - _("Maximize window vertically")) - -keybind (maximize_horizontally, handle_maximize_horizontally, 0, - BINDING_PER_WINDOW, NULL, - _("Maximize window horizontally")) - -keybind (move_to_corner_nw, handle_move_to_corner_nw, 0, - BINDING_PER_WINDOW, NULL, - _("Move window to top left corner")) -keybind (move_to_corner_ne, handle_move_to_corner_ne, 0, - BINDING_PER_WINDOW, NULL, - _("Move window to top right corner")) -keybind (move_to_corner_sw, handle_move_to_corner_sw, 0, - BINDING_PER_WINDOW, NULL, - _("Move window to bottom left corner")) -keybind (move_to_corner_se, handle_move_to_corner_se, 0, - BINDING_PER_WINDOW, NULL, - _("Move window to bottom right corner")) - -keybind (move_to_side_n, handle_move_to_side_n, 0, - BINDING_PER_WINDOW, NULL, - _("Move window to top edge of screen")) -keybind (move_to_side_s, handle_move_to_side_s, 0, - BINDING_PER_WINDOW, NULL, - _("Move window to bottom edge of screen")) -keybind (move_to_side_e, handle_move_to_side_e, 0, - BINDING_PER_WINDOW, NULL, - _("Move window to right side of screen")) -keybind (move_to_side_w, handle_move_to_side_w, 0, - BINDING_PER_WINDOW, NULL, - _("Move window to left side of screen")) -keybind (move_to_center, handle_move_to_center, 0, - BINDING_PER_WINDOW, NULL, - _("Move window to center of screen")) +keybind (move-to-workspace-left, handle_move_to_workspace, + META_MOTION_LEFT, BINDING_PER_WINDOW) +keybind (move-to-workspace-right, handle_move_to_workspace, + META_MOTION_RIGHT, BINDING_PER_WINDOW) +keybind (move-to-workspace-up, handle_move_to_workspace, + META_MOTION_UP, BINDING_PER_WINDOW) +keybind (move-to-workspace-down, handle_move_to_workspace, + META_MOTION_DOWN, BINDING_PER_WINDOW) + +keybind (raise-or-lower, handle_raise_or_lower, 0, BINDING_PER_WINDOW) +keybind (raise, handle_raise, 0, BINDING_PER_WINDOW) +keybind (lower, handle_lower, 0, BINDING_PER_WINDOW) + +keybind (maximize-vertically, handle_maximize_vertically, 0, BINDING_PER_WINDOW) + +keybind (maximize-horizontally, handle_maximize_horizontally, 0, + BINDING_PER_WINDOW) + +keybind (move-to-corner-nw, handle_move_to_corner_nw, 0, BINDING_PER_WINDOW) +keybind (move-to-corner-ne, handle_move_to_corner_ne, 0, BINDING_PER_WINDOW) +keybind (move-to-corner-sw, handle_move_to_corner_sw, 0, BINDING_PER_WINDOW) +keybind (move-to-corner-se, handle_move_to_corner_se, 0, BINDING_PER_WINDOW) + +keybind (move-to-side-n, handle_move_to_side_n, 0, BINDING_PER_WINDOW) +keybind (move-to-side-s, handle_move_to_side_s, 0, BINDING_PER_WINDOW) +keybind (move-to-side-e, handle_move_to_side_e, 0, BINDING_PER_WINDOW) +keybind (move-to-side-w, handle_move_to_side_w, 0, BINDING_PER_WINDOW) +keybind (move-to-center, handle_move_to_center, 0, BINDING_PER_WINDOW) /* eof all-keybindings.h */ diff --git a/src/include/common.h b/src/include/common.h index de2dfff1..4ce800bb 100644 --- a/src/include/common.h +++ b/src/include/common.h @@ -1,6 +1,9 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -/* Metacity common types shared by core.h and ui.h */ +/* Metacity common types shared by core.h and ui.h + * + * PLEASE KEEP IN SYNC WITH GSETTINGS SCHEMAS! + */ /* * Copyright (C) 2001 Havoc Pennington @@ -160,32 +163,6 @@ typedef enum typedef enum { - META_FOCUS_MODE_CLICK, - META_FOCUS_MODE_SLOPPY, - META_FOCUS_MODE_MOUSE -} MetaFocusMode; - -typedef enum -{ - META_FOCUS_NEW_WINDOWS_SMART, - META_FOCUS_NEW_WINDOWS_STRICT -} MetaFocusNewWindows; - -typedef enum -{ - META_ACTION_TITLEBAR_TOGGLE_SHADE, - META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE, - META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE_HORIZONTALLY, - META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE_VERTICALLY, - META_ACTION_TITLEBAR_MINIMIZE, - META_ACTION_TITLEBAR_NONE, - META_ACTION_TITLEBAR_LOWER, - META_ACTION_TITLEBAR_MENU, - META_ACTION_TITLEBAR_LAST -} MetaActionTitlebar; - -typedef enum -{ META_FRAME_TYPE_NORMAL, META_FRAME_TYPE_DIALOG, META_FRAME_TYPE_MODAL_DIALOG, diff --git a/src/include/prefs.h b/src/include/prefs.h index a4193ffb..c9f31ec4 100644 --- a/src/include/prefs.h +++ b/src/include/prefs.h @@ -28,7 +28,9 @@ /* This header is a "common" one between the UI and core side */ #include "common.h" #include <pango/pango-font.h> +#include <gdesktop-enums.h> +/* Keep in sync with GSettings schemas! */ typedef enum { META_PREF_MOUSE_BUTTON_MODS, @@ -46,8 +48,6 @@ typedef enum META_PREF_APPLICATION_BASED, META_PREF_KEYBINDINGS, META_PREF_DISABLE_WORKAROUNDS, - META_PREF_COMMANDS, - META_PREF_TERMINAL_COMMAND, META_PREF_BUTTON_LAYOUT, META_PREF_WORKSPACE_NAMES, META_PREF_VISUAL_BELL, @@ -77,8 +77,8 @@ const char* meta_preference_to_string (MetaPreference pref); MetaVirtualModifier meta_prefs_get_mouse_button_mods (void); guint meta_prefs_get_mouse_button_resize (void); guint meta_prefs_get_mouse_button_menu (void); -MetaFocusMode meta_prefs_get_focus_mode (void); -MetaFocusNewWindows meta_prefs_get_focus_new_windows (void); +GDesktopFocusMode meta_prefs_get_focus_mode (void); +GDesktopFocusNewWindows meta_prefs_get_focus_new_windows (void); gboolean meta_prefs_get_raise_on_click (void); const char* meta_prefs_get_theme (void); /* returns NULL if GTK default should be used */ @@ -92,19 +92,18 @@ gboolean meta_prefs_get_reduced_resources (void); gboolean meta_prefs_get_gnome_accessibility (void); gboolean meta_prefs_get_gnome_animations (void); -const char* meta_prefs_get_command (int i); +const char* meta_prefs_get_screenshot_command (void); -char* meta_prefs_get_gconf_key_for_command (int i); +const char* meta_prefs_get_window_screenshot_command (void); const char* meta_prefs_get_terminal_command (void); -const char* meta_prefs_get_gconf_key_for_terminal_command (void); void meta_prefs_get_button_layout (MetaButtonLayout *button_layout); /* Double, right, middle click can be configured to any titlebar meta-action */ -MetaActionTitlebar meta_prefs_get_action_double_click_titlebar (void); -MetaActionTitlebar meta_prefs_get_action_middle_click_titlebar (void); -MetaActionTitlebar meta_prefs_get_action_right_click_titlebar (void); +GDesktopTitlebarAction meta_prefs_get_action_double_click_titlebar (void); +GDesktopTitlebarAction meta_prefs_get_action_middle_click_titlebar (void); +GDesktopTitlebarAction meta_prefs_get_action_right_click_titlebar (void); void meta_prefs_set_num_workspaces (int n_workspaces); @@ -165,18 +164,6 @@ typedef enum _MetaKeyBindingAction META_KEYBINDING_ACTION_SHOW_DESKTOP, META_KEYBINDING_ACTION_PANEL_MAIN_MENU, META_KEYBINDING_ACTION_PANEL_RUN_DIALOG, - META_KEYBINDING_ACTION_COMMAND_1, - META_KEYBINDING_ACTION_COMMAND_2, - META_KEYBINDING_ACTION_COMMAND_3, - META_KEYBINDING_ACTION_COMMAND_4, - META_KEYBINDING_ACTION_COMMAND_5, - META_KEYBINDING_ACTION_COMMAND_6, - META_KEYBINDING_ACTION_COMMAND_7, - META_KEYBINDING_ACTION_COMMAND_8, - META_KEYBINDING_ACTION_COMMAND_9, - META_KEYBINDING_ACTION_COMMAND_10, - META_KEYBINDING_ACTION_COMMAND_11, - META_KEYBINDING_ACTION_COMMAND_12 } MetaKeyBindingAction; typedef struct @@ -214,17 +201,8 @@ void meta_prefs_get_window_binding (const char *name, unsigned int *keysym, MetaVirtualModifier *modifiers); -typedef enum -{ - META_VISUAL_BELL_INVALID = 0, - META_VISUAL_BELL_FULLSCREEN_FLASH, - META_VISUAL_BELL_FRAME_FLASH - -} MetaVisualBellType; - -gboolean meta_prefs_get_visual_bell (void); gboolean meta_prefs_bell_is_audible (void); -MetaVisualBellType meta_prefs_get_visual_bell_type (void); +GDesktopVisualBellType meta_prefs_get_visual_bell_type (void); #endif |