1 files changed, 11 insertions, 8 deletions

diff --git a/swaynag/swaynag.c b/swaynag/swaynag.c
index 06185f20..674c24b5 100644
--- a/swaynag/swaynag.c
+++ b/swaynag/swaynag.c
@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <assert.h>
 #include <sys/stat.h>
@@ -49,14 +49,17 @@ static void swaynag_button_execute(struct swaynag *swaynag,
                         if (fork() == 0) {
                                 // Child of the child. Will be reparented to the init process
                                 char *terminal = getenv("TERMINAL");
-                                if (terminal && strlen(terminal)) {
+                                if (button->terminal && terminal && strlen(terminal)) {
                                         wlr_log(WLR_DEBUG, "Found $TERMINAL: %s", terminal);
                                         if (!terminal_execute(terminal, button->action)) {
                                                 swaynag_destroy(swaynag);
                                                 exit(EXIT_FAILURE);
                                         }
                                 } else {
-                                        wlr_log(WLR_DEBUG, "$TERMINAL not found. Running directly");
+                                        if (button->terminal) {
+                                                wlr_log(WLR_DEBUG,
+                                                                "$TERMINAL not found. Running directly");
+                                        }
                                         execl("/bin/sh", "/bin/sh", "-c", button->action, NULL);
                                 }
                         }
@@ -126,6 +129,8 @@ static void update_cursor(struct swaynag *swaynag) {
                         pointer->cursor_surface,
                         pointer->cursor_image->hotspot_x / swaynag->scale,
                         pointer->cursor_image->hotspot_y / swaynag->scale);
+        wl_surface_damage_buffer(pointer->cursor_surface, 0, 0,
+                        INT32_MAX, INT32_MAX);
         wl_surface_commit(pointer->cursor_surface);
 }
 
@@ -290,7 +295,7 @@ static void handle_global(void *data, struct wl_registry *registry,
         struct swaynag *swaynag = data;
         if (strcmp(interface, wl_compositor_interface.name) == 0) {
                 swaynag->compositor = wl_registry_bind(registry, name,
-                                &wl_compositor_interface, 3);
+                                &wl_compositor_interface, 4);
         } else if (strcmp(interface, wl_seat_interface.name) == 0) {
                 swaynag->seat = wl_registry_bind(registry, name, &wl_seat_interface, 1);
                 wl_seat_add_listener(swaynag->seat, &seat_listener, swaynag);
@@ -404,15 +409,13 @@ void swaynag_destroy(struct swaynag *swaynag) {
         swaynag->run_display = false;
 
         free(swaynag->message);
-        while (swaynag->buttons->length) {
-                struct swaynag_button *button = swaynag->buttons->items[0];
-                list_del(swaynag->buttons, 0);
+        for (int i = 0; i < swaynag->buttons->length; ++i) {
+                struct swaynag_button *button = swaynag->buttons->items[i];
                 free(button->text);
                 free(button->action);
                 free(button);
         }
         list_free(swaynag->buttons);
-        free(swaynag->details.button_details);
         free(swaynag->details.message);
         free(swaynag->details.button_up.text);
         free(swaynag->details.button_down.text);