added smartborders branch and patch

config.def.h

@@ -6,6 +6,7 @@
 /* appearance */
 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 int smartborders              = 1;
 static const unsigned int borderpx         = 1;  /* border pixel of windows */
 static const float rootcolor[]             = COLOR(0x222222ff);
 static const float bordercolor[]           = COLOR(0x444444ff);
@@ -60,18 +61,6 @@ static const struct xkb_rule_names xkb_rules = {
 	.options = NULL,
 };
 
-/* input devices */
-static const InputRule inputrules[] = {
-	/* name                      kbcreate                 ptrcreate      */
-	/* ignore bad device - like a touchpad ;) */
-	{ "BAD DEVICE",              NULL,                    NULL                },
-	/* ungroup ydotool device - fixes a bug */
-	{ "ydotoold virtual device", createungroupedkeyboard, createpointer       },
-	/* put your touchpad name here to enable toggle touchpad */
-	{ "Elan Touchpad",           createkeyboard,          createtogglepointer },
-	{ NULL,                      createkeyboard,          createpointer       },
-};
-
 static const int repeat_rate = 25;
 static const int repeat_delay = 600;
 
@@ -154,7 +143,6 @@ static const Key keys[] = {
 	{ MODKEY,                    XKB_KEY_space,      setlayout,      {0} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space,      togglefloating, {0} },
 	{ MODKEY,                    XKB_KEY_e,         togglefullscreen, {0} },
-	{ MODKEY,                    XKB_KEY_u,          togglepointer,  {0} },
 	{ MODKEY,                    XKB_KEY_0,          view,           {.ui = ~0} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag,            {.ui = ~0} },
 	{ MODKEY,                    XKB_KEY_comma,      focusmon,       {.i = WLR_DIRECTION_LEFT} },

dwl.c

@@ -141,12 +141,6 @@ typedef struct {
 	uint32_t resize; /* configure serial of a pending resize */
 } Client;
 
-typedef struct {
-	const char *name;
-	void (*kbcreate)(struct wlr_keyboard *);
-	void (*ptrcreate)(struct wlr_pointer *);
-} InputRule;
-
 typedef struct {
 	uint32_t mod;
 	xkb_keysym_t keysym;
@@ -274,8 +268,6 @@ static void createnotify(struct wl_listener *listener, void *data);
 static void createpointer(struct wlr_pointer *pointer);
 static void createpointerconstraint(struct wl_listener *listener, void *data);
 static void createpopup(struct wl_listener *listener, void *data);
-static void createtogglepointer(struct wlr_pointer *pointer);
-static void createungroupedkeyboard(struct wlr_keyboard *keyboard);
 static void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint);
 static void cursorframe(struct wl_listener *listener, void *data);
 static void cursorwarptohint(void);
@@ -325,7 +317,7 @@ static void rendermon(struct wl_listener *listener, void *data);
 static void requestdecorationmode(struct wl_listener *listener, void *data);
 static void requeststartdrag(struct wl_listener *listener, void *data);
 static void requestmonstate(struct wl_listener *listener, void *data);
-static void resize(Client *c, struct wlr_box geo, int interact);
+static void resize(Client *c, struct wlr_box geo, int interact, int draw_borders);
 static void run(char *startup_cmd);
 static void setcursor(struct wl_listener *listener, void *data);
 static void setcursorshape(struct wl_listener *listener, void *data);
@@ -344,7 +336,6 @@ static void tagmon(const Arg *arg);
 static void tile(Monitor *m);
 static void togglefloating(const Arg *arg);
 static void togglefullscreen(const Arg *arg);
-static void togglepointer(const Arg *arg);
 static void toggletag(const Arg *arg);
 static void toggleview(const Arg *arg);
 static void unlocksession(struct wl_listener *listener, void *data);
@@ -445,8 +436,6 @@ static struct wl_listener request_start_drag = {.notify = requeststartdrag};
 static struct wl_listener start_drag = {.notify = startdrag};
 static struct wl_listener new_session_lock = {.notify = locksession};
 
-static struct libinput_device *togglepointerdevice = NULL;
-
 #ifdef XWAYLAND
 static void activatex11(struct wl_listener *listener, void *data);
 static void associatex11(struct wl_listener *listener, void *data);
@@ -817,7 +806,7 @@ closemon(Monitor *m)
 	wl_list_for_each(c, &clients, link) {
 		if (c->isfloating && c->geom.x > m->m.width)
 			resize(c, (struct wlr_box){.x = c->geom.x - m->w.width, .y = c->geom.y,
-					.width = c->geom.width, .height = c->geom.height}, 0);
+					.width = c->geom.width, .height = c->geom.height}, 0, 1);
 		if (c->mon == m)
 			setmon(c, selmon, c->tags);
 	}
