1 files changed, 35 insertions, 21 deletions

diff --git a/swaybar/bar.c b/swaybar/bar.c
index 231c1ad7..5b1213a8 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -51,10 +50,6 @@ static void swaybar_output_free(struct swaybar_output *output) {
         if (output->surface != NULL) {
                 wl_surface_destroy(output->surface);
         }
-        if (output->input_region != NULL) {
-                wl_region_destroy(output->input_region);
-        }
-        zxdg_output_v1_destroy(output->xdg_output);
         wl_output_destroy(output->output);
         destroy_buffer(&output->buffers[0]);
         destroy_buffer(&output->buffers[1]);
@@ -90,7 +85,7 @@ static void layer_surface_closed(void *_output,
         swaybar_output_free(output);
 }
 
-struct zwlr_layer_surface_v1_listener layer_surface_listener = {
+static const struct zwlr_layer_surface_v1_listener layer_surface_listener = {
         .configure = layer_surface_configure,
         .closed = layer_surface_closed,
 };
@@ -114,10 +109,9 @@ static void add_layer_surface(struct swaybar_output *output) {
 
         if (overlay) {
                 // Empty input region
-                output->input_region = wl_compositor_create_region(bar->compositor);
-                assert(output->input_region);
-
-                wl_surface_set_input_region(output->surface, output->input_region);
+                struct wl_region *region = wl_compositor_create_region(bar->compositor);
+                wl_surface_set_input_region(output->surface, region);
+                wl_region_destroy(region);
         }
 
         zwlr_layer_surface_v1_set_anchor(output->layer_surface, config->position);
@@ -172,7 +166,7 @@ bool determine_bar_visibility(struct swaybar *bar, bool moving_layer) {
                 if (bar->status) {
                         sway_log(SWAY_DEBUG, "Sending %s signal to status command",
                                         visible ? "cont" : "stop");
-                        kill(bar->status->pid, visible ?
+                        kill(-bar->status->pid, visible ?
                                         bar->status->cont_signal : bar->status->stop_signal);
                 }
         }
@@ -230,7 +224,7 @@ static void output_scale(void *data, struct wl_output *wl_output,
         }
 }
 
-struct wl_output_listener output_listener = {
+static const struct wl_output_listener output_listener = {
         .geometry = output_geometry,
         .mode = output_mode,
         .done = output_done,
@@ -307,7 +301,7 @@ static void xdg_output_handle_description(void *data,
         }
 }
 
-struct zxdg_output_v1_listener xdg_output_listener = {
+static const struct zxdg_output_v1_listener xdg_output_listener = {
         .logical_position = xdg_output_handle_logical_position,
         .logical_size = xdg_output_handle_logical_size,
         .done = xdg_output_handle_done,
@@ -367,6 +361,9 @@ static void handle_global(void *data, struct wl_registry *registry,
         } else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0) {
                 bar->xdg_output_manager = wl_registry_bind(registry, name,
                         &zxdg_output_manager_v1_interface, 2);
+        } else if (strcmp(interface, wp_cursor_shape_manager_v1_interface.name) == 0) {
+                bar->cursor_shape_manager = wl_registry_bind(registry, name,
+                        &wp_cursor_shape_manager_v1_interface, 1);
         }
 }
 
@@ -430,15 +427,17 @@ bool bar_setup(struct swaybar *bar, const char *socket_path) {
         // Second roundtrip for xdg-output
         wl_display_roundtrip(bar->display);
 
-        struct swaybar_seat *seat;
-        wl_list_for_each(seat, &bar->seats, link) {
-                struct swaybar_pointer *pointer = &seat->pointer;
-                if (!pointer) {
-                        continue;
+        if (!bar->cursor_shape_manager) {
+                struct swaybar_seat *seat;
+                wl_list_for_each(seat, &bar->seats, link) {
+                        struct swaybar_pointer *pointer = &seat->pointer;
+                        if (!pointer) {
+                                continue;
+                        }
+                        pointer->cursor_surface =
+                                wl_compositor_create_surface(bar->compositor);
+                        assert(pointer->cursor_surface);
                 }
-                pointer->cursor_surface =
-                        wl_compositor_create_surface(bar->compositor);
-                assert(pointer->cursor_surface);
         }
 
         if (bar->config->status_command) {
@@ -461,13 +460,28 @@ bool bar_setup(struct swaybar *bar, const char *socket_path) {
 
 static void display_in(int fd, short mask, void *data) {
         struct swaybar *bar = data;
+        if (mask & (POLLHUP | POLLERR)) {
+                if (mask & POLLERR) {
+                        sway_log(SWAY_ERROR, "Wayland display poll error");
+                }
+                bar->running = false;
+                return;
+        }
         if (wl_display_dispatch(bar->display) == -1) {
+                sway_log(SWAY_ERROR, "wl_display_dispatch failed");
                 bar->running = false;
         }
 }
 
 static void ipc_in(int fd, short mask, void *data) {
         struct swaybar *bar = data;
+        if (mask & (POLLHUP | POLLERR)) {
+                if (mask & POLLERR) {
+                        sway_log(SWAY_ERROR, "IPC poll error");
+                }
+                bar->running = false;
+                return;
+        }
         if (handle_ipc_readable(bar)) {
                 set_bar_dirty(bar);
         }