jachym/dwl-patches
1
0
Fork 0
mirror of https://codeberg.org/dwl/dwl-patches.git synced 2026-05-06 16:33:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix crash when theres no active client or client below cursor

Browse Source
This commit is contained in:
klim 2026-04-09 21:46:25 +02:00
parent 2d4463dd83
commit e3bf9a3d04
1 changed files with 73 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
patches/hide-cursor-when-typing/hide-cursor-when-typing.patch
View File

@ -1,14 +1,12 @@
From c72de058e6635c5bb3d973995ccbdb6e028f354d Mon Sep 17 00:00:00 2001 From 24742c6aa1837a58db36300a2ec7d1781ac5d183 Mon Sep 17 00:00:00 2001
From: nate zhou <gnuunixchad@outlook.com> From: klim <klim@noreply.codeberg.org>
Date: Tue, 3 Mar 2026 16:48:46 +0800 Date: Thu, 9 Apr 2026 21:08:24 +0200
Subject: [PATCH] Patch: hide-cursor-when-typing-0.8.patch Subject: [PATCH] [PATCH] Patch: hide-cursor-when-typing-0.8.patch
Hide the cursor when start typing, and restore it when start moving
cursor again, just like xbanish.
--- ---
config.def.h | 2 ++ config.def.h | 2 ++
dwl.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++------ dwl.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++----
2 files changed, 63 insertions(+), 7 deletions(-) 2 files changed, 86 insertions(+), 7 deletions(-)
diff --git a/config.def.h b/config.def.h diff --git a/config.def.h b/config.def.h
index 8a6eda0..6205c0a 100644 index 8a6eda0..6205c0a 100644
@ -24,7 +22,7 @@ index 8a6eda0..6205c0a 100644
#define MODKEY WLR_MODIFIER_ALT #define MODKEY WLR_MODIFIER_ALT
diff --git a/dwl.c b/dwl.c diff --git a/dwl.c b/dwl.c
index 44f3ad9..9a076b6 100644 index 44f3ad9..214374d 100644
--- a/dwl.c --- a/dwl.c
+++ b/dwl.c +++ b/dwl.c
@@ -289,6 +289,8 @@ static Client *focustop(Monitor *m); @@ -289,6 +289,8 @@ static Client *focustop(Monitor *m);
@ -36,7 +34,7 @@ index 44f3ad9..9a076b6 100644
static void incnmaster(const Arg *arg); static void incnmaster(const Arg *arg);
static void inputdevice(struct wl_listener *listener, void *data); static void inputdevice(struct wl_listener *listener, void *data);
static int keybinding(uint32_t mods, xkb_keysym_t sym); static int keybinding(uint32_t mods, xkb_keysym_t sym);
@@ -389,6 +391,14 @@ static struct wlr_pointer_constraint_v1 *active_constraint; @@ -389,6 +391,15 @@ static struct wlr_pointer_constraint_v1 *active_constraint;
static struct wlr_cursor *cursor; static struct wlr_cursor *cursor;
static struct wlr_xcursor_manager *cursor_mgr; static struct wlr_xcursor_manager *cursor_mgr;
@ -47,27 +45,28 @@ index 44f3ad9..9a076b6 100644
+ struct wlr_surface *surface; + struct wlr_surface *surface;
+ int hotspot_x; + int hotspot_x;
+ int hotspot_y; + int hotspot_y;
+ struct wl_listener destroy;
+} last_cursor; +} last_cursor;
static struct wlr_scene_rect *root_bg; static struct wlr_scene_rect *root_bg;
static struct wlr_session_lock_manager_v1 *session_lock_mgr; static struct wlr_session_lock_manager_v1 *session_lock_mgr;
@@ -610,6 +620,7 @@ axisnotify(struct wl_listener *listener, void *data) @@ -610,6 +621,7 @@ axisnotify(struct wl_listener *listener, void *data)
* for example when you move the scroll wheel. */ * for example when you move the scroll wheel. */
struct wlr_pointer_axis_event *event = data; struct wlr_pointer_axis_event *event = data;
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
+ handlecursoractivity(); + handlecursoractivity();
/* TODO: allow usage of scroll wheel for mousebindings, it can be implemented /* TODO: allow usage of scroll wheel for mousebindings, it can be implemented
* by checking the event's orientation and the delta of the event */ * by checking the event's orientation and the delta of the event */
/* Notify the client with pointer focus of the axis event. */ /* Notify the client with pointer focus of the axis event. */
@@ -628,6 +639,7 @@ buttonpress(struct wl_listener *listener, void *data) @@ -628,6 +640,7 @@ buttonpress(struct wl_listener *listener, void *data)
const Button *b; const Button *b;
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
+ handlecursoractivity(); + handlecursoractivity();
switch (event->state) { switch (event->state) {
case WL_POINTER_BUTTON_STATE_PRESSED: case WL_POINTER_BUTTON_STATE_PRESSED:
@@ -1566,6 +1578,30 @@ handlesig(int signo) @@ -1566,6 +1579,33 @@ handlesig(int signo)
quit(NULL); quit(NULL);
} }
@ -79,12 +78,15 @@ index 44f3ad9..9a076b6 100644
+ +
+ cursor_hidden = false; + cursor_hidden = false;
+ +
+ if (last_cursor.shape) + if (last_cursor.shape) {
+ wlr_cursor_set_xcursor(cursor, cursor_mgr, + wlr_cursor_set_xcursor(cursor, cursor_mgr,
+ wlr_cursor_shape_v1_name(last_cursor.shape)); + wlr_cursor_shape_v1_name(last_cursor.shape));
+ else + } else if (last_cursor.surface) {
+ wlr_cursor_set_surface(cursor, last_cursor.surface, + wlr_cursor_set_surface(cursor, last_cursor.surface,
+ last_cursor.hotspot_x, last_cursor.hotspot_y); + last_cursor.hotspot_x, last_cursor.hotspot_y);
+ } else {
+ wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
+ }
+} +}
+ +
+int +int
@ -98,27 +100,27 @@ index 44f3ad9..9a076b6 100644
void void
incnmaster(const Arg *arg) incnmaster(const Arg *arg)
{ {
@@ -1645,6 +1681,11 @@ keypress(struct wl_listener *listener, void *data) @@ -1645,6 +1685,11 @@ keypress(struct wl_listener *listener, void *data)
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
+ /* hide cursor when typing starts */ + /* hide cursor when typing starts */
+ if (hide_cursor_when_typing && !cursor_hidden && event->state == WL_KEYBOARD_KEY_STATE_PRESSED) { + if (hide_cursor_when_typing && !cursor_hidden && event->state == WL_KEYBOARD_KEY_STATE_PRESSED) {
+ hidecursor(NULL); + hidecursor(NULL);
+ } + }
+ +
/* On _press_ if there is no active screen locker, /* On _press_ if there is no active screen locker,
* attempt to process a compositor keybinding. */ * attempt to process a compositor keybinding. */
if (!locked && event->state == WL_KEYBOARD_KEY_STATE_PRESSED) { if (!locked && event->state == WL_KEYBOARD_KEY_STATE_PRESSED) {
@@ -1907,6 +1948,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d @@ -1907,6 +1952,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
wlr_cursor_move(cursor, device, dx, dy); wlr_cursor_move(cursor, device, dx, dy);
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
+ handlecursoractivity(); + handlecursoractivity();
/* Update selmon (even while dragging a window) */ /* Update selmon (even while dragging a window) */
if (sloppyfocus) if (sloppyfocus)
@@ -1931,7 +1973,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d @@ -1931,7 +1977,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
/* If there's no client surface under the cursor, set the cursor image to a /* If there's no client surface under the cursor, set the cursor image to a
* default. This is what makes the cursor image appear when you move it * default. This is what makes the cursor image appear when you move it
* off of a client or over its border. */ * off of a client or over its border. */
@ -127,7 +129,23 @@ index 44f3ad9..9a076b6 100644
wlr_cursor_set_xcursor(cursor, cursor_mgr, "default"); wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
pointerfocus(c, surface, sx, sy, time); pointerfocus(c, surface, sx, sy, time);
@@ -2311,9 +2353,16 @@ setcursor(struct wl_listener *listener, void *data) @@ -2296,6 +2342,15 @@ run(char *startup_cmd)
wl_display_run(dpy);
}
+void
+unlastcursor(struct wl_listener *listener, void *data)
+{
+ /* When the surface is destroyed, clear our reference to it */
+ last_cursor.surface = NULL;
+ wl_list_remove(&last_cursor.destroy.link);
+ wl_list_init(&last_cursor.destroy.link);
+}
+
void
setcursor(struct wl_listener *listener, void *data)
{
@@ -2311,9 +2366,23 @@ setcursor(struct wl_listener *listener, void *data)
* use the provided surface as the cursor image. It will set the * use the provided surface as the cursor image. It will set the
* hardware cursor on the output that it's currently on and continue to * hardware cursor on the output that it's currently on and continue to
* do so as the cursor moves between outputs. */ * do so as the cursor moves between outputs. */
@ -135,19 +153,26 @@ index 44f3ad9..9a076b6 100644
- wlr_cursor_set_surface(cursor, event->surface, - wlr_cursor_set_surface(cursor, event->surface,
- event->hotspot_x, event->hotspot_y); - event->hotspot_x, event->hotspot_y);
+ if (event->seat_client == seat->pointer_state.focused_client) { + if (event->seat_client == seat->pointer_state.focused_client) {
+ last_cursor.shape = 0; + last_cursor.shape = 0;
+ last_cursor.surface = event->surface; + last_cursor.surface = event->surface;
+ last_cursor.hotspot_x = event->hotspot_x; + last_cursor.hotspot_x = event->hotspot_x;
+ last_cursor.hotspot_y = event->hotspot_y; + last_cursor.hotspot_y = event->hotspot_y;
+ +
+ if (!cursor_hidden) + wl_list_remove(&last_cursor.destroy.link);
+ wlr_cursor_set_surface(cursor, event->surface, + wl_list_init(&last_cursor.destroy.link);
+ event->hotspot_x, event->hotspot_y); + if (event->surface) {
+ } + last_cursor.destroy.notify = unlastcursor;
+ wl_signal_add(&event->surface->events.destroy, &last_cursor.destroy);
+ }
+
+ if (!cursor_hidden)
+ wlr_cursor_set_surface(cursor, event->surface,
+ event->hotspot_x, event->hotspot_y);
+ }
} }
void void
@@ -2325,9 +2374,14 @@ setcursorshape(struct wl_listener *listener, void *data) @@ -2325,9 +2394,14 @@ setcursorshape(struct wl_listener *listener, void *data)
/* This can be sent by any client, so we check to make sure this one /* This can be sent by any client, so we check to make sure this one
* actually has pointer focus first. If so, we can tell the cursor to * actually has pointer focus first. If so, we can tell the cursor to
* use the provided cursor shape. */ * use the provided cursor shape. */
@ -160,11 +185,21 @@ index 44f3ad9..9a076b6 100644
+ +
+ if (!cursor_hidden) + if (!cursor_hidden)
+ wlr_cursor_set_xcursor(cursor, cursor_mgr, + wlr_cursor_set_xcursor(cursor, cursor_mgr,
+ wlr_cursor_shape_v1_name(event->shape)); + wlr_cursor_shape_v1_name(event->shape));
+ } + }
} }
void void
@@ -2592,6 +2666,9 @@ setup(void)
cursor = wlr_cursor_create();
wlr_cursor_attach_output_layout(cursor, output_layout);
+ /* Initialize the last_cursor destroy listener link so it's safe to remove later */
+ wl_list_init(&last_cursor.destroy.link);
+
/* Creates an xcursor manager, another wlroots utility which loads up
* Xcursor themes to source cursor images from and makes sure that cursor
* images are available at all scale factors on the screen (necessary for
-- --
2.53.0 2.53.0