diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/all-keybindings.h | 1 | ||||
| -rw-r--r-- | src/include/common.h | 14 | ||||
| -rw-r--r-- | src/include/frame.h | 1 | ||||
| -rw-r--r-- | src/include/prefs.h | 8 |
4 files changed, 15 insertions, 9 deletions
diff --git a/src/include/all-keybindings.h b/src/include/all-keybindings.h index 992d077f..02452878 100644 --- a/src/include/all-keybindings.h +++ b/src/include/all-keybindings.h @@ -194,6 +194,7 @@ keybind (run-command-32, handle_run_command, 31, 0) keybind (run-command-screenshot, handle_run_command, 32, 0) keybind (run-command-window-screenshot, handle_run_command, 33, 0) +keybind (run-command-area-screenshot, handle_run_command, 34, 0) keybind (run-command-terminal, handle_run_terminal, 0, 0) keybind (rename-workspace, handle_rename_workspace, 0, 0) diff --git a/src/include/common.h b/src/include/common.h index 031274f6..a0dfb69c 100644 --- a/src/include/common.h +++ b/src/include/common.h @@ -310,15 +310,11 @@ struct _MetaButtonLayout typedef struct _MetaFrameBorders MetaFrameBorders; struct _MetaFrameBorders { - /* The frame border is made up of two pieces - an inner visible portion - * and an outer portion that is invisible but responds to events. - */ - GtkBorder visible; - GtkBorder invisible; - - /* For convenience, we have a "total" border which is equal to the sum - * of the two borders above. */ - GtkBorder total; + GtkBorder visible; /* Visible window frame decoration */ + GtkBorder shadow; /* Extra size needed for shadow */ + GtkBorder resize; /* Extra size used for resize cursor area */ + GtkBorder invisible; /* Max of shadow and resize borders */ + GtkBorder total; /* Sum of visible and invisible borders */ }; /* sets all dimensions to zero */ diff --git a/src/include/frame.h b/src/include/frame.h index 97314d4b..2deba88b 100644 --- a/src/include/frame.h +++ b/src/include/frame.h @@ -30,5 +30,6 @@ Window meta_frame_get_xwindow (MetaFrame *frame); void meta_frame_calc_borders (MetaFrame *frame, MetaFrameBorders *borders); +void meta_frame_clear_cached_borders (MetaFrame *frame); #endif diff --git a/src/include/prefs.h b/src/include/prefs.h index e34f1b14..1170e8e8 100644 --- a/src/include/prefs.h +++ b/src/include/prefs.h @@ -29,6 +29,12 @@ #include "common.h" #include <pango/pango-font.h> +#define MAX_COMMANDS (32 + NUM_EXTRA_COMMANDS) +#define NUM_EXTRA_COMMANDS 3 +#define SCREENSHOT_COMMAND_IDX (MAX_COMMANDS - 3) +#define WIN_SCREENSHOT_COMMAND_IDX (MAX_COMMANDS - 2) +#define AREA_SCREENSHOT_COMMAND_IDX (MAX_COMMANDS - 1) + typedef enum { META_PREF_MOUSE_BUTTON_MODS, @@ -46,6 +52,7 @@ typedef enum META_PREF_THEME, META_PREF_TITLEBAR_FONT, META_PREF_NUM_WORKSPACES, + META_PREF_DYNAMIC_WORKSPACES, META_PREF_WRAP_STYLE, META_PREF_APPLICATION_BASED, META_PREF_KEYBINDINGS, @@ -101,6 +108,7 @@ const char* meta_prefs_get_theme (void); /* returns NULL if GTK default should be used */ const PangoFontDescription* meta_prefs_get_titlebar_font (void); int meta_prefs_get_num_workspaces (void); +gboolean meta_prefs_get_dynamic_workspaces (void); gboolean meta_prefs_get_application_based (void); gboolean meta_prefs_get_disable_workarounds (void); gboolean meta_prefs_get_auto_raise (void); |