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

Compare commits

base: inkletblot:7b555451ae284e640e52045d5fef4af5d0a859eb
Branches Tags
inkletblot:master
inkletblot:config
inkletblot:patch/swapwindows
inkletblot:patch/named-scratchpads
inkletblot:patch/steam
inkletblot:patch/hide-vacant-tags
inkletblot:patch/allowkillrule
inkletblot:patch/systray
inkletblot:suckless/master
inkletblot:patch/fullscreen
inkletblot:patch/attachtop
inkletblot:patch/movestack
inkletblot:patch/uselessgap
inkletblot:patch/restartsig
inkletblot:patch/pertag
inkletblot:patch/shift-tools
inkletblot:patch/statuscmd
inkletblot:patch/keychord
inkletblot:6.8
inkletblot:6.7
inkletblot:6.6
inkletblot:6.5
inkletblot:6.4
inkletblot:6.3
inkletblot:6.2
inkletblot:6.1
inkletblot:6.0
inkletblot:5.9
inkletblot:5.8.2
inkletblot:5.8.1
inkletblot:5.8
inkletblot:5.7.2
inkletblot:5.7.1
inkletblot:5.7
inkletblot:5.6.1
inkletblot:5.6
inkletblot:5.5
inkletblot:5.4.1
inkletblot:5.4
inkletblot:5.3.1
inkletblot:5.3
inkletblot:5.2
inkletblot:5.1
inkletblot:5.0
inkletblot:4.9
inkletblot:4.8
inkletblot:4.7
inkletblot:4.6
inkletblot:4.5
inkletblot:4.4.1
inkletblot:4.4
inkletblot:4.3
inkletblot:4.2
inkletblot:4.1
inkletblot:4.0
inkletblot:3.9
inkletblot:3.8
inkletblot:3.7
inkletblot:3.6.1
inkletblot:3.6
inkletblot:3.5
inkletblot:3.4
inkletblot:3.3
inkletblot:3.2.2
inkletblot:3.2.1
inkletblot:3.2
inkletblot:3.1
inkletblot:3.0
inkletblot:2.9
inkletblot:2.8
inkletblot:2.7
inkletblot:2.6
inkletblot:2.5.1
inkletblot:2.5
inkletblot:2.4
inkletblot:2.3
inkletblot:2.2
inkletblot:2.1
inkletblot:2.0
inkletblot:1.9
inkletblot:1.8
inkletblot:1.7.1
inkletblot:1.7
inkletblot:1.6
inkletblot:1.5
inkletblot:1.4
inkletblot:1.3
inkletblot:1.2
inkletblot:1.1
inkletblot:1.0
inkletblot:0.9
inkletblot:0.8
inkletblot:0.7
inkletblot:0.6
inkletblot:0.5
inkletblot:0.4
inkletblot:0.3
inkletblot:0.2
inkletblot:0.1
...
compare: inkletblot:a069b3ea669457ea959e39f53cc0cadc075d2572
Branches Tags
inkletblot:config
inkletblot:patch/swapwindows
inkletblot:patch/named-scratchpads
inkletblot:patch/steam
inkletblot:patch/hide-vacant-tags
inkletblot:patch/allowkillrule
inkletblot:patch/systray
inkletblot:master
inkletblot:suckless/master
inkletblot:patch/fullscreen
inkletblot:patch/attachtop
inkletblot:patch/movestack
inkletblot:patch/uselessgap
inkletblot:patch/restartsig
inkletblot:patch/pertag
inkletblot:patch/shift-tools
inkletblot:patch/statuscmd
inkletblot:patch/keychord
inkletblot:6.8
inkletblot:6.7
inkletblot:6.6
inkletblot:6.5
inkletblot:6.4
inkletblot:6.3
inkletblot:6.2
inkletblot:6.1
inkletblot:6.0
inkletblot:5.9
inkletblot:5.8.2
inkletblot:5.8.1
inkletblot:5.8
inkletblot:5.7.2
inkletblot:5.7.1
inkletblot:5.7
inkletblot:5.6.1
inkletblot:5.6
inkletblot:5.5
inkletblot:5.4.1
inkletblot:5.4
inkletblot:5.3.1
inkletblot:5.3
inkletblot:5.2
inkletblot:5.1
inkletblot:5.0
inkletblot:4.9
inkletblot:4.8
inkletblot:4.7
inkletblot:4.6
inkletblot:4.5
inkletblot:4.4.1
inkletblot:4.4
inkletblot:4.3
inkletblot:4.2
inkletblot:4.1
inkletblot:4.0
inkletblot:3.9
inkletblot:3.8
inkletblot:3.7
inkletblot:3.6.1
inkletblot:3.6
inkletblot:3.5
inkletblot:3.4
inkletblot:3.3
inkletblot:3.2.2
inkletblot:3.2.1
inkletblot:3.2
inkletblot:3.1
inkletblot:3.0
inkletblot:2.9
inkletblot:2.8
inkletblot:2.7
inkletblot:2.6
inkletblot:2.5.1
inkletblot:2.5
inkletblot:2.4
inkletblot:2.3
inkletblot:2.2
inkletblot:2.1
inkletblot:2.0
inkletblot:1.9
inkletblot:1.8
inkletblot:1.7.1
inkletblot:1.7
inkletblot:1.6
inkletblot:1.5
inkletblot:1.4
inkletblot:1.3
inkletblot:1.2
inkletblot:1.1
inkletblot:1.0
inkletblot:0.9
inkletblot:0.8
inkletblot:0.7
inkletblot:0.6
inkletblot:0.5
inkletblot:0.4
inkletblot:0.3
inkletblot:0.2
inkletblot:0.1

12 Commits
7b555451ae ... a069b3ea66

Author SHA1 Message Date
Solomon Laing
a069b3ea66 Merge branch 'patch/named-scratchpads' into config 2026-03-20 18:09:57 +10:30
Solomon Laing
298967b6ce feat: applied named scratchpads patch 2026-03-20 18:04:45 +10:30
Solomon Laing
40dfc558de chore: added named scratchpads patch 2026-03-20 18:04:07 +10:30
Solomon Laing
e880bb20fe Merge branch 'patch/steam' into config 2026-03-20 18:01:47 +10:30
Solomon Laing
dde6cf659f feat: added steam patch 2026-03-20 17:59:54 +10:30
Solomon Laing
cb76cc485e chore: added steam patch 2026-03-20 17:59:38 +10:30
Solomon Laing
24c04ef800 Merge branch 'patch/hide-vacant-tags' into config 2026-03-20 17:58:26 +10:30
Solomon Laing
7dd271426d feat: added hide vacant tags patch 2026-03-20 17:57:59 +10:30
Solomon Laing
f59fb74381 chore: added hide vacant tags patch 2026-03-20 17:57:30 +10:30
Solomon Laing
38f1d2b44b merge: merged allowkillrule 2026-03-20 17:56:13 +10:30
Solomon Laing
9599d4233d feat: applied allow kill rule 2026-03-20 13:18:27 +10:30
Solomon Laing
0c36b86ec0 chore: added patch file 2026-03-20 13:15:47 +10:30
7 changed files with 939 additions and 659 deletions
Show Stats Expand all files Collapse all files

417
config.def.h
View File

