diff --git a/README.md b/README.md new file mode 100644 index 0000000..36319e3 --- /dev/null +++ b/README.md @@ -0,0 +1,43 @@ +# dwm +This is my patched version of dwm. The base version is directly from suckless.org. +This belongs to my larbs installation script and depends heavily on its scripts and programs. +It is supposed to work in the environment after the larbs-base-installation. + +## Patches +The list below shows the currently applied patches to the master branch. +- dwm-actualfullscreen-20191112-cb3f58a.diff (enables true fullscreen) +- dwm-center-6.1.diff (adds ability to center floating windows at launch) +- dwm-deck-6.0.diff (adds deck layout) +- dwm-noborder-6.2.diff (removes border if there is only one window) +- dwm-pertag-20170513-ceac8c9.diff (allows having a layout/mwfact/barpos/nmaster per tag) +- dwm-statuscmd-6.2.diff (enables dwmblocks compatibility) + +## Hotkeys +There are various shortcuts and hotkeys used in this version. Included in my build are the following. +| ModKey | Shift | Key | Function | +| ------ | ----- | ----------------- | --------------------------------------------------------- | +| Super | Shift | Escape | Quit dwm | +| Super | Shift | b | Toggle dwmbar | +| Super | Shift | c | Enable deck(/card) layout | +| Super | Shift | d | Toggle floating/tiled for selected window | +| Super | Shift | f | Toggle fullscreen | +| Super | | h | (Tiling/Deck) Focus window higher in stack than current | +| Super | Shift | h | (Tiling/Deck) Make current window the master window | +| Super | | j | (Tiling/Deck) Focus window lower in stack than current | +| Super | Shift | j | (Tiling/Deck) Make current window the master window | +| Super | | k | (Tiling/Deck) Focus window higher in stack than current | +| Super | Shift | k | (Tiling/Deck) Make current window the master window | +| Super | | l | (Tiling/Deck) Focus window lower in stack than current | +| Super | Shift | m | Enable monocle layout | +| Super | Shift | o | (Tiling/Deck) Increase master window size | +| Super | | q | Close current window | +| Super | Shift | t | Enable tiling layout | +| Super | Shift | z | (Tiling/Deck) Decrease master window size | +| Super | | 0 | Show all tags | +| Super | Shift | 0 | Add current window to all tag | +| Super | | 1/2/.../9 | Show tag 1/2/.../9 | +| Super | Shift | 1/2/.../9 | Add current window to tag 1/2/.../9 | +| Super | | . | Show monitor lower in stack | +| Super | Shift | . | Add to monitor lower in stack | +| Super | | , | Show monitor higher in stack | +| Super | Shift | , | Add to monitor higher in stack | diff --git a/config.def.h b/config.def.h index 011d916..94f566f 100644 --- a/config.def.h +++ b/config.def.h @@ -1,26 +1,29 @@ /* See LICENSE file for copyright and license details. */ +/* for media keys */ +#include + /* appearance */ 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=10" }; +static const char *fonts[] = { "monospace:size=10", "Noto Color Emoji:size=11" }; 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 col_gray3[] = "#f7f7f7"; +static const char col_gray4[] = "#000000"; +static const char col_cyan[] = "#dddddd"; static const char *colors[][3] = { /* fg bg border */ [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, - [SchemeSel] = { col_gray4, col_cyan, col_cyan }, + [SchemeSel] = { col_gray4, col_cyan, col_gray3 }, }; /* tagging */ static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; -static const char *alttags[] = { "<01>", "<02>", "<03>", "<04>", "<05>" }; +static const char *alttags[] = { "<1>", "<2>", "<3>", "<4>", "<5>", "<6>", "<7>", "<8>", "<9>" }; static const Rule rules[] = { /* xprop(1): @@ -28,25 +31,24 @@ static const Rule rules[] = { * WM_NAME(STRING) = title */ /* class instance title tags mask iscentered isfloating monitor */ - { "Gimp", NULL, NULL, 0, 0, 1, -1 }, - { "Firefox", NULL, NULL, 1 << 8, 0, 0, -1 }, + { NULL, "de.uol.swp.client.ClientApp", NULL, 0, 0, 1, -1 }, }; /* layout(s) */ -static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ +static const float mfact = 0.5; /* 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 Layout layouts[] = { /* symbol arrange function */ - { "[]=", tile }, /* first entry is default */ - { "><>", NULL }, /* no layout function means floating behavior */ { "[M]", monocle }, + { "[]=", tile }, /* first entry is default */ { "[D]", deck }, + { "><>", NULL }, /* no layout function means floating behavior */ }; /* 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} }, \ @@ -58,36 +60,36 @@ static const Layout layouts[] = { /* 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", "-c", "-l", "20", NULL }; static Key keys[] = { - /* modifier key function argument */ - { 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 } }, - { 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, 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_c, setlayout, {.v = &layouts[3]} }, - { MODKEY, XK_space, setlayout, {0} }, - { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, - { MODKEY|ShiftMask, XK_f, togglefullscr, {0} }, - { MODKEY, XK_0, view, {.ui = ~0 } }, - { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, + /* modifier key function argument */ + { MODKEY|ShiftMask, XK_Escape, quit, {0} }, + { MODKEY|ShiftMask, XK_b, togglebar, {0} }, + { MODKEY|ShiftMask, XK_c, setlayout, {.v = &layouts[2]} }, + { MODKEY|ShiftMask, XK_d, togglefloating, {0} }, + { MODKEY|ShiftMask, XK_f, togglefullscr, {0} }, + { MODKEY, XK_h, focusstack, {.i = -1 } }, + { MODKEY|ShiftMask, XK_h, zoom, {0} }, + { MODKEY, XK_j, focusstack, {.i = +1 } }, + { MODKEY|ShiftMask, XK_j, zoom, {0} }, + { MODKEY, XK_k, focusstack, {.i = -1 } }, + { MODKEY|ShiftMask, XK_k, zoom, {0} }, + { MODKEY, XK_l, focusstack, {.i = +1 } }, + { MODKEY|ShiftMask, XK_m, setlayout, {.v = &layouts[0]} }, + { MODKEY|ShiftMask, XK_o, setmfact, {.f = +0.05} }, + { MODKEY, XK_q, killclient, {0} }, + { MODKEY|ShiftMask, XK_t, setlayout, {.v = &layouts[1]} }, + { MODKEY|ShiftMask, XK_z, setmfact, {.f = -0.05} }, + { 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_o, incnmaster, {.i = +1 } }, + //{ MODKEY|ShiftMask, XK_z, incnmaster, {.i = -1 } }, + //{ MODKEY, XK_space, setlayout, {0} }, TAGKEYS( XK_1, 0) TAGKEYS( XK_2, 1) TAGKEYS( XK_3, 2) @@ -97,7 +99,6 @@ static Key keys[] = { TAGKEYS( XK_7, 6) TAGKEYS( XK_8, 7) TAGKEYS( XK_9, 8) - { MODKEY|ShiftMask, XK_q, quit, {0} }, }; /* button definitions */ diff --git a/config.h b/config.h new file mode 100644 index 0000000..9c6b8d2 --- /dev/null +++ b/config.h @@ -0,0 +1,123 @@ +/* See LICENSE file for copyright and license details. */ + +/* for media keys */ +#include + +/* appearance */ +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=10", "Noto Color Emoji:size=11" }; +static const char dmenufont[] = "monospace:size=10"; +static const char normbgcolor[] = "#0e0f14"; +static const char normbordercolor[] = "#363b47"; +static const char normfgcolor[] = "#dfdfdf"; +static const char selfgcolor[] = "#eeeeee"; +static const char selbordercolor[] = "#555a63"; +static const char selbgcolor[] = "#282a38"; +static const 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 *alttags[] = { "<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 iscentered isfloating monitor */ + { NULL, "de.uol.swp.client.ClientApp", NULL, 0, 0, 1, -1 }, +}; + +/* layout(s) */ +static const float mfact = 0.5; /* 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 Layout layouts[] = { + /* symbol arrange function */ + { "[M]", monocle }, + { "[]=", tile }, /* first entry is default */ + { "[D]", deck }, + { "><>", 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", "-c", "-l", "20", NULL }; + +static Key keys[] = { + /* modifier key function argument */ + { MODKEY|ShiftMask, XK_Escape, quit, {0} }, + { MODKEY|ShiftMask, XK_b, togglebar, {0} }, + { MODKEY|ShiftMask, XK_c, setlayout, {.v = &layouts[2]} }, + { MODKEY|ShiftMask, XK_d, togglefloating, {0} }, + { MODKEY|ShiftMask, XK_f, togglefullscr, {0} }, + { MODKEY, XK_h, focusstack, {.i = -1 } }, + { MODKEY|ShiftMask, XK_h, zoom, {0} }, + { MODKEY, XK_j, focusstack, {.i = +1 } }, + { MODKEY|ShiftMask, XK_j, zoom, {0} }, + { MODKEY, XK_k, focusstack, {.i = -1 } }, + { MODKEY|ShiftMask, XK_k, zoom, {0} }, + { MODKEY, XK_l, focusstack, {.i = +1 } }, + { MODKEY|ShiftMask, XK_m, setlayout, {.v = &layouts[0]} }, + { MODKEY|ShiftMask, XK_o, setmfact, {.f = +0.05} }, + { MODKEY, XK_q, killclient, {0} }, + { MODKEY|ShiftMask, XK_t, setlayout, {.v = &layouts[1]} }, + { MODKEY|ShiftMask, XK_z, setmfact, {.f = -0.05} }, + { 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_o, incnmaster, {.i = +1 } }, + //{ MODKEY|ShiftMask, XK_z, incnmaster, {.i = -1 } }, + //{ MODKEY, XK_space, setlayout, {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) +}; + +/* 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, Button1, sigdwmblocks, {.i = 1} }, + { ClkStatusText, 0, Button2, sigdwmblocks, {.i = 2} }, + { ClkStatusText, 0, Button3, sigdwmblocks, {.i = 3} }, + { 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.c b/drw.c index 8fd1ca4..0d2bfcb 100644 --- a/drw.c +++ b/drw.c @@ -139,11 +139,11 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern) * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916349 * and lots more all over the internet. */ - FcBool iscol; + /*FcBool iscol; if(FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) == FcResultMatch && iscol) { XftFontClose(drw->dpy, xfont); return NULL; - } + }*/ font = ecalloc(1, sizeof(Fnt)); font->xfont = xfont; diff --git a/dwm.c b/dwm.c index 20ce5cf..4545193 100644 --- a/dwm.c +++ b/dwm.c @@ -735,7 +735,7 @@ deck(Monitor *m) { if(n > m->nmaster) { mw = m->nmaster ? m->ww * m->mfact : 0; - snprintf(m->ltsymbol, sizeof m->ltsymbol, "%d", n - m->nmaster); + snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n - m->nmaster); } else mw = m->ww;