jakub/dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: jakub:master
Branches Tags
jakub:master
jakub:confdefh
jakub:underline
jakub:status2d
jakub:dwm-6.5
..
compare: jakub:confdefh
Branches Tags
jakub:master
jakub:confdefh
jakub:underline
jakub:status2d
jakub:dwm-6.5

1 Commits
master ... confdefh

Author SHA1 Message Date
Jakub
c78718c86b wrote out config.def.h 2025-01-24 01:51:29 -05:00
9 changed files with 221 additions and 259 deletions
Show Stats Expand all files Collapse all files

5
Makefile
View File

@ -37,12 +37,9 @@ install: all
mkdir -p ${DESTDIR}${MANPREFIX}/man1 mkdir -p ${DESTDIR}${MANPREFIX}/man1
sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1 sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1
chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1 chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1
mkdir -p ${DESTDIR}${PREFIX}/share/xsessions
cp -f dwm.desktop ${DESTDIR}/usr/share/xsessions
uninstall: uninstall:
rm -f ${DESTDIR}${PREFIX}/bin/dwm\ rm -f ${DESTDIR}${PREFIX}/bin/dwm\
${DESTDIR}${MANPREFIX}/man1/dwm.1 \ ${DESTDIR}${MANPREFIX}/man1/dwm.1
${DESTDIR}/usr/share/xsessions/dwm.desktop
.PHONY: all clean dist install uninstall .PHONY: all clean dist install uninstall

325
config.def.h
View File

