From 44f30cdcf236318c3a8dcda0f594d2b7298eebcf Mon Sep 17 00:00:00 2001 From: horhik Date: Wed, 7 Oct 2020 20:59:57 +0300 Subject: [PATCH] update dwm --- dwm-6.2/config.def.h | 7 +- dwm-6.2/config.h | 6 +- dwm-6.2/dwm | Bin 71360 -> 71360 bytes dwm-6.2/dwm-alternativetags-6.2.diff | 93 ++++++++++++++++++++++ dwm-6.2/dwm.o | Bin 61376 -> 61728 bytes home/scripts/.local/scripts/status/launch | 6 ++ install.sh | 2 +- 7 files changed, 107 insertions(+), 7 deletions(-) create mode 100644 dwm-6.2/dwm-alternativetags-6.2.diff create mode 100755 home/scripts/.local/scripts/status/launch diff --git a/dwm-6.2/config.def.h b/dwm-6.2/config.def.h index cf079cd..2c56145 100644 --- a/dwm-6.2/config.def.h +++ b/dwm-6.2/config.def.h @@ -24,15 +24,16 @@ static const char *const autostart[] = { "firefox", NULL, "variety", NULL, "redshift", NULL, - //"picom", "--experimental-backends", "--detect-rounded-corners", NULL, + "picom", "--experimental-backends", "--detect-rounded-corners", NULL, "setxkbmap","us,ru,fi",",winkeys","grp:alt_shift_toggle", NULL, + "xrandr", "--output", "HDMI1", "--above", "eDP1", NULL, + "$HOME/.local/scripts/status/launch", NULL, "pulseaudio","-k", NULL, -/* "alacritty", "-t", "sp_volume", "-e", "$HOME/scripts/volume_launch.sh", NULL*/ NULL /* terminate */ }; /* tagging */ -static const char *tags[] = { "ﳎ", "", "", "", "", "", "", "", "龎" }; +static const char *tags[] = { "ﳎ ", " ", " ", " ", "", "", " ", " ", "龎 " }; /* launcher commands (They must be NULL terminated) */ static const char* surf[] = { "surf", "duckduckgo.com", NULL }; diff --git a/dwm-6.2/config.h b/dwm-6.2/config.h index cf079cd..889582f 100644 --- a/dwm-6.2/config.h +++ b/dwm-6.2/config.h @@ -24,15 +24,15 @@ static const char *const autostart[] = { "firefox", NULL, "variety", NULL, "redshift", NULL, - //"picom", "--experimental-backends", "--detect-rounded-corners", NULL, + "picom", "--experimental-backends", "--detect-rounded-corners", NULL, "setxkbmap","us,ru,fi",",winkeys","grp:alt_shift_toggle", NULL, + "xrandr", "--output", "HDMI1", "--above", "eDP1", NULL, "pulseaudio","-k", NULL, -/* "alacritty", "-t", "sp_volume", "-e", "$HOME/scripts/volume_launch.sh", NULL*/ NULL /* terminate */ }; /* tagging */ -static const char *tags[] = { "ﳎ", "", "", "", "", "", "", "", "龎" }; +static const char *tags[] = { "ﳎ ", " ", " ", " ", "", "", " ", " ", "龎 " }; /* launcher commands (They must be NULL terminated) */ static const char* surf[] = { "surf", "duckduckgo.com", NULL }; diff --git a/dwm-6.2/dwm b/dwm-6.2/dwm index 6b58f710ed1b32681ae41c194fec37ece76edd4a..377e9ac8494ab853d73de02e70755abd298ad6fa 100755 GIT binary patch delta 4315 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 diff --git a/dwm-6.2/dwm-alternativetags-6.2.diff b/dwm-6.2/dwm-alternativetags-6.2.diff new file mode 100644 index 0000000..dc6a0cf --- /dev/null +++ b/dwm-6.2/dwm-alternativetags-6.2.diff @@ -0,0 +1,93 @@ +From 25aa44b5998a2aac840a0eecf9d8a479695b2577 Mon Sep 17 00:00:00 2001 +From: Piyush Pangtey +Date: Sat, 13 Apr 2019 00:24:23 +0530 +Subject: [PATCH] alternative tags + +Having icons as tags sure makes dwm look awesome, but having tags number +simplifies tags related operations. This patch introduces alternative +tags which can be switched on the fly for the sole purpose of providing +visual aid. + +Signed-off-by: Piyush Pangtey +--- + config.def.h | 2 ++ + dwm.c | 14 ++++++++++++-- + 2 files changed, 14 insertions(+), 2 deletions(-) + +diff --git a/config.def.h b/config.def.h +index 1c0b587..e6c2565 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -20,6 +20,7 @@ static const char *colors[][3] = { + + /* tagging */ + static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; ++static const char *tagsalt[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; + + static const Rule rules[] = { + /* xprop(1): +@@ -84,6 +85,7 @@ static Key keys[] = { + { MODKEY, XK_period, focusmon, {.i = +1 } }, + { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, + { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, ++ { MODKEY, XK_n, togglealttag, {0} }, + TAGKEYS( XK_1, 0) + TAGKEYS( XK_2, 1) + TAGKEYS( XK_3, 2) +diff --git a/dwm.c b/dwm.c +index 4465af1..ee292e1 100644 +--- a/dwm.c ++++ b/dwm.c +@@ -130,6 +130,7 @@ struct Monitor { + Monitor *next; + Window barwin; + const Layout *lt[2]; ++ unsigned int alttag; + }; + + typedef struct { +@@ -209,6 +210,7 @@ static void spawn(const Arg *arg); + static void tag(const Arg *arg); + static void tagmon(const Arg *arg); + static void tile(Monitor *); ++static void togglealttag(); + static void togglebar(const Arg *arg); + static void togglefloating(const Arg *arg); + static void toggletag(const Arg *arg); +@@ -695,7 +697,7 @@ dirtomon(int dir) + void + drawbar(Monitor *m) + { +- int x, w, sw = 0; ++ int x, w, wdelta, sw = 0; + int boxs = drw->fonts->h / 9; + int boxw = drw->fonts->h / 6 + 2; + unsigned int i, occ = 0, urg = 0; +@@ -716,8 +718,9 @@ drawbar(Monitor *m) + x = 0; + for (i = 0; i < LENGTH(tags); i++) { + w = TEXTW(tags[i]); ++ wdelta = selmon->alttag ? abs(TEXTW(tags[i]) - TEXTW(tagsalt[i])) / 2 : 0; + 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, wdelta + lrpad / 2, (selmon->alttag ? tagsalt[i] : 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, +@@ -1696,6 +1699,13 @@ tile(Monitor *m) + } + } + ++void ++togglealttag() ++{ ++ selmon->alttag = !selmon->alttag; ++ drawbar(selmon); ++} ++ + void + togglebar(const Arg *arg) + { +-- +2.21.0 + diff --git a/dwm-6.2/dwm.o b/dwm-6.2/dwm.o index 9dbafa3274773ceae0c6137322fc34974a02791d..6021fdfc443a3e9c421082881eede66f321a6c57 100644 GIT binary patch delta 1064 zcmZ9KUr19?9LLYOd)Xii5xmYMr%*_B(Y<6ZZMTwA!xAj;)=Sszlw<8rcXu)$LWKx> z%KSZ)_0WbCMiIuKKPWLFFd{-90yWy*>_v2LMLk4Mo$VYc&Vh5!J)h6-d${Mv%~-bN zx^1FGN^ZS4a9bU5q0+4<^l>9aACpNJD&BjDN@JsR&eP5KU5cMhxsVb>L%IP>h&~ z;6O-^qIeAcsQa1|h934CG!TiK(YT2^J9@g@bgK_Uh6o}Zz3%khV@-}}wYv&3ed@H@ zUoW{NIBuN5x%3_5>?x^1O0U1kVn>67Dq|eR=H%(zTusG%dRc{oklLz&XJ3Ee2aw9j z&Lpq=%>oG1bvK=lU^y#KTJ~ytnb5H#o&&aIXrrc1Ft5OE$#@>RtX8}L!&a;F9X~uF zRDOg7OLl(dc0#aU;D;rT{N#24+E59@>q*K)G6SFp0eY(J!^ z9TaRc&yK<}wKIafeu!mf0q13BMzGppW|zR7m%CR4J1jGc_;t$HE0>(u&-hN?cX)Fn z<88L|Wd5WBufXc&BECs~({}tAR=2!T-CL+HcyJQ5f){VVRKe>=o@XHy@`ZMXnq|B9 z(6rr-bD(W|r6U^L-}Xqo8m!UfoCftpk90+Y>eIClEw)I5)Kg;r25UtRo&{&gD@}~S Qg_6gyw8@V90D7_UFVOkkbN~PV delta 747 zcmZ9JKWG#|6o+>v&8?s&1T$GJ5(CO1k#J37Qta&^YB)u0gtbhkU7}4A5H?~Ft6cmQ zo))?>ApU7iSArfFND7HqsOcayqzUjsEwJ;j36`cc*FPo-h*NMxNRkDtK_M( z{p!S=(`)d%&kcTO!Ql6NBdI<%_>3p2VI;Hn4gT^0BIgkLONGEI^_rOD9YL*}?q7`D z!!#m@Z(Jmmpm6ijIl4iD+x1OiZV+Sd%;IQ+Eqaa4J@a|#0NDr9>coZ3pX4D*A+sJ) znfxW2kqsUc^#l{bK2uYvf@tVf}D*jgEb;Z;Fc!oxgsAprn$*gvj%0k(dos_m4BxY7# zvwdpTK|$DSn!VL8XU8!ntf$$lgVI(oAG2~*vr|mk6^)-hF8Ozj_w`7g(qJb(Ym!qK z{;@`miJu-KXE59<(#d5^w`}6zU8_h&@mnD03RcTqxSZro|C^l8VI~>MLP?QUUHnOG yT5~bNZTiN=v}kKCCeC-^3(wOJ!VB`OiILPM?U+i7H1$wVZF77}uKS2p-m?o!tgx2= diff --git a/home/scripts/.local/scripts/status/launch b/home/scripts/.local/scripts/status/launch new file mode 100755 index 0000000..d99cc93 --- /dev/null +++ b/home/scripts/.local/scripts/status/launch @@ -0,0 +1,6 @@ +#!/bin/bash + +while true; do + xsetroot -name "$(./statusbar)" + sleep 0.5 +done & diff --git a/install.sh b/install.sh index 234015c..54515fd 100755 --- a/install.sh +++ b/install.sh @@ -7,7 +7,7 @@ cd yay makepkg -si sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" -yay -S dunst firefox dwm surf dmenu st qutebrowser pulsemixer pkg-config variety alacritty compton-tryone-git ninja meson cmake libev libevdev uthash nerd-fonts-mononoki nerd-fonts tmux feh xorg-xsetroot +yay -S dunst firefox dwm surf dmenu st qutebrowser pulsemixer pkg-config variety alacritty compton-tryone-git ninja meson cmake libev libevdev uthash nerd-fonts-mononoki nerd-fonts tmux feh xorg-xsetroot xkblayout-state # setup compositor cd $HOME/Downloads/tmp git clone https://github.com/ibhagwan/picom