@@ -886,7 +875,11 @@ commitnotify(struct wl_listener *listener, void *data)
 		return;
 	}
 
-	resize(c, c->geom, (c->isfloating && !c->isfullscreen));
+	if (client_surface(c)->mapped && c->mon && c->mon->lt[c->mon->sellt]->arrange
+			&& !c->isfullscreen && !c->isfloating)
+		c->mon->lt[c->mon->sellt]->arrange(c->mon);
+	else
+		resize(c, c->geom, (c->isfloating && !c->isfullscreen), (c->isfloating && !c->isfullscreen));
 
 	/* mark a pending resize as completed */
 	if (c->resize && c->resize <= c->surface.xdg->current.configure_serial)
@@ -1207,33 +1200,6 @@ createpopup(struct wl_listener *listener, void *data)
 	LISTEN_STATIC(&popup->base->surface->events.commit, commitpopup);
 }
 
-void
-createtogglepointer(struct wlr_pointer *pointer)
-{
-	struct libinput_device *device;
-
-	createpointer(pointer);
-
-	if (wlr_input_device_is_libinput(&pointer->base)
-			&& (device = wlr_libinput_get_device_handle(&pointer->base))) {
-		togglepointerdevice = device;
-	}
-}
-
-void
-createungroupedkeyboard(struct wlr_keyboard *keyboard)
-{
-	/* for keyboards that need their own keyboard group */
-	KeyboardGroup *group = createkeyboardgroup();
-
-	/* Set the keymap to match the group keymap */
-	wlr_keyboard_set_keymap(keyboard, group->wlr_group->keyboard.keymap);
-	LISTEN(&keyboard->base.events.destroy, &group->destroy, destroykeyboardgroup);
-
-	/* Add the new keyboard to the group */
-	wlr_keyboard_group_add_keyboard(group->wlr_group, keyboard);
-}
-
 void
 cursorconstrain(struct wlr_pointer_constraint_v1 *constraint)
 {
@@ -1617,27 +1583,13 @@ inputdevice(struct wl_listener *listener, void *data)
 	 * available. */
 	struct wlr_input_device *device = data;
 	uint32_t caps;
-	const InputRule *r;
 
 	switch (device->type) {
 	case WLR_INPUT_DEVICE_KEYBOARD:
-		for (r = inputrules; r < END(inputrules); r++) {
-			if (!r->name || strstr(device->name, r->name)) {
-				if (r->kbcreate)
-					r->kbcreate(wlr_keyboard_from_input_device(device));
-				break;
-			}
-		}
-
+		createkeyboard(wlr_keyboard_from_input_device(device));
 		break;
 	case WLR_INPUT_DEVICE_POINTER:
-		for (r = inputrules; r < END(inputrules); r++) {
-			if (!r->name || strstr(device->name, r->name)) {
-				if (r->ptrcreate)
-					r->ptrcreate(wlr_pointer_from_input_device(device));
-				break;
-			}
-		}
+		createpointer(wlr_pointer_from_input_device(device));
 		break;
 	default:
 		/* TODO handle other input device types */
@@ -1877,7 +1829,7 @@ monocle(Monitor *m)
 	wl_list_for_each(c, &clients, link) {
 		if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
 			continue;
-		resize(c, m->w, 0);
+		resize(c, m->w, 0, !smartborders);
 		n++;
 	}
 	if (n)
@@ -1969,11 +1921,11 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
 	if (cursor_mode == CurMove) {
 		/* Move the grabbed client to the new position. */
 		resize(grabc, (struct wlr_box){.x = (int)round(cursor->x) - grabcx, .y = (int)round(cursor->y) - grabcy,
-			.width = grabc->geom.width, .height = grabc->geom.height}, 1);
+			.width = grabc->geom.width, .height = grabc->geom.height}, 1, 1);
 		return;
 	} else if (cursor_mode == CurResize) {
 		resize(grabc, (struct wlr_box){.x = grabc->geom.x, .y = grabc->geom.y,
-			.width = (int)round(cursor->x) - grabc->geom.x, .height = (int)round(cursor->y) - grabc->geom.y}, 1);
+			.width = (int)round(cursor->x) - grabc->geom.x, .height = (int)round(cursor->y) - grabc->geom.y}, 1, 1);
 		return;
 	}
 
