diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/all-keybindings.h | 5 | ||||
| -rw-r--r-- | src/include/common.h | 10 | ||||
| -rw-r--r-- | src/include/display.h | 3 | ||||
| -rw-r--r-- | src/include/prefs.h | 5 | ||||
| -rw-r--r-- | src/include/ui.h | 17 |
5 files changed, 19 insertions, 21 deletions
diff --git a/src/include/all-keybindings.h b/src/include/all-keybindings.h index 50532c4b..a26720a1 100644 --- a/src/include/all-keybindings.h +++ b/src/include/all-keybindings.h @@ -252,6 +252,11 @@ keybind (maximize-vertically, handle_maximize_vertically, 0, keybind (maximize-horizontally, handle_maximize_horizontally, 0, BINDING_PER_WINDOW) +keybind (tile-to-side-e, handle_toggle_tiled, META_TILE_RIGHT, + BINDING_PER_WINDOW) +keybind (tile-to-side-w, handle_toggle_tiled, META_TILE_LEFT, + 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, diff --git a/src/include/common.h b/src/include/common.h index 69755e24..74137967 100644 --- a/src/include/common.h +++ b/src/include/common.h @@ -312,4 +312,14 @@ struct _MetaButtonLayout (ycoord) >= (rect).y && \ (ycoord) < ((rect).y + (rect).height)) +/* + * Placement mode + */ +typedef enum +{ + META_PLACEMENT_MODE_AUTOMATIC, + META_PLACEMENT_MODE_POINTER, + META_PLACEMENT_MODE_MANUAL +} MetaPlacementMode; + #endif diff --git a/src/include/display.h b/src/include/display.h index a8dc49eb..5b0e5642 100644 --- a/src/include/display.h +++ b/src/include/display.h @@ -29,9 +29,6 @@ #define meta_XFree(p) do { if ((p)) XFree ((p)); } while (0) -void meta_display_get_compositor_version (MetaDisplay *display, - int *major, - int *minor); Display *meta_display_get_xdisplay (MetaDisplay *display); MetaCompositor *meta_display_get_compositor (MetaDisplay *display); GSList *meta_display_get_screens (MetaDisplay *display); diff --git a/src/include/prefs.h b/src/include/prefs.h index d804207c..a2fbbf55 100644 --- a/src/include/prefs.h +++ b/src/include/prefs.h @@ -64,7 +64,8 @@ typedef enum META_PREF_RESIZE_WITH_RIGHT_BUTTON, META_PREF_CENTER_NEW_WINDOWS, META_PREF_SIDE_BY_SIDE_TILING, - META_PREF_FORCE_FULLSCREEN + META_PREF_FORCE_FULLSCREEN, + META_PREF_PLACEMENT_MODE } MetaPreference; typedef void (* MetaPrefsChangedFunc) (MetaPreference pref, @@ -112,6 +113,8 @@ 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); +MetaPlacementMode meta_prefs_get_placement_mode (void); + void meta_prefs_set_num_workspaces (int n_workspaces); const char* meta_prefs_get_workspace_name (int i); diff --git a/src/include/ui.h b/src/include/ui.h index e7ce90aa..70987d33 100644 --- a/src/include/ui.h +++ b/src/include/ui.h @@ -134,20 +134,6 @@ void meta_ui_window_menu_popup (MetaWindowMenu *menu, guint32 timestamp); void meta_ui_window_menu_free (MetaWindowMenu *menu); -#if !GTK_CHECK_VERSION (3, 0, 0) -MetaImageWindow* meta_image_window_new (Display *xdisplay, - int screen_number, - int max_width, - int max_height); -void meta_image_window_free (MetaImageWindow *iw); -void meta_image_window_set_showing (MetaImageWindow *iw, - gboolean showing); -void meta_image_window_set (MetaImageWindow *iw, - GdkPixbuf *pixbuf, - int x, - int y); -#endif - GdkPixbuf* meta_gdk_pixbuf_get_from_pixmap (GdkPixbuf *dest, Pixmap xpixmap, int src_x, @@ -170,9 +156,6 @@ GdkPixbuf* meta_ui_get_default_mini_icon (MetaUI *ui); gboolean meta_ui_window_should_not_cause_focus (Display *xdisplay, Window xwindow); -char* meta_text_property_to_utf8 (Display *xdisplay, - const XTextProperty *prop); - void meta_ui_set_current_theme (const char *name, gboolean force_reload); gboolean meta_ui_have_a_theme (void); |