From 51204b33c18b6f7c248f558fbaeb7198efb32900 Mon Sep 17 00:00:00 2001 From: David Eklov Date: Mon, 4 Jul 2016 16:53:03 -0500 Subject: [PATCH 1/5] Enable backgrounds and panels to be shell surfaces Prior to this commit all windows (e.g. shell surfaces) were handled the same way in handle_view_created. Since backgrounds and panels have to be treated differently, they could not be shell surfaces. This changes checks whether a client is a background or a panel in handle_view_created and exists to let them be dealt with elsewhere. --- include/extensions.h | 4 ++++ sway/extensions.c | 2 ++ sway/handlers.c | 26 ++++++++++++++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/include/extensions.h b/include/extensions.h index 158a40a2a..dbd8f6253 100644 --- a/include/extensions.h +++ b/include/extensions.h @@ -11,6 +11,8 @@ struct background_config { 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 { @@ -21,6 +23,8 @@ struct panel_config { // 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 { diff --git a/sway/extensions.c b/sway/extensions.c index 7bc9bbe4b..1fe15ac57 100644 --- a/sway/extensions.c +++ b/sway/extensions.c @@ -73,6 +73,7 @@ static void set_background(struct wl_client *client, struct wl_resource *resourc } sway_log(L_DEBUG, "Setting surface %p as background for output %d", surface, (int)output); struct background_config *config = malloc(sizeof(struct background_config)); + config->client = client; config->output = output; config->surface = wlc_resource_from_wl_surface_resource(surface); config->wl_surface_res = surface; @@ -91,6 +92,7 @@ static void set_panel(struct wl_client *client, struct wl_resource *resource, sway_log(L_DEBUG, "Setting surface %p as panel for output %d (wl_resource: %p)", surface, (int)output, resource); struct panel_config *config = find_or_create_panel_config(resource); config->output = output; + config->client = client; config->surface = wlc_resource_from_wl_surface_resource(surface); config->wl_surface_res = surface; wl_resource_set_destructor(surface, panel_surface_destructor); diff --git a/sway/handlers.c b/sway/handlers.c index b7bb1fde8..8f2f8a21a 100644 --- a/sway/handlers.c +++ b/sway/handlers.c @@ -176,6 +176,28 @@ static void handle_output_focused(wlc_handle output, bool focus) { } } +static bool client_is_background(struct wl_client *client) { + int i; + for (i = 0; i < desktop_shell.backgrounds->length; i++) { + struct background_config *config = desktop_shell.backgrounds->items[i]; + if (config->client == client) { + return true; + } + } + return false; +} + +static bool client_is_panel(struct wl_client *client) { + int i; + for (i = 0; i < desktop_shell.panels->length; i++) { + struct panel_config *config = desktop_shell.panels->items[i]; + if (config->client == client) { + return true; + } + } + return false; +} + static bool handle_view_created(wlc_handle handle) { // if view is child of another view, the use that as focused container wlc_handle parent = wlc_view_get_parent(handle); @@ -186,6 +208,10 @@ static bool handle_view_created(wlc_handle handle) { struct wl_client *client = wlc_view_get_wl_client(handle); pid_t pid; + if (client_is_background(client) || client_is_panel(client)) { + return true; + } + // Get parent container, to add view in if (parent) { focused = swayc_by_handle(parent); From bb35960e652f98a882ed3cd2d1968b860942b896 Mon Sep 17 00:00:00 2001 From: David Eklov Date: Mon, 4 Jul 2016 17:01:37 -0500 Subject: [PATCH 2/5] Move code to make a window a shell surface into seperate function --- include/client/window.h | 1 + wayland/window.c | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/include/client/window.h b/include/client/window.h index eff9032df..e48ec4f38 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/wayland/window.c b/wayland/window.c index ba64cb60f..7ca9e4ec5 100644 --- a/wayland/window.c +++ b/wayland/window.c @@ -59,6 +59,12 @@ static const struct wl_shell_surface_listener surface_listener = { .configure = shell_surface_configure }; +void window_make_shell(struct window *window) { + window->shell_surface = wl_shell_get_shell_surface(window->registry->shell, window->surface); + wl_shell_surface_add_listener(window->shell_surface, &surface_listener, window); + wl_shell_surface_set_toplevel(window->shell_surface); +} + struct window *window_setup(struct registry *registry, uint32_t width, uint32_t height, bool shell_surface) { struct window *window = malloc(sizeof(struct window)); memset(window, 0, sizeof(struct window)); @@ -69,9 +75,7 @@ struct window *window_setup(struct registry *registry, uint32_t width, uint32_t window->surface = wl_compositor_create_surface(registry->compositor); if (shell_surface) { - window->shell_surface = wl_shell_get_shell_surface(registry->shell, window->surface); - wl_shell_surface_add_listener(window->shell_surface, &surface_listener, window); - wl_shell_surface_set_toplevel(window->shell_surface); + window_make_shell(window); } if (registry->pointer) { wl_pointer_add_listener(registry->pointer, &pointer_listener, window); From d3752b41405b5572d0ba488aaf969f308e06968a Mon Sep 17 00:00:00 2001 From: David Eklov Date: Mon, 4 Jul 2016 17:03:55 -0500 Subject: [PATCH 3/5] swaybar: Make swaybar a shell surface --- swaybar/bar.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/swaybar/bar.c b/swaybar/bar.c index 957e5bdf3..6d858f92e 100644 --- a/swaybar/bar.c +++ b/swaybar/bar.c @@ -87,6 +87,8 @@ void bar_setup(struct bar *bar, const char *socket_path, const char *bar_id) { desktop_shell_set_panel(bar_output->registry->desktop_shell, output->output, bar_output->window->surface); desktop_shell_set_panel_position(bar_output->registry->desktop_shell, bar->config->position); + window_make_shell(bar_output->window); + /* set font */ bar_output->window->font = bar->config->font; From 99bda4afe27d9e5723ab6b0ebe5eabb0caaa8eeb Mon Sep 17 00:00:00 2001 From: David Eklov Date: Mon, 4 Jul 2016 17:04:16 -0500 Subject: [PATCH 4/5] swaybg: Make swaybg a shell surface --- swaybg/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/swaybg/main.c b/swaybg/main.c index fbd0d16be..4e0cc4b39 100644 --- a/swaybg/main.c +++ b/swaybg/main.c @@ -54,6 +54,7 @@ int main(int argc, const char **argv) { sway_abort("Failed to create surfaces."); } desktop_shell_set_background(registry->desktop_shell, output->output, window->surface); + window_make_shell(window); list_add(surfaces, window); #ifdef WITH_GDK_PIXBUF From d9bcea381a69ebc6367aede7816b8e27d5fc9417 Mon Sep 17 00:00:00 2001 From: David Eklov Date: Mon, 4 Jul 2016 22:18:56 -0500 Subject: [PATCH 5/5] Fix formatting guide violations (spaces instead of tabs) --- include/extensions.h | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/include/extensions.h b/include/extensions.h index dbd8f6253..7c508b5eb 100644 --- a/include/extensions.h +++ b/include/extensions.h @@ -7,37 +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; - // used to determine if client is a background + 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; - // used to determine if client is a panel + // 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;