it* dwm + patches Err codevoid.de 70 i Err codevoid.de 70 hgit clone git://git.codevoid.de/dwm-sdk URL:git://git.codevoid.de/dwm-sdk codevoid.de 70 1Log /git/dwm-sdk/log.gph codevoid.de 70 1Files /git/dwm-sdk/files.gph codevoid.de 70 1Refs /git/dwm-sdk/refs.gph codevoid.de 70 1README /git/dwm-sdk/file/README.gph codevoid.de 70 1LICENSE /git/dwm-sdk/file/LICENSE.gph codevoid.de 70 i--- Err codevoid.de 70 1commit 35a1bd478d5d01cd97af1b840d561ae46de2687c /git/dwm-sdk/commit/35a1bd478d5d01cd97af1b840d561ae46de2687c.gph codevoid.de 70 1parent 53ab4b1968efbf94b7bf93a20b70a48fefc4c3e9 /git/dwm-sdk/commit/53ab4b1968efbf94b7bf93a20b70a48fefc4c3e9.gph codevoid.de 70 hAuthor: Stefan Hagen URL:mailto:sh+git[at]codevoid[dot]de codevoid.de 70 iDate: Mon, 12 Nov 2018 22:11:48 +0100 Err codevoid.de 70 i Err codevoid.de 70 iOpenBSD Update Err codevoid.de 70 i Err codevoid.de 70 iDiffstat: Err codevoid.de 70 i M config.h | 14 ++------------ Err codevoid.de 70 i M config.mk | 6 +++--- Err codevoid.de 70 i A dwm | 0 Err codevoid.de 70 i M dwm.c | 32 ++++++++++++++++++++++++++++--- Err codevoid.de 70 i Err codevoid.de 70 i4 files changed, 34 insertions(+), 18 deletions(-) Err codevoid.de 70 i--- Err codevoid.de 70 1diff --git a/config.h b/config.h /git/dwm-sdk/file/config.h.gph codevoid.de 70 it@@ -11,8 +11,7 @@ static const int showsystray = 1; /* 0 means no systray */ Err codevoid.de 70 i static const int showbar = 1; /* 0 means no bar */ Err codevoid.de 70 i static const int topbar = 1; /* 0 means bottom bar */ Err codevoid.de 70 i Err codevoid.de 70 i-static const char font_normal[] = "Fira Mono:size=10"; Err codevoid.de 70 i-static const char font_bigger[] = "Fira Mono:size=16"; Err codevoid.de 70 i+static const char font_normal[] = "-misc-tamzenforpowerline-medium-r-normal--20-145-100-100-c-100-iso8859-1"; Err codevoid.de 70 i static const char *fonts[] = { font_normal }; Err codevoid.de 70 i Err codevoid.de 70 i static const char col_vdark[] = "#111111"; Err codevoid.de 70 it@@ -80,33 +79,24 @@ static const char scratchpadname[] = "scratchpad"; Err codevoid.de 70 i Err codevoid.de 70 i static const char *termcmd[] = { "st", "-f", font_normal, NULL }; Err codevoid.de 70 i static const char *mailcmd[] = { "st", "-f", font_normal, "-e", "mutt", NULL }; Err codevoid.de 70 i-static const char *bigtermcmd[] = { "st", "-f", font_bigger, NULL }; Err codevoid.de 70 i Err codevoid.de 70 i static const char *notescmd[] = { "st", "-f", font_normal, "-e", "vim", "Seafile/NotesSync/notes.otl", NULL }; Err codevoid.de 70 i-static const char *scratchpadcmd[] = { "st", "-f", font_normal, "-t", scratchpadname, "-g", "145x38", NULL }; Err codevoid.de 70 i-static const char *bigscratchpadcmd[] = { "st", "-f", font_bigger, "-t", scratchpadname, "-g", "95x25", NULL }; Err codevoid.de 70 i+static const char *scratchpadcmd[] = { "st", "-f", font_normal, "-t", scratchpadname, "-g", "100x25", NULL }; Err codevoid.de 70 i Err codevoid.de 70 i static const char *dmenucmd[] = { "dmenu_run", DMENUOPTS, NULL }; Err codevoid.de 70 i static const char *browsercmd[] = { ".dwm/browser", DMENUOPTS, NULL }; Err codevoid.de 70 i static const char *passmenucmd[] = { ".dwm/passmenu", DMENUOPTS, NULL }; Err codevoid.de 70 i static const char *browserpaste[] = { ".dwm/browserpaste", NULL }; Err codevoid.de 70 i Err codevoid.de 70 i-static const char *volumeupcmd[] = { ".dwm/mixer", "+2", NULL }; Err codevoid.de 70 i-static const char *volumedowncmd[] = { ".dwm/mixer", "-2", NULL }; Err codevoid.de 70 i- Err codevoid.de 70 i static Key keys[] = { Err codevoid.de 70 i /* modifier key function argument */ Err codevoid.de 70 i // application launcher Err codevoid.de 70 i { MODKEY, XK_d, spawn, {.v = dmenucmd } }, Err codevoid.de 70 i { MODKEY, XK_Return, spawn, {.v = termcmd } }, Err codevoid.de 70 i- { MODKEY|ShiftMask, XK_Return, spawn, {.v = bigtermcmd } }, Err codevoid.de 70 i { MODKEY|ShiftMask, XK_f, spawn, {.v = browsercmd } }, Err codevoid.de 70 i { MODKEY|ShiftMask, XK_p, spawn, {.v = passmenucmd } }, Err codevoid.de 70 i { MODKEY|ShiftMask, XK_m, spawn, {.v = mailcmd } }, Err codevoid.de 70 i { MODKEY, XK_minus, togglescratch, {.v = scratchpadcmd } }, Err codevoid.de 70 i- { MODKEY|ShiftMask, XK_minus, togglescratch, {.v = bigscratchpadcmd } }, Err codevoid.de 70 i- { 0, 0x1008ff13,spawn, {.v = volumeupcmd } }, Err codevoid.de 70 i- { 0, 0x1008ff11,spawn, {.v = volumedowncmd } }, Err codevoid.de 70 i { MODKEY, XK_p, spawn, {.v = browserpaste } }, Err codevoid.de 70 i { MODKEY|ShiftMask, XK_o, spawn, {.v = notescmd } }, Err codevoid.de 70 i Err codevoid.de 70 1diff --git a/config.mk b/config.mk /git/dwm-sdk/file/config.mk.gph codevoid.de 70 it@@ -18,15 +18,15 @@ XINERAMAFLAGS = -DXINERAMA Err codevoid.de 70 i FREETYPELIBS = -lfontconfig -lXft Err codevoid.de 70 i FREETYPEINC = /usr/include/freetype2 Err codevoid.de 70 i # OpenBSD (uncomment) Err codevoid.de 70 i-#FREETYPEINC = ${X11INC}/freetype2 Err codevoid.de 70 i+FREETYPEINC = ${X11INC}/freetype2 Err codevoid.de 70 i Err codevoid.de 70 i # includes and libs Err codevoid.de 70 i INCS = -I${X11INC} -I${FREETYPEINC} Err codevoid.de 70 i LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} Err codevoid.de 70 i Err codevoid.de 70 i # FreeBSD (uncomment)¬ Err codevoid.de 70 i-LIBS = -L/usr/local/lib -lc -lm -L${X11LIB} -lXft -lfontconfig -lX11 -lX11 ${XINERAMALIBS} Err codevoid.de 70 i-INCS = -I. -I/usr/local/include -I/usr/local/include/freetype2 -I${X11INC} Err codevoid.de 70 i+#LIBS = -L/usr/local/lib -lc -lm -L${X11LIB} -lXft -lfontconfig -lX11 -lX11 ${XINERAMALIBS} Err codevoid.de 70 i+#INCS = -I. -I/usr/local/include -I/usr/local/include/freetype2 -I${X11INC} Err codevoid.de 70 i Err codevoid.de 70 i # flags Err codevoid.de 70 i CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} Err codevoid.de 70 1diff --git a/dwm b/dwm /git/dwm-sdk/file/dwm.gph codevoid.de 70 iBinary files differ. Err codevoid.de 70 1diff --git a/dwm.c b/dwm.c /git/dwm-sdk/file/dwm.c.gph codevoid.de 70 it@@ -49,7 +49,8 @@ Err codevoid.de 70 i #define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask)) Err codevoid.de 70 i #define INTERSECT(x,y,w,h,m) (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \ Err codevoid.de 70 i * MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy))) Err codevoid.de 70 i-#define ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags])) Err codevoid.de 70 i+#define ISVISIBLEONTAG(C, T) ((C->tags & T)) Err codevoid.de 70 i+#define ISVISIBLE(C) ISVISIBLEONTAG(C, C->mon->tagset[C->mon->seltags]) Err codevoid.de 70 i #define LENGTH(X) (sizeof X / sizeof X[0]) Err codevoid.de 70 i #define MOUSEMASK (BUTTONMASK|PointerMotionMask) Err codevoid.de 70 i #define WIDTH(X) ((X)->w + 2 * (X)->bw) Err codevoid.de 70 it@@ -171,6 +172,7 @@ static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interac Err codevoid.de 70 i static void arrange(Monitor *m); Err codevoid.de 70 i static void arrangemon(Monitor *m); Err codevoid.de 70 i static void attach(Client *c); Err codevoid.de 70 i+static void attachaside(Client *c); Err codevoid.de 70 i static void attachstack(Client *c); Err codevoid.de 70 i static void buttonpress(XEvent *e); Err codevoid.de 70 i static void checkotherwm(void); Err codevoid.de 70 it@@ -209,6 +211,7 @@ static void maprequest(XEvent *e); Err codevoid.de 70 i static void monocle(Monitor *m); Err codevoid.de 70 i static void motionnotify(XEvent *e); Err codevoid.de 70 i static void movemouse(const Arg *arg); Err codevoid.de 70 i+static Client *nexttagged(Client *c); Err codevoid.de 70 i static Client *nexttiled(Client *c); Err codevoid.de 70 i static void pop(Client *); Err codevoid.de 70 i static void propertynotify(XEvent *e); Err codevoid.de 70 it@@ -446,6 +449,18 @@ attach(Client *c) Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i void Err codevoid.de 70 i+attachaside(Client *c) { Err codevoid.de 70 i+ Client *at = nexttagged(c); Err codevoid.de 70 i+ if(!at) { Err codevoid.de 70 i+ attach(c); Err codevoid.de 70 i+ return; Err codevoid.de 70 i+ } Err codevoid.de 70 i+ c->next = at->next; Err codevoid.de 70 i+ at->next = c; Err codevoid.de 70 i+} Err codevoid.de 70 i+ Err codevoid.de 70 i+ Err codevoid.de 70 i+void Err codevoid.de 70 i attachstack(Client *c) Err codevoid.de 70 i { Err codevoid.de 70 i c->snext = c->mon->stack; Err codevoid.de 70 it@@ -1185,7 +1200,7 @@ manage(Window w, XWindowAttributes *wa) Err codevoid.de 70 i c->isfloating = c->oldstate = trans != None || c->isfixed; Err codevoid.de 70 i if (c->isfloating) Err codevoid.de 70 i XRaiseWindow(dpy, c->win); Err codevoid.de 70 i- attach(c); Err codevoid.de 70 i+ attachaside(c); Err codevoid.de 70 i attachstack(c); Err codevoid.de 70 i XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend, Err codevoid.de 70 i (unsigned char *) &(c->win), 1); Err codevoid.de 70 it@@ -1321,6 +1336,16 @@ movemouse(const Arg *arg) Err codevoid.de 70 i } Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i+ Client * Err codevoid.de 70 i+nexttagged(Client *c) { Err codevoid.de 70 i+ Client *walked = c->mon->clients; Err codevoid.de 70 i+ for(; Err codevoid.de 70 i+ walked && (walked->isfloating || !ISVISIBLEONTAG(walked, c->tags)); Err codevoid.de 70 i+ walked = walked->next Err codevoid.de 70 i+ ); Err codevoid.de 70 i+ return walked; Err codevoid.de 70 i+} Err codevoid.de 70 i+ Err codevoid.de 70 i Client * Err codevoid.de 70 i nexttiled(Client *c) Err codevoid.de 70 i { Err codevoid.de 70 it@@ -1591,7 +1616,7 @@ sendmon(Client *c, Monitor *m) Err codevoid.de 70 i detachstack(c); Err codevoid.de 70 i c->mon = m; Err codevoid.de 70 i c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */ Err codevoid.de 70 i- attach(c); Err codevoid.de 70 i+ attachaside(c); Err codevoid.de 70 i attachstack(c); Err codevoid.de 70 i focus(NULL); Err codevoid.de 70 i arrange(NULL); Err codevoid.de 70 it@@ -2110,6 +2135,7 @@ updategeom(void) Err codevoid.de 70 i detachstack(c); Err codevoid.de 70 i c->mon = mons; Err codevoid.de 70 i attach(c); Err codevoid.de 70 i+ attachaside(c); Err codevoid.de 70 i attachstack(c); Err codevoid.de 70 i } Err codevoid.de 70 i if (m == selmon) Err codevoid.de 70 .