swc

commit 5e3c41c8737ebf432a2ae9c820b8ae0dc631cf69
parent 0c11e094aab992ac439fe9a37564d1715166e87a
Author: Michael Forney <mforney@mforney.org>
Date:   Tue, 22 Jul 2014 17:59:42 -0700

protocol/swc: Make swc_panel.dock take a swc_screen

Diffstat:
M
libswc/panel.c
 | 
9
++++-----
M
protocol/swc.xml
 | 
2
+-

2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/libswc/panel.c b/libswc/panel.c
@@ -82,14 +82,13 @@ static void update_position(struct panel * panel)
 }
 
 static void dock(struct wl_client * client, struct wl_resource * resource,
-                 uint32_t edge, struct wl_resource * output_resource,
+                 uint32_t edge, struct wl_resource * screen_resource,
                  uint32_t focus)
 {
     struct panel * panel = wl_resource_get_user_data(resource);
-    struct swc_output * output = output_resource
-        ? wl_resource_get_user_data(output_resource) : NULL;
-    struct screen * screen = output
-        ? output->screen : wl_container_of(swc.screens.next, screen, link);
+    struct screen * screen = screen_resource
+        ? wl_resource_get_user_data(screen_resource)
+        : wl_container_of(swc.screens.next, screen, link);
     bool screen_changed = screen != panel->screen;
     uint32_t length;
 
diff --git a/protocol/swc.xml b/protocol/swc.xml
@@ -47,7 +47,7 @@
 
         <request name="dock">
             <arg name="edge" type="uint" />
-            <arg name="output" type="object" interface="wl_output"
+            <arg name="screen" type="object" interface="swc_screen"
                  allow-null="true" />
             <arg name="focus" type="uint" />
         </request>