mirror of
https://codeberg.org/dwl/dwl-patches.git
synced 2025-10-26 17:54:17 +00:00
add swallow patch
This commit is contained in:
choc
parent
182158c899
commit
8a352a1b27
255
swallow/swallow.patch
Normal file
255
swallow/swallow.patch
Normal file
@ -0,0 +1,255 @@
|
||||
From 7c4b174821ab994c0f1a97cba5918f905004f72c Mon Sep 17 00:00:00 2001
|
||||
From: choc <notchoc@proton.me>
|
||||
Date: Fri, 15 Sep 2023 10:36:21 +0800
|
||||
Subject: [PATCH] swallow patch with x support
|
||||
|
||||
fixed to work after commit 985417b
|
||||
---
|
||||
client.h | 12 ++++++
|
||||
config.def.h | 7 ++--
|
||||
config.mk | 4 +-
|
||||
dwl.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++---
|
||||
4 files changed, 125 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/client.h b/client.h
|
||||
index 1dae434..51bef68 100644
|
||||
--- a/client.h
|
||||
+++ b/client.h
|
||||
@@ -131,6 +131,18 @@ client_get_appid(Client *c)
|
||||
return c->surface.xdg->toplevel->app_id;
|
||||
}
|
||||
|
||||
+static inline int
|
||||
+client_get_pid(Client *c)
|
||||
+{
|
||||
+ pid_t pid;
|
||||
+#ifdef XWAYLAND
|
||||
+ if (client_is_x11(c))
|
||||
+ return c->surface.xwayland->pid;
|
||||
+#endif
|
||||
+ wl_client_get_credentials(c->surface.xdg->client->client, &pid, NULL, NULL);
|
||||
+ return pid;
|
||||
+}
|
||||
+
|
||||
static inline void
|
||||
client_get_clip(Client *c, struct wlr_box *clip)
|
||||
{
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index a8ed61d..ca2b925 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -21,11 +21,12 @@ static const float fullscreen_bg[] = {0.1, 0.1, 0.1, 1.0}; /* You can al
|
||||
static int log_level = WLR_ERROR;
|
||||
|
||||
static const Rule rules[] = {
|
||||
- /* app_id title tags mask isfloating monitor */
|
||||
+ /* app_id title tags mask isfloating isterm noswallow monitor */
|
||||
/* examples:
|
||||
- { "Gimp", NULL, 0, 1, -1 },
|
||||
+ { "Gimp", NULL, 0, 1, 0, 1, -1 },
|
||||
*/
|
||||
- { "firefox", NULL, 1 << 8, 0, -1 },
|
||||
+ { "firefox", NULL, 1 << 8, 0, 0, 1, -1 },
|
||||
+ { "foot", NULL, 0, 0, 1, 1, -1 },
|
||||
};
|
||||
|
||||
/* layout(s) */
|
||||
diff --git a/config.mk b/config.mk
|
||||
index 906f403..f7fa488 100644
|
||||
--- a/config.mk
|
||||
+++ b/config.mk
|
||||
@@ -11,5 +11,5 @@ DATADIR = $(PREFIX)/share
|
||||
XWAYLAND =
|
||||
XLIBS =
|
||||
# Uncomment to build XWayland support
|
||||
-#XWAYLAND = -DXWAYLAND
|
||||
-#XLIBS = xcb xcb-icccm
|
||||
+XWAYLAND = -DXWAYLAND
|
||||
+XLIBS = xcb xcb-icccm
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index 10d5a5b..510ccf7 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -97,7 +97,8 @@ typedef struct {
|
||||
} Button;
|
||||
|
||||
typedef struct Monitor Monitor;
|
||||
-typedef struct {
|
||||
+typedef struct Client Client;
|
||||
+struct Client {
|
||||
/* Must keep these three elements in this order */
|
||||
unsigned int type; /* XDGShell or X11* */
|
||||
struct wlr_box geom; /* layout-relative, includes border */
|
||||
@@ -132,9 +133,11 @@ typedef struct {
|
||||
#endif
|
||||
unsigned int bw;
|
||||
uint32_t tags;
|
||||
- int isfloating, isurgent, isfullscreen;
|
||||
+ int isfloating, isurgent, isfullscreen, isterm, noswallow;
|
||||
uint32_t resize; /* configure serial of a pending resize */
|
||||
-} Client;
|
||||
+ pid_t pid;
|
||||
+ Client *swallowing, *swallowedby;
|
||||
+};
|
||||
|
||||
typedef struct {
|
||||
uint32_t mod;
|
||||
@@ -217,6 +220,8 @@ typedef struct {
|
||||
const char *title;
|
||||
uint32_t tags;
|
||||
int isfloating;
|
||||
+ int isterm;
|
||||
+ int noswallow;
|
||||
int monitor;
|
||||
} Rule;
|
||||
|
||||
@@ -331,6 +336,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 pid_t getparentprocess(pid_t p);
|
||||
+static int isdescprocess(pid_t p, pid_t c);
|
||||
+static Client *termforwin(Client *w);
|
||||
+static void swallow(Client *c, Client *w);
|
||||
|
||||
/* variables */
|
||||
static const char broken[] = "broken";
|
||||
@@ -436,10 +445,14 @@ applyrules(Client *c)
|
||||
if (!(title = client_get_title(c)))
|
||||
title = broken;
|
||||
|
||||
+ c->pid = client_get_pid(c);
|
||||
+
|
||||
for (r = rules; r < END(rules); r++) {
|
||||
if ((!r->title || strstr(title, r->title))
|
||||
&& (!r->id || strstr(appid, r->id))) {
|
||||
c->isfloating = r->isfloating;
|
||||
+ c->isterm = r->isterm;
|
||||
+ c->noswallow = r->noswallow;
|
||||
newtags |= r->tags;
|
||||
i = 0;
|
||||
wl_list_for_each(m, &mons, link) {
|
||||
@@ -449,6 +462,20 @@ applyrules(Client *c)
|
||||
}
|
||||
}
|
||||
wlr_scene_node_reparent(&c->scene->node, layers[c->isfloating ? LyrFloat : LyrTile]);
|
||||
+ if (!c->noswallow && !client_is_float_type(c)) {
|
||||
+ Client *p = termforwin(c);
|
||||
+ if (p) {
|
||||
+ c->swallowedby = p;
|
||||
+ p->swallowing = c;
|
||||
+ wl_list_remove(&c->link);
|
||||
+ wl_list_remove(&c->flink);
|
||||
+ swallow(c,p);
|
||||
+ wl_list_remove(&p->link);
|
||||
+ wl_list_remove(&p->flink);
|
||||
+ mon = p->mon;
|
||||
+ newtags = p->tags;
|
||||
+ }
|
||||
+ }
|
||||
setmon(c, mon, newtags);
|
||||
}
|
||||
|
||||
@@ -1311,6 +1338,63 @@ handlesig(int signo)
|
||||
}
|
||||
}
|
||||
|
||||
+pid_t
|
||||
+getparentprocess(pid_t p)
|
||||
+{
|
||||
+ unsigned int v = 0;
|
||||
+
|
||||
+ FILE *f;
|
||||
+ char buf[256];
|
||||
+ snprintf(buf, sizeof(buf) - 1, "/proc/%u/stat", (unsigned)p);
|
||||
+
|
||||
+ if (!(f = fopen(buf, "r")))
|
||||
+ return 0;
|
||||
+
|
||||
+ fscanf(f, "%*u %*s %*c %u", &v);
|
||||
+ fclose(f);
|
||||
+
|
||||
+ return (pid_t)v;
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+isdescprocess(pid_t p, pid_t c)
|
||||
+{
|
||||
+ while (p != c && c != 0)
|
||||
+ c = getparentprocess(c);
|
||||
+
|
||||
+ return (int)c;
|
||||
+}
|
||||
+
|
||||
+Client *
|
||||
+termforwin(Client *w)
|
||||
+{
|
||||
+ Client *c;
|
||||
+
|
||||
+ if (!w->pid || w->isterm || w->noswallow)
|
||||
+ return NULL;
|
||||
+
|
||||
+ wl_list_for_each(c, &fstack, flink)
|
||||
+ if (c->isterm && !c->swallowing && c->pid && isdescprocess(c->pid, w->pid))
|
||||
+ return c;
|
||||
+
|
||||
+ return NULL;
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+swallow(Client *c, Client *w)
|
||||
+{
|
||||
+ c->bw = w->bw;
|
||||
+ c->isfloating = w->isfloating;
|
||||
+ c->isurgent = w->isurgent;
|
||||
+ c->isfullscreen = w->isfullscreen;
|
||||
+ c->tags = w->tags;
|
||||
+ c->geom = w->geom;
|
||||
+ wl_list_insert(&w->link, &c->link);
|
||||
+ wl_list_insert(&w->flink, &c->flink);
|
||||
+ wlr_scene_node_set_enabled(&w->scene->node, 0);
|
||||
+ wlr_scene_node_set_enabled(&c->scene->node, 1);
|
||||
+}
|
||||
+
|
||||
void
|
||||
incnmaster(const Arg *arg)
|
||||
{
|
||||
@@ -2559,15 +2643,33 @@ unmapnotify(struct wl_listener *listener, void *data)
|
||||
grabc = NULL;
|
||||
}
|
||||
|
||||
+ if (c->swallowedby) {
|
||||
+ swallow(c->swallowedby, c);
|
||||
+ }
|
||||
+
|
||||
if (client_is_unmanaged(c)) {
|
||||
if (c == exclusive_focus) {
|
||||
exclusive_focus = NULL;
|
||||
focusclient(focustop(selmon), 1);
|
||||
}
|
||||
} else {
|
||||
- wl_list_remove(&c->link);
|
||||
+ if (!c->swallowing)
|
||||
+ wl_list_remove(&c->link);
|
||||
setmon(c, NULL, 0);
|
||||
- wl_list_remove(&c->flink);
|
||||
+ if (!c->swallowing)
|
||||
+ wl_list_remove(&c->flink);
|
||||
+ }
|
||||
+
|
||||
+ if (c->swallowedby) {
|
||||
+ c->swallowedby->prev = c->geom;
|
||||
+ setfullscreen(c->swallowedby, c->isfullscreen);
|
||||
+ c->swallowedby->swallowing = NULL;
|
||||
+ c->swallowedby = NULL;
|
||||
+ }
|
||||
+
|
||||
+ if (c->swallowing) {
|
||||
+ c->swallowing->swallowedby = NULL;
|
||||
+ c->swallowing = NULL;
|
||||
}
|
||||
|
||||
wlr_scene_node_destroy(&c->scene->node);
|
||||
--
|
||||
2.43.0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user