jachym/dwl-patches
1
0
Fork 0
mirror of https://codeberg.org/dwl/dwl-patches.git synced 2025-09-08 12:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix globalkey patch

Browse Source
This commit is contained in:
korei999 2024-06-03 20:47:26 +03:00
parent 748b4bc6a7
commit e8e969a564
2 changed files with 73 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
patches/globalkey/README.md
View File

@ -6,12 +6,17 @@ Example:
```
static const PassKeypressRule pass_rules[] = {
ADDPASSRULE("com.obsproject.Studio", MODKEY, XKB_KEY_Home),
ADDPASSRULE("discord", 0, XKB_KEY_n),
/* xkb key is case ignored */
};
```
will pass `MODKEY + Home` key to obs(flatpak version) regardless of what client is currently focused if any.
String "com.obsproject.Studio" should be exact match for appid of the client. To get 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.
Note that if popup (like [fuzzel](https://codeberg.org/dnkl/fuzzel)) is focused, no key will be globally passed.
This is done so these menus don't get closed after hitting some of the global keys.
### Download
- [git branch](https://codeberg.org/korei999/dwl/src/branch/globalkey)

107
patches/globalkey/globalkey.patch
View File

@ -1,34 +1,33 @@
From e4b889bbde9568913d54b70bf9f54d2e5e404b68 Mon Sep 17 00:00:00 2001
From 9207aee6d877896485cb41b587896b8d6917bdb7 Mon Sep 17 00:00:00 2001
From: korei999 <ju7t1xe@gmail.com>
Date: Mon, 3 Jun 2024 13:26:43 +0300
Subject: [PATCH] update globalkey patch
Date: Mon, 3 Jun 2024 20:39:52 +0300
Subject: [PATCH] add globalkey
---
config.def.h | 8 ++++++++
dwl.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+)
config.def.h | 7 ++++++
dwl.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 68 insertions(+), 2 deletions(-)
diff --git a/config.def.h b/config.def.h
index a784eb4..0d2bd44 100644
index a784eb4..58da23e 100644
--- a/config.def.h
+++ b/config.def.h
@@ -112,6 +112,14 @@ static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TA
{ MODKEY|WLR_MODIFIER_SHIFT, SKEY, tag, {.ui = 1 << TAG} }, \
{ MODKEY|WLR_MODIFIER_CTRL|WLR_MODIFIER_SHIFT,SKEY,toggletag, {.ui = 1 << TAG} }
@@ -119,6 +119,13 @@ 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, M, K) {.appid = S, .len = LENGTH(S), .mod = M, .keycode = K}
+
+#define ADDPASSRULE(S, M, K) {.appid = S, .len = LENGTH(S), .mod = M, .key = K}
+static const PassKeypressRule pass_rules[] = {
+ ADDPASSRULE("com.obsproject.Studio", MODKEY, XKB_KEY_Home),
+ ADDPASSRULE("havoc", 0, XKB_KEY_e),
+ /* each instance of havoc will receive input 'e' for example, regardless of which client is focused */
+};
+
/* helper for spawning shell commands in the pre dwm-5.0 fashion */
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
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 356b913..7046e52 100644
index 356b913..021f78c 100644
--- a/dwl.c
+++ b/dwl.c
@@ -218,6 +218,13 @@ typedef struct {
@ -39,7 +38,7 @@ index 356b913..7046e52 100644
+ const char* appid;
+ size_t len;
+ uint32_t mod;
+ uint32_t keycode;
+ uint32_t key;
+} PassKeypressRule;
+
typedef struct {
@ -49,26 +48,54 @@ index 356b913..7046e52 100644
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);
+static void keypresspass(struct wlr_keyboard_key_event *event, uint32_t mods, xkb_keysym_t sym);
+static void keypresspass(struct wlr_surface *last_surface, struct wlr_keyboard_key_event *event, uint32_t mods, xkb_keysym_t keysym);
static void keypressmod(struct wl_listener *listener, void *data);
static int keyrepeat(void *data);
static void killclient(const Arg *arg);
@@ -1540,6 +1548,45 @@ keypress(struct wl_listener *listener, void *data)
@@ -1502,6 +1510,8 @@ 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;
+ struct wlr_surface *last_surface = seat->keyboard_state.focused_surface;
+ struct wlr_xdg_surface* xdg_surface = NULL;
/* Translate libinput keycode -> xkbcommon */
uint32_t keycode = event->keycode + 8;
@@ -1533,15 +1543,64 @@ keypress(struct wl_listener *listener, void *data)
wl_event_source_timer_update(group->key_repeat_source, 0);
}
- if (handled)
+ if (handled) {
+ wlr_seat_set_keyboard(seat, &group->wlr_group->keyboard);
return;
+ }
+
+ if (last_surface) {
+ xdg_surface = wlr_xdg_surface_try_from_wlr_surface(last_surface);
+ /* don't pass when popup is focused */
+ /* this is better than having popups (like fuzzel or wmenu) closing while typing in a passed keybind */
+ if (xdg_surface && xdg_surface->role != WLR_XDG_SURFACE_ROLE_POPUP) {
+ keypresspass(last_surface, event, mods, syms[0]);
+ }
+ } else {
+ /* if no surface pass anyway */
+ keypresspass(last_surface, event, mods, syms[0]);
+ }
- wlr_seat_set_keyboard(seat, &group->wlr_group->keyboard);
/* Pass unhandled keycodes along to the client. */
wlr_seat_keyboard_notify_key(seat, event->time_msec,
event->keycode, event->state);
+
+ /* grab the first one sym, there's always one as far as i tested */
+ keypresspass(event, mods, syms[0]);
+}
+
}
+void
+keypresspass(struct wlr_keyboard_key_event *event, uint32_t mods, xkb_keysym_t sym)
+keypresspass(struct wlr_surface *last_surface, struct wlr_keyboard_key_event *event, uint32_t mods, xkb_keysym_t keysym)
+{
+ Client *c = NULL, *savedc = focustop(selmon);
+ struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat);
+ uint32_t keycodes[32] = {0};
+ struct wlr_surface *last_surface = seat->keyboard_state.focused_surface;
+ int reset = false;
+
+ wl_list_for_each(c, &clients, link) {
+ if (c && c != savedc) {
@ -76,18 +103,17 @@ index 356b913..7046e52 100644
+ if (appid) {
+ for (size_t r = 0; r < LENGTH(pass_rules); r++) {
+ if (strncmp(appid, pass_rules[r].appid, pass_rules[r].len) == 0) {
+
+ if (pass_rules[r].keycode == sym && pass_rules[r].mod == CLEANMASK(mods)) {
+ uint32_t rcode = xkb_keysym_to_upper(pass_rules[r].key);
+ uint32_t pcode = xkb_keysym_to_upper(keysym);
+ /* match keysym only ignoring mods (case insensitive)
+ * this fixes the case when we can release mod before the other key,
+ * such that the client might not receive released state for than button
+ * (or something like that) and stuck with the pressed state */
+ if (rcode == pcode) {
+ reset = true;
+ /* mods are passed to the surfaces anyway */
+ wlr_seat_keyboard_enter(seat, client_surface(c), keycodes, 0, &keyboard->modifiers);
+ wlr_seat_keyboard_notify_key(seat, event->time_msec, event->keycode, event->state);
+
+#ifdef XWAYLAND
+ /* https://github.com/hyprwm/Hyprland/blob/main/src/managers/KeybindManager.cpp#L2022 */
+ if (client_is_x11(c)) {
+ seat->keyboard_state.focused_client = NULL;
+ seat->keyboard_state.focused_surface = NULL;
+ }
+#endif
+ }
+ }
+ }
@ -95,10 +121,13 @@ index 356b913..7046e52 100644
+ }
+ }
+
+ wlr_seat_keyboard_enter(seat, last_surface, keycodes, 0, &keyboard->modifiers);
}
+ if (reset)
+ wlr_seat_keyboard_enter(seat, last_surface, keycodes, 0, &keyboard->modifiers);
+}
+
void
keypressmod(struct wl_listener *listener, void *data)
{
--
2.45.1