@@ -7,6 +7,7 @@ This my own patched and configured dwm build with following pathes: | |||||
- alwaysontop | - alwaysontop | ||||
- cool-autostart | - cool-autostart | ||||
- center | - center | ||||
- centeredmaster | |||||
- fullgaps | - fullgaps | ||||
- swallow | - swallow | ||||
@@ -28,7 +28,7 @@ static const char *const autostart[] = { | |||||
}; | }; | ||||
/* tagging */ | /* tagging */ | ||||
static const char *tags[] = { "", "", "", "", "", "", "" }; | |||||
static const char *tags[] = { "", "", "", "", "", "", "", "", "" }; | |||||
static const Rule rules[] = { | static const Rule rules[] = { | ||||
/* xprop(1): | /* xprop(1): | ||||
@@ -55,6 +55,8 @@ static const Layout layouts[] = { | |||||
{ "[]=", tile }, /* first entry is default */ | { "[]=", tile }, /* first entry is default */ | ||||
{ "><>", NULL }, /* no layout function means floating behavior */ | { "><>", NULL }, /* no layout function means floating behavior */ | ||||
{ "[M]", monocle }, | { "[M]", monocle }, | ||||
{ "|M|", centeredmaster }, | |||||
{ ">M>", centeredfloatingmaster }, | |||||
}; | }; | ||||
/* key definitions */ | /* key definitions */ | ||||
@@ -111,6 +113,8 @@ static Key keys[] = { | |||||
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, | { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, | ||||
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, | { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, | ||||
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, | { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, | ||||
{ MODKEY, XK_u, setlayout, {.v = &layouts[3]} }, | |||||
{ MODKEY, XK_o, setlayout, {.v = &layouts[4]} }, | |||||
{ MODKEY, XK_space, setlayout, {0} }, | { MODKEY, XK_space, setlayout, {0} }, | ||||
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} }, | { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, | ||||
{ MODKEY, XK_0, view, {.ui = ~0 } }, | { MODKEY, XK_0, view, {.ui = ~0 } }, | ||||
@@ -4,6 +4,7 @@ | |||||
static const unsigned int borderpx = 2; /* border pixel of windows */ | static const unsigned int borderpx = 2; /* border pixel of windows */ | ||||
static const unsigned int gappx = 15; | static const unsigned int gappx = 15; | ||||
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 char *fonts[] = { "monospace:size=13", "fontawesome:size=15"}; | static const char *fonts[] = { "monospace:size=13", "fontawesome:size=15"}; | ||||
@@ -27,7 +28,7 @@ static const char *const autostart[] = { | |||||
}; | }; | ||||
/* tagging */ | /* tagging */ | ||||
static const char *tags[] = { "", "", "", "", "", "", "" }; | |||||
static const char *tags[] = { "", "", "", "", "", "", "", "", "" }; | |||||
static const Rule rules[] = { | static const Rule rules[] = { | ||||
/* xprop(1): | /* xprop(1): | ||||
@@ -37,6 +38,11 @@ static const Rule rules[] = { | |||||
/* class instance title tags mask iscentered isfloating monitor */ | /* class instance title tags mask iscentered isfloating monitor */ | ||||
{ "Gimp", NULL, NULL, 0, 0, 1, -1 }, | { "Gimp", NULL, NULL, 0, 0, 1, -1 }, | ||||
{ "Firefox", NULL, NULL, 1 << 8, 0, 0, -1 }, | { "Firefox", NULL, NULL, 1 << 8, 0, 0, -1 }, | ||||
/* class instance title tags mask iscentered isfloating isterminal noswallow monitor */ | |||||
{ "Gimp", NULL, NULL, 0,0, 1, 0, 0, -1 }, | |||||
{ "Firefox", NULL, NULL, 1 << 8,0, 0, 0, -1, -1 }, | |||||
{ "St", NULL, NULL, 0,0, 0, 1, 0, -1 }, | |||||
{ NULL, NULL, "Event Tester", 0,0, 0, 0, 1, -1 }, /* xev */ | |||||
}; | }; | ||||
/* layout(s) */ | /* layout(s) */ | ||||
@@ -28,7 +28,7 @@ static const char *const autostart[] = { | |||||
}; | }; | ||||
/* tagging */ | /* tagging */ | ||||
static const char *tags[] = { "", "", "", "", "", "", "" }; | |||||
static const char *tags[] = { "", "", "", "", "", "", "", "", "" }; | |||||
static const Rule rules[] = { | static const Rule rules[] = { | ||||
/* xprop(1): | /* xprop(1): | ||||
@@ -55,6 +55,8 @@ static const Layout layouts[] = { | |||||
{ "[]=", tile }, /* first entry is default */ | { "[]=", tile }, /* first entry is default */ | ||||
{ "><>", NULL }, /* no layout function means floating behavior */ | { "><>", NULL }, /* no layout function means floating behavior */ | ||||
{ "[M]", monocle }, | { "[M]", monocle }, | ||||
{ "|M|", centeredmaster }, | |||||
{ ">M>", centeredfloatingmaster }, | |||||
}; | }; | ||||
/* key definitions */ | /* key definitions */ | ||||
@@ -111,6 +113,8 @@ static Key keys[] = { | |||||
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, | { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, | ||||
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, | { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, | ||||
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, | { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, | ||||
{ MODKEY, XK_u, setlayout, {.v = &layouts[3]} }, | |||||
{ MODKEY, XK_o, setlayout, {.v = &layouts[4]} }, | |||||
{ MODKEY, XK_space, setlayout, {0} }, | { MODKEY, XK_space, setlayout, {0} }, | ||||
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} }, | { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, | ||||
{ MODKEY, XK_0, view, {.ui = ~0 } }, | { MODKEY, XK_0, view, {.ui = ~0 } }, | ||||
@@ -0,0 +1,142 @@ | |||||
diff --git a/config.def.h b/config.def.h | |||||
index 7054c06..527b214 100644 | |||||
--- a/config.def.h | |||||
+++ b/config.def.h | |||||
@@ -39,6 +39,8 @@ static const Layout layouts[] = { | |||||
{ "[]=", tile }, /* first entry is default */ | |||||
{ "><>", NULL }, /* no layout function means floating behavior */ | |||||
{ "[M]", monocle }, | |||||
+ { "|M|", centeredmaster }, | |||||
+ { ">M>", centeredfloatingmaster }, | |||||
}; | |||||
/* key definitions */ | |||||
@@ -74,6 +76,8 @@ static Key keys[] = { | |||||
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, | |||||
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, | |||||
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, | |||||
+ { MODKEY, XK_u, setlayout, {.v = &layouts[3]} }, | |||||
+ { MODKEY, XK_o, setlayout, {.v = &layouts[4]} }, | |||||
{ MODKEY, XK_space, setlayout, {0} }, | |||||
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} }, | |||||
{ MODKEY, XK_0, view, {.ui = ~0 } }, | |||||
diff --git a/dwm.c b/dwm.c | |||||
index 0362114..1e81412 100644 | |||||
--- a/dwm.c | |||||
+++ b/dwm.c | |||||
@@ -233,6 +233,8 @@ static int xerror(Display *dpy, XErrorEvent *ee); | |||||
static int xerrordummy(Display *dpy, XErrorEvent *ee); | |||||
static int xerrorstart(Display *dpy, XErrorEvent *ee); | |||||
static void zoom(const Arg *arg); | |||||
+static void centeredmaster(Monitor *m); | |||||
+static void centeredfloatingmaster(Monitor *m); | |||||
/* variables */ | |||||
static const char broken[] = "broken"; | |||||
@@ -2139,3 +2141,106 @@ main(int argc, char *argv[]) | |||||
XCloseDisplay(dpy); | |||||
return EXIT_SUCCESS; | |||||
} | |||||
+ | |||||
+void | |||||
+centeredmaster(Monitor *m) | |||||
+{ | |||||
+ unsigned int i, n, h, mw, mx, my, oty, ety, tw; | |||||
+ Client *c; | |||||
+ | |||||
+ /* count number of clients in the selected monitor */ | |||||
+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); | |||||
+ if (n == 0) | |||||
+ return; | |||||
+ | |||||
+ /* initialize areas */ | |||||
+ mw = m->ww; | |||||
+ mx = 0; | |||||
+ my = 0; | |||||
+ tw = mw; | |||||
+ | |||||
+ if (n > m->nmaster) { | |||||
+ /* go mfact box in the center if more than nmaster clients */ | |||||
+ mw = m->nmaster ? m->ww * m->mfact : 0; | |||||
+ tw = m->ww - mw; | |||||
+ | |||||
+ if (n - m->nmaster > 1) { | |||||
+ /* only one client */ | |||||
+ mx = (m->ww - mw) / 2; | |||||
+ tw = (m->ww - mw) / 2; | |||||
+ } | |||||
+ } | |||||
+ | |||||
+ oty = 0; | |||||
+ ety = 0; | |||||
+ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) | |||||
+ if (i < m->nmaster) { | |||||
+ /* nmaster clients are stacked vertically, in the center | |||||
+ * of the screen */ | |||||
+ h = (m->wh - my) / (MIN(n, m->nmaster) - i); | |||||
+ resize(c, m->wx + mx, m->wy + my, mw - (2*c->bw), | |||||
+ h - (2*c->bw), 0); | |||||
+ my += HEIGHT(c); | |||||
+ } else { | |||||
+ /* stack clients are stacked vertically */ | |||||
+ if ((i - m->nmaster) % 2 ) { | |||||
+ h = (m->wh - ety) / ( (1 + n - i) / 2); | |||||
+ resize(c, m->wx, m->wy + ety, tw - (2*c->bw), | |||||
+ h - (2*c->bw), 0); | |||||
+ ety += HEIGHT(c); | |||||
+ } else { | |||||
+ h = (m->wh - oty) / ((1 + n - i) / 2); | |||||
+ resize(c, m->wx + mx + mw, m->wy + oty, | |||||
+ tw - (2*c->bw), h - (2*c->bw), 0); | |||||
+ oty += HEIGHT(c); | |||||
+ } | |||||
+ } | |||||
+} | |||||
+ | |||||
+void | |||||
+centeredfloatingmaster(Monitor *m) | |||||
+{ | |||||
+ unsigned int i, n, w, mh, mw, mx, mxo, my, myo, tx; | |||||
+ Client *c; | |||||
+ | |||||
+ /* count number of clients in the selected monitor */ | |||||
+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); | |||||
+ if (n == 0) | |||||
+ return; | |||||
+ | |||||
+ /* initialize nmaster area */ | |||||
+ if (n > m->nmaster) { | |||||
+ /* go mfact box in the center if more than nmaster clients */ | |||||
+ if (m->ww > m->wh) { | |||||
+ mw = m->nmaster ? m->ww * m->mfact : 0; | |||||
+ mh = m->nmaster ? m->wh * 0.9 : 0; | |||||
+ } else { | |||||
+ mh = m->nmaster ? m->wh * m->mfact : 0; | |||||
+ mw = m->nmaster ? m->ww * 0.9 : 0; | |||||
+ } | |||||
+ mx = mxo = (m->ww - mw) / 2; | |||||
+ my = myo = (m->wh - mh) / 2; | |||||
+ } else { | |||||
+ /* go fullscreen if all clients are in the master area */ | |||||
+ mh = m->wh; | |||||
+ mw = m->ww; | |||||
+ mx = mxo = 0; | |||||
+ my = myo = 0; | |||||
+ } | |||||
+ | |||||
+ for(i = tx = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) | |||||
+ if (i < m->nmaster) { | |||||
+ /* nmaster clients are stacked horizontally, in the center | |||||
+ * of the screen */ | |||||
+ w = (mw + mxo - mx) / (MIN(n, m->nmaster) - i); | |||||
+ resize(c, m->wx + mx, m->wy + my, w - (2*c->bw), | |||||
+ mh - (2*c->bw), 0); | |||||
+ mx += WIDTH(c); | |||||
+ } else { | |||||
+ /* stack clients are stacked horizontally */ | |||||
+ w = (m->ww - tx) / (n - i); | |||||
+ resize(c, m->wx + tx, m->wy, w - (2*c->bw), | |||||
+ m->wh - (2*c->bw), 0); | |||||
+ tx += WIDTH(c); | |||||
+ } | |||||
+} |
@@ -1,412 +0,0 @@ | |||||
From b2de9b0fd7988241db516a8f032f26cb9cf32be1 Mon Sep 17 00:00:00 2001 | |||||
From: Ben <ben@0x1bi.net> | |||||
Date: Fri, 7 Aug 2020 20:14:29 -0400 | |||||
Subject: [PATCH] added openbsd support for swallowing | |||||
--- | |||||
config.def.h | 9 +- | |||||
config.mk | 3 +- | |||||
dwm.c | 235 +++++++++++++++++++++++++++++++++++++++++++++++++-- | |||||
3 files changed, 237 insertions(+), 10 deletions(-) | |||||
diff --git a/config.def.h b/config.def.h | |||||
index 1c0b587..fe51476 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, 0, -1 }, | |||||
+ { NULL, NULL, "Event Tester", 0, 0, 0, 1, -1 }, /* xev */ | |||||
}; | |||||
/* layout(s) */ | |||||
diff --git a/config.mk b/config.mk | |||||
index 7084c33..ff9e508 100644 | |||||
--- a/config.mk | |||||
+++ b/config.mk | |||||
@@ -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} | |||||
+LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lX11-xcb -lxcb -lxcb-res ${KVMLIB} | |||||
# 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..e9f08f7 100644 | |||||
--- a/dwm.c | |||||
+++ b/dwm.c | |||||
@@ -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; | |||||
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 +146,8 @@ typedef struct { | |||||
const char *title; | |||||
unsigned int tags; | |||||
int isfloating; | |||||
+ int isterminal; | |||||
+ int noswallow; | |||||
int monitor; | |||||
} Rule; | |||||
@@ -235,6 +245,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]; | |||||
@@ -269,6 +285,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" | |||||
@@ -298,6 +316,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 +434,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) | |||||
{ | |||||
@@ -653,6 +720,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 +1088,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 +1109,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 +1146,8 @@ manage(Window w, XWindowAttributes *wa) | |||||
c->mon->sel = c; | |||||
arrange(c->mon); | |||||
XMapWindow(dpy, c->win); | |||||
+ if (term) | |||||
+ swallow(term, c); | |||||
focus(NULL); | |||||
} | |||||
@@ -1768,6 +1842,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 +1870,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 +2138,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) | |||||
{ | |||||
@@ -2138,10 +2359,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(); | |||||
2.26.2 | |||||
@@ -247,6 +247,8 @@ static int xerror(Display *dpy, XErrorEvent *ee); | |||||
static int xerrordummy(Display *dpy, XErrorEvent *ee); | static int xerrordummy(Display *dpy, XErrorEvent *ee); | ||||
static int xerrorstart(Display *dpy, XErrorEvent *ee); | static int xerrorstart(Display *dpy, XErrorEvent *ee); | ||||
static void zoom(const Arg *arg); | static void zoom(const Arg *arg); | ||||
static void centeredmaster(Monitor *m); | |||||
static void centeredfloatingmaster(Monitor *m); | |||||
static void autostart_exec(void); | static void autostart_exec(void); | ||||
static pid_t getparentprocess(pid_t p); | static pid_t getparentprocess(pid_t p); | ||||
@@ -2489,3 +2491,106 @@ main(int argc, char *argv[]) | |||||
XCloseDisplay(dpy); | XCloseDisplay(dpy); | ||||
return EXIT_SUCCESS; | return EXIT_SUCCESS; | ||||
} | } | ||||
void | |||||
centeredmaster(Monitor *m) | |||||
{ | |||||
unsigned int i, n, h, mw, mx, my, oty, ety, tw; | |||||
Client *c; | |||||
/* count number of clients in the selected monitor */ | |||||
for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); | |||||
if (n == 0) | |||||
return; | |||||
/* initialize areas */ | |||||
mw = m->ww; | |||||
mx = 0; | |||||
my = 0; | |||||
tw = mw; | |||||
if (n > m->nmaster) { | |||||
/* go mfact box in the center if more than nmaster clients */ | |||||
mw = m->nmaster ? m->ww * m->mfact : 0; | |||||
tw = m->ww - mw; | |||||
if (n - m->nmaster > 1) { | |||||
/* only one client */ | |||||
mx = (m->ww - mw) / 2; | |||||
tw = (m->ww - mw) / 2; | |||||
} | |||||
} | |||||
oty = 0; | |||||
ety = 0; | |||||
for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) | |||||
if (i < m->nmaster) { | |||||
/* nmaster clients are stacked vertically, in the center | |||||
* of the screen */ | |||||
h = (m->wh - my) / (MIN(n, m->nmaster) - i); | |||||
resize(c, m->wx + mx, m->wy + my, mw - (2*c->bw), | |||||
h - (2*c->bw), 0); | |||||
my += HEIGHT(c); | |||||
} else { | |||||
/* stack clients are stacked vertically */ | |||||
if ((i - m->nmaster) % 2 ) { | |||||
h = (m->wh - ety) / ( (1 + n - i) / 2); | |||||
resize(c, m->wx, m->wy + ety, tw - (2*c->bw), | |||||
h - (2*c->bw), 0); | |||||
ety += HEIGHT(c); | |||||
} else { | |||||
h = (m->wh - oty) / ((1 + n - i) / 2); | |||||
resize(c, m->wx + mx + mw, m->wy + oty, | |||||
tw - (2*c->bw), h - (2*c->bw), 0); | |||||
oty += HEIGHT(c); | |||||
} | |||||
} | |||||
} | |||||
void | |||||
centeredfloatingmaster(Monitor *m) | |||||
{ | |||||
unsigned int i, n, w, mh, mw, mx, mxo, my, myo, tx; | |||||
Client *c; | |||||
/* count number of clients in the selected monitor */ | |||||
for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); | |||||
if (n == 0) | |||||
return; | |||||
/* initialize nmaster area */ | |||||
if (n > m->nmaster) { | |||||
/* go mfact box in the center if more than nmaster clients */ | |||||
if (m->ww > m->wh) { | |||||
mw = m->nmaster ? m->ww * m->mfact : 0; | |||||
mh = m->nmaster ? m->wh * 0.9 : 0; | |||||
} else { | |||||
mh = m->nmaster ? m->wh * m->mfact : 0; | |||||
mw = m->nmaster ? m->ww * 0.9 : 0; | |||||
} | |||||
mx = mxo = (m->ww - mw) / 2; | |||||
my = myo = (m->wh - mh) / 2; | |||||
} else { | |||||
/* go fullscreen if all clients are in the master area */ | |||||
mh = m->wh; | |||||
mw = m->ww; | |||||
mx = mxo = 0; | |||||
my = myo = 0; | |||||
} | |||||
for(i = tx = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) | |||||
if (i < m->nmaster) { | |||||
/* nmaster clients are stacked horizontally, in the center | |||||
* of the screen */ | |||||
w = (mw + mxo - mx) / (MIN(n, m->nmaster) - i); | |||||
resize(c, m->wx + mx, m->wy + my, w - (2*c->bw), | |||||
mh - (2*c->bw), 0); | |||||
mx += WIDTH(c); | |||||
} else { | |||||
/* stack clients are stacked horizontally */ | |||||
w = (m->ww - tx) / (n - i); | |||||
resize(c, m->wx + tx, m->wy, w - (2*c->bw), | |||||
m->wh - (2*c->bw), 0); | |||||
tx += WIDTH(c); | |||||
} | |||||
} |
@@ -40,6 +40,12 @@ | |||||
#include <X11/extensions/Xinerama.h> | #include <X11/extensions/Xinerama.h> | ||||
#endif /* XINERAMA */ | #endif /* XINERAMA */ | ||||
#include <X11/Xft/Xft.h> | #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 "drw.h" | ||||
#include "util.h" | #include "util.h" | ||||
@@ -92,9 +98,11 @@ struct Client { | |||||
int basew, baseh, incw, inch, maxw, maxh, minw, minh; | int basew, baseh, incw, inch, maxw, maxh, minw, minh; | ||||
int bw, oldbw; | int bw, oldbw; | ||||
unsigned int tags; | unsigned int tags; | ||||
int isfixed, iscentered, isfloating, isalwaysontop, isurgent, neverfocus, oldstate, isfullscreen; | |||||
int isfixed, iscentered, isfloating, isalwaysontop, isurgent, neverfocus, oldstate, isfullscreen, isterminal, noswallow; | |||||
pid_t pid; | |||||
Client *next; | Client *next; | ||||
Client *snext; | Client *snext; | ||||
Client *swallowing; | |||||
Monitor *mon; | Monitor *mon; | ||||
Window win; | Window win; | ||||
}; | }; | ||||
@@ -140,6 +148,8 @@ typedef struct { | |||||
unsigned int tags; | unsigned int tags; | ||||
int iscentered; | int iscentered; | ||||
int isfloating; | int isfloating; | ||||
int isterminal; | |||||
int noswallow; | |||||
int monitor; | int monitor; | ||||
} Rule; | } Rule; | ||||
@@ -239,6 +249,12 @@ static int xerrorstart(Display *dpy, XErrorEvent *ee); | |||||
static void zoom(const Arg *arg); | static void zoom(const Arg *arg); | ||||
static void autostart_exec(void); | static void autostart_exec(void); | ||||
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 */ | /* variables */ | ||||
static const char broken[] = "broken"; | static const char broken[] = "broken"; | ||||
static char stext[256]; | static char stext[256]; | ||||
@@ -273,6 +289,8 @@ static Drw *drw; | |||||
static Monitor *mons, *selmon; | static Monitor *mons, *selmon; | ||||
static Window root, wmcheckwin; | static Window root, wmcheckwin; | ||||
static xcb_connection_t *xcon; | |||||
/* configuration, allows nested code to access above variables */ | /* configuration, allows nested code to access above variables */ | ||||
#include "config.h" | #include "config.h" | ||||
@@ -331,6 +349,8 @@ applyrules(Client *c) | |||||
&& (!r->class || strstr(class, r->class)) | && (!r->class || strstr(class, r->class)) | ||||
&& (!r->instance || strstr(instance, r->instance))) | && (!r->instance || strstr(instance, r->instance))) | ||||
{ | { | ||||
c->isterminal = r->isterminal; | |||||
c->noswallow = r->noswallow; | |||||
c->iscentered = r->iscentered; | c->iscentered = r->iscentered; | ||||
c->isfloating = r->isfloating; | c->isfloating = r->isfloating; | ||||
c->tags |= r->tags; | c->tags |= r->tags; | ||||
@@ -448,6 +468,53 @@ attachstack(Client *c) | |||||
c->mon->stack = 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 | void | ||||
buttonpress(XEvent *e) | buttonpress(XEvent *e) | ||||
{ | { | ||||
@@ -688,6 +755,9 @@ destroynotify(XEvent *e) | |||||
if ((c = wintoclient(ev->window))) | if ((c = wintoclient(ev->window))) | ||||
unmanage(c, 1); | unmanage(c, 1); | ||||
else if ((c = swallowingclient(ev->window))) | |||||
unmanage(c->swallowing, 1); | |||||
} | } | ||||
void | void | ||||
@@ -1056,12 +1126,13 @@ killclient(const Arg *arg) | |||||
void | void | ||||
manage(Window w, XWindowAttributes *wa) | manage(Window w, XWindowAttributes *wa) | ||||
{ | { | ||||
Client *c, *t = NULL; | |||||
Client *c, *t = NULL, *term = NULL; | |||||
Window trans = None; | Window trans = None; | ||||
XWindowChanges wc; | XWindowChanges wc; | ||||
c = ecalloc(1, sizeof(Client)); | c = ecalloc(1, sizeof(Client)); | ||||
c->win = w; | c->win = w; | ||||
c->pid = winpid(w); | |||||
/* geometry */ | /* geometry */ | ||||
c->x = c->oldx = wa->x; | c->x = c->oldx = wa->x; | ||||
c->y = c->oldy = wa->y; | c->y = c->oldy = wa->y; | ||||
@@ -1076,6 +1147,7 @@ manage(Window w, XWindowAttributes *wa) | |||||
} else { | } else { | ||||
c->mon = selmon; | c->mon = selmon; | ||||
applyrules(c); | applyrules(c); | ||||
term = termforwin(c); | |||||
} | } | ||||
if (c->x + WIDTH(c) > c->mon->mx + c->mon->mw) | if (c->x + WIDTH(c) > c->mon->mx + c->mon->mw) | ||||
@@ -1116,6 +1188,8 @@ manage(Window w, XWindowAttributes *wa) | |||||
c->mon->sel = c; | c->mon->sel = c; | ||||
arrange(c->mon); | arrange(c->mon); | ||||
XMapWindow(dpy, c->win); | XMapWindow(dpy, c->win); | ||||
if (term) | |||||
swallow(term, c); | |||||
focus(NULL); | focus(NULL); | ||||
} | } | ||||
@@ -1881,6 +1955,20 @@ unmanage(Client *c, int destroyed) | |||||
Monitor *m = c->mon; | Monitor *m = c->mon; | ||||
XWindowChanges wc; | 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); | detach(c); | ||||
detachstack(c); | detachstack(c); | ||||
if (!destroyed) { | if (!destroyed) { | ||||
@@ -1895,9 +1983,12 @@ unmanage(Client *c, int destroyed) | |||||
XUngrabServer(dpy); | XUngrabServer(dpy); | ||||
} | } | ||||
free(c); | free(c); | ||||
focus(NULL); | |||||
updateclientlist(); | |||||
arrange(m); | |||||
if (!s) { | |||||
arrange(m); | |||||
focus(NULL); | |||||
updateclientlist(); | |||||
} | |||||
} | } | ||||
void | void | ||||
@@ -2162,6 +2253,136 @@ view(const Arg *arg) | |||||
arrange(selmon); | 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 * | Client * | ||||
wintoclient(Window w) | wintoclient(Window w) | ||||
{ | { | ||||
@@ -2253,11 +2474,13 @@ main(int argc, char *argv[]) | |||||
fputs("warning: no locale support\n", stderr); | fputs("warning: no locale support\n", stderr); | ||||
if (!(dpy = XOpenDisplay(NULL))) | if (!(dpy = XOpenDisplay(NULL))) | ||||
die("dwm: cannot open display"); | die("dwm: cannot open display"); | ||||
if (!(xcon = XGetXCBConnection(dpy))) | |||||
die("dwm: cannot get xcb connection\n"); | |||||
checkotherwm(); | checkotherwm(); | ||||
autostart_exec(); | autostart_exec(); | ||||
setup(); | setup(); | ||||
#ifdef __OpenBSD__ | #ifdef __OpenBSD__ | ||||
if (pledge("stdio rpath proc exec", NULL) == -1) | |||||
if (pledge("stdio rpath proc exec ps", NULL) == -1) | |||||
die("pledge"); | die("pledge"); | ||||
#endif /* __OpenBSD__ */ | #endif /* __OpenBSD__ */ | ||||
scan(); | scan(); | ||||
@@ -1,38 +1,11 @@ | |||||
--- dwm.c | --- dwm.c | ||||
+++ dwm.c | +++ dwm.c | ||||
@@ -98,9 +104,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; | |||||
}; | |||||
@@ -314,6 +332,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); | |||||
@@ -2355,10 +2576,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(); | |||||
@@ -233,6 +233,8 @@ static int xerror(Display *dpy, XErrorEvent *ee); | |||||
static int xerrordummy(Display *dpy, XErrorEvent *ee); | |||||
static int xerrorstart(Display *dpy, XErrorEvent *ee); | |||||
static void zoom(const Arg *arg); | |||||
+static void centeredmaster(Monitor *m); | |||||
+static void centeredfloatingmaster(Monitor *m); | |||||
/* variables */ | |||||
static const char broken[] = "broken"; |
@@ -2,4 +2,6 @@ activetagindicator | |||||
alwaysontop | alwaysontop | ||||
cool-autostart | cool-autostart | ||||
center | center | ||||
centeredmaster | |||||
fullgaps | fullgaps | ||||
swallow |