@@ -2252,7 +2204,7 @@ requestmonstate(struct wl_listener *listener, void *data)
 }
 
 void
-resize(Client *c, struct wlr_box geo, int interact)
+resize(Client *c, struct wlr_box geo, int interact, int draw_borders)
 {
 	struct wlr_box *bbox;
 	struct wlr_box clip;
@@ -2264,6 +2216,7 @@ resize(Client *c, struct wlr_box geo, int interact)
 
 	client_set_bounds(c, geo.width, geo.height);
 	c->geom = geo;
+	c->bw = draw_borders ? borderpx : 0;
 	applybounds(c, bbox);
 
 	/* Update scene-graph, including borders */
@@ -2388,6 +2341,8 @@ setfloating(Client *c, int floating)
 	wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen ||
 			(p && p->isfullscreen) ? LyrFS
 			: c->isfloating ? LyrFloat : LyrTile]);
+	if (c->isfloating && !c->bw)
+		resize(c, c->mon->m, 0, 1);
 	arrange(c->mon);
 	printstatus();
 }
@@ -2405,11 +2360,11 @@ setfullscreen(Client *c, int fullscreen)
 
 	if (fullscreen) {
 		c->prev = c->geom;
-		resize(c, c->mon->m, 0);
+		resize(c, c->mon->m, 0, 0);
 	} else {
 		/* restore previous size instead of arrange for floating windows since
 		 * client positions are set by the user and cannot be recalculated */
-		resize(c, c->prev, 0);
+		resize(c, c->prev, 0, 1);
 	}
 	arrange(c->mon);
 	printstatus();
@@ -2425,6 +2380,12 @@ setlayout(const Arg *arg)
 	if (arg && arg->v)
 		selmon->lt[selmon->sellt] = (Layout *)arg->v;
 	strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, LENGTH(selmon->ltsymbol));
+	if (!selmon->lt[selmon->sellt]->arrange) {
+		/* floating layout, draw borders around all clients */
+		Client *c;
+		wl_list_for_each(c, &clients, link)
+			resize(c, c->mon->m, 0, 1);
+	}
 	arrange(selmon);
 	printstatus();
 }
@@ -2459,7 +2420,7 @@ setmon(Client *c, Monitor *m, uint32_t newtags)
 		arrange(oldmon);
 	if (m) {
 		/* Make sure window actually overlaps with the monitor */
-		resize(c, c->geom, 0);
+		resize(c, c->geom, 0, 1);
 		c->tags = newtags ? newtags : m->tagset[m->seltags]; /* assign tags of target monitor */
 		setfullscreen(c, c->isfullscreen); /* This will call arrange(c->mon) */
 		setfloating(c, c->isfloating);
@@ -2759,7 +2720,7 @@ tagmon(const Arg *arg)
 void
 tile(Monitor *m)
 {
-	unsigned int mw, my, ty;
+	unsigned int mw, my, ty, draw_borders = 1;
 	int i, n = 0;
 	Client *c;
 
@@ -2769,6 +2730,9 @@ tile(Monitor *m)
 	if (n == 0)
 		return;
 
+	if (n == smartborders)
+		draw_borders = 0;
+
 	if (n > m->nmaster)
 		mw = m->nmaster ? (int)roundf(m->w.width * m->mfact) : 0;
 	else
@@ -2779,11 +2743,11 @@ tile(Monitor *m)
 			continue;
 		if (i < m->nmaster) {
 			resize(c, (struct wlr_box){.x = m->w.x, .y = m->w.y + my, .width = mw,
-				.height = (m->w.height - my) / (MIN(n, m->nmaster) - i)}, 0);
+				.height = (m->w.height - my) / (MIN(n, m->nmaster) - i)}, 0, draw_borders);
 			my += c->geom.height;
 		} else {
 			resize(c, (struct wlr_box){.x = m->w.x + mw, .y = m->w.y + ty,
-				.width = m->w.width - mw, .height = (m->w.height - ty) / (n - i)}, 0);
+				.width = m->w.width - mw, .height = (m->w.height - ty) / (n - i)}, 0, draw_borders);
 			ty += c->geom.height;
 		}
 		i++;
