brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Make work_area calculation funcs public and introspectible"

Browse Source 
This reverts commit d8058138ab.
This commit is contained in:
Jasper St. Pierre 2013-01-27 23:08:17 -05:00
parent f37dd25e92
commit 6f873be7fa
6 changed files with 16 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/window-private.h
View File

@ -607,6 +607,14 @@ void meta_window_handle_mouse_grab_op_event (MetaWindow *window,
GList* meta_window_get_workspaces (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, void meta_window_get_current_tile_area (MetaWindow *window,
MetaRectangle *tile_area); MetaRectangle *tile_area);

23
src/core/window.c
View File

@ -9482,13 +9482,6 @@ get_work_area_monitor (MetaWindow *window,
area->x, area->y, area->width, area->height); 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 void
meta_window_get_work_area_current_monitor (MetaWindow *window, meta_window_get_work_area_current_monitor (MetaWindow *window,
MetaRectangle *area) MetaRectangle *area)
@ -9502,15 +9495,6 @@ meta_window_get_work_area_current_monitor (MetaWindow *window,
area); 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 void
meta_window_get_work_area_for_monitor (MetaWindow *window, meta_window_get_work_area_for_monitor (MetaWindow *window,
int which_monitor, int which_monitor,
@ -9523,13 +9507,6 @@ meta_window_get_work_area_for_monitor (MetaWindow *window,
which_monitor); 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 void
meta_window_get_work_area_all_monitors (MetaWindow *window, meta_window_get_work_area_all_monitors (MetaWindow *window,
MetaRectangle *area) MetaRectangle *area)

8
src/core/workspace-private.h
View File

@ -86,6 +86,10 @@ void meta_workspace_relocate_windows (MetaWorkspace *workspace,
void meta_workspace_invalidate_work_area (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_onscreen_region (MetaWorkspace *workspace);
GList* meta_workspace_get_onmonitor_region (MetaWorkspace *workspace, GList* meta_workspace_get_onmonitor_region (MetaWorkspace *workspace,
int which_monitor); int which_monitor);
@ -97,3 +101,7 @@ void meta_workspace_focus_default_window (MetaWorkspace *workspace,
const char* meta_workspace_get_name (MetaWorkspace *workspace); const char* meta_workspace_get_name (MetaWorkspace *workspace);
#endif #endif

9
src/core/workspace.c
View File

@ -1043,15 +1043,6 @@ meta_workspace_set_builtin_struts (MetaWorkspace *workspace,
meta_workspace_invalidate_work_area (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 void
meta_workspace_get_work_area_for_monitor (MetaWorkspace *workspace, meta_workspace_get_work_area_for_monitor (MetaWorkspace *workspace,
int which_monitor, int which_monitor,

8
src/meta/window.h
View File

@ -197,14 +197,6 @@ void meta_window_focus (MetaWindow *window,
void meta_window_check_alive (MetaWindow *window, void meta_window_check_alive (MetaWindow *window,
guint32 timestamp); 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, void meta_window_begin_grab_op (MetaWindow *window,
MetaGrabOp op, MetaGrabOp op,
gboolean frame_action, gboolean frame_action,

3
src/meta/workspace.h
View File

@ -52,9 +52,6 @@ GType meta_workspace_get_type (void);
int meta_workspace_index (MetaWorkspace *workspace); int meta_workspace_index (MetaWorkspace *workspace);
MetaScreen *meta_workspace_get_screen (MetaWorkspace *workspace); MetaScreen *meta_workspace_get_screen (MetaWorkspace *workspace);
GList* meta_workspace_list_windows (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, void meta_workspace_get_work_area_all_monitors (MetaWorkspace *workspace,
MetaRectangle *area); MetaRectangle *area);
void meta_workspace_activate (MetaWorkspace *workspace, guint32 timestamp); void meta_workspace_activate (MetaWorkspace *workspace, guint32 timestamp);