Merge branch 'main' of git.snaile.de:snailed/dwm-custom
This commit is contained in:
commit
c40ab9ab7d
8
build.sh
8
build.sh
|
|
@ -4,8 +4,12 @@ cp config.mk patches.h dwm-flexipatch/
|
|||
flexipatch-finalizer/flexipatch-finalizer.sh -r -d dwm-flexipatch -o dwm-final
|
||||
git -C dwm-flexipatch reset --hard HEAD && git -C dwm-flexipatch clean -fd
|
||||
for patch in patches/*.diff; do
|
||||
patch -d dwm-final <"$patch"
|
||||
patch -d dwm-final <"$patch"
|
||||
done
|
||||
cp config.h dwm-final/
|
||||
cd dwm-final || exit 1
|
||||
make
|
||||
if [ "$1" = "-i" ]; then
|
||||
sudo make install
|
||||
else
|
||||
make
|
||||
fi
|
||||
|
|
|
|||
44
config.h
44
config.h
|
|
@ -4,12 +4,13 @@
|
|||
#define TERM_FLAG_NAME "-n"
|
||||
#define TERM_FLAG_EXEC "-e"
|
||||
#define TERM_FLAG_CLASS "-c"
|
||||
#define TERM_START "tmux"
|
||||
|
||||
#define BROWSER "brave-browser"
|
||||
#define BROWSER_FLAG_INCOG "--incognito"
|
||||
#define BROWSER_FLAG_1 "--enable-blink-features=MiddleClickAutoscroll"
|
||||
|
||||
#define STATUSBAR "dwmblocks"
|
||||
|
||||
/* appearance */
|
||||
static const unsigned int borderpx = 2; /* border pixel of windows */
|
||||
static const unsigned int snap = 32; /* snap pixel */
|
||||
|
|
@ -188,21 +189,11 @@ static const Layout layouts[] = {
|
|||
{ MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
|
||||
{ MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }
|
||||
|
||||
#define STACKKEYS(MOD,ACTION) \
|
||||
{ MOD, XK_j, ACTION##stack, {.i = INC(+1) } }, \
|
||||
{ MOD, XK_k, ACTION##stack, {.i = INC(-1) } }, \
|
||||
{ MOD, XK_s, ACTION##stack, {.i = PREVSEL } }, \
|
||||
{ MOD, XK_w, ACTION##stack, {.i = 0 } }, \
|
||||
{ MOD, XK_e, ACTION##stack, {.i = 1 } }, \
|
||||
{ MOD, XK_a, ACTION##stack, {.i = 2 } }, \
|
||||
{ MOD, XK_z, ACTION##stack, {.i = -1 } },
|
||||
|
||||
|
||||
/* helper for spawning shell commands in the pre dwm-5.0 fashion */
|
||||
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
|
||||
|
||||
/* commands */
|
||||
static const char *termcmd[] = { TERM, TERM_FLAG_EXEC, TERM_START, NULL };
|
||||
static const char *termcmd[] = { TERM, NULL };
|
||||
|
||||
#include <X11/XF86keysym.h>
|
||||
static const Key keys[] = {
|
||||
|
|
@ -261,23 +252,23 @@ static const Key keys[] = {
|
|||
{ MODKEY | ShiftMask, XK_period, tagmon, {.i = -1} },
|
||||
{ MODKEY, XK_p, spawn, {.v = (const char *[]){"playerctl", "play-pause", NULL}} },
|
||||
// { MODKEY | ShiftMask, XK_p, spawn, {.v = (const char *[]){NULL}} },
|
||||
{ MODKEY, XK_y, focusstack, {.i = 0} },
|
||||
{ MODKEY | ShiftMask, XK_y, pushstack, {.i = 0} },
|
||||
// { MODKEY, XK_y, spawn, {.v = (const char *[]){NULL}} },
|
||||
// { MODKEY | ShiftMask, XK_y, spawn, {.v = (const char *[]){NULL}} },
|
||||
{ MODKEY, XK_f, togglefullscreen, {0} },
|
||||
{ MODKEY | ShiftMask, XK_f, spawn, {.v = &layouts[6]} },
|
||||
{ MODKEY, XK_g, spawn, {.v = &layouts[0]} },
|
||||
{ MODKEY | ShiftMask, XK_g, spawn, {.v = &layouts[1]} },
|
||||
{ MODKEY | ShiftMask, XK_f, setlayout, {.v = &layouts[6]} },
|
||||
{ MODKEY, XK_g, setlayout, {.v = &layouts[0]} },
|
||||
{ MODKEY | ShiftMask, XK_g, setlayout, {.v = &layouts[1]} },
|
||||
{ MODKEY, XK_c, setlayout, {.v = &layouts[2]} },
|
||||
{ MODKEY | ShiftMask, XK_c, spawn, {.v = &layouts[3]} },
|
||||
{ MODKEY, XK_r, spawn, {.v = &layouts[4]} },
|
||||
{ MODKEY | ShiftMask, XK_r, spawn, {.v = &layouts[5]} },
|
||||
{ MODKEY | ShiftMask, XK_c, setlayout, {.v = &layouts[3]} },
|
||||
{ MODKEY, XK_r, setlayout, {.v = &layouts[4]} },
|
||||
{ MODKEY | ShiftMask, XK_r, setlayout, {.v = &layouts[5]} },
|
||||
{ MODKEY, XK_l, focusdir, {.i = 1 } },
|
||||
// { MODKEY | ShiftMask, XK_l, spawn, {.v = (const char *[]){NULL}} },
|
||||
// { MODKEY, XK_slash, spawn, {.v = (const char *[]){NULL}} },
|
||||
// { MODKEY | ShiftMask, XK_slash, spawn, {.v = (const char *[]){NULL}} },
|
||||
// { MODKEY, XK_equal, spawn, {.v = (const char *[]){NULL}} },
|
||||
// { MODKEY | ShiftMask, XK_equal, spawn, {.v = (const char *[]){NULL}} },
|
||||
{ MODKEY, XK_a, setmfact, {.f = -0.05} },
|
||||
// { MODKEY, XK_a, spawn, {.v = (const char *[]){NULL}} },
|
||||
// { MODKEY | ShiftMask, XK_a, spawn, {.v = (const char *[]){NULL}} },
|
||||
{ MODKEY, XK_o, togglescratch, {.v = spproc} },
|
||||
// { MODKEY | ShiftMask, XK_o, spawn, {.v = (const char *[]){NULL}} },
|
||||
|
|
@ -294,8 +285,9 @@ static const Key keys[] = {
|
|||
{ MODKEY, XK_t, spawn, {.v = (const char *[]){BROWSER, BROWSER_FLAG_1, NULL}} },
|
||||
{ MODKEY | ShiftMask, XK_t, spawn, {.v = (const char *[]){BROWSER, BROWSER_FLAG_1, BROWSER_FLAG_INCOG, NULL}} },
|
||||
{ MODKEY, XK_n, focusstack, {.i = PREVSEL} },
|
||||
{ MODKEY | ShiftMask, XK_n, focusstack, {.i = PREVSEL} },
|
||||
{ MODKEY | ShiftMask, XK_n, focusstack, {.i = 0} },
|
||||
{ MODKEY, XK_s, setmfact, {.f = +0.05} },
|
||||
{ MODKEY | ShiftMask, XK_s, setmfact, {.f = -0.05} },
|
||||
// { MODKEY | ShiftMask, XK_s, spawn, {.v = (const char *[]){NULL}} },
|
||||
// { MODKEY, XK_minus, spawn, {.v = (const char *[]){NULL}} },
|
||||
// { MODKEY | ShiftMask, XK_minus, spawn, {.v = (const char *[]){NULL}} },
|
||||
|
|
@ -308,11 +300,11 @@ static const Key keys[] = {
|
|||
{ MODKEY, XK_q, killclient, {0} },
|
||||
// { MODKEY | ShiftMask, XK_q, spawn, {.v = (const char *[]){NULL}} },
|
||||
{ MODKEY, XK_j, focusdir, {.i = 3} },
|
||||
// { MODKEY | ShiftMask, XK_j, spawn, {.v = (const char *[]){NULL}} },
|
||||
{ MODKEY, XK_k, focusstack, {.i = 2} },
|
||||
// { MODKEY | ShiftMask, XK_k, spawn, {.v = (const char *[]){NULL}} },
|
||||
{ MODKEY | ShiftMask, XK_j, focusstack, {.i = INC(+1) } },
|
||||
{ MODKEY, XK_k, focusdir, {.i = 2} },
|
||||
{ MODKEY | ShiftMask, XK_k, focusstack, {.i = INC(-1) } },
|
||||
{ MODKEY, XK_x, togglefloating, {0} },
|
||||
{ MODKEY | ShiftMask, XK_x, unfloatvisible, {0} },
|
||||
{ MODKEY | ShiftMask, XK_x, unfloatvisible, {0} },
|
||||
{ MODKEY, XK_b, togglescratch, {.v = spinet} },
|
||||
// { MODKEY | ShiftMask, XK_b, spawn, {.v = (const char *[]){NULL}} },
|
||||
{ MODKEY, XK_m, togglescratch, {.v = spvolm} },
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 5e85bc8b5c784b47cdd3015b53c5bb517500ba9c
|
||||
Subproject commit a18f3ef370110c85d9001aced4b0cb1c96a075bf
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 7c66a3d0560d33d9d49b3e856859ef8a0af1fd6a
|
||||
Subproject commit 37e8cb6145f189b805aa58c7d560b1adf51377a7
|
||||
10
patches.h
10
patches.h
|
|
@ -29,7 +29,7 @@
|
|||
* dwmblocks: https://github.com/torrinfail/dwmblocks
|
||||
* https://dwm.suckless.org/patches/statuscmd/
|
||||
*/
|
||||
#define BAR_DWMBLOCKS_PATCH 0
|
||||
#define BAR_DWMBLOCKS_PATCH 1
|
||||
|
||||
/* Originally the dwmblocks + statuscmd patch used a user defined signal (SIGUSR1)
|
||||
* for communicating with dwmblocks to indicate update signal and what button was
|
||||
|
|
@ -144,7 +144,7 @@
|
|||
* when clicking the status bar. Refer to the website for usage.
|
||||
* https://dwm.suckless.org/patches/statuscmd/
|
||||
*/
|
||||
#define BAR_STATUSCMD_PATCH 0
|
||||
#define BAR_STATUSCMD_PATCH 1
|
||||
|
||||
/* Status2d allows colors and rectangle drawing in your dwm status bar.
|
||||
* This patch is incompatible with the statuscolors patch which takes precedence.
|
||||
|
|
@ -349,7 +349,7 @@
|
|||
* https://groups.google.com/forum/m/#!topic/wmii/7bncCahYIww
|
||||
* https://docs.google.com/viewer?a=v&pid=forums&srcid=MDAwODA2MTg0MDQyMjE0OTgzMzMBMDQ3ODQzODkyMTU3NTAyMTMxNTYBX2RUMVNtOUtDQUFKATAuMQEBdjI&authuser=0
|
||||
*/
|
||||
#define BAR_IGNORE_XFT_ERRORS_WHEN_DRAWING_TEXT_PATCH 0
|
||||
#define BAR_IGNORE_XFT_ERRORS_WHEN_DRAWING_TEXT_PATCH 1
|
||||
|
||||
/* This patch adds back in the workaround for a BadLength error in the Xft library when color
|
||||
* glyphs are used. This is for systems that do not have an updated version of the Xft library
|
||||
|
|
@ -844,7 +844,7 @@
|
|||
/* Removes the border when there is only one window visible.
|
||||
* https://dwm.suckless.org/patches/noborder/
|
||||
*/
|
||||
#define NOBORDER_PATCH 1
|
||||
#define NOBORDER_PATCH 0
|
||||
|
||||
/* Enable modifying or removing dmenu in config.def.h which resulted previously in a
|
||||
* compilation error because two lines of code hardcode dmenu into dwm.
|
||||
|
|
@ -890,7 +890,7 @@
|
|||
* This is to prevent you accidentally losing all your work.
|
||||
* https://dwm.suckless.org/patches/onlyquitonempty/
|
||||
*/
|
||||
#define ONLYQUITONEMPTY_PATCH 1
|
||||
#define ONLYQUITONEMPTY_PATCH 0
|
||||
|
||||
/* The pertag patch adds nmaster, mfacts and layouts per tag rather than per
|
||||
* monitor (default).
|
||||
|
|
|
|||
|
|
@ -5,7 +5,9 @@
|
|||
/* variables */
|
||||
static const char broken[] = "broken";
|
||||
-static char stext[1024];
|
||||
-static char rawstext[512];
|
||||
+static char stext[2048];
|
||||
+static char rawstext[1024];
|
||||
|
||||
static int screen;
|
||||
static int sw, sh; /* X display screen geometry width, height */
|
||||
|
|
|
|||
Loading…
Reference in New Issue