patches/bartruecenteredtitle/README.md

@@ -8,4 +8,3 @@ A homegrown port of dwm's _truecenteredtitle_ patch, with the addition of a conf
 
 ### Author
 - [moonsabre](https://codeberg.org/moonsabre)
-- [sewn](https://codeberg.org/sewn)

patches/bartruecenteredtitle/bartruecenteredtitle.patch

@@ -1,12 +1,12 @@
-From 17501c9f28226b1f332d6842be0d7f50ba618a29 Mon Sep 17 00:00:00 2001
+From 1bffefbe03a8f3002c7eb285ba285226aee45ef2 Mon Sep 17 00:00:00 2001
 From: moonsabre <moonsabre@tuta.io>
-Date: Fri, 14 Mar 2025 16:04:25 -0700
+Date: Thu, 13 Mar 2025 13:05:03 -0700
 Subject: [PATCH] Bar title centering parameter.
 
 ---
  config.def.h |  1 +
- dwl.c        | 9 +++++++--
- 2 files changed, 8 insertions(+), 2 deletions(-)
+ dwl.c        | 12 +++++++++---
+ 2 files changed, 10 insertions(+), 3 deletions(-)
 
 diff --git a/config.def.h b/config.def.h
 index 5d1dc2b..8ac3a8b 100644
@@ -21,23 +21,25 @@ index 5d1dc2b..8ac3a8b 100644
  static const float rootcolor[]             = COLOR(0x000000ff);
  /* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */
 diff --git a/dwl.c b/dwl.c
-index ece537a..9eb816b 100644
+index ece537a..afa1d41 100644
 --- a/dwl.c
 +++ b/dwl.c
-@@ -1551,9 +1551,14 @@ drawbar(Monitor *m)
+@@ -1551,9 +1551,15 @@ drawbar(Monitor *m)
  	if ((w = m->b.width - tw - x) > m->b.height) {
  		if (c) {
  			drwl_setscheme(m->drw, colors[m == selmon ? SchemeSel : SchemeNorm]);
 -			drwl_text(m->drw, x, 0, w, m->b.height, m->lrpad / 2, client_get_title(c), 0);
-+			tw = TEXTW(selmon, client_get_title(c));
-+			drwl_text(m->drw, x, 0, w, m->b.height,
-+    		!centeredtitle || tw > w ? m->lrpad / 2 : (w - tw) / 2,
-+    		client_get_title(c), 0);
- 			if (c && c->isfloating)
+-			if (c && c->isfloating)
 -				drwl_rect(m->drw, x + boxs, boxs, boxw, boxw, 0, 0);
-+				drwl_rect(m->drw,
-+				  !centeredtitle || tw > w ? x + boxs : x + ((w - tw) / 2 - boxs * 8),
-+				  boxs, boxw, boxw, 0, 0);
++			if (centeredtitle == 0 || TEXTW(selmon, client_get_title(c)) > w) {
++				drwl_text(m->drw, x, 0, w, m->b.height, m->lrpad / 2, client_get_title(c), 0);
++				if (c && c->isfloating)
++					drwl_rect(m->drw, x + boxs, boxs, boxw, boxw, 0, 0);
++			} else {
++				drwl_text(m->drw, x, 0, w, m->b.height, (w - TEXTW(selmon, client_get_title(c))) / 2, client_get_title(c), 0);
++				if (c && c->isfloating)
++					drwl_rect(m->drw, x + ((w - TEXTW(selmon, client_get_title(c))) / 2 - boxs * 6), boxs, boxw, boxw, 0, 0);
++			}
  		} else {
  			drwl_setscheme(m->drw, colors[SchemeNorm]);
  			drwl_rect(m->drw, x, 0, w, m->b.height, 1, 1);

patches/globalkey/README.md

@@ -6,13 +6,13 @@ This might deal with Wayland's lack of global shortcuts.
 Example:
 ```
 static const PassKeypressRule pass_rules[] = {
-	ADDPASSRULE("com.obsproject.Studio", XKB_KEY_Home),
-	ADDPASSRULE("WebCord", XKB_KEY_n),
+	ADDPASSRULE("com.obsproject.Studio", MODKEY, XKB_KEY_Home),
+	ADDPASSRULE("discord", 0, XKB_KEY_n),
     /* xkb key is case-insensitive */
 };
 ```
 
-This will pass the `Home` key (alongside with mods) to OBS regardless of what client is currently focused, if any.
+This will pass the `MODKEY + Home` keys to OBS regardless of what client is currently focused, if any.
 The string "com.obsproject.Studio" should match the exact appid of the client.
 
 To get the appid use [dwlmsg](https://codeberg.org/notchoc/dwlmsg) or run stock dwl from a terminal then launch the needed application inside, dwl will print all the info to the stdout.
@@ -20,12 +20,6 @@ To get the appid use [dwlmsg](https://codeberg.org/notchoc/dwlmsg) or run stock
 Note that if a popup (like [fuzzel](https://codeberg.org/dnkl/fuzzel)) is focused, no keys will be globally passed.
 This is done so these menus don't get closed after hitting some of the global keys.
 
-## Warning
-This patch is a stupid hack, it doesn't work all the time.
-Examples: obs needs to be clicked on once before applying global hotkeys.
-Electron (discord/webcord/chromium) with wayland backend ignores the very first press.
-Other programs might not work at all.
-
 ### Download
 - [git branch](https://codeberg.org/korei999/dwl/src/branch/globalkey)
 - [2024-06-08](https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/globalkey/globalkey.patch)

patches/globalkey/globalkey.patch

@@ -1,50 +1,51 @@
-From f36e3f134c9f14a9821783d9908471ed0bdca0ed Mon Sep 17 00:00:00 2001
+From 65e2466212beb3040241e3b6ca8e730e6b96fd66 Mon Sep 17 00:00:00 2001
 From: korei999 <ju7t1xe@gmail.com>
-Date: Fri, 14 Mar 2025 20:05:45 +0200
+Date: Thu, 21 Nov 2024 02:24:32 +0200
 Subject: [PATCH] implement globalkey patch
 
 ---
- config.def.h |  8 +++++++
- dwl.c        | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 69 insertions(+)
+ config.def.h |  8 ++++++++
+ dwl.c        | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 66 insertions(+)
 
 diff --git a/config.def.h b/config.def.h
-index 22d2171..25486c8 100644
+index 22d2171..2bf1c68 100644
 --- a/config.def.h
 +++ b/config.def.h
 @@ -122,6 +122,14 @@ static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TA
  static const char *termcmd[] = { "foot", NULL };
  static const char *menucmd[] = { "wmenu-run", NULL };
  
-+#define ADDPASSRULE(S, K) {.appid = S, .len = LENGTH(S), .key = K}
++#define ADDPASSRULE(S, M, K) {.appid = S, .len = LENGTH(S), .key = K}
 +static const PassKeypressRule pass_rules[] = {
-+	ADDPASSRULE("com.obsproject.Studio", XKB_KEY_Home),
-+	ADDPASSRULE("com.obsproject.Studio", XKB_KEY_End),
-+	ADDPASSRULE("com.obsproject.Studio", XKB_KEY_F12),
-+	ADDPASSRULE("WebCord", XKB_KEY_n),
++	ADDPASSRULE("com.obsproject.Studio", MODKEY, XKB_KEY_Home),
++	ADDPASSRULE("com.obsproject.Studio", MODKEY, XKB_KEY_End),
++	ADDPASSRULE("com.obsproject.Studio", MODKEY, XKB_KEY_F12),
++	ADDPASSRULE("discord", 0, XKB_KEY_n),
 +};
 +
  static const Key keys[] = {
  	/* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */
  	/* modifier                  key                 function        argument */
 diff --git a/dwl.c b/dwl.c
-index 4816159..9ad64dd 100644
+index 9acb898..a0d632a 100644
 --- a/dwl.c
 +++ b/dwl.c
-@@ -217,6 +217,12 @@ typedef struct {
+@@ -221,6 +221,13 @@ typedef struct {
  	int x, y;
  } MonitorRule;
  
 +typedef struct {
 +	const char* appid;
 +	size_t len;
++	uint32_t mod;
 +	uint32_t key;
 +} PassKeypressRule;
 +
  typedef struct {
  	struct wlr_pointer_constraint_v1 *constraint;
  	struct wl_listener destroy;
-@@ -293,6 +299,7 @@ static void incnmaster(const Arg *arg);
+@@ -297,6 +304,7 @@ 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);
  static void keypress(struct wl_listener *listener, void *data);
@@ -52,7 +53,7 @@ index 4816159..9ad64dd 100644
  static void keypressmod(struct wl_listener *listener, void *data);
  static int keyrepeat(void *data);
  static void killclient(const Arg *arg);
-@@ -1628,6 +1635,12 @@ keypress(struct wl_listener *listener, void *data)
+@@ -1575,6 +1583,12 @@ 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;
@@ -65,7 +66,7 @@ index 4816159..9ad64dd 100644
  
  	/* Translate libinput keycode -> xkbcommon */
  	uint32_t keycode = event->keycode + 8;
-@@ -1662,12 +1675,60 @@ keypress(struct wl_listener *listener, void *data)
+@@ -1609,12 +1623,56 @@ keypress(struct wl_listener *listener, void *data)
  	if (handled)
  		return;
  
@@ -77,10 +78,8 @@ index 4816159..9ad64dd 100644
 +#endif
 +		;
 +	/* passed keys don't get repeated */
-+	if (!locked && pass) {
-+		for (i = 0; i < nsyms; ++i)
-+			keypressglobal(last_surface, &group->wlr_group->keyboard, event, mods, syms[i]);
-+	}
++	if (pass && syms)
++		keypressglobal(last_surface, &group->wlr_group->keyboard, event, mods, syms[0]);
 +
  	wlr_seat_set_keyboard(seat, &group->wlr_group->keyboard);
  	/* Pass unhandled keycodes along to the client. */
@@ -92,13 +91,13 @@ index 4816159..9ad64dd 100644
 +keypressglobal(struct wlr_surface *last_surface, struct wlr_keyboard *keyboard, struct wlr_keyboard_key_event *event, uint32_t mods, xkb_keysym_t keysym)
 +{
 +	Client *c = NULL, *lastc = focustop(selmon);
++	uint32_t keycodes[32] = {0};
 +	int reset = false;
 +	const char *appid = NULL;
 +
 +	for (size_t r = 0; r < LENGTH(pass_rules); r++) {
 +		uint32_t rcode = xkb_keysym_to_upper(pass_rules[r].key);
 +		uint32_t pcode = xkb_keysym_to_upper(keysym);
-+
 +		/* match key only (case insensitive) ignoring mods */
 +		if (rcode == pcode) {
 +			wl_list_for_each(c, &clients, link) {
@@ -106,9 +105,7 @@ index 4816159..9ad64dd 100644
 +					appid = client_get_appid(c);
 +					if (appid && strncmp(appid, pass_rules[r].appid, pass_rules[r].len) == 0) {
 +						reset = true;
-+
-+						client_notify_enter(client_surface(c), keyboard);
-+						client_activate_surface(client_surface(c), 1);
++						wlr_seat_keyboard_enter(seat, client_surface(c), keycodes, 0, &keyboard->modifiers);
 +						wlr_seat_keyboard_send_key(seat, event->time_msec, event->keycode, event->state);
 +
 +						goto done;
@@ -119,13 +116,13 @@ index 4816159..9ad64dd 100644
 +	}
 +
 +done:
-+	if (reset && last_surface)
-+		client_notify_enter(last_surface, keyboard);
++	if (reset)
++		wlr_seat_keyboard_enter(seat, last_surface, keycodes, 0, &keyboard->modifiers);
 +}
 +
  void
  keypressmod(struct wl_listener *listener, void *data)
  {
 -- 
-2.48.1
+2.47.0