[dwl] update from master

3 files changed, 172 insertions, 197 deletions

diff --git a/dwl/config.def.h b/dwl/config.def.h
index 61e5953..be26d3c 100644
--- a/dwl/config.def.h
+++ b/dwl/config.def.h
@@ -2,14 +2,14 @@
 static const int sloppyfocus               = 1;  /* focus follows mouse */
 static const int bypass_surface_visibility = 0;  /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible  */
 static const unsigned int borderpx         = 1;  /* border pixel of windows */
-static const float rootcolor[]             = {0.3, 0.3, 0.3, 1.0};
 static const float bordercolor[]           = {0.5, 0.5, 0.5, 1.0};
 static const float focuscolor[]            = {1.0, 0.0, 0.0, 1.0};
 /* To conform the xdg-protocol, set the alpha to zero to restore the old behavior */
 static const float fullscreen_bg[]         = {0.1, 0.1, 0.1, 1.0};
 
-/* tagging */
-static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+/* tagging - tagcount must be no greater than 31 */
+#define TAGCOUNT (9)
+static const int tagcount = TAGCOUNT;
 
 static const Rule rules[] = {
 	/* app_id     title       tags mask     isfloating   monitor */
@@ -33,7 +33,7 @@ static const Layout layouts[] = {
 static const MonitorRule monrules[] = {
 	/* name       mfact nmaster scale layout       rotate/reflect                x    y */
 	/* example of a HiDPI laptop monitor:
-	{ "eDP-1",    0.5,  1,      2,    &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL    -1,  -1 },
+	{ "eDP-1",    0.5,  1,      2,    &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL,   -1,  -1 },
 	*/
 	/* defaults */
 	{ NULL,       0.55, 1,      1,    &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL,   -1,  -1 },
@@ -68,9 +68,9 @@ LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN
 static const enum libinput_config_scroll_method scroll_method = LIBINPUT_CONFIG_SCROLL_2FG;
 
 /* You can choose between:
-LIBINPUT_CONFIG_CLICK_METHOD_NONE       
-LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS       
-LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER 
+LIBINPUT_CONFIG_CLICK_METHOD_NONE
+LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS
+LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER
 */
 static const enum libinput_config_click_method click_method = LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS;
 
diff --git a/dwl/config.h b/dwl/config.h
index e78d5d5..57da994 100644
--- a/dwl/config.h
+++ b/dwl/config.h
@@ -115,8 +115,8 @@ static const char *mpc_stop[]    = { "mpc", "stop",      NULL };
 static const char *slock[]       = { "lock",             NULL };
 static const char *flameshot[]   = { "grim_slurp",       NULL };
 
-static const char *vol_dn[] = { "pactl", "set-sink-volume", "0", "-5%", NULL };
-static const char *vol_up[] = { "pactl", "set-sink-volume", "0", "+5%", NULL };
+static const char *vol_dn[] = { "pactl", "set-sink-volume", "0", "-2%", NULL };
+static const char *vol_up[] = { "pactl", "set-sink-volume", "0", "+2%", NULL };
 static const char *vol_mt[] = { "pactl", "set-sink-mute", "0", "toggle", NULL };
 
 static const Key keys[] = {
@@ -125,7 +125,7 @@ static const Key keys[] = {
     { MODKEY,                                      XKB_KEY_d,         spawn,    {.v = menucmd} },
     { MODKEY|WLR_MODIFIER_SHIFT,                   XKB_KEY_space,     spawn,    {.v = albumbler } },
     { MODKEY|WLR_MODIFIER_SHIFT|WLR_MODIFIER_CTRL, XKB_KEY_space,     spawn,    {.v = now_playing } },
-    { MODKEY,                                      XKB_KEY_x,         spawn,    {.v = slock } },
+    { MODKEY|WLR_MODIFIER_SHIFT,                   XKB_KEY_X,         spawn,    {.v = slock } },
     { MODKEY,                                      XKB_KEY_p,         spawn,    {.v = flameshot } },
     { MODKEY|WLR_MODIFIER_SHIFT|WLR_MODIFIER_CTRL, XKB_KEY_Q,         quit,     {0} },
 
diff --git a/dwl/dwl.c b/dwl/dwl.c
index c7bcf5a..83afe99 100644
--- a/dwl/dwl.c
+++ b/dwl/dwl.c
@@ -75,7 +75,7 @@
 /* enums */
 enum { CurNormal, CurPressed, CurMove, CurResize }; /* cursor */
 enum { XDGShell, LayerShell, X11Managed, X11Unmanaged }; /* client types */
-enum { LyrBg, LyrBottom, LyrTop, LyrOverlay, LyrTile, LyrFloat, LyrFS, LyrDragIcon, LyrBlock, NUM_LAYERS }; /* scene layers */
+enum { LyrBg, LyrBottom, LyrTile, LyrFloat, LyrFS, LyrTop, LyrOverlay, LyrBlock, NUM_LAYERS }; /* scene layers */
 #ifdef XWAYLAND
 enum { NetWMWindowTypeDialog, NetWMWindowTypeSplash, NetWMWindowTypeToolbar,
     NetWMWindowTypeUtility, NetLast }; /* EWMH atoms */
@@ -83,7 +83,7 @@ enum { NetWMWindowTypeDialog, NetWMWindowTypeSplash, NetWMWindowTypeToolbar,
 
 typedef union {
     int i;
-    unsigned int ui;
+    uint32_t ui;
     float f;
     const void *v;
 } Arg;
@@ -263,6 +263,7 @@ static void focusmon(const Arg *arg);
 static void focusstack(const Arg *arg);
 static Client *focustop(Monitor *m);
 static void fullscreennotify(struct wl_listener *listener, void *data);
+static void handlesig(int signo);
 static void incnmaster(const Arg *arg);
 static void inputdevice(struct wl_listener *listener, void *data);
 static int keybinding(uint32_t mods, xkb_keysym_t sym);
@@ -286,7 +287,6 @@ static void pointerfocus(Client *c, struct wlr_surface *surface,
         double sx, double sy, uint32_t time);
 static void printstatus(void);
 static void quit(const Arg *arg);
-static void quitsignal(int signo);
 static void rendermon(struct wl_listener *listener, void *data);
 static void requeststartdrag(struct wl_listener *listener, void *data);
 static void resize(Client *c, struct wlr_box geo, int interact);
@@ -318,7 +318,7 @@ static void urgent(struct wl_listener *listener, void *data);
 static void view(const Arg *arg);
 static void virtualkeyboard(struct wl_listener *listener, void *data);
 static Monitor *xytomon(double x, double y);
-static struct wlr_scene_node *xytonode(double x, double y, struct wlr_surface **psurface,
+static void xytonode(double x, double y, struct wlr_surface **psurface,
         Client **pc, LayerSurface **pl, double *nx, double *ny);
 static void zoom(const Arg *arg);
 static void bstack(Monitor *m);
@@ -334,6 +334,9 @@ static struct wl_display *dpy;
 static struct wlr_backend *backend;
 static struct wlr_scene *scene;
 static struct wlr_scene_tree *layers[NUM_LAYERS];
+static struct wlr_scene_tree *drag_icon;
+/* Map from ZWLR_LAYER_SHELL_* constants to Lyr* enum */
+static const int layermap[] = { LyrBg, LyrBottom, LyrTop, LyrOverlay };
 static struct wlr_renderer *drw;
 static struct wlr_allocator *alloc;
 static struct wlr_compositor *compositor;
@@ -402,7 +405,6 @@ static void configurex11(struct wl_listener *listener, void *data);
 static void createnotifyx11(struct wl_listener *listener, void *data);
 static Atom getatom(xcb_connection_t *xc, const char *name);
 static void sethints(struct wl_listener *listener, void *data);
-static void sigchld(int unused);
 static void xwaylandready(struct wl_listener *listener, void *data);
 static struct wl_listener new_xwayland_surface = {.notify = createnotifyx11};
 static struct wl_listener xwayland_ready = {.notify = xwaylandready};
@@ -509,9 +511,10 @@ arrange(Monitor *m)
 
     wlr_scene_node_set_enabled(&m->fullscreen_bg->node,
             (c = focustop(m)) && c->isfullscreen);
-    if (m)
-        strncpy(m->ltsymbol, m->lt->symbol, LENGTH(m->ltsymbol));
-    if (m && m->lt->arrange)
+
+    strncpy(m->ltsymbol, m->lt->symbol, LENGTH(m->ltsymbol));
+
+    if (m->lt->arrange)
         m->lt->arrange(m);
     motionnotify(0);
     checkidleinhibitor(NULL);
@@ -660,13 +663,13 @@ chvt(const Arg *arg)
 void
 checkidleinhibitor(struct wlr_surface *exclude)
 {
-    int inhibited = 0;
+    int inhibited = 0, unused_lx, unused_ly;
     struct wlr_idle_inhibitor_v1 *inhibitor;
     wl_list_for_each(inhibitor, &idle_inhibit_mgr->inhibitors, link) {
         struct wlr_surface *surface = wlr_surface_get_root_surface(inhibitor->surface);
         struct wlr_scene_tree *tree = surface->data;
         if (exclude != surface && (bypass_surface_visibility || (!tree
-                || tree->node.enabled))) {
+                || wlr_scene_node_coords(&tree->node, &unused_lx, &unused_ly)))) {
             inhibited = 1;
             break;
         }
@@ -688,6 +691,7 @@ cleanup(void)
         waitpid(child_pid, NULL, 0);
     }
     wlr_backend_destroy(backend);
+    wlr_scene_node_destroy(&scene->tree.node);
     wlr_renderer_destroy(drw);
     wlr_allocator_destroy(alloc);
     wlr_xcursor_manager_destroy(cursor_mgr);
@@ -765,17 +769,16 @@ commitlayersurfacenotify(struct wl_listener *listener, void *data)
     LayerSurface *layersurface = wl_container_of(listener, layersurface, surface_commit);
     struct wlr_layer_surface_v1 *wlr_layer_surface = layersurface->layer_surface;
     struct wlr_output *wlr_output = wlr_layer_surface->output;
+    struct wlr_scene_tree *layer = layers[layermap[wlr_layer_surface->current.layer]];
 
     /* For some reason this layersurface have no monitor, this can be because
      * its monitor has just been destroyed */
     if (!wlr_output || !(layersurface->mon = wlr_output->data))
         return;
 
-    if (layers[wlr_layer_surface->current.layer] != layersurface->scene->node.parent) {
-        wlr_scene_node_reparent(&layersurface->scene->node,
-                layers[wlr_layer_surface->current.layer]);
-        wlr_scene_node_reparent(&layersurface->popups->node,
-                layers[wlr_layer_surface->current.layer]);
+    if (layer != layersurface->scene->node.parent) {
+        wlr_scene_node_reparent(&layersurface->scene->node, layer);
+        wlr_scene_node_reparent(&layersurface->popups->node, layer);
         wl_list_remove(&layersurface->link);
         wl_list_insert(&layersurface->mon->layers[wlr_layer_surface->current.layer],
                 &layersurface->link);
@@ -795,12 +798,6 @@ void
 commitnotify(struct wl_listener *listener, void *data)
 {
     Client *c = wl_container_of(listener, c, commit);
-    struct wlr_box box = {0};
-    client_get_geometry(c, &box);
-
-    if (c->mon && !wlr_box_empty(&box) && (box.width != c->geom.width - 2 * c->bw
-            || box.height != c->geom.height - 2 * c->bw))
-        c->isfloating ? resize(c, c->geom, 1) : arrange(c->mon);
 
     /* mark a pending resize as completed */
     if (c->resize && c->resize <= c->surface.xdg->current.configure_serial)
@@ -861,12 +858,15 @@ createlayersurface(struct wl_listener *listener, void *data)
     struct wlr_layer_surface_v1 *wlr_layer_surface = data;
     LayerSurface *layersurface;
     struct wlr_layer_surface_v1_state old_state;
+    struct wlr_scene_tree *l = layers[layermap[wlr_layer_surface->pending.layer]];
 
     if (!wlr_layer_surface->output)
         wlr_layer_surface->output = selmon ? selmon->wlr_output : NULL;
 
-    if (!wlr_layer_surface->output)
+    if (!wlr_layer_surface->output) {
         wlr_layer_surface_v1_destroy(wlr_layer_surface);
+        return;
+    }
 
     layersurface = ecalloc(1, sizeof(LayerSurface));
     layersurface->type = LayerShell;
@@ -883,11 +883,9 @@ createlayersurface(struct wl_listener *listener, void *data)
     layersurface->mon = wlr_layer_surface->output->data;
     wlr_layer_surface->data = layersurface;
 
-    layersurface->scene_layer = wlr_scene_layer_surface_v1_create(
-            layers[wlr_layer_surface->pending.layer], wlr_layer_surface);
+    layersurface->scene_layer = wlr_scene_layer_surface_v1_create(l, wlr_layer_surface);
     layersurface->scene = layersurface->scene_layer->tree;
-    layersurface->popups = wlr_layer_surface->surface->data =
-            wlr_scene_tree_create(layers[wlr_layer_surface->pending.layer]);
+    layersurface->popups = wlr_layer_surface->surface->data = wlr_scene_tree_create(l);
 
     layersurface->scene->node.data = layersurface;
 
@@ -1089,6 +1087,9 @@ createpointer(struct wlr_pointer *pointer)
         if (libinput_device_config_click_get_methods(libinput_device) != LIBINPUT_CONFIG_CLICK_METHOD_NONE)
             libinput_device_config_click_set_method (libinput_device, click_method);
 
+        if (libinput_device_config_click_get_methods(libinput_device) != LIBINPUT_CONFIG_CLICK_METHOD_NONE)
+            libinput_device_config_click_set_method (libinput_device, click_method);
+
         if (libinput_device_config_send_events_get_modes(libinput_device))
             libinput_device_config_send_events_set_mode(libinput_device, send_events_mode);
 
@@ -1175,15 +1176,16 @@ destroylocksurface(struct wl_listener *listener, void *data)
     m->lock_surface = NULL;
     wl_list_remove(&m->destroy_lock_surface.link);
 
-    if (lock_surface->surface == seat->keyboard_state.focused_surface) {
-        if (locked && cur_lock && !wl_list_empty(&cur_lock->surfaces)) {
-            surface = wl_container_of(cur_lock->surfaces.next, surface, link);
-            client_notify_enter(surface->surface, wlr_seat_get_keyboard(seat));
-        } else if (!locked) {
-            focusclient(focustop(selmon), 1);
-        } else {
-            wlr_seat_keyboard_clear_focus(seat);
-        }
+    if (lock_surface->surface != seat->keyboard_state.focused_surface)
+        return;
+
+    if (locked && cur_lock && !wl_list_empty(&cur_lock->surfaces)) {
+        surface = wl_container_of(cur_lock->surfaces.next, surface, link);
+        client_notify_enter(surface->surface, wlr_seat_get_keyboard(seat));
+    } else if (!locked) {
+        focusclient(focustop(selmon), 1);
+    } else {
+        wlr_seat_keyboard_clear_focus(seat);
     }
 }
 
@@ -1241,7 +1243,9 @@ void
 focusclient(Client *c, int lift)
 {
     struct wlr_surface *old = seat->keyboard_state.focused_surface;
-    int i;
+    int i, unused_lx, unused_ly, old_client_type;
+    Client *old_c = NULL;
+    LayerSurface *old_l = NULL;
 
     if (locked)
         return;
@@ -1253,6 +1257,12 @@ focusclient(Client *c, int lift)
     if (c && client_surface(c) == old)
         return;
 
+    if ((old_client_type = toplevel_from_wlr_surface(old, &old_c, &old_l)) == XDGShell) {
+        struct wlr_xdg_popup *popup, *tmp;
+        wl_list_for_each_safe(popup, tmp, &old_c->surface.xdg->popups, link)
+            wlr_xdg_popup_destroy(popup);
+    }
+
     /* Put the new client atop the focus stack and select its monitor */
     if (c && !client_is_unmanaged(c)) {
         wl_list_remove(&c->flink);
@@ -1273,20 +1283,17 @@ focusclient(Client *c, int lift)
         /* If an overlay is focused, don't focus or activate the client,
          * but only update its position in fstack to render its border with focuscolor
          * and focus it after the overlay is closed. */
-        Client *w = NULL;
-        LayerSurface *l = NULL;
-        int type = toplevel_from_wlr_surface(old, &w, &l);
-        if (type == LayerShell && l->scene->node.enabled
-                && l->layer_surface->current.layer >= ZWLR_LAYER_SHELL_V1_LAYER_TOP) {
+        if (old_client_type == LayerShell && wlr_scene_node_coords(
+                    &old_l->scene->node, &unused_lx, &unused_ly)
+                && old_l->layer_surface->current.layer >= ZWLR_LAYER_SHELL_V1_LAYER_TOP) {
             return;
-        } else if (w && w == exclusive_focus && client_wants_focus(w)) {
+        } else if (old_c && old_c == exclusive_focus && client_wants_focus(old_c)) {
             return;
         /* Don't deactivate old client if the new one wants focus, as this causes issues with winecfg
          * and probably other clients */
-        } else if (w && !client_is_unmanaged(w) && (!c || !client_wants_focus(c))) {
+        } else if (old_c && !client_is_unmanaged(old_c) && (!c || !client_wants_focus(c))) {
             for (i = 0; i < 4; i++)
-                wlr_scene_rect_set_color(w->border[i], bordercolor);
-
+                wlr_scene_rect_set_color(old_c->border[i], bordercolor);
             client_activate_surface(old, 0);
         }
     }
@@ -1366,6 +1373,27 @@ fullscreennotify(struct wl_listener *listener, void *data)
 }
 
 void
+handlesig(int signo)
+{
+    if (signo == SIGCHLD) {
+#ifdef XWAYLAND
+        siginfo_t in;
+        /* wlroots expects to reap the XWayland process itself, so we
+         * use WNOWAIT to keep the child waitable until we know it's not
+         * XWayland.
+         */
+        while (!waitid(P_ALL, 0, &in, WEXITED|WNOHANG|WNOWAIT) && in.si_pid
+                && (!xwayland || in.si_pid != xwayland->server->pid))
+            waitpid(in.si_pid, NULL, 0);
+#else
+        while (waitpid(-1, NULL, WNOHANG) > 0);
+#endif
+    } else if (signo == SIGINT || signo == SIGTERM) {
+        quit(NULL);
+    }
+}
+
+void
 incnmaster(const Arg *arg)
 {
     if (!arg || !selmon)
@@ -1462,12 +1490,13 @@ keypress(struct wl_listener *listener, void *data)
         wl_event_source_timer_update(kb->key_repeat_source, 0);
     }
 
-    if (!handled) {
-        /* Pass unhandled keycodes along to the client. */
-        wlr_seat_set_keyboard(seat, kb->wlr_keyboard);
-        wlr_seat_keyboard_notify_key(seat, event->time_msec,
-            event->keycode, event->state);
-    }
+    if (handled)
+        return;
+
+    /* Pass unhandled keycodes along to the client. */
+    wlr_seat_set_keyboard(seat, kb->wlr_keyboard);
+    wlr_seat_keyboard_notify_key(seat, event->time_msec,
+        event->keycode, event->state);
 }
 
 void
@@ -1493,13 +1522,14 @@ keyrepeat(void *data)
 {
     Keyboard *kb = data;
     int i;
-    if (kb->nsyms && kb->wlr_keyboard->repeat_info.rate > 0) {
-        wl_event_source_timer_update(kb->key_repeat_source,
-                1000 / kb->wlr_keyboard->repeat_info.rate);
+    if (!kb->nsyms || kb->wlr_keyboard->repeat_info.rate <= 0)
+        return 0;
 
-        for (i = 0; i < kb->nsyms; i++)
-            keybinding(kb->mods, kb->keysyms[i]);
-    }
+    wl_event_source_timer_update(kb->key_repeat_source,
+            1000 / kb->wlr_keyboard->repeat_info.rate);
+
+    for (i = 0; i < kb->nsyms; i++)
+        keybinding(kb->mods, kb->keysyms[i]);
 
     return 0;
 }
@@ -1541,7 +1571,6 @@ void
 maplayersurfacenotify(struct wl_listener *listener, void *data)
 {
     LayerSurface *l = wl_container_of(listener, l, map);
-    wlr_surface_send_enter(l->layer_surface->surface, l->mon->wlr_output);
     motionnotify(0);
 }
 
@@ -1669,7 +1698,6 @@ motionnotify(uint32_t time)
     LayerSurface *l = NULL;
     int type;
     struct wlr_surface *surface = NULL;
-    struct wlr_drag_icon *icon;
 
     /* time is 0 in internal calls meant to restore pointer focus. */
     if (time) {
@@ -1680,10 +1708,9 @@ motionnotify(uint32_t time)
             selmon = xytomon(cursor->x, cursor->y);
     }
 
-    /* Update drag icon's position if any */
-    if (seat->drag && (icon = seat->drag->icon))
-        wlr_scene_node_set_position(icon->data, cursor->x + icon->surface->sx,
-                cursor->y + icon->surface->sy);
+    /* Update drag icon's position */
+    wlr_scene_node_set_position(&drag_icon->node, cursor->x, cursor->y);
+
     /* If we are currently grabbing the mouse, handle and return */
     if (cursor_mode == CurMove) {
         /* Move the grabbed client to the new position. */
@@ -1908,12 +1935,6 @@ quit(const Arg *arg)
 }
 
 void
-quitsignal(int signo)
-{
-    quit(NULL);
-}
-
-void
 rendermon(struct wl_listener *listener, void *data)
 {
     /* This function is called every time an output is ready to display a frame,
@@ -1927,8 +1948,8 @@ rendermon(struct wl_listener *listener, void *data)
     wl_list_for_each(c, &clients, link)
         if (c->resize && !c->isfloating && client_is_rendered_on_mon(c, m) && !client_is_stopped(c))
             goto skip;
-    if (!wlr_scene_output_commit(m->scene_output))
-        return;
+    wlr_scene_output_commit(m->scene_output);
+
 skip:
     /* Let clients know a frame has been rendered */
     clock_gettime(CLOCK_MONOTONIC, &now);
@@ -1976,8 +1997,6 @@ run(char *startup_cmd)
 {
     /* Add a Unix socket to the Wayland display. */
     const char *socket = wl_display_add_socket_auto(dpy);
-    struct sigaction sa = {.sa_flags = SA_RESTART, .sa_handler = SIG_IGN};
-    sigemptyset(&sa.sa_mask);
     if (!socket)
         die("startup: display_add_socket_auto");
     setenv("WAYLAND_DISPLAY", socket, 1);
@@ -2005,8 +2024,6 @@ run(char *startup_cmd)
         close(piperw[1]);
         close(piperw[0]);
     }
-    /* If nobody is reading the status output, don't terminate */
-    sigaction(SIGPIPE, &sa, NULL);
     printstatus();
 
     /* At this point the outputs are initialized, choose initial selmon based on
@@ -2055,6 +2072,8 @@ void
 setfloating(Client *c, int floating)
 {
     c->isfloating = floating;
+    if (!c->mon)
+        return;
     wlr_scene_node_reparent(&c->scene->node, layers[c->isfloating ? LyrFloat : LyrTile]);
     arrange(c->mon);
     printstatus();
@@ -2122,17 +2141,15 @@ setmon(Client *c, Monitor *m, uint32_t newtags)
     c->mon = m;
     c->prev = c->geom;
 
-    /* TODO leave/enter is not optimal but works */
-    if (oldmon) {
-        wlr_surface_send_leave(client_surface(c), oldmon->wlr_output);
+    /* Scene graph sends surface leave/enter events on move and resize */
+    if (oldmon)
         arrange(oldmon);
-    }
     if (m) {
         /* Make sure window actually overlaps with the monitor */
         resize(c, c->geom, 0);
-        wlr_surface_send_enter(client_surface(c), m->wlr_output);
         c->tags = newtags ? newtags : m->tagset; /* assign tags of target monitor */
         setfullscreen(c, c->isfullscreen); /* This will call arrange(c->mon) */
+        setfloating(c, c->isfloating);
     }
     focusclient(focustop(selmon), 1);
 }
@@ -2162,27 +2179,17 @@ setsel(struct wl_listener *listener, void *data)
 void
 setup(void)
 {
-    struct sigaction sa_term = {.sa_flags = SA_RESTART, .sa_handler = quitsignal};
-    struct sigaction sa_sigchld = {
-#ifdef XWAYLAND
-        .sa_flags = SA_RESTART,
-        .sa_handler = sigchld,
-#else
-        .sa_flags = SA_NOCLDSTOP | SA_NOCLDWAIT | SA_RESTART,
-        .sa_handler = SIG_IGN,
-#endif
-    };
-    sigemptyset(&sa_term.sa_mask);
-    sigemptyset(&sa_sigchld.sa_mask);
+    int i, sig[] = {SIGCHLD, SIGINT, SIGTERM, SIGPIPE};
+    struct sigaction sa = {.sa_flags = SA_RESTART, .sa_handler = handlesig};
+    sigemptyset(&sa.sa_mask);
+
+    for (i = 0; i < LENGTH(sig); i++)
+        sigaction(sig[i], &sa, NULL);
+
     /* The Wayland display is managed by libwayland. It handles accepting
      * clients from the Unix socket, manging Wayland globals, and so on. */
     dpy = wl_display_create();
 
-    /* Set up signal handlers */
-    sigaction(SIGCHLD, &sa_sigchld, NULL);
-    sigaction(SIGINT, &sa_term, NULL);
-    sigaction(SIGTERM, &sa_term, NULL);
-
     /* The backend is a wlroots feature which abstracts the underlying input and
      * output hardware. The autocreate option will choose the most suitable
      * backend based on the current environment, such as opening an X11 window
@@ -2196,15 +2203,10 @@ setup(void)
 
     /* Initialize the scene graph used to lay out windows */
     scene = wlr_scene_create();
-    layers[LyrBg] = wlr_scene_tree_create(&scene->tree);
-    layers[LyrBottom] = wlr_scene_tree_create(&scene->tree);
-    layers[LyrTile] = wlr_scene_tree_create(&scene->tree);
-    layers[LyrFloat] = wlr_scene_tree_create(&scene->tree);
-    layers[LyrFS] = wlr_scene_tree_create(&scene->tree);
-    layers[LyrTop] = wlr_scene_tree_create(&scene->tree);
-    layers[LyrOverlay] = wlr_scene_tree_create(&scene->tree);
-    layers[LyrDragIcon] = wlr_scene_tree_create(&scene->tree);
-    layers[LyrBlock] = wlr_scene_tree_create(&scene->tree);
+    for (i = 0; i < NUM_LAYERS; i++)
+        layers[i] = wlr_scene_tree_create(&scene->tree);
+    drag_icon = wlr_scene_tree_create(&scene->tree);
+    wlr_scene_node_place_below(&drag_icon->node, &layers[LyrBlock]->node);
 
     /* Create a renderer with the default implementation */
     if (!(drw = wlr_renderer_autocreate(backend)))
@@ -2295,6 +2297,7 @@ setup(void)
      * images are available at all scale factors on the screen (necessary for
      * HiDPI support). Scaled cursors will be loaded with each output. */
     cursor_mgr = wlr_xcursor_manager_create(NULL, 24);
+    setenv("XCURSOR_SIZE", "24", 1);
 
     /*
      * wlr_cursor *only* displays an image on screen. It does not move around
@@ -2370,12 +2373,10 @@ void
 startdrag(struct wl_listener *listener, void *data)
 {
     struct wlr_drag *drag = data;
-
     if (!drag->icon)
         return;
 
-    drag->icon->data = wlr_scene_subsurface_tree_create(layers[LyrDragIcon], drag->icon->surface);
-    motionnotify(0);
+    drag->icon->data = &wlr_scene_subsurface_tree_create(drag_icon, drag->icon->surface)->node;
     wl_signal_add(&drag->icon->events.destroy, &drag_icon_destroy);
 }
 
@@ -2383,11 +2384,12 @@ void
 tag(const Arg *arg)
 {
     Client *sel = focustop(selmon);
-    if (sel && arg->ui & TAGMASK) {
-        sel->tags = arg->ui & TAGMASK;
-        focusclient(focustop(selmon), 1);
-        arrange(selmon);
-    }
+    if (!sel || (arg->ui & TAGMASK) == 0)
+        return;
+
+    sel->tags = arg->ui & TAGMASK;
+    focusclient(focustop(selmon), 1);
+    arrange(selmon);
     printstatus();
 }
 
@@ -2425,7 +2427,7 @@ tile(Monitor *m)
             resize(c, (struct wlr_box){
                 .x = m->w.x + m->w.width - mw,
                 .y = m->w.y + my,
-                .width = mw - gap,
+                .width = mw,
                 .height = h
               }, 0);
             my += c->geom.height + gap;
@@ -2469,11 +2471,12 @@ toggletag(const Arg *arg)
     if (!sel)
         return;
     newtags = sel->tags ^ (arg->ui & TAGMASK);
-    if (newtags) {
-        sel->tags = newtags;
-        focusclient(focustop(selmon), 1);
-        arrange(selmon);
-    }
+    if (!newtags)
+        return;
+
+    sel->tags = newtags;
+    focusclient(focustop(selmon), 1);
+    arrange(selmon);
     printstatus();
 }
 
@@ -2483,30 +2486,18 @@ toggleview(const Arg *arg)
     uint32_t newtagset = selmon ? selmon->tagset ^ (arg->ui & TAGMASK) : 0;
     uint32_t i;
 
-    if (newtagset) {
-        selmon->tagset = newtagset;
-
-        if (newtagset == ~0) {
-            selmon->prevtag = selmon->curtag;
-            selmon->curtag = 0;
-        }
-
-        /* test if the user did not select the same tag */
-        if (!(newtagset & 1 << (selmon->curtag - 1))) {
-            selmon->prevtag = selmon->curtag;
-            for (i = 0; !(newtagset & 1 << i); i++) ;
-            selmon->curtag = i + 1;
-        }
+    if (!newtagset)
+        return;
 
-        /* apply settings for this view */
-        selmon->nmaster = selmon->pertag->nmasters[selmon->curtag];
-        selmon->mfact = selmon->pertag->mfacts[selmon->curtag];
-        selmon->sellt = selmon->pertag->sellts[selmon->curtag];
-        selmon->lt = selmon->pertag->ltidxs[selmon->curtag];
+    selmon->tagset = newtagset;
+    /* apply settings for this view */
+    selmon->nmaster = selmon->pertag->nmasters[selmon->curtag];
+    selmon->mfact = selmon->pertag->mfacts[selmon->curtag];
+    selmon->sellt = selmon->pertag->sellts[selmon->curtag];
+    selmon->lt = selmon->pertag->ltidxs[selmon->curtag];
 
-        focusclient(focustop(selmon), 1);
-        arrange(selmon);
-    }
+    focusclient(focustop(selmon), 1);
+    arrange(selmon);
     printstatus();
 }
 
@@ -2638,9 +2629,12 @@ updatemons(struct wl_listener *listener, void *data)
         wl_list_for_each(c, &clients, link)
             if (!c->mon && client_is_mapped(c))
                 setmon(c, selmon, c->tags);
-        if (selmon->lock_surface)
+        focusclient(focustop(selmon), 1);
+        if (selmon->lock_surface) {
             client_notify_enter(selmon->lock_surface->surface,
                     wlr_seat_get_keyboard(seat));
+            client_activate_surface(selmon->lock_surface->surface, 1);
+        }
     }
 
     wlr_output_manager_v1_set_configuration(output_mgr, config);
@@ -2660,10 +2654,11 @@ urgent(struct wl_listener *listener, void *data)
     struct wlr_xdg_activation_v1_request_activate_event *event = data;
     Client *c = NULL;
     toplevel_from_wlr_surface(event->surface, &c, NULL);
-    if (c && c != focustop(selmon)) {
-        c->isurgent = 1;
-        printstatus();
-    }
+    if (!c || c == focustop(selmon))
+        return;
+
+    c->isurgent = 1;
+    printstatus();
 }
 
 void
@@ -2715,7 +2710,7 @@ xytomon(double x, double y)
     return o ? o->data : NULL;
 }
 
-struct wlr_scene_node *
+void
 xytonode(double x, double y, struct wlr_surface **psurface,
         Client **pc, LayerSurface **pl, double *nx, double *ny)
 {
@@ -2723,30 +2718,27 @@ xytonode(double x, double y, struct wlr_surface **psurface,
     struct wlr_surface *surface = NULL;
     Client *c = NULL;
     LayerSurface *l = NULL;
-    const int *layer;
-    int focus_order[] = { LyrBlock, LyrOverlay, LyrTop, LyrFS, LyrFloat, LyrTile, LyrBottom, LyrBg };
-
-    for (layer = focus_order; layer < END(focus_order); layer++) {
-        if ((node = wlr_scene_node_at(&layers[*layer]->node, x, y, nx, ny))) {
-            if (node->type == WLR_SCENE_NODE_BUFFER)
-                surface = wlr_scene_surface_from_buffer(
-                        wlr_scene_buffer_from_node(node))->surface;
-            /* Walk the tree to find a node that knows the client */
-            for (pnode = node; pnode && !c; pnode = &pnode->parent->node)
-                c = pnode->data;
-            if (c && c->type == LayerShell) {
-                c = NULL;
-                l = pnode->data;
-            }
+    int layer;
+
+    for (layer = NUM_LAYERS - 1; !surface && layer >= 0; layer--) {
+        if (!(node = wlr_scene_node_at(&layers[layer]->node, x, y, nx, ny)))
+            continue;
+
+        if (node->type == WLR_SCENE_NODE_BUFFER)
+            surface = wlr_scene_surface_from_buffer(
+                    wlr_scene_buffer_from_node(node))->surface;
+        /* Walk the tree to find a node that knows the client */
+        for (pnode = node; pnode && !c; pnode = &pnode->parent->node)
+            c = pnode->data;
+        if (c && c->type == LayerShell) {
+            c = NULL;
+            l = pnode->data;
         }
-        if (surface)
-            break;
     }
 
     if (psurface) *psurface = surface;
     if (pc) *pc = c;
     if (pl) *pl = l;
-    return node;
 }
 
 void
@@ -2846,28 +2838,11 @@ void
 sethints(struct wl_listener *listener, void *data)
 {
     Client *c = wl_container_of(listener, c, set_hints);
-    if (c != focustop(selmon)) {
-        c->isurgent = xcb_icccm_wm_hints_get_urgency(c->surface.xwayland->hints);
-        printstatus();
-    }
-}
+    if (c == focustop(selmon))
+        return;
 
-void
-sigchld(int unused)
-{
-    siginfo_t in;
-    /* We should be able to remove this function in favor of a simple
-     *	struct sigaction sa = {.sa_handler = SIG_IGN};
-     *  sigaction(SIGCHLD, &sa, NULL);
-     * but the Xwayland implementation in wlroots currently prevents us from
-     * setting our own disposition for SIGCHLD.
-     */
-    /* WNOWAIT leaves the child in a waitable state, in case this is the
-     * XWayland process
-     */
-    while (!waitid(P_ALL, 0, &in, WEXITED|WNOHANG|WNOWAIT) && in.si_pid
-            && (!xwayland || in.si_pid != xwayland->server->pid))
-        waitpid(in.si_pid, NULL, 0);
+    c->isurgent = xcb_icccm_wm_hints_get_urgency(c->surface.xwayland->hints);
+    printstatus();
 }
 
 void