reverted to user config

bottomstack.patch

@@ -1,140 +0,0 @@
-From b352fb08f40b1ee2d8c4748be4922df711e3aaa9 Mon Sep 17 00:00:00 2001
-From: wochap <gean.marroquin@gmail.com>
-Date: Fri, 5 Jul 2024 10:44:29 -0500
-Subject: [PATCH] implement bottomstack
-
----
- config.def.h |  4 +++
- dwl.c        | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 88 insertions(+)
-
-diff --git a/config.def.h b/config.def.h
-index 22d2171..5aac3e9 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -34,6 +34,8 @@ static const Layout layouts[] = {
- 	{ "[]=",      tile },
- 	{ "><>",      NULL },    /* no layout function means floating behavior */
- 	{ "[M]",      monocle },
-+	{ "TTT",      bstack },
-+	{ "===",      bstackhoriz },
- };
- 
- /* monitors */
-@@ -139,6 +141,8 @@ static const Key keys[] = {
- 	{ MODKEY,                    XKB_KEY_t,          setlayout,      {.v = &layouts[0]} },
- 	{ MODKEY,                    XKB_KEY_f,          setlayout,      {.v = &layouts[1]} },
- 	{ MODKEY,                    XKB_KEY_m,          setlayout,      {.v = &layouts[2]} },
-+	{ MODKEY,                    XKB_KEY_u,          setlayout,      {.v = &layouts[3]} },
-+	{ MODKEY,                    XKB_KEY_o,          setlayout,      {.v = &layouts[4]} },
- 	{ MODKEY,                    XKB_KEY_space,      setlayout,      {0} },
- 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space,      togglefloating, {0} },
- 	{ MODKEY,                    XKB_KEY_e,         togglefullscreen, {0} },
-diff --git a/dwl.c b/dwl.c
-index dc0437e..5648d5f 100644
---- a/dwl.c
-+++ b/dwl.c
-@@ -57,6 +57,7 @@
- #include <wlr/types/wlr_xdg_decoration_v1.h>
- #include <wlr/types/wlr_xdg_output_v1.h>
- #include <wlr/types/wlr_xdg_shell.h>
-+#include <wlr/util/box.h>
- #include <wlr/util/log.h>
- #include <wlr/util/region.h>
- #include <xkbcommon/xkbcommon.h>
-@@ -351,6 +352,8 @@ static Monitor *xytomon(double x, double y);
- 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);
-+static void bstackhoriz(Monitor *m);
- 
- /* variables */
- static const char broken[] = "broken";
-@@ -3160,3 +3163,84 @@ main(int argc, char *argv[])
- usage:
- 	die("Usage: %s [-v] [-d] [-s startup command]", argv[0]);
- }
-+
-+static void
-+bstack(Monitor *m) 
-+{
-+	int w, h, mh, mx, tx, ty, tw;
-+	int i, n = 0;
-+	Client *c;
-+
-+	wl_list_for_each(c, &clients, link)
-+		if (VISIBLEON(c, m) && !c->isfloating)
-+			n++;
-+	if (n == 0)
-+		return;
-+
-+	if (n > m->nmaster) {
-+		mh = (int)round(m->nmaster ? m->mfact * m->w.height : 0);
-+		tw = m->w.width / (n - m->nmaster);
-+		ty = m->w.y + mh;
-+	} else {
-+		mh = m->w.height;
-+		tw = m->w.width;
-+		ty = m->w.y;
-+	}
-+
-+	i = mx = 0;
-+	tx = m-> w.x;
-+	wl_list_for_each(c, &clients, link) {
-+		if (!VISIBLEON(c, m) || c->isfloating)
-+			continue;
-+		if (i < m->nmaster) {
-+			w = (m->w.width - mx) / (MIN(n, m->nmaster) - i);
-+			resize(c, (struct wlr_box) { .x = m->w.x + mx, .y = m->w.y, .width = w, .height = mh }, 0);
-+			mx += c->geom.width;
-+		} else {
-+			h = m->w.height - mh;
-+			resize(c, (struct wlr_box) { .x = tx, .y = ty, .width = tw, .height = h }, 0);
-+			if (tw != m->w.width)
-+				tx += c->geom.width;
-+		}
-+		i++;
-+	}
-+}
-+
-+static void
-+bstackhoriz(Monitor *m) {
-+	int w, mh, mx, tx, ty, th;
-+	int i, n = 0;
-+	Client *c;
-+
-+	wl_list_for_each(c, &clients, link)
-+		if (VISIBLEON(c, m) && !c->isfloating)
-+			n ++;
-+	if (n == 0)
-+		return;
-+
-+	if (n > m->nmaster) {
-+		mh = (int)round(m->nmaster ? m->mfact * m->w.height : 0);
-+		th = (m->w.height - mh) / (n - m->nmaster);
-+		ty = m->w.y + mh;
-+	} else {
-+		th = mh = m->w.height;
-+		ty = m->w.y;
-+	}
-+
-+	i = mx = 0;
-+	tx = m-> w.x;
-+	wl_list_for_each(c, &clients, link) {
-+		if (!VISIBLEON(c,m) || c->isfloating)
-+			continue;
-+		if (i < m->nmaster) {
-+			w = (m->w.width - mx) / (MIN(n, m->nmaster) - i);
-+			resize(c, (struct wlr_box) { .x = m->w.x + mx, .y = m->w.y, .width = w, .height = mh }, 0);
-+			mx += c->geom.width;
-+		} else {
-+			resize(c, (struct wlr_box) { .x = tx, .y = ty, .width = m->w.width, .height = th }, 0);
-+			if (th != m->w.height)
-+				ty += c->geom.height;
-+		}
-+		i++;
-+	}
-+}
--- 
-2.45.1

