diff options
| -rw-r--r-- | config.h | 11 | ||||
| -rw-r--r-- | dwm.c | 61 |
2 files changed, 53 insertions, 19 deletions
@@ -43,17 +43,17 @@ static const Rule rules[] = { { "steam", "steamwebhelper", "Steam", 0, 0, 0, 0, -1 }, { "steam", NULL, "Steam Settings", 0, 1, 0, 0, -1 }, { "qemu-system-x86_64","qemu-system-x86_64",NULL, 0, 1, 0, 0, -1 }, - { "steam_proton","steam_proton","Unreal Tournament 2004", 0, 1, 0, 0, -1 }, { "Virt-manager",NULL, NULL, 0, 0, 0, 0, -1 }, { "qBittorrent", NULL, NULL, 0, 1, 0, 0, -1 }, { "qBittorrent", "qbittorrent", NULL, 0, 0, 0, 0, -1 }, { "St", "st", NULL, 0, 0, 1, 1, -1 }, + { "stfloat", "st", NULL, 0, 1, 1, 1, -1 }, { "Mpv", NULL, NULL, 0, 1, 0, 0, -1 }, { "Nsxiv", NULL, NULL, 0, 1, 0, 0, -1 }, { "XTerm", "xterm", NULL, 0, 0, 1, 1, -1 }, { "scrcpy", NULL, NULL, 0, 1, 0, 0, -1 }, { "LibreWolf", "Alert", NULL, 0, 1, 0, 0, -1 }, - { "LibreWolf", "Places", "Library", 0, 1, 0, 0, -1 }, + { "LibreWolf", "Places", "Library", 0, 1, 0, 0, -1 }, { NULL, NULL, "Event Tester", 0, 0, 0, 1, -1 }, }; @@ -85,7 +85,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_gray4, "-sf", col_cyan, NULL }; static const char *termcmd[] = { TERMINAL, NULL }; -static const char *sutermcmd[] = { TERMINAL,"-e", "su", NULL }; +static const char *floatterm[] = { TERMINAL, "-c", "stfloat", NULL }; +static const char *sutermcmd[] = { TERMINAL, "-e", "su", NULL }; #include <X11/XF86keysym.h> @@ -123,6 +124,8 @@ static const Key keys[] = { /* Non-default commands i.e. commands added in by me and patches */ { MODKEY|ShiftMask, XK_space, spawn, {.v = sutermcmd } }, + { Mod1Mask, XK_space, spawn, {.v = floatterm } }, + { Mod1Mask|ShiftMask, XK_space, spawn, SHCMD(TERMINAL" -c stfloat -e su")}, { MODKEY|ShiftMask, XK_j, movestack, {.i = +1 } }, { MODKEY|ShiftMask, XK_k, movestack, {.i = -1 } }, { MODKEY, XK_f, togglefullscr, {0} }, @@ -138,7 +141,7 @@ static const Key keys[] = { { Mod1Mask|ControlMask, XK_h, moveresize, {.v = "0x 0y -25w 0h" } }, { MODKEY|ShiftMask, XK_m, spawn, SHCMD(TERMINAL" -e neomutt")}, { MODKEY|ShiftMask, XK_n, spawn, SHCMD(TERMINAL" -e nvim")}, - { MODKEY, XK_Escape, spawn, SHCMD(TERMINAL" -e htop")}, + { Mod1Mask, XK_Escape, spawn, SHCMD(TERMINAL" -c stfloat -e htop")}, { MODKEY, XK_n, spawn, SHCMD(TERMINAL" -e newsboat")}, { MODKEY, XK_e, spawn, SHCMD(TERMINAL" -e lfub")}, { MODKEY, XK_Print, spawn, SHCMD("maimpick") }, @@ -22,6 +22,7 @@ */ #include <errno.h> #include <locale.h> +#include <stdbool.h> #include <signal.h> #include <stdarg.h> #include <stdio.h> @@ -272,6 +273,7 @@ static pid_t winpid(Window w); /* variables */ static const char broken[] = "broken"; static char stext[256]; +static bool showtags; static int screen; static int sw, sh; /* X display screen geometry width, height */ static int bh; /* bar height */ @@ -809,12 +811,10 @@ drawbar(Monitor *m) if (!m->showbar) return; - /* draw status first so it can be overdrawn by tags later */ - if (m == selmon) { /* status is only drawn on selected monitor */ - drw_setscheme(drw, scheme[SchemeStatus]); - tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */ - drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0); - } + drw_setscheme(drw, scheme[SchemeStatus]); + tw = TEXTW(stext) - lrpad + 2; + drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0); + drw_map(drw, m->barwin, 0, 0, m->ww, bh); for (c = m->clients; c; c = c->next) { if (ISVISIBLE(c)) @@ -823,15 +823,31 @@ drawbar(Monitor *m) if (c->isurgent) urg |= c->tags; } - x = 0; + + int tag_width = 0; + for (i = 0; i < LENGTH(tags); i++) { + if (m->tagset[m->seltags] & 1 << i || occ & 1 <<i) { + tag_width += TEXTW(tags[i]); + } + } + int center_x = (m->ww - tag_width) / 2; + + x = center_x; for (i = 0; i < LENGTH(tags); i++) { w = TEXTW(tags[i]); - if (!(m->tagset[m->seltags] & 1 << i || occ & 1 <<i)) continue; /*Only displays tags occupied by a window*/ - drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeTagsSel : SchemeTagsNorm]); - drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i); - x += w; + if (!(m->tagset[m->seltags] & 1 << i || occ & 1 <<i)) continue; + if (showtags || n == 0) { + drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeTagsSel : SchemeTagsNorm]); + drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i); + drw_map(drw, m->barwin, 0, 0, m->ww, bh); + } else { + drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeTagsSel : SchemeTagsNorm]); + drw_text(drw, x, 0, w, bh, lrpad / 2, "", urg & 1 << i); + } + x += w; } + x = 0; if ((w = m->ww - tw - x) > bh) { if (n > 0) { int remainder = w % n; @@ -853,7 +869,12 @@ drawbar(Monitor *m) } remainder--; } - drw_text(drw, x, 0, tabw, bh, (TEXTW(c->name) < tabw ? (tabw - c->incw - TEXTW(c->name) + lrpad) / 2 : lrpad / 2), c->name, 0); + if (!showtags) { + drw_text(drw, x, 0, tabw, bh, (TEXTW(c->name) < tabw ? (tabw - c->incw - TEXTW(c->name) + lrpad) / 2 : lrpad / 2), c->name, 0); + drw_map(drw, m->barwin, 0, 0, m->ww, bh); + } else { + drw_text(drw, x, 0, tabw, bh, (TEXTW(c->name) < tabw ? (tabw - c->incw - TEXTW(c->name) + lrpad) / 2 : lrpad / 2), "", 0); + } x += tabw; } } else { @@ -863,8 +884,8 @@ drawbar(Monitor *m) } m->bt = n; m->btw = w; - drw_map(drw, m->barwin, 0, 0, m->ww, bh); } + void drawbars(void) { @@ -965,7 +986,7 @@ focusmon(const Arg *arg) void focusstackvis(const Arg *arg) { - focusstack(arg->i, 0); + focusstack(arg->i, 0); } void @@ -1016,6 +1037,7 @@ movestack(const Arg *arg) arrange(selmon); } + showtags = false; } void @@ -1023,6 +1045,8 @@ focusstack(int inc, int hid) { Client *c = NULL, *i; + showtags = false; + if ((!selmon->sel && !hid) || (selmon->sel && selmon->sel->isfullscreen && lockfullscreen)) return; if (!selmon->clients) @@ -1522,6 +1546,7 @@ tagtonext(const Arg *arg) if (selmon->sel == NULL) return; + showtags = true; tmp = nexttag(); tag(&(const Arg){.ui = tmp}); view(&(const Arg){.ui = tmp}); @@ -1535,6 +1560,7 @@ tagtoprev(const Arg *arg) if (selmon->sel == NULL) return; + showtags = true; tmp = prevtag(); tag(&(const Arg){.ui = tmp}); view(&(const Arg){.ui = tmp}); @@ -1543,12 +1569,14 @@ tagtoprev(const Arg *arg) void viewnext(const Arg *arg) { + showtags = true; view(&(const Arg){.ui = nexttag()}); } void viewprev(const Arg *arg) { + showtags = true; view(&(const Arg){.ui = prevtag()}); } @@ -1899,7 +1927,6 @@ setfullscreen(Client *c, int fullscreen) c->h = c->oldh; resizeclient(c, c->x, c->y, c->w, c->h); arrange(c->mon); - XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w/2, c->h/2); } } @@ -2090,6 +2117,7 @@ spawn(const Arg *arg) { struct sigaction sa; + showtags = false; if (arg->v == dmenucmd) dmenumon[0] = '0' + selmon->num; if (fork() == 0) { @@ -2191,6 +2219,7 @@ toggletag(const Arg *arg) if (!selmon->sel) return; + showtags = true; newtags = selmon->sel->tags ^ (arg->ui & TAGMASK); if (newtags) { selmon->sel->tags = newtags; @@ -2204,6 +2233,7 @@ toggleview(const Arg *arg) { unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK); + showtags = true; if (newtagset) { selmon->tagset[selmon->seltags] = newtagset; focus(NULL); @@ -2520,6 +2550,7 @@ view(const Arg *arg) { if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags]) return; + showtags = true; selmon->seltags ^= 1; /* toggle sel tagset */ if (arg->ui & TAGMASK) selmon->tagset[selmon->seltags] = arg->ui & TAGMASK; |