diff --git a/Makefile b/Makefile index d2cca80..ffa69b4 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ dwm: ${OBJ} ${CC} -o $@ ${OBJ} ${LDFLAGS} clean: - rm -f dwm ${OBJ} config.h dwm-${VERSION}.tar.gz + rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz dist: clean mkdir -p dwm-${VERSION} diff --git a/config.def.h b/config.def.h index 26c446d..9efa774 100644 --- a/config.def.h +++ b/config.def.h @@ -1,37 +1,34 @@ /* See LICENSE file for copyright and license details. */ /* appearance */ -static const unsigned int borderpx = 3; /* border pixel of windows */ +static const unsigned int borderpx = 1; /* border pixel of 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 char *fonts[] = { "monospace:size=16" }; - */ -static const char *fonts[] = {"Mononoki Nerd Font:size=16:antialias=true:autohint=true", - "Hack:size=14:antialias=true:autohint=true", - "JoyPixels:size=16:antialias=true:autohint=true"}; - -#include "/home/moo/.config/themes/using/colors-wal-dwm.h" +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 *colors[][3] = { + /* fg bg border */ + [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, + [SchemeSel] = { col_gray4, col_cyan, col_cyan }, +}; /* tagging */ -/*static const char *tags[] = { "", "", "", "", "", "", "7", "8", "9" }; - */ -static const char *tags[] = { "•", "•", "•", "•", "•", "•", "•", "•", "•" }; +static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; 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, 1 << 6, 0, -1 }, - { NULL, NULL, "pulsemixer", 0, 1, -1 }, - { "waterfox", NULL, NULL, 1, 0, -1 }, - { "Element", NULL, NULL, 1 << 8, 0, -1 }, - { NULL, NULL, "LibreWolf", 1 << 0, 0, -1 }, - { NULL, NULL, "Waterfox", 1 << 0, 0, -1 }, - { NULL, NULL, "Discord", 1 << 8, 0, -1 }, - { "mpv", NULL, NULL, 1 << 5, 1, -1 }, + /* class instance title tags mask isfloating monitor */ + { "Gimp", NULL, NULL, 0, 1, -1 }, + { "Firefox", NULL, NULL, 1 << 8, 0, -1 }, }; /* layout(s) */ @@ -48,7 +45,7 @@ static const Layout layouts[] = { }; /* key definitions */ -#define MODKEY Mod4Mask +#define MODKEY Mod1Mask #define TAGKEYS(KEY,TAG) \ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ @@ -60,15 +57,13 @@ static const Layout layouts[] = { /* commands */ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ -static const char *dmenucmd[] = { "dmenu_run", "-p", "Run: ", NULL }; +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 *volume[] = { "st", "-e", "pulsemixer", NULL }; static const Key keys[] = { /* modifier key function argument */ - { MODKEY, XK_Return, spawn, {.v = termcmd } }, - { MODKEY|ShiftMask, XK_Return, spawn, {.v = dmenucmd } }, - { MODKEY|Mod1Mask, XK_v, spawn, {.v = volume } }, + { MODKEY, XK_p, spawn, {.v = dmenucmd } }, + { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, { MODKEY, XK_b, togglebar, {0} }, { MODKEY, XK_j, focusstack, {.i = +1 } }, { MODKEY, XK_k, focusstack, {.i = -1 } }, @@ -76,7 +71,7 @@ static const Key keys[] = { { MODKEY, XK_d, incnmaster, {.i = -1 } }, { MODKEY, XK_h, setmfact, {.f = -0.05} }, { MODKEY, XK_l, setmfact, {.f = +0.05} }, - { MODKEY, XK_p, zoom, {0} }, + { MODKEY, XK_Return, zoom, {0} }, { MODKEY, XK_Tab, view, {0} }, { MODKEY|ShiftMask, XK_c, killclient, {0} }, { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, diff --git a/config.h b/config.h deleted file mode 100644 index 26c446d..0000000 --- a/config.h +++ /dev/null @@ -1,121 +0,0 @@ -/* See LICENSE file for copyright and license details. */ - -/* appearance */ -static const unsigned int borderpx = 3; /* border pixel of 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 char *fonts[] = { "monospace:size=16" }; - */ -static const char *fonts[] = {"Mononoki Nerd Font:size=16:antialias=true:autohint=true", - "Hack:size=14:antialias=true:autohint=true", - "JoyPixels:size=16:antialias=true:autohint=true"}; - -#include "/home/moo/.config/themes/using/colors-wal-dwm.h" - -/* tagging */ -/*static const char *tags[] = { "", "", "", "", "", "", "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, 1 << 6, 0, -1 }, - { NULL, NULL, "pulsemixer", 0, 1, -1 }, - { "waterfox", NULL, NULL, 1, 0, -1 }, - { "Element", NULL, NULL, 1 << 8, 0, -1 }, - { NULL, NULL, "LibreWolf", 1 << 0, 0, -1 }, - { NULL, NULL, "Waterfox", 1 << 0, 0, -1 }, - { NULL, NULL, "Discord", 1 << 8, 0, -1 }, - { "mpv", NULL, NULL, 1 << 5, 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 */ - -static const Layout layouts[] = { - /* symbol arrange function */ - { "[]=", tile }, /* first entry is default */ - { "><>", NULL }, /* no layout function means floating behavior */ - { "[M]", monocle }, -}; - -/* 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", "-p", "Run: ", NULL }; -static const char *termcmd[] = { "st", NULL }; -static const char *volume[] = { "st", "-e", "pulsemixer", NULL }; - -static const Key keys[] = { - /* modifier key function argument */ - { MODKEY, XK_Return, spawn, {.v = termcmd } }, - { MODKEY|ShiftMask, XK_Return, spawn, {.v = dmenucmd } }, - { MODKEY|Mod1Mask, XK_v, spawn, {.v = volume } }, - { 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_p, zoom, {0} }, - { MODKEY, XK_Tab, view, {0} }, - { MODKEY|ShiftMask, XK_c, killclient, {0} }, - { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, - { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, - { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, - { MODKEY, XK_space, setlayout, {0} }, - { 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 } }, - 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} }, -}; - -/* button definitions */ -/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ -static const 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/drw.o b/drw.o deleted file mode 100644 index e5b1c4d..0000000 Binary files a/drw.o and /dev/null differ diff --git a/dwm b/dwm deleted file mode 100755 index 21e6618..0000000 Binary files a/dwm and /dev/null differ diff --git a/dwm.c b/dwm.c index 8ab6b7b..1443802 100644 --- a/dwm.c +++ b/dwm.c @@ -146,7 +146,6 @@ static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interac static void arrange(Monitor *m); static void arrangemon(Monitor *m); static void attach(Client *c); -static void attachbottom(Client *c); static void attachstack(Client *c); static void buttonpress(XEvent *e); static void checkotherwm(void); @@ -408,15 +407,6 @@ attach(Client *c) c->mon->clients = c; } -void -attachbottom(Client *c) -{ - Client **tc; - c->next = NULL; - for (tc = &c->mon->clients; *tc; tc = &(*tc)->next); - *tc = c; -} - void attachstack(Client *c) { @@ -1083,7 +1073,7 @@ manage(Window w, XWindowAttributes *wa) c->isfloating = c->oldstate = trans != None || c->isfixed; if (c->isfloating) XRaiseWindow(dpy, c->win); - attachbottom(c); + attach(c); attachstack(c); XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend, (unsigned char *) &(c->win), 1); @@ -1436,7 +1426,7 @@ sendmon(Client *c, Monitor *m) detachstack(c); c->mon = m; c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */ - attachbottom(c); + attach(c); attachstack(c); focus(NULL); arrange(NULL); @@ -1924,7 +1914,7 @@ updategeom(void) m->clients = c->next; detachstack(c); c->mon = mons; - attachbottom(c); + attach(c); attachstack(c); } if (m == selmon) diff --git a/dwm.o b/dwm.o deleted file mode 100644 index 0014b23..0000000 Binary files a/dwm.o and /dev/null differ diff --git a/patches/dwm-attachbottom-6.3.diff b/patches/dwm-attachbottom-6.3.diff deleted file mode 100644 index c3955f9..0000000 --- a/patches/dwm-attachbottom-6.3.diff +++ /dev/null @@ -1,54 +0,0 @@ -diff -up dwm-6.3/dwm.c dwm-6.3-attachbottom/dwm.c ---- dwm-6.3/dwm.c 2022-01-07 12:42:18.000000000 +0100 -+++ dwm-6.3-attachbottom/dwm.c 2022-08-17 22:14:41.813809073 +0200 -@@ -147,6 +147,7 @@ static int applysizehints(Client *c, int - static void arrange(Monitor *m); - static void arrangemon(Monitor *m); - static void attach(Client *c); -+static void attachbottom(Client *c); - static void attachstack(Client *c); - static void buttonpress(XEvent *e); - static void checkotherwm(void); -@@ -408,6 +409,15 @@ attach(Client *c) - } - - void -+attachbottom(Client *c) -+{ -+ Client **tc; -+ c->next = NULL; -+ for (tc = &c->mon->clients; *tc; tc = &(*tc)->next); -+ *tc = c; -+} -+ -+void - attachstack(Client *c) - { - c->snext = c->mon->stack; -@@ -1066,7 +1076,7 @@ manage(Window w, XWindowAttributes *wa) - c->isfloating = c->oldstate = trans != None || c->isfixed; - if (c->isfloating) - XRaiseWindow(dpy, c->win); -- attach(c); -+ attachbottom(c); - attachstack(c); - XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend, - (unsigned char *) &(c->win), 1); -@@ -1421,7 +1431,7 @@ sendmon(Client *c, Monitor *m) - detachstack(c); - c->mon = m; - c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */ -- attach(c); -+ attachbottom(c); - attachstack(c); - focus(NULL); - arrange(NULL); -@@ -1903,7 +1913,7 @@ updategeom(void) - m->clients = c->next; - detachstack(c); - c->mon = mons; -- attach(c); -+ attachbottom(c); - attachstack(c); - } - if (m == selmon) diff --git a/util.o b/util.o deleted file mode 100644 index ab605f1..0000000 Binary files a/util.o and /dev/null differ