Merge pull request #738 from deklov/panel-as-shell-02

Make swaybar and swaybg shell surfaces, take 2

2 files changed, 23 insertions, 18 deletions

diff --git a/include/client/window.h b/include/client/window.h
index eff9032d..e48ec4f3 100644
--- a/include/client/window.h
+++ b/include/client/window.h
@@ -42,5 +42,6 @@ struct window *window_setup(struct registry *registry, uint32_t width, uint32_t
 void window_teardown(struct window *state);
 int window_prerender(struct window *state);
 int window_render(struct window *state);
+void window_make_shell(struct window *window);
 
 #endif
diff --git a/include/extensions.h b/include/extensions.h
index 158a40a2..7c508b5e 100644
--- a/include/extensions.h
+++ b/include/extensions.h
@@ -7,33 +7,37 @@
 #include "list.h"
 
 struct background_config {
-        wlc_handle output;
-        wlc_resource surface;
-        // we need the wl_resource of the surface in the destructor
-        struct wl_resource *wl_surface_res;
+        wlc_handle output;
+        wlc_resource surface;
+        // we need the wl_resource of the surface in the destructor
+        struct wl_resource *wl_surface_res;
+        // used to determine if client is a background
+        struct wl_client *client;
 };
 
 struct panel_config {
-        // wayland resource used in callbacks, is used to track this panel
-        struct wl_resource *wl_resource;
-        wlc_handle output;
-        wlc_resource surface;
-        // we need the wl_resource of the surface in the destructor
-        struct wl_resource *wl_surface_res;
-        enum desktop_shell_panel_position panel_position;
+        // wayland resource used in callbacks, is used to track this panel
+        struct wl_resource *wl_resource;
+        wlc_handle output;
+        wlc_resource surface;
+        // we need the wl_resource of the surface in the destructor
+        struct wl_resource *wl_surface_res;
+        enum desktop_shell_panel_position panel_position;
+        // used to determine if client is a panel
+        struct wl_client *client;
 };
 
 struct desktop_shell_state {
-        list_t *backgrounds;
-        list_t *panels;
-        list_t *lock_surfaces;
-        bool is_locked;
+        list_t *backgrounds;
+        list_t *panels;
+        list_t *lock_surfaces;
+        bool is_locked;
 };
 
 struct swaylock_state {
-        bool active;
-        wlc_handle output;
-        wlc_resource surface;
+        bool active;
+        wlc_handle output;
+        wlc_resource surface;
 };
 
 extern struct desktop_shell_state desktop_shell;