@ -1,60 +1,59 @@
/* See LICENSE file for copyright and license details. */ /* See LICENSE file for copyright and license details. */
/* appearance */ /* appearance */
static const unsigned int borderpx = 1; /* border pixel of windows */ static const unsigned int borderpx = 1; /* border pixel of windows */
static const unsigned int gappx = 18; /* gap pixel between windows */ static const unsigned int gappx = 10; /* gap pixel between windows */
static const unsigned int snap = 32; /* snap pixel */ static const unsigned int snap = 32; /* snap pixel */
static const int swallowfloating = 0; /* 1 means swallow floating windows by default */ static const int swallowfloating = 0; /* 1 means swallow floating windows by default */
static const int showbar = 1; /* 0 means no standard bar */ static const int showbar = 1; /* 0 means no standard bar */
static const int topbar = 1; /* 0 means standard bar at bottom */ static const int topbar = 1; /* 0 means standard bar at bottom */
static const int extrabar = 1; /* 0 means no extra bar */ static const int extrabar = 1; /* 0 means no extra bar */
static const char statussep = ';'; /* separator between statuses */ static const char statussep = ';'; /* separator between statuses */
static const int user_bh = 2; /* 2 is the default spacing around the bar's font */ static const int user_bh = 2; /* 2 is the default spacing around the bar's font */
static const int vertpad = 10; /* vertical padding of bar */ static const int vertpad = 10; /* vertical padding of bar */
static const int sidepad = 10; /* horizontal padding of bar */ static const int sidepad = 10; /* horizontal padding of bar */
static const char *fonts[] = { "Hack Nerd Font:size=10" }; static const char *fonts[] = { "Hack Nerd Font:size=10" };
static const char dmenufont[] = "Hack Nerd Font:size=10"; static const char dmenufont[] = "Hack Nerd Font:size=10";
static const char col_bg_dim[] = "#1e2326"; static const char col_bg_dim[] = "#1e2326";
static const char col_bg0[] = "#272e33"; static const char col_bg0[] = "#272e33";
static const char col_bg1[] = "#2e383c"; static const char col_bg1[] = "#2e383c";
static const char col_bg2[] = "#374145"; static const char col_bg2[] = "#374145";
static const char col_bg3[] = "#414b50"; static const char col_bg3[] = "#414b50";
static const char col_bg4[] = "#495156"; static const char col_bg4[] = "#495156";
static const char col_bg5[] = "#4f5b58"; static const char col_bg5[] = "#4f5b58";
static const char col_bg_red[] = "#4c3743"; static const char col_bg_red[] = "#4c3743";
static const char col_bg_visual[] = "#493b40"; static const char col_bg_visual[] = "#493b40";
static const char col_bg_green[] = "#3c4841"; static const char col_bg_green[] = "#3c4841";
static const char col_bg_blue[] = "#384b55"; static const char col_bg_blue[] = "#384b55";
static const char col_bg_yellow[] = "#45443c"; static const char col_bg_yellow[] = "#45443c";
static const char col_fg[] = "#d3c6aa"; static const char col_fg[] = "#d3c6aa";
static const char col_red[] = "#e67e80"; static const char col_red[] = "#e67e80";
static const char col_orange[] = "#e69875"; static const char col_orange[] = "#e69875";
static const char col_yellow[] = "#dbbc7f"; static const char col_yellow[] = "#dbbc7f";
static const char col_green[] = "#a7c080"; static const char col_green[] = "#a7c080";
static const char col_aqua[] = "#83c092"; static const char col_aqua[] = "#83c092";
static const char col_blue[] = "#7fbbb3"; static const char col_blue[] = "#7fbbb3";
static const char col_purple[] = "#d699b6"; static const char col_purple[] = "#d699b6";
static const char col_gray0[] = "#7a8478"; static const char col_gray0[] = "#7a8478";
static const char col_gray1[] = "#859289"; static const char col_gray1[] = "#859289";
static const char col_gray2[] = "#9da9a0"; static const char col_gray2[] = "#9da9a0";
static const unsigned int baralpha = 230; static const unsigned int baralpha = 230;
static const unsigned int borderalpha = OPAQUE; static const unsigned int borderalpha = OPAQUE;
static const char *colors[][3] = { static const char *colors[][3] = {
/* fg bg border */ /* fg bg border */
[SchemeNorm] = { col_fg, col_bg_dim, col_gray0 }, [SchemeNorm] = { col_fg, col_bg_dim, col_gray0 },
[SchemeSel] = { col_fg, col_bg3, col_blue}, [SchemeSel] = { col_fg, col_bg3, col_blue},
[SchemeHid] = { col_gray0, col_bg_dim, col_blue}, [SchemeHid] = { col_gray0, col_bg_dim, col_blue},
[SchemeLay] = { col_fg, col_bg0, col_blue }, [SchemeLay] = { col_fg, col_bg0, col_blue },
[SchemeWf] = { col_fg, col_bg1, col_blue }, [SchemeWf] = { col_fg, col_bg1, col_blue },
}; };
static const unsigned int alphas[][3] = { static const unsigned int alphas[][3] = {
/* fg bg border*/ /* fg bg border*/
[SchemeNorm] = { OPAQUE, baralpha, borderalpha }, [SchemeNorm] = { OPAQUE, baralpha, borderalpha },
[SchemeSel] = { OPAQUE, baralpha, borderalpha }, [SchemeSel] = { OPAQUE, baralpha, borderalpha },
[SchemeHid] = { OPAQUE, baralpha, borderalpha }, [SchemeHid] = { OPAQUE, baralpha, borderalpha },
[SchemeLay] = { OPAQUE, baralpha, borderalpha }, [SchemeLay] = { OPAQUE, baralpha, borderalpha },
[SchemeWf] = { OPAQUE, baralpha, borderalpha }, [SchemeWf] = { OPAQUE, baralpha, borderalpha },
}; };
static const char *const autostart[] = { static const char *const autostart[] = {
@ -67,9 +66,10 @@ static const char *const autostart[] = {
/* tagging */ /* tagging */
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
/* launcher commands (They must be NULL terminated) */ /* launcher commands (They must be NULL terminated) */
static const char* browser[] = { "firefox", "--newwindow", "search.brave.com", NULL }; static const char* browser[] = { "firefox-esr", "--newwindow", NULL };
static const char* terminal[] = { "st", NULL }; static const char* terminal[] = { "st", NULL };
static const Launcher launchers[] = { static const Launcher launchers[] = {
{ terminal, "st" }, { terminal, "st" },
@ -100,11 +100,12 @@ static const Rule rules[] = {
* WM_CLASS(STRING) = instance, class * WM_CLASS(STRING) = instance, class
* WM_NAME(STRING) = title * WM_NAME(STRING) = title
*/ */
/* class instance title tags mask isfloating isfakefullscreen isterminal noswallow monitor */ /* class instance title tags mask isfloating isfakefullscreen isterminal noswallow monitor */
{ "Gimp", NULL, NULL, 0, 1, 0, 0, 0, -1 }, { "Gimp", NULL, NULL, 0, 1, 0, 0, 0, -1 },
{ "Firefox", NULL, NULL, 1 << 8, 0, 0, 0, -1, -1 }, { "Firefox", NULL, NULL, 1 << 8, 0, 0, 0, -1, -1 },
{ "St", NULL, NULL, 0, 0, 0, 1, 0, -1 }, { "St", NULL, NULL, 0, 0, 0, 1, 0, -1 },
{ NULL, NULL, "Event Tester", 0, 0, 0, 0, 1, -1 }, /* xev */ { "St", NULL, "pulsemixer", 0, 1, 0, 0, 1, -1 },
{ NULL, NULL, "Event Tester", 0, 0, 0, 0, 1, -1 }, /* xev */
}; };
static const char topicon[128] = "\uf435"; static const char topicon[128] = "\uf435";
@ -116,29 +117,27 @@ static const char topicon[128] = "\uf435";
#define WFDEFAULT WFINACTIVE #define WFDEFAULT WFINACTIVE
/* layout(s) */ /* layout(s) */
static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ 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 nmaster = 1; /* number of clients in master area */
static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ 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 int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
#include "gaplessgrid.c"
static const Layout layouts[] = { static const Layout layouts[] = {
/* symbol arrange function */ /* symbol arrange function */
{ "[]=", tile }, /* first entry is default */ { "[]=", tile }, /* first entry is default */
{ "><>", NULL }, /* no layout function means floating behavior */ { "><>", NULL }, /* no layout function means floating behavior */
{ "[M]", monocle }, { "[M]", monocle },
{ "[D]", deck }, { "[D]", deck },
{ "###", gaplessgrid },
}; };
/* key definitions */ /* key definitions */
#define MODKEY Mod4Mask #define MODKEY Mod4Mask
#define TAGKEYS(KEY,TAG) \ #define TAGKEYS(KEY,TAG) \
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
{ MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
{ MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
{ MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, \
{ Mod1Mask|ShiftMask, KEY, swaptags, {.ui = 1 << TAG} }, { Mod1Mask|ShiftMask, KEY, swaptags, {.ui = 1 << TAG} },
/* helper for spawning shell commands in the pre dwm-5.0 fashion */ /* helper for spawning shell commands in the pre dwm-5.0 fashion */
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
@ -146,96 +145,112 @@ static const Layout layouts[] = {
/* commands */ /* commands */
static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_bg_dim, "-nf", col_fg, "-sb", col_bg3, "-sf", col_fg, NULL }; static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_bg_dim, "-nf", col_fg, "-sb", col_bg3, "-sf", col_fg, NULL };
static const char *termcmd[] = { "st", NULL };
static const char *layoutmenu_cmd = "layoutmenu.sh"; static const char *layoutmenu_cmd = "layoutmenu.sh";
#include <X11/XF86keysym.h>
#include "exitdwm.c" #include "exitdwm.c"
static const Key keys[] = { static const Key keys[] = {
/* modifier key function argument */ /* modifier key function argument */
{ MODKEY, XK_p, spawn, {.v = dmenucmd } }, { 0, XF86XK_AudioMute, spawn, { .v = (const char*[]){ "sh", "-c", "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; notify-send -r 1001 \"$(wpctl get-volume @DEFAULT_SINK@ | awk '{printf \"%s %.f%% %s\\n\",$1, $2 * 100, $3}')\"", NULL } } }, // TODO status update
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, { 0, XF86XK_AudioRaiseVolume, spawn, { .v = (const char*[]){ "sh", "-c", "wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+; notify-send -r 1001 \"$(wpctl get-volume @DEFAULT_SINK@ | awk '{printf \"%s %.f%% %s\\n\",$1, $2 * 100, $3}')\"", NULL } } }, // TODO status update
{ MODKEY, XK_b, togglebar, {0} }, { 0, XF86XK_AudioLowerVolume, spawn, { .v = (const char*[]){ "sh", "-c", "wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%-; notify-send -r 1001 \"$(wpctl get-volume @DEFAULT_SINK@ | awk '{printf \"%s %.f%% %s\\n\",$1, $2 * 100, $3}')\"", NULL } } }, // TODO status update
{ MODKEY|ShiftMask, XK_b, toggleextrabar, {0} }, { 0, XF86XK_MonBrightnessUp, spawn, { .v = (const char*[]){ "sh", "-c", "xbacklight -inc 5; notify-send -r 1001 \"$(xbacklight -get | awk '{gsub(/\\.[0-9]+/, \"\"); print \"Brightness \" $1 \"%\"}')\"", NULL } } }, // TODO status update
{ MODKEY, XK_n, togglefollow, {0} }, { 0, XF86XK_MonBrightnessDown, spawn, { .v = (const char*[]){ "sh", "-c", "xbacklight -dec 5; notify-send -r 1001 \"$(xbacklight -get | awk '{gsub(/\\.[0-9]+/, \"\"); print \"Brightness \" $1 \"%\"}')\"", NULL } } }, // TODO status update
{ MODKEY, XK_j, focusstackvis, {.i = +1 } }, { MODKEY, XK_BackSpace, spawn, { .v = (const char*[]){ "sh", "-c", "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; notify-send -r 1001 \"$(wpctl get-volume @DEFAULT_SINK@ | awk '{printf \"%s %.f%% %s\\n\",$1, $2 * 100, $3}')\"", NULL } } }, // TODO status update
{ MODKEY, XK_k, focusstackvis, {.i = -1 } }, { MODKEY, XK_equal, spawn, { .v = (const char*[]){ "sh", "-c", "wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+; notify-send -r 1001 \"$(wpctl get-volume @DEFAULT_SINK@ | awk '{printf \"%s %.f%% %s\\n\",$1, $2 * 100, $3}')\"", NULL } } }, // TODO status update
{ MODKEY|ShiftMask, XK_j, focusstackhid, {.i = +1 } }, { MODKEY, XK_minus, spawn, { .v = (const char*[]){ "sh", "-c", "wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%-; notify-send -r 1001 \"$(wpctl get-volume @DEFAULT_SINK@ | awk '{printf \"%s %.f%% %s\\n\",$1, $2 * 100, $3}')\"", NULL } } }, // TODO status update
{ MODKEY|ShiftMask, XK_k, focusstackhid, {.i = -1 } }, { MODKEY, XK_q, killclient, {0}},
{ MODKEY|ShiftMask, XK_j, movestack, {.i = +1 } }, { MODKEY|ShiftMask, XK_q, exitdwm, {0}},
{ MODKEY|ShiftMask, XK_k, movestack, {.i = -1 } }, { MODKEY, XK_e, spawn, SHCMD("st -e nvim")},
{ MODKEY, XK_i, incnmaster, {.i = +1 } }, { MODKEY, XK_i, spawn, SHCMD("firefox-esr")},
{ MODKEY, XK_d, incnmaster, {.i = -1 } }, { MODKEY, XK_p, spawn, SHCMD("dmenu-pass")},
{ MODKEY, XK_h, setmfact, {.f = -0.05} }, { MODKEY|ShiftMask, XK_p, spawn, SHCMD("dmenu-pass -a")},
{ MODKEY, XK_l, setmfact, {.f = +0.05} }, { MODKEY, XK_a, spawn, SHCMD("kill $(pidof -x pulsemixer); st -n pulsemixer -e pulsemixer;")}, // TODO status update
{ MODKEY, XK_r, resetlayout, {0} }, { MODKEY, XK_d, spawn, {.v=dmenucmd}},
{ MODKEY, XK_Return, zoom, {0} }, { MODKEY, XK_f, togglefullscr, {0}},
{ MODKEY, XK_Tab, view, {0} }, { MODKEY|ShiftMask, XK_f, togglefakefullscr, {0}},
{ MODKEY|ShiftMask, XK_c, killclient, {0} }, { MODKEY|Mod1Mask, XK_f, togglefollow, {0}},
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, { MODKEY, XK_h, focusmon, {.i=+1}},
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, { MODKEY|ShiftMask, XK_h, tagmon, {.i=+1}},
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, { MODKEY, XK_j, focusstackvis, {.i=+1}},
{ MODKEY, XK_r, setlayout, {.v = &layouts[3]} }, { MODKEY|ShiftMask, XK_j, movestack, {.i=+1}},
{ MODKEY, XK_space, setlayout, {0} }, { MODKEY|Mod1Mask, XK_j, focusstackhid, {.i=+1}},
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} }, { MODKEY, XK_k, focusstackvis, {.i=-1}},
{ MODKEY|ShiftMask, XK_t, togglealwaysontop, {0} }, { MODKEY|ShiftMask, XK_k, movestack, {.i=-1}},
{ MODKEY, XK_Down, moveresize, {.v = "0x 25y 0w 0h" } }, { MODKEY|Mod1Mask, XK_k, focusstackhid, {.i=-1}},
{ MODKEY, XK_Up, moveresize, {.v = "0x -25y 0w 0h" } }, { MODKEY, XK_l, focusmon, {.i=-1}},
{ MODKEY, XK_Right, moveresize, {.v = "25x 0y 0w 0h" } }, { MODKEY|ShiftMask, XK_l, tagmon, {.i=-1}},
{ MODKEY, XK_Left, moveresize, {.v = "-25x 0y 0w 0h" } }, { MODKEY, XK_Return, spawn, SHCMD("st")},
{ MODKEY|ShiftMask, XK_Down, moveresize, {.v = "0x 0y 0w 25h" } }, { MODKEY|ShiftMask, XK_Return, zoom, {0}},
{ MODKEY|ShiftMask, XK_Up, moveresize, {.v = "0x 0y 0w -25h" } }, { MODKEY, XK_comma, setmfact, {.f=-0.05}},
{ MODKEY|ShiftMask, XK_Right, moveresize, {.v = "0x 0y 25w 0h" } }, { MODKEY|ShiftMask, XK_comma, incnmaster, {.i=+1}},
{ MODKEY|ShiftMask, XK_Left, moveresize, {.v = "0x 0y -25w 0h" } }, { MODKEY, XK_period, setmfact, {.f=+0.05}},
{ MODKEY|ControlMask, XK_Up, moveresizeedge, {.v = "t"} }, { MODKEY|ShiftMask, XK_period, incnmaster, {.i=-1}},
{ MODKEY|ControlMask, XK_Down, moveresizeedge, {.v = "b"} }, TAGKEYS( XK_1, 0 )
{ MODKEY|ControlMask, XK_Left, moveresizeedge, {.v = "l"} }, TAGKEYS( XK_2, 1 )
{ MODKEY|ControlMask, XK_Right, moveresizeedge, {.v = "r"} }, TAGKEYS( XK_3, 2 )
{ MODKEY|ControlMask|ShiftMask, XK_Up, moveresizeedge, {.v = "T"} }, TAGKEYS( XK_4, 3 )
{ MODKEY|ControlMask|ShiftMask, XK_Down, moveresizeedge, {.v = "B"} }, TAGKEYS( XK_5, 4 )
{ MODKEY|ControlMask|ShiftMask, XK_Left, moveresizeedge, {.v = "L"} }, TAGKEYS( XK_6, 5 )
{ MODKEY|ControlMask|ShiftMask, XK_Right, moveresizeedge, {.v = "R"} }, TAGKEYS( XK_7, 6 )
{ MODKEY|ShiftMask, XK_f, togglefullscr, {0} }, TAGKEYS( XK_8, 7 )
{ MODKEY|Mod1Mask, XK_f, togglefakefullscr, {0} }, TAGKEYS( XK_9, 8 )
{ 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, XK_s, show, {0} },
{ MODKEY|ShiftMask, XK_s, showall, {0} },
{ MODKEY, XK_h, hide, {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_e, exitdwm, {0} }
{MODKEY, XK_r, resetlayout, {0}},
{MODKEY, XK_t, setlayout, {.v=&layouts[0]}},
{MODKEY, XK_f, setlayout, {.v=&layouts[1]}},
{MODKEY, XK_m, setlayout, {.v=&layouts[2]}},
{MODKEY, XK_r, setlayout, {.v=&layouts[3]}},
{MODKEY, XK_space, setlayout, {0}},
{MODKEY|ShiftMask, XK_space, togglefloating,{0}},
{MODKEY|ShiftMask, XK_t, togglealwaysontop,{0}},
{MODKEY, XK_Down, moveresize, {.v="0x25y0w0h"}},
{MODKEY, XK_Up, moveresize, {.v="0x-25y0w0h"}},
{MODKEY, XK_Right, moveresize, {.v="25x0y0w0h"}},
{MODKEY, XK_Left, moveresize, {.v="-25x0y0w0h"}},
{MODKEY|ShiftMask, XK_Down, moveresize, {.v="0x0y0w25h"}},
{MODKEY|ShiftMask, XK_Up, moveresize, {.v="0x0y0w-25h"}},
{MODKEY|ShiftMask, XK_Right, moveresize, {.v="0x0y25w0h"}},
{MODKEY|ShiftMask, XK_Left, moveresize, {.v="0x0y-25w0h"}},
{MODKEY|ControlMask, XK_Up, moveresizeedge,{.v="t"}},
{MODKEY|ControlMask, XK_Down, moveresizeedge,{.v="b"}},
{MODKEY|ControlMask, XK_Left, moveresizeedge,{.v="l"}},
{MODKEY|ControlMask, XK_Right, moveresizeedge,{.v="r"}},
{MODKEY|ControlMask|ShiftMask,XK_Up, moveresizeedge,{.v="T"}},
{MODKEY|ControlMask|ShiftMask,XK_Down, moveresizeedge,{.v="B"}},
{MODKEY|ControlMask|ShiftMask,XK_Left, moveresizeedge,{.v="L"}},
{MODKEY|ControlMask|ShiftMask,XK_Right, moveresizeedge,{.v="R"}},
{MODKEY, XK_0, view, {.ui=~0}},
{MODKEY|ShiftMask, XK_0, tag, {.ui=~0}},
{MODKEY, XK_s, show, {0}},
{MODKEY|ShiftMask, XK_s, showall, {0}},
{MODKEY, XK_h, hide, {0}},
}; };
/* button definitions */ /* button definitions */
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ /* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
static const Button buttons[] = { static const Button buttons[] = {
/* click event mask button function argument */ /* click event mask button function argument */
{ ClkLtSymbol, 0, Button1, setlayout, {0} }, { ClkLtSymbol, 0, Button1, setlayout, {0} },
{ ClkLtSymbol, 0, Button3, layoutmenu, {0} }, { ClkLtSymbol, 0, Button3, layoutmenu, {0} },
{ ClkFollowSymbol, 0, Button1, togglefollow, {0} }, { ClkFollowSymbol, 0, Button1, togglefollow, {0} },
{ ClkWinTitle, 0, Button1, togglewin, {0} }, { ClkWinTitle, 0, Button1, togglewin, {0} },
{ ClkWinTitle, 0, Button2, zoom, {0} }, { ClkWinTitle, 0, Button2, zoom, {0} },
{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, /* { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, */
{ ClkExBarLeftStatus, 0, Button2, spawn, {.v = termcmd } }, /* { ClkExBarLeftStatus, 0, Button2, spawn, {.v = termcmd } }, */
{ ClkExBarMiddle, 0, Button2, spawn, {.v = termcmd } }, /* { ClkExBarMiddle, 0, Button2, spawn, {.v = termcmd } }, */
{ ClkExBarRightStatus, 0, Button2, spawn, {.v = termcmd } }, /* { ClkExBarRightStatus, 0, Button2, spawn, {.v = termcmd } }, */
{ ClkClientWin, MODKEY, Button1, movemouse, {0} }, { ClkClientWin, MODKEY, Button1, movemouse, {0} },
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} }, { ClkClientWin, MODKEY, Button2, togglefloating, {0} },
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} }, { ClkClientWin, MODKEY, Button3, resizemouse, {0} },
{ ClkTagBar, 0, Button1, view, {0} }, { ClkTagBar, 0, Button1, view, {0} },
{ ClkTagBar, 0, Button3, toggleview, {0} }, { ClkTagBar, 0, Button3, toggleview, {0} },
{ ClkTagBar, MODKEY, Button1, tag, {0} }, { ClkTagBar, MODKEY, Button1, tag, {0} },
{ ClkTagBar, MODKEY, Button3, toggletag, {0} }, { ClkTagBar, MODKEY, Button3, toggletag, {0} },
}; };