config.def.h

@@ -34,8 +34,6 @@ static const Layout layouts[] = {
 	{ "[]=",      tile },
 	{ "><>",      NULL },    /* no layout function means floating behavior */
 	{ "[M]",      monocle },
-	{ "TTT",      bstack },
-	{ "===",      bstackhoriz },
 };
 
 /* monitors */
@@ -141,8 +139,6 @@ static const Key keys[] = {
 	{ MODKEY,                    XKB_KEY_t,          setlayout,      {.v = &layouts[0]} },
 	{ MODKEY,                    XKB_KEY_f,          setlayout,      {.v = &layouts[1]} },
 	{ MODKEY,                    XKB_KEY_m,          setlayout,      {.v = &layouts[2]} },
-	{ MODKEY,                    XKB_KEY_u,          setlayout,      {.v = &layouts[3]} },
-	{ MODKEY,                    XKB_KEY_o,          setlayout,      {.v = &layouts[4]} },
 	{ MODKEY,                    XKB_KEY_space,      setlayout,      {0} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space,      togglefloating, {0} },
 	{ MODKEY,                    XKB_KEY_e,         togglefullscreen, {0} },

dwl.c

@@ -59,7 +59,6 @@
 #include <wlr/types/wlr_xdg_decoration_v1.h>
 #include <wlr/types/wlr_xdg_output_v1.h>
 #include <wlr/types/wlr_xdg_shell.h>
-#include <wlr/util/box.h>
 #include <wlr/util/log.h>
 #include <wlr/util/region.h>
 #include <xkbcommon/xkbcommon.h>
@@ -352,8 +351,6 @@ static Monitor *xytomon(double x, double y);
 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);
-static void bstackhoriz(Monitor *m);
 
 /* variables */
 static pid_t child_pid = -1;
@@ -439,6 +436,11 @@ 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 const struct xkb_rule_names en_rules = {.layout = "de"};
+static struct xkb_context *en_context;
+static struct xkb_keymap *en_keymap;
+static struct xkb_state *en_state;
+
 #ifdef XWAYLAND
 static void activatex11(struct wl_listener *listener, void *data);
 static void associatex11(struct wl_listener *listener, void *data);
@@ -720,6 +722,9 @@ cleanup(void)
 	wlr_backend_destroy(backend);
 
 	wl_display_destroy(dpy);
+	xkb_state_unref(en_state);
+	xkb_keymap_unref(en_keymap);
+	xkb_context_unref(en_context);
 	/* Destroy after the wayland display (when the monitors are already destroyed)
 	   to avoid destroying them with an invalid scene output. */
 	wlr_scene_node_destroy(&scene->tree.node);
