dwm - Personal dwm fork. git clone https://git.oscarbenedito.com/dwm

About | Log | Files | Refs | License | Contribute

dwm-swallow-20200522-7accbcf.diff (10221B) - raw

---

 From 7accbcf7db35995d4c26c5cd69338aafa6feb89a Mon Sep 17 00:00:00 2001
 From: wtl <wtl144000@gmail.com>
 Date: Fri, 22 May 2020 22:38:38 +0300
 Subject: [PATCH] swallow X windows from the terminal
 
 ---
  config.def.h |   9 ++-
  config.mk    |   2 +-
  dwm.c        | 218 +++++++++++++++++++++++++++++++++++++++++++++++++--
  3 files changed, 220 insertions(+), 9 deletions(-)
 
 diff --git a/config.def.h b/config.def.h
 index 1c0b587..4c0b25c 100644
 --- a/config.def.h
 +++ b/config.def.h
 @@ -3,6 +3,7 @@
  /* appearance */
  static const unsigned int borderpx  = 1;        /* border pixel of 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 char *fonts[]          = { "monospace:size=10" };
 @@ -26,9 +27,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,          -1,        -1 },
 +	{ NULL,      NULL,     "Event Tester", 0,         1,          0,           1,        -1 }, /* xev */
  };
  
  /* layout(s) */
 diff --git a/config.mk b/config.mk
 index 7084c33..b77641d 100644
 --- a/config.mk
 +++ b/config.mk
 @@ -22,7 +22,7 @@ FREETYPEINC = /usr/include/freetype2
  
  # includes and libs
  INCS = -I${X11INC} -I${FREETYPEINC}
 -LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
 +LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lX11-xcb -lxcb -lxcb-res
  
  # flags
  CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
 diff --git a/dwm.c b/dwm.c
 index 9fd0286..1befee4 100644
 --- a/dwm.c
 +++ b/dwm.c
 @@ -40,6 +40,8 @@
  #include <X11/extensions/Xinerama.h>
  #endif /* XINERAMA */
  #include <X11/Xft/Xft.h>
 +#include <X11/Xlib-xcb.h>
 +#include <xcb/res.h>
  
  #include "drw.h"
  #include "util.h"
 @@ -92,9 +94,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;
 +	int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen, isterminal, noswallow;
 +	pid_t pid;
  	Client *next;
  	Client *snext;
 +	Client *swallowing;
  	Monitor *mon;
  	Window win;
  };
 @@ -138,6 +142,8 @@ typedef struct {
  	const char *title;
  	unsigned int tags;
  	int isfloating;
 +	int isterminal;
 +	int noswallow;
  	int monitor;
  } Rule;
  
 @@ -235,9 +241,16 @@ static int xerrordummy(Display *dpy, XErrorEvent *ee);
  static int xerrorstart(Display *dpy, XErrorEvent *ee);
  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 broken[] = "broken";
  static char stext[256];
 +static int scanner;
  static int screen;
  static int sw, sh;           /* X display screen geometry width, height */
  static int bh, blw = 0;      /* bar geometry */
 @@ -269,6 +282,8 @@ static Drw *drw;
  static Monitor *mons, *selmon;
  static Window root, wmcheckwin;
  
 +static xcb_connection_t *xcon;
 +
  /* configuration, allows nested code to access above variables */
  #include "config.h"
  
 @@ -286,6 +301,7 @@ applyrules(Client *c)
  	XClassHint ch = { NULL, NULL };
  
  	/* rule matching */
 +	c->noswallow = -1;
  	c->isfloating = 0;
  	c->tags = 0;
  	XGetClassHint(dpy, c->win, &ch);
 @@ -298,6 +314,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);
 @@ -414,6 +432,61 @@ attachstack(Client *c)
  	c->mon->stack = c;
  }
  
 +void
 +swallow(Client *p, Client *c)
 +{
 +	Client *s;
 +
 +	if (c->noswallow > 0 || c->isterminal)
 +		return;
 +	if (c->noswallow < 0 && !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;
 +
 +	XChangeProperty(dpy, c->win, netatom[NetClientList], XA_WINDOW, 32, PropModeReplace,
 +		(unsigned char *) &(p->win), 1);
 +
 +	updatetitle(p);
 +	s = scanner ? c : p;
 +	XMoveResizeWindow(dpy, p->win, s->x, s->y, s->w, s->h);
 +	arrange(p->mon);
 +	configure(p);
 +	updateclientlist();
 +}
 +
 +void
 +unswallow(Client *c)
 +{
 +	c->win = c->swallowing->win;
 +
 +	free(c->swallowing);
 +	c->swallowing = NULL;
 +
 +	XDeleteProperty(dpy, c->win, netatom[NetClientList]);
 +
 +	/* 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)
  {
 @@ -653,6 +726,9 @@ destroynotify(XEvent *e)
  
  	if ((c = wintoclient(ev->window)))
  		unmanage(c, 1);
 +
 +	else if ((c = swallowingclient(ev->window)))
 +		unmanage(c->swallowing, 1);
  }
  
  void
 @@ -1018,12 +1094,13 @@ killclient(const Arg *arg)
  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;
 @@ -1038,6 +1115,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)
 @@ -1074,6 +1152,8 @@ manage(Window w, XWindowAttributes *wa)
  	c->mon->sel = c;
  	arrange(c->mon);
  	XMapWindow(dpy, c->win);
 +	if (term)
 +		swallow(term, c);
  	focus(NULL);
  }
  
 @@ -1384,7 +1464,9 @@ run(void)
  void
  scan(void)
  {
 +	scanner = 1;
  	unsigned int i, num;
 +	char swin[256];
  	Window d1, d2, *wins = NULL;
  	XWindowAttributes wa;
  
 @@ -1395,6 +1477,8 @@ scan(void)
  				continue;
  			if (wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
  				manage(wins[i], &wa);
 +			else if (gettextprop(wins[i], netatom[NetClientList], swin, sizeof swin))
 +				manage(wins[i], &wa);
  		}
  		for (i = 0; i < num; i++) { /* now the transients */
  			if (!XGetWindowAttributes(dpy, wins[i], &wa))
 @@ -1406,6 +1490,7 @@ scan(void)
  		if (wins)
  			XFree(wins);
  	}
 +	scanner = 0;
  }
  
  void
 @@ -1768,6 +1853,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) {
 @@ -1782,9 +1881,12 @@ unmanage(Client *c, int destroyed)
  		XUngrabServer(dpy);
  	}
  	free(c);
 -	focus(NULL);
 -	updateclientlist();
 -	arrange(m);
 +
 +	if (!s) {
 +		arrange(m);
 +		focus(NULL);
 +		updateclientlist();
 +	}
  }
  
  void
 @@ -2047,6 +2149,110 @@ view(const Arg *arg)
  	arrange(selmon);
  }
  
 +pid_t
 +winpid(Window w)
 +{
 +	pid_t result = 0;
 +
 +	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;
 +	return result;
 +}
 +
 +pid_t
 +getparentprocess(pid_t p)
 +{
 +	unsigned int v = 0;
 +
 +#if defined(__linux__)
 +	FILE *f;
 +	char buf[256];
 +	snprintf(buf, sizeof(buf) - 1, "/proc/%u/stat", (unsigned)p);
 +
 +	if (!(f = fopen(buf, "r")))
 +		return (pid_t)0;
 +
 +	if (fscanf(f, "%*u %*s %*c %u", (unsigned *)&v) != 1)
 +		v = (pid_t)0;
 +	fclose(f);
 +#elif defined(__FreeBSD__)
 +	struct kinfo_proc *proc = kinfo_getproc(p);
 +	if (!proc)
 +		return (pid_t)0;
 +
 +	v = proc->ki_ppid;
 +	free(proc);
 +#endif
 +	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)
  {
 @@ -2138,6 +2344,8 @@ 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();
  	setup();
  #ifdef __OpenBSD__
 -- 
 2.26.2