commit 5e3c41c

Michael Forney  ·  2014-07-23 00:59:42 +0000 UTC
parent 0c11e09 
protocol/swc: Make swc_panel.dock take a swc_screen
2 files changed,  +5, -6
M libswc/panel.c
M protocol/swc.xml
M libswc/panel.c
+4, -5 
 1@@ -82,14 +82,13 @@ static void update_position(struct panel * panel)
 2 }
 3 
 4 static void dock(struct wl_client * client, struct wl_resource * resource,
 5-                 uint32_t edge, struct wl_resource * output_resource,
 6+                 uint32_t edge, struct wl_resource * screen_resource,
 7                  uint32_t focus)
 8 {
 9     struct panel * panel = wl_resource_get_user_data(resource);
10-    struct swc_output * output = output_resource
11-        ? wl_resource_get_user_data(output_resource) : NULL;
12-    struct screen * screen = output
13-        ? output->screen : wl_container_of(swc.screens.next, screen, link);
14+    struct screen * screen = screen_resource
15+        ? wl_resource_get_user_data(screen_resource)
16+        : wl_container_of(swc.screens.next, screen, link);
17     bool screen_changed = screen != panel->screen;
18     uint32_t length;
19
M protocol/swc.xml
+1, -1 
1@@ -47,7 +47,7 @@
2 
3         <request name="dock">
4             <arg name="edge" type="uint" />
5-            <arg name="output" type="object" interface="wl_output"
6+            <arg name="screen" type="object" interface="swc_screen"
7                  allow-null="true" />
8             <arg name="focus" type="uint" />
9         </request>