From 81858d5f054b3d109fffd5af3e870422f48d8cc2 Mon Sep 17 00:00:00 2001 From: DogeyStamp Date: Sun, 30 Jan 2022 16:47:05 -0500 Subject: [PATCH] [dwm] Fix minor cherry-pick issues --- suckless/dwm/README.md | 6 ------ suckless/dwm/config.def.h | 33 +++++++++++++-------------------- suckless/dwm/dwm.c | 4 ++++ 3 files changed, 17 insertions(+), 26 deletions(-) diff --git a/suckless/dwm/README.md b/suckless/dwm/README.md index c608796..b55fe3f 100644 --- a/suckless/dwm/README.md +++ b/suckless/dwm/README.md @@ -1,18 +1,12 @@ # dwm My build of dwm. ## Patches -center - swallow -combo - blanktags alpha -rearrangebar - warp ## Installation Clone the repo. diff --git a/suckless/dwm/config.def.h b/suckless/dwm/config.def.h index f740697..9611147 100644 --- a/suckless/dwm/config.def.h +++ b/suckless/dwm/config.def.h @@ -3,14 +3,9 @@ #include /* appearance */ -static const unsigned int borderpx = 1; /* border pixel of windows */ +static const unsigned int borderpx = 0; /* border pixel of windows */ static const unsigned int snap = 32; /* snap pixel */ static const int swallowfloating = 1; /* 1 means swallow floating windows by default */ -static const unsigned int gappih = 20; /* horiz inner gap between windows */ -static const unsigned int gappiv = 10; /* vert inner gap between windows */ -static const unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */ -static const unsigned int gappov = 30; /* vert outer gap between windows and screen edge */ -static int smartgaps = 0; /* 1 means no outer gap when there is only one window */ static int passthrough = 0; /* 1 means to ignore most shortcuts */ static const int showbar = 1; /* 0 means no bar */ static const int barpadding = 0; /* 0 means no padding beneath/above bar */ @@ -80,10 +75,8 @@ static const Layout layouts[] = { 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, "-n", NULL }; static const char *termcmd[] = { "st", NULL }; -static const char *suspendcmd[] = { "systemctl", "suspend", NULL }; -static const char *browsercmd[] = { "librewolf", NULL }; -static const char *scrotcmd[] = {".local/bin/screenshot.sh"}; -static const char *scrotscmd[] = {".local/bin/screenshot-save.sh"}; +static const char *suspendcmd[] = { "doas", "/bin/loginctl", "suspend", NULL }; +static const char *browsercmd[] = { "qutebrowser", NULL }; static const char *lockcmd[] = { "slock" }; static const char *upvol[] = { "/usr/bin/pactl", "set-sink-volume", "0", "+5%", NULL }; static const char *downvol[] = { "/usr/bin/pactl", "set-sink-volume", "0", "-5%", NULL }; @@ -96,21 +89,21 @@ static const char *stopcmd[] = { "mpc", "stop", NULL }; static const Key keys[] = { /* modifier key function argument */ { Mod4Mask, XK_p, togglepass, {0} }, - { MODKEY, XK_f, togglealtbar, {0} }, + { MODKEY, XK_f, togglealtbar, {0} }, { MODKEY, XK_p, spawn, {.v = dmenucmd } }, { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, { MODKEY|ShiftMask, XK_s, spawn, {.v = suspendcmd } }, { MODKEY|ShiftMask, XK_b, spawn, {.v = browsercmd } }, { MODKEY|ShiftMask, XK_l, spawn, {.v = lockcmd } }, - { 0, XK_Print, spawn, {.v = scrotcmd } }, - { ShiftMask, XK_Print, spawn, {.v = scrotscmd } }, - { 0, XF86XK_AudioStop, spawn, {.v = stopcmd } }, - { 0, XF86XK_AudioNext, spawn, {.v = next } }, - { 0, XF86XK_AudioPrev, spawn, {.v = prev } }, - { 0, XF86XK_AudioPlay, spawn, {.v = play } }, - { 0, XF86XK_AudioLowerVolume, spawn, {.v = downvol } }, - { 0, XF86XK_AudioMute, spawn, {.v = mutevol } }, - { 0, XF86XK_AudioRaiseVolume, spawn, {.v = upvol } }, + { 0, XK_Print, spawn, SHCMD("~/.local/bin/s.sh") }, + { ShiftMask, XK_Print, spawn, SHCMD("~/.local/bin/ss.sh") }, + { 0, XF86XK_AudioStop, spawn, {.v = stopcmd } }, + { 0, XF86XK_AudioNext, spawn, {.v = next } }, + { 0, XF86XK_AudioPrev, spawn, {.v = prev } }, + { 0, XF86XK_AudioPlay, spawn, {.v = play } }, + { 0, XF86XK_AudioLowerVolume, spawn, {.v = downvol } }, + { 0, XF86XK_AudioMute, spawn, {.v = mutevol } }, + { 0, XF86XK_AudioRaiseVolume, spawn, {.v = upvol } }, { MODKEY, XK_b, togglebar, {0} }, { MODKEY, XK_j, focusstack, {.i = +1 } }, { MODKEY, XK_k, focusstack, {.i = -1 } }, diff --git a/suckless/dwm/dwm.c b/suckless/dwm/dwm.c index 97cdd49..07757e3 100644 --- a/suckless/dwm/dwm.c +++ b/suckless/dwm/dwm.c @@ -256,6 +256,8 @@ static Client *swallowingclient(Window w); static Client *termforwin(const Client *c); static pid_t winpid(Window w); +static void keyrelease(XEvent *e); + /* variables */ static const char broken[] = "broken"; static char stext[256]; @@ -267,6 +269,7 @@ static int (*xerrorxlib)(Display *, XErrorEvent *); static unsigned int numlockmask = 0; static void (*handler[LASTEvent]) (XEvent *) = { [ButtonPress] = buttonpress, + [ButtonRelease] = keyrelease, [ClientMessage] = clientmessage, [ConfigureRequest] = configurerequest, [ConfigureNotify] = configurenotify, @@ -274,6 +277,7 @@ static void (*handler[LASTEvent]) (XEvent *) = { [EnterNotify] = enternotify, [Expose] = expose, [FocusIn] = focusin, + [KeyRelease] = keyrelease, [KeyPress] = keypress, [MappingNotify] = mappingnotify, [MapRequest] = maprequest,