compositor, shell: add and use weston_surface_set_position()
Another shorthand like weston_surface_configure().
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
diff --git a/src/shell.c b/src/shell.c
index f67a894..66c4f01 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -346,9 +346,9 @@
{
switch (surface->type) {
case SHELL_SURFACE_FULLSCREEN:
- surface->surface->geometry.x = surface->saved_x;
- surface->surface->geometry.y = surface->saved_y;
- surface->surface->geometry.dirty = 1;
+ weston_surface_set_position(surface->surface,
+ surface->saved_x,
+ surface->saved_y);
surface->surface->fullscreen_output = NULL;
break;
case SHELL_SURFACE_PANEL:
@@ -402,10 +402,8 @@
/* assign to parents output */
es->output = pes->output;
-
- es->geometry.x = pes->geometry.x + x;
- es->geometry.y = pes->geometry.y + y;
- es->geometry.dirty = 1;
+ weston_surface_set_position(es, pes->geometry.x + x,
+ pes->geometry.y + y);
shsurf->type = SHELL_SURFACE_TRANSIENT;
}
@@ -436,9 +434,9 @@
shsurf->saved_x = es->geometry.x;
shsurf->saved_y = es->geometry.y;
- es->geometry.x = (output->current->width - es->geometry.width) / 2;
- es->geometry.y = (output->current->height - es->geometry.height) / 2;
- es->geometry.dirty = 1;
+ weston_surface_set_position(es,
+ (output->current->width - es->geometry.width) / 2,
+ (output->current->height - es->geometry.height) / 2);
es->fullscreen_output = output;
shsurf->type = SHELL_SURFACE_FULLSCREEN;
}
@@ -533,9 +531,7 @@
}
wl_list_insert(es->geometry.transformation_list.prev,
&shsurf->popup.parent_transform.link);
- es->geometry.x = shsurf->popup.x;
- es->geometry.y = shsurf->popup.y;
- es->geometry.dirty = 1;
+ weston_surface_set_position(es, shsurf->popup.x, shsurf->popup.y);
shsurf->popup.grab.input_device = device;
shsurf->popup.time = device->grab_time;
@@ -747,9 +743,8 @@
wl_list_insert(&shell->backgrounds, &shsurf->link);
- surface->geometry.x = shsurf->output->x;
- surface->geometry.y = shsurf->output->y;
- surface->geometry.dirty = 1;
+ weston_surface_set_position(surface, shsurf->output->x,
+ shsurf->output->y);
wl_resource_post_event(resource,
DESKTOP_SHELL_CONFIGURE,
@@ -786,9 +781,8 @@
wl_list_insert(&shell->panels, &shsurf->link);
- surface->geometry.x = shsurf->output->x;
- surface->geometry.y = shsurf->output->y;
- surface->geometry.dirty = 1;
+ weston_surface_set_position(surface, shsurf->output->x,
+ shsurf->output->y);
wl_resource_post_event(resource,
DESKTOP_SHELL_CONFIGURE,
@@ -1266,12 +1260,10 @@
center_on_output(struct weston_surface *surface, struct weston_output *output)
{
struct weston_mode *mode = output->current;
+ GLfloat x = (mode->width - surface->geometry.width) / 2;
+ GLfloat y = (mode->height - surface->geometry.height) / 2;
- surface->geometry.x =
- output->x + (mode->width - surface->geometry.width) / 2;
- surface->geometry.y =
- output->y + (mode->height - surface->geometry.height) / 2;
- surface->geometry.dirty = 1;
+ weston_surface_set_position(surface, output->x + x, output->y + y);
}
static void
@@ -1304,8 +1296,8 @@
/* initial positioning, see also configure() */
switch (surface_type) {
case SHELL_SURFACE_TOPLEVEL:
- surface->geometry.x = 10 + random() % 400;
- surface->geometry.y = 10 + random() % 400;
+ weston_surface_set_position(surface, 10 + random() % 400,
+ 10 + random() % 400);
break;
case SHELL_SURFACE_SCREENSAVER:
case SHELL_SURFACE_FULLSCREEN: