commit 45f3e405c6e556f50eeeb319d2191b8a4aa61796
author Pekka Paalanen <ppaalanen@gmail.com> Thu Jan 26 11:34:16 2012 +0200
committer Pekka Paalanen <ppaalanen@gmail.com> Fri Jan 27 16:15:02 2012 +0200
tree e0d9435b1a75581a40176a05a9e6d3752f3ffa97
parent 3bfcd4d907870e063a36bdb776f0d78a8469070a

compositor: weston_surface_assign_output() to use bounding box

Use the bounding box to compute an approximation of which output
contains most of the surface.

Move the region32 init outside the loop, and fini it, too.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>

src/compositor.c

diff --git a/src/compositor.c b/src/compositor.c
index 050227f..b8ccf6d 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1037,14 +1037,14 @@
 	uint32_t max, area;
 	pixman_box32_t *e;
 
+	weston_surface_update_transform(es);
+
 	new_output = NULL;
 	max = 0;
+	pixman_region32_init(&region);
 	wl_list_for_each(output, &ec->output_list, link) {
-		pixman_region32_init_rect(&region,
-					  es->geometry.x, es->geometry.y,
-					  es->geometry.width,
-					  es->geometry.height);
-		pixman_region32_intersect(&region, &region, &output->region);
+		pixman_region32_intersect(&region, &es->transform.boundingbox,
+					  &output->region);
 
 		e = pixman_region32_extents(&region);
 		area = (e->x2 - e->x1) * (e->y2 - e->y1);
@@ -1054,6 +1054,7 @@
 			max = area;
 		}
 	}
+	pixman_region32_fini(&region);
 
 	es->output = new_output;
 	if (!wl_list_empty(&es->frame_callback_list)) {