@@ 4,8 4,8 @@
diff -r 5195c62d896b config.def.h
--- a/config.def.h Thu Aug 01 09:48:07 2013 +1200
-+++ b/config.def.h Mon Mar 02 21:18:07 2015 +1300
-@@ -9,40 +9,42 @@
++++ b/config.def.h Thu Mar 11 18:26:14 2021 +1300
+@@ -9,40 +9,41 @@
static const char selbgcolor[] = "#005577";
static const char selfgcolor[] = "#eeeeee";
static const unsigned int borderpx = 1; /* border pixel of windows */
@@ 26,9 26,8 @@ diff -r 5195c62d896b config.def.h
/* class instance title tags mask isfloating monitor */
- { "Gimp", NULL, NULL, 0, True, -1 },
- { "Firefox", NULL, NULL, 1 << 8, False, -1 },
-+ { "Vimprobable", NULL, NULL, 1 << 1, False, -1 },
-+ { "Chromium", NULL, NULL, 1 << 0, False, -1 },
-+ { "tabbed", NULL, NULL, 1 << 1, False, -1 },
++ { "firefox", NULL, NULL, 1 << 0, False, -1 },
++ { "qutebrowser", NULL, NULL, 1 << 1, False, -1 },
+ { "mpv", NULL, NULL, 1 << 0, True, -1 },
+ { NULL, NULL, "mutt", 1 << 3, False, -1 },
+ { NULL, NULL, "tmux", 1 << 2, False, -1 },
@@ 62,7 61,7 @@ diff -r 5195c62d896b config.def.h
{ MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
{ MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
-@@ -51,12 +53,28 @@
+@@ -51,12 +52,29 @@
/* commands */
static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
@@ 72,6 71,8 @@ diff -r 5195c62d896b config.def.h
+static const char *mailcmd[] = { "urxvtc", "-title", "mutt", "-e", "mutt", NULL };
+static const char *tmuxcmd[] = { "urxvtc", "-title", "tmux", "-e", "tmux", "-f", "/home/jason/.tmux/conf", NULL };
+static const char *padcmd[] = { "urxvtc", "-title", "scratchpad", "-geometry", "56x10-30+40", NULL };
++static const char *voloffcmd[] = { "amixer", "-c", "0", "set", "Master", "mute", NULL };
++static const char *webcmd[] = { "run_browser", NULL };
+static const char *lockcmd[] = { "xautolock", "-locknow", NULL };
+static const char *rebootcmd[] = { "systemctl", "reboot", NULL };
+static const char *shutcmd[] = { "systemctl", "poweroff", NULL };
@@ 88,8 89,7 @@ diff -r 5195c62d896b config.def.h
+ { ControlMask|Mod1Mask, XK_p, spawn, {.v = padcmd } },
+ { ControlMask|Mod1Mask, XK_r, spawn, {.v = rebootcmd } },
+ { ControlMask|Mod1Mask, XK_q, spawn, {.v = shutcmd } },
-+ { ControlMask|Mod1Mask, XK_s, spawn, SHCMD("$HOME/Scripts/shux") },
-+ { ControlMask|Mod1Mask, XK_w, spawn, SHCMD("$(tabbed -c -d -p -2 >/tmp/tabbed.xid); vimprobable2 -e $(</tmp/tabbed.xid)") },
++ { ControlMask|Mod1Mask, XK_w, spawn, {.v = webcmd } },
{ MODKEY, XK_b, togglebar, {0} },
{ MODKEY, XK_j, focusstack, {.i = +1 } },
{ MODKEY, XK_k, focusstack, {.i = -1 } },
@@ 1,9 1,10 @@
# HG changeset patch
# Parent 968c9ff015807846610d502ff367b90842dd8c46
+# Parent 82e05d998bd4a5788b2af23104a4b7d23b397ef0
-diff -r 968c9ff01580 config.def.h
---- a/config.def.h Fri Sep 20 08:55:52 2013 +1200
-+++ b/config.def.h Tue Nov 11 19:56:30 2014 +1300
+diff -r 82e05d998bd4 config.def.h
+--- a/config.def.h Mon Mar 02 21:18:46 2015 +1300
++++ b/config.def.h Thu Mar 11 18:22:31 2021 +1300
@@ -1,7 +1,7 @@
/* See LICENSE file for copyright and license details. */
@@ 13,16 14,21 @@ diff -r 968c9ff01580 config.def.h
#define NUMCOLORS 9
static const char colors[NUMCOLORS][ColLast][9] = {
// border foreground background
-@@ -31,7 +31,8 @@
- { "Skype", NULL, NULL, 1 << 0, True, -1 },
- { "Filezilla", NULL, NULL, 1 << 0, True, -1 },
- { "MPlayer", NULL, NULL, 1 << 0, True, -1 },
-+ { "Gimp", NULL, NULL, 1 << 0, True, -1 },
-+ { "Pcmanfm", NULL, NULL, 1 << 0, True, -1 },
+@@ -25,10 +25,10 @@
+
+ static const Rule rules[] = {
+ /* class instance title tags mask isfloating monitor */
+- { "Vimprobable", NULL, NULL, 1 << 1, False, -1 },
+- { "Chromium", NULL, NULL, 1 << 0, False, -1 },
+- { "tabbed", NULL, NULL, 1 << 1, False, -1 },
++ { "firefox", NULL, NULL, 1 << 0, False, -1 },
++ { "qutebrowser", NULL, NULL, 1 << 1, False, -1 },
+ { "mpv", NULL, NULL, 1 << 0, True, -1 },
++ { NULL, NULL, "mpv", 1 << 0, True, -1 },
{ NULL, NULL, "mutt", 1 << 3, False, -1 },
{ NULL, NULL, "tmux", 1 << 2, False, -1 },
{ NULL, NULL, "ssh", 1 << 0, False, -1 },
-@@ -39,7 +40,7 @@
+@@ -36,7 +36,7 @@
};
/* layout(s) */
@@ 31,15 37,26 @@ diff -r 968c9ff01580 config.def.h
static const int nmaster = 1; /* number of clients in master area */
static const Bool resizehints = False;/* True means respect size hints in tiled resizals */
-@@ -69,6 +70,7 @@
+@@ -66,6 +66,8 @@
static const char *mailcmd[] = { "urxvtc", "-title", "mutt", "-e", "mutt", NULL };
static const char *tmuxcmd[] = { "urxvtc", "-title", "tmux", "-e", "tmux", "-f", "/home/jason/.tmux/conf", NULL };
static const char *padcmd[] = { "urxvtc", "-title", "scratchpad", "-geometry", "56x10-30+40", NULL };
-+static const char *voloffcmd[] = { "amixer", "-q", "sset", "Master", "toggle", NULL };
++static const char *voloffcmd[] = { "amixer", "-c", "0", "set", "Master", "mute", NULL };
++static const char *webcmd[] = { "run_browser", NULL };
static const char *lockcmd[] = { "xautolock", "-locknow", NULL };
static const char *rebootcmd[] = { "systemctl", "reboot", NULL };
static const char *shutcmd[] = { "systemctl", "poweroff", NULL };
-@@ -115,6 +117,11 @@
+@@ -81,8 +83,7 @@
+ { ControlMask|Mod1Mask, XK_p, spawn, {.v = padcmd } },
+ { ControlMask|Mod1Mask, XK_r, spawn, {.v = rebootcmd } },
+ { ControlMask|Mod1Mask, XK_q, spawn, {.v = shutcmd } },
+- { ControlMask|Mod1Mask, XK_s, spawn, SHCMD("$HOME/Scripts/shux") },
+- { ControlMask|Mod1Mask, XK_w, spawn, SHCMD("$(tabbed -c -d -p -2 >/tmp/tabbed.xid); vimprobable2 -e $(</tmp/tabbed.xid)") },
++ { ControlMask|Mod1Mask, XK_w, spawn, {.v = webcmd } },
+ { MODKEY, XK_b, togglebar, {0} },
+ { MODKEY, XK_j, focusstack, {.i = +1 } },
+ { MODKEY, XK_k, focusstack, {.i = -1 } },
+@@ -111,6 +112,11 @@
{ MODKEY, XK_Right, cycle, {.i = +1 } },
{ MODKEY|ControlMask, XK_Left, tagcycle, {.i = -1 } },
{ MODKEY|ControlMask, XK_Right, tagcycle, {.i = +1 } },