alrayyes/dwm
1
0
Fork 0
mirror of https://github.com/alrayyes/dwm.git synced 2024-11-21 19:16:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: added swallow patch

Browse source
This commit is contained in:
Ryan Kes 2020-12-03 12:09:42 +01:00
parent 69e2067d12
commit bc3fff60c7
4 changed files with 419 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
PKGBUILD
View file

@ -30,6 +30,7 @@ _patches=(
"dwm-statuscmd-signal-6.2.diff" "dwm-statuscmd-signal-6.2.diff"
"local-xrdb-6.2.diff" "local-xrdb-6.2.diff"
"local-sticky-20160911-ab9571b.diff" "local-sticky-20160911-ab9571b.diff"
"local-swallow-20200807-b2de9b0.diff"
) )
source=(http://dl.suckless.org/dwm/dwm-$pkgver.tar.gz source=(http://dl.suckless.org/dwm/dwm-$pkgver.tar.gz
@ -54,7 +55,8 @@ md5sums=('9929845ccdec4d2cc191f16210dd7f3d'
'7799f60a9e87e4f99e813d158abee15b' '7799f60a9e87e4f99e813d158abee15b'
'6343099cdc9752bc3f4f87e119345b79' '6343099cdc9752bc3f4f87e119345b79'
'3ebe2a57a05e963764c2083916a02677' '3ebe2a57a05e963764c2083916a02677'
'1494ebf7135e01101542daa59b7b28ab') '1494ebf7135e01101542daa59b7b28ab'
'96e122c7e880177259cf5dbda7e646cb')
prepare() { prepare() {
cd $srcdir/dwm-$pkgver cd $srcdir/dwm-$pkgver

1
README.org
View file

@ -17,6 +17,7 @@
- [[https://dwm.suckless.org/patches/statuscmd/][statuscmd]] - [[https://dwm.suckless.org/patches/statuscmd/][statuscmd]]
- [[https://dwm.suckless.org/patches/statuspadding/][statuspadding]] - [[https://dwm.suckless.org/patches/statuspadding/][statuspadding]]
- [[https://dwm.suckless.org/patches/sticky/][sticky]] - [[https://dwm.suckless.org/patches/sticky/][sticky]]
- [[https://dwm.suckless.org/patches/swallow/][swallow]]
- [[https://dwm.suckless.org/patches/uselessgap/][uselessgap]] - [[https://dwm.suckless.org/patches/uselessgap/][uselessgap]]
- [[https://dwm.suckless.org/patches/xrdb/][xrdb]] - [[https://dwm.suckless.org/patches/xrdb/][xrdb]]

33
config_desktop.h
View file

@ -4,6 +4,7 @@
static const unsigned int borderpx = 1; /* border pixel of windows */ static const unsigned int borderpx = 1; /* border pixel of windows */
static const unsigned int gappx = 6; /* gaps between windows */ static const unsigned int gappx = 6; /* gaps between windows */
static const unsigned int snap = 32; /* snap pixel */ static const unsigned int snap = 32; /* snap pixel */
static const int swallowfloating = 0; /* 1 means swallow floating windows by default */
static const int showbar = 1; /* 0 means no bar */ static const int showbar = 1; /* 0 means no bar */
static const int topbar = 1; /* 0 means bottom bar */ static const int topbar = 1; /* 0 means bottom bar */
static const int horizpadbar = 2; /* horizontal padding for statusbar */ static const int horizpadbar = 2; /* horizontal padding for statusbar */
@ -48,25 +49,28 @@ static const Rule rules[] = {
* WM_CLASS(STRING) = instance, class * WM_CLASS(STRING) = instance, class
* WM_NAME(STRING) = title * WM_NAME(STRING) = title
*/ */
/* class instance title tags mask isfloating monitor */ /* class instance title tags mask isfloating isterminal noswallow monitor */
{ "Gimp", NULL, NULL, 0, 1, -1 }, { "Gimp", NULL, NULL, 0, 1, 0, 0, -1 },
{ "Syncthing GTK", NULL, NULL, 0, 1, -1 }, { "Syncthing GTK", NULL, NULL, 0, 1, 0, 0, -1 },
{ "Brave-browser", NULL, NULL, 0, 0, 1 }, { "Brave-browser", NULL, NULL, 0, 0, 0, -1, 1 },
{ "Firefox", NULL, NULL, 0, 0, 1 }, { "Firefox", NULL, NULL, 0, 0, 0, -1, 1 },
{ "iceweasel", NULL, NULL, 0, 0, 1 }, { "iceweasel", NULL, NULL, 0, 0, 0, -1, 1 },
{ "Element", NULL, NULL, 1 << 2, 0, -1 }, { "Element", NULL, NULL, 1 << 2, 0, 0, -1, -1 },
{ "Element-Nightly", NULL, NULL, 1 << 2, 0, -1 }, { "Element-Nightly", NULL, NULL, 1 << 2, 0, 0, -1, -1 },
{ "Slack", NULL, NULL, 1 << 2, 0, -1 }, { "Slack", NULL, NULL, 1 << 2, 0, 0, -1, -1 },
{ "castero", NULL, NULL, 1 << 3, 0, -1 }, { "castero", NULL, NULL, 1 << 3, 0, 0, -1, -1 },
{ "Spt", NULL, NULL, 1 << 3, 0, -1 }, { "Spt", NULL, NULL, 1 << 3, 0, 0, -1, -1 },
{ "Spotify", NULL, NULL, 1 << 3, 0, -1 }, { "Spotify", NULL, NULL, 1 << 3, 0, 0, -1, -1 },
{ "jetbrains-webstorm", NULL, NULL, 1 << 7, 0, -1 }, { "jetbrains-webstorm", NULL, NULL, 1 << 7, 0, 0, -1, -1 },
{ "Emacs", NULL, NULL, 1 << 8, 0, -1 }, { "Emacs", NULL, NULL, 1 << 8, 0, 0, -1, -1 },
{ "st-256color", NULL, NULL, 0, 0, 1, 0, -1 },
{ NULL, NULL, "Event Tester", 0, 0, 0, 1, -1 }, /* xev */
}; };
/* layout(s) */ /* layout(s) */
@ -129,7 +133,6 @@ static Key keys[] = {
{ MODKEY|ControlMask, XK_period, cyclelayout, {.i = +1 } }, { MODKEY|ControlMask, XK_period, cyclelayout, {.i = +1 } },
{ MODKEY, XK_p, setlayout, {0} }, { MODKEY, XK_p, setlayout, {0} },
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} }, { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
{ MODKEY, XK_s, togglesticky, {0} },
{ MODKEY, XK_0, view, {.ui = ~0 } }, { MODKEY, XK_0, view, {.ui = ~0 } },
{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
{ MODKEY, XK_comma, focusmon, {.i = -1 } }, { MODKEY, XK_comma, focusmon, {.i = -1 } },

397
local-swallow-20200807-b2de9b0.diff Normal file
View file

@ -0,0 +1,397 @@
diff -up -N a/config.def.h b/config.def.h
--- a/config.def.h 2020-12-03 12:03:37.833676126 +0100
+++ b/config.def.h 2020-12-03 11:36:50.007560999 +0100
@@ -4,6 +4,7 @@
static const unsigned int borderpx = 1; /* border pixel of windows */
static const unsigned int gappx = 6; /* gaps between windows */
static const unsigned int snap = 32; /* snap pixel */
+static const int swallowfloating = 0; /* 1 means swallow floating windows by default */
static const int showbar = 1; /* 0 means no bar */
static const int topbar = 1; /* 0 means bottom bar */
static const int horizpadbar = 2; /* horizontal padding for statusbar */
@@ -39,9 +40,11 @@ static const Rule rules[] = {
* WM_CLASS(STRING) = instance, class
* WM_NAME(STRING) = title
*/
- /* class instance title tags mask isfloating monitor */
- { "Gimp", NULL, NULL, 0, 1, -1 },
- { "Firefox", NULL, NULL, 1 << 8, 0, -1 },
+ /* class instance title tags mask isfloating isterminal noswallow monitor */
+ { "Gimp", NULL, NULL, 0, 1, 0, 0, -1 },
+ { "Firefox", NULL, NULL, 1 << 8, 0, 0, -1, -1 },
+ { "St", NULL, NULL, 0, 0, 1, 0, -1 },
+ { NULL, NULL, "Event Tester", 0, 0, 0, 1, -1 }, /* xev */
};
/* layout(s) */
diff -up -N a/config.mk b/config.mk
--- a/config.mk 2020-12-03 12:03:37.833676126 +0100
+++ b/config.mk 2020-12-03 11:47:10.202544463 +0100
@@ -19,10 +19,11 @@ FREETYPELIBS = -lfontconfig -lXft
FREETYPEINC = /usr/include/freetype2
# OpenBSD (uncomment)
#FREETYPEINC = ${X11INC}/freetype2
+#KVMLIB = -lkvm
# includes and libs
INCS = -I${X11INC} -I${FREETYPEINC}
-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lXrender
+LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lXrender -lX11-xcb -lxcb -lxcb-res ${KVMLIB}
# flags
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
diff -up -N a/dwm.c b/dwm.c
--- a/dwm.c 2020-12-03 12:03:37.833676126 +0100
+++ b/dwm.c 2020-12-03 11:57:41.171787313 +0100
@@ -42,6 +42,12 @@
#include <X11/extensions/Xinerama.h>
#endif /* XINERAMA */
#include <X11/Xft/Xft.h>
+#include <X11/Xlib-xcb.h>
+#include <xcb/res.h>
+#ifdef __OpenBSD__
+#include <sys/sysctl.h>
+#include <kvm.h>
+#endif /* __OpenBSD */
#include "drw.h"
#include "util.h"
@@ -111,9 +117,11 @@ struct Client {
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int bw, oldbw;
unsigned int tags;
- int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen, issticky;
+ int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen, issticky, isterminal, noswallow;
+ pid_t pid;
Client *next;
Client *snext;
+ Client *swallowing;
Monitor *mon;
Window win;
};
@@ -157,6 +165,8 @@ typedef struct {
const char *title;
unsigned int tags;
int isfloating;
+ int isterminal;
+ int noswallow;
int monitor;
} Rule;
@@ -266,6 +276,12 @@ static void xinitvisual();
static void xrdb(const Arg *arg);
static void zoom(const Arg *arg);
+static pid_t getparentprocess(pid_t p);
+static int isdescprocess(pid_t p, pid_t c);
+static Client *swallowingclient(Window w);
+static Client *termforwin(const Client *c);
+static pid_t winpid(Window w);
+
/* variables */
static const char autostartblocksh[] = "autostart_blocking.sh";
static const char autostartsh[] = "autostart.sh";
@@ -307,6 +323,8 @@ static Drw *drw;
static Monitor *mons, *selmon;
static Window root, wmcheckwin;
+static xcb_connection_t *xcon;
+
static int useargb = 0;
static Visual *visual;
static int depth;
@@ -343,6 +361,8 @@ applyrules(Client *c)
&& (!r->class || strstr(class, r->class))
&& (!r->instance || strstr(instance, r->instance)))
{
+ c->isterminal = r->isterminal;
+ c->noswallow = r->noswallow;
c->isfloating = r->isfloating;
c->tags |= r->tags;
for (m = mons; m && m->num != r->monitor; m = m->next);
@@ -460,6 +480,53 @@ attachstack(Client *c)
}
void
+swallow(Client *p, Client *c)
+{
+
+ if (c->noswallow || c->isterminal)
+ return;
+ if (c->noswallow && !swallowfloating && c->isfloating)
+ return;
+
+ detach(c);
+ detachstack(c);
+
+ setclientstate(c, WithdrawnState);
+ XUnmapWindow(dpy, p->win);
+
+ p->swallowing = c;
+ c->mon = p->mon;
+
+ Window w = p->win;
+ p->win = c->win;
+ c->win = w;
+ updatetitle(p);
+ XMoveResizeWindow(dpy, p->win, p->x, p->y, p->w, p->h);
+ arrange(p->mon);
+ configure(p);
+ updateclientlist();
+}
+
+void
+unswallow(Client *c)
+{
+ c->win = c->swallowing->win;
+
+ free(c->swallowing);
+ c->swallowing = NULL;
+
+ /* unfullscreen the client */
+ setfullscreen(c, 0);
+ updatetitle(c);
+ arrange(c->mon);
+ XMapWindow(dpy, c->win);
+ XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
+ setclientstate(c, NormalState);
+ focus(NULL);
+ arrange(c->mon);
+}
+
+void
buttonpress(XEvent *e)
{
unsigned int i, x, click, occ = 0;
@@ -750,6 +817,9 @@ destroynotify(XEvent *e)
if ((c = wintoclient(ev->window)))
unmanage(c, 1);
+
+ else if ((c = swallowingclient(ev->window)))
+ unmanage(c->swallowing, 1);
}
void
@@ -1180,12 +1250,13 @@ loadxrdb()
void
manage(Window w, XWindowAttributes *wa)
{
- Client *c, *t = NULL;
+ Client *c, *t = NULL, *term = NULL;
Window trans = None;
XWindowChanges wc;
c = ecalloc(1, sizeof(Client));
c->win = w;
+ c->pid = winpid(w);
/* geometry */
c->x = c->oldx = wa->x;
c->y = c->oldy = wa->y;
@@ -1200,6 +1271,7 @@ manage(Window w, XWindowAttributes *wa)
} else {
c->mon = selmon;
applyrules(c);
+ term = termforwin(c);
}
if (c->x + WIDTH(c) > c->mon->mx + c->mon->mw)
@@ -1244,6 +1316,8 @@ manage(Window w, XWindowAttributes *wa)
c->mon->sel = c;
arrange(c->mon);
XMapWindow(dpy, c->win);
+ if (term)
+ swallow(term, c);
focus(NULL);
}
@@ -2125,6 +2199,20 @@ unmanage(Client *c, int destroyed)
Monitor *m = c->mon;
XWindowChanges wc;
+ if (c->swallowing) {
+ unswallow(c);
+ return;
+ }
+
+ Client *s = swallowingclient(c->win);
+ if (s) {
+ free(s->swallowing);
+ s->swallowing = NULL;
+ arrange(m);
+ focus(NULL);
+ return;
+ }
+
detach(c);
detachstack(c);
if (!destroyed) {
@@ -2139,9 +2227,12 @@ unmanage(Client *c, int destroyed)
XUngrabServer(dpy);
}
free(c);
- focus(NULL);
- updateclientlist();
- arrange(m);
+
+ if (!s) {
+ arrange(m);
+ focus(NULL);
+ updateclientlist();
+ }
}
void
@@ -2408,6 +2499,136 @@ view(const Arg *arg)
arrange(selmon);
}
+pid_t
+winpid(Window w)
+{
+
+ pid_t result = 0;
+
+ #ifdef __linux__
+ xcb_res_client_id_spec_t spec = {0};
+ spec.client = w;
+ spec.mask = XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID;
+
+ xcb_generic_error_t *e = NULL;
+ xcb_res_query_client_ids_cookie_t c = xcb_res_query_client_ids(xcon, 1, &spec);
+ xcb_res_query_client_ids_reply_t *r = xcb_res_query_client_ids_reply(xcon, c, &e);
+
+ if (!r)
+ return (pid_t)0;
+
+ xcb_res_client_id_value_iterator_t i = xcb_res_query_client_ids_ids_iterator(r);
+ for (; i.rem; xcb_res_client_id_value_next(&i)) {
+ spec = i.data->spec;
+ if (spec.mask & XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID) {
+ uint32_t *t = xcb_res_client_id_value_value(i.data);
+ result = *t;
+ break;
+ }
+ }
+
+ free(r);
+
+ if (result == (pid_t)-1)
+ result = 0;
+
+ #endif /* __linux__ */
+
+ #ifdef __OpenBSD__
+ Atom type;
+ int format;
+ unsigned long len, bytes;
+ unsigned char *prop;
+ pid_t ret;
+
+ if (XGetWindowProperty(dpy, w, XInternAtom(dpy, "_NET_WM_PID", 1), 0, 1, False, AnyPropertyType, &type, &format, &len, &bytes, &prop) != Success || !prop)
+ return 0;
+
+ ret = *(pid_t*)prop;
+ XFree(prop);
+ result = ret;
+
+ #endif /* __OpenBSD__ */
+ return result;
+}
+
+pid_t
+getparentprocess(pid_t p)
+{
+ unsigned int v = 0;
+
+#ifdef __linux__
+ 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);
+#endif /* __linux__*/
+
+#ifdef __OpenBSD__
+ int n;
+ kvm_t *kd;
+ struct kinfo_proc *kp;
+
+ kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, NULL);
+ if (!kd)
+ return 0;
+
+ kp = kvm_getprocs(kd, KERN_PROC_PID, p, sizeof(*kp), &n);
+ v = kp->p_ppid;
+#endif /* __OpenBSD__ */
+
+ 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(const Client *w)
+{
+ Client *c;
+ Monitor *m;
+
+ if (!w->pid || w->isterminal)
+ return NULL;
+
+ for (m = mons; m; m = m->next) {
+ for (c = m->clients; c; c = c->next) {
+ if (c->isterminal && !c->swallowing && c->pid && isdescprocess(c->pid, w->pid))
+ return c;
+ }
+ }
+
+ return NULL;
+}
+
+Client *
+swallowingclient(Window w)
+{
+ Client *c;
+ Monitor *m;
+
+ for (m = mons; m; m = m->next) {
+ for (c = m->clients; c; c = c->next) {
+ if (c->swallowing && c->swallowing->win == w)
+ return c;
+ }
+ }
+
+ return NULL;
+}
+
Client *
wintoclient(Window w)
{
@@ -2547,12 +2768,14 @@ main(int argc, char *argv[])
fputs("warning: no locale support\n", stderr);
if (!(dpy = XOpenDisplay(NULL)))
die("dwm: cannot open display");
+ if (!(xcon = XGetXCBConnection(dpy)))
+ die("dwm: cannot get xcb connection\n");
checkotherwm();
XrmInitialize();
loadxrdb();
setup();
#ifdef __OpenBSD__
- if (pledge("stdio rpath proc exec", NULL) == -1)
+ if (pledge("stdio rpath proc exec ps", NULL) == -1)
die("pledge");
#endif /* __OpenBSD__ */
scan();