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

compositor: Fix cow shaping on multi monitor setups

Browse Source 
XFixesCreateRegionFromWindow does not take the window's position into account,
which results into setting a wrong shape for windows not located on the
leftmost monitor.

Fix that by creating the region from the window's MetaRectangle.

https://bugzilla.gnome.org/show_bug.cgi?id=657869
This commit is contained in:
Adel Gadllah 2011-09-15 21:50:28 +02:00
parent d7f1b95349
commit 6923973c8a
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/compositor/compositor.c
View File

@ -606,22 +606,30 @@ meta_compositor_unmanage_screen (MetaCompositor *compositor,
/* /*
* Shapes the cow so that the given window is exposed, * Shapes the cow so that the given window is exposed,
* when xwin is None it clears the shape again * when metaWindow is NULL it clears the shape again
*/ */
static void static void
meta_shape_cow_for_window (MetaScreen *screen, meta_shape_cow_for_window (MetaScreen *screen,
Window xwin) MetaWindow *metaWindow)
{ {
MetaCompScreen *info = meta_screen_get_compositor_data (screen); MetaCompScreen *info = meta_screen_get_compositor_data (screen);
Display *xdisplay = meta_display_get_xdisplay (meta_screen_get_display (screen)); Display *xdisplay = meta_display_get_xdisplay (meta_screen_get_display (screen));
if (xwin == None) if (metaWindow == NULL)
XFixesSetWindowShapeRegion (xdisplay, info->output, ShapeBounding, 0, 0, None); XFixesSetWindowShapeRegion (xdisplay, info->output, ShapeBounding, 0, 0, None);
else else
{ {
XserverRegion output_region; XserverRegion output_region;
XRectangle screen_rect; XRectangle screen_rect, window_bounds;
int width, height; int width, height;
MetaRectangle rect;
meta_window_get_outer_rect (metaWindow, &rect);
window_bounds.x = rect.x;
window_bounds.y = rect.y;
window_bounds.width = rect.width;
window_bounds.height = rect.height;
meta_screen_get_size (screen, &width, &height); meta_screen_get_size (screen, &width, &height);
screen_rect.x = 0; screen_rect.x = 0;
@ -629,7 +637,8 @@ meta_shape_cow_for_window (MetaScreen *screen,
screen_rect.width = width; screen_rect.width = width;
screen_rect.height = height; screen_rect.height = height;
output_region = XFixesCreateRegionFromWindow (xdisplay, xwin, WindowRegionBounding); output_region = XFixesCreateRegion (xdisplay, &window_bounds, 1);
XFixesInvertRegion (xdisplay, output_region, &screen_rect, output_region); XFixesInvertRegion (xdisplay, output_region, &screen_rect, output_region);
XFixesSetWindowShapeRegion (xdisplay, info->output, ShapeBounding, 0, 0, output_region); XFixesSetWindowShapeRegion (xdisplay, info->output, ShapeBounding, 0, 0, output_region);
XFixesDestroyRegion (xdisplay, output_region); XFixesDestroyRegion (xdisplay, output_region);
@ -671,7 +680,7 @@ meta_compositor_remove_window (MetaCompositor *compositor,
{ {
meta_window_actor_set_redirected (window_actor, TRUE); meta_window_actor_set_redirected (window_actor, TRUE);
meta_shape_cow_for_window (meta_window_get_screen (meta_window_actor_get_meta_window (info->unredirected_window)), meta_shape_cow_for_window (meta_window_get_screen (meta_window_actor_get_meta_window (info->unredirected_window)),
None); NULL);
info->unredirected_window = NULL; info->unredirected_window = NULL;
} }
@ -1166,13 +1175,13 @@ pre_paint_windows (MetaCompScreen *info)
{ {
meta_window_actor_set_redirected (info->unredirected_window, TRUE); meta_window_actor_set_redirected (info->unredirected_window, TRUE);
meta_shape_cow_for_window (meta_window_get_screen (meta_window_actor_get_meta_window (info->unredirected_window)), meta_shape_cow_for_window (meta_window_get_screen (meta_window_actor_get_meta_window (info->unredirected_window)),
None); NULL);
} }
if (expected_unredirected_window != NULL) if (expected_unredirected_window != NULL)
{ {
meta_shape_cow_for_window (meta_window_get_screen (meta_window_actor_get_meta_window (top_window)), meta_shape_cow_for_window (meta_window_get_screen (meta_window_actor_get_meta_window (top_window)),
meta_window_actor_get_x_window (top_window)); meta_window_actor_get_meta_window (top_window));
meta_window_actor_set_redirected (top_window, FALSE); meta_window_actor_set_redirected (top_window, FALSE);
} }