Support desktop shell panels in compositor

3 files changed, 103 insertions, 4 deletions

diff --git a/sway/extensions.c b/sway/extensions.c
index aa51b474..1f8e9a7c 100644
--- a/sway/extensions.c
+++ b/sway/extensions.c
@@ -2,6 +2,7 @@
 #include <wlc/wlc.h>
 #include <wlc/wlc-wayland.h>
 #include "wayland-desktop-shell-server-protocol.h"
+#include "layout.h"
 #include "log.h"
 #include "extensions.h"
 
@@ -20,13 +21,55 @@ static void set_background(struct wl_client *client, struct wl_resource *resourc
         list_add(desktop_shell.backgrounds, config);
 }
 
+static void set_panel(struct wl_client *client, struct wl_resource *resource,
+                          struct wl_resource *_output, struct wl_resource *surface) {
+        wlc_handle output = wlc_handle_from_wl_output_resource(_output);
+        if (!output) {
+                return;
+        }
+        sway_log(L_DEBUG, "Setting surface %p as panel for output %d", surface, (int)output);
+        struct panel_config *config = malloc(sizeof(struct panel_config));
+        config->output = output;
+        config->surface = wlc_resource_from_wl_surface_resource(surface);
+        list_add(desktop_shell.panels, config);
+        desktop_shell.panel_size = *wlc_surface_get_size(config->surface);
+        arrange_windows(&root_container, -1, -1);
+}
+
+static void set_lock_surface(struct wl_client *client, struct wl_resource *resource, struct wl_resource *surface) {
+        sway_log(L_ERROR, "desktop_set_lock_surface is not currently supported");
+}
+
+static void unlock(struct wl_client *client, struct wl_resource *resource) {
+        sway_log(L_ERROR, "desktop_unlock is not currently supported");
+}
+
+static void set_grab_surface(struct wl_client *client, struct wl_resource *resource, struct wl_resource *surface) {
+        sway_log(L_ERROR, "desktop_set_grab_surface is not currently supported");
+}
+
+static void desktop_ready(struct wl_client *client, struct wl_resource *resource) {
+        // nop
+}
+
+static void set_panel_position(struct wl_client *client, struct wl_resource *resource, uint32_t position) {
+        desktop_shell.panel_position = position;
+        arrange_windows(&root_container, -1, -1);
+}
+
 static struct desktop_shell_interface desktop_shell_implementation = {
-        .set_background = set_background
+        .set_background = set_background,
+        .set_panel = set_panel,
+        .set_lock_surface = set_lock_surface,
+        .unlock = unlock,
+        .set_grab_surface = set_grab_surface,
+        .desktop_ready = desktop_ready,
+        .set_panel_position = set_panel_position
 };
 
 static void desktop_shell_bind(struct wl_client *client, void *data,
                 unsigned int version, unsigned int id) {
-        if (version > 1) {
+        if (version > 3) {
                 // Unsupported version
                 return;
         }
@@ -40,6 +83,8 @@ static void desktop_shell_bind(struct wl_client *client, void *data,
 }
 
 void register_extensions(void) {
-        wl_global_create(wlc_get_wl_display(), &desktop_shell_interface, 1, NULL, desktop_shell_bind);
+        wl_global_create(wlc_get_wl_display(), &desktop_shell_interface, 3, NULL, desktop_shell_bind);
         desktop_shell.backgrounds = create_list();
+        desktop_shell.panels = create_list();
+        desktop_shell.panel_position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM;
 }
diff --git a/sway/handlers.c b/sway/handlers.c
index 267a8f3a..2029ae84 100644
--- a/sway/handlers.c
+++ b/sway/handlers.c
@@ -72,11 +72,43 @@ static void handle_output_destroyed(wlc_handle output) {
 }
 
 static void handle_output_pre_render(wlc_handle output) {
+        struct wlc_size resolution = *wlc_output_get_resolution(output);
+
         int i;
         for (i = 0; i < desktop_shell.backgrounds->length; ++i) {
                 struct background_config *config = desktop_shell.backgrounds->items[i];
                 if (config->output == output) {
-                        wlc_surface_render(config->surface, &(struct wlc_geometry){ wlc_origin_zero, *wlc_output_get_resolution(output) });
+                        wlc_surface_render(config->surface, &(struct wlc_geometry){ wlc_origin_zero, resolution });
+                        break;
+                }
+        }
+        
+        for (i = 0; i < desktop_shell.panels->length; ++i) {
+                struct panel_config *config = desktop_shell.panels->items[i];
+                if (config->output == output) {
+                        struct wlc_size size = *wlc_surface_get_size(config->surface);
+                        struct wlc_geometry geo = {
+                                .size = size
+                        };
+                        switch (desktop_shell.panel_position) {
+                        case DESKTOP_SHELL_PANEL_POSITION_TOP:
+                                geo.origin = (struct wlc_origin){ 0, 0 };
+                                break;
+                        case DESKTOP_SHELL_PANEL_POSITION_BOTTOM:
+                                geo.origin = (struct wlc_origin){ 0, resolution.h - size.h };
+                                break;
+                        case DESKTOP_SHELL_PANEL_POSITION_LEFT:
+                                geo.origin = (struct wlc_origin){ 0, 0 };
+                                break;
+                        case DESKTOP_SHELL_PANEL_POSITION_RIGHT:
+                                geo.origin = (struct wlc_origin){ resolution.w - size.w, 0 };
+                                break;
+                        }
+                        wlc_surface_render(config->surface, &geo);
+                        if (size.w != desktop_shell.panel_size.w || size.h != desktop_shell.panel_size.h) {
+                                desktop_shell.panel_size = size;
+                                arrange_windows(&root_container, -1, -1);
+                        }
                         break;
                 }
         }
diff --git a/sway/layout.c b/sway/layout.c
index de186886..70980ec3 100644
--- a/sway/layout.c
+++ b/sway/layout.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <wlc/wlc.h>
+#include "extensions.h"
 #include "layout.h"
 #include "log.h"
 #include "list.h"
@@ -426,6 +427,27 @@ static void arrange_windows_r(swayc_t *container, double width, double height) {
                 }
                 return;
         case C_OUTPUT:
+                for (i = 0; i < desktop_shell.panels->length; ++i) {
+                        struct panel_config *config = desktop_shell.panels->items[i];
+                        if (config->output == container->handle) {
+                                struct wlc_size size = *wlc_surface_get_size(config->surface);
+                                switch (desktop_shell.panel_position) {
+                                case DESKTOP_SHELL_PANEL_POSITION_TOP:
+                                        y += size.h; height -= size.h;
+                                        break;
+                                case DESKTOP_SHELL_PANEL_POSITION_BOTTOM:
+                                        height -= size.h;
+                                        break;
+                                case DESKTOP_SHELL_PANEL_POSITION_LEFT:
+                                        x += size.w; width -= size.w;
+                                        break;
+                                case DESKTOP_SHELL_PANEL_POSITION_RIGHT:
+                                        width -= size.w;
+                                        break;
+                                }
+                        }
+                }
+
                 container->width = width;
                 container->height = height;
                 x = 0, y = 0;