merged scratchpad-fix
This commit is contained in:
commit
0996e00fff
41
config.def.h
41
config.def.h
|
@ -63,31 +63,20 @@ static Sp scratchpads[] = {
|
||||||
{"spterm5", spcmd5},
|
{"spterm5", spcmd5},
|
||||||
{"spterm6", spcmd6},
|
{"spterm6", spcmd6},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* tagging */
|
/* tagging */
|
||||||
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
|
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
|
||||||
|
|
||||||
static const Rule rules[] = {
|
static const Rule rules[] = {
|
||||||
/* xprop(1):
|
/* class instance title tags mask isfloating isterminal noswallow monitor */
|
||||||
* WM_CLASS(STRING) = instance, class
|
{ NULL, "spterm0", NULL, SPTAG(0), 1, 1, 0, -1 },
|
||||||
* WM_NAME(STRING) = title
|
{ NULL, "spterm1", NULL, SPTAG(1), 1, 1, 0, -1 },
|
||||||
*/
|
{ NULL, "spterm2", NULL, SPTAG(2), 1, 1, 0, -1 },
|
||||||
/* class instance title tags mask isfloating isterminal noswallow monitor */
|
{ NULL, "spterm3", NULL, SPTAG(3), 1, 1, 0, -1 },
|
||||||
{ "Gimp", NULL, NULL, 0, 1, 0, 0, -1 },
|
{ NULL, "spterm4", NULL, SPTAG(4), 1, 1, 0, -1 },
|
||||||
{ "Firefox", NULL, NULL, 1 << 8, 0, 0, -1, -1 },
|
{ NULL, "spterm5", NULL, SPTAG(5), 1, 1, 0, -1 },
|
||||||
{ "St", NULL, NULL, 0, 0, 1, 0, -1 },
|
{ NULL, "spterm6", NULL, SPTAG(6), 1, 1, 0, -1 },
|
||||||
{ NULL, "spterm0", NULL, SPTAG(0), 1, 1, 0 -1 },
|
|
||||||
{ NULL, "spterm1", NULL, SPTAG(1), 1, 1, 0 -1 },
|
|
||||||
{ NULL, "spterm2", NULL, SPTAG(2), 1, 1, 0 -1 },
|
|
||||||
{ NULL, "spterm3", NULL, SPTAG(3), 1, 1, 0 -1 },
|
|
||||||
{ NULL, "spterm4", NULL, SPTAG(4), 1, 1, 0 -1 },
|
|
||||||
{ NULL, "spterm5", NULL, SPTAG(5), 1, 1, 0 -1 },
|
|
||||||
{ NULL, "spterm6", NULL, SPTAG(6), 1, 1, 0 -1 },
|
|
||||||
{ NULL, NULL, "Event Tester", 0, 0, 0, 1, -1 }, /* xev */
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/* layout(s) */
|
/* layout(s) */
|
||||||
static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
|
static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
|
||||||
static const int nmaster = 1; /* number of clients in master area */
|
static const int nmaster = 1; /* number of clients in master area */
|
||||||
|
@ -120,7 +109,7 @@ static const char *termcmd[] = { "st", NULL };
|
||||||
static const Key keys[] = {
|
static const Key keys[] = {
|
||||||
/* modifier key function argument */
|
/* modifier key function argument */
|
||||||
{ MODKEY, XK_r, spawn, {.v = dmenucmd } },
|
{ MODKEY, XK_r, spawn, {.v = dmenucmd } },
|
||||||
{ MODKEY, XK_w, spawn, {.v = dmenuwifi } },
|
{ MODKEY, XK_w, spawn, {.v = dmenuwifi } },
|
||||||
{ MODKEY, XK_Return, spawn, {.v = termcmd } },
|
{ MODKEY, XK_Return, spawn, {.v = termcmd } },
|
||||||
{ MODKEY, XK_b, togglebar, {0} },
|
{ MODKEY, XK_b, togglebar, {0} },
|
||||||
{ MODKEY, XK_j, focusstack, {.i = +1 } },
|
{ MODKEY, XK_j, focusstack, {.i = +1 } },
|
||||||
|
@ -158,11 +147,11 @@ static const Key keys[] = {
|
||||||
{ MODKEY|ControlMask|ShiftMask, XK_q, quit, {1} },
|
{ MODKEY|ControlMask|ShiftMask, XK_q, quit, {1} },
|
||||||
|
|
||||||
// Scratchpads
|
// Scratchpads
|
||||||
{ MODKEY, XK_y, togglescratch, {.ui = 0 } },
|
{ MODKEY, XK_y, togglescratch, {.ui = 0 } },
|
||||||
{ MODKEY, XK_u, togglescratch, {.ui = 1 } },
|
{ MODKEY, XK_u, togglescratch, {.ui = 1 } },
|
||||||
{ MODKEY, XK_i, togglescratch, {.ui = 2 } },
|
{ MODKEY, XK_i, togglescratch, {.ui = 2 } },
|
||||||
{ MODKEY, XK_c, togglescratch, {.ui = 3 } },
|
{ MODKEY, XK_c, togglescratch, {.ui = 3 } },
|
||||||
{ MODKEY|ShiftMask, XK_c, togglescratch, {.ui = 4 } },
|
{ MODKEY|ShiftMask, XK_c, togglescratch, {.ui = 4 } },
|
||||||
{ MODKEY, XK_a, togglescratch, {.ui = 5 } },
|
{ MODKEY, XK_a, togglescratch, {.ui = 5 } },
|
||||||
{ MODKEY, XK_p, togglescratch, {.ui = 6 } },
|
{ MODKEY, XK_p, togglescratch, {.ui = 6 } },
|
||||||
{ MODKEY, XK_o, togglescratch, {.ui = -1 } },
|
{ MODKEY, XK_o, togglescratch, {.ui = -1 } },
|
||||||
|
|
62
dwm.c
62
dwm.c
|
@ -183,6 +183,7 @@ static void focus(Client *c);
|
||||||
static void focusin(XEvent *e);
|
static void focusin(XEvent *e);
|
||||||
static void focusmon(const Arg *arg);
|
static void focusmon(const Arg *arg);
|
||||||
static void focusstack(const Arg *arg);
|
static void focusstack(const Arg *arg);
|
||||||
|
static pid_t getparentprocess(pid_t p);
|
||||||
static Atom getatomprop(Client *c, Atom prop);
|
static Atom getatomprop(Client *c, Atom prop);
|
||||||
static int getrootptr(int *x, int *y);
|
static int getrootptr(int *x, int *y);
|
||||||
static long getstate(Window w);
|
static long getstate(Window w);
|
||||||
|
@ -190,6 +191,7 @@ static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
|
||||||
static void grabbuttons(Client *c, int focused);
|
static void grabbuttons(Client *c, int focused);
|
||||||
static void grabkeys(void);
|
static void grabkeys(void);
|
||||||
static void incnmaster(const Arg *arg);
|
static void incnmaster(const Arg *arg);
|
||||||
|
static int isdescprocess(pid_t p, pid_t c);
|
||||||
static void keypress(XEvent *e);
|
static void keypress(XEvent *e);
|
||||||
static void killclient(const Arg *arg);
|
static void killclient(const Arg *arg);
|
||||||
static void manage(Window w, XWindowAttributes *wa);
|
static void manage(Window w, XWindowAttributes *wa);
|
||||||
|
@ -223,8 +225,10 @@ static void showhide(Client *c);
|
||||||
static void sighup(int unused);
|
static void sighup(int unused);
|
||||||
static void sigterm(int unused);
|
static void sigterm(int unused);
|
||||||
static void spawn(const Arg *arg);
|
static void spawn(const Arg *arg);
|
||||||
|
static Client *swallowingclient(Window w);
|
||||||
static void tag(const Arg *arg);
|
static void tag(const Arg *arg);
|
||||||
static void tagmon(const Arg *arg);
|
static void tagmon(const Arg *arg);
|
||||||
|
static Client *termforwin(const Client *c);
|
||||||
static void tile(Monitor *m);
|
static void tile(Monitor *m);
|
||||||
static void togglebar(const Arg *arg);
|
static void togglebar(const Arg *arg);
|
||||||
static void togglefloating(const Arg *arg);
|
static void togglefloating(const Arg *arg);
|
||||||
|
@ -245,6 +249,7 @@ static void updatetitle(Client *c);
|
||||||
static void updatewindowtype(Client *c);
|
static void updatewindowtype(Client *c);
|
||||||
static void updatewmhints(Client *c);
|
static void updatewmhints(Client *c);
|
||||||
static void view(const Arg *arg);
|
static void view(const Arg *arg);
|
||||||
|
static pid_t winpid(Window w);
|
||||||
static Client *wintoclient(Window w);
|
static Client *wintoclient(Window w);
|
||||||
static Monitor *wintomon(Window w);
|
static Monitor *wintomon(Window w);
|
||||||
static int xerror(Display *dpy, XErrorEvent *ee);
|
static int xerror(Display *dpy, XErrorEvent *ee);
|
||||||
|
@ -325,7 +330,6 @@ applyrules(Client *c)
|
||||||
&& (!r->instance || strstr(instance, r->instance)))
|
&& (!r->instance || strstr(instance, r->instance)))
|
||||||
{
|
{
|
||||||
c->isterminal = r->isterminal;
|
c->isterminal = r->isterminal;
|
||||||
c->noswallow = r->noswallow;
|
|
||||||
c->isfloating = r->isfloating;
|
c->isfloating = r->isfloating;
|
||||||
c->tags |= r->tags;
|
c->tags |= r->tags;
|
||||||
if ((r->tags & SPTAGMASK) && r->isfloating) {
|
if ((r->tags & SPTAGMASK) && r->isfloating) {
|
||||||
|
@ -452,11 +456,8 @@ attachstack(Client *c)
|
||||||
void
|
void
|
||||||
swallow(Client *p, Client *c)
|
swallow(Client *p, Client *c)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (c->noswallow || c->isterminal)
|
if (c->noswallow || c->isterminal)
|
||||||
return;
|
return;
|
||||||
if (c->noswallow && !swallowfloating && c->isfloating)
|
|
||||||
return;
|
|
||||||
|
|
||||||
detach(c);
|
detach(c);
|
||||||
detachstack(c);
|
detachstack(c);
|
||||||
|
@ -471,8 +472,8 @@ swallow(Client *p, Client *c)
|
||||||
p->win = c->win;
|
p->win = c->win;
|
||||||
c->win = w;
|
c->win = w;
|
||||||
updatetitle(p);
|
updatetitle(p);
|
||||||
XMoveResizeWindow(dpy, p->win, p->x, p->y, p->w, p->h);
|
|
||||||
arrange(p->mon);
|
arrange(p->mon);
|
||||||
|
XMoveResizeWindow(dpy, p->win, p->x, p->y, p->w, p->h);
|
||||||
configure(p);
|
configure(p);
|
||||||
updateclientlist();
|
updateclientlist();
|
||||||
}
|
}
|
||||||
|
@ -485,15 +486,12 @@ unswallow(Client *c)
|
||||||
free(c->swallowing);
|
free(c->swallowing);
|
||||||
c->swallowing = NULL;
|
c->swallowing = NULL;
|
||||||
|
|
||||||
/* unfullscreen the client */
|
|
||||||
setfullscreen(c, 0);
|
|
||||||
updatetitle(c);
|
updatetitle(c);
|
||||||
arrange(c->mon);
|
arrange(c->mon);
|
||||||
XMapWindow(dpy, c->win);
|
XMapWindow(dpy, c->win);
|
||||||
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
|
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
|
||||||
|
configure(c);
|
||||||
setclientstate(c, NormalState);
|
setclientstate(c, NormalState);
|
||||||
focus(NULL);
|
|
||||||
arrange(c->mon);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -567,7 +565,7 @@ cleanup(void)
|
||||||
selmon->lt[selmon->sellt] = &foo;
|
selmon->lt[selmon->sellt] = &foo;
|
||||||
for (m = mons; m; m = m->next)
|
for (m = mons; m; m = m->next)
|
||||||
while (m->stack)
|
while (m->stack)
|
||||||
unmanage(m->stack, 0);
|
unmanage(m->stack, 0); // XXX - unmanage swallowing windows too
|
||||||
XUngrabKey(dpy, AnyKey, AnyModifier, root);
|
XUngrabKey(dpy, AnyKey, AnyModifier, root);
|
||||||
while (mons)
|
while (mons)
|
||||||
cleanupmon(mons);
|
cleanupmon(mons);
|
||||||
|
@ -2010,7 +2008,7 @@ unmanage(Client *c, int destroyed)
|
||||||
free(s->swallowing);
|
free(s->swallowing);
|
||||||
s->swallowing = NULL;
|
s->swallowing = NULL;
|
||||||
arrange(m);
|
arrange(m);
|
||||||
focus(NULL);
|
focus(NULL);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2301,10 +2299,8 @@ view(const Arg *arg)
|
||||||
pid_t
|
pid_t
|
||||||
winpid(Window w)
|
winpid(Window w)
|
||||||
{
|
{
|
||||||
|
|
||||||
pid_t result = 0;
|
pid_t result = 0;
|
||||||
|
|
||||||
#ifdef __linux__
|
|
||||||
xcb_res_client_id_spec_t spec = {0};
|
xcb_res_client_id_spec_t spec = {0};
|
||||||
spec.client = w;
|
spec.client = w;
|
||||||
spec.mask = XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID;
|
spec.mask = XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID;
|
||||||
|
@ -2330,24 +2326,6 @@ winpid(Window w)
|
||||||
|
|
||||||
if (result == (pid_t)-1)
|
if (result == (pid_t)-1)
|
||||||
result = 0;
|
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;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2366,20 +2344,7 @@ getparentprocess(pid_t p)
|
||||||
|
|
||||||
fscanf(f, "%*u %*s %*c %u", &v);
|
fscanf(f, "%*u %*s %*c %u", &v);
|
||||||
fclose(f);
|
fclose(f);
|
||||||
#endif /* __linux__*/
|
#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;
|
return (pid_t)v;
|
||||||
}
|
}
|
||||||
|
@ -2434,10 +2399,13 @@ wintoclient(Window w)
|
||||||
Client *c;
|
Client *c;
|
||||||
Monitor *m;
|
Monitor *m;
|
||||||
|
|
||||||
for (m = mons; m; m = m->next)
|
for (m = mons; m; m = m->next) {
|
||||||
for (c = m->clients; c; c = c->next)
|
for (c = m->clients; c; c = c->next) {
|
||||||
if (c->win == w)
|
if (c->win == w)
|
||||||
return c;
|
return c;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,381 @@
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index fd77a07..69976b3 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -26,9 +26,10 @@ 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, 0, -1 },
|
||||||
|
+ { "st", NULL, NULL, 0, 0, 1, 1, -1 },
|
||||||
|
};
|
||||||
|
|
||||||
|
/* layout(s) */
|
||||||
|
diff --git a/config.mk b/config.mk
|
||||||
|
index 80dc936..5ed14e3 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=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
|
||||||
|
diff --git a/dwm.c b/dwm.c
|
||||||
|
index b2bc9bd..528df2f 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"
|
||||||
|
@@ -93,9 +95,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;
|
||||||
|
};
|
||||||
|
@@ -139,6 +143,8 @@ typedef struct {
|
||||||
|
const char *title;
|
||||||
|
unsigned int tags;
|
||||||
|
int isfloating;
|
||||||
|
+ int isterminal;
|
||||||
|
+ int noswallow;
|
||||||
|
int monitor;
|
||||||
|
} Rule;
|
||||||
|
|
||||||
|
@@ -171,12 +177,14 @@ static void focus(Client *c);
|
||||||
|
static void focusin(XEvent *e);
|
||||||
|
static void focusmon(const Arg *arg);
|
||||||
|
static void focusstack(const Arg *arg);
|
||||||
|
+static pid_t getparentprocess(pid_t p);
|
||||||
|
static int getrootptr(int *x, int *y);
|
||||||
|
static long getstate(Window w);
|
||||||
|
static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
|
||||||
|
static void grabbuttons(Client *c, int focused);
|
||||||
|
static void grabkeys(void);
|
||||||
|
static void incnmaster(const Arg *arg);
|
||||||
|
+static int isdescprocess(pid_t p, pid_t c);
|
||||||
|
static void keypress(XEvent *e);
|
||||||
|
static void killclient(const Arg *arg);
|
||||||
|
static void manage(Window w, XWindowAttributes *wa);
|
||||||
|
@@ -207,8 +215,10 @@ static void setup(void);
|
||||||
|
static void showhide(Client *c);
|
||||||
|
static void sigchld(int unused);
|
||||||
|
static void spawn(const Arg *arg);
|
||||||
|
+static Client *swallowingclient(Window w);
|
||||||
|
static void tag(const Arg *arg);
|
||||||
|
static void tagmon(const Arg *arg);
|
||||||
|
+static Client *termforwin(const Client *c);
|
||||||
|
static void tile(Monitor *);
|
||||||
|
static void togglebar(const Arg *arg);
|
||||||
|
static void togglefloating(const Arg *arg);
|
||||||
|
@@ -228,6 +238,7 @@ static void updatewindowtype(Client *c);
|
||||||
|
static void updatetitle(Client *c);
|
||||||
|
static void updatewmhints(Client *c);
|
||||||
|
static void view(const Arg *arg);
|
||||||
|
+static pid_t winpid(Window w);
|
||||||
|
static Client *wintoclient(Window w);
|
||||||
|
static Monitor *wintomon(Window w);
|
||||||
|
static int xerror(Display *dpy, XErrorEvent *ee);
|
||||||
|
@@ -269,6 +280,8 @@ static Drw *drw;
|
||||||
|
static Monitor *mons, *selmon;
|
||||||
|
static Window root;
|
||||||
|
|
||||||
|
+static xcb_connection_t *xcon;
|
||||||
|
+
|
||||||
|
/* configuration, allows nested code to access above variables */
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
|
@@ -298,6 +311,7 @@ applyrules(Client *c)
|
||||||
|
&& (!r->class || strstr(class, r->class))
|
||||||
|
&& (!r->instance || strstr(instance, r->instance)))
|
||||||
|
{
|
||||||
|
+ c->isterminal = r->isterminal;
|
||||||
|
c->isfloating = r->isfloating;
|
||||||
|
c->tags |= r->tags;
|
||||||
|
for (m = mons; m && m->num != r->monitor; m = m->next);
|
||||||
|
@@ -415,6 +429,47 @@ attachstack(Client *c)
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
+swallow(Client *p, Client *c)
|
||||||
|
+{
|
||||||
|
+ if (c->noswallow || c->isterminal)
|
||||||
|
+ 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);
|
||||||
|
+ arrange(p->mon);
|
||||||
|
+ XMoveResizeWindow(dpy, p->win, p->x, p->y, p->w, p->h);
|
||||||
|
+ configure(p);
|
||||||
|
+ updateclientlist();
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+unswallow(Client *c)
|
||||||
|
+{
|
||||||
|
+ c->win = c->swallowing->win;
|
||||||
|
+
|
||||||
|
+ free(c->swallowing);
|
||||||
|
+ c->swallowing = NULL;
|
||||||
|
+
|
||||||
|
+ updatetitle(c);
|
||||||
|
+ arrange(c->mon);
|
||||||
|
+ XMapWindow(dpy, c->win);
|
||||||
|
+ XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
|
||||||
|
+ configure(c);
|
||||||
|
+ setclientstate(c, NormalState);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
buttonpress(XEvent *e)
|
||||||
|
{
|
||||||
|
unsigned int i, x, click;
|
||||||
|
@@ -477,7 +531,7 @@ cleanup(void)
|
||||||
|
selmon->lt[selmon->sellt] = &foo;
|
||||||
|
for (m = mons; m; m = m->next)
|
||||||
|
while (m->stack)
|
||||||
|
- unmanage(m->stack, 0);
|
||||||
|
+ unmanage(m->stack, 0); // XXX - unmanage swallowing windows too
|
||||||
|
XUngrabKey(dpy, AnyKey, AnyModifier, root);
|
||||||
|
while (mons)
|
||||||
|
cleanupmon(mons);
|
||||||
|
@@ -665,6 +719,9 @@ destroynotify(XEvent *e)
|
||||||
|
|
||||||
|
if ((c = wintoclient(ev->window)))
|
||||||
|
unmanage(c, 1);
|
||||||
|
+
|
||||||
|
+ else if ((c = swallowingclient(ev->window)))
|
||||||
|
+ unmanage(c->swallowing, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
@@ -1034,12 +1091,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 +1112,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)
|
||||||
|
@@ -1090,6 +1149,8 @@ manage(Window w, XWindowAttributes *wa)
|
||||||
|
c->mon->sel = c;
|
||||||
|
arrange(c->mon);
|
||||||
|
XMapWindow(dpy, c->win);
|
||||||
|
+ if (term)
|
||||||
|
+ swallow(term, c);
|
||||||
|
focus(NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1757,6 +1818,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;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/* The server grab construct avoids race conditions. */
|
||||||
|
detach(c);
|
||||||
|
detachstack(c);
|
||||||
|
@@ -1772,9 +1847,12 @@ unmanage(Client *c, int destroyed)
|
||||||
|
XUngrabServer(dpy);
|
||||||
|
}
|
||||||
|
free(c);
|
||||||
|
- focus(NULL);
|
||||||
|
- updateclientlist();
|
||||||
|
- arrange(m);
|
||||||
|
+
|
||||||
|
+ if (!s) {
|
||||||
|
+ arrange(m);
|
||||||
|
+ focus(NULL);
|
||||||
|
+ updateclientlist();
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
@@ -2039,16 +2117,116 @@ 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;
|
||||||
|
+
|
||||||
|
+#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__ */
|
||||||
|
+
|
||||||
|
+ 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)
|
||||||
|
{
|
||||||
|
Client *c;
|
||||||
|
Monitor *m;
|
||||||
|
|
||||||
|
- for (m = mons; m; m = m->next)
|
||||||
|
- for (c = m->clients; c; c = c->next)
|
||||||
|
+ for (m = mons; m; m = m->next) {
|
||||||
|
+ for (c = m->clients; c; c = c->next) {
|
||||||
|
if (c->win == w)
|
||||||
|
return c;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -2130,6 +2308,8 @@ main(int argc, char *argv[])
|
||||||
|
fputs("warning: no locale support\n", stderr);
|
||||||
|
if (!(dpy = XOpenDisplay(NULL)))
|
||||||
|
die("dwm: cannot open display\n");
|
||||||
|
+ if (!(xcon = XGetXCBConnection(dpy)))
|
||||||
|
+ die("dwm: cannot get xcb connection\n");
|
||||||
|
checkotherwm();
|
||||||
|
setup();
|
||||||
|
scan();
|
Loading…
Reference in New Issue