compositor: move output assignment to update_transform
Move the call to assign an output from weston_surface_configure() to
weston_surface_update_transform().
As update_transform takes new geometry into use, it should also reassign
the output for the surface, but only if an output was already assigned.
Add explicit assing output calls to where we relied on
weston_surface_configure() unconditionally assigning the output.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
diff --git a/src/compositor.c b/src/compositor.c
index 3375558..507fcda 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -387,6 +387,10 @@
else
pixman_region32_init(&surface->transform.opaque);
+
+ if (surface->output)
+ weston_surface_assign_output(surface);
+
weston_compositor_schedule_repaint(surface->compositor);
}
@@ -503,16 +507,11 @@
weston_surface_configure(struct weston_surface *surface,
GLfloat x, GLfloat y, int width, int height)
{
- weston_surface_damage_below(surface);
-
surface->geometry.x = x;
surface->geometry.y = y;
surface->geometry.width = width;
surface->geometry.height = height;
surface->geometry.dirty = 1;
-
- weston_surface_assign_output(surface);
- weston_surface_damage(surface);
}
WL_EXPORT uint32_t
@@ -1060,6 +1059,7 @@
weston_surface_configure(surface, 0, 0, 8192, 8192);
weston_surface_set_color(surface, 0.0, 0.0, 0.0, 0.0);
wl_list_insert(&compositor->surface_list, &surface->link);
+ weston_surface_assign_output(surface);
compositor->fade.surface = surface;
}
@@ -1700,9 +1700,11 @@
return;
}
- if (!device->sprite->output)
+ if (!device->sprite->output) {
wl_list_insert(&compositor->surface_list,
&device->sprite->link);
+ weston_surface_assign_output(device->sprite);
+ }
buffer = buffer_resource->data;
device->hotspot_x = x;