commit 068ae944db2975e2d5001c08e981e420871af1bd
author Pekka Paalanen <ppaalanen@gmail.com> Mon Nov 28 14:11:15 2011 +0200
committer Kristian Høgsberg <krh@bitplanet.net> Sun Dec 04 14:54:34 2011 -0500
tree 0d61740dd8098da3105595a139114c5043636aef
parent 9d1613eb4a183c0e412c2f920d25e98ea964f48c

desktop-shell: update protocol and client to wl_shell_surface

Change desktop-shell protocol to use wl_shell_surface instead of
wl_surface.

Adapt the desktop-shell client and the shell plugin.

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

compositor/shell.c

diff --git a/compositor/shell.c b/compositor/shell.c
index 11907b3..ffa21b4 100644
--- a/compositor/shell.c
+++ b/compositor/shell.c
@@ -36,6 +36,8 @@
 #include "compositor.h"
 #include "desktop-shell-server-protocol.h"
 
+struct shell_surface;
+
 struct wl_shell {
 	struct wlsc_compositor *compositor;
 	struct wlsc_shell shell;
@@ -49,7 +51,7 @@
 	bool locked;
 	bool prepare_event_sent;
 
-	struct wlsc_surface *lock_surface;
+	struct shell_surface *lock_surface;
 	struct wl_listener lock_surface_listener;
 	struct wl_list hidden_surface_list;
 
@@ -436,7 +438,8 @@
 			     struct wl_resource *surface_resource)
 {
 	struct wl_shell *shell = resource->data;
-	struct wlsc_surface *surface = surface_resource->data;
+	struct shell_surface *shsurf = surface_resource->data;
+	struct wlsc_surface *surface = shsurf->surface;
 	struct shell_surface *priv;
 
 	wl_list_for_each(priv, &shell->backgrounds, link) {
@@ -448,20 +451,19 @@
 		}
 	}
 
-	priv = get_shell_surface(surface);
-	priv->type = SHELL_SURFACE_BACKGROUND;
-	priv->output = output_resource->data;
+	shsurf->type = SHELL_SURFACE_BACKGROUND;
+	shsurf->output = output_resource->data;
 
-	wl_list_insert(&shell->backgrounds, &priv->link);
+	wl_list_insert(&shell->backgrounds, &shsurf->link);
 
-	surface->x = priv->output->x;
-	surface->y = priv->output->y;
+	surface->x = shsurf->output->x;
+	surface->y = shsurf->output->y;
 
 	wl_resource_post_event(resource,
 			       DESKTOP_SHELL_CONFIGURE,
-			       wlsc_compositor_get_time(), 0, surface,
-			       priv->output->current->width,
-			       priv->output->current->height);
+			       wlsc_compositor_get_time(), 0, surface_resource,
+			       shsurf->output->current->width,
+			       shsurf->output->current->height);
 }
 
 static void
@@ -471,7 +473,8 @@
 			struct wl_resource *surface_resource)
 {
 	struct wl_shell *shell = resource->data;
-	struct wlsc_surface *surface = surface_resource->data;
+	struct shell_surface *shsurf = surface_resource->data;
+	struct wlsc_surface *surface = shsurf->surface;
 	struct shell_surface *priv;
 
 	wl_list_for_each(priv, &shell->panels, link) {
@@ -483,20 +486,19 @@
 		}
 	}
 
-	priv = get_shell_surface(surface);
-	priv->type = SHELL_SURFACE_PANEL;
-	priv->output = output_resource->data;
+	shsurf->type = SHELL_SURFACE_PANEL;
+	shsurf->output = output_resource->data;
 
-	wl_list_insert(&shell->panels, &priv->link);
+	wl_list_insert(&shell->panels, &shsurf->link);
 
-	surface->x = priv->output->x;
-	surface->y = priv->output->y;
+	surface->x = shsurf->output->x;
+	surface->y = shsurf->output->y;
 
 	wl_resource_post_event(resource,
 			       DESKTOP_SHELL_CONFIGURE,
 			       wlsc_compositor_get_time(), 0, surface_resource,
-			       priv->output->current->width,
-			       priv->output->current->height);
+			       shsurf->output->current->width,
+			       shsurf->output->current->height);
 }
 
 static void
@@ -516,7 +518,6 @@
 			       struct wl_resource *surface_resource)
 {
 	struct wl_shell *shell = resource->data;
-	struct shell_surface *priv;
 
 	shell->prepare_event_sent = false;
 
@@ -529,8 +530,7 @@
 	wl_list_insert(&surface_resource->destroy_listener_list,
 		       &shell->lock_surface_listener.link);
 
-	priv = get_shell_surface(shell->lock_surface);
-	priv->type = SHELL_SURFACE_LOCK;
+	shell->lock_surface->type = SHELL_SURFACE_LOCK;
 }
 
 static void