diff --git a/Makefile b/Makefile
index 9ae64c5..0b3d26c 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ dwm: ${OBJ}
${CC} -o $@ ${OBJ} ${LDFLAGS}
clean:
- rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz
+ rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz *.orig *.rej
dist: clean
mkdir -p dwm-${VERSION}
diff --git a/README.md b/README.md
index a860733..85f8b17 100644
--- a/README.md
+++ b/README.md
@@ -16,8 +16,9 @@
|mod+shift+enter|open scratchpad(st)|
|mod+r|open dmenu|
|mod+shift+x|kill window|
-|mod+Tab|cycle through windows|
-|mod+b|toggle statusbar|
+| mod+Tab | cycle through windows |
+| mod+b | toggle statusbar |
+| mod+p | mpc toggle |
|mod+F5|xrdb|
|mod+h/l|resize windows horizontally|
|mod+space|move the focused window to master|
diff --git a/config.def.h b/config.def.h
deleted file mode 100644
index c1f5131..0000000
--- a/config.def.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-/* Constants */
-#define BROWSER "librewolf"
-#define TERMINAL "st"
-
-/* appearance */
-static const unsigned int borderpx = 2; /* border pixel of windows */
-static const unsigned int gappx = 3; /* gaps between windows */
-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 int user_bh = 17; /* 0 means that dwm will calculate bar height, >= 1 means dwm will user_bh as bar height */
-static const char *fonts[] = { "JetBrainsMono Nerd Font:size=11", "FontAwesome:size=10", "NotoColorEmoji:pixelsize=11:antialias=true:autohint=true" };
-
-static char normbgcolor[] = "#222222";
-static char normbordercolor[] = "#444444";
-static char normfgcolor[] = "#bbbbbb";
-static char selfgcolor[] = "#eeeeee";
-static char selbordercolor[] = "#224488";
-static char selbgcolor[] = "#224488";
-static char *colors[][3] = {
-/* fg bg border */
-[SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor },
-[SchemeSel] = { selfgcolor, selbgcolor, selbordercolor },
-};
-/* tagging */
-//static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
-static const char *tags[] = { " ", " ", " ", " ", " ", " ", " ", " ", " " };
-
-static const Rule rules[] = {
- /* xprop(1):
- * WM_CLASS(STRING) = instance, class
- * WM_NAME(STRING) = title
- */
- /* class instance title tags mask isfloating monitor */
- { "Gimp", NULL, NULL, 0, 1, -1 },
-};
-
-/* layout(s) */
-static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
-static const int nmaster = 1; /* number of clients in master area */
-static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
-static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
-
-#include "fibonacci.c"
-static const Layout layouts[] = {
- /* symbol arrange function */
- { "[]=", tile }, /* first entry is default */
- { "[M]", monocle },
- { "[@]", spiral },
- { "[\\]", dwindle },
- { "><>", NULL }, /* no layout function means floating behavior */
-};
-
-/* key definitions */
-#define MODKEY Mod4Mask
-#define TAGKEYS(KEY,TAG) \
- { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
- { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
- { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
- { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
-
-/* helper for spawning shell commands in the pre dwm-5.0 fashion */
-#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
-
-/* commands */
-static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
-static const char *dmenucmd[] = { "dmenu_run" };
-static const char *termcmd[] = { "st", NULL };
-static const char scratchpadname[] = "scratchpad";
-static const char *scratchpadcmd[] = { "st", "-t", scratchpadname, "-g", "120x34", NULL };
-
-#include // this is to support XF86 keys
-
-static Key keys[] = {
- /* modifier key function argument */
- { MODKEY, XK_grave, spawn, {.v = (const char*[]){ "unicode_emoji", NULL } } },
- { MODKEY, XK_r, spawn, {.v = dmenucmd } },
- { MODKEY, XK_Return, spawn, {.v = termcmd } },
- { MODKEY|ShiftMask, XK_Return, togglescratch, {.v = scratchpadcmd } },
- { MODKEY, XK_F5, xrdb, {.v = NULL } },
- { MODKEY, XK_b, togglebar, {0} },
- { MODKEY, XK_Tab, focusstack, {.i = +1 } },
- { 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_space, zoom, {0} },
- /* { MODKEY, XK_Tab, view, {0} }, */
- { MODKEY|ShiftMask, XK_x, killclient, {0} },
- { MODKEY, XK_w, spawn, {.v = (const char*[]){ BROWSER, NULL } } },
- { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, // tile
- { MODKEY|ShiftMask, XK_u, setlayout, {.v = &layouts[1]} }, // monocle
- { MODKEY, XK_y, setlayout, {.v = &layouts[2]} }, // spiral
- { MODKEY|ShiftMask, XK_y, setlayout, {.v = &layouts[3]} }, // dwindle
- { MODKEY|ShiftMask, XK_f, setlayout, {.v = &layouts[4]} },
- { MODKEY|ShiftMask, XK_r, togglefloating, {0} },
- { MODKEY, XK_f, togglefullscr, {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|ShiftMask, XK_h, layoutscroll, {.i = -1 } },
- { MODKEY|ShiftMask, XK_Tab, layoutscroll, {.i = +1 } },
- { MODKEY, XK_minus, setgaps, {.i = -1 } },
- { MODKEY, XK_equal, setgaps, {.i = +1 } },
- { MODKEY|ShiftMask, XK_equal, setgaps, {.i = 0 } },
- TAGKEYS( XK_1, 0)
- TAGKEYS( XK_2, 1)
- TAGKEYS( XK_3, 2)
- TAGKEYS( XK_4, 3)
- TAGKEYS( XK_5, 4)
- TAGKEYS( XK_6, 5)
- TAGKEYS( XK_7, 6)
- TAGKEYS( XK_8, 7)
- TAGKEYS( XK_9, 8)
- { MODKEY|ShiftMask, XK_q, quit, {0} },
- { 0, XK_Print, spawn, SHCMD("maimshot") },
- { MODKEY, XK_Escape, spawn, SHCMD("system_action") },
- { MODKEY, XK_m, spawn, {.v = (const char*[]){ TERMINAL, "-e", "ncmpcpp", NULL } } },
- { 0, XF86XK_AudioMute, spawn, SHCMD("pamixer -t; kill -34 $(cat ~/.cache/pidofbar") },
- { 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("pamixer -i 2; kill -34 $(cat ~/.cache/pidofbar)") },
- { 0, XF86XK_AudioLowerVolume, spawn, SHCMD("pamixer -d 2; kill -34 $(cat ~/.cache/pidofbar)") },
-};
-
-/* button definitions */
-/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
-static Button buttons[] = {
- /* click event mask button function argument */
- { ClkLtSymbol, 0, Button1, setlayout, {0} },
- { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
- { ClkWinTitle, 0, Button2, zoom, {0} },
- { ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
- { ClkClientWin, MODKEY, Button1, movemouse, {0} },
- { ClkClientWin, MODKEY, Button2, togglefloating, {0} },
- { ClkClientWin, MODKEY, Button3, resizemouse, {0} },
- { ClkTagBar, 0, Button1, view, {0} },
- { ClkTagBar, 0, Button3, toggleview, {0} },
- { ClkTagBar, MODKEY, Button1, tag, {0} },
- { ClkTagBar, MODKEY, Button3, toggletag, {0} },
-};
-
diff --git a/config.h b/config.h
index c1f5131..561ccb1 100644
--- a/config.h
+++ b/config.h
@@ -126,6 +126,7 @@ static Key keys[] = {
{ 0, XF86XK_AudioMute, spawn, SHCMD("pamixer -t; kill -34 $(cat ~/.cache/pidofbar") },
{ 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("pamixer -i 2; kill -34 $(cat ~/.cache/pidofbar)") },
{ 0, XF86XK_AudioLowerVolume, spawn, SHCMD("pamixer -d 2; kill -34 $(cat ~/.cache/pidofbar)") },
+ { MODKEY, XK_p, spawn, {.v = (const char*[]){ "mpc", "toggle", NULL } } },
};
/* button definitions */
diff --git a/dwm b/dwm
index 1cac6db..d7cc387 100755
Binary files a/dwm and b/dwm differ