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 e855cee56205d8e87f98de64c2f38d6ca3b56ba8 /git/dwm-sdk/commit/e855cee56205d8e87f98de64c2f38d6ca3b56ba8.gph codevoid.de 70 1parent d55d667e8407d99cdedb7477ecca04da988d518b /git/dwm-sdk/commit/d55d667e8407d99cdedb7477ecca04da988d518b.gph codevoid.de 70 hAuthor: Stefan Hagen URL:mailto:sh+git[at]codevoid[dot]de codevoid.de 70 iDate: Tue, 21 Aug 2018 23:28:23 +0200 Err codevoid.de 70 i Err codevoid.de 70 iUnpatch broken selfrestart, update font, scratchpad... Err codevoid.de 70 i Err codevoid.de 70 iDiffstat: Err codevoid.de 70 i M config.h | 17 ++++++++++------- Err codevoid.de 70 i D selfrestart.c | 78 ------------------------------- Err codevoid.de 70 i Err codevoid.de 70 i2 files changed, 10 insertions(+), 85 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@@ -10,8 +10,10 @@ 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 *fonts[] = { "Terminus:size=9:embeddedbitmap=true" }; Err codevoid.de 70 i-static const char dmenufont[] = "Terminus:size=9:embeddedbitmap=true"; Err codevoid.de 70 i+//static const char *fonts[] = { "Terminus:size=9:embeddedbitmap=true" }; Err codevoid.de 70 i+//static const char dmenufont[] = "Terminus:size=9:embeddedbitmap=true"; Err codevoid.de 70 i+static const char *fonts[] = { "Fira Mono:pixelsize=20" }; Err codevoid.de 70 i+static const char dmenufont[] = "Fira Mono:pixelsize=20"; Err codevoid.de 70 i Err codevoid.de 70 i static const char col_vdark[] = "#111111"; Err codevoid.de 70 i static const char col_dark[] = "#333333"; Err codevoid.de 70 it@@ -77,9 +79,12 @@ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() Err codevoid.de 70 i static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; Err codevoid.de 70 i static const char *termcmd[] = { "st", NULL }; Err codevoid.de 70 i static const char *mailcmd[] = { "st", "-e", "mutt", NULL }; Err codevoid.de 70 i-static const char *bigtermcmd[] = { "st", "-f Terminus:size=18:embeddedbitmap=true", NULL }; Err codevoid.de 70 i+static const char *bigtermcmd[] = { "st", "-f", "Fira Mono:pixelsize=26", NULL }; Err codevoid.de 70 i+ Err codevoid.de 70 i static const char scratchpadname[] = "scratchpad"; Err codevoid.de 70 i-static const char *scratchpadcmd[] = { "st", "-t", scratchpadname, "-g", "180x51", NULL }; Err codevoid.de 70 i+static const char *scratchpadcmd[] = { "st", "-t", scratchpadname, "-g", "135x34", NULL }; Err codevoid.de 70 i+static const char *bigscratchpadcmd[] = { "st-lc", "-f", "Fira Mono:pixelsize=26", "-t", scratchpadname, "-g", "100x30", "sacc","codevoid.de", NULL }; Err codevoid.de 70 i+ Err codevoid.de 70 i static const char *browsercmd[] = { ".dwm/browser", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; Err codevoid.de 70 i static const char *passmenucmd[] = { ".dwm/passmenu", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; Err codevoid.de 70 i static const char *browserpaste[] = { ".dwm/browserpaste", NULL }; Err codevoid.de 70 it@@ -87,8 +92,6 @@ static const char *notescmd[] = { "st", "-e", "vim", "Seafile/NotesSync/not 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-#include "selfrestart.c" 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 it@@ -99,6 +102,7 @@ static Key keys[] = { 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 it@@ -148,7 +152,6 @@ static Key keys[] = { Err codevoid.de 70 i { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, Err codevoid.de 70 i { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, Err codevoid.de 70 i Err codevoid.de 70 i- { MODKEY|ShiftMask, XK_Home, self_restart, {0} }, Err codevoid.de 70 i { MODKEY|ShiftMask, XK_End, quit, {0} }, Err codevoid.de 70 i Err codevoid.de 70 i // /* Media keys */ Err codevoid.de 70 1diff --git a/selfrestart.c b/selfrestart.c /git/dwm-sdk/file/selfrestart.c.gph codevoid.de 70 it@@ -1,78 +0,0 @@ Err codevoid.de 70 i-#include Err codevoid.de 70 i-#include Err codevoid.de 70 i-#include Err codevoid.de 70 i-#include Err codevoid.de 70 i-#include Err codevoid.de 70 i-#include Err codevoid.de 70 i- Err codevoid.de 70 i-/** Err codevoid.de 70 i- * Magically finds the current's executable path Err codevoid.de 70 i- * Err codevoid.de 70 i- * I'm doing the do{}while(); trick because Linux (what I'm running) is not Err codevoid.de 70 i- * POSIX compilant and so lstat() cannot be trusted on /proc entries Err codevoid.de 70 i- * Err codevoid.de 70 i- * @return char* the path of the current executable Err codevoid.de 70 i- */ Err codevoid.de 70 i-char *get_dwm_path(){ Err codevoid.de 70 i- char *path = NULL; Err codevoid.de 70 i-#ifdef __FreeBSD__ Err codevoid.de 70 i- int mib[4]; Err codevoid.de 70 i- mib[0] = CTL_KERN; Err codevoid.de 70 i- mib[1] = KERN_PROC; Err codevoid.de 70 i- mib[2] = KERN_PROC_PATHNAME; Err codevoid.de 70 i- mib[3] = -1; Err codevoid.de 70 i- char buf[1024]; Err codevoid.de 70 i- size_t cb = sizeof(buf); Err codevoid.de 70 i- sysctl(mib, 4, buf, &cb, NULL, 0); Err codevoid.de 70 i- path = buf; Err codevoid.de 70 i- return path; Err codevoid.de 70 i-#else Err codevoid.de 70 i- struct stat s; Err codevoid.de 70 i- int r, length, rate = 42; Err codevoid.de 70 i- Err codevoid.de 70 i- if(lstat("/proc/self/exe", &s) == -1){ Err codevoid.de 70 i- perror("lstat:"); Err codevoid.de 70 i- return NULL; Err codevoid.de 70 i- } Err codevoid.de 70 i- Err codevoid.de 70 i- length = s.st_size + 1 - rate; Err codevoid.de 70 i- Err codevoid.de 70 i- do{ Err codevoid.de 70 i- length+=rate; Err codevoid.de 70 i- Err codevoid.de 70 i- free(path); Err codevoid.de 70 i- path = malloc(sizeof(char) * length); Err codevoid.de 70 i- Err codevoid.de 70 i- if(path == NULL){ Err codevoid.de 70 i- perror("malloc:"); Err codevoid.de 70 i- return NULL; Err codevoid.de 70 i- } Err codevoid.de 70 i- Err codevoid.de 70 i- r = readlink("/proc/self/exe", path, length); Err codevoid.de 70 i- Err codevoid.de 70 i- if(r == -1){ Err codevoid.de 70 i- perror("readlink:"); Err codevoid.de 70 i- return NULL; Err codevoid.de 70 i- } Err codevoid.de 70 i- }while(r >= length); Err codevoid.de 70 i- Err codevoid.de 70 i- path[r] = '\0'; Err codevoid.de 70 i- return path; Err codevoid.de 70 i-#endif Err codevoid.de 70 i-} Err codevoid.de 70 i- Err codevoid.de 70 i-/** Err codevoid.de 70 i- * self-restart Err codevoid.de 70 i- * Err codevoid.de 70 i- * Initially inspired by: Yu-Jie Lin Err codevoid.de 70 i- * https://sites.google.com/site/yjlnotes/notes/dwm Err codevoid.de 70 i- */ Err codevoid.de 70 i-void self_restart(const Arg *arg) { Err codevoid.de 70 i- char *const argv[] = {get_dwm_path(), NULL}; Err codevoid.de 70 i- Err codevoid.de 70 i- if(argv[0] == NULL){ Err codevoid.de 70 i- return; Err codevoid.de 70 i- } Err codevoid.de 70 i- Err codevoid.de 70 i- execv(argv[0], argv); Err codevoid.de 70 i-} Err codevoid.de 70 .