@ -1,33 +1,27 @@
/* 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 = 6; /* gaps between windows */ static const unsigned int gappx = 6; /* gaps between windows */
static const unsigned int snap = 32; /* snap pixel */ static const unsigned int snap = 32;/* snap pixel */
static const unsigned int systraypinning = static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor static const unsigned int systrayonleft = 0; /* 0: systray in the right corner, >0: systray on left of status text */
X */ static const unsigned int systrayspacing = 3; /* systray spacing */
static const unsigned int systrayonleft = static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/
0; /* 0: systray in the right corner, >0: systray on left of status text */ static const int showsystray = 1; /* 0 means no systray */
static const unsigned int systrayspacing = 3; /* systray spacing */ static const int showbar = 1; /* 0 means no bar */
static const int systraypinningfailfirst = static const int topbar = 1; /* 0 means bottom bar */
1; /* 1: if pinning fails, display systray on the first monitor, False: static const int allowkill = 1; /* allow killing clients by default? */
display systray on the last monitor*/ static const char *fonts[] = {"FiraCode Nerd Font:size=10:antialias=true:hinting=true"};
static const int showsystray = 1; /* 0 means no systray */ static const char dmenufont[] = "FiraCode Nerd Font:size=10:antialias=true:hinting=true";
static const int showbar = 1; /* 0 means no bar */
static const int topbar = 1; /* 0 means bottom bar */
static const char *fonts[] = {
"FiraCode Nerd Font:size=10:antialias=true:hinting=true"};
static const char dmenufont[] =
"FiraCode Nerd Font:size=10:antialias=true:hinting=true";
static const char norm_fg[] = "#D5C4A1"; static const char norm_fg[] = "#D5C4A1";
static const char norm_bg[] = "#262626"; static const char norm_bg[] = "#262626";
static const char norm_border[] = "#665c54"; static const char norm_border[] = "#665c54";
static const char sel_fg[] = "#262626"; static const char sel_fg[] = "#262626";
static const char sel_bg[] = "#FE8019"; static const char sel_bg[] = "#FE8019";
static const char sel_border[] = "#fbf1c7"; static const char sel_border[] = "#fbf1c7";
static const char *colors[][3] = { static const char *colors[][3] = {
/* fg bg border */ /* fg bg border */
@ -46,46 +40,40 @@ 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 /* class instance title tags mask allowkill isfloating monitor */
monitor */ {"firefox", NULL, NULL, 1 << 0, 0, 0, -1 0},
{"firefox", NULL, NULL, 1 << 0, 0, -1}, {"thunderbird", NULL, NULL, 1 << 6, 1, 0, -1 0},
{"thunderbird", NULL, NULL, 1 << 6, 0, -1}, {"org.mozilla.Thunderbird", NULL, NULL, 1 << 6, 1, 0, -1 0},
{"org.mozilla.Thunderbird", NULL, NULL, 1 << 6, 0, -1}, {"ManagerDesktop", NULL, NULL, 1 << 7, 1, 0, -1 0},
{"ManagerDesktop", NULL, NULL, 1 << 7, 0, -1}, {"Manager", NULL, NULL, 1 << 7, 1, 0, -1 0},
{"Manager", NULL, NULL, 1 << 7, 0, -1}, {"InputLeap", NULL, NULL, 1 << 8, 1, 1, -1 0},
{"InputLeap", NULL, NULL, 1 << 8, 1, -1}, {"Nextcloud", NULL, NULL, 1 << 8, 1, 0, -1 0},
{"Nextcloud", NULL, NULL, 1 << 8, 0, -1}, {"feishin", NULL, NULL, 1 << 2, 1, 0, -1 0},
{"feishin", NULL, NULL, 1 << 2, 0, -1}, { NULL, NULL, "scratchpad", 0, 1, 0, -1, 's'},
}; };
/* layout(s) */ /* layout(s) */
static const float mfact = 0.50; /* factor of master area size [0.05..0.95] */ static const float mfact = 0.50; /* 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 = static const int resizehints = 0; /* 1 means respect size hints in tiled resizals */
0; /* 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 = static const int refreshrate = 120; /* refresh rate (per second) for client move/resize */
1; /* 1 will force focus on the fullscreen window */
static const int refreshrate =
120; /* refresh rate (per second) for client move/resize */
static const Layout layouts[] = { static const Layout layouts[] = {
/* symbol arrange function */ /* symbol arrange function */
{"[]=", tile}, /* first entry is default */ {"[]=", tile}, /* first entry is default */
{"[M]", monocle}, {"[M]", monocle},
{"><>", NULL}, /* no layout function means floating behavior */ {"><>", NULL}, /* no layout function means floating behavior */
}; };
/* key definitions */ /* key definitions */
#define MODKEY Mod1Mask #define MODKEY Mod1Mask
#define TAGKEYS(KEY, TAG) \
&((Keychord){1, {{MODKEY, KEY}}, view, {.ui = 1 << TAG}}), \ #define TAGKEYS(KEY, TAG) \
&((Keychord){ \ &((Keychord){1, {{MODKEY, KEY}}, view, {.ui = 1 << TAG}}), \
1, {{MODKEY | ControlMask, KEY}}, toggleview, {.ui = 1 << TAG}}), \ &((Keychord){1, {{MODKEY | ControlMask, KEY}}, toggleview, {.ui = 1 << TAG}}), \
&((Keychord){1, {{MODKEY | ShiftMask, KEY}}, tag, {.ui = 1 << TAG}}), \ &((Keychord){1, {{MODKEY | ShiftMask, KEY}}, tag, {.ui = 1 << TAG}}), \
&((Keychord){1, \ &((Keychord){1, {{MODKEY | ControlMask | ShiftMask, KEY}}, toggletag, {.ui = 1 << TAG}}),
{{MODKEY | ControlMask | ShiftMask, KEY}}, \
toggletag, \
{.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) \ #define SHCMD(cmd) \
@ -98,247 +86,140 @@ static const Layout layouts[] = {
#define STATUSBAR "dwmblocks" #define STATUSBAR "dwmblocks"
/* commands */ /* commands */
static char dmenumon[2] = static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
"0"; /* component of dmenucmd, manipulated in spawn() */ static const char *dmenucmd[] = {"dmenu_run", NULL};
static const char *dmenucmd[] = {"dmenu_run", NULL}; static const char *slockcmd[] = {"slock", NULL};
static const char *slockcmd[] = {"slock", NULL}; static const char *termcmd[] = {TERMINAL, "-e", "tmux-worker", NULL};
static const char *termcmd[] = {TERMINAL, "-e", "tmux-worker", NULL}; /*First arg only serves to match against key in rules*/
static const char *scratchpadcmd[] = {"s", "st", "-t", "scratchpad", NULL};
#include "movestack.c" #include "movestack.c"
#include "shift-tools.c" #include "shift-tools.c"
#include <X11/XF86keysym.h> #include <X11/XF86keysym.h>
static const Keychord *keychords[] = { static const Keychord *keychords[] = {
/* modifier key chord function // &((Keychord){1, {{MODKEY, XK_}}, spawn, {}}),
argument */ /* key count key chords function argument */
// &((Keychord){1, {{MODKEY, XK_}}, spawn, {} &((Keychord){1, {{MODKEY | ControlMask | ShiftMask, XK_apostrophe}}, quit, {0}}),
// }), &((Keychord){1, {{MODKEY | ShiftMask, XK_apostrophe}}, quit, {1}}),
&((Keychord){
1, {{MODKEY | ControlMask | ShiftMask, XK_apostrophe}}, quit, {0}}),
&((Keychord){1, {{MODKEY | ShiftMask, XK_apostrophe}}, quit, {1}}),
&((Keychord){1, {{MODKEY, XK_apostrophe}}, killclient, {0}}), &((Keychord){1, {{MODKEY, XK_grave}}, togglescratch, {.v = scratchpadcmd }}),
&((Keychord){1, {{MODKEY, XK_a}}, spawn, {.v = dmenucmd}}), &((Keychord){1, {{MODKEY, XK_apostrophe}}, killclient, {0}}),
&((Keychord){1, {{MODKEY | ShiftMask, XK_Return}}, spawn, {.v = termcmd}}),
&((Keychord){1, {{MODKEY, XK_Escape}}, spawn, {.v = slockcmd}}),
&((Keychord){1, {{MODKEY, XK_l}}, shiftviewclients, {.i = +1}}), &((Keychord){1, {{MODKEY, XK_a}}, spawn, {.v = dmenucmd}}),
&((Keychord){1, {{MODKEY, XK_h}}, shiftviewclients, {.i = -1}}), &((Keychord){1, {{MODKEY | ShiftMask, XK_Return}}, spawn, {.v = termcmd}}),
&((Keychord){1, {{MODKEY | ShiftMask, XK_l}}, shiftview, {.i = +1}}), &((Keychord){1, {{MODKEY, XK_Escape}}, spawn, {.v = slockcmd}}),
&((Keychord){1, {{MODKEY | ShiftMask, XK_h}}, shiftview, {.i = -1}}),
&((Keychord){1, {{MODKEY | ControlMask, XK_l}}, shiftboth, {.i = +1}}),
&((Keychord){1, {{MODKEY | ControlMask, XK_h}}, shiftboth, {.i = -1}}),
&((Keychord){1,
{{MODKEY | ControlMask | ShiftMask, XK_l}},
shiftswaptags,
{.i = +1}}),
&((Keychord){1,
{{MODKEY | ControlMask | ShiftMask, XK_h}},
shiftswaptags,
{.i = -1}}),
&((Keychord){1, {{MODKEY, XK_j}}, focusstack, {.i = +1}}), &((Keychord){1, {{MODKEY, XK_l}}, shiftviewclients, {.i = +1}}),
&((Keychord){1, {{MODKEY, XK_k}}, focusstack, {.i = -1}}), &((Keychord){1, {{MODKEY, XK_h}}, shiftviewclients, {.i = -1}}),
&((Keychord){1, {{MODKEY | ShiftMask, XK_v}}, incnmaster, {.i = +1}}), &((Keychord){1, {{MODKEY | ShiftMask, XK_l}}, shiftview, {.i = +1}}),
&((Keychord){1, {{MODKEY | ShiftMask, XK_w}}, incnmaster, {.i = -1}}), &((Keychord){1, {{MODKEY | ShiftMask, XK_h}}, shiftview, {.i = -1}}),
&((Keychord){1, {{MODKEY, XK_equal}}, setmfact, {.f = +0.05}}), &((Keychord){1, {{MODKEY | ControlMask, XK_l}}, shiftboth, {.i = +1}}),
&((Keychord){1, {{MODKEY, XK_minus}}, setmfact, {.f = -0.05}}), &((Keychord){1, {{MODKEY | ControlMask, XK_h}}, shiftboth, {.i = -1}}),
&((Keychord){1, {{MODKEY | ShiftMask, XK_j}}, movestack, {.i = +1}}), &((Keychord){1, {{MODKEY | ControlMask | ShiftMask, XK_l}}, shiftswaptags, {.i = +1}}),
&((Keychord){1, {{MODKEY | ShiftMask, XK_k}}, movestack, {.i = -1}}), &((Keychord){1, {{MODKEY | ControlMask | ShiftMask, XK_h}}, shiftswaptags, {.i = -1}}),
&((Keychord){1, {{MODKEY, XK_Return}}, zoom, {0}}),
&((Keychord){1, {{MODKEY, XK_Tab}}, view, {0}}),
&((Keychord){ &((Keychord){1, {{MODKEY, XK_j}}, focusstack, {.i = +1}}),
2, {{MODKEY, XK_w}, {MODKEY, XK_t}}, setlayout, {.v = &layouts[0]}}), &((Keychord){1, {{MODKEY, XK_k}}, focusstack, {.i = -1}}),
&((Keychord){ &((Keychord){1, {{MODKEY | ShiftMask, XK_v}}, incnmaster, {.i = +1}}),
2, {{MODKEY, XK_w}, {MODKEY, XK_m}}, setlayout, {.v = &layouts[1]}}), &((Keychord){1, {{MODKEY | ShiftMask, XK_w}}, incnmaster, {.i = -1}}),
&((Keychord){ &((Keychord){1, {{MODKEY, XK_equal}}, setmfact, {.f = +0.05}}),
2, {{MODKEY, XK_w}, {MODKEY, XK_f}}, setlayout, {.v = &layouts[2]}}), &((Keychord){1, {{MODKEY, XK_minus}}, setmfact, {.f = -0.05}}),
&((Keychord){1, {{MODKEY, XK_F11}}, fullscreen, {0}}), &((Keychord){1, {{MODKEY | ShiftMask, XK_j}}, movestack, {.i = +1}}),
&((Keychord){1, {{MODKEY, XK_space}}, setlayout, {0}}), &((Keychord){1, {{MODKEY | ShiftMask, XK_k}}, movestack, {.i = -1}}),
&((Keychord){1, {{MODKEY | ShiftMask, XK_space}}, togglefloating, {0}}), &((Keychord){1, {{MODKEY, XK_Return}}, zoom, {0}}),
&((Keychord){1, {{MODKEY, XK_b}}, togglebar, {0}}), &((Keychord){1, {{MODKEY, XK_Tab}}, view, {0}}),
&((Keychord){1, {{MODKEY, XK_0}}, view, {.ui = ~0}}), &((Keychord){2, {{MODKEY, XK_w}, {MODKEY, XK_t}}, setlayout, {.v = &layouts[0]}}),
&((Keychord){1, {{MODKEY | ShiftMask, XK_0}}, tag, {.ui = ~0}}), &((Keychord){2, {{MODKEY, XK_w}, {MODKEY, XK_m}}, setlayout, {.v = &layouts[1]}}),
&((Keychord){1, {{MODKEY, XK_comma}}, focusmon, {.i = -1}}), &((Keychord){2, {{MODKEY, XK_w}, {MODKEY, XK_f}}, setlayout, {.v = &layouts[2]}}),
&((Keychord){1, {{MODKEY, XK_period}}, focusmon, {.i = +1}}), &((Keychord){1, {{MODKEY, XK_F11}}, fullscreen, {0}}),
&((Keychord){1, {{MODKEY | ShiftMask, XK_comma}}, tagmon, {.i = -1}}), &((Keychord){1, {{MODKEY, XK_space}}, setlayout, {0}}),
&((Keychord){1, {{MODKEY | ShiftMask, XK_period}}, tagmon, {.i = +1}}), &((Keychord){1, {{MODKEY | ShiftMask, XK_space}}, togglefloating, {0}}),
&((Keychord){1, {{MODKEY, XK_b}}, togglebar, {0}}),
&((Keychord){1, &((Keychord){1, {{MODKEY, XK_0}}, view, {.ui = ~0}}),
{{MODKEY | ShiftMask, XK_s}}, &((Keychord){1, {{MODKEY | ShiftMask, XK_0}}, tag, {.ui = ~0}}),
spawn, &((Keychord){1, {{MODKEY, XK_comma}}, focusmon, {.i = -1}}),
{.v = (const char *[]){"sysact", NULL}}}), &((Keychord){1, {{MODKEY, XK_period}}, focusmon, {.i = +1}}),
&((Keychord){1, {{MODKEY | ShiftMask, XK_comma}}, tagmon, {.i = -1}}),
&((Keychord){1, {{MODKEY | ShiftMask, XK_period}}, tagmon, {.i = +1}}),
&((Keychord){1, &((Keychord){1, {{MODKEY | ShiftMask, XK_s}}, spawn, {.v = (const char *[]){"sysact", NULL}}}),
{{MODKEY | ShiftMask, XK_o}},
spawn,
{.v = (const char *[]){"set-default-sink", NULL}}}),
&((Keychord){1,
{{MODKEY | ShiftMask, XK_i}},
spawn,
{.v = (const char *[]){"set-default-source", NULL}}}),
&((Keychord){2, &((Keychord){1, {{MODKEY | ShiftMask, XK_o}}, spawn, {.v = (const char *[]){"set-default-sink", NULL}}}),
{{MODKEY, XK_m}, {MODKEY, XK_a}}, &((Keychord){1, {{MODKEY | ShiftMask, XK_i}}, spawn, {.v = (const char *[]){"set-default-source", NULL}}}),
spawn,
{.v = (const char *[]){"dmenumusic", NULL}}}),
&((Keychord){2,
{{MODKEY, XK_m}, {MODKEY, XK_p}},
spawn,
{.v = (const char *[]){"mpc", "toggle", NULL}}}),
&((Keychord){2,
{{MODKEY, XK_m}, {MODKEY, XK_l}},
spawn,
{.v = (const char *[]){"mpc", "next", NULL}}}),
&((Keychord){2,
{{MODKEY, XK_m}, {MODKEY, XK_h}},
spawn,
{.v = (const char *[]){"mpc", "prev", NULL}}}),
&((Keychord){1,
{{MODKEY, XF86XK_AudioPlay}},
spawn,
{.v = (const char *[]){"mpc", "toggle", NULL}}}),
&((Keychord){1,
{{MODKEY, XF86XK_AudioNext}},
spawn,
{.v = (const char *[]){"mpc", "next", NULL}}}),
&((Keychord){1,
{{MODKEY, XF86XK_AudioPrev}},
spawn,
{.v = (const char *[]){"mpc", "prev", NULL}}}),
&((Keychord){2, &((Keychord){2, {{MODKEY, XK_m}, {MODKEY, XK_a}}, spawn, {.v = (const char *[]){"dmenumusic", NULL}}}),
{{MODKEY, XK_o}, {MODKEY, XK_l}}, &((Keychord){2, {{MODKEY, XK_m}, {MODKEY, XK_p}}, spawn, {.v = (const char *[]){"mpc", "toggle", NULL}}}),
spawn, &((Keychord){2, {{MODKEY, XK_m}, {MODKEY, XK_l}}, spawn, {.v = (const char *[]){"mpc", "next", NULL}}}),
{.v = (const char *[]){TERMINAL, "-e", "lf", NULL}}}), &((Keychord){2, {{MODKEY, XK_m}, {MODKEY, XK_h}}, spawn, {.v = (const char *[]){"mpc", "prev", NULL}}}),
&((Keychord){2, &((Keychord){1, {{MODKEY, XF86XK_AudioPlay}}, spawn, {.v = (const char *[]){"mpc", "toggle", NULL}}}),
{{MODKEY, XK_o}, {MODKEY, XK_f}}, &((Keychord){1, {{MODKEY, XF86XK_AudioNext}}, spawn, {.v = (const char *[]){"mpc", "next", NULL}}}),
spawn, &((Keychord){1, {{MODKEY, XF86XK_AudioPrev}}, spawn, {.v = (const char *[]){"mpc", "prev", NULL}}}),
{.v = (const char *[]){"firefox", NULL}}}),
&((Keychord){2,
{{MODKEY, XK_o}, {MODKEY, XK_n}},
spawn,
{.v = (const char *[]){TERMINAL, "-e", "ncmpcpp", NULL}}}),
&((Keychord){2,
{{MODKEY, XK_o}, {MODKEY, XK_m}},
spawn,
{.v = (const char *[]){TERMINAL, "-e", "gotop", NULL}}}),
&((Keychord){2,
{{MODKEY, XK_o}, {MODKEY, XK_t}},
spawn,
{.v = (const char *[]){"thunar", NULL}}}),
&((Keychord){2,
{{MODKEY, XK_o}, {MODKEY, XK_c}},
spawn,
{.v = (const char *[]){"calcurse-select", NULL}}}),
&((Keychord){2, &((Keychord){2, {{MODKEY, XK_o}, {MODKEY, XK_l}}, spawn, {.v = (const char *[]){TERMINAL, "-e", "lf", NULL}}}),
{{MODKEY, XK_d}, {MODKEY, XK_h}}, &((Keychord){2, {{MODKEY, XK_o}, {MODKEY, XK_f}}, spawn, {.v = (const char *[]){"firefox", NULL}}}),
spawn, &((Keychord){2, {{MODKEY, XK_o}, {MODKEY, XK_n}}, spawn, {.v = (const char *[]){TERMINAL, "-e", "ncmpcpp", NULL}}}),
{.v = (const char *[]){"dmenuhandler", NULL}}}), &((Keychord){2, {{MODKEY, XK_o}, {MODKEY, XK_m}}, spawn, {.v = (const char *[]){TERMINAL, "-e", "gotop", NULL}}}),
&((Keychord){2, &((Keychord){2, {{MODKEY, XK_o}, {MODKEY, XK_t}}, spawn, {.v = (const char *[]){"thunar", NULL}}}),
{{MODKEY, XK_d}, {MODKEY, XK_m}}, &((Keychord){2, {{MODKEY, XK_o}, {MODKEY, XK_c}}, spawn, {.v = (const char *[]){"calcurse-select", NULL}}}),
spawn,
{.v = (const char *[]){"mounter", NULL}}}),
&((Keychord){2,
{{MODKEY, XK_d}, {MODKEY, XK_c}},
spawn,
{.v = (const char *[]){"dmenumountcifs", NULL}}}),
&((Keychord){2,
{{MODKEY, XK_d}, {MODKEY, XK_u}},
spawn,
{.v = (const char *[]){"unmounter", NULL}}}),
&((Keychord){2,
{{MODKEY, XK_d}, {MODKEY, XK_s}},
spawn,
{.v = (const char *[]){"dmenusearch", "duckduckgo", NULL}}}),
&((Keychord){2,
{{MODKEY, XK_d}, {MODKEY, XK_l}},
spawn,
{.v = (const char *[]){"linkhandler", NULL}}}),
&((Keychord){2, &((Keychord){2, {{MODKEY, XK_d}, {MODKEY, XK_h}}, spawn, {.v = (const char *[]){"dmenuhandler", NULL}}}),
{{MODKEY, XK_d}, {MODKEY, XK_b}}, &((Keychord){2, {{MODKEY, XK_d}, {MODKEY, XK_m}}, spawn, {.v = (const char *[]){"mounter", NULL}}}),
spawn, &((Keychord){2, {{MODKEY, XK_d}, {MODKEY, XK_c}}, spawn, {.v = (const char *[]){"dmenumountcifs", NULL}}}),
SHCMD("dmenu-bluetooth -i -l 25")}), &((Keychord){2, {{MODKEY, XK_d}, {MODKEY, XK_u}}, spawn, {.v = (const char *[]){"unmounter", NULL}}}),
&((Keychord){2, {{MODKEY, XK_d}, {MODKEY, XK_s}}, spawn, {.v = (const char *[]){"dmenusearch", "duckduckgo", NULL}}}),
&((Keychord){2, {{MODKEY, XK_d}, {MODKEY, XK_l}}, spawn, {.v = (const char *[]){"linkhandler", NULL}}}),
&((Keychord){1, &((Keychord){2, {{MODKEY, XK_d}, {MODKEY, XK_b}}, spawn, SHCMD("dmenu-bluetooth -i -l 25")}),
{{MODKEY | ControlMask, XK_period}},
spawn,
{.v = (const char *[]){"sd", NULL}}}),
&((Keychord){1, &((Keychord){1, {{MODKEY | ControlMask, XK_period}}, spawn, {.v = (const char *[]){"sd", NULL}}}),
{{MODKEY, XK_f}},
spawn,
{.v = (const char *[]){"screenlayout", NULL}}}),
&((Keychord){1, &((Keychord){1, {{MODKEY, XK_f}}, spawn, {.v = (const char *[]){"screenlayout", NULL}}}),
{{MODKEY, XK_F1}},
spawn,
{.v = (const char *[]){"kbswitcher", NULL}}}),
&((Keychord){ &((Keychord){1, {{MODKEY, XK_F1}}, spawn, {.v = (const char *[]){"kbswitcher", NULL}}}),
1,
{{0, XF86XK_AudioMute}},
spawn,
SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -37 $(pidof "
"dwmblocks)")}),
&((Keychord){
1,
{{0, XF86XK_AudioRaiseVolume}},
spawn,
SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; kill -37 $(pidof "
"dwmblocks)")}),
&((Keychord){
1,
{{0, XF86XK_AudioLowerVolume}},
spawn,
SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-; kill -37 $(pidof "
"dwmblocks)")}),
&((Keychord){
1,
{{0, XF86XK_AudioMicMute}},
spawn,
SHCMD("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle; kill -37 $(pidof "
"dwmblocks)")}),
&((Keychord){
1, {{MODKEY, XK_v}}, spawn, {.v = (const char *[]){"setvol", NULL}}}),
&((Keychord){1, &((Keychord){1, {{0, XF86XK_AudioMute}}, spawn, SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -37 $(pidof " "dwmblocks)")}),
{{0, XF86XK_MonBrightnessUp}}, &((Keychord){1, {{0, XF86XK_AudioRaiseVolume}}, spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; kill -37 $(pidof " "dwmblocks)")}),
spawn, &((Keychord){1, {{0, XF86XK_AudioLowerVolume}}, spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-; kill -37 $(pidof " "dwmblocks)")}),
{.v = (const char *[]){"mod_backlight", "up", NULL}}}), &((Keychord){1, {{0, XF86XK_AudioMicMute}}, spawn, SHCMD("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle; kill -37 $(pidof " "dwmblocks)")}),
&((Keychord){1, &((Keychord){1, {{MODKEY, XK_v}}, spawn, {.v = (const char *[]){"setvol", NULL}}}),
{{0, XF86XK_MonBrightnessDown}},
spawn,
{.v = (const char *[]){"mod_backlight", "down", NULL}}}),
TAGKEYS(XK_1, 0) TAGKEYS(XK_2, 1) TAGKEYS(XK_3, 2) TAGKEYS(XK_4, 3) &((Keychord){1, {{0, XF86XK_MonBrightnessUp}}, spawn, {.v = (const char *[]){"mod_backlight", "up", NULL}}}),
TAGKEYS(XK_5, 4) TAGKEYS(XK_6, 5) TAGKEYS(XK_7, 6) TAGKEYS(XK_8, 7) &((Keychord){1, {{0, XF86XK_MonBrightnessDown}}, spawn, {.v = (const char *[]){"mod_backlight", "down", NULL}}}),
TAGKEYS(XK_9, 8)};
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 */ /* button definitions */
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, /* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
* ClkClientWin, or ClkRootWin */ * ClkClientWin, or ClkRootWin */
static Button buttons[] = { static 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, setlayout, {.v = &layouts[2]}}, {ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]}},
{ClkWinTitle, 0, Button2, zoom, {0}}, {ClkWinTitle, 0, Button2, zoom, {0}},
{ClkStatusText, 0, Button1, sigstatusbar, {.i = 1}}, {ClkStatusText, 0, Button1, sigstatusbar, {.i = 1}},
{ClkStatusText, 0, Button2, sigstatusbar, {.i = 2}}, {ClkStatusText, 0, Button2, sigstatusbar, {.i = 2}},
{ClkStatusText, 0, Button3, sigstatusbar, {.i = 3}}, {ClkStatusText, 0, Button3, sigstatusbar, {.i = 3}},
{ClkStatusText, 0, Button4, sigstatusbar, {.i = 4}}, {ClkStatusText, 0, Button4, sigstatusbar, {.i = 4}},
{ClkStatusText, 0, Button5, sigstatusbar, {.i = 5}}, {ClkStatusText, 0, Button5, sigstatusbar, {.i = 5}},
{ClkStatusText, ShiftMask, Button1, sigstatusbar, {.i = 6}}, {ClkStatusText, ShiftMask, Button1, sigstatusbar, {.i = 6}},
{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}},
}; };

721
drw.c
View File

@ -1,472 +1,441 @@
/* See LICENSE file for copyright and license details. */ /* See LICENSE file for copyright and license details. */
#include <X11/Xft/Xft.h>
#include <X11/Xlib.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <X11/Xlib.h>
#include <X11/Xft/Xft.h>
#include "drw.h" #include "drw.h"
#include "util.h" #include "util.h"
#define UTF_INVALID 0xFFFD #define UTF_INVALID 0xFFFD
static int static int utf8decode(const char *s_in, long *u, int *err) {
utf8decode(const char *s_in, long *u, int *err) static const unsigned char lens[] = {
{ /* 0XXXX */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
static const unsigned char lens[] = { /* 10XXX */ 0, 0, 0, 0, 0, 0, 0, 0, /* invalid */
/* 0XXXX */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 110XX */ 2, 2, 2, 2,
/* 10XXX */ 0, 0, 0, 0, 0, 0, 0, 0, /* invalid */ /* 1110X */ 3, 3,
/* 110XX */ 2, 2, 2, 2, /* 11110 */ 4,
/* 1110X */ 3, 3, /* 11111 */ 0, /* invalid */
/* 11110 */ 4, };
/* 11111 */ 0, /* invalid */ static const unsigned char leading_mask[] = {0x7F, 0x1F, 0x0F, 0x07};
}; static const unsigned int overlong[] = {0x0, 0x80, 0x0800, 0x10000};
static const unsigned char leading_mask[] = { 0x7F, 0x1F, 0x0F, 0x07 };
static const unsigned int overlong[] = { 0x0, 0x80, 0x0800, 0x10000 };
const unsigned char *s = (const unsigned char *)s_in; const unsigned char *s = (const unsigned char *)s_in;
int len = lens[*s >> 3]; int len = lens[*s >> 3];
*u = UTF_INVALID; *u = UTF_INVALID;
*err = 1; *err = 1;
if (len == 0) if (len == 0)
return 1; return 1;
long cp = s[0] & leading_mask[len - 1]; long cp = s[0] & leading_mask[len - 1];
for (int i = 1; i < len; ++i) { for (int i = 1; i < len; ++i) {
if (s[i] == '\0' || (s[i] & 0xC0) != 0x80) if (s[i] == '\0' || (s[i] & 0xC0) != 0x80)
return i; return i;
cp = (cp << 6) | (s[i] & 0x3F); cp = (cp << 6) | (s[i] & 0x3F);
} }
/* out of range, surrogate, overlong encoding */ /* out of range, surrogate, overlong encoding */
if (cp > 0x10FFFF || (cp >> 11) == 0x1B || cp < overlong[len - 1]) if (cp > 0x10FFFF || (cp >> 11) == 0x1B || cp < overlong[len - 1])
return len; return len;
*err = 0; *err = 0;
*u = cp; *u = cp;
return len; return len;
} }
Drw * Drw *drw_create(Display *dpy, int screen, Window root, unsigned int w,
drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h) unsigned int h) {
{ Drw *drw = ecalloc(1, sizeof(Drw));
Drw *drw = ecalloc(1, sizeof(Drw));
drw->dpy = dpy; drw->dpy = dpy;
drw->screen = screen; drw->screen = screen;
drw->root = root; drw->root = root;
drw->w = w; drw->w = w;
drw->h = h; drw->h = h;
drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen)); drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
drw->gc = XCreateGC(dpy, root, 0, NULL); drw->gc = XCreateGC(dpy, root, 0, NULL);
XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter); XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
return drw; return drw;
} }
void void drw_resize(Drw *drw, unsigned int w, unsigned int h) {
drw_resize(Drw *drw, unsigned int w, unsigned int h) if (!drw)
{ return;
if (!drw)
return;
drw->w = w; drw->w = w;
drw->h = h; drw->h = h;
if (drw->drawable) if (drw->drawable)
XFreePixmap(drw->dpy, drw->drawable); XFreePixmap(drw->dpy, drw->drawable);
drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen)); drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h,
DefaultDepth(drw->dpy, drw->screen));
} }
void void drw_free(Drw *drw) {
drw_free(Drw *drw) XFreePixmap(drw->dpy, drw->drawable);
{ XFreeGC(drw->dpy, drw->gc);
XFreePixmap(drw->dpy, drw->drawable); drw_fontset_free(drw->fonts);
XFreeGC(drw->dpy, drw->gc); free(drw);
drw_fontset_free(drw->fonts);
free(drw);
} }
/* This function is an implementation detail. Library users should use /* This function is an implementation detail. Library users should use
* drw_fontset_create instead. * drw_fontset_create instead.
*/ */
static Fnt * static Fnt *xfont_create(Drw *drw, const char *fontname,
xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern) FcPattern *fontpattern) {
{ Fnt *font;
Fnt *font; XftFont *xfont = NULL;
XftFont *xfont = NULL; FcPattern *pattern = NULL;
FcPattern *pattern = NULL;
if (fontname) { if (fontname) {
/* Using the pattern found at font->xfont->pattern does not yield the /* Using the pattern found at font->xfont->pattern does not yield the
* same substitution results as using the pattern returned by * same substitution results as using the pattern returned by
* FcNameParse; using the latter results in the desired fallback * FcNameParse; using the latter results in the desired fallback
* behaviour whereas the former just results in missing-character * behaviour whereas the former just results in missing-character
* rectangles being drawn, at least with some fonts. */ * rectangles being drawn, at least with some fonts. */
if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) { if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname); fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname);
return NULL; return NULL;
} }
if (!(pattern = FcNameParse((FcChar8 *) fontname))) { if (!(pattern = FcNameParse((FcChar8 *)fontname))) {
fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname); fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n",
XftFontClose(drw->dpy, xfont); fontname);
return NULL; XftFontClose(drw->dpy, xfont);
} return NULL;
} else if (fontpattern) { }
if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) { } else if (fontpattern) {
fprintf(stderr, "error, cannot load font from pattern.\n"); if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
return NULL; fprintf(stderr, "error, cannot load font from pattern.\n");
} return NULL;
} else { }
die("no font specified."); } else {
} die("no font specified.");
}
font = ecalloc(1, sizeof(Fnt)); font = ecalloc(1, sizeof(Fnt));
font->xfont = xfont; font->xfont = xfont;
font->pattern = pattern; font->pattern = pattern;
font->h = xfont->ascent + xfont->descent; font->h = xfont->ascent + xfont->descent;
font->dpy = drw->dpy; font->dpy = drw->dpy;
return font; return font;
} }
static void static void xfont_free(Fnt *font) {
xfont_free(Fnt *font) if (!font)
{ return;
if (!font) if (font->pattern)
return; FcPatternDestroy(font->pattern);
if (font->pattern) XftFontClose(font->dpy, font->xfont);
FcPatternDestroy(font->pattern); free(font);
XftFontClose(font->dpy, font->xfont);
free(font);
} }
Fnt* Fnt *drw_fontset_create(Drw *drw, const char *fonts[], size_t fontcount) {
drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount) Fnt *cur, *ret = NULL;
{ size_t i;
Fnt *cur, *ret = NULL;
size_t i;
if (!drw || !fonts) if (!drw || !fonts)
return NULL; return NULL;
for (i = 1; i <= fontcount; i++) { for (i = 1; i <= fontcount; i++) {
if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) { if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) {
cur->next = ret; cur->next = ret;
ret = cur; ret = cur;
} }
} }
return (drw->fonts = ret); return (drw->fonts = ret);
} }
void void drw_fontset_free(Fnt *font) {
drw_fontset_free(Fnt *font) if (font) {
{ drw_fontset_free(font->next);
if (font) { xfont_free(font);
drw_fontset_free(font->next); }
xfont_free(font);
}
} }
void void drw_clr_create(Drw *drw, Clr *dest, const char *clrname) {
drw_clr_create(Drw *drw, Clr *dest, const char *clrname) if (!drw || !dest || !clrname)
{ return;
if (!drw || !dest || !clrname)
return;
if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen), if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
DefaultColormap(drw->dpy, drw->screen), DefaultColormap(drw->dpy, drw->screen), clrname, dest))
clrname, dest)) die("error, cannot allocate color '%s'", clrname);
die("error, cannot allocate color '%s'", clrname);
} }
/* Create color schemes. */ /* Create color schemes. */
Clr * Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount) {
drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount) size_t i;
{ Clr *ret;
size_t i;
Clr *ret;
/* need at least two colors for a scheme */ /* need at least two colors for a scheme */
if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(Clr)))) if (!drw || !clrnames || clrcount < 2 ||
return NULL; !(ret = ecalloc(clrcount, sizeof(Clr))))
return NULL;
for (i = 0; i < clrcount; i++) for (i = 0; i < clrcount; i++)
drw_clr_create(drw, &ret[i], clrnames[i]); drw_clr_create(drw, &ret[i], clrnames[i]);
return ret; return ret;
} }
void void drw_clr_free(Drw *drw, Clr *c) {
drw_clr_free(Drw *drw, Clr *c) if (!drw || !c)
{ return;
if (!drw || !c)
return;
/* c is typedef XftColor Clr */ /* c is typedef XftColor Clr */
XftColorFree(drw->dpy, DefaultVisual(drw->dpy, drw->screen), XftColorFree(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
DefaultColormap(drw->dpy, drw->screen), c); DefaultColormap(drw->dpy, drw->screen), c);
} }
void void drw_scm_free(Drw *drw, Clr *scm, size_t clrcount) {
drw_scm_free(Drw *drw, Clr *scm, size_t clrcount) size_t i;
{
size_t i;
if (!drw || !scm) if (!drw || !scm)
return; return;
for (i = 0; i < clrcount; i++) for (i = 0; i < clrcount; i++)
drw_clr_free(drw, &scm[i]); drw_clr_free(drw, &scm[i]);
free(scm); free(scm);
} }
void void drw_setfontset(Drw *drw, Fnt *set) {
drw_setfontset(Drw *drw, Fnt *set) if (drw)
{ drw->fonts = set;
if (drw)
drw->fonts = set;
} }
void void drw_setscheme(Drw *drw, Clr *scm) {
drw_setscheme(Drw *drw, Clr *scm) if (drw)
{ drw->scheme = scm;
if (drw)
drw->scheme = scm;
} }
void void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h,
drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert) int filled, int invert) {
{ if (!drw || !drw->scheme)
if (!drw || !drw->scheme) return;
return; XSetForeground(drw->dpy, drw->gc,
XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel); invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel);
if (filled) if (filled)
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
else else
XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1); XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1);
} }
int int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h,
drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert) unsigned int lpad, const char *text, int invert) {
{ int ty, ellipsis_x = 0;
int ty, ellipsis_x = 0; unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len, hash, h0, h1;
unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len, hash, h0, h1; XftDraw *d = NULL;
XftDraw *d = NULL; Fnt *usedfont, *curfont, *nextfont;
Fnt *usedfont, *curfont, *nextfont; int utf8strlen, utf8charlen, utf8err, render = x || y || w || h;
int utf8strlen, utf8charlen, utf8err, render = x || y || w || h; long utf8codepoint = 0;
long utf8codepoint = 0; const char *utf8str;
const char *utf8str; FcCharSet *fccharset;
FcCharSet *fccharset; FcPattern *fcpattern;
FcPattern *fcpattern; FcPattern *match;
FcPattern *match; XftResult result;
XftResult result; int charexists = 0, overflow = 0;
int charexists = 0, overflow = 0; /* keep track of a couple codepoints for which we have no match. */
/* keep track of a couple codepoints for which we have no match. */ static unsigned int nomatches[128], ellipsis_width, invalid_width;
static unsigned int nomatches[128], ellipsis_width, invalid_width; static const char invalid[] = "<EFBFBD>";
static const char invalid[] = "<EFBFBD>";
if (!drw || (render && (!drw->scheme || !w)) || !text || !drw->fonts) if (!drw || (render && (!drw->scheme || !w)) || !text || !drw->fonts)
return 0; return 0;
if (!render) { if (!render) {
w = invert ? invert : ~invert; w = invert ? invert : ~invert;
} else { } else {
XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel); XSetForeground(drw->dpy, drw->gc,
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); drw->scheme[invert ? ColFg : ColBg].pixel);
if (w < lpad) XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
return x + w; if (w < lpad)
d = XftDrawCreate(drw->dpy, drw->drawable, return x + w;
DefaultVisual(drw->dpy, drw->screen), d = XftDrawCreate(drw->dpy, drw->drawable,
DefaultColormap(drw->dpy, drw->screen)); DefaultVisual(drw->dpy, drw->screen),
x += lpad; DefaultColormap(drw->dpy, drw->screen));
w -= lpad; x += lpad;
} w -= lpad;
}
usedfont = drw->fonts; usedfont = drw->fonts;
if (!ellipsis_width && render) if (!ellipsis_width && render)
ellipsis_width = drw_fontset_getwidth(drw, "..."); ellipsis_width = drw_fontset_getwidth(drw, "...");
if (!invalid_width && render) if (!invalid_width && render)
invalid_width = drw_fontset_getwidth(drw, invalid); invalid_width = drw_fontset_getwidth(drw, invalid);
while (1) { while (1) {
ew = ellipsis_len = utf8err = utf8charlen = utf8strlen = 0; ew = ellipsis_len = utf8err = utf8charlen = utf8strlen = 0;
utf8str = text; utf8str = text;
nextfont = NULL; nextfont = NULL;
while (*text) { while (*text) {
utf8charlen = utf8decode(text, &utf8codepoint, &utf8err); utf8charlen = utf8decode(text, &utf8codepoint, &utf8err);
for (curfont = drw->fonts; curfont; curfont = curfont->next) { for (curfont = drw->fonts; curfont; curfont = curfont->next) {
charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint); charexists = charexists ||
if (charexists) { XftCharExists(drw->dpy, curfont->xfont, utf8codepoint);
drw_font_getexts(curfont, text, utf8charlen, &tmpw, NULL); if (charexists) {
if (ew + ellipsis_width <= w) { drw_font_getexts(curfont, text, utf8charlen, &tmpw, NULL);
/* keep track where the ellipsis still fits */ if (ew + ellipsis_width <= w) {
ellipsis_x = x + ew; /* keep track where the ellipsis still fits */
ellipsis_w = w - ew; ellipsis_x = x + ew;
ellipsis_len = utf8strlen; ellipsis_w = w - ew;
} ellipsis_len = utf8strlen;
}
if (ew + tmpw > w) { if (ew + tmpw > w) {
overflow = 1; overflow = 1;
/* called from drw_fontset_getwidth_clamp(): /* called from drw_fontset_getwidth_clamp():
* it wants the width AFTER the overflow * it wants the width AFTER the overflow
*/ */
if (!render) if (!render)
x += tmpw; x += tmpw;
else else
utf8strlen = ellipsis_len; utf8strlen = ellipsis_len;
} else if (curfont == usedfont) { } else if (curfont == usedfont) {
text += utf8charlen; text += utf8charlen;
utf8strlen += utf8err ? 0 : utf8charlen; utf8strlen += utf8err ? 0 : utf8charlen;
ew += utf8err ? 0 : tmpw; ew += utf8err ? 0 : tmpw;
} else { } else {
nextfont = curfont; nextfont = curfont;
} }
break; break;
} }
} }
if (overflow || !charexists || nextfont || utf8err) if (overflow || !charexists || nextfont || utf8err)
break; break;
else else
charexists = 0; charexists = 0;
} }
if (utf8strlen) { if (utf8strlen) {
if (render) { if (render) {
ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent; ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent;
XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg], XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg],
usedfont->xfont, x, ty, (XftChar8 *)utf8str, utf8strlen); usedfont->xfont, x, ty, (XftChar8 *)utf8str,
} utf8strlen);
x += ew; }
w -= ew; x += ew;
} w -= ew;
if (utf8err && (!render || invalid_width < w)) { }
if (render) if (utf8err && (!render || invalid_width < w)) {
drw_text(drw, x, y, w, h, 0, invalid, invert); if (render)
x += invalid_width; drw_text(drw, x, y, w, h, 0, invalid, invert);
w -= invalid_width; x += invalid_width;
} w -= invalid_width;
if (render && overflow) }
drw_text(drw, ellipsis_x, y, ellipsis_w, h, 0, "...", invert); if (render && overflow)
drw_text(drw, ellipsis_x, y, ellipsis_w, h, 0, "...", invert);
if (!*text || overflow) { if (!*text || overflow) {
break; break;
} else if (nextfont) { } else if (nextfont) {
charexists = 0; charexists = 0;
usedfont = nextfont; usedfont = nextfont;
} else { } else {
/* Regardless of whether or not a fallback font is found, the /* Regardless of whether or not a fallback font is found, the
* character must be drawn. */ * character must be drawn. */
charexists = 1; charexists = 1;
hash = (unsigned int)utf8codepoint; hash = (unsigned int)utf8codepoint;
hash = ((hash >> 16) ^ hash) * 0x21F0AAAD; hash = ((hash >> 16) ^ hash) * 0x21F0AAAD;
hash = ((hash >> 15) ^ hash) * 0xD35A2D97; hash = ((hash >> 15) ^ hash) * 0xD35A2D97;
h0 = ((hash >> 15) ^ hash) % LENGTH(nomatches); h0 = ((hash >> 15) ^ hash) % LENGTH(nomatches);
h1 = (hash >> 17) % LENGTH(nomatches); h1 = (hash >> 17) % LENGTH(nomatches);
/* avoid expensive XftFontMatch call when we know we won't find a match */ /* avoid expensive XftFontMatch call when we know we won't find a match */
if (nomatches[h0] == utf8codepoint || nomatches[h1] == utf8codepoint) if (nomatches[h0] == utf8codepoint || nomatches[h1] == utf8codepoint)
goto no_match; goto no_match;
fccharset = FcCharSetCreate(); fccharset = FcCharSetCreate();
FcCharSetAddChar(fccharset, utf8codepoint); FcCharSetAddChar(fccharset, utf8codepoint);
if (!drw->fonts->pattern) { if (!drw->fonts->pattern) {
/* Refer to the comment in xfont_create for more information. */ /* Refer to the comment in xfont_create for more information. */
die("the first font in the cache must be loaded from a font string."); die("the first font in the cache must be loaded from a font string.");
} }
fcpattern = FcPatternDuplicate(drw->fonts->pattern); fcpattern = FcPatternDuplicate(drw->fonts->pattern);
FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue); FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
FcConfigSubstitute(NULL, fcpattern, FcMatchPattern); FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
FcDefaultSubstitute(fcpattern); FcDefaultSubstitute(fcpattern);
match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result); match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result);
FcCharSetDestroy(fccharset); FcCharSetDestroy(fccharset);
FcPatternDestroy(fcpattern); FcPatternDestroy(fcpattern);
if (match) { if (match) {
usedfont = xfont_create(drw, NULL, match); usedfont = xfont_create(drw, NULL, match);
if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) { if (usedfont &&
for (curfont = drw->fonts; curfont->next; curfont = curfont->next) XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) {
; /* NOP */ for (curfont = drw->fonts; curfont->next; curfont = curfont->next)
curfont->next = usedfont; ; /* NOP */
} else { curfont->next = usedfont;
xfont_free(usedfont); } else {
nomatches[nomatches[h0] ? h1 : h0] = utf8codepoint; xfont_free(usedfont);
no_match: nomatches[nomatches[h0] ? h1 : h0] = utf8codepoint;
usedfont = drw->fonts; no_match:
} usedfont = drw->fonts;
} }
} }
} }
if (d) }
XftDrawDestroy(d); if (d)
XftDrawDestroy(d);
return x + (render ? w : 0); return x + (render ? w : 0);
} }
void void drw_map(Drw *drw, Window win, int x, int y, unsigned int w,
drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) unsigned int h) {
{ if (!drw)
if (!drw) return;
return;
XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y); XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
XSync(drw->dpy, False); XSync(drw->dpy, False);
} }
unsigned int unsigned int drw_fontset_getwidth(Drw *drw, const char *text) {
drw_fontset_getwidth(Drw *drw, const char *text) if (!drw || !drw->fonts || !text)
{ return 0;
if (!drw || !drw->fonts || !text) return drw_text(drw, 0, 0, 0, 0, 0, text, 0);
return 0;
return drw_text(drw, 0, 0, 0, 0, 0, text, 0);
} }
unsigned int unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text,
drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n) unsigned int n) {
{ unsigned int tmp = 0;
unsigned int tmp = 0; if (drw && drw->fonts && text && n)
if (drw && drw->fonts && text && n) tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n);
tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n); return MIN(n, tmp);
return MIN(n, tmp);
} }
void void drw_font_getexts(Fnt *font, const char *text, unsigned int len,
drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h) unsigned int *w, unsigned int *h) {
{ XGlyphInfo ext;
XGlyphInfo ext;
if (!font || !text) if (!font || !text)
return; return;
XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext); XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
if (w) if (w)
*w = ext.xOff; *w = ext.xOff;
if (h) if (h)
*h = font->h; *h = font->h;
} }
Cur * Cur *drw_cur_create(Drw *drw, int shape) {
drw_cur_create(Drw *drw, int shape) Cur *cur;
{
Cur *cur;
if (!drw || !(cur = ecalloc(1, sizeof(Cur)))) if (!drw || !(cur = ecalloc(1, sizeof(Cur))))
return NULL; return NULL;
cur->cursor = XCreateFontCursor(drw->dpy, shape); cur->cursor = XCreateFontCursor(drw->dpy, shape);
return cur; return cur;
} }
void void drw_cur_free(Drw *drw, Cur *cursor) {
drw_cur_free(Drw *drw, Cur *cursor) if (!cursor)
{ return;
if (!cursor)
return;
XFreeCursor(drw->dpy, cursor->cursor); XFreeCursor(drw->dpy, cursor->cursor);
free(cursor); free(cursor);
} }

