|
|
|
|
@ -40,6 +40,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"
|
|
|
|
|
@ -92,9 +98,11 @@ struct Client {
|
|
|
|
|
int basew, baseh, incw, inch, maxw, maxh, minw, minh, hintsvalid;
|
|
|
|
|
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;
|
|
|
|
|
};
|
|
|
|
|
@ -139,6 +147,8 @@ typedef struct {
|
|
|
|
|
const char *title;
|
|
|
|
|
unsigned int tags;
|
|
|
|
|
int isfloating;
|
|
|
|
|
int isterminal;
|
|
|
|
|
int noswallow;
|
|
|
|
|
int monitor;
|
|
|
|
|
} Rule;
|
|
|
|
|
|
|
|
|
|
@ -236,6 +246,12 @@ 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];
|
|
|
|
|
@ -270,6 +286,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"
|
|
|
|
|
|
|
|
|
|
@ -299,6 +317,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);
|
|
|
|
|
@ -417,6 +437,53 @@ attachstack(Client *c)
|
|
|
|
|
c->mon->stack = 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)
|
|
|
|
|
{
|
|
|
|
|
@ -435,9 +502,15 @@ buttonpress(XEvent *e)
|
|
|
|
|
}
|
|
|
|
|
if (ev->window == selmon->barwin) {
|
|
|
|
|
i = x = 0;
|
|
|
|
|
do
|
|
|
|
|
unsigned int occ = 0;
|
|
|
|
|
for(c = m->clients; c; c=c->next)
|
|
|
|
|
occ |= c->tags;
|
|
|
|
|
do {
|
|
|
|
|
/* Do not reserve space for vacant tags */
|
|
|
|
|
if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
|
|
|
|
|
continue;
|
|
|
|
|
x += TEXTW(tags[i]);
|
|
|
|
|
while (ev->x >= x && ++i < LENGTH(tags));
|
|
|
|
|
} while (ev->x >= x && ++i < LENGTH(tags));
|
|
|
|
|
if (i < LENGTH(tags)) {
|
|
|
|
|
click = ClkTagBar;
|
|
|
|
|
arg.ui = 1 << i;
|
|
|
|
|
@ -658,6 +731,9 @@ destroynotify(XEvent *e)
|
|
|
|
|
|
|
|
|
|
if ((c = wintoclient(ev->window)))
|
|
|
|
|
unmanage(c, 1);
|
|
|
|
|
|
|
|
|
|
else if ((c = swallowingclient(ev->window)))
|
|
|
|
|
unmanage(c->swallowing, 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
@ -724,13 +800,12 @@ drawbar(Monitor *m)
|
|
|
|
|
}
|
|
|
|
|
x = 0;
|
|
|
|
|
for (i = 0; i < LENGTH(tags); i++) {
|
|
|
|
|
/* Do not draw vacant tags */
|
|
|
|
|
if(!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
|
|
|
|
|
continue;
|
|
|
|
|
w = TEXTW(tags[i]);
|
|
|
|
|
drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
|
|
|
|
|
drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
|
|
|
|
|
if (occ & 1 << i)
|
|
|
|
|
drw_rect(drw, x + boxs, boxs, boxw, boxw,
|
|
|
|
|
m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
|
|
|
|
|
urg & 1 << i);
|
|
|
|
|
x += w;
|
|
|
|
|
}
|
|
|
|
|
w = TEXTW(m->ltsymbol);
|
|
|
|
|
@ -1034,12 +1109,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;
|
|
|
|
|
@ -1054,6 +1130,7 @@ manage(Window w, XWindowAttributes *wa)
|
|
|
|
|
} else {
|
|
|
|
|
c->mon = selmon;
|
|
|
|
|
applyrules(c);
|
|
|
|
|
term = termforwin(c);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (c->x + WIDTH(c) > c->mon->wx + c->mon->ww)
|
|
|
|
|
@ -1088,6 +1165,8 @@ manage(Window w, XWindowAttributes *wa)
|
|
|
|
|
c->mon->sel = c;
|
|
|
|
|
arrange(c->mon);
|
|
|
|
|
XMapWindow(dpy, c->win);
|
|
|
|
|
if (term)
|
|
|
|
|
swallow(term, c);
|
|
|
|
|
focus(NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -1800,6 +1879,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) {
|
|
|
|
|
@ -1815,9 +1908,12 @@ unmanage(Client *c, int destroyed)
|
|
|
|
|
XUngrabServer(dpy);
|
|
|
|
|
}
|
|
|
|
|
free(c);
|
|
|
|
|
|
|
|
|
|
if (!s) {
|
|
|
|
|
arrange(m);
|
|
|
|
|
focus(NULL);
|
|
|
|
|
updateclientlist();
|
|
|
|
|
arrange(m);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
@ -2081,6 +2177,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", 0), 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)
|
|
|
|
|
{
|
|
|
|
|
@ -2170,10 +2396,12 @@ 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__
|
|
|
|
|
if (pledge("stdio rpath proc exec", NULL) == -1)
|
|
|
|
|
if (pledge("stdio rpath proc exec ps", NULL) == -1)
|
|
|
|
|
die("pledge");
|
|
|
|
|
#endif /* __OpenBSD__ */
|
|
|
|
|
scan();
|
|
|
|
|
|
TitanE
1 year ago