6 files changed, 51 insertions, 15 deletions

diff --git a/swaynag/config.c b/swaynag/config.c
index ca7f4eb2..6db7cce5 100644
--- a/swaynag/config.c
+++ b/swaynag/config.c
@@ -51,7 +51,7 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
                 TO_PADDING_BTN,
         };
 
-        static struct option opts[] = {
+        static const struct option opts[] = {
                 {"button", required_argument, NULL, 'b'},
                 {"button-no-terminal", required_argument, NULL, 'B'},
                 {"button-dismiss", required_argument, NULL, 'z'},
@@ -59,6 +59,7 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
                 {"config", required_argument, NULL, 'c'},
                 {"debug", no_argument, NULL, 'd'},
                 {"edge", required_argument, NULL, 'e'},
+                {"layer", required_argument, NULL, 'y'},
                 {"font", required_argument, NULL, 'f'},
                 {"help", no_argument, NULL, 'h'},
                 {"detailed-message", no_argument, NULL, 'l'},
@@ -104,6 +105,8 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
                 "  -c, --config <path>             Path to config file.\n"
                 "  -d, --debug                     Enable debugging.\n"
                 "  -e, --edge top|bottom           Set the edge to use.\n"
+                "  -y, --layer overlay|top|bottom|background\n"
+            "                                  Set the layer to use.\n"
                 "  -f, --font <font>               Set the font to use.\n"
                 "  -h, --help                      Show help message and quit.\n"
                 "  -l, --detailed-message          Read a detailed message from stdin.\n"
@@ -133,7 +136,7 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
 
         optind = 1;
         while (1) {
-                int c = getopt_long(argc, argv, "b:B:z:Z:c:de:f:hlL:m:o:s:t:v", opts, NULL);
+                int c = getopt_long(argc, argv, "b:B:z:Z:c:de:y:f:hlL:m:o:s:t:v", opts, NULL);
                 if (c == -1) {
                         break;
                 }
@@ -184,6 +187,24 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
                                 }
                         }
                         break;
+                case 'y': // Layer
+                        if (type) {
+                                if (strcmp(optarg, "background") == 0) {
+                                        type->layer = ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND;
+                                } else if (strcmp(optarg, "bottom") == 0) {
+                                        type->layer = ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM;
+                                } else if (strcmp(optarg, "top") == 0) {
+                                        type->layer = ZWLR_LAYER_SHELL_V1_LAYER_TOP;
+                                } else if (strcmp(optarg, "overlay") == 0) {
+                                        type->layer = ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY;
+                                } else {
+                                        fprintf(stderr, "Invalid layer: %s\n"
+                                                        "Usage: --layer overlay|top|bottom|background\n",
+                                                        optarg);
+                                        return EXIT_FAILURE;
+                                }
+                        }
+                        break;
                 case 'f': // Font
                         if (type) {
                                 free(type->font);
diff --git a/swaynag/render.c b/swaynag/render.c
index cf2cc9e0..2a7f869a 100644
--- a/swaynag/render.c
+++ b/swaynag/render.c
@@ -1,5 +1,5 @@
 #include <stdint.h>
-#include "cairo.h"
+#include "cairo_util.h"
 #include "log.h"
 #include "pango.h"
 #include "pool-buffer.h"
diff --git a/swaynag/swaynag.1.scd b/swaynag/swaynag.1.scd
index 4a03469e..1cc85db7 100644
--- a/swaynag/swaynag.1.scd
+++ b/swaynag/swaynag.1.scd
@@ -48,6 +48,9 @@ _swaynag_ [options...]
 *-e, --edge* top|bottom
         Set the edge to use.
 
+*-y, --layer* overlay|top|bottom|background
+        Set the layer to use.
+
 *-f, --font* <font>
         Set the font to use.
 
diff --git a/swaynag/swaynag.5.scd b/swaynag/swaynag.5.scd
index a078a4d7..3c367d0f 100644
--- a/swaynag/swaynag.5.scd
+++ b/swaynag/swaynag.5.scd
@@ -53,7 +53,7 @@ The following sizing options can also be set:
 *message-padding=<padding>*
         Set the padding for the message.
 
-*details-gackground=<color>*
+*details-background=<color>*
         The background color for the details.
 
 *details-border-size=<size>*
@@ -79,6 +79,9 @@ Additionally, the following options can be assigned a default per-type:
 *edge=top|bottom*
         Set the edge to use.
 
+*layer=overlay|top|bottom|background*
+        Set the layer to use.
+
 *font=<font>*
         Set the font to use.
 
diff --git a/swaynag/swaynag.c b/swaynag/swaynag.c
index d9bec368..dd17c0b0 100644
--- a/swaynag/swaynag.c
+++ b/swaynag/swaynag.c
@@ -30,8 +30,8 @@ static bool terminal_execute(char *terminal, char *command) {
         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.");
+        execlp("sh", "sh", "-c", cmd, NULL);
+        sway_log_errno(SWAY_ERROR, "Failed to run command, execlp() returned.");
         free(cmd);
         return false;
 }
@@ -69,8 +69,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 +103,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 +124,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,
 };
@@ -178,6 +178,8 @@ static void wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
                 wl_fixed_t surface_x, wl_fixed_t surface_y) {
         struct swaynag_seat *seat = data;
         struct swaynag_pointer *pointer = &seat->pointer;
+        pointer->x = wl_fixed_to_int(surface_x);
+        pointer->y = wl_fixed_to_int(surface_y);
         pointer->serial = serial;
         update_cursor(seat);
 }
@@ -263,7 +265,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 +291,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,7 +307,7 @@ static void output_scale(void *data, struct wl_output *output,
         }
 }
 
-static struct wl_output_listener output_listener = {
+static const struct wl_output_listener output_listener = {
         .geometry = nop,
         .mode = nop,
         .done = nop,
@@ -327,7 +329,7 @@ static void xdg_output_handle_name(void *data,
         swaynag_output->swaynag->querying_outputs--;
 }
 
-static struct zxdg_output_v1_listener xdg_output_listener = {
+static const struct zxdg_output_v1_listener xdg_output_listener = {
         .logical_position = nop,
         .logical_size = nop,
         .done = nop,
@@ -474,7 +476,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);
diff --git a/swaynag/types.c b/swaynag/types.c
index fa045532..7bef0f87 100644
--- a/swaynag/types.c
+++ b/swaynag/types.c
@@ -26,6 +26,7 @@ struct swaynag_type *swaynag_type_new(const char *name) {
         type->button_gap_close = -1;
         type->button_margin_right = -1;
         type->button_padding = -1;
+        type->layer = -1;
         return type;
 }
 
@@ -35,6 +36,7 @@ void swaynag_types_add_default(list_t *types) {
         type_defaults->anchors = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP
                 | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
                 | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
+        type_defaults->layer = ZWLR_LAYER_SHELL_V1_LAYER_TOP;
         type_defaults->button_background = 0x333333FF;
         type_defaults->details_background = 0x333333FF;
         type_defaults->background = 0x323232FF;
@@ -100,6 +102,10 @@ void swaynag_type_merge(struct swaynag_type *dest, struct swaynag_type *src) {
                 dest->anchors = src->anchors;
         }
 
+        if (src->layer >= 0) {
+                dest->layer = src->layer;
+        }
+
         // Colors
         if (src->button_background > 0) {
                 dest->button_background = src->button_background;