[PATCH v4] compositor: call configure on surfaces with a null buffer too

Giulio Camuffo giuliocamuffo at gmail.com
Wed Feb 20 06:44:09 PST 2013


This way the shell can know when a surface has been unmapped by
checking the value returned by weston_surface_is_mapped(surface).
The configure handlers have now width and height parameters, so
they do not need anymore to check manually the buffer size.
If a surface's buffer is NULL the width and height passed to the
configure are both 0.
Configure is now only called after an attach. The variable
weston_surface.pending.newly_attached is set to 1 on attach, and
after the configure call is reset to 0.
---
 src/compositor.c   | 31 ++++++++++++++++++++++---------
 src/compositor.h   |  3 ++-
 src/shell.c        | 48 +++++++++++++++++++++++++++++-------------------
 src/tablet-shell.c |  8 ++------
 4 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/src/compositor.c b/src/compositor.c
index 64d0830..9d271b4 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -290,6 +290,7 @@ weston_surface_create(struct weston_compositor *compositor)
 	surface->pending.buffer_transform = surface->buffer_transform;
 	surface->output = NULL;
 	surface->plane = &compositor->primary_plane;
+	surface->pending.newly_attached = 0;
 
 	pixman_region32_init(&surface->damage);
 	pixman_region32_init(&surface->opaque);
