mirror of
https://codeberg.org/dwl/dwl-patches.git
synced 2026-08-04 19:24:15 +00:00
Compare commits
3 Commits
514ad37ea9
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| a44a71ab0f | |||
| c9f31f29ea | |||
| 8085c4759f |
@@ -0,0 +1,8 @@
|
||||
### Description
|
||||
Gamepad bindings to dwl. Press `LB + RB` toggle gamepad bindings.
|
||||
|
||||
### Download
|
||||
- [2026-07-18](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/gamepad-bindings/gamepad-bindings.patch)
|
||||
### Authors
|
||||
- [dhruva_sambrani](https://codeberg.org/dhruva_sambrani)
|
||||
|
||||
@@ -0,0 +1,423 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 578194f..601c70e 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -12,16 +12,17 @@ DWLDEVCFLAGS = -g -Wpedantic -Wall -Wextra -Wdeclaration-after-statement \
|
||||
-Wfloat-conversion
|
||||
|
||||
# CFLAGS / LDFLAGS
|
||||
-PKGS = wayland-server xkbcommon libinput $(XLIBS)
|
||||
+PKGS = wayland-server xkbcommon libinput libevdev libudev $(XLIBS)
|
||||
DWLCFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` $(WLR_INCS) $(DWLCPPFLAGS) $(DWLDEVCFLAGS) $(CFLAGS)
|
||||
LDLIBS = `$(PKG_CONFIG) --libs $(PKGS)` $(WLR_LIBS) -lm $(LIBS)
|
||||
|
||||
all: dwl
|
||||
-dwl: dwl.o util.o
|
||||
- $(CC) dwl.o util.o $(DWLCFLAGS) $(LDFLAGS) $(LDLIBS) -o $@
|
||||
-dwl.o: dwl.c client.h config.h config.mk cursor-shape-v1-protocol.h \
|
||||
+dwl: dwl.o gamepad.o util.o
|
||||
+ $(CC) dwl.o gamepad.o util.o $(DWLCFLAGS) $(LDFLAGS) $(LDLIBS) -o $@
|
||||
+dwl.o: dwl.c client.h gamepad.h config.h config.mk cursor-shape-v1-protocol.h \
|
||||
pointer-constraints-unstable-v1-protocol.h wlr-layer-shell-unstable-v1-protocol.h \
|
||||
wlr-output-power-management-unstable-v1-protocol.h xdg-shell-protocol.h
|
||||
+gamepad.o: gamepad.c gamepad.h
|
||||
util.o: util.c util.h
|
||||
|
||||
# wayland-scanner is a tool which generates C headers and rigging for Wayland
|
||||
@@ -54,7 +55,7 @@ clean:
|
||||
dist: clean
|
||||
mkdir -p dwl-$(VERSION)
|
||||
cp -R LICENSE* Makefile CHANGELOG.md README.md client.h config.def.h \
|
||||
- config.mk protocols dwl.1 dwl.c util.c util.h dwl.desktop \
|
||||
+ config.mk protocols dwl.1 dwl.c gamepad.c gamepad.h util.c util.h dwl.desktop \
|
||||
dwl-$(VERSION)
|
||||
tar -caf dwl-$(VERSION).tar.gz dwl-$(VERSION)
|
||||
rm -rf dwl-$(VERSION)
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 8a6eda0..48270f6 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -165,6 +165,22 @@ static const Key keys[] = {
|
||||
CHVT(7), CHVT(8), CHVT(9), CHVT(10), CHVT(11), CHVT(12),
|
||||
};
|
||||
|
||||
+static const GamepadButton gamepadbuttons[] = {
|
||||
+ { BTN_DPAD_DOWN, focusstack, {.i = +1} },
|
||||
+ { BTN_DPAD_UP, focusstack, {.i = -1} },
|
||||
+ { BTN_DPAD_LEFT, setmfact, {.f = -0.05f} },
|
||||
+ { BTN_DPAD_RIGHT, setmfact, {.f = +0.05f} },
|
||||
+ { BTN_SOUTH, zoom, {0} },
|
||||
+ { BTN_EAST, setlayout, {.v = &layouts[0]} },
|
||||
+ { BTN_NORTH, setlayout, {.v = &layouts[1]} },
|
||||
+ { BTN_WEST, setlayout, {.v = &layouts[2]} },
|
||||
+ { ABS_Z, focusmon, {.i = WLR_DIRECTION_LEFT} },
|
||||
+ { ABS_RZ, focusmon, {.i = WLR_DIRECTION_RIGHT} },
|
||||
+ { BTN_START, spawn, SHCMD("wmenu-run") },
|
||||
+ { BTN_SELECT, winview, {0} },
|
||||
+ { BTN_MODE, spawn, { "steam", NULL }},
|
||||
+};
|
||||
+
|
||||
static const Button buttons[] = {
|
||||
{ MODKEY, BTN_LEFT, moveresize, {.ui = CurMove} },
|
||||
{ MODKEY, BTN_MIDDLE, togglefloating, {0} },
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index 101a45f..96e1c01 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -63,6 +63,7 @@
|
||||
#include <wlr/util/log.h>
|
||||
#include <wlr/util/region.h>
|
||||
#include <xkbcommon/xkbcommon.h>
|
||||
+#include "gamepad.h"
|
||||
#ifdef XWAYLAND
|
||||
#include <wlr/xwayland.h>
|
||||
#include <xcb/xcb.h>
|
||||
@@ -149,6 +150,12 @@ typedef struct {
|
||||
const Arg arg;
|
||||
} Key;
|
||||
|
||||
+typedef struct {
|
||||
+ unsigned int button;
|
||||
+ void (*func)(const Arg *);
|
||||
+ const Arg arg;
|
||||
+} GamepadButton;
|
||||
+
|
||||
typedef struct {
|
||||
struct wlr_keyboard_group *wlr_group;
|
||||
|
||||
@@ -289,6 +296,7 @@ static void focusstack(const Arg *arg);
|
||||
static Client *focustop(Monitor *m);
|
||||
static void fullscreennotify(struct wl_listener *listener, void *data);
|
||||
static void gpureset(struct wl_listener *listener, void *data);
|
||||
+static void gamepadbutton(unsigned int button, int state);
|
||||
static void handlesig(int signo);
|
||||
static void incnmaster(const Arg *arg);
|
||||
static void inputdevice(struct wl_listener *listener, void *data);
|
||||
@@ -398,6 +406,7 @@ static struct wlr_session_lock_v1 *cur_lock;
|
||||
|
||||
static struct wlr_seat *seat;
|
||||
static KeyboardGroup *kb_group;
|
||||
+static struct gamepad *gamepad;
|
||||
static unsigned int cursor_mode;
|
||||
static Client *grabc;
|
||||
static int grabcx, grabcy; /* client-relative */
|
||||
@@ -713,6 +722,7 @@ cleanup(void)
|
||||
wlr_xcursor_manager_destroy(cursor_mgr);
|
||||
|
||||
destroykeyboardgroup(&kb_group->destroy, NULL);
|
||||
+ gamepad_destroy(gamepad);
|
||||
|
||||
/* If it's not destroyed manually, it will cause a use-after-free of wlr_seat.
|
||||
* Destroy it until it's fixed on the wlroots side */
|
||||
@@ -1558,6 +1568,21 @@ gpureset(struct wl_listener *listener, void *data)
|
||||
wlr_renderer_destroy(old_drw);
|
||||
}
|
||||
|
||||
+void
|
||||
+gamepadbutton(unsigned int button, int state)
|
||||
+{
|
||||
+ const GamepadButton *b;
|
||||
+ if (!state || locked)
|
||||
+ return;
|
||||
+ wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
|
||||
+ for (b = gamepadbuttons; b < END(gamepadbuttons); b++) {
|
||||
+ if (button == b->button && b->func) {
|
||||
+ b->func(&b->arg);
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
void
|
||||
handlesig(int signo)
|
||||
{
|
||||
@@ -2643,6 +2668,7 @@ setup(void)
|
||||
|
||||
kb_group = createkeyboardgroup();
|
||||
wl_list_init(&kb_group->destroy.link);
|
||||
+ gamepad = gamepad_create(event_loop, session, gamepadbutton);
|
||||
|
||||
output_mgr = wlr_output_manager_v1_create(dpy);
|
||||
wl_signal_add(&output_mgr->events.apply, &output_mgr_apply);
|
||||
diff --git a/gamepad.c b/gamepad.c
|
||||
new file mode 100644
|
||||
index 0000000..6bad2f6
|
||||
--- /dev/null
|
||||
+++ b/gamepad.c
|
||||
@@ -0,0 +1,255 @@
|
||||
+#include <fcntl.h>
|
||||
+#include <libevdev/libevdev.h>
|
||||
+#include <libudev.h>
|
||||
+#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
+#include <unistd.h>
|
||||
+#include <wayland-server-core.h>
|
||||
+#include <wlr/backend/session.h>
|
||||
+
|
||||
+#include "gamepad.h"
|
||||
+
|
||||
+struct pad {
|
||||
+ struct wl_list link;
|
||||
+ char *path;
|
||||
+ int fd;
|
||||
+ struct libevdev *dev;
|
||||
+ struct wl_event_source *src;
|
||||
+ unsigned char key[KEY_CNT];
|
||||
+ unsigned char abs[ABS_CNT];
|
||||
+ int enabled;
|
||||
+ GamepadHandler fn;
|
||||
+};
|
||||
+
|
||||
+struct gamepad {
|
||||
+ struct udev *udev;
|
||||
+ struct udev_monitor *mon;
|
||||
+ struct wl_event_source *msrc;
|
||||
+ struct wl_event_loop *loop;
|
||||
+ struct wl_list pads;
|
||||
+ GamepadHandler fn;
|
||||
+};
|
||||
+
|
||||
+static int
|
||||
+ispad(struct udev_device *d)
|
||||
+{
|
||||
+ const char *p;
|
||||
+
|
||||
+ p = udev_device_get_property_value(d, "ID_INPUT_JOYSTICK");
|
||||
+ return !strcmp(udev_device_get_subsystem(d), "input")
|
||||
+ && !strncmp(udev_device_get_sysname(d), "event", 5)
|
||||
+ && p && !strcmp(p, "1");
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
+padstop(struct pad *p)
|
||||
+{
|
||||
+ if (p->src)
|
||||
+ wl_event_source_remove(p->src);
|
||||
+ if (p->dev)
|
||||
+ libevdev_free(p->dev);
|
||||
+ if (p->fd >= 0)
|
||||
+ close(p->fd);
|
||||
+ p->src = NULL;
|
||||
+ p->dev = NULL;
|
||||
+ p->fd = -1;
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
+padclose(struct pad *p)
|
||||
+{
|
||||
+ padstop(p);
|
||||
+ wl_list_remove(&p->link);
|
||||
+ free(p->path);
|
||||
+ free(p);
|
||||
+}
|
||||
+
|
||||
+static int
|
||||
+padin(int fd, uint32_t mask, void *data)
|
||||
+{
|
||||
+ struct pad *p = data;
|
||||
+ struct input_event e;
|
||||
+ int r, v;
|
||||
+
|
||||
+ if (mask & (WL_EVENT_HANGUP | WL_EVENT_ERROR)) {
|
||||
+ padclose(p);
|
||||
+ return 0;
|
||||
+ }
|
||||
+ while ((r = libevdev_next_event(p->dev, LIBEVDEV_READ_FLAG_NORMAL, &e)) == 0
|
||||
+ || r == LIBEVDEV_READ_STATUS_SYNC) {
|
||||
+ if (e.type == EV_KEY) {
|
||||
+ v = !!e.value;
|
||||
+ if (p->key[e.code] != v) {
|
||||
+ p->key[e.code] = v;
|
||||
+ if (p->enabled)
|
||||
+ p->fn(e.code, v);
|
||||
+ if ((e.code == BTN_TL || e.code == BTN_TR)
|
||||
+ && p->key[BTN_TL] && p->key[BTN_TR] && v)
|
||||
+ p->enabled ^= 1;
|
||||
+ }
|
||||
+ } else if (e.type == EV_ABS && (e.code == ABS_Z || e.code == ABS_RZ
|
||||
+ || e.code == ABS_GAS || e.code == ABS_BRAKE)) {
|
||||
+ const struct input_absinfo *a = libevdev_get_abs_info(p->dev, e.code);
|
||||
+
|
||||
+ v = e.value > (a->minimum + a->maximum) / 2;
|
||||
+ if (p->abs[e.code] != v) {
|
||||
+ p->abs[e.code] = v;
|
||||
+ if (p->enabled)
|
||||
+ p->fn(e.code, v);
|
||||
+ }
|
||||
+ } else if (e.type == EV_ABS && e.code == ABS_HAT0X) {
|
||||
+ v = e.value + 1;
|
||||
+ if (p->abs[e.code] != v) {
|
||||
+ if (p->enabled) {
|
||||
+ p->fn(BTN_DPAD_LEFT, 0);
|
||||
+ p->fn(BTN_DPAD_RIGHT, 0);
|
||||
+ }
|
||||
+ p->abs[e.code] = v;
|
||||
+ if (p->enabled) {
|
||||
+ p->fn(BTN_DPAD_LEFT, e.value < 0);
|
||||
+ p->fn(BTN_DPAD_RIGHT, e.value > 0);
|
||||
+ }
|
||||
+ }
|
||||
+ } else if (e.type == EV_ABS && e.code == ABS_HAT0Y) {
|
||||
+ v = e.value + 1;
|
||||
+ if (p->abs[e.code] != v) {
|
||||
+ if (p->enabled) {
|
||||
+ p->fn(BTN_DPAD_UP, 0);
|
||||
+ p->fn(BTN_DPAD_DOWN, 0);
|
||||
+ }
|
||||
+ p->abs[e.code] = v;
|
||||
+ if (p->enabled) {
|
||||
+ p->fn(BTN_DPAD_UP, e.value < 0);
|
||||
+ p->fn(BTN_DPAD_DOWN, e.value > 0);
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
+padstart(struct pad *p, struct wl_event_loop *loop)
|
||||
+{
|
||||
+ if (p->fd >= 0 || (p->fd = open(p->path, O_RDONLY | O_NONBLOCK | O_CLOEXEC)) < 0)
|
||||
+ return;
|
||||
+ if (libevdev_new_from_fd(p->fd, &p->dev)) {
|
||||
+ close(p->fd);
|
||||
+ p->fd = -1;
|
||||
+ return;
|
||||
+ }
|
||||
+ if (!(p->src = wl_event_loop_add_fd(loop, p->fd, WL_EVENT_READABLE, padin, p)))
|
||||
+ padstop(p);
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
+padadd(struct gamepad *g, struct udev_device *d)
|
||||
+{
|
||||
+ struct pad *p;
|
||||
+ struct pad *q;
|
||||
+ const char *path;
|
||||
+
|
||||
+ if (!ispad(d) || !(path = udev_device_get_devnode(d)))
|
||||
+ return;
|
||||
+ wl_list_for_each(q, &g->pads, link) {
|
||||
+ if (!strcmp(q->path, path))
|
||||
+ return;
|
||||
+ }
|
||||
+ if (!(p = calloc(1, sizeof(*p))))
|
||||
+ return;
|
||||
+ if (!(p->path = strdup(path))) {
|
||||
+ free(p);
|
||||
+ return;
|
||||
+ }
|
||||
+ p->fd = -1;
|
||||
+ p->enabled = 1;
|
||||
+ p->fn = g->fn;
|
||||
+ wl_list_insert(&g->pads, &p->link);
|
||||
+ padstart(p, g->loop);
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
+padremove(struct gamepad *g, const char *path)
|
||||
+{
|
||||
+ struct pad *p, *t;
|
||||
+
|
||||
+ wl_list_for_each_safe(p, t, &g->pads, link) {
|
||||
+ if (!strcmp(p->path, path)) {
|
||||
+ padclose(p);
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static int
|
||||
+monin(int fd, uint32_t mask, void *data)
|
||||
+{
|
||||
+ struct gamepad *g = data;
|
||||
+ struct udev_device *d;
|
||||
+ const char *a;
|
||||
+ const char *path;
|
||||
+
|
||||
+ if (!(d = udev_monitor_receive_device(g->mon)))
|
||||
+ return 0;
|
||||
+ a = udev_device_get_action(d);
|
||||
+ path = udev_device_get_devnode(d);
|
||||
+ if (a && !strcmp(a, "add"))
|
||||
+ padadd(g, d);
|
||||
+ else if (a && !strcmp(a, "remove") && path)
|
||||
+ padremove(g, path);
|
||||
+ udev_device_unref(d);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+struct gamepad *
|
||||
+gamepad_create(struct wl_event_loop *loop, struct wlr_session *s, GamepadHandler fn)
|
||||
+{
|
||||
+ struct gamepad *g;
|
||||
+ struct udev_enumerate *e;
|
||||
+ struct udev_list_entry *l;
|
||||
+ struct udev_device *d;
|
||||
+
|
||||
+ if (!s || !(g = calloc(1, sizeof(*g))) || !(g->udev = udev_new()))
|
||||
+ return NULL;
|
||||
+ g->loop = loop;
|
||||
+ g->fn = fn;
|
||||
+ wl_list_init(&g->pads);
|
||||
+ if ((e = udev_enumerate_new(g->udev))) {
|
||||
+ udev_enumerate_add_match_subsystem(e, "input");
|
||||
+ udev_enumerate_scan_devices(e);
|
||||
+ udev_list_entry_foreach(l, udev_enumerate_get_list_entry(e)) {
|
||||
+ d = udev_device_new_from_syspath(g->udev, udev_list_entry_get_name(l));
|
||||
+ if (d) {
|
||||
+ padadd(g, d);
|
||||
+ udev_device_unref(d);
|
||||
+ }
|
||||
+ }
|
||||
+ udev_enumerate_unref(e);
|
||||
+ }
|
||||
+ if (!(g->mon = udev_monitor_new_from_netlink(g->udev, "udev"))
|
||||
+ || udev_monitor_filter_add_match_subsystem_devtype(g->mon, "input", NULL)
|
||||
+ || udev_monitor_enable_receiving(g->mon)
|
||||
+ || !(g->msrc = wl_event_loop_add_fd(loop, udev_monitor_get_fd(g->mon), WL_EVENT_READABLE, monin, g))) {
|
||||
+ gamepad_destroy(g);
|
||||
+ return NULL;
|
||||
+ }
|
||||
+ return g;
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+gamepad_destroy(struct gamepad *g)
|
||||
+{
|
||||
+ struct pad *p, *t;
|
||||
+
|
||||
+ if (!g)
|
||||
+ return;
|
||||
+ wl_list_for_each_safe(p, t, &g->pads, link)
|
||||
+ padclose(p);
|
||||
+ if (g->msrc)
|
||||
+ wl_event_source_remove(g->msrc);
|
||||
+ if (g->mon)
|
||||
+ udev_monitor_unref(g->mon);
|
||||
+ if (g->udev)
|
||||
+ udev_unref(g->udev);
|
||||
+ free(g);
|
||||
+}
|
||||
diff --git a/gamepad.h b/gamepad.h
|
||||
new file mode 100644
|
||||
index 0000000..5d45d28
|
||||
--- /dev/null
|
||||
+++ b/gamepad.h
|
||||
@@ -0,0 +1,15 @@
|
||||
+#ifndef GAMEPAD_H
|
||||
+#define GAMEPAD_H
|
||||
+
|
||||
+#include <linux/input.h>
|
||||
+
|
||||
+struct gamepad;
|
||||
+struct wl_event_loop;
|
||||
+struct wlr_session;
|
||||
+
|
||||
+typedef void (*GamepadHandler)(unsigned int, int);
|
||||
+
|
||||
+struct gamepad *gamepad_create(struct wl_event_loop *, struct wlr_session *, GamepadHandler);
|
||||
+void gamepad_destroy(struct gamepad *);
|
||||
+
|
||||
+#endif
|
||||
@@ -10,9 +10,10 @@ Examples provided:
|
||||
- exclude certain keyboards (eg ydotool) from keyboard group
|
||||
|
||||
### Download
|
||||
- [git branch](https://codeberg.org/bencc/dwl/src/branch/inputdevicerules)
|
||||
- [v0.8](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/inputdevicerules/inputdevicerules-v0.8.patch)
|
||||
- [v0.7](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/inputdevicerules/inputdevicerules-v0.7.patch)
|
||||
- [v0.6](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/inputdevicerules/inputdevicerules-v0.6.patch)
|
||||
|
||||
### Authors
|
||||
- [Viktor Woloszczuk](https://codeberg.org/vwoloszczuk)
|
||||
- [Ben Collerson](https://codeberg.org/bencc)
|
||||
|
||||
@@ -0,0 +1,173 @@
|
||||
From 31c8493d7f2a863949a91cd14769e28894f259e7 Mon Sep 17 00:00:00 2001
|
||||
From: Viktor Woloszczuk <viktor@woloszcz.uk>
|
||||
Date: Wed, 11 Mar 2026 19:41:02 +0000
|
||||
Subject: [PATCH] input device rules (v0.8)
|
||||
|
||||
* 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 8a6eda0..4dbcfd1 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -56,6 +56,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;
|
||||
|
||||
@@ -138,6 +150,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 44f3ad9..42557fe 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -141,6 +141,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;
|
||||
@@ -268,6 +274,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);
|
||||
@@ -336,6 +344,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);
|
||||
@@ -406,6 +415,8 @@ static struct wlr_box sgeom;
|
||||
static struct wl_list mons;
|
||||
static Monitor *selmon;
|
||||
|
||||
+static struct libinput_device *togglepointerdevice = NULL;
|
||||
+
|
||||
/* global event handlers */
|
||||
static struct wl_listener cursor_axis = {.notify = axisnotify};
|
||||
static struct wl_listener cursor_button = {.notify = buttonpress};
|
||||
@@ -1199,6 +1210,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)
|
||||
{
|
||||
@@ -1582,13 +1620,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 */
|
||||
@@ -2760,6 +2812,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.53.0
|
||||
|
||||
@@ -2,12 +2,11 @@
|
||||
|
||||
Like smartborders. Don't put borders when there is only one window on the screen.
|
||||
|
||||
The patch for tag v0.7 below appears to apply cleanly to the current HEAD of
|
||||
upstream/main as at 2024-10-11.
|
||||
|
||||
### Download
|
||||
- [git branch](https://codeberg.org/bencc/dwl/src/branch/simpleborders)
|
||||
- [v0.7](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simpleborders/simpleborders-v0.7.patch)
|
||||
- [v0.6](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simpleborders/simpleborders-v0.6.patch)
|
||||
- [simpleborders-wlroots-next-f4249db](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simpleborders/simpleborders-wlroots-next-f4249db.patch)
|
||||
- [simpleborders-0.8.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simpleborders/simpleborders-v0.8.patch)
|
||||
|
||||
### Authors
|
||||
- [A Frederick Christensen](https://codeberg.org/fauxmight)
|
||||
- [Ben Collerson](https://codeberg.org/bencc)
|
||||
|
||||
+15
-15
@@ -1,34 +1,34 @@
|
||||
From 681e520deaeee460647de36f5312af3cb0c31f4a Mon Sep 17 00:00:00 2001
|
||||
From: Ben Collerson <benc@benc.cc>
|
||||
Date: Sat, 30 Dec 2023 13:39:31 +1000
|
||||
Subject: [PATCH] simpleborders
|
||||
From 41eb0c0d196d302790ae87a5ca1a4da660864f10 Mon Sep 17 00:00:00 2001
|
||||
From: A Frederick Christensen <dwl@ivories.org>
|
||||
Date: Wed, 25 Feb 2026 20:11:56 -0600
|
||||
Subject: [PATCH] Apply simpleborders patch
|
||||
|
||||
---
|
||||
dwl.c | 22 ++++++++++++++++++++++
|
||||
1 file changed, 22 insertions(+)
|
||||
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index 4d19357..900e651 100644
|
||||
index 44f3ad9..defe2a8 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -245,6 +245,7 @@ static void cleanupmon(struct wl_listener *listener, void *data);
|
||||
static void closemon(Monitor *m);
|
||||
@@ -257,6 +257,7 @@ static void closemon(Monitor *m);
|
||||
static void commitlayersurfacenotify(struct wl_listener *listener, void *data);
|
||||
static void commitnotify(struct wl_listener *listener, void *data);
|
||||
static void commitpopup(struct wl_listener *listener, void *data);
|
||||
+static int countclients(Monitor *m);
|
||||
static void createdecoration(struct wl_listener *listener, void *data);
|
||||
static void createidleinhibitor(struct wl_listener *listener, void *data);
|
||||
static void createkeyboard(struct wlr_keyboard *keyboard);
|
||||
@@ -286,6 +287,7 @@ static void motionabsolute(struct wl_listener *listener, void *data);
|
||||
static void motionnotify(uint32_t time);
|
||||
@@ -305,6 +306,7 @@ static void motionnotify(uint32_t time, struct wlr_input_device *device, double
|
||||
double sy, double sx_unaccel, double sy_unaccel);
|
||||
static void motionrelative(struct wl_listener *listener, void *data);
|
||||
static void moveresize(const Arg *arg);
|
||||
+static int needsborder(Client *c);
|
||||
static void outputmgrapply(struct wl_listener *listener, void *data);
|
||||
static void outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int test);
|
||||
static void outputmgrtest(struct wl_listener *listener, void *data);
|
||||
@@ -739,6 +741,17 @@ commitnotify(struct wl_listener *listener, void *data)
|
||||
c->resize = 0;
|
||||
@@ -915,6 +917,17 @@ commitpopup(struct wl_listener *listener, void *data)
|
||||
free(listener);
|
||||
}
|
||||
|
||||
+int
|
||||
@@ -45,7 +45,7 @@ index 4d19357..900e651 100644
|
||||
void
|
||||
createdecoration(struct wl_listener *listener, void *data)
|
||||
{
|
||||
@@ -1697,6 +1710,14 @@ moveresize(const Arg *arg)
|
||||
@@ -1980,6 +1993,14 @@ moveresize(const Arg *arg)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -60,8 +60,8 @@ index 4d19357..900e651 100644
|
||||
void
|
||||
outputmgrapply(struct wl_listener *listener, void *data)
|
||||
{
|
||||
@@ -1930,6 +1951,7 @@ resize(Client *c, struct wlr_box geo, int interact)
|
||||
struct wlr_box clip;
|
||||
@@ -2215,6 +2236,7 @@ resize(Client *c, struct wlr_box geo, int interact)
|
||||
|
||||
client_set_bounds(c, geo.width, geo.height);
|
||||
c->geom = geo;
|
||||
+ c->bw = needsborder(c) ? borderpx : 0;
|
||||
@@ -69,5 +69,5 @@ index 4d19357..900e651 100644
|
||||
|
||||
/* Update scene-graph, including borders */
|
||||
--
|
||||
2.43.0
|
||||
2.52.0
|
||||
|
||||
+11
-11
@@ -1,14 +1,14 @@
|
||||
From 09759c3ef75158c366e9fc63814485fbb31a3ccf Mon Sep 17 00:00:00 2001
|
||||
From: Ben Collerson <benc@benc.cc>
|
||||
Date: Sat, 30 Dec 2023 13:39:31 +1000
|
||||
Subject: [PATCH] simpleborders
|
||||
From 33364ee84f8063813fbdb8b319965a87f63e2694 Mon Sep 17 00:00:00 2001
|
||||
From: A Frederick Christensen <dwl@ivories.org>
|
||||
Date: Wed, 25 Feb 2026 20:14:28 -0600
|
||||
Subject: [PATCH] Apply simpleborders patch
|
||||
|
||||
---
|
||||
dwl.c | 22 ++++++++++++++++++++++
|
||||
1 file changed, 22 insertions(+)
|
||||
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index a2711f67..415fe1a0 100644
|
||||
index 8a9715d..a3caac8 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -259,6 +259,7 @@ static void closemon(Monitor *m);
|
||||
@@ -19,7 +19,7 @@ index a2711f67..415fe1a0 100644
|
||||
static void createdecoration(struct wl_listener *listener, void *data);
|
||||
static void createidleinhibitor(struct wl_listener *listener, void *data);
|
||||
static void createkeyboard(struct wlr_keyboard *keyboard);
|
||||
@@ -308,6 +309,7 @@ static void motionnotify(uint32_t time, struct wlr_input_device *device, double
|
||||
@@ -307,6 +308,7 @@ static void motionnotify(uint32_t time, struct wlr_input_device *device, double
|
||||
double sy, double sx_unaccel, double sy_unaccel);
|
||||
static void motionrelative(struct wl_listener *listener, void *data);
|
||||
static void moveresize(const Arg *arg);
|
||||
@@ -27,8 +27,8 @@ index a2711f67..415fe1a0 100644
|
||||
static void outputmgrapply(struct wl_listener *listener, void *data);
|
||||
static void outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int test);
|
||||
static void outputmgrtest(struct wl_listener *listener, void *data);
|
||||
@@ -849,6 +851,17 @@ commitpopup(struct wl_listener *listener, void *data)
|
||||
wl_list_remove(&listener->link);
|
||||
@@ -917,6 +919,17 @@ commitpopup(struct wl_listener *listener, void *data)
|
||||
free(listener);
|
||||
}
|
||||
|
||||
+int
|
||||
@@ -45,7 +45,7 @@ index a2711f67..415fe1a0 100644
|
||||
void
|
||||
createdecoration(struct wl_listener *listener, void *data)
|
||||
{
|
||||
@@ -1927,6 +1940,14 @@ moveresize(const Arg *arg)
|
||||
@@ -1982,6 +1995,14 @@ moveresize(const Arg *arg)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ index a2711f67..415fe1a0 100644
|
||||
void
|
||||
outputmgrapply(struct wl_listener *listener, void *data)
|
||||
{
|
||||
@@ -2190,6 +2211,7 @@ resize(Client *c, struct wlr_box geo, int interact)
|
||||
@@ -2217,6 +2238,7 @@ resize(Client *c, struct wlr_box geo, int interact)
|
||||
|
||||
client_set_bounds(c, geo.width, geo.height);
|
||||
c->geom = geo;
|
||||
@@ -69,5 +69,5 @@ index a2711f67..415fe1a0 100644
|
||||
|
||||
/* Update scene-graph, including borders */
|
||||
--
|
||||
2.45.2
|
||||
2.52.0
|
||||
|
||||
Reference in New Issue
Block a user