hide-cursor-when-typing: remove unused variable and improve unclutter patch compatibility

patches/hide-cursor-when-typing/hide-cursor-when-typing.patch

@@ -1,12 +1,12 @@
-From 24742c6aa1837a58db36300a2ec7d1781ac5d183 Mon Sep 17 00:00:00 2001
-From: klim <klim@noreply.codeberg.org>
-Date: Thu, 9 Apr 2026 21:08:24 +0200
-Subject: [PATCH] [PATCH] Patch: hide-cursor-when-typing-0.8.patch
+From a73f5a4c7dd636d999cfab15610e68e170d2f597 Mon Sep 17 00:00:00 2001
+From: nate zhou <gnuunixchad@outlook.com>
+Date: Fri, 10 Apr 2026 19:38:43 +0800
+Subject: [PATCH] Patch: hide-cursor-when-typing-0.8.patch
 
 ---
  config.def.h |  2 ++
- dwl.c        | 91 ++++++++++++++++++++++++++++++++++++++++++++++++----
- 2 files changed, 86 insertions(+), 7 deletions(-)
+ dwl.c        | 90 ++++++++++++++++++++++++++++++++++++++++++++++++----
+ 2 files changed, 85 insertions(+), 7 deletions(-)
 
 diff --git a/config.def.h b/config.def.h
 index 8a6eda0..6205c0a 100644
@@ -22,23 +22,22 @@ index 8a6eda0..6205c0a 100644
  #define MODKEY WLR_MODIFIER_ALT
  
 diff --git a/dwl.c b/dwl.c
-index 44f3ad9..214374d 100644
+index 44f3ad9..7325f7a 100644
 --- a/dwl.c
 +++ b/dwl.c
-@@ -289,6 +289,8 @@ static Client *focustop(Monitor *m);
+@@ -288,6 +288,8 @@ 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 handlesig(int signo);
 +static void handlecursoractivity(void);
 +static int hidecursor(void *data);
+ static void handlesig(int signo);
  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);
-@@ -389,6 +391,15 @@ static struct wlr_pointer_constraint_v1 *active_constraint;
+@@ -389,6 +391,14 @@ static struct wlr_pointer_constraint_v1 *active_constraint;
  
  static struct wlr_cursor *cursor;
  static struct wlr_xcursor_manager *cursor_mgr;
-+static struct wl_event_source *hide_source;
 +static bool cursor_hidden = false;
 +static struct {
 +	enum wp_cursor_shape_device_v1_shape shape;
@@ -50,7 +49,7 @@ index 44f3ad9..214374d 100644
  
  static struct wlr_scene_rect *root_bg;
  static struct wlr_session_lock_manager_v1 *session_lock_mgr;
-@@ -610,6 +621,7 @@ axisnotify(struct wl_listener *listener, void *data)
+@@ -610,6 +620,7 @@ axisnotify(struct wl_listener *listener, void *data)
  	 * for example when you move the scroll wheel. */
  	struct wlr_pointer_axis_event *event = data;
  	wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
@@ -58,7 +57,7 @@ index 44f3ad9..214374d 100644
  	/* TODO: allow usage of scroll wheel for mousebindings, it can be implemented
  	 * by checking the event's orientation and the delta of the event */
  	/* Notify the client with pointer focus of the axis event. */
-@@ -628,6 +640,7 @@ buttonpress(struct wl_listener *listener, void *data)
+@@ -628,6 +639,7 @@ buttonpress(struct wl_listener *listener, void *data)
  	const Button *b;
  
  	wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
@@ -66,7 +65,7 @@ index 44f3ad9..214374d 100644
  
  	switch (event->state) {
  	case WL_POINTER_BUTTON_STATE_PRESSED:
-@@ -1566,6 +1579,33 @@ handlesig(int signo)
+@@ -1566,6 +1578,33 @@ handlesig(int signo)
  		quit(NULL);
  }
  
@@ -100,7 +99,7 @@ index 44f3ad9..214374d 100644
  void
  incnmaster(const Arg *arg)
  {
-@@ -1645,6 +1685,11 @@ keypress(struct wl_listener *listener, void *data)
+@@ -1645,6 +1684,11 @@ keypress(struct wl_listener *listener, void *data)
  
  	wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
  
@@ -112,7 +111,7 @@ index 44f3ad9..214374d 100644
  	/* On _press_ if there is no active screen locker,
  	 * attempt to process a compositor keybinding. */
  	if (!locked && event->state == WL_KEYBOARD_KEY_STATE_PRESSED) {
-@@ -1907,6 +1952,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
+@@ -1907,6 +1951,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
  
  		wlr_cursor_move(cursor, device, dx, dy);
  		wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
@@ -120,7 +119,7 @@ index 44f3ad9..214374d 100644
  
  		/* Update selmon (even while dragging a window) */
  		if (sloppyfocus)
-@@ -1931,7 +1977,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
+@@ -1931,7 +1976,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
  	 * default. This is what makes the cursor image appear when you move it
  	 * off of a client or over its border. */
@@ -129,7 +128,7 @@ index 44f3ad9..214374d 100644
  		wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
  
  	pointerfocus(c, surface, sx, sy, time);
-@@ -2296,6 +2342,15 @@ run(char *startup_cmd)
+@@ -2296,6 +2341,15 @@ run(char *startup_cmd)
  	wl_display_run(dpy);
  }
  
@@ -145,7 +144,7 @@ index 44f3ad9..214374d 100644
  void
  setcursor(struct wl_listener *listener, void *data)
  {
-@@ -2311,9 +2366,23 @@ setcursor(struct wl_listener *listener, void *data)
+@@ -2311,9 +2365,23 @@ setcursor(struct wl_listener *listener, void *data)
  	 * 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
  	 * do so as the cursor moves between outputs. */
@@ -172,7 +171,7 @@ index 44f3ad9..214374d 100644
  }
  
  void
-@@ -2325,9 +2394,14 @@ setcursorshape(struct wl_listener *listener, void *data)
+@@ -2325,9 +2393,14 @@ setcursorshape(struct wl_listener *listener, void *data)
  	/* 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
  	 * use the provided cursor shape. */
@@ -190,7 +189,7 @@ index 44f3ad9..214374d 100644
  }
  
  void
-@@ -2592,6 +2666,9 @@ setup(void)
+@@ -2592,6 +2665,9 @@ setup(void)
  	cursor = wlr_cursor_create();
  	wlr_cursor_attach_output_layout(cursor, output_layout);