Commit

Add dwm patch; update st patch
Daniel Moch committed 3 years ago (Tree)

Diffstat

 x11/dwm/patches/patch-config_def_h | 110 ++++++++++++++++++++++++++++++++
 x11/st/patches/patch-config_def_h | 11 +++

x11/dwm/patches/patch-config_def_h (created)

1 +--- config.def.h.old Sat Feb 2 07:55:28 2019
2 ++++ config.def.h Tue Jun 16 04:44:41 2020
3 +@@ -5,17 +5,17 @@
4 + static const unsigned int snap = 32; /* snap pixel */
5 + static const int showbar = 1; /* 0 means no bar */
6 + static const int topbar = 1; /* 0 means bottom bar */
7 +-static const char *fonts[] = { "monospace:size=10" };
8 +-static const char dmenufont[] = "monospace:size=10";
9 +-static const char col_gray1[] = "#222222";
10 +-static const char col_gray2[] = "#444444";
11 +-static const char col_gray3[] = "#bbbbbb";
12 +-static const char col_gray4[] = "#eeeeee";
13 +-static const char col_cyan[] = "#005577";
14 ++static const char *fonts[] = { "sans:size=8" };
15 ++static const char dmenufont[] = "sans:size=8";
16 ++static const char col_gray1[] = "#3A3A3A";
17 ++static const char col_gray2[] = "#BCBCBC";
18 ++static const char col_white[] = "#FFFFFF";
19 ++static const char col_black[] = "#000000";
20 ++static const char col_blue[] = "#005FAF";
21 + static const char *colors[][3] = {
22 + /* fg bg border */
23 +- [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
24 +- [SchemeSel] = { col_gray4, col_cyan, col_cyan },
25 ++ [SchemeNorm] = { col_white, col_gray1, col_gray1 },
26 ++ [SchemeSel] = { col_black, col_gray2, col_blue },
27 + };
28 +
29 + /* tagging */
30 +@@ -26,9 +26,13 @@
31 + * WM_CLASS(STRING) = instance, class
32 + * WM_NAME(STRING) = title
33 + */
34 +- /* class instance title tags mask isfloating monitor */
35 +- { "Gimp", NULL, NULL, 0, 1, -1 },
36 +- { "Firefox", NULL, NULL, 1 << 8, 0, -1 },
37 ++ /* class instance title tags mask isfloating monitor */
38 ++ { NULL, NULL, "xbindkeys_show", 0, 1, -1 },
39 ++ { NULL, NULL, "xfontsel", 0, 1, -1 },
40 ++ { "newDiffPopup", NULL, NULL, 0, 1, -1 },
41 ++ { "xcalc", NULL, NULL, 0, 1, -1 },
42 ++ { "xclock", NULL, NULL, 0, 1, -1 },
43 ++ { "pinentry", NULL, NULL, 0, 1, -1 },
44 + };
45 +
46 + /* layout(s) */
47 +@@ -44,7 +48,7 @@
48 + };
49 +
50 + /* key definitions */
51 +-#define MODKEY Mod1Mask
52 ++#define MODKEY Mod4Mask
53 + #define TAGKEYS(KEY,TAG) \
54 + { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
55 + { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
56 +@@ -56,23 +60,24 @@
57 +
58 + /* commands */
59 + static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
60 +-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
61 +-static const char *termcmd[] = { "st", NULL };
62 ++static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_white, "-sb", col_gray2, "-sf", col_black, NULL };
63 ++static const char *passmenucmd[] = { "passmenu", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_white, "-sb", col_gray2, "-sf", col_black, NULL };
64 ++static const char *termcmd[] = { "my term", NULL };
65 +
66 + static Key keys[] = {
67 + /* modifier key function argument */
68 + { MODKEY, XK_p, spawn, {.v = dmenucmd } },
69 +- { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
70 ++ { MODKEY, XK_z, spawn, {.v = passmenucmd } },
71 + { MODKEY, XK_b, togglebar, {0} },
72 + { MODKEY, XK_j, focusstack, {.i = +1 } },
73 + { MODKEY, XK_k, focusstack, {.i = -1 } },
74 + { MODKEY, XK_i, incnmaster, {.i = +1 } },
75 + { MODKEY, XK_d, incnmaster, {.i = -1 } },
76 +- { MODKEY, XK_h, setmfact, {.f = -0.05} },
77 +- { MODKEY, XK_l, setmfact, {.f = +0.05} },
78 +- { MODKEY, XK_Return, zoom, {0} },
79 ++ { MODKEY|Mod1Mask, XK_h, setmfact, {.f = -0.05} },
80 ++ { MODKEY|Mod1Mask, XK_l, setmfact, {.f = +0.05} },
81 ++ { MODKEY|ControlMask, XK_Return, zoom, {0} },
82 + { MODKEY, XK_Tab, view, {0} },
83 +- { MODKEY|ShiftMask, XK_c, killclient, {0} },
84 ++ { MODKEY, XK_q, killclient, {0} },
85 + { MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
86 + { MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
87 + { MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
88 +@@ -80,10 +85,9 @@
89 + { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
90 + { MODKEY, XK_0, view, {.ui = ~0 } },
91 + { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
92 +- { MODKEY, XK_comma, focusmon, {.i = -1 } },
93 +- { MODKEY, XK_period, focusmon, {.i = +1 } },
94 +- { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
95 +- { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
96 ++ { MODKEY|ControlMask, XK_k, focusmon, {.i = -1 } },
97 ++ { MODKEY|ControlMask, XK_j, focusmon, {.i = +1 } },
98 ++ { MODKEY, XK_o, tagmon, {.i = +1 } },
99 + TAGKEYS( XK_1, 0)
100 + TAGKEYS( XK_2, 1)
101 + TAGKEYS( XK_3, 2)
102 +@@ -93,7 +97,7 @@
103 + TAGKEYS( XK_7, 6)
104 + TAGKEYS( XK_8, 7)
105 + TAGKEYS( XK_9, 8)
106 +- { MODKEY|ShiftMask, XK_q, quit, {0} },
107 ++ { Mod1Mask|ControlMask, XK_BackSpace, quit, {0} },
108 + };
109 +
110 + /* button definitions */

x11/st/patches/patch-config_def_h

1 +<<<<<<< patch-config_def_h
1 2 --- config.def.h Sat Feb 9 06:50:41 2019
2 3 +++ /home/djmoch/src/dotcom-git/pkgbuild/st/config.h Mon Dec 30 19:50:45 2019
3 4 @@ -5,7 +5,7 @@
. . .
29 30 - "blue2",
30 31 - "magenta3",
31 32 - "cyan3",
33 +=======
34 +$OpenBSD: patch-config_def_h,v 1.12 2020/05/23 19:32:37 mestre Exp $
35 +Index: config.def.h
36 +--- config.def.h.orig
37 ++++ config.def.h
38 +@@ -94,7 +94,7 @@ static const char *colorname[] = {
39 + "blue2",
40 + "magenta3",
41 + "cyan3",
42 +>>>>>>> 1.12
32 43 - "gray90",
33 44 + "#000000",
34 45 + "#870000",