@@ -1273,6 +1274,7 @@ surface_attach(struct wl_client *client,
 	surface->pending.sx = sx;
 	surface->pending.sy = sy;
 	surface->pending.buffer = buffer;
+	surface->pending.newly_attached = 1;
 	if (buffer) {
 		wl_signal_add(&buffer->resource.destroy_signal,
 			      &surface->pending.buffer_destroy_listener);
@@ -1391,6 +1393,8 @@ surface_commit(struct wl_client *client, struct wl_resource *resource)
 {
 	struct weston_surface *surface = resource->data;
 	pixman_region32_t opaque;
+	int buffer_width = 0;
+	int buffer_height = 0;
 
 	if (surface->pending.sx || surface->pending.sy ||
 	    (surface->pending.buffer &&
@@ -1404,11 +1408,18 @@ surface_commit(struct wl_client *client, struct wl_resource *resource)
 	if (surface->pending.buffer || surface->pending.remove_contents)
 		weston_surface_attach(surface, surface->pending.buffer);
 
-	if (surface->buffer_ref.buffer && surface->configure)
+	if (surface->buffer_ref.buffer) {
+		buffer_width = weston_surface_buffer_width(surface);
+		buffer_height = weston_surface_buffer_height(surface);
+	}
+
+	if (surface->configure && surface->pending.newly_attached)
 		surface->configure(surface, surface->pending.sx,
-				   surface->pending.sy);
+				   surface->pending.sy, buffer_width, buffer_height);
+
 	surface->pending.sx = 0;
 	surface->pending.sy = 0;
+	surface->pending.newly_attached = 0;
 
 	/* wl_surface.damage */
 	pixman_region32_union(&surface->damage, &surface->damage,
@@ -2144,11 +2155,14 @@ pointer_handle_sprite_destroy(struct wl_listener *listener, void *data)
 
 static void
 pointer_cursor_surface_configure(struct weston_surface *es,
-				 int32_t dx, int32_t dy)
+				 int32_t dx, int32_t dy, int32_t width, int32_t height)
 {
 	struct weston_seat *seat = es->private;
 	int x, y;
 
+	if (width == 0)
+		return;
+
 	assert(es == seat->sprite);
 
 	seat->hotspot_x -= dx;
@@ -2158,8 +2172,7 @@ pointer_cursor_surface_configure(struct weston_surface *es,
 	y = wl_fixed_to_int(seat->seat.pointer->y) - seat->hotspot_y;
 
 	weston_surface_configure(seat->sprite, x, y,
-				 es->buffer_ref.buffer->width,
-				 es->buffer_ref.buffer->height);
+				 width, height);
 
 	empty_region(&es->pending.input);
 
@@ -2226,7 +2239,8 @@ pointer_set_cursor(struct wl_client *client, struct wl_resource *resource,
 	seat->hotspot_y = y;
 
 	if (surface->buffer_ref.buffer)
-		pointer_cursor_surface_configure(surface, 0, 0);
+		pointer_cursor_surface_configure(surface, 0, 0, weston_surface_buffer_width(surface),
+								weston_surface_buffer_height(surface));
 }
 
 static const struct wl_pointer_interface pointer_interface = {
@@ -2604,14 +2618,13 @@ weston_seat_release(struct weston_seat *seat)
 }
 
 static void
-drag_surface_configure(struct weston_surface *es, int32_t sx, int32_t sy)
+drag_surface_configure(struct weston_surface *es, int32_t sx, int32_t sy, int32_t width, int32_t height)
 {
 	empty_region(&es->pending.input);
 
 	weston_surface_configure(es,
 				 es->geometry.x + sx, es->geometry.y + sy,
-				 es->buffer_ref.buffer->width,
-				 es->buffer_ref.buffer->height);
+				 width, height);
 }
 
 static int
diff --git a/src/compositor.h b/src/compositor.h
index fdde762..962a703 100644
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -460,6 +460,7 @@ struct weston_surface {
 	/* All the pending state, that wl_surface.commit will apply. */
 	struct {
 		/* wl_surface.attach */
+		int newly_attached;
 		int remove_contents;
 		struct wl_buffer *buffer;
 		struct wl_listener buffer_destroy_listener;
@@ -487,7 +488,7 @@ struct weston_surface {
 	 * a new buffer has been set up for this surface. The integer params
 	 * are the sx and sy paramerters supplied to surface::attach .
 	 */
-	void (*configure)(struct weston_surface *es, int32_t sx, int32_t sy);
+	void (*configure)(struct weston_surface *es, int32_t sx, int32_t sy, int32_t width, int32_t height);
 	void *private;
 };
 
diff --git a/src/shell.c b/src/shell.c
index af802a5..e355aa0 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -1627,7 +1627,7 @@ shell_surface_set_maximized(struct wl_client *client,
 }
 
 static void
-black_surface_configure(struct weston_surface *es, int32_t sx, int32_t sy);
+black_surface_configure(struct weston_surface *es, int32_t sx, int32_t sy, int32_t width, int32_t height);
 
 static struct weston_surface *
 create_black_surface(struct weston_compositor *ec,
@@ -2023,7 +2023,7 @@ shell_handle_surface_destroy(struct wl_listener *listener, void *data)
 }
 
 static void
-shell_surface_configure(struct weston_surface *, int32_t, int32_t);
+shell_surface_configure(struct weston_surface *, int32_t, int32_t, int32_t, int32_t);
 
 static struct shell_surface *
 get_shell_surface(struct weston_surface *surface)
@@ -2172,10 +2172,13 @@ terminate_screensaver(struct desktop_shell *shell)
 }
 
 static void
-configure_static_surface(struct weston_surface *es, struct weston_layer *layer)
+configure_static_surface(struct weston_surface *es, struct weston_layer *layer, int32_t width, int32_t height)
 {
 	struct weston_surface *s, *next;
 
+	if (width == 0)
+		return;
+
 	wl_list_for_each_safe(s, next, &layer->surface_list, layer_link) {
 		if (s->output == es->output && s != es) {
 			weston_surface_unmap(s);
@@ -2183,9 +2186,7 @@ configure_static_surface(struct weston_surface *es, struct weston_layer *layer)
 		}
 	}
 
-	weston_surface_configure(es, es->output->x, es->output->y,
-				 weston_surface_buffer_width(es),
-				 weston_surface_buffer_height(es));
+	weston_surface_configure(es, es->output->x, es->output->y, width, height);
 
 	if (wl_list_empty(&es->layer_link)) {
 		wl_list_insert(&layer->surface_list, &es->layer_link);
@@ -2194,11 +2195,11 @@ configure_static_surface(struct weston_surface *es, struct weston_layer *layer)
 }
 
 static void
-background_configure(struct weston_surface *es, int32_t sx, int32_t sy)
+background_configure(struct weston_surface *es, int32_t sx, int32_t sy, int32_t width, int32_t height)
 {
 	struct desktop_shell *shell = es->private;
 
-	configure_static_surface(es, &shell->background_layer);
+	configure_static_surface(es, &shell->background_layer, width, height);
 }
 
 static void
@@ -2227,11 +2228,11 @@ desktop_shell_set_background(struct wl_client *client,
 }
 
 static void
-panel_configure(struct weston_surface *es, int32_t sx, int32_t sy)
+panel_configure(struct weston_surface *es, int32_t sx, int32_t sy, int32_t width, int32_t height)
 {
 	struct desktop_shell *shell = es->private;
 
-	configure_static_surface(es, &shell->panel_layer);
+	configure_static_surface(es, &shell->panel_layer, width, height);
 }
 
 static void
@@ -2260,10 +2261,13 @@ desktop_shell_set_panel(struct wl_client *client,
 }
 
 static void
-lock_surface_configure(struct weston_surface *surface, int32_t sx, int32_t sy)
+lock_surface_configure(struct weston_surface *surface, int32_t sx, int32_t sy, int32_t width, int32_t height)
 {
 	struct desktop_shell *shell = surface->private;
 
+	if (width == 0)
+		return;
+
 	center_on_output(surface, get_default_output(shell->compositor));
 
 	if (!weston_surface_is_mapped(surface)) {
@@ -2718,7 +2722,7 @@ activate(struct desktop_shell *shell, struct weston_surface *es,
 
 /* no-op func for checking black surface */
 static void
-black_surface_configure(struct weston_surface *es, int32_t sx, int32_t sy)
+black_surface_configure(struct weston_surface *es, int32_t sx, int32_t sy, int32_t width, int32_t height)
 {
 }
 
@@ -3084,14 +3088,16 @@ configure(struct desktop_shell *shell, struct weston_surface *surface,
 }
 
 static void
-shell_surface_configure(struct weston_surface *es, int32_t sx, int32_t sy)
+shell_surface_configure(struct weston_surface *es, int32_t sx, int32_t sy, int32_t width, int32_t height)
 {
 	struct shell_surface *shsurf = get_shell_surface(es);
 	struct desktop_shell *shell = shsurf->shell;
-	int32_t width = weston_surface_buffer_width(es);
-	int32_t height = weston_surface_buffer_height(es);
+
 	int type_changed = 0;
 
+	if (width == 0)
+		return;
+
 	if (shsurf->next_type != SHELL_SURFACE_NONE &&
 	    shsurf->type != shsurf->next_type) {
 		set_surface_type(shsurf);
@@ -3204,10 +3210,13 @@ bind_desktop_shell(struct wl_client *client,
 }
 
 static void
-screensaver_configure(struct weston_surface *surface, int32_t sx, int32_t sy)
+screensaver_configure(struct weston_surface *surface, int32_t sx, int32_t sy, int32_t width, int32_t height)
 {
 	struct desktop_shell *shell = surface->private;
 
+	if (width == 0)
+		return;
+
 	/* XXX: starting weston-screensaver beforehand does not work */
 	if (!shell->locked)
 		return;
@@ -3275,13 +3284,14 @@ bind_screensaver(struct wl_client *client,
 }
 
 static void
-input_panel_configure(struct weston_surface *surface, int32_t sx, int32_t sy)
+input_panel_configure(struct weston_surface *surface, int32_t sx, int32_t sy, int32_t width, int32_t height)
 {
 	struct weston_mode *mode;
-	int32_t width = weston_surface_buffer_width(surface);
-	int32_t height = weston_surface_buffer_height(surface);
 	float x, y;
 
+	if (width == 0)
+		return;
+
 	if (!weston_surface_is_mapped(surface))
 		return;
 
diff --git a/src/tablet-shell.c b/src/tablet-shell.c
index 9e88e27..66b1a44 100644
--- a/src/tablet-shell.c
+++ b/src/tablet-shell.c
@@ -124,17 +124,13 @@ tablet_shell_set_state(struct tablet_shell *shell, int state)
 
 static void
 tablet_shell_surface_configure(struct weston_surface *surface,
-			       int32_t sx, int32_t sy)
+			       int32_t sx, int32_t sy, int32_t width, int32_t height)
 {
 	struct tablet_shell *shell = get_shell(surface->compositor);
-	int32_t width, height;
 
-	if (weston_surface_is_mapped(surface))
+	if (weston_surface_is_mapped(surface) || width == 0)
 		return;
 
-	width = surface->buffer_ref.buffer->width;
-	height = surface->buffer_ref.buffer->height;
-
 	weston_surface_configure(surface, 0, 0, width, height);
 
 	if (surface == shell->lockscreen_surface) {
-- 
1.8.1.3



More information about the wayland-devel mailing list