@@ -2807,18 +2771,6 @@ togglefullscreen(const Arg *arg)
 		setfullscreen(sel, !sel->isfullscreen);
 }
 
-void
-togglepointer(const Arg *arg)
-{
-	if (!togglepointerdevice)
-		return;
-
-	libinput_device_config_send_events_set_mode(
-		togglepointerdevice,
-		libinput_device_config_send_events_get_mode(togglepointerdevice) ^ LIBINPUT_CONFIG_SEND_EVENTS_DISABLED
-	);
-}
-
 void
 toggletag(const Arg *arg)
 {
@@ -2964,7 +2916,7 @@ updatemons(struct wl_listener *listener, void *data)
 		arrange(m);
 		/* make sure fullscreen clients have the right size */
 		if ((c = focustop(m)) && c->isfullscreen)
-			resize(c, m->m, 0);
+			resize(c, m->m, 0, 0);
 
 		/* Try to re-set the gamma LUT when updating monitors,
 		 * it's only really needed when enabling a disabled output, but meh. */
@@ -3173,7 +3125,7 @@ configurex11(struct wl_listener *listener, void *data)
 	if ((c->isfloating && c != grabc) || !c->mon->lt[c->mon->sellt]->arrange) {
 		resize(c, (struct wlr_box){.x = event->x - c->bw,
 				.y = event->y - c->bw, .width = event->width + c->bw * 2,
-				.height = event->height + c->bw * 2}, 0);
+				.height = event->height + c->bw * 2}, 0, 1);
 	} else {
 		arrange(c->mon);
 	}

inputdevicerules-v0.7.patch