13
dwm.c
View File

@ -2046,6 +2046,8 @@ void
resizeclient(Client *c, int x, int y, int w, int h) resizeclient(Client *c, int x, int y, int w, int h)
{ {
XWindowChanges wc; XWindowChanges wc;
unsigned int n;
Client *nbc;
c->oldx = c->x; c->x = wc.x = x; c->oldx = c->x; c->x = wc.x = x;
c->oldy = c->y; c->y = wc.y = y; c->oldy = c->y; c->y = wc.y = y;
@ -2056,6 +2058,17 @@ resizeclient(Client *c, int x, int y, int w, int h)
if ((nexttiled(c->mon->clients) == c) && !(nexttiled(c->next))) if ((nexttiled(c->mon->clients) == c) && !(nexttiled(c->next)))
resetlayout(NULL); resetlayout(NULL);
for (n = 0, nbc = nexttiled(c->mon->clients); nbc; nbc = nexttiled(nbc->next), n++);
if (c->isfloating || c->mon->lt[c->mon->sellt]->arrange == NULL) {
} else {
if (c->mon->lt[c->mon->sellt]->arrange == monocle || n == 1) {
wc.border_width = 0;
c->w = wc.width += c->bw * 2;
c->h = wc.height += c->bw * 2;
}
}
XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc); XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
configure(c); configure(c);
XSync(dpy, False); XSync(dpy, False);

9
dwm.desktop
View File

@ -1,9 +0,0 @@
[Desktop Entry]
Name=dwm
Comment=dynamic tiling window manager
Exec=dwm
TryExec=dwm
Type=Application
X-LightDM-DesktopName=dwm
DesktopNames=dwm
Keywords=tiling;wm;windowmanager;window;manager;

47
gaplessgrid.c
View File

@ -1,47 +0,0 @@
void
gaplessgrid(Monitor *m)
{
unsigned int i, n;
int x, y, cols, rows, ch, cw, cn, rn, rrest, crest; // counters
Client *c;
for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
if ( n == 0 )
return;
/* grid dimensions */
for (cols = 0; cols <= n/2; cols++)
if (cols*cols >= n)
break;
if (n == 5) /* set layout against the general calculation: not 1:2:2, but 2:3 */
cols = 2;
rows = n/cols;
cn = rn = 0; // reset column no, row no, client count
ch = (m->wh - 2*gappx - gappx * (rows - 1)) / rows;
cw = (m->ww - 2*gappx - gappx * (cols - 1)) / cols;
rrest = (m->wh - 2*gappx - gappx * (rows - 1)) - ch * rows;
crest = (m->ww - 2*gappx - gappx * (cols - 1)) - cw * cols;
x = m->wx + gappx;
y = m->wy + gappx;
for (i = 0, c = nexttiled(m->clients); c; i++, c = nexttiled(c->next)) {
if (i/rows + 1 > cols - n%cols) {
rows = n/cols + 1;
ch = (m->wh - 2*gappx - gappx * (rows - 1)) / rows;
rrest = (m->wh - 2*gappx - gappx * (rows - 1)) - ch * rows;
}
resize(c,
x,
y + rn*(ch + gappx) + MIN(rn, rrest),
cw + (cn < crest ? 1 : 0) - 2*c->bw,
ch + (rn < rrest ? 1 : 0) - 2*c->bw,
0);
rn++;
if (rn >= rows) {
rn = 0;
x += cw + gappx + (cn < crest ? 1 : 0);
cn++;
}
}
}

31
patches/appearance/dwm-removeborder-20220626-d3f93c7.diff Normal file
View File

@ -0,0 +1,31 @@
diff --git a/dwm.c b/dwm.c
index 5646a5c..27e29df 100644
--- a/dwm.c
+++ b/dwm.c
@@ -1283,12 +1283,26 @@ void
resizeclient(Client *c, int x, int y, int w, int h)
{
XWindowChanges wc;
+ unsigned int n;
+ Client *nbc;
c->oldx = c->x; c->x = wc.x = x;
c->oldy = c->y; c->y = wc.y = y;
c->oldw = c->w; c->w = wc.width = w;
c->oldh = c->h; c->h = wc.height = h;
wc.border_width = c->bw;
+
+ for (n = 0, nbc = nexttiled(c->mon->clients); nbc; nbc = nexttiled(nbc->next), n++);
+
+ if (c->isfloating || c->mon->lt[c->mon->sellt]->arrange == NULL) {
+ } else {
+ if (c->mon->lt[c->mon->sellt]->arrange == monocle || n == 1) {
+ wc.border_width = 0;
+ c->w = wc.width += c->bw * 2;
+ c->h = wc.height += c->bw * 2;
+ }
+ }
+
XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
configure(c);
XSync(dpy, False);

43
patches/layouts/dwm-gaplessgrid-20160731-56a31dc.diff
View File

@ -1,43 +0,0 @@
URL: http://dwm.suckless.org/patches/gapless_grid
Add gapless grid layout.
Index: dwm/gaplessgrid.c
===================================================================
--- /dev/null
+++ dwm/gaplessgrid.c
@@ -0,0 +1,35 @@
+void
+gaplessgrid(Monitor *m) {
+ unsigned int n, cols, rows, cn, rn, i, cx, cy, cw, ch;
+ Client *c;
+
+ for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) ;
+ if(n == 0)
+ return;
+
+ /* grid dimensions */
+ for(cols = 0; cols <= n/2; cols++)
+ if(cols*cols >= n)
+ break;
+ if(n == 5) /* set layout against the general calculation: not 1:2:2, but 2:3 */
+ cols = 2;
+ rows = n/cols;
+
+ /* window geometries */
+ cw = cols ? m->ww / cols : m->ww;
+ cn = 0; /* current column number */
+ rn = 0; /* current row number */
+ for(i = 0, c = nexttiled(m->clients); c; i++, c = nexttiled(c->next)) {
+ if(i/rows + 1 > cols - n%cols)
+ rows = n/cols + 1;
+ ch = rows ? m->wh / rows : m->wh;
+ cx = m->wx + cn*cw;
+ cy = m->wy + rn*ch;
+ resize(c, cx, cy, cw - 2 * c->bw, ch - 2 * c->bw, False);
+ rn++;
+ if(rn >= rows) {
+ rn = 0;
+ cn++;
+ }
+ }
+}

1
scripts/layoutmenu.sh
View File

@ -5,5 +5,4 @@ cat <<EOF | xmenu
><> Floating Layout 1 ><> Floating Layout 1
[M] Monocle Layout 2 [M] Monocle Layout 2
[D] Deck Layout 3 [D] Deck Layout 3
### Grid Layout 4
EOF EOF

6
todo.md Normal file
View File

@ -0,0 +1,6 @@
# DWM Todo
## Bar
- [ ] add `config.def.h` options for window name & tag underline colors and
widths
- [ ] and drawbar is a mess from that ^ so clean it up