mirror of
https://codeberg.org/dwl/dwl-patches.git
synced 2026-11-04 04:03:18 +00:00
Compare commits
13
Commits
1be70745cc
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
28f91b0326 | ||
|
|
3360d3acf7 | ||
|
|
730f15e95e | ||
|
|
9e89b5823f | ||
|
|
78e632455b | ||
|
|
ae0fe9e212 | ||
|
|
8a28588683 | ||
|
|
c71551b288 | ||
|
|
4dbca64379 | ||
|
|
7b42b1ab4d | ||
|
|
20598d28dc | ||
|
|
de72d2bb3c | ||
|
|
f974a35dab |
@@ -0,0 +1,9 @@
|
||||
## Description
|
||||
Choose multiple/one floating window to be always-on-top - this prevents other floating windows from being raised above it. Useful for playing films, etc.
|
||||
this builds against tag 0.9 and also against commit 1dae5ba3ed.
|
||||
### Download
|
||||
- [2026-09-17](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/ontop/ontop.patch)
|
||||
### Author
|
||||
- [killertofus](https://codeberg.org/killertofus)
|
||||
killertofus irc/matrix
|
||||
with help from kana
|
||||
@@ -0,0 +1,99 @@
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 13c5322..0af77b2 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -137,6 +137,7 @@ static const Key keys[] = {
|
||||
{ MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} },
|
||||
{ MODKEY, XKB_KEY_space, setlayout, {0} },
|
||||
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} },
|
||||
+ { MODKEY|WLR_MODIFIER_ALT, XKB_KEY_space, togglealwaysontop, {0} },
|
||||
{ MODKEY, XKB_KEY_e, togglefullscreen, {0} },
|
||||
{ MODKEY, XKB_KEY_0, view, {.ui = ~0} },
|
||||
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_0, tag, {.ui = ~0} },
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index c51e0d5..a6c9a05 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -88,7 +88,7 @@
|
||||
/* enums */
|
||||
enum { CurNormal, CurPressed, CurMove, CurResize }; /* cursor */
|
||||
enum { XDGShell, LayerShell, X11 }; /* client types */
|
||||
-enum { LyrBg, LyrBottom, LyrTile, LyrFloat, LyrTop, LyrFS, LyrUnmanaged, LyrOverlay,
|
||||
+enum { LyrBg, LyrBottom, LyrTile, LyrFloat, LyrAlwaysTop, LyrTop, LyrFS, LyrUnmanaged, LyrOverlay,
|
||||
LyrIMPopup, LyrBlock, NUM_LAYERS }; /* scene layers */
|
||||
enum { AxisUp, AxisRight, AxisDown, AxisLeft };
|
||||
|
||||
@@ -158,7 +158,7 @@ typedef struct {
|
||||
#endif
|
||||
unsigned int bw;
|
||||
uint32_t tags;
|
||||
- int isfloating, isurgent, isfullscreen;
|
||||
+ int isfloating, isurgent, isfullscreen, isalwaysontop;
|
||||
} Client;
|
||||
|
||||
typedef struct {
|
||||
@@ -355,6 +355,7 @@ static void startdrag(struct wl_listener *listener, void *data);
|
||||
static void tag(const Arg *arg);
|
||||
static void tagmon(const Arg *arg);
|
||||
static void tile(Monitor *m);
|
||||
+static void togglealwaysontop(const Arg *arg);
|
||||
static void togglefloating(const Arg *arg);
|
||||
static void togglefullscreen(const Arg *arg);
|
||||
static void toggletag(const Arg *arg);
|
||||
@@ -565,7 +566,7 @@ arrange(Monitor *m)
|
||||
/* We move all clients (except fullscreen and unmanaged) to LyrTile while
|
||||
* in floating layout to avoid "real" floating clients be always on top */
|
||||
wl_list_for_each(c, &clients, link) {
|
||||
- if (c->mon != m || c->scene->node.parent == layers[LyrFS])
|
||||
+ if (c->mon != m || c->scene->node.parent == layers[LyrFS] || c->isalwaysontop)
|
||||
continue;
|
||||
|
||||
wlr_scene_node_reparent(&c->scene->node,
|
||||
@@ -2487,7 +2488,8 @@ setfloating(Client *c, int floating)
|
||||
return;
|
||||
wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen ||
|
||||
(p && p->isfullscreen) ? LyrFS
|
||||
- : c->isfloating ? LyrFloat : LyrTile]);
|
||||
+ : c->isfloating ? (c->isalwaysontop ? LyrAlwaysTop : LyrFloat) : LyrTile]);
|
||||
+
|
||||
arrange(c->mon);
|
||||
printstatus();
|
||||
}
|
||||
@@ -2501,7 +2503,8 @@ setfullscreen(Client *c, int fullscreen)
|
||||
c->bw = fullscreen ? 0 : borderpx;
|
||||
client_set_fullscreen(c, fullscreen);
|
||||
wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen
|
||||
- ? LyrFS : c->isfloating ? LyrFloat : LyrTile]);
|
||||
+ ? LyrFS : c->isfloating ? (c->isalwaysontop ? LyrAlwaysTop : LyrFloat) : LyrTile]);
|
||||
+
|
||||
|
||||
if (fullscreen) {
|
||||
c->prev = c->geom;
|
||||
@@ -2515,6 +2518,27 @@ setfullscreen(Client *c, int fullscreen)
|
||||
printstatus();
|
||||
}
|
||||
|
||||
+void
|
||||
+togglealwaysontop(const Arg *arg)
|
||||
+{
|
||||
+ Client *sel = focustop(selmon);
|
||||
+ if (!sel)
|
||||
+ return;
|
||||
+
|
||||
+ if (sel->isfullscreen)
|
||||
+ return;
|
||||
+
|
||||
+ if (sel->isalwaysontop) {
|
||||
+ wlr_scene_node_reparent(&sel->scene->node, layers[sel->isalwaysontop]);
|
||||
+ sel->isalwaysontop = 0;
|
||||
+ } else {
|
||||
+ sel->isalwaysontop = sel->isfullscreen ? LyrFS : LyrTile;
|
||||
+ wlr_scene_node_reparent(&sel->scene->node, layers[LyrAlwaysTop]);
|
||||
+ }
|
||||
+ arrange(selmon);
|
||||
+}
|
||||
+
|
||||
+
|
||||
void
|
||||
setlayout(const Arg *arg)
|
||||
{
|
||||
@@ -4,7 +4,7 @@ Add simple animation support with a [cubic-bezier](https://en.wikipedia.org/wiki
|
||||
### Download
|
||||
- [git branch](/pi66/dwl-patches/src/branch/animation)
|
||||
- [animation-0.9.patch](/dwl/dwl-patches/raw/branch/main/patches/animation/animation-0.9.patch)
|
||||
- [animation-d29259c.patch](/dwl/dwl-patches/raw/branch/main/patches/animation/animation-d29259c.patch)
|
||||
- [animation-e203845.patch](/dwl/dwl-patches/raw/branch/main/patches/animation/animation-e203845.patch)
|
||||
|
||||
### Authors
|
||||
- [Pi66](https://codeberg.org/pi66)
|
||||
|
||||
@@ -1,13 +1,41 @@
|
||||
From 63675bf00dc9570424317f2ea87371d753ff5fae Mon Sep 17 00:00:00 2001
|
||||
From 302ace232def0685dfccefe5d48570996263619d Mon Sep 17 00:00:00 2001
|
||||
From: pi66 <pixel2176@proton.me>
|
||||
Date: Mon, 28 Sep 2026 18:03:22 +0100
|
||||
Subject: [PATCH] add: zoom and bezier animation support
|
||||
Date: Wed, 30 Sep 2026 00:05:37 +0100
|
||||
Subject: [PATCH] fix: animation glitches and zoom logic
|
||||
|
||||
---
|
||||
client.h | 9 +--
|
||||
config.def.h | 4 ++
|
||||
dwl.c | 127 +++++++++++++++++++++++++++++++++++++++++++++------
|
||||
2 files changed, 117 insertions(+), 14 deletions(-)
|
||||
dwl.c | 155 ++++++++++++++++++++++++++++++++++++++++++++-------
|
||||
3 files changed, 144 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/client.h b/client.h
|
||||
index dc0615e..9300417 100644
|
||||
--- a/client.h
|
||||
+++ b/client.h
|
||||
@@ -365,7 +365,7 @@ client_set_scale(struct wlr_surface *s, float scale)
|
||||
wlr_surface_set_preferred_buffer_scale(s, (int32_t)ceilf(scale));
|
||||
}
|
||||
|
||||
-static inline void
|
||||
+static inline uint32_t
|
||||
client_set_size(Client *c, uint32_t width, uint32_t height)
|
||||
{
|
||||
#ifdef XWAYLAND
|
||||
@@ -375,9 +375,10 @@ client_set_size(Client *c, uint32_t width, uint32_t height)
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
- if ((int32_t)width != c->surface.xdg->toplevel->current.width
|
||||
- || (int32_t)height != c->surface.xdg->toplevel->current.height)
|
||||
- wlr_xdg_toplevel_set_size(c->surface.xdg->toplevel, (int32_t)width, (int32_t)height);
|
||||
+ if ((int32_t)width == c->surface.xdg->toplevel->current.width
|
||||
+ && (int32_t)height == c->surface.xdg->toplevel->current.height)
|
||||
+ return 0;
|
||||
+ return wlr_xdg_toplevel_set_size(c->surface.xdg->toplevel, (int32_t)width, (int32_t)height);
|
||||
}
|
||||
|
||||
static inline void
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 13c5322..b0c17e8 100644
|
||||
--- a/config.def.h
|
||||
@@ -24,19 +52,26 @@ index 13c5322..b0c17e8 100644
|
||||
#define TAGCOUNT (9)
|
||||
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index 4cfd0fd..c2276bb 100644
|
||||
index 4cfd0fd..81f157d 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -159,6 +159,12 @@ typedef struct {
|
||||
@@ -86,6 +86,7 @@
|
||||
#define LISTEN_STATIC(E, H) do { struct wl_listener *_l = ecalloc(1, sizeof(*_l)); _l->notify = (H); wl_signal_add((E), _l); } while (0)
|
||||
|
||||
/* enums */
|
||||
+enum { CliNormal, CliClosing, CliOpening }; /* client events */
|
||||
enum { CurNormal, CurPressed, CurMove, CurResize }; /* cursor */
|
||||
enum { XDGShell, LayerShell, X11 }; /* client types */
|
||||
enum { LyrBg, LyrBottom, LyrTile, LyrFloat, LyrTop, LyrFS, LyrUnmanaged, LyrOverlay,
|
||||
@@ -159,6 +160,11 @@ typedef struct {
|
||||
unsigned int bw;
|
||||
uint32_t tags;
|
||||
int isfloating, isurgent, isfullscreen;
|
||||
+
|
||||
+ /* Animation */
|
||||
+ struct wlr_box anim_from, anim_to, anim_cur;
|
||||
+ uint32_t anim_start;
|
||||
+ int animating;
|
||||
+ int anim_zoom;
|
||||
+ uint32_t anim_start, serial;
|
||||
+ int animating, status;
|
||||
} Client;
|
||||
|
||||
typedef struct {
|
||||
@@ -59,7 +94,7 @@ index 4cfd0fd..c2276bb 100644
|
||||
static pid_t child_pid = -1;
|
||||
static int locked;
|
||||
static void *exclusive_focus;
|
||||
@@ -485,6 +496,87 @@ static struct wlr_xwayland *xwayland;
|
||||
@@ -485,6 +496,86 @@ static struct wlr_xwayland *xwayland;
|
||||
#include "ime.h"
|
||||
|
||||
/* function implementations */
|
||||
@@ -105,7 +140,6 @@ index 4cfd0fd..c2276bb 100644
|
||||
+ if (t >= 1) {
|
||||
+ t = 1;
|
||||
+ c->animating = 0;
|
||||
+ c->anim_zoom = 0;
|
||||
+ }
|
||||
+ p = animation_bezier(t);
|
||||
+ c->anim_cur.x = (int)(c->anim_from.x + (c->anim_to.x - c->anim_from.x) * p);
|
||||
@@ -147,7 +181,33 @@ index 4cfd0fd..c2276bb 100644
|
||||
void
|
||||
applybounds(Client *c, struct wlr_box *bbox)
|
||||
{
|
||||
@@ -2365,7 +2457,6 @@ void
|
||||
@@ -1873,6 +1964,7 @@ mapnotify(struct wl_listener *listener, void *data)
|
||||
.title = client_get_title(c),
|
||||
};
|
||||
|
||||
+ c->status = CliOpening;
|
||||
/* Create scene tree for this client and its border */
|
||||
c->scene = client_surface(c)->data = wlr_scene_tree_create(layers[LyrTile]);
|
||||
/* Enabled later by a call to arrange() */
|
||||
@@ -2322,12 +2414,17 @@ rendermon(struct wl_listener *listener, void *data)
|
||||
* generally at the output's refresh rate (e.g. 60Hz). */
|
||||
Monitor *m = wl_container_of(listener, m, frame);
|
||||
struct timespec now;
|
||||
+ Client *c;
|
||||
|
||||
if (!wlr_scene_output_needs_frame(m->scene_output)) {
|
||||
return;
|
||||
}
|
||||
+ wl_list_for_each(c, &clients, link)
|
||||
+ if (c->serial && !c->isfloating && client_is_rendered_on_mon(c, m) && !client_is_stopped(c))
|
||||
+ goto skip;
|
||||
|
||||
wlr_scene_output_commit(m->scene_output, NULL);
|
||||
+skip:
|
||||
clock_gettime(CLOCK_MONOTONIC, &now);
|
||||
wlr_scene_output_send_frame_done(m->scene_output, &now);
|
||||
}
|
||||
@@ -2365,7 +2462,6 @@ void
|
||||
resize(Client *c, struct wlr_box geo, int interact)
|
||||
{
|
||||
struct wlr_box *bbox;
|
||||
@@ -155,11 +215,11 @@ index 4cfd0fd..c2276bb 100644
|
||||
|
||||
if (!c->mon || !client_surface(c)->mapped)
|
||||
return;
|
||||
@@ -2375,21 +2466,28 @@ resize(Client *c, struct wlr_box geo, int interact)
|
||||
@@ -2375,21 +2471,27 @@ resize(Client *c, struct wlr_box geo, int interact)
|
||||
client_set_bounds(c, geo.width, geo.height);
|
||||
c->geom = geo;
|
||||
applybounds(c, bbox);
|
||||
+ client_set_size(c, c->geom.width - 2 * c->bw, c->geom.height - 2 * c->bw);
|
||||
+ c->serial = client_set_size(c, c->geom.width - 2 * c->bw, c->geom.height - 2 * c->bw);
|
||||
|
||||
- /* Update scene-graph, including borders */
|
||||
- wlr_scene_node_set_position(&c->scene->node, c->geom.x, c->geom.y);
|
||||
@@ -186,7 +246,6 @@ index 4cfd0fd..c2276bb 100644
|
||||
+ c->anim_cur.height = c->geom.height / 2;
|
||||
+ c->anim_cur.x = c->geom.x + (c->geom.width - c->anim_cur.width) / 2;
|
||||
+ c->anim_cur.y = c->geom.y + (c->geom.height - c->anim_cur.height) / 2;
|
||||
+ c->anim_zoom = 1;
|
||||
+ }
|
||||
+
|
||||
+ c->anim_from = c->anim_cur;
|
||||
@@ -197,7 +256,7 @@ index 4cfd0fd..c2276bb 100644
|
||||
}
|
||||
|
||||
void
|
||||
@@ -2615,6 +2713,7 @@ setup(void)
|
||||
@@ -2615,6 +2717,7 @@ setup(void)
|
||||
* clients from the Unix socket, managing Wayland globals, and so on. */
|
||||
dpy = wl_display_create();
|
||||
event_loop = wl_display_get_event_loop(dpy);
|
||||
@@ -205,6 +264,44 @@ index 4cfd0fd..c2276bb 100644
|
||||
|
||||
/* The backend is a wlroots feature which abstracts the underlying input and
|
||||
* output hardware. The autocreate option will choose the most suitable
|
||||
@@ -2896,19 +2999,31 @@ tile(Monitor *m)
|
||||
mw = m->nmaster ? (int)roundf(m->w.width * m->mfact) : 0;
|
||||
else
|
||||
mw = m->w.width;
|
||||
+
|
||||
i = my = ty = 0;
|
||||
wl_list_for_each(c, &clients, link) {
|
||||
+ struct wlr_box geo;
|
||||
+
|
||||
if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
|
||||
continue;
|
||||
+
|
||||
if (i < m->nmaster) {
|
||||
- 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);
|
||||
- my += c->geom.height;
|
||||
+ geo = (struct wlr_box){m->w.x, m->w.y + my, mw,
|
||||
+ (m->w.height - my) / (MIN(n, m->nmaster) - i)};
|
||||
+ my += geo.height;
|
||||
} else {
|
||||
- resize(c, (struct wlr_box){.x = m->w.x + mw, .y = m->w.y + ty,
|
||||
- .width = m->w.width - mw, .height = (m->w.height - ty) / (n - i)}, 0);
|
||||
- ty += c->geom.height;
|
||||
+ geo = (struct wlr_box){m->w.x + mw, m->w.y + ty, m->w.width - mw,
|
||||
+ (m->w.height - ty) / (n - i)};
|
||||
+ ty += geo.height;
|
||||
+ }
|
||||
+
|
||||
+ if (c->status == CliOpening) {
|
||||
+ c->anim_cur = (struct wlr_box){geo.x + geo.width / 4, geo.y + geo.height / 4,
|
||||
+ geo.width / 2, geo.height / 2};
|
||||
+ c->anim_from = c->anim_cur;
|
||||
+ c->status = CliNormal;
|
||||
}
|
||||
+ resize(c, geo, 0);
|
||||
i++;
|
||||
}
|
||||
}
|
||||
--
|
||||
2.55.0
|
||||
|
||||
|
||||
+114
-17
@@ -1,13 +1,41 @@
|
||||
From 91ca9657e49f501f2765eb2afa01785bbe88a2c2 Mon Sep 17 00:00:00 2001
|
||||
From e8f65d36d788cfb0a02984ecaf979d639388913c Mon Sep 17 00:00:00 2001
|
||||
From: pi66 <pixel2176@proton.me>
|
||||
Date: Mon, 28 Sep 2026 18:10:19 +0100
|
||||
Subject: [PATCH] add: zoom and bezier animation support
|
||||
Date: Wed, 30 Sep 2026 00:03:31 +0100
|
||||
Subject: [PATCH] fix: animation glitches and zoom logic
|
||||
|
||||
---
|
||||
client.h | 9 +--
|
||||
config.def.h | 4 ++
|
||||
dwl.c | 127 +++++++++++++++++++++++++++++++++++++++++++++------
|
||||
2 files changed, 117 insertions(+), 14 deletions(-)
|
||||
dwl.c | 155 ++++++++++++++++++++++++++++++++++++++++++++-------
|
||||
3 files changed, 144 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/client.h b/client.h
|
||||
index eb1bb47..a271446 100644
|
||||
--- a/client.h
|
||||
+++ b/client.h
|
||||
@@ -366,7 +366,7 @@ client_set_scale(struct wlr_surface *s, float scale)
|
||||
wlr_surface_set_preferred_buffer_scale(s, (int32_t)ceilf(scale));
|
||||
}
|
||||
|
||||
-static inline void
|
||||
+static inline uint32_t
|
||||
client_set_size(Client *c, uint32_t width, uint32_t height)
|
||||
{
|
||||
#ifdef XWAYLAND
|
||||
@@ -376,9 +376,10 @@ client_set_size(Client *c, uint32_t width, uint32_t height)
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
- if ((int32_t)width != c->surface.xdg->toplevel->current.width
|
||||
- || (int32_t)height != c->surface.xdg->toplevel->current.height)
|
||||
- wlr_xdg_toplevel_set_size(c->surface.xdg->toplevel, (int32_t)width, (int32_t)height);
|
||||
+ if ((int32_t)width == c->surface.xdg->toplevel->current.width
|
||||
+ && (int32_t)height == c->surface.xdg->toplevel->current.height)
|
||||
+ return 0;
|
||||
+ return wlr_xdg_toplevel_set_size(c->surface.xdg->toplevel, (int32_t)width, (int32_t)height);
|
||||
}
|
||||
|
||||
static inline void
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index a4019d3..d37aa10 100644
|
||||
--- a/config.def.h
|
||||
@@ -24,19 +52,26 @@ index a4019d3..d37aa10 100644
|
||||
#define TAGCOUNT (9)
|
||||
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index e07a269..570f862 100644
|
||||
index 216deb5..50e1687 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -159,6 +159,12 @@ typedef struct {
|
||||
@@ -86,6 +86,7 @@
|
||||
#define LISTEN_STATIC(E, H) do { struct wl_listener *_l = ecalloc(1, sizeof(*_l)); _l->notify = (H); wl_signal_add((E), _l); } while (0)
|
||||
|
||||
/* enums */
|
||||
+enum { CliNormal, CliClosing, CliOpening }; /* client events */
|
||||
enum { CurNormal, CurPressed, CurMove, CurResize }; /* cursor */
|
||||
enum { XDGShell, LayerShell, X11 }; /* client types */
|
||||
enum { LyrBg, LyrBottom, LyrTile, LyrFloat, LyrTop, LyrFS, LyrUnmanaged, LyrOverlay,
|
||||
@@ -159,6 +160,11 @@ typedef struct {
|
||||
unsigned int bw;
|
||||
uint32_t tags;
|
||||
int isfloating, isurgent, isfullscreen;
|
||||
+
|
||||
+ /* Animation */
|
||||
+ struct wlr_box anim_from, anim_to, anim_cur;
|
||||
+ uint32_t anim_start;
|
||||
+ int animating;
|
||||
+ int anim_zoom;
|
||||
+ uint32_t anim_start, serial;
|
||||
+ int animating, status;
|
||||
} Client;
|
||||
|
||||
typedef struct {
|
||||
@@ -59,7 +94,7 @@ index e07a269..570f862 100644
|
||||
static pid_t child_pid = -1;
|
||||
static int locked;
|
||||
static Client *focused_client;
|
||||
@@ -486,6 +497,87 @@ static struct wlr_xwayland *xwayland;
|
||||
@@ -486,6 +497,86 @@ static struct wlr_xwayland *xwayland;
|
||||
#include "ime.h"
|
||||
|
||||
/* function implementations */
|
||||
@@ -105,7 +140,6 @@ index e07a269..570f862 100644
|
||||
+ if (t >= 1) {
|
||||
+ t = 1;
|
||||
+ c->animating = 0;
|
||||
+ c->anim_zoom = 0;
|
||||
+ }
|
||||
+ p = animation_bezier(t);
|
||||
+ c->anim_cur.x = (int)(c->anim_from.x + (c->anim_to.x - c->anim_from.x) * p);
|
||||
@@ -147,7 +181,33 @@ index e07a269..570f862 100644
|
||||
void
|
||||
applybounds(Client *c, struct wlr_box *bbox)
|
||||
{
|
||||
@@ -2378,7 +2470,6 @@ void
|
||||
@@ -1887,6 +1978,7 @@ mapnotify(struct wl_listener *listener, void *data)
|
||||
.title = client_get_title(c),
|
||||
};
|
||||
|
||||
+ c->status = CliOpening;
|
||||
/* Create scene tree for this client and its border */
|
||||
c->scene = client_surface(c)->data = wlr_scene_tree_create(layers[LyrTile]);
|
||||
/* Enabled later by a call to arrange() */
|
||||
@@ -2340,12 +2432,17 @@ rendermon(struct wl_listener *listener, void *data)
|
||||
* generally at the output's refresh rate (e.g. 60Hz). */
|
||||
Monitor *m = wl_container_of(listener, m, frame);
|
||||
struct timespec now;
|
||||
+ Client *c;
|
||||
|
||||
if (!wlr_scene_output_needs_frame(m->scene_output)) {
|
||||
return;
|
||||
}
|
||||
+ wl_list_for_each(c, &clients, link)
|
||||
+ if (c->serial && !c->isfloating && client_is_rendered_on_mon(c, m) && !client_is_stopped(c))
|
||||
+ goto skip;
|
||||
|
||||
wlr_scene_output_commit(m->scene_output, NULL);
|
||||
+skip:
|
||||
clock_gettime(CLOCK_MONOTONIC, &now);
|
||||
wlr_scene_output_send_frame_done(m->scene_output, &now);
|
||||
}
|
||||
@@ -2383,7 +2480,6 @@ void
|
||||
resize(Client *c, struct wlr_box geo, int interact)
|
||||
{
|
||||
struct wlr_box *bbox;
|
||||
@@ -155,11 +215,11 @@ index e07a269..570f862 100644
|
||||
|
||||
if (!c->mon || !client_surface(c)->mapped)
|
||||
return;
|
||||
@@ -2388,21 +2479,28 @@ resize(Client *c, struct wlr_box geo, int interact)
|
||||
@@ -2393,21 +2489,27 @@ resize(Client *c, struct wlr_box geo, int interact)
|
||||
client_set_bounds(c, geo.width, geo.height);
|
||||
c->geom = geo;
|
||||
applybounds(c, bbox);
|
||||
+ client_set_size(c, c->geom.width - 2 * c->bw, c->geom.height - 2 * c->bw);
|
||||
+ c->serial = client_set_size(c, c->geom.width - 2 * c->bw, c->geom.height - 2 * c->bw);
|
||||
|
||||
- /* Update scene-graph, including borders */
|
||||
- wlr_scene_node_set_position(&c->scene->node, c->geom.x, c->geom.y);
|
||||
@@ -186,7 +246,6 @@ index e07a269..570f862 100644
|
||||
+ c->anim_cur.height = c->geom.height / 2;
|
||||
+ c->anim_cur.x = c->geom.x + (c->geom.width - c->anim_cur.width) / 2;
|
||||
+ c->anim_cur.y = c->geom.y + (c->geom.height - c->anim_cur.height) / 2;
|
||||
+ c->anim_zoom = 1;
|
||||
+ }
|
||||
+
|
||||
+ c->anim_from = c->anim_cur;
|
||||
@@ -197,7 +256,7 @@ index e07a269..570f862 100644
|
||||
}
|
||||
|
||||
void
|
||||
@@ -2628,6 +2726,7 @@ setup(void)
|
||||
@@ -2633,6 +2735,7 @@ setup(void)
|
||||
* clients from the Unix socket, managing Wayland globals, and so on. */
|
||||
dpy = wl_display_create();
|
||||
event_loop = wl_display_get_event_loop(dpy);
|
||||
@@ -205,6 +264,44 @@ index e07a269..570f862 100644
|
||||
|
||||
/* The backend is a wlroots feature which abstracts the underlying input and
|
||||
* output hardware. The autocreate option will choose the most suitable
|
||||
@@ -2914,19 +3017,31 @@ tile(Monitor *m)
|
||||
mw = m->nmaster ? (int)roundf(m->w.width * m->mfact) : 0;
|
||||
else
|
||||
mw = m->w.width;
|
||||
+
|
||||
i = my = ty = 0;
|
||||
wl_list_for_each(c, &clients, link) {
|
||||
+ struct wlr_box geo;
|
||||
+
|
||||
if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
|
||||
continue;
|
||||
+
|
||||
if (i < m->nmaster) {
|
||||
- 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);
|
||||
- my += c->geom.height;
|
||||
+ geo = (struct wlr_box){m->w.x, m->w.y + my, mw,
|
||||
+ (m->w.height - my) / (MIN(n, m->nmaster) - i)};
|
||||
+ my += geo.height;
|
||||
} else {
|
||||
- resize(c, (struct wlr_box){.x = m->w.x + mw, .y = m->w.y + ty,
|
||||
- .width = m->w.width - mw, .height = (m->w.height - ty) / (n - i)}, 0);
|
||||
- ty += c->geom.height;
|
||||
+ geo = (struct wlr_box){m->w.x + mw, m->w.y + ty, m->w.width - mw,
|
||||
+ (m->w.height - ty) / (n - i)};
|
||||
+ ty += geo.height;
|
||||
+ }
|
||||
+
|
||||
+ if (c->status == CliOpening) {
|
||||
+ c->anim_cur = (struct wlr_box){geo.x + geo.width / 4, geo.y + geo.height / 4,
|
||||
+ geo.width / 2, geo.height / 2};
|
||||
+ c->anim_from = c->anim_cur;
|
||||
+ c->status = CliNormal;
|
||||
}
|
||||
+ resize(c, geo, 0);
|
||||
i++;
|
||||
}
|
||||
}
|
||||
--
|
||||
2.55.0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,13 +0,0 @@
|
||||
### Description
|
||||
Add a keybinding that toggles centering the terminally horizontally when
|
||||
it's the only window, while still tiling multiple windows.
|
||||
|
||||
This limits the width of long text making it easier to read, and avoids
|
||||
covering the wallpaper more than necessary.
|
||||
|
||||
### Download
|
||||
- [git branch](https://codeberg.org/guidocella/dwl/src/branch/center-terminal)
|
||||
- [2026-09-16](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/center-terminal/center-terminal.patch)
|
||||
|
||||
### Authors
|
||||
- [Guido Cella](https://codeberg.org/guidocella)
|
||||
@@ -1,103 +0,0 @@
|
||||
From 974db1c4a01a38e2c2af9460e4d9c5f48e7974f7 Mon Sep 17 00:00:00 2001
|
||||
From: Guido Cella <guido@guidocella.xyz>
|
||||
Date: Mon, 9 Feb 2026 10:21:33 +0100
|
||||
Subject: [PATCH] add a keybinding to center the terminal
|
||||
|
||||
Add a keybinding that toggles centering the terminally horizontally when
|
||||
it's the only window, while still tiling multiple windows.
|
||||
|
||||
This limits the width of long text making it easier to read, and avoids
|
||||
covering the wallpaper more than necessary.
|
||||
---
|
||||
config.def.h | 1 +
|
||||
dwl.c | 20 ++++++++++++++++++++
|
||||
2 files changed, 21 insertions(+)
|
||||
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 13c5322..aef03cb 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -138,6 +138,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_v, togglecenter, {0} },
|
||||
{ MODKEY, XKB_KEY_0, view, {.ui = ~0} },
|
||||
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_0, tag, {.ui = ~0} },
|
||||
{ MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} },
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index f7bda0b..cfdd4d1 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -9,6 +9,7 @@
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
+#include <strings.h>
|
||||
#include <sys/wait.h>
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
@@ -158,6 +159,7 @@ typedef struct {
|
||||
unsigned int bw;
|
||||
uint32_t tags;
|
||||
int isfloating, isurgent, isfullscreen;
|
||||
+ bool centered;
|
||||
} Client;
|
||||
|
||||
typedef struct {
|
||||
@@ -354,6 +356,7 @@ static void startdrag(struct wl_listener *listener, void *data);
|
||||
static void tag(const Arg *arg);
|
||||
static void tagmon(const Arg *arg);
|
||||
static void tile(Monitor *m);
|
||||
+static void togglecenter(const Arg *arg);
|
||||
static void togglefloating(const Arg *arg);
|
||||
static void togglefullscreen(const Arg *arg);
|
||||
static void toggletag(const Arg *arg);
|
||||
@@ -460,6 +463,8 @@ static struct wl_listener start_drag = {.notify = startdrag};
|
||||
static struct wl_listener new_session_lock = {.notify = locksession};
|
||||
static struct wl_listener new_foreign_toplevel_capture_request = {.notify = capturerequest};
|
||||
|
||||
+static bool center;
|
||||
+
|
||||
#ifdef XWAYLAND
|
||||
static void activatex11(struct wl_listener *listener, void *data);
|
||||
static void associatex11(struct wl_listener *listener, void *data);
|
||||
@@ -534,6 +539,9 @@ applyrules(Client *c)
|
||||
}
|
||||
}
|
||||
|
||||
+ if (!strcasecmp(appid, termcmd[0]))
|
||||
+ c->centered = true;
|
||||
+
|
||||
c->isfloating |= client_is_float_type(c);
|
||||
setmon(c, mon, newtags);
|
||||
}
|
||||
@@ -2886,6 +2894,11 @@ tile(Monitor *m)
|
||||
if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
|
||||
continue;
|
||||
if (i < m->nmaster) {
|
||||
+ if (n == 1 && center && c->centered) {
|
||||
+ resize(c, (struct wlr_box){.x = m->w.width / 4, .y = m->w.y,
|
||||
+ .width = m->w.width / 2, .height = m->w.height - 2 * c->bw}, 0);
|
||||
+ return;
|
||||
+ }
|
||||
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);
|
||||
my += c->geom.height;
|
||||
@@ -2898,6 +2911,13 @@ tile(Monitor *m)
|
||||
}
|
||||
}
|
||||
|
||||
+void
|
||||
+togglecenter(const Arg *arg)
|
||||
+{
|
||||
+ center = !center;
|
||||
+ tile(selmon);
|
||||
+}
|
||||
+
|
||||
void
|
||||
togglefloating(const Arg *arg)
|
||||
{
|
||||
--
|
||||
2.55.0
|
||||
|
||||
@@ -7,9 +7,18 @@ Mod+chain is pressed. A subsequent keypress will be matched against bindings
|
||||
for that chain key. If it is configured the action will be triggered, otherwise
|
||||
the keypress will be ignored.
|
||||
|
||||
To use chainkeys, append the key after the argument in the keybindings. Example usage:
|
||||
```c
|
||||
{ MODKEY, XKB_KEY_d, incnmaster, {.i = -1} },
|
||||
{ MODKEY, XKB_KEY_s, setmfact, {.f = -0.05f}, XKB_KEY_h },
|
||||
{ MODKEY, XKB_KEY_s, setmfact, {.f = +0.05f}, XKB_KEY_l },
|
||||
```
|
||||
Here, `MODKEY+i` triggers incnmaster to decrease nmaster, while `MODKEY+s` triggers a chain. After triggering the chain, pressing `h` or `l` changes the monitor's mfact and resets the chain.
|
||||
|
||||
### Download
|
||||
- [git branch](https://codeberg.org/bencc/dwl/src/branch/chainkeys)
|
||||
- [2024-05-20](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/chainkeys/chainkeys.patch)
|
||||
- [chainkeys.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/chainkeys/chainkeys.patch) Latest version, applies to main branch, tested on commit dwl/dwl@e2038450f2
|
||||
- [chainkeys_2024-05-20.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/chainkeys/chainkeys_2024-05-20.patch) Legacy version from 2024-05-20
|
||||
|
||||
### Authors
|
||||
- [atourist](https://codeberg.org/atourist)
|
||||
- [Ben Collerson](https://codeberg.org/bencc)
|
||||
|
||||
@@ -1,157 +1,74 @@
|
||||
From 226e204ec7fb6d6840a984ef8e8ec1d2514e985f Mon Sep 17 00:00:00 2001
|
||||
From: Ben Collerson <benc@benc.cc>
|
||||
Date: Tue, 2 Jan 2024 10:33:59 +1000
|
||||
Subject: [PATCH] chainkeys
|
||||
|
||||
---
|
||||
config.def.h | 62 ++++++++++++++++++++++++++--------------------------
|
||||
dwl.c | 23 ++++++++++++++++++-
|
||||
2 files changed, 53 insertions(+), 32 deletions(-)
|
||||
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 8f498d2f..1c182547 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -105,10 +105,10 @@ static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TA
|
||||
#define MODKEY WLR_MODIFIER_ALT
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 8304245..836cb87 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -9,7 +9,7 @@ DWLCPPFLAGS = -I. -DWLR_USE_UNSTABLE -D_POSIX_C_SOURCE=200809L \
|
||||
DWLDEVCFLAGS = -g -Wpedantic -Wall -Wextra -Wdeclaration-after-statement \
|
||||
-Wno-unused-parameter -Wshadow -Wunused-macros -Werror=strict-prototypes \
|
||||
-Werror=implicit -Werror=return-type -Werror=incompatible-pointer-types \
|
||||
- -Wfloat-conversion
|
||||
+ -Wfloat-conversion -Wno-missing-field-initializers
|
||||
|
||||
#define TAGKEYS(KEY,SKEY,TAG) \
|
||||
- { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
|
||||
- { MODKEY|WLR_MODIFIER_CTRL, KEY, toggleview, {.ui = 1 << TAG} }, \
|
||||
- { MODKEY|WLR_MODIFIER_SHIFT, SKEY, tag, {.ui = 1 << TAG} }, \
|
||||
- { MODKEY|WLR_MODIFIER_CTRL|WLR_MODIFIER_SHIFT,SKEY,toggletag, {.ui = 1 << TAG} }
|
||||
+ { MODKEY, -1, KEY, view, {.ui = 1 << TAG} }, \
|
||||
+ { MODKEY|WLR_MODIFIER_CTRL, -1, KEY, toggleview, {.ui = 1 << TAG} }, \
|
||||
+ { MODKEY|WLR_MODIFIER_SHIFT, -1, SKEY, tag, {.ui = 1 << TAG} }, \
|
||||
+ { MODKEY|WLR_MODIFIER_CTRL|WLR_MODIFIER_SHIFT,-1,SKEY,toggletag, {.ui = 1 << TAG} }
|
||||
|
||||
/* helper for spawning shell commands in the pre dwm-5.0 fashion */
|
||||
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
|
||||
@@ -119,30 +119,30 @@ static const char *menucmd[] = { "wmenu-run", NULL };
|
||||
|
||||
static const Key keys[] = {
|
||||
/* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */
|
||||
- /* modifier key function argument */
|
||||
- { MODKEY, XKB_KEY_p, spawn, {.v = menucmd} },
|
||||
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return, spawn, {.v = termcmd} },
|
||||
- { MODKEY, XKB_KEY_j, focusstack, {.i = +1} },
|
||||
- { MODKEY, XKB_KEY_k, focusstack, {.i = -1} },
|
||||
- { MODKEY, XKB_KEY_i, incnmaster, {.i = +1} },
|
||||
- { MODKEY, XKB_KEY_d, incnmaster, {.i = -1} },
|
||||
- { MODKEY, XKB_KEY_h, setmfact, {.f = -0.05f} },
|
||||
- { MODKEY, XKB_KEY_l, setmfact, {.f = +0.05f} },
|
||||
- { MODKEY, XKB_KEY_Return, zoom, {0} },
|
||||
- { MODKEY, XKB_KEY_Tab, view, {0} },
|
||||
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C, killclient, {0} },
|
||||
- { MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} },
|
||||
- { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} },
|
||||
- { MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} },
|
||||
- { MODKEY, XKB_KEY_space, setlayout, {0} },
|
||||
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} },
|
||||
- { MODKEY, XKB_KEY_e, togglefullscreen, {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} },
|
||||
- { MODKEY, XKB_KEY_period, focusmon, {.i = WLR_DIRECTION_RIGHT} },
|
||||
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less, tagmon, {.i = WLR_DIRECTION_LEFT} },
|
||||
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater, tagmon, {.i = WLR_DIRECTION_RIGHT} },
|
||||
+ /* modifier chain, key function argument */
|
||||
+ { MODKEY, -1, XKB_KEY_p, spawn, {.v = menucmd} },
|
||||
+ { MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_Return, spawn, {.v = termcmd} },
|
||||
+ { MODKEY, -1, XKB_KEY_j, focusstack, {.i = +1} },
|
||||
+ { MODKEY, -1, XKB_KEY_k, focusstack, {.i = -1} },
|
||||
+ { MODKEY, -1, XKB_KEY_i, incnmaster, {.i = +1} },
|
||||
+ { MODKEY, -1, XKB_KEY_d, incnmaster, {.i = -1} },
|
||||
+ { MODKEY, -1, XKB_KEY_h, setmfact, {.f = -0.05f} },
|
||||
+ { MODKEY, -1, XKB_KEY_l, setmfact, {.f = +0.05f} },
|
||||
+ { MODKEY, -1, XKB_KEY_Return, zoom, {0} },
|
||||
+ { MODKEY, -1, XKB_KEY_Tab, view, {0} },
|
||||
+ { MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_C, killclient, {0} },
|
||||
+ { MODKEY, -1, XKB_KEY_t, setlayout, {.v = &layouts[0]} },
|
||||
+ { MODKEY, -1, XKB_KEY_f, setlayout, {.v = &layouts[1]} },
|
||||
+ { MODKEY, -1, XKB_KEY_m, setlayout, {.v = &layouts[2]} },
|
||||
+ { MODKEY, -1, XKB_KEY_space, setlayout, {0} },
|
||||
+ { MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_space, togglefloating, {0} },
|
||||
+ { MODKEY, -1, XKB_KEY_e, togglefullscreen, {0} },
|
||||
+ { MODKEY, -1, XKB_KEY_0, view, {.ui = ~0} },
|
||||
+ { MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_parenright, tag, {.ui = ~0} },
|
||||
+ { MODKEY, -1, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} },
|
||||
+ { MODKEY, -1, XKB_KEY_period, focusmon, {.i = WLR_DIRECTION_RIGHT} },
|
||||
+ { MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_less, tagmon, {.i = WLR_DIRECTION_LEFT} },
|
||||
+ { MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_greater, tagmon, {.i = WLR_DIRECTION_RIGHT} },
|
||||
TAGKEYS( XKB_KEY_1, XKB_KEY_exclam, 0),
|
||||
TAGKEYS( XKB_KEY_2, XKB_KEY_at, 1),
|
||||
TAGKEYS( XKB_KEY_3, XKB_KEY_numbersign, 2),
|
||||
@@ -152,14 +152,14 @@ static const Key keys[] = {
|
||||
TAGKEYS( XKB_KEY_7, XKB_KEY_ampersand, 6),
|
||||
TAGKEYS( XKB_KEY_8, XKB_KEY_asterisk, 7),
|
||||
TAGKEYS( XKB_KEY_9, XKB_KEY_parenleft, 8),
|
||||
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q, quit, {0} },
|
||||
+ { MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_Q, quit, {0} },
|
||||
|
||||
/* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */
|
||||
- { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_Terminate_Server, quit, {0} },
|
||||
+ { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,-1,XKB_KEY_Terminate_Server, quit, {0} },
|
||||
/* Ctrl-Alt-Fx is used to switch to another VT, if you don't know what a VT is
|
||||
* do not remove them.
|
||||
*/
|
||||
-#define CHVT(n) { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_XF86Switch_VT_##n, chvt, {.ui = (n)} }
|
||||
+#define CHVT(n) { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,-1,XKB_KEY_XF86Switch_VT_##n, chvt, {.ui = (n)} }
|
||||
CHVT(1), CHVT(2), CHVT(3), CHVT(4), CHVT(5), CHVT(6),
|
||||
CHVT(7), CHVT(8), CHVT(9), CHVT(10), CHVT(11), CHVT(12),
|
||||
};
|
||||
# CFLAGS / LDFLAGS
|
||||
PKGS = wayland-server xkbcommon libinput $(XLIBS)
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index bf763dfc..05e667f8 100644
|
||||
index 216deb5..af011ea 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -143,6 +143,7 @@ typedef struct {
|
||||
|
||||
typedef struct {
|
||||
uint32_t mod;
|
||||
+ int chain;
|
||||
@@ -166,6 +166,7 @@ typedef struct {
|
||||
xkb_keysym_t keysym;
|
||||
void (*func)(const Arg *);
|
||||
const Arg arg;
|
||||
@@ -353,6 +354,7 @@ static const char broken[] = "broken";
|
||||
+ xkb_keysym_t chain;
|
||||
} Key;
|
||||
|
||||
typedef struct {
|
||||
@@ -378,6 +379,7 @@ static void zoom(const Arg *arg);
|
||||
/* variables */
|
||||
static pid_t child_pid = -1;
|
||||
static int locked;
|
||||
static void *exclusive_focus;
|
||||
+static int chainkey = -1;
|
||||
+static xkb_keysym_t chainkey = 0;
|
||||
static Client *focused_client;
|
||||
static struct wl_display *dpy;
|
||||
static struct wlr_backend *backend;
|
||||
static struct wlr_scene *scene;
|
||||
@@ -1438,11 +1440,30 @@ keybinding(uint32_t mods, xkb_keysym_t sym)
|
||||
static struct wl_event_loop *event_loop;
|
||||
@@ -1735,9 +1737,21 @@ keybinding(uint32_t mods, xkb_keysym_t sym)
|
||||
* processing.
|
||||
*/
|
||||
const Key *k;
|
||||
+ if (chainkey) {
|
||||
+ for (k = keys; k < END(keys); k++) {
|
||||
+ if (chainkey == k->keysym && sym == k->chain) {
|
||||
+ chainkey = 0;
|
||||
+ return k;
|
||||
+ }
|
||||
+ }
|
||||
+ chainkey = 0;
|
||||
+ return NULL;
|
||||
+ }
|
||||
for (k = keys; k < END(keys); k++) {
|
||||
if (CLEANMASK(mods) == CLEANMASK(k->mod)
|
||||
- && sym == k->keysym && k->func) {
|
||||
+ && sym == k->keysym
|
||||
+ && chainkey == -1
|
||||
+ && k->chain == -1
|
||||
+ && k->func) {
|
||||
k->func(&k->arg);
|
||||
return 1;
|
||||
}
|
||||
+ else if (sym == k->keysym
|
||||
+ && chainkey != -1
|
||||
+ && k->chain == chainkey
|
||||
+ && k->func) {
|
||||
+ k->func(&k->arg);
|
||||
+ chainkey = -1;
|
||||
+ return 1;
|
||||
+ }
|
||||
+ else if (CLEANMASK(mods) == CLEANMASK(k->mod)
|
||||
+ && k->chain == (int)sym
|
||||
+ && chainkey == -1
|
||||
+ && k->func) {
|
||||
+ chainkey = sym;
|
||||
+ return 1;
|
||||
+ }
|
||||
- if (CLEANMASK(mods) == CLEANMASK(k->mod) && sym == k->keysym && k->func)
|
||||
+ if (CLEANMASK(mods) == CLEANMASK(k->mod) && sym == k->keysym && k->func) {
|
||||
+ if (k->chain) chainkey = k->keysym;
|
||||
return k;
|
||||
+ }
|
||||
}
|
||||
+ chainkey = -1;
|
||||
return 0;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@@ -1771,7 +1785,7 @@ keypress(struct wl_listener *listener, void *data)
|
||||
const Key *key = keybinding(group->mods, group->keysyms[i]);
|
||||
if (key) {
|
||||
consumed[event->keycode] = 1;
|
||||
- key->func(&key->arg);
|
||||
+ if (!chainkey) key->func(&key->arg);
|
||||
handled = 1;
|
||||
break;
|
||||
}
|
||||
@@ -1827,7 +1841,7 @@ keyrepeat(void *data)
|
||||
for (int i = 0; i < 2; i++) {
|
||||
const Key *key = keybinding(group->mods, group->keysyms[i]);
|
||||
if (key) {
|
||||
- key->func(&key->arg);
|
||||
+ if (!chainkey) key->func(&key->arg);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,157 @@
|
||||
From 226e204ec7fb6d6840a984ef8e8ec1d2514e985f Mon Sep 17 00:00:00 2001
|
||||
From: Ben Collerson <benc@benc.cc>
|
||||
Date: Tue, 2 Jan 2024 10:33:59 +1000
|
||||
Subject: [PATCH] chainkeys
|
||||
|
||||
---
|
||||
config.def.h | 62 ++++++++++++++++++++++++++--------------------------
|
||||
dwl.c | 23 ++++++++++++++++++-
|
||||
2 files changed, 53 insertions(+), 32 deletions(-)
|
||||
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 8f498d2f..1c182547 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -105,10 +105,10 @@ static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TA
|
||||
#define MODKEY WLR_MODIFIER_ALT
|
||||
|
||||
#define TAGKEYS(KEY,SKEY,TAG) \
|
||||
- { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
|
||||
- { MODKEY|WLR_MODIFIER_CTRL, KEY, toggleview, {.ui = 1 << TAG} }, \
|
||||
- { MODKEY|WLR_MODIFIER_SHIFT, SKEY, tag, {.ui = 1 << TAG} }, \
|
||||
- { MODKEY|WLR_MODIFIER_CTRL|WLR_MODIFIER_SHIFT,SKEY,toggletag, {.ui = 1 << TAG} }
|
||||
+ { MODKEY, -1, KEY, view, {.ui = 1 << TAG} }, \
|
||||
+ { MODKEY|WLR_MODIFIER_CTRL, -1, KEY, toggleview, {.ui = 1 << TAG} }, \
|
||||
+ { MODKEY|WLR_MODIFIER_SHIFT, -1, SKEY, tag, {.ui = 1 << TAG} }, \
|
||||
+ { MODKEY|WLR_MODIFIER_CTRL|WLR_MODIFIER_SHIFT,-1,SKEY,toggletag, {.ui = 1 << TAG} }
|
||||
|
||||
/* helper for spawning shell commands in the pre dwm-5.0 fashion */
|
||||
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
|
||||
@@ -119,30 +119,30 @@ static const char *menucmd[] = { "wmenu-run", NULL };
|
||||
|
||||
static const Key keys[] = {
|
||||
/* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */
|
||||
- /* modifier key function argument */
|
||||
- { MODKEY, XKB_KEY_p, spawn, {.v = menucmd} },
|
||||
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return, spawn, {.v = termcmd} },
|
||||
- { MODKEY, XKB_KEY_j, focusstack, {.i = +1} },
|
||||
- { MODKEY, XKB_KEY_k, focusstack, {.i = -1} },
|
||||
- { MODKEY, XKB_KEY_i, incnmaster, {.i = +1} },
|
||||
- { MODKEY, XKB_KEY_d, incnmaster, {.i = -1} },
|
||||
- { MODKEY, XKB_KEY_h, setmfact, {.f = -0.05f} },
|
||||
- { MODKEY, XKB_KEY_l, setmfact, {.f = +0.05f} },
|
||||
- { MODKEY, XKB_KEY_Return, zoom, {0} },
|
||||
- { MODKEY, XKB_KEY_Tab, view, {0} },
|
||||
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C, killclient, {0} },
|
||||
- { MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} },
|
||||
- { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} },
|
||||
- { MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} },
|
||||
- { MODKEY, XKB_KEY_space, setlayout, {0} },
|
||||
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} },
|
||||
- { MODKEY, XKB_KEY_e, togglefullscreen, {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} },
|
||||
- { MODKEY, XKB_KEY_period, focusmon, {.i = WLR_DIRECTION_RIGHT} },
|
||||
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less, tagmon, {.i = WLR_DIRECTION_LEFT} },
|
||||
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater, tagmon, {.i = WLR_DIRECTION_RIGHT} },
|
||||
+ /* modifier chain, key function argument */
|
||||
+ { MODKEY, -1, XKB_KEY_p, spawn, {.v = menucmd} },
|
||||
+ { MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_Return, spawn, {.v = termcmd} },
|
||||
+ { MODKEY, -1, XKB_KEY_j, focusstack, {.i = +1} },
|
||||
+ { MODKEY, -1, XKB_KEY_k, focusstack, {.i = -1} },
|
||||
+ { MODKEY, -1, XKB_KEY_i, incnmaster, {.i = +1} },
|
||||
+ { MODKEY, -1, XKB_KEY_d, incnmaster, {.i = -1} },
|
||||
+ { MODKEY, -1, XKB_KEY_h, setmfact, {.f = -0.05f} },
|
||||
+ { MODKEY, -1, XKB_KEY_l, setmfact, {.f = +0.05f} },
|
||||
+ { MODKEY, -1, XKB_KEY_Return, zoom, {0} },
|
||||
+ { MODKEY, -1, XKB_KEY_Tab, view, {0} },
|
||||
+ { MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_C, killclient, {0} },
|
||||
+ { MODKEY, -1, XKB_KEY_t, setlayout, {.v = &layouts[0]} },
|
||||
+ { MODKEY, -1, XKB_KEY_f, setlayout, {.v = &layouts[1]} },
|
||||
+ { MODKEY, -1, XKB_KEY_m, setlayout, {.v = &layouts[2]} },
|
||||
+ { MODKEY, -1, XKB_KEY_space, setlayout, {0} },
|
||||
+ { MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_space, togglefloating, {0} },
|
||||
+ { MODKEY, -1, XKB_KEY_e, togglefullscreen, {0} },
|
||||
+ { MODKEY, -1, XKB_KEY_0, view, {.ui = ~0} },
|
||||
+ { MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_parenright, tag, {.ui = ~0} },
|
||||
+ { MODKEY, -1, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} },
|
||||
+ { MODKEY, -1, XKB_KEY_period, focusmon, {.i = WLR_DIRECTION_RIGHT} },
|
||||
+ { MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_less, tagmon, {.i = WLR_DIRECTION_LEFT} },
|
||||
+ { MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_greater, tagmon, {.i = WLR_DIRECTION_RIGHT} },
|
||||
TAGKEYS( XKB_KEY_1, XKB_KEY_exclam, 0),
|
||||
TAGKEYS( XKB_KEY_2, XKB_KEY_at, 1),
|
||||
TAGKEYS( XKB_KEY_3, XKB_KEY_numbersign, 2),
|
||||
@@ -152,14 +152,14 @@ static const Key keys[] = {
|
||||
TAGKEYS( XKB_KEY_7, XKB_KEY_ampersand, 6),
|
||||
TAGKEYS( XKB_KEY_8, XKB_KEY_asterisk, 7),
|
||||
TAGKEYS( XKB_KEY_9, XKB_KEY_parenleft, 8),
|
||||
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q, quit, {0} },
|
||||
+ { MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_Q, quit, {0} },
|
||||
|
||||
/* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */
|
||||
- { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_Terminate_Server, quit, {0} },
|
||||
+ { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,-1,XKB_KEY_Terminate_Server, quit, {0} },
|
||||
/* Ctrl-Alt-Fx is used to switch to another VT, if you don't know what a VT is
|
||||
* do not remove them.
|
||||
*/
|
||||
-#define CHVT(n) { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_XF86Switch_VT_##n, chvt, {.ui = (n)} }
|
||||
+#define CHVT(n) { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,-1,XKB_KEY_XF86Switch_VT_##n, chvt, {.ui = (n)} }
|
||||
CHVT(1), CHVT(2), CHVT(3), CHVT(4), CHVT(5), CHVT(6),
|
||||
CHVT(7), CHVT(8), CHVT(9), CHVT(10), CHVT(11), CHVT(12),
|
||||
};
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index bf763dfc..05e667f8 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -143,6 +143,7 @@ typedef struct {
|
||||
|
||||
typedef struct {
|
||||
uint32_t mod;
|
||||
+ int chain;
|
||||
xkb_keysym_t keysym;
|
||||
void (*func)(const Arg *);
|
||||
const Arg arg;
|
||||
@@ -353,6 +354,7 @@ static const char broken[] = "broken";
|
||||
static pid_t child_pid = -1;
|
||||
static int locked;
|
||||
static void *exclusive_focus;
|
||||
+static int chainkey = -1;
|
||||
static struct wl_display *dpy;
|
||||
static struct wlr_backend *backend;
|
||||
static struct wlr_scene *scene;
|
||||
@@ -1438,11 +1440,30 @@ keybinding(uint32_t mods, xkb_keysym_t sym)
|
||||
const Key *k;
|
||||
for (k = keys; k < END(keys); k++) {
|
||||
if (CLEANMASK(mods) == CLEANMASK(k->mod)
|
||||
- && sym == k->keysym && k->func) {
|
||||
+ && sym == k->keysym
|
||||
+ && chainkey == -1
|
||||
+ && k->chain == -1
|
||||
+ && k->func) {
|
||||
k->func(&k->arg);
|
||||
return 1;
|
||||
}
|
||||
+ else if (sym == k->keysym
|
||||
+ && chainkey != -1
|
||||
+ && k->chain == chainkey
|
||||
+ && k->func) {
|
||||
+ k->func(&k->arg);
|
||||
+ chainkey = -1;
|
||||
+ return 1;
|
||||
+ }
|
||||
+ else if (CLEANMASK(mods) == CLEANMASK(k->mod)
|
||||
+ && k->chain == (int)sym
|
||||
+ && chainkey == -1
|
||||
+ && k->func) {
|
||||
+ chainkey = sym;
|
||||
+ return 1;
|
||||
+ }
|
||||
}
|
||||
+ chainkey = -1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@@ -12,6 +12,11 @@ then `status1` is set as the status of the primary bar,
|
||||
`status2` is set as the left status of extrabar,
|
||||
`status3` is set as the right status of extrabar.
|
||||
|
||||
### Download
|
||||
|
||||
- [2026-10-14](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/extrabar/extrabar-20261014.patch)
|
||||
- [2026-03-13](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/extrabar/extrabar-20260313.patch)
|
||||
|
||||
### Author
|
||||
|
||||
[dhruva_sambrani](/dhruva_sambrani)
|
||||
|
||||
@@ -0,0 +1,227 @@
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index 7fe9468..1c4d5ba 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -205,6 +205,7 @@ struct Monitor {
|
||||
struct wlr_output *wlr_output;
|
||||
struct wlr_scene_output *scene_output;
|
||||
struct wlr_scene_buffer *scene_buffer; /* bar buffer */
|
||||
+ struct wlr_scene_buffer *extra_scene_buffer; /* bar buffer */
|
||||
struct wlr_scene_rect *fullscreen_bg; /* See createmon() for info */
|
||||
struct wl_listener frame;
|
||||
struct wl_listener destroy;
|
||||
@@ -230,6 +231,7 @@ struct Monitor {
|
||||
int asleep;
|
||||
Drwl *drw;
|
||||
Buffer *pool[2];
|
||||
+ Buffer *extra_pool[2];
|
||||
int lrpad;
|
||||
};
|
||||
|
||||
@@ -278,7 +280,7 @@ static void bufdestroy(struct wlr_buffer *buffer);
|
||||
static bool bufdatabegin(struct wlr_buffer *buffer, uint32_t flags,
|
||||
void **data, uint32_t *format, size_t *stride);
|
||||
static void bufdataend(struct wlr_buffer *buffer);
|
||||
-static Buffer *bufmon(Monitor *m);
|
||||
+static Buffer *bufmon(Monitor *m, Buffer **pool);
|
||||
static void bufrelease(struct wl_listener *listener, void *data);
|
||||
static void buttonpress(struct wl_listener *listener, void *data);
|
||||
static void chvt(const Arg *arg);
|
||||
@@ -444,6 +446,8 @@ static struct wl_list mons;
|
||||
static Monitor *selmon;
|
||||
|
||||
static char stext[256];
|
||||
+static char stext2[256];
|
||||
+static char stext3[256];
|
||||
static struct wl_event_source *status_event_source;
|
||||
|
||||
static const struct wlr_buffer_impl buffer_impl = {
|
||||
@@ -627,6 +631,11 @@ arrangelayers(Monitor *m)
|
||||
usable_area.y += topbar ? m->b.real_height : 0;
|
||||
}
|
||||
|
||||
+ if (m->extra_scene_buffer->node.enabled) {
|
||||
+ usable_area.height -= m->b.real_height;
|
||||
+ usable_area.y += topbar ? 0 : m->b.real_height;
|
||||
+ }
|
||||
+
|
||||
/* Arrange exclusive surfaces from top->bottom */
|
||||
for (i = 3; i >= 0; i--)
|
||||
arrangelayer(m, &m->layers[i], &usable_area, 1);
|
||||
@@ -706,23 +715,23 @@ bufdataend(struct wlr_buffer *wlr_buffer)
|
||||
}
|
||||
|
||||
Buffer *
|
||||
-bufmon(Monitor *m)
|
||||
+bufmon(Monitor *m, Buffer **pool)
|
||||
{
|
||||
size_t i;
|
||||
Buffer *buf = NULL;
|
||||
|
||||
for (i = 0; i < LENGTH(m->pool); i++) {
|
||||
- if (m->pool[i]) {
|
||||
- if (m->pool[i]->busy)
|
||||
+ if (pool[i]) {
|
||||
+ if (pool[i]->busy)
|
||||
continue;
|
||||
- buf = m->pool[i];
|
||||
+ buf = pool[i];
|
||||
break;
|
||||
}
|
||||
|
||||
buf = ecalloc(1, sizeof(Buffer) + (m->b.width * 4 * m->b.height));
|
||||
buf->image = drwl_image_create(NULL, m->b.width, m->b.height, buf->data);
|
||||
wlr_buffer_init(&buf->base, &buffer_impl, m->b.width, m->b.height);
|
||||
- m->pool[i] = buf;
|
||||
+ pool[i] = buf;
|
||||
break;
|
||||
}
|
||||
if (!buf)
|
||||
@@ -894,6 +903,9 @@ cleanupmon(struct wl_listener *listener, void *data)
|
||||
for (i = 0; i < LENGTH(m->pool); i++)
|
||||
wlr_buffer_drop(&m->pool[i]->base);
|
||||
|
||||
+ for (i = 0; i < LENGTH(m->extra_pool); i++)
|
||||
+ wlr_buffer_drop(&m->extra_pool[i]->base);
|
||||
+
|
||||
drwl_setimage(m->drw, NULL);
|
||||
drwl_destroy(m->drw);
|
||||
|
||||
@@ -910,6 +922,7 @@ cleanupmon(struct wl_listener *listener, void *data)
|
||||
closemon(m);
|
||||
wlr_scene_node_destroy(&m->fullscreen_bg->node);
|
||||
wlr_scene_node_destroy(&m->scene_buffer->node);
|
||||
+ wlr_scene_node_destroy(&m->extra_scene_buffer->node);
|
||||
free(m);
|
||||
}
|
||||
|
||||
@@ -1255,6 +1268,8 @@ createmon(struct wl_listener *listener, void *data)
|
||||
|
||||
m->scene_buffer = wlr_scene_buffer_create(layers[LyrBottom], NULL);
|
||||
m->scene_buffer->point_accepts_input = baracceptsinput;
|
||||
+ m->extra_scene_buffer = wlr_scene_buffer_create(layers[LyrBottom], NULL);
|
||||
+ m->extra_scene_buffer->point_accepts_input = baracceptsinput;
|
||||
updatebar(m);
|
||||
|
||||
wl_list_insert(&mons, &m->link);
|
||||
@@ -1580,7 +1595,7 @@ drawbar(Monitor *m)
|
||||
|
||||
if (!m->scene_buffer->node.enabled)
|
||||
return;
|
||||
- if (!(buf = bufmon(m)))
|
||||
+ if (!(buf = bufmon(m, m->pool)))
|
||||
return;
|
||||
|
||||
/* draw status first so it can be overdrawn by tags later */
|
||||
@@ -1633,13 +1648,47 @@ drawbar(Monitor *m)
|
||||
wlr_buffer_unlock(&buf->base);
|
||||
}
|
||||
|
||||
+void
|
||||
+extrabar(Monitor *m)
|
||||
+{
|
||||
+ int tw = 0;
|
||||
+ Buffer *buf = NULL;
|
||||
+
|
||||
+ /* Skip if the extra bar scene buffer is not initialized/enabled */
|
||||
+ if (!m->extra_scene_buffer || !m->extra_scene_buffer->node.enabled)
|
||||
+ return;
|
||||
+
|
||||
+ /* Inline bufmon logic for the extra pool to keep changes contained */
|
||||
+ if (!(buf = bufmon(m, m->extra_pool)))
|
||||
+ return;
|
||||
+
|
||||
+ drwl_setscheme(m->drw, colors[SchemeNorm]);
|
||||
+ drwl_rect(m->drw, 0, 0, m->b.width, m->b.height, 1, 1);
|
||||
+
|
||||
+ drwl_setscheme(m->drw, colors[SchemeNorm]);
|
||||
+ tw = TEXTW(m, stext2) - m->lrpad + 2; /* 2px right padding */
|
||||
+ drwl_text(m->drw, 2, 0, tw, m->b.height, 0, stext2, 0);
|
||||
+
|
||||
+ tw = TEXTW(m, stext3) - m->lrpad + 2; /* 2px right padding */
|
||||
+ drwl_text(m->drw, m->b.width - tw - 4, 0, tw, m->b.height, 0, stext3, 0);
|
||||
+
|
||||
+ wlr_scene_buffer_set_dest_size(m->extra_scene_buffer, m->b.real_width, m->b.real_height);
|
||||
+ wlr_scene_node_set_position(&m->extra_scene_buffer->node, m->m.x,
|
||||
+ m->m.y + (topbar ? m->m.height - m->b.real_height : 0));
|
||||
+
|
||||
+ wlr_scene_buffer_set_buffer(m->extra_scene_buffer, &buf->base);
|
||||
+ wlr_buffer_unlock(&buf->base);
|
||||
+}
|
||||
+
|
||||
void
|
||||
drawbars(void)
|
||||
{
|
||||
Monitor *m = NULL;
|
||||
|
||||
- wl_list_for_each(m, &mons, link)
|
||||
+ wl_list_for_each(m, &mons, link) {
|
||||
drawbar(m);
|
||||
+ extrabar(m);
|
||||
+ }
|
||||
}
|
||||
|
||||
void
|
||||
@@ -2896,7 +2945,7 @@ startdrag(struct wl_listener *listener, void *data)
|
||||
int
|
||||
statusin(int fd, unsigned int mask, void *data)
|
||||
{
|
||||
- char status[256];
|
||||
+ char status[3*256];
|
||||
ssize_t n;
|
||||
|
||||
if (mask & WL_EVENT_ERROR)
|
||||
@@ -2911,7 +2960,18 @@ statusin(int fd, unsigned int mask, void *data)
|
||||
status[n] = '\0';
|
||||
status[strcspn(status, "\n")] = '\0';
|
||||
|
||||
- strncpy(stext, status, sizeof(stext));
|
||||
+ char *l1 = strchr(status, ';');
|
||||
+ if (l1) {
|
||||
+ *l1 = '\0';
|
||||
+ char *l2 = strchr(++l1, ';');
|
||||
+ if (l2) {
|
||||
+ *l2 = '\0';
|
||||
+ strncpy(stext3, ++l2, sizeof(stext3));
|
||||
+ }
|
||||
+ strncpy(stext2, l1, sizeof(stext2));
|
||||
+ }
|
||||
+ strncpy(stext, status, sizeof(stext));
|
||||
+
|
||||
drawbars();
|
||||
|
||||
return 0;
|
||||
@@ -3172,10 +3232,9 @@ updatemons(struct wl_listener *listener, void *data)
|
||||
|
||||
if (stext[0] == '\0')
|
||||
strncpy(stext, "dwl-"VERSION, sizeof(stext));
|
||||
- wl_list_for_each(m, &mons, link) {
|
||||
+ wl_list_for_each(m, &mons, link)
|
||||
updatebar(m);
|
||||
- drawbar(m);
|
||||
- }
|
||||
+ drawbars();
|
||||
|
||||
/* FIXME: figure out why the cursor image is at 0,0 after turning all
|
||||
* the monitors on.
|
||||
@@ -3199,6 +3258,7 @@ updatebar(Monitor *m)
|
||||
m->b.real_width = (int)((float)m->b.width / m->wlr_output->scale);
|
||||
|
||||
wlr_scene_node_set_enabled(&m->scene_buffer->node, m->wlr_output->enabled ? showbar : 0);
|
||||
+ wlr_scene_node_set_enabled(&m->extra_scene_buffer->node, m->wlr_output->enabled ? showbar : 0);
|
||||
|
||||
for (i = 0; i < LENGTH(m->pool); i++)
|
||||
if (m->pool[i]) {
|
||||
@@ -3206,6 +3266,12 @@ updatebar(Monitor *m)
|
||||
m->pool[i] = NULL;
|
||||
}
|
||||
|
||||
+ for (i = 0; i < LENGTH(m->extra_pool); i++)
|
||||
+ if (m->extra_pool[i]) {
|
||||
+ wlr_buffer_drop(&m->extra_pool[i]->base);
|
||||
+ m->extra_pool[i] = NULL;
|
||||
+ }
|
||||
+
|
||||
if (m->b.scale == m->wlr_output->scale && m->drw)
|
||||
return;
|
||||
|
||||
@@ -2,8 +2,10 @@
|
||||
Implement `foreign-toplevel-management`, it add handlers for activate, close, fullscreen and destroy request events, it's missing minimize and maximize request handlers.
|
||||
|
||||
### Download
|
||||
- [git branch](https://codeberg.org/wochap/dwl/src/branch/v0.6-a/foreign-toplevel-management)
|
||||
- [git branch](https://codeberg.org/guidocella/dwl/src/branch/foreign-toplevel-management)
|
||||
- [2026-10-20](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/foreign-toplevel-management/foreign-toplevel-management.patch)
|
||||
- [2024-05-02](https://codeberg.org/dwl/dwl-patches/raw/commit/e58c3ec41a39df934d2998161d7187ac965ea77a/foreign-toplevel-management/foreign-toplevel-management.patch)
|
||||
|
||||
### Authors
|
||||
- [wochap](https://codeberg.org/wochap)
|
||||
- [wochap](https://codeberg.org/wochap)
|
||||
- [Guido Cella](https://codeberg.org/guidocella)
|
||||
|
||||
@@ -1,29 +1,29 @@
|
||||
From dc63d64cd69f515013464b3feb8acb411f5a348f Mon Sep 17 00:00:00 2001
|
||||
From 7820c6ca511de2fc41ab5bcf74dc0a5e0803d33f Mon Sep 17 00:00:00 2001
|
||||
From: wochap <gean.marroquin@gmail.com>
|
||||
Date: Thu, 2 May 2024 17:25:45 -0500
|
||||
Date: Thu, 17 Sep 2026 08:22:59 +0200
|
||||
Subject: [PATCH] implement foreign toplevel management
|
||||
|
||||
---
|
||||
Makefile | 5 +-
|
||||
dwl.c | 93 +++++-
|
||||
dwl.c | 95 +++++-
|
||||
...oreign-toplevel-management-unstable-v1.xml | 270 ++++++++++++++++++
|
||||
3 files changed, 366 insertions(+), 2 deletions(-)
|
||||
3 files changed, 367 insertions(+), 3 deletions(-)
|
||||
create mode 100644 protocols/wlr-foreign-toplevel-management-unstable-v1.xml
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index a67fdd3..e0e1260 100644
|
||||
index 8304245..cfbc0e0 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -16,7 +16,7 @@ LDLIBS = `$(PKG_CONFIG) --libs $(PKGS)` $(LIBS)
|
||||
all: dwl
|
||||
dwl: dwl.o util.o
|
||||
$(CC) dwl.o util.o $(LDLIBS) $(LDFLAGS) $(DWLCFLAGS) -o $@
|
||||
-dwl.o: dwl.c config.mk config.h client.h cursor-shape-v1-protocol.h pointer-constraints-unstable-v1-protocol.h wlr-layer-shell-unstable-v1-protocol.h xdg-shell-protocol.h
|
||||
+dwl.o: dwl.c config.mk config.h client.h cursor-shape-v1-protocol.h pointer-constraints-unstable-v1-protocol.h wlr-layer-shell-unstable-v1-protocol.h xdg-shell-protocol.h wlr-foreign-toplevel-management-unstable-v1-protocol.h
|
||||
util.o: util.c util.h
|
||||
@@ -20,7 +20,7 @@ all: dwl
|
||||
dwl: dwl.c client.h config.h ime.h util.h config.mk cursor-shape-v1-protocol.h \
|
||||
ext-image-copy-capture-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
|
||||
+ wlr-foreign-toplevel-management-unstable-v1-protocol.h wlr-output-power-management-unstable-v1-protocol.h xdg-shell-protocol.h
|
||||
$(CC) dwl.c $(DWLCFLAGS) $(LDFLAGS) $(LDLIBS) -o $@
|
||||
|
||||
# wayland-scanner is a tool which generates C headers and rigging for Wayland
|
||||
@@ -37,6 +37,9 @@ wlr-layer-shell-unstable-v1-protocol.h:
|
||||
@@ -47,6 +47,9 @@ wlr-output-power-management-unstable-v1-protocol.h:
|
||||
xdg-shell-protocol.h:
|
||||
$(WAYLAND_SCANNER) server-header \
|
||||
$(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@
|
||||
@@ -34,18 +34,18 @@ index a67fdd3..e0e1260 100644
|
||||
config.h:
|
||||
cp config.def.h $@
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index bf763df..648616d 100644
|
||||
index 89e8caf..006c615 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <wlr/types/wlr_data_device.h>
|
||||
#include <wlr/types/wlr_drm.h>
|
||||
#include <wlr/types/wlr_export_dmabuf_v1.h>
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <wlr/types/wlr_ext_image_capture_source_v1.h>
|
||||
#include <wlr/types/wlr_ext_image_copy_capture_v1.h>
|
||||
#include <wlr/types/wlr_ext_foreign_toplevel_list_v1.h>
|
||||
+#include <wlr/types/wlr_foreign_toplevel_management_v1.h>
|
||||
#include <wlr/types/wlr_fractional_scale_v1.h>
|
||||
#include <wlr/types/wlr_gamma_control_v1.h>
|
||||
#include <wlr/types/wlr_idle_inhibit_v1.h>
|
||||
@@ -126,6 +127,11 @@ typedef struct {
|
||||
@@ -151,6 +152,11 @@ typedef struct {
|
||||
struct wl_listener fullscreen;
|
||||
struct wl_listener set_decoration_mode;
|
||||
struct wl_listener destroy_decoration;
|
||||
@@ -54,10 +54,10 @@ index bf763df..648616d 100644
|
||||
+ struct wl_listener fclose;
|
||||
+ struct wl_listener ffullscreen;
|
||||
+ struct wl_listener fdestroy;
|
||||
struct wlr_box prev; /* layout-relative, includes border */
|
||||
struct wlr_box bounds;
|
||||
#ifdef XWAYLAND
|
||||
@@ -347,6 +353,11 @@ static Monitor *xytomon(double x, double y);
|
||||
struct wl_listener activate;
|
||||
struct wl_listener associate;
|
||||
@@ -387,8 +393,14 @@ static Monitor *xytomon(double x, double y);
|
||||
static void xytonode(double x, double y, struct wlr_surface **psurface,
|
||||
Client **pc, LayerSurface **pl, double *nx, double *ny);
|
||||
static void zoom(const Arg *arg);
|
||||
@@ -68,19 +68,22 @@ index bf763df..648616d 100644
|
||||
+static void ffullscreennotify(struct wl_listener *listener, void *data);
|
||||
|
||||
/* variables */
|
||||
static const char broken[] = "broken";
|
||||
@@ -392,6 +403,8 @@ static struct wlr_scene_rect *locked_bg;
|
||||
+static const char broken[] = "broken";
|
||||
static pid_t child_pid = -1;
|
||||
static int locked;
|
||||
static Client *focused_client;
|
||||
@@ -433,6 +445,8 @@ static struct wlr_session_lock_manager_v1 *session_lock_mgr;
|
||||
static struct wlr_scene_rect *locked_bg;
|
||||
static struct wlr_session_lock_v1 *cur_lock;
|
||||
static struct wl_listener lock_listener = {.notify = locksession};
|
||||
|
||||
+static struct wlr_foreign_toplevel_manager_v1 *foreign_toplevel_mgr;
|
||||
+
|
||||
static struct wlr_seat *seat;
|
||||
static KeyboardGroup kb_group = {0};
|
||||
static KeyboardGroup vkb_group = {0};
|
||||
@@ -458,6 +471,11 @@ applyrules(Client *c)
|
||||
if (!(title = client_get_title(c)))
|
||||
title = broken;
|
||||
static KeyboardGroup *kb_group;
|
||||
static unsigned int cursor_mode;
|
||||
@@ -588,6 +602,11 @@ applyrules(Client *c)
|
||||
appid = client_get_appid(c);
|
||||
title = client_get_title(c);
|
||||
|
||||
+ if (c->foreign_toplevel) {
|
||||
+ wlr_foreign_toplevel_handle_v1_set_app_id(c->foreign_toplevel, appid);
|
||||
@@ -90,34 +93,35 @@ index bf763df..648616d 100644
|
||||
for (r = rules; r < END(rules); r++) {
|
||||
if ((!r->title || strstr(title, r->title))
|
||||
&& (!r->id || strstr(appid, r->id))) {
|
||||
@@ -1288,6 +1306,8 @@ focusclient(Client *c, int lift)
|
||||
client_set_border_color(old_c, bordercolor);
|
||||
|
||||
client_activate_surface(old, 0);
|
||||
+ if (old_c->foreign_toplevel)
|
||||
+ wlr_foreign_toplevel_handle_v1_set_activated(old_c->foreign_toplevel, 0);
|
||||
}
|
||||
@@ -1631,6 +1650,8 @@ focusclient(Client *c, LayerSurface *l, int lift)
|
||||
if (s && s->mapped)
|
||||
client_activate_surface(s, 0);
|
||||
focused_client = NULL;
|
||||
+ if (old_c && old_c->foreign_toplevel)
|
||||
+ wlr_foreign_toplevel_handle_v1_set_activated(old_c->foreign_toplevel, 0);
|
||||
}
|
||||
printstatus();
|
||||
@@ -1306,6 +1326,8 @@ focusclient(Client *c, int lift)
|
||||
|
||||
/* Activate the new client */
|
||||
client_activate_surface(client_surface(c), 1);
|
||||
@@ -1653,6 +1674,9 @@ focusclient(Client *c, LayerSurface *l, int lift)
|
||||
|
||||
if (!client_is_unmanaged(c))
|
||||
focused_client = c;
|
||||
+
|
||||
+ if (c->foreign_toplevel)
|
||||
+ wlr_foreign_toplevel_handle_v1_set_activated(c->foreign_toplevel, 1);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -1599,6 +1621,8 @@ mapnotify(struct wl_listener *listener, void *data)
|
||||
@@ -1975,6 +1999,8 @@ mapnotify(struct wl_listener *listener, void *data)
|
||||
c->border[i]->node.data = c;
|
||||
}
|
||||
|
||||
+ createforeigntoplevel(c);
|
||||
+
|
||||
/* Initialize client geometry with room for border */
|
||||
client_set_tiled(c, WLR_EDGE_TOP | WLR_EDGE_BOTTOM | WLR_EDGE_LEFT | WLR_EDGE_RIGHT);
|
||||
c->geom.width += 2 * c->bw;
|
||||
@@ -2232,12 +2256,17 @@ setmon(Client *c, Monitor *m, uint32_t newtags)
|
||||
client_set_tiled(c, WLR_EDGE_TOP | WLR_EDGE_BOTTOM | WLR_EDGE_LEFT |
|
||||
WLR_EDGE_RIGHT);
|
||||
@@ -2661,12 +2687,17 @@ setmon(Client *c, Monitor *m, uint32_t newtags)
|
||||
c->prev = c->geom;
|
||||
|
||||
/* Scene graph sends surface leave/enter events on move and resize */
|
||||
@@ -136,29 +140,28 @@ index bf763df..648616d 100644
|
||||
setfullscreen(c, c->isfullscreen); /* This will call arrange(c->mon) */
|
||||
setfloating(c, c->isfloating);
|
||||
}
|
||||
@@ -2351,6 +2380,9 @@ setup(void)
|
||||
gamma_control_mgr = wlr_gamma_control_manager_v1_create(dpy);
|
||||
LISTEN_STATIC(&gamma_control_mgr->events.set_gamma, setgamma);
|
||||
@@ -2806,7 +2837,10 @@ setup(void)
|
||||
power_mgr = wlr_output_power_manager_v1_create(dpy);
|
||||
wl_signal_add(&power_mgr->events.set_mode, &output_power_mgr_set_mode);
|
||||
|
||||
- /* Creates an output layout, which is a wlroots utility for working with an
|
||||
+ /* Initializes foreign toplevel management */
|
||||
+ foreign_toplevel_mgr = wlr_foreign_toplevel_manager_v1_create(dpy);
|
||||
+
|
||||
/* Creates an output layout, which a wlroots utility for working with an
|
||||
+ /* Creates an output layout, which a wlroots utility for working with an
|
||||
* arrangement of screens in a physical layout. */
|
||||
output_layout = wlr_output_layout_create();
|
||||
@@ -2691,6 +2723,11 @@ unmapnotify(struct wl_listener *listener, void *data)
|
||||
wl_list_remove(&c->flink);
|
||||
output_layout = wlr_output_layout_create(dpy);
|
||||
wl_signal_add(&output_layout->events.change, &layout_change);
|
||||
@@ -3261,6 +3295,8 @@ unmapnotify(struct wl_listener *listener, void *data)
|
||||
wlr_ext_foreign_toplevel_handle_v1_destroy(c->foreign_toplevel_handle);
|
||||
c->foreign_toplevel_handle = NULL;
|
||||
}
|
||||
|
||||
+ if (c->foreign_toplevel) {
|
||||
+ if (c->foreign_toplevel)
|
||||
+ wlr_foreign_toplevel_handle_v1_destroy(c->foreign_toplevel);
|
||||
+ c->foreign_toplevel = NULL;
|
||||
+ }
|
||||
+
|
||||
wlr_scene_node_destroy(&c->scene->node);
|
||||
printstatus();
|
||||
motionnotify(0, NULL, 0, 0, 0, 0);
|
||||
@@ -2802,6 +2839,12 @@ void
|
||||
#ifdef XWAYLAND
|
||||
if (c->type != XDGShell && c->capture.image_capture_scene_surface) {
|
||||
wlr_scene_node_destroy(&c->capture.image_capture_scene_surface->buffer->node);
|
||||
@@ -3393,6 +3429,12 @@ void
|
||||
updatetitle(struct wl_listener *listener, void *data)
|
||||
{
|
||||
Client *c = wl_container_of(listener, c, set_title);
|
||||
@@ -170,8 +173,8 @@ index bf763df..648616d 100644
|
||||
+ }
|
||||
if (c == focustop(c->mon))
|
||||
printstatus();
|
||||
}
|
||||
@@ -2929,6 +2972,54 @@ zoom(const Arg *arg)
|
||||
|
||||
@@ -3531,6 +3573,55 @@ zoom(const Arg *arg)
|
||||
arrange(selmon);
|
||||
}
|
||||
|
||||
@@ -195,7 +198,7 @@ index bf763df..648616d 100644
|
||||
+ } else {
|
||||
+ setmon(c, selmon, 0);
|
||||
+ }
|
||||
+ focusclient(c, 1);
|
||||
+ focusclient(c, NULL, 1);
|
||||
+ arrange(c->mon);
|
||||
+}
|
||||
+
|
||||
@@ -221,6 +224,7 @@ index bf763df..648616d 100644
|
||||
+ wl_list_remove(&c->fclose.link);
|
||||
+ wl_list_remove(&c->ffullscreen.link);
|
||||
+ wl_list_remove(&c->fdestroy.link);
|
||||
+ c->foreign_toplevel = NULL;
|
||||
+}
|
||||
+
|
||||
#ifdef XWAYLAND
|
||||
@@ -503,5 +507,5 @@ index 0000000..44505bb
|
||||
+ </interface>
|
||||
+</protocol>
|
||||
--
|
||||
2.43.2
|
||||
2.56.0
|
||||
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
### Description
|
||||
|
||||
Implement rounded corners, shadows and blur with [scenefx](https://github.com/wlrfx/scenefx) 0.5.
|
||||
|
||||
- [git branch](https://codeberg.org/guidocella/dwl/src/branch/scenefx)
|
||||
- [2026-10-29](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/scenefx/scenefx.patch)
|
||||
- [v0.5](https://codeberg.org/dwl/dwl-patches/raw/commit/7a5c3420822074c544fa102e030b7c30aa6b6be8/scenefx/scenefx.patch)
|
||||
|
||||
### Authors
|
||||
|
||||
- [wochap](https://codeberg.org/wochap)
|
||||
- [Guido Cella](https://codeberg.org/guidocella)
|
||||
@@ -0,0 +1,425 @@
|
||||
From 10d093f65881d49ff5e919168451ab75f16adce0 Mon Sep 17 00:00:00 2001
|
||||
From: Guido Cella <guido@guidocella.xyz>
|
||||
Date: Thu, 29 Oct 2026 18:06:25 +0100
|
||||
Subject: [PATCH] integrate scenefx
|
||||
|
||||
Add rounded corners, shadows and blur with scenefx.
|
||||
|
||||
The border is now a single rectangle with a hole for the window contents,
|
||||
so its corners can be rounded concentrically with them. Buffers are rounded
|
||||
when their corners coincide with the window's, which includes subsurfaces
|
||||
covering it.
|
||||
|
||||
Tiled windows show the cached blur of the background layer, which is
|
||||
redrawn only when it changes, while floating windows blur what's behind
|
||||
them. Fullscreen windows have no effects so that fullscreen_bg keeps
|
||||
hiding what's behind them.
|
||||
|
||||
scenefx has to be linked before wlroots so that its wlr_scene functions
|
||||
override wlroots' ones, including those called by wlroots' scene surface
|
||||
helpers, which scenefx doesn't reimplement.
|
||||
---
|
||||
Makefile | 4 +-
|
||||
client.h | 4 +-
|
||||
config.def.h | 8 +++
|
||||
config.mk | 5 ++
|
||||
dwl.c | 144 +++++++++++++++++++++++++++++++++++++++++++--------
|
||||
5 files changed, 137 insertions(+), 28 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 8304245..aad87ba 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -13,8 +13,8 @@ DWLDEVCFLAGS = -g -Wpedantic -Wall -Wextra -Wdeclaration-after-statement \
|
||||
|
||||
# CFLAGS / LDFLAGS
|
||||
PKGS = wayland-server xkbcommon libinput $(XLIBS)
|
||||
-DWLCFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` $(WLR_INCS) $(DWLCPPFLAGS) $(DWLDEVCFLAGS) $(CFLAGS)
|
||||
-LDLIBS = `$(PKG_CONFIG) --libs $(PKGS)` $(WLR_LIBS) -lm $(LIBS)
|
||||
+DWLCFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` $(WLR_INCS) $(FX_INCS) $(DWLCPPFLAGS) $(DWLDEVCFLAGS) $(CFLAGS)
|
||||
+LDLIBS = `$(PKG_CONFIG) --libs $(PKGS)` $(FX_LIBS) $(WLR_LIBS) -lm $(LIBS)
|
||||
|
||||
all: dwl
|
||||
dwl: dwl.c client.h config.h ime.h util.h config.mk cursor-shape-v1-protocol.h \
|
||||
diff --git a/client.h b/client.h
|
||||
index ebe665b..d3f8091 100644
|
||||
--- a/client.h
|
||||
+++ b/client.h
|
||||
@@ -300,9 +300,7 @@ client_send_close(Client *c)
|
||||
static inline void
|
||||
client_set_border_color(Client *c, const float color[static 4])
|
||||
{
|
||||
- int i;
|
||||
- for (i = 0; i < 4; i++)
|
||||
- wlr_scene_rect_set_color(c->border[i], color);
|
||||
+ wlr_scene_rect_set_color(c->border, color);
|
||||
}
|
||||
|
||||
static inline void
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 4901e7a..71ffa98 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -13,6 +13,14 @@ static const float bordercolor[] = COLOR(0x444444ff);
|
||||
static const float focuscolor[] = COLOR(0x005577ff);
|
||||
static const float urgentcolor[] = COLOR(0xff0000ff);
|
||||
static const float fullscreen_bg[] = {0.0f, 0.0f, 0.0f, 1.0f}; /* You can also use glsl colors */
|
||||
+/* rounded corners, shadows and blur, see scenefx */
|
||||
+static const int corner_radius = 8; /* radius of the corners of window contents, 0 disables them */
|
||||
+static const int corner_radius_only_floating = 0; /* 1 means only floating windows have rounded corners */
|
||||
+static const int shadow_sigma = 20; /* blur sigma and size of window shadows, 0 disables them */
|
||||
+static const float shadow_color[] = COLOR(0x00000080);
|
||||
+/* blur behind translucent windows. Set num_passes to 0 to disable it */
|
||||
+static const struct blur_data blur_data = { .num_passes = 3, .radius = 5, .noise = 0.02f,
|
||||
+ .brightness = 0.9f, .contrast = 0.9f, .saturation = 1.1f };
|
||||
|
||||
/* tagging - TAGCOUNT must be no greater than 31 */
|
||||
#define TAGCOUNT (9)
|
||||
diff --git a/config.mk b/config.mk
|
||||
index 0da079c..9293d5e 100644
|
||||
--- a/config.mk
|
||||
+++ b/config.mk
|
||||
@@ -24,6 +24,11 @@ WLR_LIBS = `$(PKG_CONFIG) --libs wlroots-0.20`
|
||||
# -I$(PWD)/wlroots/0.20/include/wlroots-0.20
|
||||
#WLR_LIBS = -Wl,-rpath,$(PWD)/wlroots/0.20/lib64 -L$(PWD)/wlroots/0.20/lib64 -lwlroots-0.20
|
||||
|
||||
+# scenefx's headers are included with -isystem to hide their -Wpedantic warnings,
|
||||
+# and after WLR_INCS so they don't override an alternative wlroots installation.
|
||||
+FX_INCS = -isystem `$(PKG_CONFIG) --variable=includedir scenefx-0.5`/scenefx-0.5
|
||||
+FX_LIBS = `$(PKG_CONFIG) --libs scenefx-0.5`
|
||||
+
|
||||
XWAYLAND =
|
||||
XLIBS =
|
||||
# Uncomment to build XWayland support
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index 89e8caf..1a702c9 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -6,6 +6,9 @@
|
||||
#include <limits.h>
|
||||
#include <linux/input-event-codes.h>
|
||||
#include <math.h>
|
||||
+#include <scenefx/render/fx_renderer/fx_renderer.h>
|
||||
+#include <scenefx/types/fx/clipped_region.h>
|
||||
+#include <scenefx/types/wlr_scene.h>
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
@@ -51,7 +54,6 @@
|
||||
#include <wlr/types/wlr_primary_selection.h>
|
||||
#include <wlr/types/wlr_primary_selection_v1.h>
|
||||
#include <wlr/types/wlr_relative_pointer_v1.h>
|
||||
-#include <wlr/types/wlr_scene.h>
|
||||
#include <wlr/types/wlr_screencopy_v1.h>
|
||||
#include <wlr/types/wlr_seat.h>
|
||||
#include <wlr/types/wlr_server_decoration.h>
|
||||
@@ -120,7 +122,9 @@ typedef struct {
|
||||
|
||||
Monitor *mon;
|
||||
struct wlr_scene_tree *scene;
|
||||
- struct wlr_scene_rect *border[4]; /* top, bottom, left, right */
|
||||
+ struct wlr_scene_rect *border;
|
||||
+ struct wlr_scene_shadow *shadow;
|
||||
+ struct wlr_scene_blur *blur;
|
||||
struct wlr_scene_tree *scene_surface;
|
||||
struct wl_list link;
|
||||
struct wl_list flink;
|
||||
@@ -211,6 +215,7 @@ struct Monitor {
|
||||
struct wlr_output *wlr_output;
|
||||
struct wlr_scene_output *scene_output;
|
||||
struct wlr_scene_rect *fullscreen_bg; /* See createmon() for info */
|
||||
+ struct wlr_scene_optimized_blur *blur;
|
||||
struct wl_listener frame;
|
||||
struct wl_listener destroy;
|
||||
struct wl_listener request_state;
|
||||
@@ -284,6 +289,7 @@ static void commitlayersurfacenotify(struct wl_listener *listener, void *data);
|
||||
static void commitlocksurface(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 cornerradius(Client *c);
|
||||
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);
|
||||
@@ -346,6 +352,7 @@ static void requestdecorationmode(struct wl_listener *listener, void *data);
|
||||
static void requeststartdrag(struct wl_listener *listener, void *data);
|
||||
static void requestmonstate(struct wl_listener *listener, void *data);
|
||||
static void resize(Client *c, struct wlr_box geo, int interact);
|
||||
+static void roundbuffer(struct wlr_scene_buffer *buffer, int sx, int sy, void *data);
|
||||
static void run(char *startup_cmd);
|
||||
static void setcursor(struct wl_listener *listener, void *data);
|
||||
static void setcursorshape(struct wl_listener *listener, void *data);
|
||||
@@ -545,6 +552,9 @@ applygeom(Client *c)
|
||||
{
|
||||
struct wlr_box clip;
|
||||
Client *p = client_get_parent(c);
|
||||
+ int radius = cornerradius(c);
|
||||
+ int outer = radius ? radius + (int)c->bw : 0;
|
||||
+ int floating = c->isfloating || !c->mon->lt[c->mon->sellt]->arrange;
|
||||
|
||||
/* We move all floating clients to LyrTile while in floating layout
|
||||
* to avoid "real" floating clients be always on top */
|
||||
@@ -560,19 +570,37 @@ applygeom(Client *c)
|
||||
wlr_scene_node_set_enabled(&c->scene_surface->node, 1);
|
||||
}
|
||||
|
||||
- /* Update scene-graph, including borders */
|
||||
+ /* Update scene-graph, including borders. The border is a rectangle with
|
||||
+ * a hole for the content, so their rounded corners stay concentric. */
|
||||
wlr_scene_node_set_position(&c->scene->node, c->geom.x, c->geom.y);
|
||||
wlr_scene_node_set_position(&c->scene_surface->node, c->bw, c->bw);
|
||||
- wlr_scene_rect_set_size(c->border[0], c->geom.width, c->bw);
|
||||
- wlr_scene_rect_set_size(c->border[1], c->geom.width, c->bw);
|
||||
- wlr_scene_rect_set_size(c->border[2], c->bw, c->geom.height - 2 * c->bw);
|
||||
- wlr_scene_rect_set_size(c->border[3], c->bw, c->geom.height - 2 * c->bw);
|
||||
- wlr_scene_node_set_position(&c->border[1]->node, 0, c->geom.height - c->bw);
|
||||
- wlr_scene_node_set_position(&c->border[2]->node, 0, c->bw);
|
||||
- wlr_scene_node_set_position(&c->border[3]->node, c->geom.width - c->bw, c->bw);
|
||||
+ wlr_scene_rect_set_size(c->border, c->geom.width, c->geom.height);
|
||||
+ wlr_scene_rect_set_corner_radius(c->border, outer);
|
||||
+ wlr_scene_rect_set_clipped_region(c->border, (struct clipped_region){
|
||||
+ .area = { c->bw, c->bw, c->geom.width - 2 * c->bw, c->geom.height - 2 * c->bw },
|
||||
+ .corners = corner_radii_all(radius) });
|
||||
+
|
||||
+ wlr_scene_node_set_enabled(&c->shadow->node, shadow_sigma && !c->isfullscreen);
|
||||
+ wlr_scene_shadow_set_size(c->shadow, c->geom.width + 2 * shadow_sigma,
|
||||
+ c->geom.height + 2 * shadow_sigma);
|
||||
+ wlr_scene_shadow_set_corner_radius(c->shadow, outer);
|
||||
+ /* Don't draw the shadow behind translucent windows */
|
||||
+ wlr_scene_shadow_set_clipped_region(c->shadow, (struct clipped_region){
|
||||
+ .area = { shadow_sigma, shadow_sigma, c->geom.width, c->geom.height },
|
||||
+ .corners = corner_radii_all(outer) });
|
||||
+
|
||||
+ /* The fullscreen background hides what's behind fullscreen windows */
|
||||
+ wlr_scene_node_set_enabled(&c->blur->node, blur_data.num_passes && !c->isfullscreen);
|
||||
+ wlr_scene_node_set_position(&c->blur->node, c->bw, c->bw);
|
||||
+ wlr_scene_blur_set_size(c->blur, c->geom.width - 2 * c->bw, c->geom.height - 2 * c->bw);
|
||||
+ wlr_scene_blur_set_corner_radius(c->blur, radius);
|
||||
+ /* Only floating windows can be above other windows, tiled ones can use
|
||||
+ * the cached blur of the background layer */
|
||||
+ wlr_scene_blur_set_should_only_blur_bottom_layer(c->blur, !floating);
|
||||
|
||||
client_get_clip(c, &clip);
|
||||
wlr_scene_subsurface_tree_set_clip(&c->scene_surface->node, &clip);
|
||||
+ wlr_scene_node_for_each_buffer(&c->scene_surface->node, roundbuffer, c);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -890,6 +918,7 @@ cleanupmon(struct wl_listener *listener, void *data)
|
||||
|
||||
closemon(m);
|
||||
wlr_scene_node_destroy(&m->fullscreen_bg->node);
|
||||
+ wlr_scene_node_destroy(&m->blur->node);
|
||||
free(m);
|
||||
}
|
||||
|
||||
@@ -982,6 +1011,10 @@ commitlayersurfacenotify(struct wl_listener *listener, void *data)
|
||||
return;
|
||||
}
|
||||
|
||||
+ /* The cached blur of the background layer must be redrawn when it changes */
|
||||
+ if (scene_layer == layers[LyrBg] || l->scene->node.parent == layers[LyrBg])
|
||||
+ wlr_scene_optimized_blur_mark_dirty(l->mon->blur);
|
||||
+
|
||||
if (layer_surface->current.committed == 0 && l->mapped == layer_surface->surface->mapped)
|
||||
return;
|
||||
l->mapped = layer_surface->surface->mapped;
|
||||
@@ -1043,6 +1076,9 @@ commitnotify(struct wl_listener *listener, void *data)
|
||||
transactioncommit(c, c->resize_serial && c->surface.xdg->current.configure_serial
|
||||
>= c->resize_serial);
|
||||
resize(c, c->geom, (c->isfloating && !c->isfullscreen));
|
||||
+ /* Subsurfaces may have been added or resized */
|
||||
+ if (client_surface(c)->mapped)
|
||||
+ wlr_scene_node_for_each_buffer(&c->scene_surface->node, roundbuffer, c);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -1075,6 +1111,15 @@ commitpopup(struct wl_listener *listener, void *data)
|
||||
free(listener);
|
||||
}
|
||||
|
||||
+int
|
||||
+cornerradius(Client *c)
|
||||
+{
|
||||
+ if (c->isfullscreen || (corner_radius_only_floating && !c->isfloating
|
||||
+ && c->mon && c->mon->lt[c->mon->sellt]->arrange))
|
||||
+ return 0;
|
||||
+ return corner_radius;
|
||||
+}
|
||||
+
|
||||
void
|
||||
createdecoration(struct wl_listener *listener, void *data)
|
||||
{
|
||||
@@ -1267,6 +1312,10 @@ createmon(struct wl_listener *listener, void *data)
|
||||
m->fullscreen_bg = wlr_scene_rect_create(layers[LyrFS], 0, 0, fullscreen_bg);
|
||||
wlr_scene_node_set_enabled(&m->fullscreen_bg->node, 0);
|
||||
|
||||
+ /* Caches the blur of everything below it, which tiled windows show */
|
||||
+ m->blur = wlr_scene_optimized_blur_create(&scene->tree, 0, 0);
|
||||
+ wlr_scene_node_place_above(&m->blur->node, &layers[LyrBg]->node);
|
||||
+
|
||||
/* Adds this to the output layout in the order it was configured.
|
||||
*
|
||||
* The output layout utility automatically adds a wl_output global to the
|
||||
@@ -1720,7 +1769,7 @@ gpureset(struct wl_listener *listener, void *data)
|
||||
struct wlr_renderer *old_drw = drw;
|
||||
struct wlr_allocator *old_alloc = alloc;
|
||||
struct Monitor *m;
|
||||
- if (!(drw = wlr_renderer_autocreate(backend)))
|
||||
+ if (!(drw = fx_renderer_create(backend)))
|
||||
die("couldn't recreate renderer");
|
||||
|
||||
if (!(alloc = wlr_allocator_autocreate(backend, drw)))
|
||||
@@ -1733,6 +1782,7 @@ gpureset(struct wl_listener *listener, void *data)
|
||||
|
||||
wl_list_for_each(m, &mons, link) {
|
||||
wlr_output_init_render(m->wlr_output, alloc, drw);
|
||||
+ wlr_scene_optimized_blur_mark_dirty(m->blur);
|
||||
}
|
||||
|
||||
wlr_allocator_destroy(old_alloc);
|
||||
@@ -1941,7 +1991,6 @@ mapnotify(struct wl_listener *listener, void *data)
|
||||
Client *p = NULL;
|
||||
Client *w, *c = wl_container_of(listener, c, map);
|
||||
Monitor *m;
|
||||
- int i;
|
||||
|
||||
struct wlr_ext_foreign_toplevel_handle_v1_state foreign_toplevel_state = {
|
||||
.app_id = client_get_appid(c),
|
||||
@@ -1969,11 +2018,14 @@ mapnotify(struct wl_listener *listener, void *data)
|
||||
goto unset_fullscreen;
|
||||
}
|
||||
|
||||
- for (i = 0; i < 4; i++) {
|
||||
- c->border[i] = wlr_scene_rect_create(c->scene, 0, 0,
|
||||
- c->isurgent ? urgentcolor : bordercolor);
|
||||
- c->border[i]->node.data = c;
|
||||
- }
|
||||
+ c->border = wlr_scene_rect_create(c->scene, 0, 0,
|
||||
+ c->isurgent ? urgentcolor : bordercolor);
|
||||
+ c->border->node.data = c;
|
||||
+ c->shadow = wlr_scene_shadow_create(c->scene, 0, 0, 0, shadow_sigma, shadow_color);
|
||||
+ wlr_scene_node_set_position(&c->shadow->node, -shadow_sigma, -shadow_sigma);
|
||||
+ wlr_scene_node_lower_to_bottom(&c->shadow->node);
|
||||
+ c->blur = wlr_scene_blur_create(c->scene, 0, 0);
|
||||
+ wlr_scene_node_lower_to_bottom(&c->blur->node);
|
||||
|
||||
/* Initialize client geometry with room for border */
|
||||
client_set_tiled(c, WLR_EDGE_TOP | WLR_EDGE_BOTTOM | WLR_EDGE_LEFT |
|
||||
@@ -2494,6 +2546,22 @@ resize(Client *c, struct wlr_box geo, int interact)
|
||||
transactionschedule();
|
||||
}
|
||||
|
||||
+void
|
||||
+roundbuffer(struct wlr_scene_buffer *buffer, int sx, int sy, void *data)
|
||||
+{
|
||||
+ /* Round the corners of buffers which are at the corners of the window,
|
||||
+ * including subsurfaces covering it */
|
||||
+ Client *c = data;
|
||||
+ int radius = cornerradius(c);
|
||||
+ int left = sx == (int)c->bw, top = sy == (int)c->bw;
|
||||
+ int right = sx + buffer->dst_width == c->current.width - (int)c->bw;
|
||||
+ int bottom = sy + buffer->dst_height == c->current.height - (int)c->bw;
|
||||
+
|
||||
+ wlr_scene_buffer_set_corner_radii(buffer, corner_radii_new(
|
||||
+ top && left ? radius : 0, top && right ? radius : 0,
|
||||
+ bottom && right ? radius : 0, bottom && left ? radius : 0));
|
||||
+}
|
||||
+
|
||||
void
|
||||
run(char *startup_cmd)
|
||||
{
|
||||
@@ -2737,17 +2805,18 @@ setup(void)
|
||||
|
||||
/* Initialize the scene graph used to lay out windows */
|
||||
scene = wlr_scene_create();
|
||||
+ wlr_scene_set_blur_data(scene, blur_data.num_passes, (int)blur_data.radius, blur_data.noise,
|
||||
+ blur_data.brightness, blur_data.contrast, blur_data.saturation);
|
||||
root_bg = wlr_scene_rect_create(&scene->tree, 0, 0, rootcolor);
|
||||
for (i = 0; i < NUM_LAYERS; i++)
|
||||
layers[i] = wlr_scene_tree_create(&scene->tree);
|
||||
drag_icon = wlr_scene_tree_create(&scene->tree);
|
||||
wlr_scene_node_place_below(&drag_icon->node, &layers[LyrBlock]->node);
|
||||
|
||||
- /* Autocreates a renderer, either Pixman, GLES2 or Vulkan for us. The user
|
||||
- * can also specify a renderer using the WLR_RENDERER env var.
|
||||
+ /* Creates scenefx's GLES2 renderer, which is required to render its effects.
|
||||
* The renderer is responsible for defining the various pixel formats it
|
||||
* supports for shared memory, this configures that for clients. */
|
||||
- if (!(drw = wlr_renderer_autocreate(backend)))
|
||||
+ if (!(drw = fx_renderer_create(backend)))
|
||||
die("couldn't create renderer");
|
||||
wl_signal_add(&drw->events.lost, &gpu_reset);
|
||||
|
||||
@@ -2959,7 +3028,9 @@ snapshot(struct wlr_scene_node *node, struct wlr_scene_tree *parent, void *data)
|
||||
* the buffers so that they can be shown after the client changes them */
|
||||
struct wlr_scene_node *child, *copy;
|
||||
struct wlr_scene_tree *tree;
|
||||
- struct wlr_scene_rect *rect;
|
||||
+ struct wlr_scene_rect *src_rect, *rect;
|
||||
+ struct wlr_scene_shadow *src_shadow, *shadow;
|
||||
+ struct wlr_scene_blur *src_blur, *blur;
|
||||
struct wlr_scene_buffer *src, *buffer;
|
||||
|
||||
if (!node->enabled)
|
||||
@@ -2973,8 +3044,29 @@ snapshot(struct wlr_scene_node *node, struct wlr_scene_tree *parent, void *data)
|
||||
copy = &tree->node;
|
||||
break;
|
||||
case WLR_SCENE_NODE_RECT:
|
||||
- rect = wlr_scene_rect_from_node(node);
|
||||
- copy = &wlr_scene_rect_create(parent, rect->width, rect->height, rect->color)->node;
|
||||
+ src_rect = wlr_scene_rect_from_node(node);
|
||||
+ rect = wlr_scene_rect_create(parent, src_rect->width, src_rect->height, src_rect->color);
|
||||
+ wlr_scene_rect_set_corner_radii(rect, src_rect->corners);
|
||||
+ wlr_scene_rect_set_clipped_region(rect, src_rect->clipped_region);
|
||||
+ copy = &rect->node;
|
||||
+ break;
|
||||
+ case WLR_SCENE_NODE_SHADOW:
|
||||
+ src_shadow = wlr_scene_shadow_from_node(node);
|
||||
+ shadow = wlr_scene_shadow_create(parent, src_shadow->width, src_shadow->height,
|
||||
+ src_shadow->corner_radius, src_shadow->blur_sigma, src_shadow->color);
|
||||
+ wlr_scene_shadow_set_clipped_region(shadow, src_shadow->clipped_region);
|
||||
+ copy = &shadow->node;
|
||||
+ break;
|
||||
+ case WLR_SCENE_NODE_BLUR:
|
||||
+ src_blur = wlr_scene_blur_from_node(node);
|
||||
+ blur = wlr_scene_blur_create(parent, src_blur->width, src_blur->height);
|
||||
+ wlr_scene_blur_set_corner_radii(blur, src_blur->corners);
|
||||
+ wlr_scene_blur_set_clipped_region(blur, src_blur->clipped_region);
|
||||
+ wlr_scene_blur_set_should_only_blur_bottom_layer(blur,
|
||||
+ src_blur->should_only_blur_bottom_layer);
|
||||
+ wlr_scene_blur_set_alpha(blur, src_blur->alpha);
|
||||
+ wlr_scene_blur_set_strength(blur, src_blur->strength);
|
||||
+ copy = &blur->node;
|
||||
break;
|
||||
case WLR_SCENE_NODE_BUFFER:
|
||||
src = wlr_scene_buffer_from_node(node);
|
||||
@@ -2989,6 +3081,7 @@ snapshot(struct wlr_scene_node *node, struct wlr_scene_tree *parent, void *data)
|
||||
wlr_scene_buffer_set_color_range(buffer, src->color_range);
|
||||
wlr_scene_buffer_set_source_box(buffer, &src->src_box);
|
||||
wlr_scene_buffer_set_transform(buffer, src->transform);
|
||||
+ wlr_scene_buffer_set_corner_radii(buffer, src->corners);
|
||||
wlr_scene_buffer_set_buffer(buffer, src->buffer);
|
||||
copy = &buffer->node;
|
||||
break;
|
||||
@@ -3222,6 +3315,8 @@ unmaplayersurfacenotify(struct wl_listener *listener, void *data)
|
||||
wlr_scene_node_set_enabled(&l->scene->node, 0);
|
||||
if (l->layer_surface->output && (l->mon = l->layer_surface->output->data))
|
||||
arrangelayers(l->mon);
|
||||
+ if (l->mon && l->scene->node.parent == layers[LyrBg])
|
||||
+ wlr_scene_optimized_blur_mark_dirty(l->mon->blur);
|
||||
if (l->layer_surface->surface == seat->keyboard_state.focused_surface)
|
||||
focusclient(focustop(selmon), NULL, 1);
|
||||
motionnotify(0, NULL, 0, 0, 0, 0);
|
||||
@@ -3340,6 +3435,9 @@ updatemons(struct wl_listener *listener, void *data)
|
||||
wlr_scene_node_set_position(&m->fullscreen_bg->node, m->m.x, m->m.y);
|
||||
wlr_scene_rect_set_size(m->fullscreen_bg, m->m.width, m->m.height);
|
||||
|
||||
+ wlr_scene_node_set_position(&m->blur->node, m->m.x, m->m.y);
|
||||
+ wlr_scene_optimized_blur_set_size(m->blur, m->m.width, m->m.height);
|
||||
+
|
||||
if (m->lock_surface) {
|
||||
struct wlr_scene_tree *scene_tree = m->lock_surface->surface->data;
|
||||
wlr_scene_node_set_position(&scene_tree->node, m->m.x, m->m.y);
|
||||
--
|
||||
2.56.0
|
||||
|
||||
@@ -4,7 +4,8 @@ Swapfocus adds a new function on dwl: a shortcut to change the focus to the last
|
||||
- Alternatively: edit the patch and uncomment and comment out the lines instructed to keep the swapfocus shortcut from changing to another tag.
|
||||
|
||||
### Download
|
||||
- [v0.8](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/swapfocus/swapfocus.patch)
|
||||
- [2026-10-25](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/swapfocus/swapfocus.patch)
|
||||
- [v0.8](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/swapfocus/swapfocus-0.8.patch)
|
||||
|
||||
### Authors
|
||||
- [André Desgualdo Pereira](https://codeberg.org/Kana)
|
||||
|
||||
@@ -0,0 +1,154 @@
|
||||
From 364b9f20b830886b9c0e6539ddba2cc206a286eb Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andr=C3=A9=20Desgualdo=20Pereira?= <desgua@gmail.com>
|
||||
Date: Thu, 21 May 2026 09:50:03 -0300
|
||||
Subject: [PATCH] swapfocus patch
|
||||
|
||||
---
|
||||
config.def.h | 1 +
|
||||
dwl.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 91 insertions(+)
|
||||
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 8a6eda0..23e502d 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -132,6 +132,7 @@ static const Key keys[] = {
|
||||
{ MODKEY, XKB_KEY_Return, zoom, {0} },
|
||||
{ MODKEY, XKB_KEY_Tab, view, {0} },
|
||||
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_c, killclient, {0} },
|
||||
+ { MODKEY, XKB_KEY_s, swapfocus, {0} },
|
||||
{ MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} },
|
||||
{ MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} },
|
||||
{ MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} },
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index 101a45f..c512323 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -332,6 +332,7 @@ static void setsel(struct wl_listener *listener, void *data);
|
||||
static void setup(void);
|
||||
static void spawn(const Arg *arg);
|
||||
static void startdrag(struct wl_listener *listener, void *data);
|
||||
+static void swapfocus(const Arg *arg);
|
||||
static void tag(const Arg *arg);
|
||||
static void tagmon(const Arg *arg);
|
||||
static void tile(Monitor *m);
|
||||
@@ -375,6 +376,7 @@ static struct wlr_xdg_activation_v1 *activation;
|
||||
static struct wlr_xdg_decoration_manager_v1 *xdg_decoration_mgr;
|
||||
static struct wl_list clients; /* tiling order */
|
||||
static struct wl_list fstack; /* focus order */
|
||||
+static Client *prevclient = NULL;
|
||||
static struct wlr_idle_notifier_v1 *idle_notifier;
|
||||
static struct wlr_idle_inhibit_manager_v1 *idle_inhibit_mgr;
|
||||
static struct wlr_layer_shell_v1 *layer_shell;
|
||||
@@ -1330,6 +1332,8 @@ destroynotify(struct wl_listener *listener, void *data)
|
||||
{
|
||||
/* Called when the xdg_toplevel is destroyed. */
|
||||
Client *c = wl_container_of(listener, c, destroy);
|
||||
+ if (c == prevclient)
|
||||
+ prevclient = NULL;
|
||||
wl_list_remove(&c->destroy.link);
|
||||
wl_list_remove(&c->set_title.link);
|
||||
wl_list_remove(&c->fullscreen.link);
|
||||
@@ -1424,6 +1428,11 @@ focusclient(Client *c, int lift)
|
||||
wlr_xdg_popup_destroy(popup);
|
||||
}
|
||||
|
||||
+ /* Capture the client losing focus as the previous client */
|
||||
+ if (old_c && !client_is_unmanaged(old_c) && old_c != c) {
|
||||
+ prevclient = old_c;
|
||||
+ }
|
||||
+
|
||||
/* Put the new client atop the focus stack and select its monitor */
|
||||
if (c && !client_is_unmanaged(c)) {
|
||||
wl_list_remove(&c->flink);
|
||||
@@ -2679,6 +2688,87 @@ spawn(const Arg *arg)
|
||||
}
|
||||
}
|
||||
|
||||
+void
|
||||
+swapfocus(const Arg *arg)
|
||||
+{
|
||||
+ Client *c;
|
||||
+ int found = 0;
|
||||
+
|
||||
+ /* Verify the client still exists in the list of managed windows */
|
||||
+ if (prevclient) {
|
||||
+ wl_list_for_each(c, &clients, link) {
|
||||
+ if (c == prevclient) {
|
||||
+ found = 1;
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (found && !client_is_unmanaged(prevclient)) {
|
||||
+ /* Get the bitmask of currently visible tags on the prevclient's monitor */
|
||||
+ unsigned int visible_tags = prevclient->mon->tagset[prevclient->mon->seltags];
|
||||
+
|
||||
+ /* Check if the client's tags are currently visible */
|
||||
+ if (!(prevclient->tags & visible_tags)) {
|
||||
+ /* Tag is NOT visible: Switch tags and monitor only.
|
||||
+ * dwl's view() calls arrange(), which automatically focuses the
|
||||
+ * top-most window in the focus stack for that tag. */
|
||||
+ Arg a = {.ui = prevclient->tags};
|
||||
+ selmon = prevclient->mon;
|
||||
+ view(&a);
|
||||
+
|
||||
+ /* Comment out the 3 lines above and
|
||||
+ * uncommment the following lines
|
||||
+ * if changing tags isn't desired */
|
||||
+
|
||||
+// int current_tag_clients = 0;
|
||||
+// Client *tmp;
|
||||
+// wl_list_for_each(tmp, &clients, link) {
|
||||
+// /* Make sure it's on the current monitor, visible on the current tag, and mapped */
|
||||
+// if (tmp->mon == selmon && (tmp->tags & selmon->tagset[selmon->seltags]) && !client_is_unmanaged(tmp)) {
|
||||
+// current_tag_clients++;
|
||||
+// }
|
||||
+// }
|
||||
+//
|
||||
+// /* If there's more than 1 window here, mimic Mod+k instead of switching tags */
|
||||
+// if (current_tag_clients > 1) {
|
||||
+// Arg arg_focus = {.i = -1};
|
||||
+// focusstack(&arg_focus);
|
||||
+// }
|
||||
+
|
||||
+ /* End of not changing tags logic */
|
||||
+ } else {
|
||||
+ /* Tag IS visible: Just swap focus within the same view */
|
||||
+ focusclient(prevclient, 1);
|
||||
+ }
|
||||
+ } else {
|
||||
+ Arg a = {.ui = 0};
|
||||
+ selmon = prevclient->mon;
|
||||
+ view(&a);
|
||||
+
|
||||
+ /* Comment out the 3 lines above and
|
||||
+ * uncommment the following lines
|
||||
+ * if changing tags isn't desired */
|
||||
+
|
||||
+ /* use the following if changing tags isn't desired */
|
||||
+// int current_tag_clients = 0;
|
||||
+// Client *tmp;
|
||||
+// wl_list_for_each(tmp, &clients, link) {
|
||||
+// /* Make sure it's on the current monitor, visible on the current tag, and mapped */
|
||||
+// if (tmp->mon == selmon && (tmp->tags & selmon->tagset[selmon->seltags]) && !client_is_unmanaged(tmp)) {
|
||||
+// current_tag_clients++;
|
||||
+// }
|
||||
+// }
|
||||
+//
|
||||
+// /* If there's more than 1 window here, mimic Mod+k instead of switching tags */
|
||||
+// if (current_tag_clients > 1) {
|
||||
+// Arg arg_focus = {.i = -1};
|
||||
+// focusstack(&arg_focus);
|
||||
+// }
|
||||
+ /* end of not changing tags logic */
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
void
|
||||
startdrag(struct wl_listener *listener, void *data)
|
||||
{
|
||||
--
|
||||
2.53.0
|
||||
|
||||
@@ -1,15 +1,5 @@
|
||||
From 364b9f20b830886b9c0e6539ddba2cc206a286eb Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andr=C3=A9=20Desgualdo=20Pereira?= <desgua@gmail.com>
|
||||
Date: Thu, 21 May 2026 09:50:03 -0300
|
||||
Subject: [PATCH] swapfocus patch
|
||||
|
||||
---
|
||||
config.def.h | 1 +
|
||||
dwl.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 91 insertions(+)
|
||||
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 8a6eda0..23e502d 100644
|
||||
index a4019d3..02ee21c 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -132,6 +132,7 @@ static const Key keys[] = {
|
||||
@@ -21,18 +11,18 @@ index 8a6eda0..23e502d 100644
|
||||
{ MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} },
|
||||
{ MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} },
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index 101a45f..c512323 100644
|
||||
index d5f2f98..5e65cfa 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -332,6 +332,7 @@ static void setsel(struct wl_listener *listener, void *data);
|
||||
static void setup(void);
|
||||
@@ -362,6 +362,7 @@ static struct wlr_scene_node *snapshot(struct wlr_scene_node *node,
|
||||
struct wlr_scene_tree *parent, void *data);
|
||||
static void spawn(const Arg *arg);
|
||||
static void startdrag(struct wl_listener *listener, void *data);
|
||||
+static void swapfocus(const Arg *arg);
|
||||
static void tag(const Arg *arg);
|
||||
static void tagmon(const Arg *arg);
|
||||
static void tile(Monitor *m);
|
||||
@@ -375,6 +376,7 @@ static struct wlr_xdg_activation_v1 *activation;
|
||||
@@ -410,6 +411,7 @@ static struct wlr_xdg_activation_v1 *activation;
|
||||
static struct wlr_xdg_decoration_manager_v1 *xdg_decoration_mgr;
|
||||
static struct wl_list clients; /* tiling order */
|
||||
static struct wl_list fstack; /* focus order */
|
||||
@@ -40,7 +30,7 @@ index 101a45f..c512323 100644
|
||||
static struct wlr_idle_notifier_v1 *idle_notifier;
|
||||
static struct wlr_idle_inhibit_manager_v1 *idle_inhibit_mgr;
|
||||
static struct wlr_layer_shell_v1 *layer_shell;
|
||||
@@ -1330,6 +1332,8 @@ destroynotify(struct wl_listener *listener, void *data)
|
||||
@@ -1500,6 +1502,8 @@ destroynotify(struct wl_listener *listener, void *data)
|
||||
{
|
||||
/* Called when the xdg_toplevel is destroyed. */
|
||||
Client *c = wl_container_of(listener, c, destroy);
|
||||
@@ -49,7 +39,7 @@ index 101a45f..c512323 100644
|
||||
wl_list_remove(&c->destroy.link);
|
||||
wl_list_remove(&c->set_title.link);
|
||||
wl_list_remove(&c->fullscreen.link);
|
||||
@@ -1424,6 +1428,11 @@ focusclient(Client *c, int lift)
|
||||
@@ -1600,6 +1604,11 @@ focusclient(Client *c, LayerSurface *l, int lift)
|
||||
wlr_xdg_popup_destroy(popup);
|
||||
}
|
||||
|
||||
@@ -61,7 +51,7 @@ index 101a45f..c512323 100644
|
||||
/* Put the new client atop the focus stack and select its monitor */
|
||||
if (c && !client_is_unmanaged(c)) {
|
||||
wl_list_remove(&c->flink);
|
||||
@@ -2679,6 +2688,87 @@ spawn(const Arg *arg)
|
||||
@@ -3015,6 +3024,87 @@ spawn(const Arg *arg)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -116,7 +106,7 @@ index 101a45f..c512323 100644
|
||||
+ /* End of not changing tags logic */
|
||||
+ } else {
|
||||
+ /* Tag IS visible: Just swap focus within the same view */
|
||||
+ focusclient(prevclient, 1);
|
||||
+ focusclient(prevclient, NULL, 1);
|
||||
+ }
|
||||
+ } else {
|
||||
+ Arg a = {.ui = 0};
|
||||
@@ -149,6 +139,3 @@ index 101a45f..c512323 100644
|
||||
void
|
||||
startdrag(struct wl_listener *listener, void *data)
|
||||
{
|
||||
--
|
||||
2.53.0
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ Add a rule option to switch to the configured tag when a window opens, then swit
|
||||
|
||||
### Download
|
||||
- [git branch](https://codeberg.org/guidocella/dwl/src/branch/switchtotag)
|
||||
- [2026-09-16](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/switchtotag/switchtotag.patch)
|
||||
- [2026-10-20](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/switchtotag/switchtotag.patch)
|
||||
|
||||
### Authors
|
||||
- [Guido Cella](https://codeberg.org/guidocella)
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
From 2d466821072b6b3630169a784a10b0fe40666790 Mon Sep 17 00:00:00 2001
|
||||
From b636e766b42a75404ada4a5c39fd66221bb19b0b Mon Sep 17 00:00:00 2001
|
||||
From: Guido Cella <guido@guidocella.xyz>
|
||||
Date: Mon, 30 Sep 2024 08:40:25 +0200
|
||||
Date: Sun, 4 Oct 2026 10:22:14 +0200
|
||||
Subject: [PATCH] allow switching to the configured tag when a window opens
|
||||
|
||||
Add a rule option to switch to the configured tag when a window opens,
|
||||
then switch back when it closes.
|
||||
---
|
||||
config.def.h | 6 +++---
|
||||
dwl.c | 21 +++++++++++++++++----
|
||||
2 files changed, 20 insertions(+), 7 deletions(-)
|
||||
dwl.c | 13 +++++++++++++
|
||||
2 files changed, 16 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 13c5322..1e52d05 100644
|
||||
index a4019d3..ffb0d6a 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -22,9 +22,9 @@ static const float fullscreen_bg[] = {0.0f, 0.0f, 0.0f, 1.0f}; /* You ca
|
||||
@@ -28,10 +28,10 @@ index 13c5322..1e52d05 100644
|
||||
};
|
||||
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index f7bda0b..a58bd9a 100644
|
||||
index 7d8fc1e..8201d29 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -158,6 +158,7 @@ typedef struct {
|
||||
@@ -162,6 +162,7 @@ typedef struct {
|
||||
unsigned int bw;
|
||||
uint32_t tags;
|
||||
int isfloating, isurgent, isfullscreen;
|
||||
@@ -39,7 +39,7 @@ index f7bda0b..a58bd9a 100644
|
||||
} Client;
|
||||
|
||||
typedef struct {
|
||||
@@ -245,6 +246,7 @@ typedef struct {
|
||||
@@ -250,6 +251,7 @@ typedef struct {
|
||||
const char *id;
|
||||
const char *title;
|
||||
uint32_t tags;
|
||||
@@ -47,29 +47,11 @@ index f7bda0b..a58bd9a 100644
|
||||
int isfloating;
|
||||
int monitor;
|
||||
} Rule;
|
||||
@@ -260,7 +262,7 @@ typedef struct {
|
||||
|
||||
/* function declarations */
|
||||
static void applybounds(Client *c, struct wlr_box *bbox);
|
||||
-static void applyrules(Client *c);
|
||||
+static void applyrules(Client *c, bool map);
|
||||
static void arrange(Monitor *m);
|
||||
static void arrangelayer(Monitor *m, struct wl_list *list,
|
||||
struct wlr_box *usable_area, int exclusive);
|
||||
@@ -509,7 +511,7 @@ applybounds(Client *c, struct wlr_box *bbox)
|
||||
}
|
||||
|
||||
void
|
||||
-applyrules(Client *c)
|
||||
+applyrules(Client *c, bool map)
|
||||
{
|
||||
/* rule matching */
|
||||
const char *appid, *title;
|
||||
@@ -531,6 +533,11 @@ applyrules(Client *c)
|
||||
@@ -594,6 +596,11 @@ applyrules(Client *c)
|
||||
if (r->monitor == i++)
|
||||
mon = m;
|
||||
}
|
||||
+ if (r->switchtotag && map) {
|
||||
+ if (r->switchtotag && client_surface(c)->mapped) {
|
||||
+ c->switchtotag = selmon->tagset[selmon->seltags];
|
||||
+ mon->seltags ^= 1;
|
||||
+ mon->tagset[selmon->seltags] = r->tags & TAGMASK;
|
||||
@@ -77,28 +59,10 @@ index f7bda0b..a58bd9a 100644
|
||||
}
|
||||
}
|
||||
|
||||
@@ -952,7 +959,7 @@ commitnotify(struct wl_listener *listener, void *data)
|
||||
* a different monitor based on its title, this will likely select
|
||||
* a wrong monitor.
|
||||
*/
|
||||
- applyrules(c);
|
||||
+ applyrules(c, false);
|
||||
if (c->mon) {
|
||||
client_set_scale(client_surface(c), c->mon->wlr_output->scale);
|
||||
}
|
||||
@@ -1914,7 +1921,7 @@ mapnotify(struct wl_listener *listener, void *data)
|
||||
c->isfloating = 1;
|
||||
setmon(c, p->mon, p->tags);
|
||||
} else {
|
||||
- applyrules(c);
|
||||
+ applyrules(c, true);
|
||||
}
|
||||
printstatus();
|
||||
|
||||
@@ -3000,6 +3007,12 @@ unmapnotify(struct wl_listener *listener, void *data)
|
||||
wlr_scene_node_destroy(&c->image_capture_scene->tree.node);
|
||||
wlr_scene_node_destroy(&c->scene->node);
|
||||
client_surface(c)->data = NULL;
|
||||
@@ -3227,6 +3234,12 @@ unmapnotify(struct wl_listener *listener, void *data)
|
||||
c->snapshot = NULL;
|
||||
c->resize_serial = 0;
|
||||
c->current = (struct wlr_box){0};
|
||||
+
|
||||
+ if (c->switchtotag) {
|
||||
+ Arg a = { .ui = c->switchtotag };
|
||||
@@ -109,5 +73,5 @@ index f7bda0b..a58bd9a 100644
|
||||
motionnotify(0, NULL, 0, 0, 0, 0);
|
||||
}
|
||||
--
|
||||
2.55.0
|
||||
2.56.0
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ Hide the mouse cursor if it isn't being used for a certain period of time.
|
||||
|
||||
### Download
|
||||
- [git branch](https://codeberg.org/guidocella/dwl/src/branch/unclutter)
|
||||
- [2026-09-26](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/unclutter/unclutter.patch)
|
||||
- [2026-10-04](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/unclutter/unclutter.patch)
|
||||
|
||||
### Authors
|
||||
- [Guido Cella](https://github.com/guidocella)
|
||||
|
||||
+126
-102
@@ -1,12 +1,12 @@
|
||||
From 66537535757a3f0efe65a370f150506eb2a8d82f Mon Sep 17 00:00:00 2001
|
||||
From 7a5a1c34dd099c209fff3f4447a5a404af0f3f12 Mon Sep 17 00:00:00 2001
|
||||
From: Guido Cella <guido@guidocella.xyz>
|
||||
Date: Sat, 26 Sep 2026 12:28:50 +0200
|
||||
Date: Sun, 4 Oct 2026 22:48:42 +0200
|
||||
Subject: [PATCH] hide the mouse cursor when it isn't being used
|
||||
|
||||
---
|
||||
config.def.h | 2 ++
|
||||
dwl.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++-----
|
||||
2 files changed, 75 insertions(+), 7 deletions(-)
|
||||
config.def.h | 2 +
|
||||
dwl.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++----
|
||||
2 files changed, 99 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index a4019d3..fa640a1 100644
|
||||
@@ -22,19 +22,21 @@ index a4019d3..fa640a1 100644
|
||||
#define MODKEY WLR_MODIFIER_ALT
|
||||
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index ca97c30..7695341 100644
|
||||
index 216deb5..475733c 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -311,6 +311,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);
|
||||
@@ -374,6 +374,10 @@ static Monitor *xytomon(double x, double y);
|
||||
static void xytonode(double x, double y, struct wlr_surface **psurface,
|
||||
Client **pc, LayerSurface **pl, double *nx, double *ny);
|
||||
static void zoom(const Arg *arg);
|
||||
+static void cursorsurfacedestroy(struct wl_listener *listener, void *data);
|
||||
+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);
|
||||
@@ -414,6 +416,15 @@ static struct wlr_pointer_constraint_v1 *active_constraint;
|
||||
+static void trackcursorsurface(struct wlr_surface *surface);
|
||||
|
||||
/* variables */
|
||||
static pid_t child_pid = -1;
|
||||
@@ -414,6 +418,18 @@ static struct wlr_pointer_constraint_v1 *active_constraint;
|
||||
|
||||
static struct wlr_cursor *cursor;
|
||||
static struct wlr_xcursor_manager *cursor_mgr;
|
||||
@@ -45,12 +47,15 @@ index ca97c30..7695341 100644
|
||||
+ struct wlr_surface *surface;
|
||||
+ int hotspot_x;
|
||||
+ int hotspot_y;
|
||||
+} last_cursor;
|
||||
+ struct wl_listener surface_destroy;
|
||||
+} last_cursor = {
|
||||
+ .surface_destroy.notify = cursorsurfacedestroy,
|
||||
+};
|
||||
+
|
||||
|
||||
static struct wlr_scene_rect *root_bg;
|
||||
static struct wlr_session_lock_manager_v1 *session_lock_mgr;
|
||||
@@ -677,6 +688,7 @@ axisnotify(struct wl_listener *listener, void *data)
|
||||
@@ -676,6 +692,7 @@ axisnotify(struct wl_listener *listener, void *data)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,7 +63,7 @@ index ca97c30..7695341 100644
|
||||
/* Notify the client with pointer focus of the axis event. */
|
||||
wlr_seat_pointer_notify_axis(seat,
|
||||
event->time_msec, event->orientation, event->delta,
|
||||
@@ -694,6 +706,7 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
@@ -693,6 +710,7 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
const Button *b;
|
||||
|
||||
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
|
||||
@@ -66,10 +71,97 @@ index ca97c30..7695341 100644
|
||||
|
||||
switch (event->state) {
|
||||
case WL_POINTER_BUTTON_STATE_PRESSED:
|
||||
@@ -1696,6 +1709,42 @@ handlesig(int signo)
|
||||
quit(NULL);
|
||||
@@ -2067,6 +2085,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);
|
||||
+ handlecursoractivity();
|
||||
|
||||
/* Update selmon (even while dragging a window) */
|
||||
if (sloppyfocus)
|
||||
@@ -2101,7 +2120,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. */
|
||||
- if (!surface && !seat->drag)
|
||||
+ if (!surface && !seat->drag && !cursor_hidden)
|
||||
wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
|
||||
|
||||
pointerfocus(c, l, surface, sx, sy, time);
|
||||
@@ -2463,6 +2482,7 @@ run(char *startup_cmd)
|
||||
* monitor when displayed here */
|
||||
wlr_cursor_warp_closest(cursor, NULL, cursor->x, cursor->y);
|
||||
wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
|
||||
+ handlecursoractivity();
|
||||
|
||||
/* Run the Wayland event loop. This does not return until you exit the
|
||||
* compositor. Starting the backend rigged up all of the necessary event
|
||||
@@ -2486,9 +2506,16 @@ 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. */
|
||||
- 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;
|
||||
+ trackcursorsurface(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
|
||||
@@ -2500,9 +2527,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;
|
||||
+ trackcursorsurface(NULL);
|
||||
+
|
||||
+ if (!cursor_hidden)
|
||||
+ wlr_cursor_set_xcursor(cursor, cursor_mgr,
|
||||
+ wlr_cursor_shape_v1_name(event->shape));
|
||||
+ }
|
||||
}
|
||||
|
||||
void
|
||||
@@ -2802,6 +2834,8 @@ setup(void)
|
||||
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);
|
||||
|
||||
+ hide_source = wl_event_loop_add_timer(event_loop, hidecursor, cursor);
|
||||
+
|
||||
/*
|
||||
* Configures a seat, which is a single "seat" at which a user sits and
|
||||
* operates the computer. This conceptually includes up to one keyboard,
|
||||
@@ -3217,6 +3251,7 @@ virtualpointer(struct wl_listener *listener, void *data)
|
||||
if (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();
|
||||
}
|
||||
|
||||
Monitor *
|
||||
@@ -3281,6 +3316,61 @@ zoom(const Arg *arg)
|
||||
arrange(selmon);
|
||||
}
|
||||
|
||||
+void
|
||||
+cursorsurfacedestroy(struct wl_listener *listener, void *data)
|
||||
+{
|
||||
+ wl_list_remove(&listener->link);
|
||||
+ last_cursor.surface = NULL;
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+handlecursoractivity(void)
|
||||
+{
|
||||
@@ -83,9 +175,11 @@ index ca97c30..7695341 100644
|
||||
+ if (last_cursor.shape)
|
||||
+ wlr_cursor_set_xcursor(cursor, cursor_mgr,
|
||||
+ wlr_cursor_shape_v1_name(last_cursor.shape));
|
||||
+ else
|
||||
+ else if (last_cursor.surface)
|
||||
+ wlr_cursor_set_surface(cursor, last_cursor.surface,
|
||||
+ last_cursor.hotspot_x, last_cursor.hotspot_y);
|
||||
+ else
|
||||
+ wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
|
||||
+
|
||||
+ /* Note that calling the functions below instead of manually saving the last
|
||||
+ * cursor causes issues like making the cursor warp when clicking ReShade's
|
||||
@@ -106,89 +200,19 @@ index ca97c30..7695341 100644
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
void
|
||||
incnmaster(const Arg *arg)
|
||||
{
|
||||
@@ -2069,6 +2118,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);
|
||||
+ handlecursoractivity();
|
||||
|
||||
/* Update selmon (even while dragging a window) */
|
||||
if (sloppyfocus)
|
||||
@@ -2103,7 +2153,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. */
|
||||
- if (!surface && !seat->drag)
|
||||
+ if (!surface && !seat->drag && !cursor_hidden)
|
||||
wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
|
||||
|
||||
pointerfocus(c, l, surface, sx, sy, time);
|
||||
@@ -2465,6 +2515,7 @@ run(char *startup_cmd)
|
||||
* monitor when displayed here */
|
||||
wlr_cursor_warp_closest(cursor, NULL, cursor->x, cursor->y);
|
||||
wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
|
||||
+ handlecursoractivity();
|
||||
|
||||
/* Run the Wayland event loop. This does not return until you exit the
|
||||
* compositor. Starting the backend rigged up all of the necessary event
|
||||
@@ -2488,9 +2539,16 @@ 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. */
|
||||
- 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;
|
||||
+void
|
||||
+trackcursorsurface(struct wlr_surface *surface)
|
||||
+{
|
||||
+ if (last_cursor.surface)
|
||||
+ wl_list_remove(&last_cursor.surface_destroy.link);
|
||||
+ last_cursor.surface = surface;
|
||||
+ if (surface)
|
||||
+ wl_signal_add(&surface->events.destroy, &last_cursor.surface_destroy);
|
||||
+}
|
||||
+
|
||||
+ if (!cursor_hidden)
|
||||
+ wlr_cursor_set_surface(cursor, event->surface,
|
||||
+ event->hotspot_x, event->hotspot_y);
|
||||
+ }
|
||||
}
|
||||
|
||||
#ifdef XWAYLAND
|
||||
void
|
||||
@@ -2502,9 +2560,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
|
||||
@@ -2804,6 +2867,8 @@ setup(void)
|
||||
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);
|
||||
|
||||
+ hide_source = wl_event_loop_add_timer(event_loop, hidecursor, cursor);
|
||||
+
|
||||
/*
|
||||
* Configures a seat, which is a single "seat" at which a user sits and
|
||||
* operates the computer. This conceptually includes up to one keyboard,
|
||||
@@ -3219,6 +3284,7 @@ virtualpointer(struct wl_listener *listener, void *data)
|
||||
if (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();
|
||||
}
|
||||
|
||||
Monitor *
|
||||
activatex11(struct wl_listener *listener, void *data)
|
||||
--
|
||||
2.55.0
|
||||
2.56.0
|
||||
|
||||
|
||||
@@ -1,113 +0,0 @@
|
||||
### Description
|
||||
|
||||
Implement https://github.com/wlrfx/scenefx
|
||||
|
||||
```c
|
||||
/* available options */
|
||||
|
||||
static const int opacity = 0; /* flag to enable opacity */
|
||||
static const float opacity_inactive = 0.5;
|
||||
static const float opacity_active = 1.0;
|
||||
|
||||
static const int shadow = 1; /* flag to enable shadow */
|
||||
static const int shadow_only_floating = 0; /* only apply shadow to floating windows */
|
||||
static const float shadow_color[4] = COLOR(0x0000FFff);
|
||||
static const float shadow_color_focus[4] = COLOR(0xFF0000ff);
|
||||
static const int shadow_blur_sigma = 20;
|
||||
static const int shadow_blur_sigma_focus = 40;
|
||||
static const char *const shadow_ignore_list[] = { NULL }; /* list of app-id to ignore */
|
||||
|
||||
static const int corner_radius = 8; /* 0 disables corner_radius */
|
||||
static const int corner_radius_inner = 8; /* 0 disables corner_radius */
|
||||
static const int corner_radius_only_floating = 0; /* only apply corner_radius and corner_radius_inner to floating windows */
|
||||
|
||||
static const int blur = 1; /* flag to enable blur */
|
||||
static const int blur_xray = 0; /* flag to make transparent fs and floating windows display your background */
|
||||
static const int blur_ignore_transparent = 1;
|
||||
static const struct blur_data blur_data = {
|
||||
.radius = 5,
|
||||
.num_passes = 3,
|
||||
.noise = (float)0.02,
|
||||
.brightness = (float)0.9,
|
||||
.contrast = (float)0.9,
|
||||
.saturation = (float)1.1,
|
||||
};
|
||||
```
|
||||
|
||||
> **NOTE:** If you are using nix with flakes, scenefx has a flake for scenefx https://github.com/wlrfx/scenefx/blob/main/flake.nix
|
||||
|
||||
> **NOTE:** Blur doesn't work on windows with opacity set (opacity_active, opacity_inactive)
|
||||
|
||||
> **NOTE:** In DWL's Makefile `scenefx-0.2` must be placed before `wlroots-0.18`, e.g. `PKGS = scenefx-0.2 wlroots-0.18 wayland-server ...`
|
||||
|
||||
<details>
|
||||
<summary>Preview</summary>
|
||||
<pre>
|
||||
<img src="https://i.imgur.com/nJIX6lp.png"/>
|
||||
</pre>
|
||||
</details>
|
||||
|
||||
### Download
|
||||
|
||||
- [git branch](https://codeberg.org/wochap/dwl/src/branch/v0.8-a/scenefx-b)
|
||||
|
||||
- [0.8-dev](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/scenefx/scenefx.patch)
|
||||
|
||||
**NOTE:** This patch was tested with the `87c0e8b6d5c86557a800445e8e4c322f387fe19c` commit on the `main` branch of `SceneFX`. It supports rounded borders, blur, and shadows. However, it does not add rounded borders or shadows to Xwayland apps. That said, Xwayland apps can have shadows, and they might also support rounded borders, but I was never able to make it work. PRs are welcome!
|
||||
|
||||
**IMPORTANT:** This patch requires you to build DWL with the following dependencies
|
||||
|
||||
- **scenefx**
|
||||
- libGL
|
||||
|
||||
- [2024-07-09](https://codeberg.org/dwl/dwl-patches/raw/commit/13d96b51b54500dd24544cf3a73c61b7a1414bc6/patches/scenefx/scenefx.patch)
|
||||
|
||||
**IMPORTANT:** This patch only works with the `2ec3505248e819191c37cb831197629f373326fb` commit on the `main` branch of `scenefx`, therefore, it does not support **blur**.
|
||||
|
||||
**IMPORTANT:** This patch requires you to build DWL with the following dependencies
|
||||
|
||||
- **scenefx**
|
||||
- libGL
|
||||
|
||||
<details>
|
||||
<summary>Preview</summary>
|
||||
<pre>
|
||||
<img src="https://i.imgur.com/4kFhSaS.png"/>
|
||||
<img src="https://i.imgur.com/9ZQAUXx.png"/>
|
||||
</pre>
|
||||
</details>
|
||||
|
||||
- [2024-04-11](https://codeberg.org/dwl/dwl-patches/raw/commit/6e3a57ffd16dafa31900b7e89e51672bd7bcc1e8/scenefx/scenefx.patch)
|
||||
|
||||
**IMPORTANT:** This patch only works with the `de4ec10e1ff9347b5833f00f8615d760d9378c99` commit on the `wlr_scene_blur` branch of `scenefx`, as it adds support for **blur**.
|
||||
|
||||
**IMPORTANT:** This patch requires you to build DWL with the dependencies of WLROOTS:
|
||||
|
||||
- **scenefx**
|
||||
- libGL
|
||||
- libcap
|
||||
- libinput
|
||||
- libpng
|
||||
- libxkbcommon
|
||||
- mesa
|
||||
- pixman
|
||||
- seatd
|
||||
- vulkan-loader
|
||||
- wayland
|
||||
- wayland-protocols
|
||||
- xorg.libX11
|
||||
- xorg.xcbutilerrors
|
||||
- xorg.xcbutilimage
|
||||
- xorg.xcbutilrenderutil
|
||||
- xorg.xcbutilwm
|
||||
- xwayland (optional)
|
||||
- ffmpeg
|
||||
- hwdata
|
||||
- libliftoff
|
||||
- libdisplay-info
|
||||
|
||||
- [v0.5](https://codeberg.org/dwl/dwl-patches/raw/commit/7a5c3420822074c544fa102e030b7c30aa6b6be8/scenefx/scenefx.patch)
|
||||
|
||||
### Authors
|
||||
|
||||
- [wochap](https://codeberg.org/wochap)
|
||||
@@ -1,700 +0,0 @@
|
||||
From d209aeaee541a045de9dba2154bbbd5475bba2ec Mon Sep 17 00:00:00 2001
|
||||
From: wochap <gean.marroquin@gmail.com>
|
||||
Date: Sun, 9 Mar 2025 17:26:07 -0500
|
||||
Subject: [PATCH] implement scenefx
|
||||
|
||||
---
|
||||
Makefile | 2 +-
|
||||
client.h | 18 +++
|
||||
config.def.h | 30 +++-
|
||||
dwl.c | 414 ++++++++++++++++++++++++++++++++++++++++++++++++++-
|
||||
4 files changed, 457 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 3358bae..8dc79bd 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -12,7 +12,7 @@ DWLDEVCFLAGS = -g -pedantic -Wall -Wextra -Wdeclaration-after-statement \
|
||||
-Wfloat-conversion
|
||||
|
||||
# CFLAGS / LDFLAGS
|
||||
-PKGS = wlroots-0.18 wayland-server xkbcommon libinput $(XLIBS)
|
||||
+PKGS = scenefx-0.2 wlroots-0.18 wayland-server xkbcommon libinput $(XLIBS)
|
||||
DWLCFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` $(DWLCPPFLAGS) $(DWLDEVCFLAGS) $(CFLAGS)
|
||||
LDLIBS = `$(PKG_CONFIG) --libs $(PKGS)` -lm $(LIBS)
|
||||
|
||||
diff --git a/client.h b/client.h
|
||||
index 42f225f..4e8f016 100644
|
||||
--- a/client.h
|
||||
+++ b/client.h
|
||||
@@ -147,6 +147,13 @@ client_get_clip(Client *c, struct wlr_box *clip)
|
||||
return;
|
||||
#endif
|
||||
|
||||
+ *clip = (struct wlr_box){
|
||||
+ .x = c->bw,
|
||||
+ .y = c->bw,
|
||||
+ .width = c->geom.width - c->bw * 2,
|
||||
+ .height = c->geom.height - c->bw * 2,
|
||||
+ };
|
||||
+
|
||||
wlr_xdg_surface_get_geometry(c->surface.xdg, &xdg_geom);
|
||||
clip->x = xdg_geom.x;
|
||||
clip->y = xdg_geom.y;
|
||||
@@ -328,6 +335,17 @@ static inline void
|
||||
client_set_border_color(Client *c, const float color[static 4])
|
||||
{
|
||||
int i;
|
||||
+
|
||||
+#ifdef XWAYLAND
|
||||
+ if (!client_is_x11(c)) {
|
||||
+#endif
|
||||
+ if (corner_radius > 0) {
|
||||
+ return;
|
||||
+ }
|
||||
+#ifdef XWAYLAND
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
for (i = 0; i < 4; i++)
|
||||
wlr_scene_rect_set_color(c->border[i], color);
|
||||
}
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 22d2171..8c50932 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -12,7 +12,35 @@ static const float bordercolor[] = COLOR(0x444444ff);
|
||||
static const float focuscolor[] = COLOR(0x005577ff);
|
||||
static const float urgentcolor[] = COLOR(0xff0000ff);
|
||||
/* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */
|
||||
-static const float fullscreen_bg[] = {0.1f, 0.1f, 0.1f, 1.0f}; /* You can also use glsl colors */
|
||||
+static const float fullscreen_bg[] = {0.1f, 0.1f, 0.1f, 0.0f}; /* You can also use glsl colors */
|
||||
+
|
||||
+static const int opacity = 0; /* flag to enable opacity */
|
||||
+static const float opacity_inactive = 0.5;
|
||||
+static const float opacity_active = 1.0;
|
||||
+
|
||||
+static const int shadow = 1; /* flag to enable shadow */
|
||||
+static const int shadow_only_floating = 0; /* only apply shadow to floating windows */
|
||||
+static const float shadow_color[4] = COLOR(0x0000FFff);
|
||||
+static const float shadow_color_focus[4] = COLOR(0xFF0000ff);
|
||||
+static const int shadow_blur_sigma = 20;
|
||||
+static const int shadow_blur_sigma_focus = 40;
|
||||
+static const char *const shadow_ignore_list[] = { NULL }; /* list of app-id to ignore */
|
||||
+
|
||||
+static const int corner_radius = 8; /* 0 disables corner_radius */
|
||||
+static const int corner_radius_inner = 9; /* 0 disables corner_radius */
|
||||
+static const int corner_radius_only_floating = 0; /* only apply corner_radius and corner_radius_inner to floating windows */
|
||||
+
|
||||
+static const int blur = 1; /* flag to enable blur */
|
||||
+static const int blur_xray = 0; /* flag to make transparent fs and floating windows display your background */
|
||||
+static const int blur_ignore_transparent = 1;
|
||||
+static const struct blur_data blur_data = {
|
||||
+ .radius = 5,
|
||||
+ .num_passes = 3,
|
||||
+ .noise = (float)0.02,
|
||||
+ .brightness = (float)0.9,
|
||||
+ .contrast = (float)0.9,
|
||||
+ .saturation = (float)1.1,
|
||||
+};
|
||||
|
||||
/* tagging - TAGCOUNT must be no greater than 31 */
|
||||
#define TAGCOUNT (9)
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index 5bf995e..655e175 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -10,8 +10,14 @@
|
||||
#include <stdlib.h>
|
||||
#include <sys/wait.h>
|
||||
#include <time.h>
|
||||
+#include <scenefx/render/fx_renderer/fx_renderer.h>
|
||||
+#include <scenefx/types/fx/blur_data.h>
|
||||
+#include <scenefx/types/fx/clipped_region.h>
|
||||
+#include <scenefx/types/fx/corner_location.h>
|
||||
+#include <scenefx/types/wlr_scene.h>
|
||||
#include <unistd.h>
|
||||
#include <wayland-server-core.h>
|
||||
+#include <wayland-util.h>
|
||||
#include <wlr/backend.h>
|
||||
#include <wlr/backend/libinput.h>
|
||||
#include <wlr/render/allocator.h>
|
||||
@@ -43,7 +49,6 @@
|
||||
#include <wlr/types/wlr_primary_selection.h>
|
||||
#include <wlr/types/wlr_primary_selection_v1.h>
|
||||
#include <wlr/types/wlr_relative_pointer_v1.h>
|
||||
-#include <wlr/types/wlr_scene.h>
|
||||
#include <wlr/types/wlr_screencopy_v1.h>
|
||||
#include <wlr/types/wlr_seat.h>
|
||||
#include <wlr/types/wlr_server_decoration.h>
|
||||
@@ -83,7 +88,7 @@
|
||||
/* enums */
|
||||
enum { CurNormal, CurPressed, CurMove, CurResize }; /* cursor */
|
||||
enum { XDGShell, LayerShell, X11 }; /* client types */
|
||||
-enum { LyrBg, LyrBottom, LyrTile, LyrFloat, LyrTop, LyrFS, LyrOverlay, LyrBlock, NUM_LAYERS }; /* scene layers */
|
||||
+enum { LyrBg, LyrBlur, LyrBottom, LyrTile, LyrFloat, LyrTop, LyrFS, LyrOverlay, LyrBlock, NUM_LAYERS }; /* scene layers */
|
||||
#ifdef XWAYLAND
|
||||
enum { NetWMWindowTypeDialog, NetWMWindowTypeSplash, NetWMWindowTypeToolbar,
|
||||
NetWMWindowTypeUtility, NetLast }; /* EWMH atoms */
|
||||
@@ -141,6 +146,12 @@ typedef struct {
|
||||
uint32_t tags;
|
||||
int isfloating, isurgent, isfullscreen;
|
||||
uint32_t resize; /* configure serial of a pending resize */
|
||||
+
|
||||
+ float opacity;
|
||||
+ int corner_radius;
|
||||
+ struct wlr_scene_shadow *shadow;
|
||||
+ int has_shadow_enabled;
|
||||
+ struct wlr_scene_rect *round_border;
|
||||
} Client;
|
||||
|
||||
typedef struct {
|
||||
@@ -208,6 +219,7 @@ struct Monitor {
|
||||
int nmaster;
|
||||
char ltsymbol[16];
|
||||
int asleep;
|
||||
+ struct wlr_scene_optimized_blur *blur_layer;
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
@@ -355,6 +367,18 @@ static Monitor *xytomon(double x, double y);
|
||||
static void xytonode(double x, double y, struct wlr_surface **psurface,
|
||||
Client **pc, LayerSurface **pl, double *nx, double *ny);
|
||||
static void zoom(const Arg *arg);
|
||||
+static void iter_xdg_scene_buffers(struct wlr_scene_buffer *buffer, int sx, int sy, void *user_data);
|
||||
+static void iter_xdg_scene_buffers_blur(struct wlr_scene_buffer *buffer, int sx, int sy, void *user_data);
|
||||
+static void iter_xdg_scene_buffers_opacity(struct wlr_scene_buffer *buffer, int sx, int sy, void *user_data);
|
||||
+static void iter_xdg_scene_buffers_corner_radius(struct wlr_scene_buffer *buffer, int sx, int sy, void *user_data);
|
||||
+static void output_configure_scene(struct wlr_scene_node *node, Client *c);
|
||||
+static int in_shadow_ignore_list(const char *str);
|
||||
+static void client_set_shadow_blur_sigma(Client *c, int blur_sigma);
|
||||
+static void update_client_corner_radius(Client *c);
|
||||
+static void update_client_shadow_color(Client *c);
|
||||
+static void update_client_focus_decorations(Client *c, int focused, int urgent);
|
||||
+static void update_client_blur(Client *c);
|
||||
+static void update_buffer_corner_radius(Client *c, struct wlr_scene_buffer *buffer);
|
||||
|
||||
/* variables */
|
||||
static const char broken[] = "broken";
|
||||
@@ -413,6 +437,8 @@ static struct wlr_box sgeom;
|
||||
static struct wl_list mons;
|
||||
static Monitor *selmon;
|
||||
|
||||
+static float transparent[4] = {0.1f, 0.1f, 0.1f, 0.0f};
|
||||
+
|
||||
#ifdef XWAYLAND
|
||||
static void activatex11(struct wl_listener *listener, void *data);
|
||||
static void associatex11(struct wl_listener *listener, void *data);
|
||||
@@ -499,6 +525,10 @@ arrange(Monitor *m)
|
||||
wlr_scene_node_set_enabled(&m->fullscreen_bg->node,
|
||||
(c = focustop(m)) && c->isfullscreen);
|
||||
|
||||
+ if (blur) {
|
||||
+ wlr_scene_node_set_enabled(&m->blur_layer->node, 1);
|
||||
+ }
|
||||
+
|
||||
strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, LENGTH(m->ltsymbol));
|
||||
|
||||
/* We move all clients (except fullscreen and unmanaged) to LyrTile while
|
||||
@@ -722,6 +752,11 @@ cleanupmon(struct wl_listener *listener, void *data)
|
||||
|
||||
closemon(m);
|
||||
wlr_scene_node_destroy(&m->fullscreen_bg->node);
|
||||
+
|
||||
+ if (blur) {
|
||||
+ wlr_scene_node_destroy(&m->blur_layer->node);
|
||||
+ }
|
||||
+
|
||||
free(m);
|
||||
}
|
||||
|
||||
@@ -785,6 +820,18 @@ commitlayersurfacenotify(struct wl_listener *listener, void *data)
|
||||
}
|
||||
|
||||
arrangelayers(l->mon);
|
||||
+
|
||||
+ if (blur) {
|
||||
+ // Rerender the optimized blur on change
|
||||
+ struct wlr_layer_surface_v1 *wlr_layer_surface = l->layer_surface;
|
||||
+ if (wlr_layer_surface->current.layer ==
|
||||
+ ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND ||
|
||||
+ wlr_layer_surface->current.layer == ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM) {
|
||||
+ if (l->mon) {
|
||||
+ wlr_scene_optimized_blur_mark_dirty(l->mon->blur_layer);
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
|
||||
void
|
||||
@@ -1036,6 +1083,12 @@ createmon(struct wl_listener *listener, void *data)
|
||||
m->fullscreen_bg = wlr_scene_rect_create(layers[LyrFS], 0, 0, fullscreen_bg);
|
||||
wlr_scene_node_set_enabled(&m->fullscreen_bg->node, 0);
|
||||
|
||||
+ if (blur) {
|
||||
+ m->blur_layer = wlr_scene_optimized_blur_create(&scene->tree, 0, 0);
|
||||
+ wlr_scene_node_reparent(&m->blur_layer->node, layers[LyrBlur]);
|
||||
+ wlr_scene_node_set_enabled(&m->blur_layer->node, 0);
|
||||
+ }
|
||||
+
|
||||
/* Adds this to the output layout in the order it was configured.
|
||||
*
|
||||
* The output layout utility automatically adds a wl_output global to the
|
||||
@@ -1061,6 +1114,9 @@ createnotify(struct wl_listener *listener, void *data)
|
||||
c->surface.xdg = toplevel->base;
|
||||
c->bw = borderpx;
|
||||
|
||||
+ c->opacity = opacity;
|
||||
+ c->corner_radius = corner_radius;
|
||||
+
|
||||
LISTEN(&toplevel->base->surface->events.commit, &c->commit, commitnotify);
|
||||
LISTEN(&toplevel->base->surface->events.map, &c->map, mapnotify);
|
||||
LISTEN(&toplevel->base->surface->events.unmap, &c->unmap, unmapnotify);
|
||||
@@ -1369,8 +1425,11 @@ focusclient(Client *c, int lift)
|
||||
|
||||
/* Don't change border color if there is an exclusive focus or we are
|
||||
* handling a drag operation */
|
||||
- if (!exclusive_focus && !seat->drag)
|
||||
+ if (!exclusive_focus && !seat->drag) {
|
||||
client_set_border_color(c, focuscolor);
|
||||
+
|
||||
+ update_client_focus_decorations(c, 1, 0);
|
||||
+ }
|
||||
}
|
||||
|
||||
/* Deactivate old client if focus is changing */
|
||||
@@ -1389,6 +1448,8 @@ focusclient(Client *c, int lift)
|
||||
} else if (old_c && !client_is_unmanaged(old_c) && (!c || !client_wants_focus(c))) {
|
||||
client_set_border_color(old_c, bordercolor);
|
||||
|
||||
+ update_client_focus_decorations(old_c, 0, 0);
|
||||
+
|
||||
client_activate_surface(old, 0);
|
||||
}
|
||||
}
|
||||
@@ -1718,6 +1779,38 @@ mapnotify(struct wl_listener *listener, void *data)
|
||||
c->border[i]->node.data = c;
|
||||
}
|
||||
|
||||
+ wlr_scene_node_for_each_buffer(&c->scene_surface->node, iter_xdg_scene_buffers, c);
|
||||
+
|
||||
+#ifdef XWAYLAND
|
||||
+ if (!client_is_x11(c)) {
|
||||
+#endif
|
||||
+ if (corner_radius > 0) {
|
||||
+ c->round_border = wlr_scene_rect_create(c->scene, 0, 0, c->isurgent ? urgentcolor : bordercolor);
|
||||
+ c->round_border->node.data = c;
|
||||
+ /* Lower the border below the XDG scene tree */
|
||||
+ wlr_scene_node_lower_to_bottom(&c->round_border->node);
|
||||
+
|
||||
+ /* hide original border */
|
||||
+ for (i = 0; i < 4; i++) {
|
||||
+ wlr_scene_rect_set_color(c->border[i], transparent);
|
||||
+ }
|
||||
+ }
|
||||
+#ifdef XWAYLAND
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
+#ifdef XWAYLAND
|
||||
+ if (!client_is_x11(c)) {
|
||||
+#endif
|
||||
+ if (shadow) {
|
||||
+ c->shadow = wlr_scene_shadow_create(c->scene, 0, 0, c->corner_radius, shadow_blur_sigma, shadow_color);
|
||||
+ /* Lower the shadow below the border */
|
||||
+ wlr_scene_node_lower_to_bottom(&c->shadow->node);
|
||||
+ }
|
||||
+#ifdef XWAYLAND
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
/* Initialize client geometry with room for border */
|
||||
client_set_tiled(c, WLR_EDGE_TOP | WLR_EDGE_BOTTOM | WLR_EDGE_LEFT | WLR_EDGE_RIGHT);
|
||||
c->geom.width += 2 * c->bw;
|
||||
@@ -1739,6 +1832,13 @@ mapnotify(struct wl_listener *listener, void *data)
|
||||
}
|
||||
printstatus();
|
||||
|
||||
+ /* TODO: shouldn't we call iter_xdg_scene_buffers_corner_radius? */
|
||||
+ update_client_corner_radius(c);
|
||||
+
|
||||
+ update_client_shadow_color(c);
|
||||
+
|
||||
+ update_client_blur(c);
|
||||
+
|
||||
unset_fullscreen:
|
||||
m = c->mon ? c->mon : xytomon(c->geom.x, c->geom.y);
|
||||
wl_list_for_each(w, &clients, link) {
|
||||
@@ -2113,6 +2213,8 @@ rendermon(struct wl_listener *listener, void *data)
|
||||
goto skip;
|
||||
}
|
||||
|
||||
+ output_configure_scene(&m->scene_output->scene->tree.node, NULL);
|
||||
+
|
||||
/*
|
||||
* HACK: The "correct" way to set the gamma is to commit it together with
|
||||
* the rest of the state in one go, but to do that we would need to rewrite
|
||||
@@ -2207,6 +2309,21 @@ resize(Client *c, struct wlr_box geo, int interact)
|
||||
c->geom.height - 2 * c->bw);
|
||||
client_get_clip(c, &clip);
|
||||
wlr_scene_subsurface_tree_set_clip(&c->scene_surface->node, &clip);
|
||||
+
|
||||
+ if (corner_radius > 0 && c->round_border) {
|
||||
+ wlr_scene_node_set_position(&c->round_border->node, 0, 0);
|
||||
+ wlr_scene_rect_set_size(c->round_border, c->geom.width, c->geom.height);
|
||||
+ wlr_scene_rect_set_clipped_region(c->round_border, (struct clipped_region) {
|
||||
+ .corner_radius = c->corner_radius,
|
||||
+ .corners = CORNER_LOCATION_ALL,
|
||||
+ .area = { c->bw, c->bw, c->geom.width - c->bw * 2, c->geom.height - c->bw * 2 }
|
||||
+ });
|
||||
+ }
|
||||
+
|
||||
+ if (shadow && c->shadow) {
|
||||
+ /* TODO: shouldn't we call wlr_scene_shadow_set_blur_sigma? */
|
||||
+ client_set_shadow_blur_sigma(c, (int)round(c->shadow->blur_sigma));
|
||||
+ }
|
||||
}
|
||||
|
||||
void
|
||||
@@ -2307,6 +2424,13 @@ setfloating(Client *c, int floating)
|
||||
{
|
||||
Client *p = client_get_parent(c);
|
||||
c->isfloating = floating;
|
||||
+
|
||||
+ update_client_corner_radius(c);
|
||||
+
|
||||
+ update_client_shadow_color(c);
|
||||
+
|
||||
+ update_client_blur(c);
|
||||
+
|
||||
/* If in floating layout do not change the client's layer */
|
||||
if (!c->mon || !client_surface(c)->mapped || !c->mon->lt[c->mon->sellt]->arrange)
|
||||
return;
|
||||
@@ -2336,6 +2460,13 @@ setfullscreen(Client *c, int fullscreen)
|
||||
* client positions are set by the user and cannot be recalculated */
|
||||
resize(c, c->prev, 0);
|
||||
}
|
||||
+
|
||||
+ update_client_corner_radius(c);
|
||||
+
|
||||
+ update_client_shadow_color(c);
|
||||
+
|
||||
+ update_client_blur(c);
|
||||
+
|
||||
arrange(c->mon);
|
||||
printstatus();
|
||||
}
|
||||
@@ -2457,11 +2588,15 @@ setup(void)
|
||||
drag_icon = wlr_scene_tree_create(&scene->tree);
|
||||
wlr_scene_node_place_below(&drag_icon->node, &layers[LyrBlock]->node);
|
||||
|
||||
+ if (blur) {
|
||||
+ wlr_scene_set_blur_data(scene, blur_data);
|
||||
+ }
|
||||
+
|
||||
/* Autocreates a renderer, either Pixman, GLES2 or Vulkan for us. The user
|
||||
* can also specify a renderer using the WLR_RENDERER env var.
|
||||
* The renderer is responsible for defining the various pixel formats it
|
||||
* supports for shared memory, this configures that for clients. */
|
||||
- if (!(drw = wlr_renderer_autocreate(backend)))
|
||||
+ if (!(drw = fx_renderer_create(backend)))
|
||||
die("couldn't create renderer");
|
||||
LISTEN_STATIC(&drw->events.lost, gpureset);
|
||||
|
||||
@@ -2870,6 +3005,10 @@ updatemons(struct wl_listener *listener, void *data)
|
||||
|
||||
wlr_scene_node_set_position(&m->fullscreen_bg->node, m->m.x, m->m.y);
|
||||
wlr_scene_rect_set_size(m->fullscreen_bg, m->m.width, m->m.height);
|
||||
+
|
||||
+ if (blur) {
|
||||
+ wlr_scene_optimized_blur_set_size(m->blur_layer, m->m.width, m->m.height);
|
||||
+ }
|
||||
|
||||
if (m->lock_surface) {
|
||||
struct wlr_scene_tree *scene_tree = m->lock_surface->surface->data;
|
||||
@@ -2940,8 +3079,11 @@ urgent(struct wl_listener *listener, void *data)
|
||||
c->isurgent = 1;
|
||||
printstatus();
|
||||
|
||||
- if (client_surface(c)->mapped)
|
||||
+ if (client_surface(c)->mapped) {
|
||||
client_set_border_color(c, urgentcolor);
|
||||
+
|
||||
+ update_client_focus_decorations(c, 1, 1);
|
||||
+ }
|
||||
}
|
||||
|
||||
void
|
||||
@@ -3053,6 +3195,268 @@ zoom(const Arg *arg)
|
||||
arrange(selmon);
|
||||
}
|
||||
|
||||
+void
|
||||
+iter_xdg_scene_buffers(struct wlr_scene_buffer *buffer, int sx, int sy, void *user_data)
|
||||
+{
|
||||
+ Client *c = user_data;
|
||||
+ struct wlr_scene_surface * scene_surface = wlr_scene_surface_try_from_buffer(buffer);
|
||||
+ struct wlr_xdg_surface *xdg_surface;
|
||||
+
|
||||
+ if (!scene_surface) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ xdg_surface = wlr_xdg_surface_try_from_wlr_surface(scene_surface->surface);
|
||||
+
|
||||
+ if (c && xdg_surface && xdg_surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
|
||||
+ /* TODO: Be able to set whole decoration_data instead of calling */
|
||||
+ /* each individually? */
|
||||
+ if (opacity) {
|
||||
+ wlr_scene_buffer_set_opacity(buffer, c->opacity);
|
||||
+ }
|
||||
+
|
||||
+ if (!wlr_subsurface_try_from_wlr_surface(xdg_surface->surface)) {
|
||||
+ update_buffer_corner_radius(c, buffer);
|
||||
+
|
||||
+ if (blur) {
|
||||
+ int blur_optimized = !c->isfloating || blur_xray;
|
||||
+ wlr_scene_buffer_set_backdrop_blur(buffer, 1);
|
||||
+ wlr_scene_buffer_set_backdrop_blur_optimized(buffer, blur_optimized);
|
||||
+ wlr_scene_buffer_set_backdrop_blur_ignore_transparent(buffer, blur_ignore_transparent);
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+iter_xdg_scene_buffers_blur(struct wlr_scene_buffer *buffer, int sx, int sy, void *user_data)
|
||||
+{
|
||||
+ Client *c = user_data;
|
||||
+ struct wlr_scene_surface * scene_surface = wlr_scene_surface_try_from_buffer(buffer);
|
||||
+ struct wlr_xdg_surface *xdg_surface;
|
||||
+
|
||||
+ if (!scene_surface) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ xdg_surface = wlr_xdg_surface_try_from_wlr_surface(scene_surface->surface);
|
||||
+
|
||||
+ if (c && xdg_surface && xdg_surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
|
||||
+ if (!wlr_subsurface_try_from_wlr_surface(xdg_surface->surface)) {
|
||||
+ if (blur) {
|
||||
+ int blur_optimized = !c->isfloating || blur_xray;
|
||||
+ wlr_scene_buffer_set_backdrop_blur_optimized(buffer, blur_optimized);
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+iter_xdg_scene_buffers_opacity(struct wlr_scene_buffer *buffer, int sx, int sy, void *user_data)
|
||||
+{
|
||||
+ Client *c = user_data;
|
||||
+ struct wlr_scene_surface * scene_surface = wlr_scene_surface_try_from_buffer(buffer);
|
||||
+ struct wlr_xdg_surface *xdg_surface;
|
||||
+
|
||||
+ if (!scene_surface) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ xdg_surface = wlr_xdg_surface_try_from_wlr_surface(scene_surface->surface);
|
||||
+
|
||||
+ if (c && xdg_surface && xdg_surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
|
||||
+ /* TODO: Be able to set whole decoration_data instead of calling */
|
||||
+ /* each individually? */
|
||||
+ if (opacity) {
|
||||
+ wlr_scene_buffer_set_opacity(buffer, c->opacity);
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+iter_xdg_scene_buffers_corner_radius(struct wlr_scene_buffer *buffer, int sx, int sy, void *user_data)
|
||||
+{
|
||||
+ Client *c = user_data;
|
||||
+ struct wlr_scene_surface * scene_surface = wlr_scene_surface_try_from_buffer(buffer);
|
||||
+ struct wlr_xdg_surface *xdg_surface;
|
||||
+
|
||||
+ if (!scene_surface) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ xdg_surface = wlr_xdg_surface_try_from_wlr_surface(scene_surface->surface);
|
||||
+
|
||||
+ if (c && xdg_surface && xdg_surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
|
||||
+ /* TODO: Be able to set whole decoration_data instead of calling */
|
||||
+ /* each individually? */
|
||||
+ update_buffer_corner_radius(c, buffer);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+output_configure_scene(struct wlr_scene_node *node, Client *c)
|
||||
+{
|
||||
+ Client *_c;
|
||||
+ struct wlr_xdg_surface *xdg_surface;
|
||||
+ struct wlr_scene_node *_node;
|
||||
+
|
||||
+ if (!node->enabled) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ _c = node->data;
|
||||
+ if (_c) {
|
||||
+ c = _c;
|
||||
+ }
|
||||
+
|
||||
+ if (node->type == WLR_SCENE_NODE_BUFFER) {
|
||||
+ struct wlr_scene_buffer *buffer = wlr_scene_buffer_from_node(node);
|
||||
+
|
||||
+ struct wlr_scene_surface *scene_surface = wlr_scene_surface_try_from_buffer(buffer);
|
||||
+ if (!scene_surface) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ xdg_surface = wlr_xdg_surface_try_from_wlr_surface(scene_surface->surface);
|
||||
+
|
||||
+ if (c && xdg_surface && xdg_surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
|
||||
+ if (opacity) {
|
||||
+ wlr_scene_buffer_set_opacity(buffer, c->opacity);
|
||||
+ }
|
||||
+
|
||||
+ if (!wlr_subsurface_try_from_wlr_surface(xdg_surface->surface)) {
|
||||
+ update_buffer_corner_radius(c, buffer);
|
||||
+ }
|
||||
+ }
|
||||
+ } else if (node->type == WLR_SCENE_NODE_TREE) {
|
||||
+ struct wlr_scene_tree *tree = wl_container_of(node, tree, node);
|
||||
+ wl_list_for_each(_node, &tree->children, link) {
|
||||
+ output_configure_scene(_node, c);
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+in_shadow_ignore_list(const char *str)
|
||||
+{
|
||||
+ for (int i = 0; shadow_ignore_list[i] != NULL; i++) {
|
||||
+ if (strcmp(shadow_ignore_list[i], str) == 0) {
|
||||
+ return 1;
|
||||
+ }
|
||||
+ }
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+client_set_shadow_blur_sigma(Client *c, int blur_sigma)
|
||||
+{
|
||||
+ wlr_scene_shadow_set_blur_sigma(c->shadow, blur_sigma);
|
||||
+ wlr_scene_node_set_position(&c->shadow->node, -blur_sigma, -blur_sigma);
|
||||
+ wlr_scene_shadow_set_size(c->shadow, c->geom.width + blur_sigma * 2, c->geom.height + blur_sigma * 2);
|
||||
+ wlr_scene_shadow_set_clipped_region(c->shadow, (struct clipped_region) {
|
||||
+ .corner_radius = c->corner_radius + c->bw,
|
||||
+ .corners = CORNER_LOCATION_ALL,
|
||||
+ .area = { blur_sigma, blur_sigma, c->geom.width, c->geom.height }
|
||||
+ });
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+update_client_corner_radius(Client *c)
|
||||
+{
|
||||
+ if (corner_radius && c->round_border) {
|
||||
+ int radius = c->corner_radius + c->bw;
|
||||
+ if ((corner_radius_only_floating && !c->isfloating) || c->isfullscreen) {
|
||||
+ radius = 0;
|
||||
+ }
|
||||
+ wlr_scene_rect_set_corner_radius(c->round_border, radius, CORNER_LOCATION_ALL);
|
||||
+ }
|
||||
+
|
||||
+#ifdef XWAYLAND
|
||||
+ if (!client_is_x11(c)) {
|
||||
+#endif
|
||||
+ if (corner_radius_inner > 0 && c->scene) {
|
||||
+ wlr_scene_node_for_each_buffer(&c->scene_surface->node, iter_xdg_scene_buffers_corner_radius, c);
|
||||
+ }
|
||||
+#ifdef XWAYLAND
|
||||
+ }
|
||||
+#endif
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+update_client_blur(Client *c)
|
||||
+{
|
||||
+ if (!blur) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (c->scene) {
|
||||
+ wlr_scene_node_for_each_buffer(&c->scene_surface->node, iter_xdg_scene_buffers_blur, c);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+update_buffer_corner_radius(Client *c, struct wlr_scene_buffer *buffer)
|
||||
+{
|
||||
+ int radius;
|
||||
+
|
||||
+#ifdef XWAYLAND
|
||||
+ if (client_is_x11(c)) {
|
||||
+ return;
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
+ if (!corner_radius_inner) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ radius = corner_radius_inner;
|
||||
+ if ((corner_radius_only_floating && !c->isfloating) || c->isfullscreen) {
|
||||
+ radius = 0;
|
||||
+ }
|
||||
+ wlr_scene_buffer_set_corner_radius(buffer, radius, CORNER_LOCATION_ALL);
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+update_client_shadow_color(Client *c)
|
||||
+{
|
||||
+ int has_shadow_enabled = 1;
|
||||
+ const float *color;
|
||||
+
|
||||
+ if (!shadow || !c->shadow) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ color = focustop(c->mon) == c ? shadow_color_focus : shadow_color;
|
||||
+
|
||||
+ if ((shadow_only_floating && !c->isfloating) ||
|
||||
+ in_shadow_ignore_list(client_get_appid(c)) ||
|
||||
+ c->isfullscreen) {
|
||||
+ color = transparent;
|
||||
+ has_shadow_enabled = 0;
|
||||
+ }
|
||||
+
|
||||
+ wlr_scene_shadow_set_color(c->shadow, color);
|
||||
+ c->has_shadow_enabled = has_shadow_enabled;
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+update_client_focus_decorations(Client *c, int focused, int urgent)
|
||||
+{
|
||||
+ if (corner_radius > 0 && c->round_border) {
|
||||
+ wlr_scene_rect_set_color(c->round_border, urgent ? urgentcolor : (focused ? focuscolor : bordercolor));
|
||||
+ }
|
||||
+ if (shadow && c->shadow) {
|
||||
+ client_set_shadow_blur_sigma(c, (int)round(focused ? shadow_blur_sigma_focus : shadow_blur_sigma));
|
||||
+ if (c->has_shadow_enabled) {
|
||||
+ wlr_scene_shadow_set_color(c->shadow, focused ? shadow_color_focus : shadow_color);
|
||||
+ }
|
||||
+ }
|
||||
+ if (opacity) {
|
||||
+ c->opacity = focused ? opacity_active : opacity_inactive;
|
||||
+ wlr_scene_node_for_each_buffer(&c->scene_surface->node, iter_xdg_scene_buffers_opacity, c);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
#ifdef XWAYLAND
|
||||
void
|
||||
activatex11(struct wl_listener *listener, void *data)
|
||||
--
|
||||
2.47.2
|
||||
|
||||
|
||||
Reference in New Issue
Block a user