@@ -1631,16 +1636,19 @@ keypress(struct wl_listener *listener, void *data)
 	/* This event is raised when a key is pressed or released. */
 	KeyboardGroup *group = wl_container_of(listener, group, key);
 	struct wlr_keyboard_key_event *event = data;
+	int nsyms, handled;
 
 	/* Translate libinput keycode -> xkbcommon */
 	uint32_t keycode = event->keycode + 8;
 	/* Get a list of keysyms based on the keymap for this keyboard */
 	const xkb_keysym_t *syms;
-	int nsyms = xkb_state_key_get_syms(
-			group->wlr_group->keyboard.xkb_state, keycode, &syms);
-
-	int handled = 0;
 	uint32_t mods = wlr_keyboard_get_modifiers(&group->wlr_group->keyboard);
+	xkb_state_update_key(en_state, keycode,
+			(event->state == WL_KEYBOARD_KEY_STATE_PRESSED)
+			? XKB_KEY_DOWN : XKB_KEY_UP);
+	nsyms = xkb_state_key_get_syms(en_state, keycode, &syms);
+
+	handled = 0;
 
 	wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
 
@@ -2622,6 +2630,10 @@ setup(void)
 	 * pointer, touch, and drawing tablet device. We also rig up a listener to
 	 * let us know when new input devices are available on the backend.
 	 */
+        en_context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
+        en_keymap = xkb_keymap_new_from_names(en_context, &en_rules,
+        	XKB_KEYMAP_COMPILE_NO_FLAGS);
+        en_state = xkb_state_new(en_keymap);
 	wl_signal_add(&backend->events.new_input, &new_input_device);
 	virtual_keyboard_mgr = wlr_virtual_keyboard_manager_v1_create(dpy);
 	wl_signal_add(&virtual_keyboard_mgr->events.new_virtual_keyboard,
@@ -3211,84 +3223,3 @@ main(int argc, char *argv[])
 usage:
 	die("Usage: %s [-v] [-d] [-s startup command]", argv[0]);
 }
-
-static void
-bstack(Monitor *m) 
-{
-	int w, h, mh, mx, tx, ty, tw;
-	int i, n = 0;
-	Client *c;
-
-	wl_list_for_each(c, &clients, link)
-		if (VISIBLEON(c, m) && !c->isfloating)
-			n++;
-	if (n == 0)
-		return;
-
-	if (n > m->nmaster) {
-		mh = (int)round(m->nmaster ? m->mfact * m->w.height : 0);
-		tw = m->w.width / (n - m->nmaster);
-		ty = m->w.y + mh;
-	} else {
-		mh = m->w.height;
-		tw = m->w.width;
-		ty = m->w.y;
-	}
-
-	i = mx = 0;
-	tx = m-> w.x;
-	wl_list_for_each(c, &clients, link) {
-		if (!VISIBLEON(c, m) || c->isfloating)
-			continue;
-		if (i < m->nmaster) {
-			w = (m->w.width - mx) / (MIN(n, m->nmaster) - i);
-			resize(c, (struct wlr_box) { .x = m->w.x + mx, .y = m->w.y, .width = w, .height = mh }, 0);
-			mx += c->geom.width;
-		} else {
-			h = m->w.height - mh;
-			resize(c, (struct wlr_box) { .x = tx, .y = ty, .width = tw, .height = h }, 0);
-			if (tw != m->w.width)
-				tx += c->geom.width;
-		}
-		i++;
-	}
-}
-
-static void
-bstackhoriz(Monitor *m) {
-	int w, mh, mx, tx, ty, th;
-	int i, n = 0;
-	Client *c;
-
-	wl_list_for_each(c, &clients, link)
-		if (VISIBLEON(c, m) && !c->isfloating)
-			n ++;
-	if (n == 0)
-		return;
-
-	if (n > m->nmaster) {
-		mh = (int)round(m->nmaster ? m->mfact * m->w.height : 0);
-		th = (m->w.height - mh) / (n - m->nmaster);
-		ty = m->w.y + mh;
-	} else {
-		th = mh = m->w.height;
-		ty = m->w.y;
-	}
-
-	i = mx = 0;
-	tx = m-> w.x;
-	wl_list_for_each(c, &clients, link) {
-		if (!VISIBLEON(c,m) || c->isfloating)
-			continue;
-		if (i < m->nmaster) {
-			w = (m->w.width - mx) / (MIN(n, m->nmaster) - i);
-			resize(c, (struct wlr_box) { .x = m->w.x + mx, .y = m->w.y, .width = w, .height = mh }, 0);
-			mx += c->geom.width;
-		} else {
-			resize(c, (struct wlr_box) { .x = tx, .y = ty, .width = m->w.width, .height = th }, 0);
-			if (th != m->w.height)
-				ty += c->geom.height;
-		}
-		i++;
-	}
-}

