1 files changed, 82 insertions, 71 deletions

diff --git a/swaynag/swaynag.c b/swaynag/swaynag.c
index d9bec368..6ea739e3 100644
--- a/swaynag/swaynag.c
+++ b/swaynag/swaynag.c
@@ -28,10 +28,15 @@ static bool terminal_execute(char *terminal, char *command) {
         fprintf(tmp, "#!/bin/sh\nrm %s\n%s", fname, command);
         fclose(tmp);
         chmod(fname, S_IRUSR | S_IWUSR | S_IXUSR);
-        char *cmd = malloc(sizeof(char) * (strlen(terminal) + strlen(" -e ") + strlen(fname) + 1));
-        sprintf(cmd, "%s -e %s", terminal, fname);
-        execl("/bin/sh", "/bin/sh", "-c", cmd, NULL);
-        sway_log_errno(SWAY_ERROR, "Failed to run command, execl() returned.");
+        size_t cmd_size = strlen(terminal) + strlen(" -e ") + strlen(fname) + 1;
+        char *cmd = malloc(cmd_size);
+        if (!cmd) {
+                perror("malloc");
+                return false;
+        }
+        snprintf(cmd, cmd_size, "%s -e %s", terminal, fname);
+        execlp("sh", "sh", "-c", cmd, NULL);
+        sway_log_errno(SWAY_ERROR, "Failed to run command, execlp() returned.");
         free(cmd);
         return false;
 }
@@ -58,7 +63,7 @@ static void swaynag_button_execute(struct swaynag *swaynag,
                         } else if (pid == 0) {
                                 // Child of the child. Will be reparented to the init process
                                 char *terminal = getenv("TERMINAL");
-                                if (button->terminal && terminal && strlen(terminal)) {
+                                if (button->terminal && terminal && *terminal) {
                                         sway_log(SWAY_DEBUG, "Found $TERMINAL: %s", terminal);
                                         if (!terminal_execute(terminal, button->action)) {
                                                 swaynag_destroy(swaynag);
@@ -69,8 +74,8 @@ static void swaynag_button_execute(struct swaynag *swaynag,
                                                 sway_log(SWAY_DEBUG,
                                                                 "$TERMINAL not found. Running directly");
                                         }
-                                        execl("/bin/sh", "/bin/sh", "-c", button->action, NULL);
-                                        sway_log_errno(SWAY_DEBUG, "execl failed");
+                                        execlp("sh", "sh", "-c", button->action, NULL);
+                                        sway_log_errno(SWAY_DEBUG, "execlp failed");
                                         _exit(EXIT_FAILURE);
                                 }
                         }
@@ -103,7 +108,7 @@ static void layer_surface_closed(void *data,
         swaynag_destroy(swaynag);
 }
 
-static 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,
 };
@@ -124,7 +129,7 @@ static void surface_enter(void *data, struct wl_surface *surface,
         };
 }
 
