simpleborders: update filename structure and add version

patches/autostart/README.md

@@ -5,8 +5,9 @@ Note: Commands from array are executed using execvp(). So if you need to execute
 
 ### Download
 - [git branch](https://codeberg.org/sevz/dwl/src/branch/autostart)
-- [autostart-wlroots-next-f4249db.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/autostart/autostart-wlroots-next-f4249db.patch)
+- [autostart_main-5fd19fe](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/autostart/autostart_main-5fd19fe.patch)
-- [autostart-0.8.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/autostart/autostart-0.8.patch)
+- [autostart_wlroots-next-f4249db.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/autostart/autostart_wlroots-next-f4249db.patch)
+- [autostart_0.8.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/autostart/autostart_0.8.patch)
 
 ### Authors
 - [fauxmight](https://codeberg.org/fauxmight)

patches/autostart/autostart_main-5fd19fe.patch

@@ -0,0 +1,128 @@
+diff --git a/config.def.h b/config.def.h
+index 572984b..0697b66 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -20,6 +20,12 @@ static const float fullscreen_bg[]         = {0.0f, 0.0f, 0.0f, 1.0f}; /* You ca
+ /* logging */
+ static int log_level = WLR_ERROR;
+ 
++/* Autostart */
++static const char *const autostart[] = {
++        "wbg", "/path/to/your/image", NULL,
++        NULL /* terminate */
++};
++
+ static const Rule rules[] = {
+ 	/* app_id             title       tags mask     isfloating   monitor */
+ 	{ "Gimp_EXAMPLE",     NULL,       0,            1,           -1 }, /* Start on currently visible tags floating, not tiled */
+diff --git a/dwl.c b/dwl.c
+index f902ace..36496b3 100644
+--- a/dwl.c
++++ b/dwl.c
+@@ -263,6 +263,7 @@ static void arrange(Monitor *m);
+ static void arrangelayer(Monitor *m, struct wl_list *list,
+ 		struct wlr_box *usable_area, int exclusive);
+ static void arrangelayers(Monitor *m);
++static void autostartexec(void);
+ static void axisnotify(struct wl_listener *listener, void *data);
+ static void buttonpress(struct wl_listener *listener, void *data);
+ static void capturerequest(struct wl_listener *listener, void *data);
+@@ -471,6 +472,9 @@ static struct wl_listener xwayland_ready = {.notify = xwaylandready};
+ static struct wlr_xwayland *xwayland;
+ #endif
+ 
++static pid_t *autostart_pids;
++static size_t autostart_len;
++
+ /* configuration, allows nested code to access above variables */
+ #include "config.h"
+ 
+@@ -630,6 +634,27 @@ arrangelayers(Monitor *m)
+ 	}
+ }
+ 
++void
++autostartexec(void) {
++	const char *const *p;
++	size_t i = 0;
++
++	/* count entries */
++	for (p = autostart; *p; autostart_len++, p++)
++		while (*++p);
++
++	autostart_pids = calloc(autostart_len, sizeof(pid_t));
++	for (p = autostart; *p; i++, p++) {
++		if ((autostart_pids[i] = fork()) == 0) {
++			setsid();
++			execvp(*p, (char *const *)p);
++			die("dwl: execvp %s:", *p);
++		}
++		/* skip arguments */
++		while (*++p);
++	}
++}
++
+ void
+ axisnotify(struct wl_listener *listener, void *data)
+ {
+@@ -767,12 +792,23 @@ checkidleinhibitor(struct wlr_surface *exclude)
+ void
+ cleanup(void)
+ {
++	size_t i;
++
+ 	cleanuplisteners();
+ #ifdef XWAYLAND
+ 	wlr_xwayland_destroy(xwayland);
+ 	xwayland = NULL;
+ #endif
+ 	wl_display_destroy_clients(dpy);
++
++	/* kill child processes */
++	for (i = 0; i < autostart_len; i++) {
++		if (0 < autostart_pids[i]) {
++			kill(autostart_pids[i], SIGTERM);
++			waitpid(autostart_pids[i], NULL, 0);
++		}
++	}
++
+ 	if (child_pid > 0) {
+ 		kill(-child_pid, SIGTERM);
+ 		waitpid(child_pid, NULL, 0);
+@@ -1646,10 +1682,25 @@ gpureset(struct wl_listener *listener, void *data)
+ void
+ handlesig(int signo)
+ {
+-	if (signo == SIGCHLD)
+-		while (waitpid(-1, NULL, WNOHANG) > 0);
+-	else if (signo == SIGINT || signo == SIGTERM)
++	if (signo == SIGCHLD) {
++		pid_t pid, *p, *lim;
++		while ((pid = waitpid(-1, NULL, WNOHANG)) > 0) {
++			if (pid == child_pid)
++				child_pid = -1;
++			if (!(p = autostart_pids))
++				continue;
++			lim = &p[autostart_len];
++
++			for (; p < lim; p++) {
++				if (*p == pid) {
++					*p = -1;
++					break;
++				}
++			}
++		}
++	} else if (signo == SIGINT || signo == SIGTERM) {
+ 		quit(NULL);
++	}
+ }
+ 
+ void
+@@ -2365,6 +2416,7 @@ run(char *startup_cmd)
+ 		die("startup: backend_start");
+ 
+ 	/* Now that the socket exists and the backend is started, run the startup command */
++	autostartexec();
+ 	if (startup_cmd) {
+ 		int piperw[2];
+ 		if (pipe(piperw) < 0)

patches/customfloat/README.md

@@ -9,14 +9,14 @@ The variable `center_relative_to_monitor` allows the user to choose whether to c
 <summary>Explanation of center_relative_to_monitor:</summary>
 <pre>
 The "Monitor area" refers to the space enclosed by the green rectangle, while the "Window area" refers to the space enclosed by the red rectangle.
-<img src="https://i.imgur.com/xhejzPh.png"/>
+<img src="customfloat-monitor-vs-window.png"/>
 </pre>
 </details>
 
 ### Download
-- [git branch](https://codeberg.org/wochap/dwl/src/branch/v0.5/customfloat)
+- [customfloat_main-5fd19fe](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/customfloat/customfloat_main-5fd19fe.patch)
-- [wlroots-next-f4249db](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/customfloat/customfloat-wlroots-next-f4249db.patch)
+- [customfloat_wlroots-next-f4249db](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/customfloat/customfloat_wlroots-next-f4249db.patch)
-- [0.8](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/customfloat/customfloat-0.8.patch)
+- [customfloat_0.8](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/customfloat/customfloat_0.8.patch)
 
 ### Authors
 - [fauxmight](https://codeberg.org/fauxmight)

patches/customfloat/customfloat_main-5fd19fe.patch

@@ -0,0 +1,82 @@
+diff --git a/config.def.h b/config.def.h
+index 572984b..708d87a 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -13,6 +13,7 @@ static const float focuscolor[]            = COLOR(0x005577ff);
+ static const float urgentcolor[]           = COLOR(0xff0000ff);
+ /* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */
+ static const float fullscreen_bg[]         = {0.0f, 0.0f, 0.0f, 1.0f}; /* You can also use glsl colors */
++static const int respect_monitor_reserved_area = 0;  /* 1 to monitor center while respecting the monitor's reserved area, 0 to monitor center */
+ 
+ /* tagging - TAGCOUNT must be no greater than 31 */
+ #define TAGCOUNT (9)
+@@ -21,9 +22,9 @@ static const float fullscreen_bg[]         = {0.0f, 0.0f, 0.0f, 1.0f}; /* You ca
+ static int log_level = WLR_ERROR;
+ 
+ static const Rule rules[] = {
+-	/* app_id             title       tags mask     isfloating   monitor */
+-	{ "Gimp_EXAMPLE",     NULL,       0,            1,           -1 }, /* Start on currently visible tags floating, not tiled */
+-	{ "firefox_EXAMPLE",  NULL,       1 << 8,       0,           -1 }, /* Start on ONLY tag "9" */
++	/* app_id             title       tags mask     isfloating   monitor   x   y   width   height */
++	{ "Gimp_EXAMPLE",     NULL,       0,            1,           -1,       -1, -1, 1000,   0.75 }, /* Start on currently visible tags floating, not tiled */
++	{ "firefox_EXAMPLE",  NULL,       1 << 8,       0,           -1,       -1, -1, -1,     -1 },   /* Start on ONLY tag "9" */
+     /* default/example rule: can be changed but cannot be eliminated; at least one rule must exist */
+ };
+ 
+diff --git a/dwl.c b/dwl.c
+index f902ace..97e09e6 100644
+--- a/dwl.c
++++ b/dwl.c
+@@ -245,6 +245,10 @@ typedef struct {
+ 	uint32_t tags;
+ 	int isfloating;
+ 	int monitor;
++	int x;
++	int y;
++	float w;
++	float h;
+ } Rule;
+ 
+ typedef struct {
+@@ -506,6 +510,11 @@ applyrules(Client *c)
+ 	int i;
+ 	const Rule *r;
+ 	Monitor *mon = selmon, *m;
++	int newwidth;
++	int newheight;
++	int newx;
++	int newy;
++	int apply_resize = 0;
+ 
+ 	appid = client_get_appid(c);
+ 	title = client_get_title(c);
+@@ -519,12 +528,29 @@ applyrules(Client *c)
+ 			wl_list_for_each(m, &mons, link) {
+ 				if (r->monitor == i++)
+ 					mon = m;
++				if (c->isfloating || !mon->lt[mon->sellt]->arrange) {
++					/* client is floating or in floating layout */
++					struct wlr_box b = respect_monitor_reserved_area ? mon->w : mon->m;
++					newwidth  = (int)round((r->w >= 0) ? (r->w <= 1 ? b.width  * r->w       : r->w)       : c->geom.width);
++					newheight = (int)round((r->h >= 0) ? (r->h <= 1 ? b.height * r->h       : r->h)       : c->geom.height);
++					newx      = (int)round((r->x >= 0) ? (r->x <= 1 ? b.width  * r->x + b.x : r->x + b.x) : c->geom.x);
++					newy      = (int)round((r->y >= 0) ? (r->y <= 1 ? b.height * r->y + b.y : r->y + b.y) : c->geom.y);
++					apply_resize = 1;
++				}
+ 			}
+ 		}
+ 	}
+ 
+ 	c->isfloating |= client_is_float_type(c);
+ 	setmon(c, mon, newtags);
++	if (apply_resize) {
++		resize(c, (struct wlr_box){
++				.x = newx,
++				.y = newy,
++				.width = newwidth,
++				.height = newheight,
++		}, 1);
++	}
+ }
+ 
+ void

patches/numlock-capslock/README.md

@@ -2,8 +2,9 @@
 Allows activating numlock or capslock at startup.
 
 ### Download
-- [numlock-capslock-wlroots-next-f4249db.patch](/dwl/dwl-patches/raw/branch/main/patches/numlock-capslock/numlock-capslock-wlroots-next-f4249db.patch)
+- [numlock-capslock_main-5fd19fe.patch](/dwl/dwl-patches/raw/branch/main/patches/numlock-capslock/numlock-capslock_main-5fd19fe.patch)
-- [numlock-capslock-0.8.patch](/dwl/dwl-patches/raw/branch/main/patches/numlock-capslock/numlock-capslock-0.8.patch)
+- [numlock-capslock_wlroots-next-f4249db.patch](/dwl/dwl-patches/raw/branch/main/patches/numlock-capslock/numlock-capslock_wlroots-next-f4249db.patch)
+- [numlock-capslock_0.8.patch](/dwl/dwl-patches/raw/branch/main/patches/numlock-capslock/numlock-capslock_0.8.patch)
 
 ### Authors
 - [fauxmight](https://codeberg.org/fauxmight)

patches/numlock-capslock/numlock-capslock_main-5fd19fe.patch

@@ -0,0 +1,66 @@
+diff --git a/config.def.h b/config.def.h
+index 572984b..5dae6d3 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -56,6 +56,10 @@ static const struct xkb_rule_names xkb_rules = {
+ 	.options = NULL,
+ };
+ 
++/* numlock and capslock */
++static const int numlock = 1;
++static const int capslock = 0;
++
+ static const int repeat_rate = 25;
+ static const int repeat_delay = 600;
+ 
+diff --git a/dwl.c b/dwl.c
+index f902ace..7023cab 100644
+--- a/dwl.c
++++ b/dwl.c
+@@ -14,6 +14,7 @@
+ #include <wayland-server-core.h>
+ #include <wlr/backend.h>
+ #include <wlr/backend/libinput.h>
++#include <wlr/interfaces/wlr_keyboard.h>
+ #include <wlr/render/allocator.h>
+ #include <wlr/render/wlr_renderer.h>
+ #include <wlr/types/wlr_alpha_modifier_v1.h>
+@@ -373,6 +374,7 @@ static void zoom(const Arg *arg);
+ /* variables */
+ static pid_t child_pid = -1;
+ static int locked;
++static uint32_t locked_mods = 0;
+ static void *exclusive_focus;
+ static struct wl_display *dpy;
+ static struct wl_event_loop *event_loop;
+@@ -1019,6 +1021,8 @@ createkeyboard(struct wlr_keyboard *keyboard)
+ 	/* Set the keymap to match the group keymap */
+ 	wlr_keyboard_set_keymap(keyboard, kb_group->wlr_group->keyboard.keymap);
+ 
++	wlr_keyboard_notify_modifiers(keyboard, 0, 0, locked_mods, 0);
++
+ 	/* Add the new keyboard to the group */
+ 	wlr_keyboard_group_add_keyboard(kb_group->wlr_group, keyboard);
+ }
+@@ -1040,6 +1044,21 @@ createkeyboardgroup(void)
+ 		die("failed to compile keymap");
+ 
+ 	wlr_keyboard_set_keymap(&group->wlr_group->keyboard, keymap);
++	if (numlock) {
++		xkb_mod_index_t mod_index = xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_NUM);
++		if (mod_index != XKB_MOD_INVALID)
++			locked_mods |= (uint32_t)1 << mod_index;
++	}
++
++	if (capslock) {
++		xkb_mod_index_t mod_index = xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_CAPS);
++		if (mod_index != XKB_MOD_INVALID)
++			locked_mods |= (uint32_t)1 << mod_index;
++	}
++
++	if (locked_mods)
++		wlr_keyboard_notify_modifiers(&group->wlr_group->keyboard, 0, 0, locked_mods, 0);
++
+ 	xkb_keymap_unref(keymap);
+ 	xkb_context_unref(context);
+ 

patches/simpleborders/README.md

@@ -4,8 +4,9 @@ Like smartborders. Don't put borders when there is only one window on the screen
 
 ### Download
 - [git branch](https://codeberg.org/bencc/dwl/src/branch/simpleborders)
-- [simpleborders-wlroots-next-f4249db](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simpleborders/simpleborders-wlroots-next-f4249db.patch)
+- [simpleborders_main-5fd19fe.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simpleborders/simpleborders_main-5fd19fe.patch)
-- [simpleborders-0.8.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simpleborders/simpleborders-v0.8.patch)
+- [simpleborders_wlroots-next-f4249db.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simpleborders/simpleborders_wlroots-next-f4249db.patch)
+- [simpleborders_0.8.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simpleborders/simpleborders_0.8.patch)
 
 ### Authors
 - [A Frederick Christensen](https://codeberg.org/fauxmight)

patches/simpleborders/simpleborders_main-5fd19fe.patch

@@ -0,0 +1,61 @@
+diff --git a/dwl.c b/dwl.c
+index f902ace..5c3f0ee 100644
+--- a/dwl.c
++++ b/dwl.c
+@@ -275,6 +275,7 @@ static void closemon(Monitor *m);
+ static void commitlayersurfacenotify(struct wl_listener *listener, void *data);
+ static void commitnotify(struct wl_listener *listener, void *data);
+ static void commitpopup(struct wl_listener *listener, void *data);
++static int countclients(Monitor *m);
+ static void createdecoration(struct wl_listener *listener, void *data);
+ static void createidleinhibitor(struct wl_listener *listener, void *data);
+ static void createkeyboard(struct wlr_keyboard *keyboard);
+@@ -323,6 +324,7 @@ static void motionnotify(uint32_t time, struct wlr_input_device *device, double
+ 		double sy, double sx_unaccel, double sy_unaccel);
+ static void motionrelative(struct wl_listener *listener, void *data);
+ static void moveresize(const Arg *arg);
++static int needsborder(Client *c);
+ static void outputmgrapply(struct wl_listener *listener, void *data);
+ static void outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int test);
+ static void outputmgrtest(struct wl_listener *listener, void *data);
+@@ -991,6 +993,17 @@ commitpopup(struct wl_listener *listener, void *data)
+ 	free(listener);
+ }
+ 
++int
++countclients(Monitor *m)
++{
++	unsigned int n = 0;
++	Client *c;
++	wl_list_for_each(c, &clients, link)
++		if (VISIBLEON(c, m) && !c->isfloating && !c->isfullscreen)
++			n++;
++	return n;
++}
++
+ void
+ createdecoration(struct wl_listener *listener, void *data)
+ {
+@@ -2099,6 +2112,14 @@ moveresize(const Arg *arg)
+ 	}
+ }
+ 
++int
++needsborder(Client *c) {
++	return ((countclients(c->mon) > 1
++			&& c->mon->lt[c->mon->sellt]->arrange != monocle)
++		|| c->isfloating)
++		&& !c->isfullscreen;
++}
++
+ void
+ outputmgrapply(struct wl_listener *listener, void *data)
+ {
+@@ -2330,6 +2351,7 @@ resize(Client *c, struct wlr_box geo, int interact)
+ 
+ 	client_set_bounds(c, geo.width, geo.height);
+ 	c->geom = geo;
++	c->bw = needsborder(c) ? borderpx : 0;
+ 	applybounds(c, bbox);
+ 
+ 	/* Update scene-graph, including borders */