Compare commits

...
3 Commits
Author SHA1 Message Date
Guido Cella 005596c2e8 update unclutter 2026-09-16 20:25:35 +02:00
Guido Cella aec8bbf5c3 update switchtotag 2026-09-16 20:25:32 +02:00
Guido Cella c4cf29b0a4 update center-terminal 2026-09-16 20:16:56 +02:00
6 changed files with 74 additions and 120 deletions
+1 -1
View File
@@ -7,7 +7,7 @@ covering the wallpaper more than necessary.
### Download ### Download
- [git branch](https://codeberg.org/guidocella/dwl/src/branch/center-terminal) - [git branch](https://codeberg.org/guidocella/dwl/src/branch/center-terminal)
- [2026-02-09](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/center-terminal/center-terminal.patch) - [2026-09-16](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/center-terminal/center-terminal.patch)
### Authors ### Authors
- [Guido Cella](https://codeberg.org/guidocella) - [Guido Cella](https://codeberg.org/guidocella)
+14 -14
View File
@@ -1,4 +1,4 @@
From 897765216ac8567a40654b813379a4e074ca6298 Mon Sep 17 00:00:00 2001 From 974db1c4a01a38e2c2af9460e4d9c5f48e7974f7 Mon Sep 17 00:00:00 2001
From: Guido Cella <guido@guidocella.xyz> From: Guido Cella <guido@guidocella.xyz>
Date: Mon, 9 Feb 2026 10:21:33 +0100 Date: Mon, 9 Feb 2026 10:21:33 +0100
Subject: [PATCH] add a keybinding to center the terminal Subject: [PATCH] add a keybinding to center the terminal
@@ -14,7 +14,7 @@ covering the wallpaper more than necessary.
2 files changed, 21 insertions(+) 2 files changed, 21 insertions(+)
diff --git a/config.def.h b/config.def.h diff --git a/config.def.h b/config.def.h
index 8a6eda0..8c35c40 100644 index 13c5322..aef03cb 100644
--- a/config.def.h --- a/config.def.h
+++ b/config.def.h +++ b/config.def.h
@@ -138,6 +138,7 @@ static const Key keys[] = { @@ -138,6 +138,7 @@ static const Key keys[] = {
@@ -23,13 +23,13 @@ index 8a6eda0..8c35c40 100644
{ MODKEY, XKB_KEY_e, togglefullscreen, {0} }, { MODKEY, XKB_KEY_e, togglefullscreen, {0} },
+ { MODKEY, XKB_KEY_v, togglecenter, {0} }, + { MODKEY, XKB_KEY_v, togglecenter, {0} },
{ MODKEY, XKB_KEY_0, view, {.ui = ~0} }, { MODKEY, XKB_KEY_0, view, {.ui = ~0} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag, {.ui = ~0} }, { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_0, tag, {.ui = ~0} },
{ MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} }, { MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} },
diff --git a/dwl.c b/dwl.c diff --git a/dwl.c b/dwl.c
index 44f3ad9..9ee397a 100644 index f7bda0b..cfdd4d1 100644
--- a/dwl.c --- a/dwl.c
+++ b/dwl.c +++ b/dwl.c
@@ -8,6 +8,7 @@ @@ -9,6 +9,7 @@
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -37,15 +37,15 @@ index 44f3ad9..9ee397a 100644
#include <sys/wait.h> #include <sys/wait.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
@@ -138,6 +139,7 @@ typedef struct { @@ -158,6 +159,7 @@ typedef struct {
unsigned int bw; unsigned int bw;
uint32_t tags; uint32_t tags;
int isfloating, isurgent, isfullscreen; int isfloating, isurgent, isfullscreen;
+ bool centered; + bool centered;
uint32_t resize; /* configure serial of a pending resize */
} Client; } Client;
@@ -334,6 +336,7 @@ static void startdrag(struct wl_listener *listener, void *data); typedef struct {
@@ -354,6 +356,7 @@ static void startdrag(struct wl_listener *listener, void *data);
static void tag(const Arg *arg); static void tag(const Arg *arg);
static void tagmon(const Arg *arg); static void tagmon(const Arg *arg);
static void tile(Monitor *m); static void tile(Monitor *m);
@@ -53,16 +53,16 @@ index 44f3ad9..9ee397a 100644
static void togglefloating(const Arg *arg); static void togglefloating(const Arg *arg);
static void togglefullscreen(const Arg *arg); static void togglefullscreen(const Arg *arg);
static void toggletag(const Arg *arg); static void toggletag(const Arg *arg);
@@ -436,6 +439,8 @@ static struct wl_listener request_start_drag = {.notify = requeststartdrag}; @@ -460,6 +463,8 @@ static struct wl_listener start_drag = {.notify = startdrag};
static struct wl_listener start_drag = {.notify = startdrag};
static struct wl_listener new_session_lock = {.notify = locksession}; static struct wl_listener new_session_lock = {.notify = locksession};
static struct wl_listener new_foreign_toplevel_capture_request = {.notify = capturerequest};
+static bool center; +static bool center;
+ +
#ifdef XWAYLAND #ifdef XWAYLAND
static void activatex11(struct wl_listener *listener, void *data); static void activatex11(struct wl_listener *listener, void *data);
static void associatex11(struct wl_listener *listener, void *data); static void associatex11(struct wl_listener *listener, void *data);
@@ -499,6 +504,9 @@ applyrules(Client *c) @@ -534,6 +539,9 @@ applyrules(Client *c)
} }
} }
@@ -72,7 +72,7 @@ index 44f3ad9..9ee397a 100644
c->isfloating |= client_is_float_type(c); c->isfloating |= client_is_float_type(c);
setmon(c, mon, newtags); setmon(c, mon, newtags);
} }
@@ -2731,6 +2739,11 @@ tile(Monitor *m) @@ -2886,6 +2894,11 @@ tile(Monitor *m)
if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen) if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
continue; continue;
if (i < m->nmaster) { if (i < m->nmaster) {
@@ -84,7 +84,7 @@ index 44f3ad9..9ee397a 100644
resize(c, (struct wlr_box){.x = m->w.x, .y = m->w.y + my, .width = mw, resize(c, (struct wlr_box){.x = m->w.x, .y = m->w.y + my, .width = mw,
.height = (m->w.height - my) / (MIN(n, m->nmaster) - i)}, 0); .height = (m->w.height - my) / (MIN(n, m->nmaster) - i)}, 0);
my += c->geom.height; my += c->geom.height;
@@ -2743,6 +2756,13 @@ tile(Monitor *m) @@ -2898,6 +2911,13 @@ tile(Monitor *m)
} }
} }
@@ -99,5 +99,5 @@ index 44f3ad9..9ee397a 100644
togglefloating(const Arg *arg) togglefloating(const Arg *arg)
{ {
-- --
2.52.0 2.55.0
+1 -1
View File
@@ -3,7 +3,7 @@ Add a rule option to switch to the configured tag when a window opens, then swit
### Download ### Download
- [git branch](https://codeberg.org/guidocella/dwl/src/branch/switchtotag) - [git branch](https://codeberg.org/guidocella/dwl/src/branch/switchtotag)
- [2026-02-09](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/switchtotag/switchtotag.patch) - [2026-09-16](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/switchtotag/switchtotag.patch)
### Authors ### Authors
- [Guido Cella](https://codeberg.org/guidocella) - [Guido Cella](https://codeberg.org/guidocella)
+21 -23
View File
@@ -1,4 +1,4 @@
From bfcfb26b00cb93a359469cb8817861439818b430 Mon Sep 17 00:00:00 2001 From 2d466821072b6b3630169a784a10b0fe40666790 Mon Sep 17 00:00:00 2001
From: Guido Cella <guido@guidocella.xyz> From: Guido Cella <guido@guidocella.xyz>
Date: Mon, 30 Sep 2024 08:40:25 +0200 Date: Mon, 30 Sep 2024 08:40:25 +0200
Subject: [PATCH] allow switching to the configured tag when a window opens Subject: [PATCH] allow switching to the configured tag when a window opens
@@ -7,14 +7,14 @@ Add a rule option to switch to the configured tag when a window opens,
then switch back when it closes. then switch back when it closes.
--- ---
config.def.h | 6 +++--- config.def.h | 6 +++---
dwl.c | 23 +++++++++++++++++++---- dwl.c | 21 +++++++++++++++++----
2 files changed, 22 insertions(+), 7 deletions(-) 2 files changed, 20 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..59e3ac5 100644 index 13c5322..1e52d05 100644
--- a/config.def.h --- a/config.def.h
+++ b/config.def.h +++ b/config.def.h
@@ -21,9 +21,9 @@ static const float fullscreen_bg[] = {0.0f, 0.0f, 0.0f, 1.0f}; /* You ca @@ -22,9 +22,9 @@ static const float fullscreen_bg[] = {0.0f, 0.0f, 0.0f, 1.0f}; /* You ca
static int log_level = WLR_ERROR; static int log_level = WLR_ERROR;
static const Rule rules[] = { static const Rule rules[] = {
@@ -28,18 +28,18 @@ index 8a6eda0..59e3ac5 100644
}; };
diff --git a/dwl.c b/dwl.c diff --git a/dwl.c b/dwl.c
index 44f3ad9..7a97d94 100644 index f7bda0b..a58bd9a 100644
--- a/dwl.c --- a/dwl.c
+++ b/dwl.c +++ b/dwl.c
@@ -138,6 +138,7 @@ typedef struct { @@ -158,6 +158,7 @@ typedef struct {
unsigned int bw; unsigned int bw;
uint32_t tags; uint32_t tags;
int isfloating, isurgent, isfullscreen; int isfloating, isurgent, isfullscreen;
+ int switchtotag; + int switchtotag;
uint32_t resize; /* configure serial of a pending resize */
} Client; } Client;
@@ -226,6 +227,7 @@ typedef struct { typedef struct {
@@ -245,6 +246,7 @@ typedef struct {
const char *id; const char *id;
const char *title; const char *title;
uint32_t tags; uint32_t tags;
@@ -47,7 +47,7 @@ index 44f3ad9..7a97d94 100644
int isfloating; int isfloating;
int monitor; int monitor;
} Rule; } Rule;
@@ -241,7 +243,7 @@ typedef struct { @@ -260,7 +262,7 @@ typedef struct {
/* function declarations */ /* function declarations */
static void applybounds(Client *c, struct wlr_box *bbox); static void applybounds(Client *c, struct wlr_box *bbox);
@@ -56,7 +56,7 @@ index 44f3ad9..7a97d94 100644
static void arrange(Monitor *m); static void arrange(Monitor *m);
static void arrangelayer(Monitor *m, struct wl_list *list, static void arrangelayer(Monitor *m, struct wl_list *list,
struct wlr_box *usable_area, int exclusive); struct wlr_box *usable_area, int exclusive);
@@ -474,7 +476,7 @@ applybounds(Client *c, struct wlr_box *bbox) @@ -509,7 +511,7 @@ applybounds(Client *c, struct wlr_box *bbox)
} }
void void
@@ -65,7 +65,7 @@ index 44f3ad9..7a97d94 100644
{ {
/* rule matching */ /* rule matching */
const char *appid, *title; const char *appid, *title;
@@ -496,6 +498,11 @@ applyrules(Client *c) @@ -531,6 +533,11 @@ applyrules(Client *c)
if (r->monitor == i++) if (r->monitor == i++)
mon = m; mon = m;
} }
@@ -77,7 +77,7 @@ index 44f3ad9..7a97d94 100644
} }
} }
@@ -864,7 +871,7 @@ commitnotify(struct wl_listener *listener, void *data) @@ -952,7 +959,7 @@ commitnotify(struct wl_listener *listener, void *data)
* a different monitor based on its title, this will likely select * a different monitor based on its title, this will likely select
* a wrong monitor. * a wrong monitor.
*/ */
@@ -86,7 +86,7 @@ index 44f3ad9..7a97d94 100644
if (c->mon) { if (c->mon) {
client_set_scale(client_surface(c), c->mon->wlr_output->scale); client_set_scale(client_surface(c), c->mon->wlr_output->scale);
} }
@@ -1790,7 +1797,7 @@ mapnotify(struct wl_listener *listener, void *data) @@ -1914,7 +1921,7 @@ mapnotify(struct wl_listener *listener, void *data)
c->isfloating = 1; c->isfloating = 1;
setmon(c, p->mon, p->tags); setmon(c, p->mon, p->tags);
} else { } else {
@@ -95,21 +95,19 @@ index 44f3ad9..7a97d94 100644
} }
printstatus(); printstatus();
@@ -2831,6 +2838,14 @@ unmapnotify(struct wl_listener *listener, void *data) @@ -3000,6 +3007,12 @@ unmapnotify(struct wl_listener *listener, void *data)
wl_list_remove(&c->flink); wlr_scene_node_destroy(&c->image_capture_scene->tree.node);
} wlr_scene_node_destroy(&c->scene->node);
client_surface(c)->data = NULL;
+
+ if (c->switchtotag) { + if (c->switchtotag) {
+ Arg a = { .ui = c->switchtotag }; + Arg a = { .ui = c->switchtotag };
+ // Call view() -> arrange() -> checkidleinhibitor() before
+ // wlr_scene_node_destroy() to prevent a rare use after free of
+ // tree->node.
+ view(&a); + view(&a);
+ } + }
+ +
wlr_scene_node_destroy(&c->scene->node);
printstatus(); printstatus();
motionnotify(0, NULL, 0, 0, 0, 0); motionnotify(0, NULL, 0, 0, 0, 0);
}
-- --
2.52.0 2.55.0
+1 -1
View File
@@ -2,8 +2,8 @@
Hide the mouse cursor if it isn't being used for a certain period of time. Hide the mouse cursor if it isn't being used for a certain period of time.
### Download ### Download
- [0.8](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/unclutter/unclutter.patch)
- [git branch](https://codeberg.org/guidocella/dwl/src/branch/unclutter) - [git branch](https://codeberg.org/guidocella/dwl/src/branch/unclutter)
- [2026-09-16](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/unclutter/unclutter.patch)
### Authors ### Authors
- [Guido Cella](https://github.com/guidocella) - [Guido Cella](https://github.com/guidocella)
+36 -80
View File
@@ -1,18 +1,22 @@
From 3e8ba5681dc34d7bf4229708af1f4eab243f520b Mon Sep 17 00:00:00 2001 From f8f6f6e20db7eaa0800b16f698907cfffab5f93e Mon Sep 17 00:00:00 2001
From: nate zhou <gnuunixchad@outlook.com> From: Guido Cella <guido@guidocella.xyz>
Date: Fri, 10 Apr 2026 19:13:25 +0800 Date: Wed, 16 Sep 2026 20:22:31 +0200
Subject: [PATCH] Patch: unclutter-0.8.patch Subject: [PATCH] =?UTF-8?q?hide=20the=20mouse=20cursor=20if=20it=20isn?=
=?UTF-8?q?=E2=80=99t=20being=20used?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
--- ---
config.def.h | 2 ++ config.def.h | 2 ++
dwl.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++------ dwl.c | 36 +++++++++++++++++++++++++++++++++++-
2 files changed, 65 insertions(+), 7 deletions(-) 2 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/config.def.h b/config.def.h diff --git a/config.def.h b/config.def.h
index 8a6eda0..0a1fff5 100644 index 13c5322..45c3c76 100644
--- a/config.def.h --- a/config.def.h
+++ b/config.def.h +++ b/config.def.h
@@ -102,6 +102,8 @@ LIBINPUT_CONFIG_TAP_MAP_LMR -- 1/2/3 finger tap maps to left/middle/right @@ -103,6 +103,8 @@ LIBINPUT_CONFIG_TAP_MAP_LMR -- 1/2/3 finger tap maps to left/middle/right
*/ */
static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TAP_MAP_LRM; static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TAP_MAP_LRM;
@@ -22,10 +26,10 @@ index 8a6eda0..0a1fff5 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..ac21ca3 100644 index f7bda0b..aabaa0d 100644
--- a/dwl.c --- a/dwl.c
+++ b/dwl.c +++ b/dwl.c
@@ -288,6 +288,8 @@ static void focusstack(const Arg *arg); @@ -308,6 +308,8 @@ static void focusstack(const Arg *arg);
static Client *focustop(Monitor *m); static Client *focustop(Monitor *m);
static void fullscreennotify(struct wl_listener *listener, void *data); static void fullscreennotify(struct wl_listener *listener, void *data);
static void gpureset(struct wl_listener *listener, void *data); static void gpureset(struct wl_listener *listener, void *data);
@@ -34,30 +38,25 @@ index 44f3ad9..ac21ca3 100644
static void handlesig(int signo); static void handlesig(int signo);
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);
@@ -389,6 +391,14 @@ static struct wlr_pointer_constraint_v1 *active_constraint; @@ -411,6 +413,8 @@ 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;
+static struct wl_event_source *hide_source; +static struct wl_event_source *hide_source;
+static bool cursor_hidden = false; +static bool cursor_hidden = false;
+static struct {
+ enum wp_cursor_shape_device_v1_shape shape;
+ struct wlr_surface *surface;
+ int hotspot_x;
+ int hotspot_y;
+} 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) @@ -671,6 +675,8 @@ axisnotify(struct wl_listener *listener, void *data)
* for example when you move the scroll wheel. */ wlr_seat_pointer_notify_axis(seat,
struct wlr_pointer_axis_event *event = data; event->time_msec, event->orientation, event->delta,
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); event->delta_discrete, event->source, event->relative_direction);
+
+ handlecursoractivity(); + handlecursoractivity();
/* 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. */ void
@@ -628,6 +639,7 @@ buttonpress(struct wl_listener *listener, void *data) @@ -684,6 +690,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);
@@ -65,7 +64,7 @@ index 44f3ad9..ac21ca3 100644
switch (event->state) { switch (event->state) {
case WL_POINTER_BUTTON_STATE_PRESSED: case WL_POINTER_BUTTON_STATE_PRESSED:
@@ -1566,6 +1578,32 @@ handlesig(int signo) @@ -1662,6 +1669,28 @@ handlesig(int signo)
quit(NULL); quit(NULL);
} }
@@ -79,12 +78,8 @@ index 44f3ad9..ac21ca3 100644
+ +
+ cursor_hidden = false; + cursor_hidden = false;
+ +
+ if (last_cursor.shape) + wlr_seat_pointer_clear_focus(seat);
+ wlr_cursor_set_xcursor(cursor, cursor_mgr, + motionnotify(0, NULL, 0, 0, 0, 0);
+ wlr_cursor_shape_v1_name(last_cursor.shape));
+ else
+ wlr_cursor_set_surface(cursor, last_cursor.surface,
+ last_cursor.hotspot_x, last_cursor.hotspot_y);
+} +}
+ +
+int +int
@@ -98,7 +93,7 @@ index 44f3ad9..ac21ca3 100644
void void
incnmaster(const Arg *arg) incnmaster(const Arg *arg)
{ {
@@ -1907,6 +1945,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d @@ -2032,6 +2061,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);
@@ -106,7 +101,7 @@ index 44f3ad9..ac21ca3 100644
/* Update selmon (even while dragging a window) */ /* Update selmon (even while dragging a window) */
if (sloppyfocus) if (sloppyfocus)
@@ -1931,7 +1970,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d @@ -2066,7 +2096,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. */
@@ -114,8 +109,8 @@ index 44f3ad9..ac21ca3 100644
+ if (!surface && !seat->drag && !cursor_hidden) + if (!surface && !seat->drag && !cursor_hidden)
wlr_cursor_set_xcursor(cursor, cursor_mgr, "default"); wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
pointerfocus(c, surface, sx, sy, time); pointerfocus(c, l, surface, sx, sy, time);
@@ -2288,6 +2327,7 @@ run(char *startup_cmd) @@ -2429,6 +2459,7 @@ run(char *startup_cmd)
* monitor when displayed here */ * monitor when displayed here */
wlr_cursor_warp_closest(cursor, NULL, cursor->x, cursor->y); wlr_cursor_warp_closest(cursor, NULL, cursor->x, cursor->y);
wlr_cursor_set_xcursor(cursor, cursor_mgr, "default"); wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
@@ -123,62 +118,23 @@ index 44f3ad9..ac21ca3 100644
/* Run the Wayland event loop. This does not return until you exit the /* Run the Wayland event loop. This does not return until you exit the
* compositor. Starting the backend rigged up all of the necessary event * compositor. Starting the backend rigged up all of the necessary event
@@ -2311,9 +2351,16 @@ setcursor(struct wl_listener *listener, void *data) @@ -2768,6 +2799,8 @@ setup(void)
* 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. */
- if (event->seat_client == seat->pointer_state.focused_client)
- wlr_cursor_set_surface(cursor, event->surface,
- event->hotspot_x, event->hotspot_y);
+ if (event->seat_client == seat->pointer_state.focused_client) {
+ last_cursor.shape = 0;
+ last_cursor.surface = event->surface;
+ last_cursor.hotspot_x = event->hotspot_x;
+ last_cursor.hotspot_y = event->hotspot_y;
+
+ if (!cursor_hidden)
+ wlr_cursor_set_surface(cursor, event->surface,
+ event->hotspot_x, event->hotspot_y);
+ }
}
void
@@ -2325,9 +2372,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. */
- if (event->seat_client == seat->pointer_state.focused_client)
- wlr_cursor_set_xcursor(cursor, cursor_mgr,
- wlr_cursor_shape_v1_name(event->shape));
+ if (event->seat_client == seat->pointer_state.focused_client) {
+ last_cursor.shape = event->shape;
+ last_cursor.surface = NULL;
+
+ if (!cursor_hidden)
+ wlr_cursor_set_xcursor(cursor, cursor_mgr,
+ wlr_cursor_shape_v1_name(event->shape));
+ }
}
void
@@ -2618,6 +2670,9 @@ setup(void)
cursor_shape_mgr = wlr_cursor_shape_manager_v1_create(dpy, 1); cursor_shape_mgr = wlr_cursor_shape_manager_v1_create(dpy, 1);
wl_signal_add(&cursor_shape_mgr->events.request_set_shape, &request_set_cursor_shape); wl_signal_add(&cursor_shape_mgr->events.request_set_shape, &request_set_cursor_shape);
+ hide_source = wl_event_loop_add_timer(wl_display_get_event_loop(dpy), + hide_source = wl_event_loop_add_timer(event_loop, hidecursor, cursor);
+ hidecursor, cursor);
+ +
/* /*
* Configures a seat, which is a single "seat" at which a user sits and * Configures a seat, which is a single "seat" at which a user sits and
* operates the computer. This conceptually includes up to one keyboard, * operates the computer. This conceptually includes up to one keyboard,
@@ -3002,6 +3057,7 @@ virtualpointer(struct wl_listener *listener, void *data) @@ -3185,6 +3218,7 @@ virtualpointer(struct wl_listener *listener, void *data)
wlr_cursor_attach_input_device(cursor, device);
if (event->suggested_output) if (event->suggested_output)
wlr_cursor_map_input_to_output(cursor, device, event->suggested_output); wlr_cursor_map_input_to_output(cursor, device, event->suggested_output);
wlr_seat_set_capabilities(seat, seat->capabilities | WL_SEAT_CAPABILITY_POINTER);
+ handlecursoractivity(); + handlecursoractivity();
} }
Monitor * Monitor *
-- --
2.53.0 2.55.0