en-keycodes.patch

@@ -0,0 +1,73 @@
+From cd61fac9cb6e9d0172e2f7a01e6a514d676ba5f0 Mon Sep 17 00:00:00 2001
+From: Nikita Ivanov <nikita.vyach.ivanov@gmail.com>
+Date: Tue, 4 Feb 2025 23:53:11 +0100
+Subject: [PATCH] Always use the English keymap to get keycodes
+
+---
+ dwl.c | 23 +++++++++++++++++++----
+ 1 file changed, 19 insertions(+), 4 deletions(-)
+
+diff --git a/dwl.c b/dwl.c
+index def2562..c299365 100644
+--- a/dwl.c
++++ b/dwl.c
+@@ -413,6 +413,11 @@ static struct wlr_box sgeom;
+ static struct wl_list mons;
+ static Monitor *selmon;
+ 
++static const struct xkb_rule_names en_rules = {.layout = "us"};
++static struct xkb_context *en_context;
++static struct xkb_keymap *en_keymap;
++static struct xkb_state *en_state;
++
+ #ifdef XWAYLAND
+ static void activatex11(struct wl_listener *listener, void *data);
+ static void associatex11(struct wl_listener *listener, void *data);
+@@ -694,6 +699,9 @@ cleanup(void)
+ 	wlr_backend_destroy(backend);
+ 
+ 	wl_display_destroy(dpy);
++	xkb_state_unref(en_state);
++	xkb_keymap_unref(en_keymap);
++	xkb_context_unref(en_context);
+ 	/* Destroy after the wayland display (when the monitors are already destroyed)
+ 	   to avoid destroying them with an invalid scene output. */
+ 	wlr_scene_node_destroy(&scene->tree.node);
+@@ -1582,16 +1590,19 @@ keypress(struct wl_listener *listener, void *data)
+ 	/* This event is raised when a key is pressed or released. */
+ 	KeyboardGroup *group = wl_container_of(listener, group, key);
+ 	struct wlr_keyboard_key_event *event = data;
++	int nsyms, handled;
+ 
+ 	/* Translate libinput keycode -> xkbcommon */
+ 	uint32_t keycode = event->keycode + 8;
+ 	/* Get a list of keysyms based on the keymap for this keyboard */
+ 	const xkb_keysym_t *syms;
+-	int nsyms = xkb_state_key_get_syms(
+-			group->wlr_group->keyboard.xkb_state, keycode, &syms);
+-
+-	int handled = 0;
+ 	uint32_t mods = wlr_keyboard_get_modifiers(&group->wlr_group->keyboard);
++	xkb_state_update_key(en_state, keycode,
++			(event->state == WL_KEYBOARD_KEY_STATE_PRESSED)
++			? XKB_KEY_DOWN : XKB_KEY_UP);
++	nsyms = xkb_state_key_get_syms(en_state, keycode, &syms);
++
++	handled = 0;
+ 
+ 	wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
+ 
+@@ -2607,6 +2618,10 @@ setup(void)
+ 	 * pointer, touch, and drawing tablet device. We also rig up a listener to
+ 	 * let us know when new input devices are available on the backend.
+ 	 */
++	en_context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
++	en_keymap = xkb_keymap_new_from_names(en_context, &en_rules,
++		XKB_KEYMAP_COMPILE_NO_FLAGS);
++	en_state = xkb_state_new(en_keymap);
+ 	LISTEN_STATIC(&backend->events.new_input, inputdevice);
+ 	virtual_keyboard_mgr = wlr_virtual_keyboard_manager_v1_create(dpy);
+ 	LISTEN_STATIC(&virtual_keyboard_mgr->events.new_virtual_keyboard, virtualkeyboard);
+-- 
+2.48.1
+