mirror of
https://codeberg.org/dwl/dwl-patches.git
synced 2025-09-09 12:45:00 +00:00
105 lines
3.6 KiB
Diff
105 lines
3.6 KiB
Diff
From e4b889bbde9568913d54b70bf9f54d2e5e404b68 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
|
|
|
|
---
|
|
config.def.h | 8 ++++++++
|
|
dwl.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++
|
|
2 files changed, 55 insertions(+)
|
|
|
|
diff --git a/config.def.h b/config.def.h
|
|
index a784eb4..0d2bd44 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} }
|
|
|
|
+#define ADDPASSRULE(S, M, K) {.appid = S, .len = LENGTH(S), .mod = M, .keycode = 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 } }
|
|
|
|
diff --git a/dwl.c b/dwl.c
|
|
index 356b913..7046e52 100644
|
|
--- a/dwl.c
|
|
+++ b/dwl.c
|
|
@@ -218,6 +218,13 @@ typedef struct {
|
|
int x, y;
|
|
} MonitorRule;
|
|
|
|
+typedef struct {
|
|
+ const char* appid;
|
|
+ size_t len;
|
|
+ uint32_t mod;
|
|
+ uint32_t keycode;
|
|
+} PassKeypressRule;
|
|
+
|
|
typedef struct {
|
|
struct wlr_pointer_constraint_v1 *constraint;
|
|
struct wl_listener destroy;
|
|
@@ -291,6 +298,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);
|
|
+static void keypresspass(struct wlr_keyboard_key_event *event, uint32_t mods, xkb_keysym_t sym);
|
|
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)
|
|
/* 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)
|
|
+{
|
|
+ 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;
|
|
+
|
|
+ wl_list_for_each(c, &clients, link) {
|
|
+ if (c && c != savedc) {
|
|
+ const char* appid = client_get_appid(c);
|
|
+ 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)) {
|
|
+ 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
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ wlr_seat_keyboard_enter(seat, last_surface, keycodes, 0, &keyboard->modifiers);
|
|
}
|
|
|
|
void
|
|
--
|
|
2.45.1
|
|
|