98
dwm-allowkillrule-6.4.diff Normal file
View File

@ -0,0 +1,98 @@
diff -up a/config.def.h b/config.def.h
--- a/config.def.h 2022-10-04 19:38:18.000000000 +0200
+++ b/config.def.h 2023-05-06 22:19:27.298742237 +0200
@@ -5,6 +5,7 @@ static const unsigned int borderpx = 1;
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 allowkill = 1; /* allow killing clients by default? */
static const char *fonts[] = { "monospace:size=10" };
static const char dmenufont[] = "monospace:size=10";
static const char col_gray1[] = "#222222";
@@ -26,9 +27,9 @@ static const Rule rules[] = {
* WM_CLASS(STRING) = instance, class
* WM_NAME(STRING) = title
*/
- /* class instance title tags mask isfloating monitor */
- { "Gimp", NULL, NULL, 0, 1, -1 },
- { "Firefox", NULL, NULL, 1 << 8, 0, -1 },
+ /* class instance title tags mask allowkill isfloating monitor */
+ { "Gimp", NULL, NULL, 0, 1, 1, -1 },
+ { "Firefox", NULL, NULL, 1 << 8, 1, 0, -1 },
};
/* layout(s) */
@@ -78,6 +79,7 @@ static const Key keys[] = {
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
{ MODKEY, XK_space, setlayout, {0} },
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
+ { MODKEY, XK_q, toggleallowkill,{0} },
{ MODKEY, XK_0, view, {.ui = ~0 } },
{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
{ MODKEY, XK_comma, focusmon, {.i = -1 } },
diff -up a/dwm.c b/dwm.c
--- a/dwm.c 2022-10-04 19:38:18.000000000 +0200
+++ b/dwm.c 2023-05-06 22:18:43.239357744 +0200
@@ -93,6 +93,7 @@ struct Client {
int bw, oldbw;
unsigned int tags;
int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
+ int allowkill;
Client *next;
Client *snext;
Monitor *mon;
@@ -137,6 +138,7 @@ typedef struct {
const char *instance;
const char *title;
unsigned int tags;
+ int allowkill;
int isfloating;
int monitor;
} Rule;
@@ -212,6 +214,7 @@ static void tagmon(const Arg *arg);
static void tile(Monitor *m);
static void togglebar(const Arg *arg);
static void togglefloating(const Arg *arg);
+static void toggleallowkill(const Arg *arg);
static void toggletag(const Arg *arg);
static void toggleview(const Arg *arg);
static void unfocus(Client *c, int setfocus);
@@ -288,6 +291,7 @@ applyrules(Client *c)
/* rule matching */
c->isfloating = 0;
c->tags = 0;
+ c->allowkill = allowkill;
XGetClassHint(dpy, c->win, &ch);
class = ch.res_class ? ch.res_class : broken;
instance = ch.res_name ? ch.res_name : broken;
@@ -300,6 +304,7 @@ applyrules(Client *c)
{
c->isfloating = r->isfloating;
c->tags |= r->tags;
+ c->allowkill = r->allowkill;
for (m = mons; m && m->num != r->monitor; m = m->next);
if (m)
c->mon = m;
@@ -1006,7 +1011,7 @@ keypress(XEvent *e)
void
killclient(const Arg *arg)
{
- if (!selmon->sel)
+ if (!selmon->sel || !selmon->sel->allowkill)
return;
if (!sendevent(selmon->sel, wmatom[WMDelete])) {
XGrabServer(dpy);
@@ -1704,6 +1709,13 @@ togglebar(const Arg *arg)
}
void
+toggleallowkill(const Arg *arg)
+{
+ if (!selmon->sel) return;
+ selmon->sel->allowkill = !selmon->sel->allowkill;
+}
+
+void
togglefloating(const Arg *arg)
{
if (!selmon->sel)

48
dwm-hide_vacant_tags-6.4.diff Normal file
View File

@ -0,0 +1,48 @@
:100644 100644 f1d86b2 0000000 M dwm.c
diff --git a/dwm.c b/dwm.c
index f1d86b2..d41cc14 100644
--- a/dwm.c
+++ b/dwm.c
@@ -433,9 +433,15 @@ buttonpress(XEvent *e)
}
if (ev->window == selmon->barwin) {
i = x = 0;
- do
+ unsigned int occ = 0;
+ for(c = m->clients; c; c=c->next)
+ occ |= c->tags == TAGMASK ? 0 : c->tags;
+ do {
+ /* Do not reserve space for vacant tags */
+ if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
+ continue;
x += TEXTW(tags[i]);
- while (ev->x >= x && ++i < LENGTH(tags));
+ } while (ev->x >= x && ++i < LENGTH(tags));
if (i < LENGTH(tags)) {
click = ClkTagBar;
arg.ui = 1 << i;
@@ -715,19 +721,18 @@ drawbar(Monitor *m)
}
for (c = m->clients; c; c = c->next) {
- occ |= c->tags;
+ occ |= c->tags == TAGMASK ? 0 : c->tags;
if (c->isurgent)
urg |= c->tags;
}
x = 0;
for (i = 0; i < LENGTH(tags); i++) {
+ /* Do not draw vacant tags */
+ if(!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
+ continue;
w = TEXTW(tags[i]);
drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
- if (occ & 1 << i)
- drw_rect(drw, x + boxs, boxs, boxw, boxw,
- m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
- urg & 1 << i);
x += w;
}
w = TEXTW(m->ltsymbol);

148
dwm-namedscratchpads-6.5.diff Normal file
View File

@ -0,0 +1,148 @@
diff --git a/config.def.h b/config.def.h
index 9efa774..c3e236e 100644
--- a/config.def.h
+++ b/config.def.h
@@ -26,9 +26,10 @@ static const Rule rules[] = {
* WM_CLASS(STRING) = instance, class
* WM_NAME(STRING) = title
*/
- /* class instance title tags mask isfloating monitor */
- { "Gimp", NULL, NULL, 0, 1, -1 },
- { "Firefox", NULL, NULL, 1 << 8, 0, -1 },
+ /* class instance title tags mask isfloating monitor scratch key */
+ { "Gimp", NULL, NULL, 0, 1, -1, 0 },
+ { "firefox", NULL, NULL, 1 << 8, 0, -1, 0 },
+ { NULL, NULL, "scratchpad", 0, 1, -1, 's' },
};
/* layout(s) */
@@ -60,10 +61,14 @@ 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 };
+/*First arg only serves to match against key in rules*/
+static const char *scratchpadcmd[] = {"s", "st", "-t", "scratchpad", NULL};
+
static const Key keys[] = {
/* modifier key function argument */
{ MODKEY, XK_p, spawn, {.v = dmenucmd } },
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
+ { MODKEY, XK_grave, togglescratch, {.v = scratchpadcmd } },
{ MODKEY, XK_b, togglebar, {0} },
{ MODKEY, XK_j, focusstack, {.i = +1 } },
{ MODKEY, XK_k, focusstack, {.i = -1 } },
diff --git a/dwm.c b/dwm.c
index f1d86b2..be6a754 100644
--- a/dwm.c
+++ b/dwm.c
@@ -93,6 +93,7 @@ struct Client {
int bw, oldbw;
unsigned int tags;
int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
+ char scratchkey;
Client *next;
Client *snext;
Monitor *mon;
@@ -139,6 +140,7 @@ typedef struct {
unsigned int tags;
int isfloating;
int monitor;
+ const char scratchkey;
} Rule;
/* function declarations */
@@ -206,11 +208,13 @@ static void setup(void);
static void seturgent(Client *c, int urg);
static void showhide(Client *c);
static void spawn(const Arg *arg);
+static void spawnscratch(const Arg *arg);
static void tag(const Arg *arg);
static void tagmon(const Arg *arg);
static void tile(Monitor *m);
static void togglebar(const Arg *arg);
static void togglefloating(const Arg *arg);
+static void togglescratch(const Arg *arg);
static void toggletag(const Arg *arg);
static void toggleview(const Arg *arg);
static void unfocus(Client *c, int setfocus);
@@ -287,6 +291,7 @@ applyrules(Client *c)
/* rule matching */
c->isfloating = 0;
c->tags = 0;
+ c->scratchkey = 0;
XGetClassHint(dpy, c->win, &ch);
class = ch.res_class ? ch.res_class : broken;
instance = ch.res_name ? ch.res_name : broken;
@@ -299,6 +304,7 @@ applyrules(Client *c)
{
c->isfloating = r->isfloating;
c->tags |= r->tags;
+ c->scratchkey = r->scratchkey;
for (m = mons; m && m->num != r->monitor; m = m->next);
if (m)
c->mon = m;
@@ -308,6 +314,7 @@ applyrules(Client *c)
XFree(ch.res_class);
if (ch.res_name)
XFree(ch.res_name);
+
c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];
}
@@ -1666,6 +1673,27 @@ spawn(const Arg *arg)
}
}
+void spawnscratch(const Arg *arg)
+{
+ struct sigaction sa;
+
+ if (fork() == 0) {
+ if (dpy)
+ close(ConnectionNumber(dpy));
+ setsid();
+
+ sigemptyset(&sa.sa_mask);
+ sa.sa_flags = 0;
+ sa.sa_handler = SIG_DFL;
+ sigaction(SIGCHLD, &sa, NULL);
+
+ execvp(((char **)arg->v)[1], ((char **)arg->v)+1);
+ fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[1]);
+ perror(" failed");
+ exit(EXIT_SUCCESS);
+ }
+}
+
void
tag(const Arg *arg)
{
@@ -1735,6 +1763,28 @@ togglefloating(const Arg *arg)
arrange(selmon);
}
+void
+togglescratch(const Arg *arg)
+{
+ Client *c;
+ unsigned int found = 0;
+
+ for (c = selmon->clients; c && !(found = c->scratchkey == ((char**)arg->v)[0][0]); c = c->next);
+ if (found) {
+ c->tags = ISVISIBLE(c) ? 0 : selmon->tagset[selmon->seltags];
+ focus(NULL);
+ arrange(selmon);
+
+ if (ISVISIBLE(c)) {
+ focus(c);
+ restack(selmon);
+ }
+
+ } else{
+ spawnscratch(arg);
+ }
+}
+
void
toggletag(const Arg *arg)
{

63
dwm-steam-6.2.diff Normal file
View File

@ -0,0 +1,63 @@
From 2550931c66e10e667ce56a6761cbadd12b331c52 Mon Sep 17 00:00:00 2001
From: bakkeby <bakkeby@gmail.com>
Date: Mon, 10 Aug 2020 16:45:00 +0200
Subject: [PATCH] Steam patch
Steam, and steam windows (games), trigger a ConfigureNotify request every time the window
gets focus. More so, the configure event passed along from Steam tends to have the wrong
x and y coordinates which can make the window, if floating, jump around the screen.
This patch works around this age-old issue by ignoring the x and y co-ordinates for
ConfigureNotify requests relating to Steam windows.
---
dwm.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/dwm.c b/dwm.c
index 4465af1..598d36d 100644
--- a/dwm.c
+++ b/dwm.c
@@ -93,6 +93,7 @@ struct Client {
int bw, oldbw;
unsigned int tags;
int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
+ int issteam;
Client *next;
Client *snext;
Monitor *mon;
@@ -291,6 +292,9 @@ applyrules(Client *c)
class = ch.res_class ? ch.res_class : broken;
instance = ch.res_name ? ch.res_name : broken;
+ if (strstr(class, "Steam") || strstr(class, "steam_app_"))
+ c->issteam = 1;
+
for (i = 0; i < LENGTH(rules); i++) {
r = &rules[i];
if ((!r->title || strstr(c->name, r->title))
@@ -588,13 +592,15 @@ configurerequest(XEvent *e)
c->bw = ev->border_width;
else if (c->isfloating || !selmon->lt[selmon->sellt]->arrange) {
m = c->mon;
- if (ev->value_mask & CWX) {
- c->oldx = c->x;
- c->x = m->mx + ev->x;
- }
- if (ev->value_mask & CWY) {
- c->oldy = c->y;
- c->y = m->my + ev->y;
+ if (!c->issteam) {
+ if (ev->value_mask & CWX) {
+ c->oldx = c->x;
+ c->x = m->mx + ev->x;
+ }
+ if (ev->value_mask & CWY) {
+ c->oldy = c->y;
+ c->y = m->my + ev->y;
+ }
}
if (ev->value_mask & CWWidth) {
c->oldw = c->w;
--
2.19.1

103
dwm.c
View File

@ -108,6 +108,9 @@ struct Client {
int bw, oldbw; int bw, oldbw;
unsigned int tags; unsigned int tags;
int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen; int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
int allowkill;
int issteam;
char scratchkey;
Client *next; Client *next;
Client *snext; Client *snext;
Monitor *mon; Monitor *mon;
@ -159,8 +162,10 @@ typedef struct {
const char *instance; const char *instance;
const char *title; const char *title;
unsigned int tags; unsigned int tags;
int allowkill;
int isfloating; int isfloating;
int monitor; int monitor;
const char scratchkey;
} Rule; } Rule;
typedef struct Systray Systray; typedef struct Systray Systray;
@ -246,11 +251,14 @@ static void sigterm(int unused);
static void sigstatusbar(const Arg *arg); static void sigstatusbar(const Arg *arg);
static void spawn(const Arg *arg); static void spawn(const Arg *arg);
static Monitor *systraytomon(Monitor *m); static Monitor *systraytomon(Monitor *m);
static void spawnscratch(const Arg *arg);
static void tag(const Arg *arg); static void tag(const Arg *arg);
static void tagmon(const Arg *arg); static void tagmon(const Arg *arg);
static void tile(Monitor *m); static void tile(Monitor *m);
static void togglebar(const Arg *arg); static void togglebar(const Arg *arg);
static void togglefloating(const Arg *arg); static void togglefloating(const Arg *arg);
static void toggleallowkill(const Arg *arg);
static void togglescratch(const Arg *arg);
static void toggletag(const Arg *arg); static void toggletag(const Arg *arg);
static void toggleview(const Arg *arg); static void toggleview(const Arg *arg);
static void unfocus(Client *c, int setfocus); static void unfocus(Client *c, int setfocus);
@ -347,10 +355,15 @@ applyrules(Client *c)
/* rule matching */ /* rule matching */
c->isfloating = 0; c->isfloating = 0;
c->tags = 0; c->tags = 0;
c->allowkill = allowkill;
c->scratchkey = 0;
XGetClassHint(dpy, c->win, &ch); XGetClassHint(dpy, c->win, &ch);
class = ch.res_class ? ch.res_class : broken; class = ch.res_class ? ch.res_class : broken;
instance = ch.res_name ? ch.res_name : broken; instance = ch.res_name ? ch.res_name : broken;
if (strstr(class, "Steam") || strstr(class, "steam_app_"))
c->issteam = 1;
for (i = 0; i < LENGTH(rules); i++) { for (i = 0; i < LENGTH(rules); i++) {
r = &rules[i]; r = &rules[i];
if ((!r->title || strstr(c->name, r->title)) if ((!r->title || strstr(c->name, r->title))
@ -359,6 +372,8 @@ applyrules(Client *c)
{ {
c->isfloating = r->isfloating; c->isfloating = r->isfloating;
c->tags |= r->tags; c->tags |= r->tags;
c->allowkill = r->allowkill;
c->scratchkey = r->scratchkey;
for (m = mons; m && m->num != r->monitor; m = m->next); for (m = mons; m && m->num != r->monitor; m = m->next);
if (m) if (m)
c->mon = m; c->mon = m;
@ -368,6 +383,7 @@ applyrules(Client *c)
XFree(ch.res_class); XFree(ch.res_class);
if (ch.res_name) if (ch.res_name)
XFree(ch.res_name); XFree(ch.res_name);
c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags]; c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];
} }
@ -513,9 +529,15 @@ buttonpress(XEvent *e)
} }
if (ev->window == selmon->barwin) { if (ev->window == selmon->barwin) {
i = x = 0; i = x = 0;
do unsigned int occ = 0;
for(c = m->clients; c; c=c->next)
occ |= c->tags == TAGMASK ? 0 : c->tags;
do {
/* Do not reserve space for vacant tags */
if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
continue;
x += TEXTW(tags[i]); x += TEXTW(tags[i]);
while (ev->x >= x && ++i < LENGTH(tags)); } while (ev->x >= x && ++i < LENGTH(tags));
if (i < LENGTH(tags)) { if (i < LENGTH(tags)) {
click = ClkTagBar; click = ClkTagBar;
arg.ui = 1 << i; arg.ui = 1 << i;
@ -745,13 +767,15 @@ configurerequest(XEvent *e)
c->bw = ev->border_width; c->bw = ev->border_width;
else if (c->isfloating || !selmon->lt[selmon->sellt]->arrange) { else if (c->isfloating || !selmon->lt[selmon->sellt]->arrange) {
m = c->mon; m = c->mon;
if (ev->value_mask & CWX) { if (!c->issteam) {
c->oldx = c->x; if (ev->value_mask & CWX) {
c->x = m->mx + ev->x; c->oldx = c->x;
} c->x = m->mx + ev->x;
if (ev->value_mask & CWY) { }
c->oldy = c->y; if (ev->value_mask & CWY) {
c->y = m->my + ev->y; c->oldy = c->y;
c->y = m->my + ev->y;
}
} }
if (ev->value_mask & CWWidth) { if (ev->value_mask & CWWidth) {
c->oldw = c->w; c->oldw = c->w;
@ -908,19 +932,18 @@ drawbar(Monitor *m)
resizebarwin(m); resizebarwin(m);
for (c = m->clients; c; c = c->next) { for (c = m->clients; c; c = c->next) {
occ |= c->tags; occ |= c->tags == TAGMASK ? 0 : c->tags;
if (c->isurgent) if (c->isurgent)
urg |= c->tags; urg |= c->tags;
} }
x = 0; x = 0;
for (i = 0; i < LENGTH(tags); i++) { for (i = 0; i < LENGTH(tags); i++) {
/* Do not draw vacant tags */
if(!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
continue;
w = TEXTW(tags[i]); w = TEXTW(tags[i]);
drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]); drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i); drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
if (occ & 1 << i)
drw_rect(drw, x + boxs, boxs, boxw, boxw,
m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
urg & 1 << i);
x += w; x += w;
} }
w = TEXTW(m->ltsymbol); w = TEXTW(m->ltsymbol);
@ -1284,7 +1307,7 @@ keypress(XEvent *e)
void void
killclient(const Arg *arg) killclient(const Arg *arg)
{ {
if (!selmon->sel) if (!selmon->sel || !selmon->sel->allowkill)
return; return;
if (!sendevent(selmon->sel->win, wmatom[WMDelete], NoEventMask, wmatom[WMDelete], CurrentTime, 0 , 0, 0)) { if (!sendevent(selmon->sel->win, wmatom[WMDelete], NoEventMask, wmatom[WMDelete], CurrentTime, 0 , 0, 0)) {
@ -2085,6 +2108,27 @@ spawn(const Arg *arg)
} }
} }
void spawnscratch(const Arg *arg)
{
struct sigaction sa;
if (fork() == 0) {
if (dpy)
close(ConnectionNumber(dpy));
setsid();
sigemptyset(&sa.sa_mask);
sa.sa_flags = 0;
sa.sa_handler = SIG_DFL;
sigaction(SIGCHLD, &sa, NULL);
execvp(((char **)arg->v)[1], ((char **)arg->v)+1);
fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[1]);
perror(" failed");
exit(EXIT_SUCCESS);
}
}
void void
tag(const Arg *arg) tag(const Arg *arg)
{ {
@ -2151,6 +2195,13 @@ togglebar(const Arg *arg)
arrange(selmon); arrange(selmon);
} }
void
toggleallowkill(const Arg *arg)
{
if (!selmon->sel) return;
selmon->sel->allowkill = !selmon->sel->allowkill;
}
void void
togglefloating(const Arg *arg) togglefloating(const Arg *arg)
{ {
@ -2165,6 +2216,28 @@ togglefloating(const Arg *arg)
arrange(selmon); arrange(selmon);
} }
void
togglescratch(const Arg *arg)
{
Client *c;
unsigned int found = 0;
for (c = selmon->clients; c && !(found = c->scratchkey == ((char**)arg->v)[0][0]); c = c->next);
if (found) {
c->tags = ISVISIBLE(c) ? 0 : selmon->tagset[selmon->seltags];
focus(NULL);
arrange(selmon);
if (ISVISIBLE(c)) {
focus(c);
restack(selmon);
}
} else{
spawnscratch(arg);
}
}
void void
toggletag(const Arg *arg) toggletag(const Arg *arg)
{ {