commit 8011a078559eed74a632e8d96bdc0c69e8551c3a
parent d903a0a1950aec2a47e1185cec44996a04e002ee
Author: Daniel Moch <daniel@danielmoch.com>
Date: Tue, 16 Jun 2020 09:13:43 -0400
Add dwm patch; update st patch
Diffstat:
2 files changed, 121 insertions(+), 0 deletions(-)
diff --git a/x11/dwm/patches/patch-config_def_h b/x11/dwm/patches/patch-config_def_h
@@ -0,0 +1,110 @@
+--- config.def.h.old Sat Feb 2 07:55:28 2019
++++ config.def.h Tue Jun 16 04:44:41 2020
+@@ -5,17 +5,17 @@
+ static const unsigned int snap = 32; /* snap pixel */
+ 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" };
+-static const char dmenufont[] = "monospace:size=10";
+-static const char col_gray1[] = "#222222";
+-static const char col_gray2[] = "#444444";
+-static const char col_gray3[] = "#bbbbbb";
+-static const char col_gray4[] = "#eeeeee";
+-static const char col_cyan[] = "#005577";
++static const char *fonts[] = { "sans:size=8" };
++static const char dmenufont[] = "sans:size=8";
++static const char col_gray1[] = "#3A3A3A";
++static const char col_gray2[] = "#BCBCBC";
++static const char col_white[] = "#FFFFFF";
++static const char col_black[] = "#000000";
++static const char col_blue[] = "#005FAF";
+ static const char *colors[][3] = {
+ /* fg bg border */
+- [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
+- [SchemeSel] = { col_gray4, col_cyan, col_cyan },
++ [SchemeNorm] = { col_white, col_gray1, col_gray1 },
++ [SchemeSel] = { col_black, col_gray2, col_blue },
+ };
+
+ /* tagging */
+@@ -26,9 +26,13 @@
+ * 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 monitor */
++ { NULL, NULL, "xbindkeys_show", 0, 1, -1 },
++ { NULL, NULL, "xfontsel", 0, 1, -1 },
++ { "newDiffPopup", NULL, NULL, 0, 1, -1 },
++ { "xcalc", NULL, NULL, 0, 1, -1 },
++ { "xclock", NULL, NULL, 0, 1, -1 },
++ { "pinentry", NULL, NULL, 0, 1, -1 },
+ };
+
+ /* layout(s) */
+@@ -44,7 +48,7 @@
+ };
+
+ /* key definitions */
+-#define MODKEY Mod1Mask
++#define MODKEY Mod4Mask
+ #define TAGKEYS(KEY,TAG) \
+ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
+ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
+@@ -56,23 +60,24 @@
+
+ /* commands */
+ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
+-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
+-static const char *termcmd[] = { "st", NULL };
++static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_white, "-sb", col_gray2, "-sf", col_black, NULL };
++static const char *passmenucmd[] = { "passmenu", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_white, "-sb", col_gray2, "-sf", col_black, NULL };
++static const char *termcmd[] = { "my term", NULL };
+
+ static Key keys[] = {
+ /* modifier key function argument */
+ { MODKEY, XK_p, spawn, {.v = dmenucmd } },
+- { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
++ { MODKEY, XK_z, spawn, {.v = passmenucmd } },
+ { MODKEY, XK_b, togglebar, {0} },
+ { MODKEY, XK_j, focusstack, {.i = +1 } },
+ { MODKEY, XK_k, focusstack, {.i = -1 } },
+ { MODKEY, XK_i, incnmaster, {.i = +1 } },
+ { MODKEY, XK_d, incnmaster, {.i = -1 } },
+- { MODKEY, XK_h, setmfact, {.f = -0.05} },
+- { MODKEY, XK_l, setmfact, {.f = +0.05} },
+- { MODKEY, XK_Return, zoom, {0} },
++ { MODKEY|Mod1Mask, XK_h, setmfact, {.f = -0.05} },
++ { MODKEY|Mod1Mask, XK_l, setmfact, {.f = +0.05} },
++ { MODKEY|ControlMask, XK_Return, zoom, {0} },
+ { MODKEY, XK_Tab, view, {0} },
+- { MODKEY|ShiftMask, XK_c, killclient, {0} },
++ { MODKEY, XK_q, killclient, {0} },
+ { MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
+ { MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
+ { MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
+@@ -80,10 +85,9 @@
+ { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
+ { MODKEY, XK_0, view, {.ui = ~0 } },
+ { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
+- { MODKEY, XK_comma, focusmon, {.i = -1 } },
+- { MODKEY, XK_period, focusmon, {.i = +1 } },
+- { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
+- { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
++ { MODKEY|ControlMask, XK_k, focusmon, {.i = -1 } },
++ { MODKEY|ControlMask, XK_j, focusmon, {.i = +1 } },
++ { MODKEY, XK_o, tagmon, {.i = +1 } },
+ TAGKEYS( XK_1, 0)
+ TAGKEYS( XK_2, 1)
+ TAGKEYS( XK_3, 2)
+@@ -93,7 +97,7 @@
+ TAGKEYS( XK_7, 6)
+ TAGKEYS( XK_8, 7)
+ TAGKEYS( XK_9, 8)
+- { MODKEY|ShiftMask, XK_q, quit, {0} },
++ { Mod1Mask|ControlMask, XK_BackSpace, quit, {0} },
+ };
+
+ /* button definitions */
diff --git a/x11/st/patches/patch-config_def_h b/x11/st/patches/patch-config_def_h
@@ -1,3 +1,4 @@
+<<<<<<< patch-config_def_h
--- config.def.h Sat Feb 9 06:50:41 2019
+++ /home/djmoch/src/dotcom-git/pkgbuild/st/config.h Mon Dec 30 19:50:45 2019
@@ -5,7 +5,7 @@
@@ -29,6 +30,16 @@
- "blue2",
- "magenta3",
- "cyan3",
+=======
+$OpenBSD: patch-config_def_h,v 1.12 2020/05/23 19:32:37 mestre Exp $
+Index: config.def.h
+--- config.def.h.orig
++++ config.def.h
+@@ -94,7 +94,7 @@ static const char *colorname[] = {
+ "blue2",
+ "magenta3",
+ "cyan3",
+>>>>>>> 1.12
- "gray90",
+ "#000000",
+ "#870000",
