isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-29 19:40:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

window: Change ordering of functions to match wayland branch

Browse Source 
... and also change some unused public functions to be statics.
This commit is contained in:
Jasper St. Pierre 2014-02-26 20:22:20 -05:00
parent 36009cbae1
commit be352c2bf1
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -682,17 +682,10 @@ void meta_window_compute_tile_match (MetaWindow *window);
gboolean meta_window_updates_are_frozen (MetaWindow *window); gboolean meta_window_updates_are_frozen (MetaWindow *window);
void meta_window_set_opaque_region (MetaWindow *window,
cairo_region_t *region);
void meta_window_update_opaque_region_x11 (MetaWindow *window); void meta_window_update_opaque_region_x11 (MetaWindow *window);
void meta_window_set_input_region (MetaWindow *window,
cairo_region_t *region);
void meta_window_update_input_region_x11 (MetaWindow *window); void meta_window_update_input_region_x11 (MetaWindow *window);
void meta_window_set_shape_region (MetaWindow *window,
cairo_region_t *region);
void meta_window_update_shape_region_x11 (MetaWindow *window); void meta_window_update_shape_region_x11 (MetaWindow *window);
void meta_window_set_opacity (MetaWindow *window, void meta_window_set_opacity (MetaWindow *window,
guint opacity); guint opacity);

22
src/core/window.c
View File

@ -7667,7 +7667,7 @@ meta_window_update_net_wm_type (MetaWindow *window)
meta_window_recalc_window_type (window); meta_window_recalc_window_type (window);
} }
void static void
meta_window_set_opaque_region (MetaWindow *window, meta_window_set_opaque_region (MetaWindow *window,
cairo_region_t *region) cairo_region_t *region)
{ {
@ -7753,17 +7753,17 @@ region_create_from_x_rectangles (const XRectangle *rects,
return cairo_region_create_rectangles (cairo_rects, n_rects); return cairo_region_create_rectangles (cairo_rects, n_rects);
} }
void static void
meta_window_set_shape_region (MetaWindow *window, meta_window_set_input_region (MetaWindow *window,
cairo_region_t *region) cairo_region_t *region)
{ {
g_clear_pointer (&window->shape_region, cairo_region_destroy); g_clear_pointer (&window->input_region, cairo_region_destroy);
if (region != NULL) if (region != NULL)
window->shape_region = cairo_region_reference (region); window->input_region = cairo_region_reference (region);
if (window->display->compositor) if (window->display->compositor)
meta_compositor_update_shape_region (window->display->compositor, window); meta_compositor_update_input_region (window->display->compositor, window);
} }
void void
@ -7839,17 +7839,17 @@ meta_window_update_input_region_x11 (MetaWindow *window)
cairo_region_destroy (region); cairo_region_destroy (region);
} }
void static void
meta_window_set_input_region (MetaWindow *window, meta_window_set_shape_region (MetaWindow *window,
cairo_region_t *region) cairo_region_t *region)
{ {
g_clear_pointer (&window->input_region, cairo_region_destroy); g_clear_pointer (&window->shape_region, cairo_region_destroy);
if (region != NULL) if (region != NULL)
window->input_region = cairo_region_reference (region); window->shape_region = cairo_region_reference (region);
if (window->display->compositor) if (window->display->compositor)
meta_compositor_update_input_region (window->display->compositor, window); meta_compositor_update_shape_region (window->display->compositor, window);
} }
void void