-static struct wl_surface_listener surface_listener = {
+static const struct wl_surface_listener surface_listener = {
         .enter = surface_enter,
         .leave = nop,
 };
@@ -138,7 +143,7 @@ static void update_cursor(struct swaynag_seat *seat) {
         const char *cursor_theme = getenv("XCURSOR_THEME");
         unsigned cursor_size = 24;
         const char *env_cursor_size = getenv("XCURSOR_SIZE");
-        if (env_cursor_size && strlen(env_cursor_size) > 0) {
+        if (env_cursor_size && *env_cursor_size) {
                 errno = 0;
                 char *end;
                 unsigned size = strtoul(env_cursor_size, &end, 10);
@@ -148,8 +153,15 @@ static void update_cursor(struct swaynag_seat *seat) {
         }
         pointer->cursor_theme = wl_cursor_theme_load(
                 cursor_theme, cursor_size * swaynag->scale, swaynag->shm);
-        struct wl_cursor *cursor =
-                wl_cursor_theme_get_cursor(pointer->cursor_theme, "left_ptr");
+        if (!pointer->cursor_theme) {
+                sway_log(SWAY_ERROR, "Failed to load cursor theme");
+                return;
+        }
+        struct wl_cursor *cursor = wl_cursor_theme_get_cursor(pointer->cursor_theme, "default");
+        if (!cursor) {
+                sway_log(SWAY_ERROR, "Failed to get default cursor from theme");
+                return;
+        }
         pointer->cursor_image = cursor->images[0];
         wl_surface_set_buffer_scale(pointer->cursor_surface,
                         swaynag->scale);
@@ -177,9 +189,22 @@ static void wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
                 uint32_t serial, struct wl_surface *surface,
                 wl_fixed_t surface_x, wl_fixed_t surface_y) {
         struct swaynag_seat *seat = data;
+
         struct swaynag_pointer *pointer = &seat->pointer;
-        pointer->serial = serial;
-        update_cursor(seat);
+        pointer->x = wl_fixed_to_int(surface_x);
+        pointer->y = wl_fixed_to_int(surface_y);
+
+        if (seat->swaynag->cursor_shape_manager) {
+                struct wp_cursor_shape_device_v1 *device =
+                        wp_cursor_shape_manager_v1_get_pointer(
+                                seat->swaynag->cursor_shape_manager, wl_pointer);
+                wp_cursor_shape_device_v1_set_shape(device, serial,
+                        WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_DEFAULT);
+                wp_cursor_shape_device_v1_destroy(device);
+        } else {
+                pointer->serial = serial;
+                update_cursor(seat);
+        }
 }
 
 static void wl_pointer_motion(void *data, struct wl_pointer *wl_pointer,
@@ -198,8 +223,8 @@ static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
                 return;
         }
 
-        double x = seat->pointer.x * swaynag->scale;
-        double y = seat->pointer.y * swaynag->scale;
+        double x = seat->pointer.x;
+        double y = seat->pointer.y;
         for (int i = 0; i < swaynag->buttons->length; i++) {
                 struct swaynag_button *nagbutton = swaynag->buttons->items[i];
                 if (x >= nagbutton->x
@@ -263,7 +288,7 @@ static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
         render_frame(swaynag);
 }
 
-static struct wl_pointer_listener pointer_listener = {
+static const struct wl_pointer_listener pointer_listener = {
         .enter = wl_pointer_enter,
         .leave = nop,
         .motion = wl_pointer_motion,
@@ -289,7 +314,7 @@ static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
         }
 }
 
-const struct wl_seat_listener seat_listener = {
+static const struct wl_seat_listener seat_listener = {
         .capabilities = seat_handle_capabilities,
         .name = nop,
 };
@@ -305,33 +330,25 @@ static void output_scale(void *data, struct wl_output *output,
         }
 }
 
-static struct wl_output_listener output_listener = {
-        .geometry = nop,
-        .mode = nop,
-        .done = nop,
-        .scale = output_scale,
-};
-
-static void xdg_output_handle_name(void *data,
-                struct zxdg_output_v1 *xdg_output, const char *name) {
+static void output_name(void *data, struct wl_output *output,
+                const char *name) {
         struct swaynag_output *swaynag_output = data;
-        char *outname = swaynag_output->swaynag->type->output;
-        sway_log(SWAY_DEBUG, "Checking against output %s for %s", name, outname);
-        if (!swaynag_output->swaynag->output && outname && name
-                        && strcmp(outname, name) == 0) {
+        swaynag_output->name = strdup(name);
+
+        const char *outname = swaynag_output->swaynag->type->output;
+        if (!swaynag_output->swaynag->output && outname &&
+                        strcmp(outname, name) == 0) {
                 sway_log(SWAY_DEBUG, "Using output %s", name);
                 swaynag_output->swaynag->output = swaynag_output;
         }
-        swaynag_output->name = strdup(name);
-        zxdg_output_v1_destroy(xdg_output);
-        swaynag_output->swaynag->querying_outputs--;
 }
 
-static struct zxdg_output_v1_listener xdg_output_listener = {
-        .logical_position = nop,
-        .logical_size = nop,
+static const struct wl_output_listener output_listener = {
+        .geometry = nop,
+        .mode = nop,
         .done = nop,
-        .name = xdg_output_handle_name,
+        .scale = output_scale,
+        .name = output_name,
         .description = nop,
 };
 
@@ -345,6 +362,7 @@ static void handle_global(void *data, struct wl_registry *registry,
                 struct swaynag_seat *seat =
                         calloc(1, sizeof(struct swaynag_seat));
                 if (!seat) {
+                        perror("calloc");
                         return;
                 }
 
@@ -359,33 +377,28 @@ static void handle_global(void *data, struct wl_registry *registry,
         } else if (strcmp(interface, wl_shm_interface.name) == 0) {
                 swaynag->shm = wl_registry_bind(registry, name, &wl_shm_interface, 1);
         } else if (strcmp(interface, wl_output_interface.name) == 0) {
-                if (!swaynag->output && swaynag->xdg_output_manager) {
-                        swaynag->querying_outputs++;
+                if (!swaynag->output) {
                         struct swaynag_output *output =
                                 calloc(1, sizeof(struct swaynag_output));
+                        if (!output) {
+                                perror("calloc");
+                                return;
+                        }
                         output->wl_output = wl_registry_bind(registry, name,
-                                        &wl_output_interface, 3);
+                                        &wl_output_interface, 4);
                         output->wl_name = name;
                         output->scale = 1;
                         output->swaynag = swaynag;
                         wl_list_insert(&swaynag->outputs, &output->link);
                         wl_output_add_listener(output->wl_output,
                                         &output_listener, output);
-
-                        struct zxdg_output_v1 *xdg_output;
-                        xdg_output = zxdg_output_manager_v1_get_xdg_output(
-                                        swaynag->xdg_output_manager, output->wl_output);
-                        zxdg_output_v1_add_listener(xdg_output,
-                                        &xdg_output_listener, output);
                 }
         } else if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) {
                 swaynag->layer_shell = wl_registry_bind(
                                 registry, name, &zwlr_layer_shell_v1_interface, 1);
-        } else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0
-                        && version >= ZXDG_OUTPUT_V1_NAME_SINCE_VERSION) {
-                swaynag->xdg_output_manager = wl_registry_bind(registry, name,
-                                &zxdg_output_manager_v1_interface,
-                                ZXDG_OUTPUT_V1_NAME_SINCE_VERSION);
+        } else if (strcmp(interface, wp_cursor_shape_manager_v1_interface.name) == 0) {
+                swaynag->cursor_shape_manager = wl_registry_bind(
+                                registry, name, &wp_cursor_shape_manager_v1_interface, 1);
         }
 }
 
@@ -451,12 +464,11 @@ void swaynag_setup(struct swaynag *swaynag) {
 
         assert(swaynag->compositor && swaynag->layer_shell && swaynag->shm);
 
-        while (swaynag->querying_outputs > 0) {
-                if (wl_display_roundtrip(swaynag->display) < 0) {
-                        sway_log(SWAY_ERROR, "Error during outputs init.");
-                        swaynag_destroy(swaynag);
-                        exit(EXIT_FAILURE);
-                }
+        // Second roundtrip to get wl_output properties
+        if (wl_display_roundtrip(swaynag->display) < 0) {
+                sway_log(SWAY_ERROR, "Error during outputs init.");
+                swaynag_destroy(swaynag);
+                exit(EXIT_FAILURE);
         }
 
         if (!swaynag->output && swaynag->type->output) {
@@ -465,7 +477,9 @@ void swaynag_setup(struct swaynag *swaynag) {
                 exit(EXIT_FAILURE);
         }
 
-        swaynag_setup_cursors(swaynag);
+        if (!swaynag->cursor_shape_manager) {
+                swaynag_setup_cursors(swaynag);
+        }
 
         swaynag->surface = wl_compositor_create_surface(swaynag->compositor);
         assert(swaynag->surface);
@@ -474,7 +488,8 @@ void swaynag_setup(struct swaynag *swaynag) {
         swaynag->layer_surface = zwlr_layer_shell_v1_get_layer_surface(
                         swaynag->layer_shell, swaynag->surface,
                         swaynag->output ? swaynag->output->wl_output : NULL,
-                        ZWLR_LAYER_SHELL_V1_LAYER_TOP, "swaynag");
+                        swaynag->type->layer,
+                        "swaynag");
         assert(swaynag->layer_surface);
         zwlr_layer_surface_v1_add_listener(swaynag->layer_surface,
                         &layer_surface_listener, swaynag);
@@ -491,10 +506,6 @@ void swaynag_run(struct swaynag *swaynag) {
                         && wl_display_dispatch(swaynag->display) != -1) {
                 // This is intentionally left blank
         }
-
-        if (swaynag->display) {
-                wl_display_disconnect(swaynag->display);
-        }
 }
 
 void swaynag_destroy(struct swaynag *swaynag) {
@@ -509,6 +520,7 @@ void swaynag_destroy(struct swaynag *swaynag) {
         }
         list_free(swaynag->buttons);
         free(swaynag->details.message);
+        free(swaynag->details.details_text);
         free(swaynag->details.button_up.text);
         free(swaynag->details.button_down.text);
 
@@ -529,13 +541,8 @@ void swaynag_destroy(struct swaynag *swaynag) {
                 swaynag_seat_destroy(seat);
         }
 
-        if (&swaynag->buffers[0]) {
-                destroy_buffer(&swaynag->buffers[0]);
-        }
-
-        if (&swaynag->buffers[1]) {
-                destroy_buffer(&swaynag->buffers[1]);
-        }
+        destroy_buffer(&swaynag->buffers[0]);
+        destroy_buffer(&swaynag->buffers[1]);
 
         if (swaynag->outputs.prev || swaynag->outputs.next) {
                 struct swaynag_output *output, *temp;
@@ -554,4 +561,8 @@ void swaynag_destroy(struct swaynag *swaynag) {
         if (swaynag->shm) {
                 wl_shm_destroy(swaynag->shm);
         }
+
+        if (swaynag->display) {
+                wl_display_disconnect(swaynag->display);
+        }
 }