xdg_toplevel_v6: Use toplevel for user data

Change-Id: I5445632e0e56b3fb1273fab90edde85e43649392

diff --git a/src/xdg_shell_v6/xdg_toplevel_v6.c b/src/xdg_shell_v6/xdg_toplevel_v6.c
index dc3ca87..29cb187 100644 (file)
--- a/src/xdg_shell_v6/xdg_toplevel_v6.c
+++ b/src/xdg_shell_v6/xdg_toplevel_v6.c
@@ -99,7 +99,7 @@ create_xdg_toplevel_v6(struct ds_xdg_surface_v6 *surface, uint32_t id)
     }
 
     wl_resource_set_implementation(surface->toplevel->resource,
-            &xdg_toplevel_v6_impl, surface,
+            &xdg_toplevel_v6_impl, surface->toplevel,
             xdg_toplevel_v6_handle_resource_destroy);
 
     surface->role = DS_XDG_SURFACE_V6_ROLE_TOPLEVEL;
@@ -205,43 +205,42 @@ static void
 xdg_toplevel_v6_handle_set_title(struct wl_client *client,
         struct wl_resource *resource, const char *title)
 {
-    struct ds_xdg_surface_v6 *surface;
+    struct ds_xdg_toplevel_v6 *toplevel;
     char *tmp;
 
-    surface = wl_resource_get_user_data(resource);
+    toplevel = wl_resource_get_user_data(resource);
     tmp = strdup(title);
     if (!tmp) {
         wl_resource_post_no_memory(resource);
         return;
     }
 
-    if (surface->toplevel->title)
-        free(surface->toplevel->title);
+    if (toplevel->title)
+        free(toplevel->title);
 
-    surface->toplevel->title = tmp;
-    wl_signal_emit_mutable(&surface->toplevel->events.set_title, surface);
+    toplevel->title = tmp;
+    wl_signal_emit_mutable(&toplevel->events.set_title, toplevel);
 }
 
 static void
 xdg_toplevel_v6_handle_set_app_id(struct wl_client *client,
         struct wl_resource *resource, const char *app_id)
 {
-    struct ds_xdg_surface_v6 *surface;
+    struct ds_xdg_toplevel_v6 *toplevel;
     char *tmp;
 
-    surface = wl_resource_get_user_data(resource);
+    toplevel = wl_resource_get_user_data(resource);
     tmp = strdup(app_id);
     if (!tmp) {
         wl_resource_post_no_memory(resource);
         return;
     }
 
-    if (surface->toplevel->app_id)
-        free(surface->toplevel->app_id);
-
-    surface->toplevel->app_id= tmp;
-    wl_signal_emit_mutable(&surface->toplevel->events.set_app_id, surface);
+    if (toplevel->app_id)
+        free(toplevel->app_id);
 
+    toplevel->app_id= tmp;
+    wl_signal_emit_mutable(&toplevel->events.set_app_id, toplevel);
 }
 
 static void
@@ -272,46 +271,46 @@ static void
 xdg_toplevel_v6_handle_set_max_size(struct wl_client *client,
         struct wl_resource *resource, int32_t width, int32_t height)
 {
-    struct ds_xdg_surface_v6 *surface;
+    struct ds_xdg_toplevel_v6 *toplevel;
 
-    surface = wl_resource_get_user_data(resource);
-    surface->toplevel->pending.max_width = width;
-    surface->toplevel->pending.max_height = height;
+    toplevel = wl_resource_get_user_data(resource);
+    toplevel->pending.max_width = width;
+    toplevel->pending.max_height = height;
 }
 
 static void
 xdg_toplevel_v6_handle_set_min_size(struct wl_client *client,
         struct wl_resource *resource, int32_t width, int32_t height)
 {
-    struct ds_xdg_surface_v6 *surface;
+    struct ds_xdg_toplevel_v6 *toplevel;
 
-    surface = wl_resource_get_user_data(resource);
-    surface->toplevel->pending.min_width = width;
-    surface->toplevel->pending.min_height = height;
+    toplevel = wl_resource_get_user_data(resource);
+    toplevel->pending.min_width = width;
+    toplevel->pending.min_height = height;
 }
 
 static void
 xdg_toplevel_v6_handle_set_maximized(struct wl_client *client,
         struct wl_resource *resource)
 {
-    struct ds_xdg_surface_v6 *surface;
+    struct ds_xdg_toplevel_v6 *toplevel;
 
-    surface = wl_resource_get_user_data(resource);
-    surface->toplevel->requested.maximized = true;
-    wl_signal_emit_mutable(&surface->toplevel->events.request_maximize, surface);
-    ds_xdg_surface_v6_schedule_configure(surface);
+    toplevel = wl_resource_get_user_data(resource);
+    toplevel->requested.maximized = true;
+    wl_signal_emit_mutable(&toplevel->events.request_maximize, toplevel);
+    ds_xdg_surface_v6_schedule_configure(toplevel->base);
 }
 
 static void
 xdg_toplevel_v6_handle_unset_maximized(struct wl_client *client,
         struct wl_resource *resource)
 {
-    struct ds_xdg_surface_v6 *surface;
+    struct ds_xdg_toplevel_v6 *toplevel;
 
-    surface = wl_resource_get_user_data(resource);
-    surface->toplevel->requested.maximized = false;
-    wl_signal_emit_mutable(&surface->toplevel->events.request_maximize, surface);
-    ds_xdg_surface_v6_schedule_configure(surface);
+    toplevel = wl_resource_get_user_data(resource);
+    toplevel->requested.maximized = false;
+    wl_signal_emit_mutable(&toplevel->events.request_maximize, toplevel);
+    ds_xdg_surface_v6_schedule_configure(toplevel->base);
 }
 
 static void
@@ -332,11 +331,11 @@ static void
 xdg_toplevel_v6_handle_set_minimized(struct wl_client *client,
         struct wl_resource *resource)
 {
-    struct ds_xdg_surface_v6 *surface;
+    struct ds_xdg_toplevel_v6 *toplevel;
 
-    surface = wl_resource_get_user_data(resource);
-    surface->toplevel->requested.minimized = true;
-    wl_signal_emit_mutable(&surface->toplevel->events.request_maximize, surface);
+    toplevel = wl_resource_get_user_data(resource);
+    toplevel->requested.minimized = true;
+    wl_signal_emit_mutable(&toplevel->events.request_maximize, toplevel);
 }
 
 static const struct zxdg_toplevel_v6_interface xdg_toplevel_v6_impl =
@@ -360,11 +359,11 @@ static const struct zxdg_toplevel_v6_interface xdg_toplevel_v6_impl =
 static void
 xdg_toplevel_v6_handle_resource_destroy(struct wl_resource *resource)
 {
-    struct ds_xdg_surface_v6 *surface;
+    struct ds_xdg_toplevel_v6 *toplevel;
 
-    surface = wl_resource_get_user_data(resource);
-    if (!surface)
+    toplevel = wl_resource_get_user_data(resource);
+    if (!toplevel)
         return;
 
-    destroy_xdg_toplevel_v6(surface);
+    destroy_xdg_toplevel_v6(toplevel->base);
 }