diff --git a/src/core/window-private.h b/src/core/window-private.h index becfef5d6..f4f94b8aa 100644 --- a/src/core/window-private.h +++ b/src/core/window-private.h @@ -607,6 +607,14 @@ void meta_window_handle_mouse_grab_op_event (MetaWindow *window, GList* meta_window_get_workspaces (MetaWindow *window); +void meta_window_get_work_area_current_monitor (MetaWindow *window, + MetaRectangle *area); +void meta_window_get_work_area_for_monitor (MetaWindow *window, + int which_monitor, + MetaRectangle *area); +void meta_window_get_work_area_all_monitors (MetaWindow *window, + MetaRectangle *area); + void meta_window_get_current_tile_area (MetaWindow *window, MetaRectangle *tile_area); diff --git a/src/core/window.c b/src/core/window.c index e5023e4a4..9820d8d02 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -9482,13 +9482,6 @@ get_work_area_monitor (MetaWindow *window, area->x, area->y, area->width, area->height); } -/** - * meta_window_get_work_area_current_monitor: - * @window: a #MetaWindow - * @area: (out): a location to store the work area - * - * Get the work area for the monitor @window is currently on. - */ void meta_window_get_work_area_current_monitor (MetaWindow *window, MetaRectangle *area) @@ -9502,15 +9495,6 @@ meta_window_get_work_area_current_monitor (MetaWindow *window, area); } -/** - * meta_window_get_work_area_for_monitor: - * @window: a #MetaWindow - * @which_monitor: a moniotr to get the work area for - * @area: (out): a location to store the work area - * - * Get the work area for @window, given the monitor index - * @which_monitor. - */ void meta_window_get_work_area_for_monitor (MetaWindow *window, int which_monitor, @@ -9523,13 +9507,6 @@ meta_window_get_work_area_for_monitor (MetaWindow *window, which_monitor); } -/** - * meta_window_get_work_area_all_monitors: - * @window: a #MetaWindow - * @area: (out): a location to store the work area - * - * Get the work area for all monitors for @window. - */ void meta_window_get_work_area_all_monitors (MetaWindow *window, MetaRectangle *area) diff --git a/src/core/workspace-private.h b/src/core/workspace-private.h index 4e94fa052..78c900b04 100644 --- a/src/core/workspace-private.h +++ b/src/core/workspace-private.h @@ -86,6 +86,10 @@ void meta_workspace_relocate_windows (MetaWorkspace *workspace, void meta_workspace_invalidate_work_area (MetaWorkspace *workspace); + +void meta_workspace_get_work_area_for_monitor (MetaWorkspace *workspace, + int which_monitor, + MetaRectangle *area); GList* meta_workspace_get_onscreen_region (MetaWorkspace *workspace); GList* meta_workspace_get_onmonitor_region (MetaWorkspace *workspace, int which_monitor); @@ -97,3 +101,7 @@ void meta_workspace_focus_default_window (MetaWorkspace *workspace, const char* meta_workspace_get_name (MetaWorkspace *workspace); #endif + + + + diff --git a/src/core/workspace.c b/src/core/workspace.c index 0e2d1bb11..62a04d2c6 100644 --- a/src/core/workspace.c +++ b/src/core/workspace.c @@ -1043,15 +1043,6 @@ meta_workspace_set_builtin_struts (MetaWorkspace *workspace, meta_workspace_invalidate_work_area (workspace); } -/** - * meta_workspace_get_work_area_for_monitor: - * @workspace: a #MetaWorkspace - * @which_monitor: a monitor index - * @area: (out): location to store the work area - * - * Stores the work area for @which_monitor on @workspace - * in @area. - */ void meta_workspace_get_work_area_for_monitor (MetaWorkspace *workspace, int which_monitor, diff --git a/src/meta/window.h b/src/meta/window.h index 87368c081..d968ecca6 100644 --- a/src/meta/window.h +++ b/src/meta/window.h @@ -197,14 +197,6 @@ void meta_window_focus (MetaWindow *window, void meta_window_check_alive (MetaWindow *window, guint32 timestamp); -void meta_window_get_work_area_current_monitor (MetaWindow *window, - MetaRectangle *area); -void meta_window_get_work_area_for_monitor (MetaWindow *window, - int which_monitor, - MetaRectangle *area); -void meta_window_get_work_area_all_monitors (MetaWindow *window, - MetaRectangle *area); - void meta_window_begin_grab_op (MetaWindow *window, MetaGrabOp op, gboolean frame_action, diff --git a/src/meta/workspace.h b/src/meta/workspace.h index 66efe0fff..5dac43ed5 100644 --- a/src/meta/workspace.h +++ b/src/meta/workspace.h @@ -52,9 +52,6 @@ GType meta_workspace_get_type (void); int meta_workspace_index (MetaWorkspace *workspace); MetaScreen *meta_workspace_get_screen (MetaWorkspace *workspace); GList* meta_workspace_list_windows (MetaWorkspace *workspace); -void meta_workspace_get_work_area_for_monitor (MetaWorkspace *workspace, - int which_monitor, - MetaRectangle *area); void meta_workspace_get_work_area_all_monitors (MetaWorkspace *workspace, MetaRectangle *area); void meta_workspace_activate (MetaWorkspace *workspace, guint32 timestamp);