From 97872e70a546bc233e44513e05df96ff0d64d6be Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Tue, 18 Mar 2014 17:34:07 -0400 Subject: [PATCH] compositor: Fix variable name style in meta_shape_cow_for_window This has bugged me forever... --- src/compositor/compositor.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c index 2ce2e10bb..047e351e4 100644 --- a/src/compositor/compositor.c +++ b/src/compositor/compositor.c @@ -667,18 +667,25 @@ meta_compositor_unmanage_screen (MetaCompositor *compositor, } } -/* - * Shapes the cow so that the given window is exposed, - * when metaWindow is NULL it clears the shape again +/** + * meta_shape_cow_for_window: + * @screen: A #MetaScreen + * @window: (allow-none): A #MetaWindow to shape the COW for + * + * Sets an bounding shape on the COW so that the given window + * is exposed. If @window is %NULL it clears the shape again. + * + * Used so we can unredirect windows, by shaping away the part + * of the COW, letting the raw window be seen through below. */ static void meta_shape_cow_for_window (MetaScreen *screen, - MetaWindow *metaWindow) + MetaWindow *window) { MetaCompScreen *info = meta_screen_get_compositor_data (screen); Display *xdisplay = meta_display_get_xdisplay (meta_screen_get_display (screen)); - if (metaWindow == NULL) + if (window == NULL) XFixesSetWindowShapeRegion (xdisplay, info->output, ShapeBounding, 0, 0, None); else { @@ -687,7 +694,7 @@ meta_shape_cow_for_window (MetaScreen *screen, int width, height; MetaRectangle rect; - meta_window_get_frame_rect (metaWindow, &rect); + meta_window_get_frame_rect (window, &rect); window_bounds.x = rect.x; window_bounds.y = rect.y;