From f97c855a2b85cc4b8ca2aacb89c0bc5e628a55bf Mon Sep 17 00:00:00 2001 From: Marcin Wozniak Date: Fri, 24 May 2019 08:35:52 +0200 Subject: [PATCH] Added files --- config.def.h | 4 ++ config.h | 8 ++-- dwm | Bin 64112 -> 64152 bytes dwm-fullgaps-6.2.diff | 95 ++++++++++++++++++++++++++++++++++++++++++ dwm.c | 29 +++++++++---- dwm.c.orig | 3 +- dwm.o | Bin 71832 -> 72008 bytes dwm_status | 32 +++++++++----- 8 files changed, 149 insertions(+), 22 deletions(-) create mode 100644 dwm-fullgaps-6.2.diff diff --git a/config.def.h b/config.def.h index bfa9a12..ccea5ca 100644 --- a/config.def.h +++ b/config.def.h @@ -2,6 +2,7 @@ /* appearance */ static const unsigned int borderpx = 1; /* border pixel of windows */ +static const unsigned int gappx = 5; /* gaps between windows */ static const unsigned int snap = 32; /* snap pixel */ static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */ static const unsigned int systrayspacing = 2; /* systray spacing */ @@ -101,6 +102,9 @@ 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_minus, setgaps, {.i = -1 } }, + { MODKEY, XK_equal, setgaps, {.i = +1 } }, + { MODKEY|ShiftMask, XK_equal, setgaps, {.i = 0 } }, TAGKEYS( XK_1, 0) TAGKEYS( XK_2, 1) TAGKEYS( XK_3, 2) diff --git a/config.h b/config.h index e382a03..099e0a0 100644 --- a/config.h +++ b/config.h @@ -1,6 +1,6 @@ /* appearance */ -static const unsigned int borderpx = 1; /* border pixel of windows */ -static const unsigned int gappx = 5; /* gaps between windows */ +static const unsigned int borderpx = 3; /* border pixel of windows */ +static const unsigned int gappx = 20; /* gaps between windows */ 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 */ @@ -8,7 +8,8 @@ static const unsigned int systraypinning = 0; /* 0: sloppy systray follows sel static const unsigned int systrayspacing = 2; /* systray spacing */ static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/ static const int showsystray = 1; /* 0 means no systray */ -static const char *fonts[] = { "monospace:size=14" }; +/*static const char *fonts[] = {"monospace:size=14", "noto color emoji"};*/ +static const char *fonts[] = { "monospace:size=14", "Font Awesome 5 Free Solid:size=14" }; static const char dmenufont[] = "monospace:size=14"; static const char col_gray1[] = "#222222"; static const char col_gray2[] = "#444444"; @@ -154,3 +155,4 @@ static Button buttons[] = { { ClkTagBar, MODKEY, Button1, tag, {0} }, { ClkTagBar, MODKEY, Button3, toggletag, {0} }, }; + diff --git a/dwm b/dwm index 0c10b7d420f8920b761ae64df496c001550f6330..6f8131769bda18d773d2647ddc9a9dbf004e6e62 100755 GIT binary patch delta 21986 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 S!GHD(UVTO9!}5JK_WuEEy$J;X delta 21757 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
@!3J&xz+H&#XnJfRZo^jW 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 JJ^Rn3{{u4|$g=nmaster = nmaster; + m->showbar = showbar; + m->topbar = topbar; ++ m->gappx = gappx; + m->lt[0] = &layouts[0]; + m->lt[1] = &layouts[1 % LENGTH(layouts)]; + strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol); +@@ -1497,6 +1500,16 @@ setfullscreen(Client *c, int fullscreen) + } + } + ++void ++setgaps(const Arg *arg) ++{ ++ if ((arg->i == 0) || (selmon->gappx + arg->i < 0)) ++ selmon->gappx = 0; ++ else ++ selmon->gappx += arg->i; ++ arrange(selmon); ++} ++ + void + setlayout(const Arg *arg) + { +@@ -1683,16 +1696,16 @@ tile(Monitor *m) + if (n > m->nmaster) + mw = m->nmaster ? m->ww * m->mfact : 0; + else +- mw = m->ww; +- for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) ++ mw = m->ww - m->gappx; ++ for (i = 0, my = ty = m->gappx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) + if (i < m->nmaster) { +- h = (m->wh - my) / (MIN(n, m->nmaster) - i); +- resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0); +- my += HEIGHT(c); ++ h = (m->wh - my) / (MIN(n, m->nmaster) - i) - m->gappx; ++ resize(c, m->wx + m->gappx, m->wy + my, mw - (2*c->bw) - m->gappx, h - (2*c->bw), 0); ++ my += HEIGHT(c) + m->gappx; + } else { +- h = (m->wh - ty) / (n - i); +- resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0); +- ty += HEIGHT(c); ++ h = (m->wh - ty) / (n - i) - m->gappx; ++ resize(c, m->wx + mw + m->gappx, m->wy + ty, m->ww - mw - (2*c->bw) - 2*m->gappx, h - (2*c->bw), 0); ++ ty += HEIGHT(c) + m->gappx; + } + } + +-- +2.20.1 + diff --git a/dwm.c b/dwm.c index 6688340..0a7da2c 100644 --- a/dwm.c +++ b/dwm.c @@ -138,6 +138,7 @@ struct Monitor { int by; /* bar geometry */ int mx, my, mw, mh; /* screen size */ int wx, wy, ww, wh; /* window area */ + int gappx; /* gaps between windows */ unsigned int seltags; unsigned int sellt; unsigned int tagset[2]; @@ -230,6 +231,7 @@ static void sendmon(Client *c, Monitor *m); static void setclientstate(Client *c, long state); static void setfocus(Client *c); static void setfullscreen(Client *c, int fullscreen); +static void setgaps(const Arg *arg); static void setlayout(const Arg *arg); static void setmfact(const Arg *arg); static void setup(void); @@ -724,6 +726,7 @@ createmon(void) m->nmaster = nmaster; m->showbar = showbar; m->topbar = topbar; + m->gappx = gappx; m->lt[0] = &layouts[0]; m->lt[1] = &layouts[1 % LENGTH(layouts)]; strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol); @@ -1679,6 +1682,16 @@ setfullscreen(Client *c, int fullscreen) } } +void +setgaps(const Arg *arg) +{ + if ((arg->i == 0) || (selmon->gappx + arg->i < 0)) + selmon->gappx = 0; + else + selmon->gappx += arg->i; + arrange(selmon); +} + void setlayout(const Arg *arg) { @@ -1874,16 +1887,16 @@ tile(Monitor *m) if (n > m->nmaster) mw = m->nmaster ? m->ww * m->mfact : 0; else - mw = m->ww; - for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) + mw = m->ww - m->gappx; + for (i = 0, my = ty = m->gappx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) if (i < m->nmaster) { - h = (m->wh - my) / (MIN(n, m->nmaster) - i); - resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0); - my += HEIGHT(c); + h = (m->wh - my) / (MIN(n, m->nmaster) - i) - m->gappx; + resize(c, m->wx + m->gappx, m->wy + my, mw - (2*c->bw) - m->gappx, h - (2*c->bw), 0); + my += HEIGHT(c) + m->gappx; } else { - h = (m->wh - ty) / (n - i); - resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0); - ty += HEIGHT(c); + h = (m->wh - ty) / (n - i) - m->gappx; + resize(c, m->wx + mw + m->gappx, m->wy + ty, m->ww - mw - (2*c->bw) - 2*m->gappx, h - (2*c->bw), 0); + ty += HEIGHT(c) + m->gappx; } } diff --git a/dwm.c.orig b/dwm.c.orig index 4d3ffa2..6688340 100644 --- a/dwm.c.orig +++ b/dwm.c.orig @@ -36,6 +36,7 @@ #include #include #include +#include #ifdef XINERAMA #include #endif /* XINERAMA */ @@ -272,7 +273,7 @@ static void zoom(const Arg *arg); /* variables */ static Systray *systray = NULL; static const char broken[] = "broken"; -static char stext[256]; +static char stext[512]; static int screen; static int sw, sh; /* X display screen geometry width, height */ static int bh, blw = 0; /* bar geometry */ diff --git a/dwm.o b/dwm.o index 994f22afa874a9a3d7d2d4d27a5bc81ff9a77a38..448749286e8513bbf865bb0a248cad321e7ee24d 100644 GIT binary patch delta 23467 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 Q-_%eR$}YQeLs`H716Ea^l>h($ delta 23554 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 Bc!K}{ diff --git a/dwm_status b/dwm_status index df7107a..a751e6e 100755 --- a/dwm_status +++ b/dwm_status @@ -17,15 +17,20 @@ now=$3 } print_volume() { -[ "$(pulsemixer --get-mute)" = "1" ] && printf "MUTE" && exit +[ "$(pulsemixer --get-mute)" = "1" ] && printf "" && exit vol=$(pulsemixer --get-volume | awk '{print $1}') -printf "%s%%\\n" "$vol" +printf "%s%%\\n" " $vol" } print_wifi() { - ESSID="`iw dev wlan0 link | grep SSID| sed -r 's/SSID://' | sed -e 's/^[ \t]*//'`" - echo -e "$ESSID" + ESSID="`iw dev wlan0 link | grep SSID| sed -r 's/SSID://' | sed -e 's/^[ \t]*//'`" + if test -z "$ESSID" + then + echo -e "" + else + echo -e " $ESSID" + fi } print_mem(){ @@ -34,7 +39,7 @@ print_mem(){ } print_temp(){ - echo -e "$(sensors | awk '/Core 0/ {print $3}') +$(nvidia-smi -q -d temperature | grep -i "GPU Current" |sed -r 's/GPU Current Temp ://'| sed -r 's/ C//' |sed -e 's/^[ \t]*//').0°C" + echo -e " $(sensors | awk '/Core 0/ {print $3}') +$(nvidia-smi -q -d temperature | grep -i "GPU Current" |sed -r 's/GPU Current Temp ://'| sed -r 's/ C//' |sed -e 's/^[ \t]*//').0°C" } print_bat(){ @@ -45,17 +50,25 @@ print_bat(){ then # suspend when we close the lid #systemctl --user stop inhibit-lid-sleep-on-battery.service - echo -e "B:${charge}%" + if [ "$charge" -ge 75 ]; then + echo -e " ${charge}%" + elif [ "$charge" -ge 50 ]; then + echo -e " ${charge}%" + elif [ "$charge" -ge 25 ]; then + echo -e " ${charge}%" + else + echo -e " !${charge}%" + fi else # On mains! no need to suspend #systemctl --user start inhibit-lid-sleep-on-battery.service - echo -e "B:${charge}%" + echo -e " ${charge}%" fi } print_date(){ - echo -e "$(date +"%m-%e %H:%M")" + echo -e " $(date +"%m-%e %H:%M")" } print_mail(){ @@ -78,7 +91,6 @@ nm-applet --sm-disable& /usr/local/bin/st -e "tmux-my"& "/mnt/mega/Systems/Gentoo/apps/KeePass.AppImage"& megasync& -opera-developer& dunst -config& /usr/bin/ibus-daemon -d& sh /home/yorune/.xsessionrc& @@ -96,7 +108,7 @@ do vel_recv=$(get_velocity $received_bytes $old_received_bytes $now) vel_trans=$(get_velocity $transmitted_bytes $old_transmitted_bytes $now) - xsetroot -name "M:$(print_mail) $(print_temp) $(sh /home/yorune/dwm/weather.sh) $(print_wifi) $(print_bat) V:$(print_volume) $(print_date)" + xsetroot -name "$(print_temp)  $(sh /home/yorune/dwm/weather.sh) $(print_wifi) $(print_bat) $(print_volume) $(print_date)" # Update old values to perform new calculations old_received_bytes=$received_bytes