@@ -1,173 +0,0 @@
-From 89f870a04f903681b0a7a0ac4eb1ae70c4984b46 Mon Sep 17 00:00:00 2001
-From: Ben Collerson <benc@benc.cc>
-Date: Sat, 15 Jun 2024 12:34:01 +1000
-Subject: [PATCH] input device rules
-
-* customise input device handling
-* ignore unwanted input devices
-* configure a toggle for an input device
----
- config.def.h | 13 ++++++++++
- dwl.c        | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++--
- 2 files changed, 79 insertions(+), 2 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index 22d2171d..0b287ab5 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -60,6 +60,18 @@ static const struct xkb_rule_names xkb_rules = {
- 	.options = NULL,
- };
- 
-+/* input devices */
-+static const InputRule inputrules[] = {
-+	/* name                      kbcreate                 ptrcreate      */
-+	/* ignore bad device - like a touchpad ;) */
-+	{ "BAD DEVICE",              NULL,                    NULL                },
-+	/* ungroup ydotool device - fixes a bug */
-+	{ "ydotoold virtual device", createungroupedkeyboard, createpointer       },
-+	/* put your touchpad name here to enable toggle touchpad */
-+	{ "Elan Touchpad",           createkeyboard,          createtogglepointer },
-+	{ NULL,                      createkeyboard,          createpointer       },
-+};
-+
- static const int repeat_rate = 25;
- static const int repeat_delay = 600;
- 
-@@ -142,6 +154,7 @@ static const Key keys[] = {
- 	{ MODKEY,                    XKB_KEY_space,      setlayout,      {0} },
- 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space,      togglefloating, {0} },
- 	{ MODKEY,                    XKB_KEY_e,         togglefullscreen, {0} },
-+	{ MODKEY,                    XKB_KEY_u,          togglepointer,  {0} },
- 	{ MODKEY,                    XKB_KEY_0,          view,           {.ui = ~0} },
- 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag,            {.ui = ~0} },
- 	{ MODKEY,                    XKB_KEY_comma,      focusmon,       {.i = WLR_DIRECTION_LEFT} },
-diff --git a/dwl.c b/dwl.c
-index a2711f67..f6f91938 100644
---- a/dwl.c
-+++ b/dwl.c
-@@ -143,6 +143,12 @@ typedef struct {
- 	uint32_t resize; /* configure serial of a pending resize */
- } Client;
- 
-+typedef struct {
-+	const char *name;
-+	void (*kbcreate)(struct wlr_keyboard *);
-+	void (*ptrcreate)(struct wlr_pointer *);
-+} InputRule;
-+
- typedef struct {
- 	uint32_t mod;
- 	xkb_keysym_t keysym;
-@@ -270,6 +276,8 @@ static void createnotify(struct wl_listener *listener, void *data);
- static void createpointer(struct wlr_pointer *pointer);
- static void createpointerconstraint(struct wl_listener *listener, void *data);
- static void createpopup(struct wl_listener *listener, void *data);
-+static void createtogglepointer(struct wlr_pointer *pointer);
-+static void createungroupedkeyboard(struct wlr_keyboard *keyboard);
- static void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint);
- static void cursorframe(struct wl_listener *listener, void *data);
- static void cursorwarptohint(void);
-@@ -340,6 +348,7 @@ static void tagmon(const Arg *arg);
- static void tile(Monitor *m);
- static void togglefloating(const Arg *arg);
- static void togglefullscreen(const Arg *arg);
-+static void togglepointer(const Arg *arg);
- static void toggletag(const Arg *arg);
- static void toggleview(const Arg *arg);
- static void unlocksession(struct wl_listener *listener, void *data);
-@@ -413,6 +422,8 @@ static struct wlr_box sgeom;
- static struct wl_list mons;
- static Monitor *selmon;
- 
-+static struct libinput_device *togglepointerdevice = NULL;
-+
- #ifdef XWAYLAND
- static void activatex11(struct wl_listener *listener, void *data);
- static void associatex11(struct wl_listener *listener, void *data);
-@@ -1133,6 +1144,33 @@ createpopup(struct wl_listener *listener, void *data)
- 	LISTEN_STATIC(&popup->base->surface->events.commit, commitpopup);
- }
- 
-+void
-+createtogglepointer(struct wlr_pointer *pointer)
-+{
-+	struct libinput_device *device;
-+
-+	createpointer(pointer);
-+
-+	if (wlr_input_device_is_libinput(&pointer->base)
-+			&& (device = wlr_libinput_get_device_handle(&pointer->base))) {
-+		togglepointerdevice = device;
-+	}
-+}
-+
-+void
-+createungroupedkeyboard(struct wlr_keyboard *keyboard)
-+{
-+	/* for keyboards that need their own keyboard group */
-+	KeyboardGroup *group = createkeyboardgroup();
-+
-+	/* Set the keymap to match the group keymap */
-+	wlr_keyboard_set_keymap(keyboard, group->wlr_group->keyboard.keymap);
-+	LISTEN(&keyboard->base.events.destroy, &group->destroy, destroykeyboardgroup);
-+
-+	/* Add the new keyboard to the group */
-+	wlr_keyboard_group_add_keyboard(group->wlr_group, keyboard);
-+}
-+
- void
- cursorconstrain(struct wlr_pointer_constraint_v1 *constraint)
- {
-@@ -1531,13 +1569,27 @@ inputdevice(struct wl_listener *listener, void *data)
- 	 * available. */
- 	struct wlr_input_device *device = data;
- 	uint32_t caps;
-+	const InputRule *r;
- 
- 	switch (device->type) {
- 	case WLR_INPUT_DEVICE_KEYBOARD:
--		createkeyboard(wlr_keyboard_from_input_device(device));
-+		for (r = inputrules; r < END(inputrules); r++) {
-+			if (!r->name || strstr(device->name, r->name)) {
-+				if (r->kbcreate)
-+					r->kbcreate(wlr_keyboard_from_input_device(device));
-+				break;
-+			}
-+		}
-+
- 		break;
- 	case WLR_INPUT_DEVICE_POINTER:
--		createpointer(wlr_pointer_from_input_device(device));
-+		for (r = inputrules; r < END(inputrules); r++) {
-+			if (!r->name || strstr(device->name, r->name)) {
-+				if (r->ptrcreate)
-+					r->ptrcreate(wlr_pointer_from_input_device(device));
-+				break;
-+			}
-+		}
- 		break;
- 	default:
- 		/* TODO handle other input device types */
-@@ -2739,6 +2791,18 @@ togglefullscreen(const Arg *arg)
- 		setfullscreen(sel, !sel->isfullscreen);
- }
- 
-+void
-+togglepointer(const Arg *arg)
-+{
-+	if (!togglepointerdevice)
-+		return;
-+
-+	libinput_device_config_send_events_set_mode(
-+		togglepointerdevice,
-+		libinput_device_config_send_events_get_mode(togglepointerdevice) ^ LIBINPUT_CONFIG_SEND_EVENTS_DISABLED
-+	);
-+}
-+
- void
- toggletag(const Arg *arg)
- {
--- 
-2.45.2
-