From b0c17bbe25e022e3de907c7361e9d9883cd78ffd Mon Sep 17 00:00:00 2001 From: Mouad Alami Date: Tue, 12 Sep 2023 15:36:03 +0100 Subject: added alternative tags patch --- README | 2 +- config.h | 3 +++ dwm.c | 35 +++++++++++++++++++++++++++++++++-- 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/README b/README index eca7244..5b4a8c2 100644 --- a/README +++ b/README @@ -49,4 +49,4 @@ and (re)compiling the source code. Patches applied --------------- -zoomswap - scratchpad - sticky - statuscmd - pertag - noborder - movestack - hide vacant tags - actualfullscreen - bar height - alpha monocle layout +zoomswap - scratchpad - sticky - statuscmd - pertag - noborder - movestack - hide vacant tags - actualfullscreen - bar height - alpha monocle layout - alternativetags diff --git a/config.h b/config.h index afe4ba1..08e4a79 100644 --- a/config.h +++ b/config.h @@ -38,6 +38,8 @@ static const char *dec_bright[] = { /* tagging */ static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; +static const char *tagsalt[] = { "", "", "", "", "", "", "", "", "" }; +static const int momentaryalttags = 0; /* 1 means alttags will show only when key is held down*/ static const Rule rules[] = { /* xprop(1): @@ -109,6 +111,7 @@ static const Key keys[] = { { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, { MODKEY, XK_comma, focusmon, {.i = -1 } }, { MODKEY, XK_period, focusmon, {.i = +1 } }, + { MODKEY, XK_n, togglealttag, {0} }, { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, {MODKEY, XK_s, togglesticky, {0}}, diff --git a/dwm.c b/dwm.c index c10f57b..8ab1c33 100644 --- a/dwm.c +++ b/dwm.c @@ -132,6 +132,7 @@ struct Monitor { Window barwin; const Layout *lt[2]; Pertag *pertag; + unsigned int alttag; }; typedef struct { @@ -181,6 +182,7 @@ static void grabbuttons(Client *c, int focused); static void grabkeys(void); static void incnmaster(const Arg *arg); static void keypress(XEvent *e); +static void keyrelease(XEvent *e); static void killclient(const Arg *arg); static void manage(Window w, XWindowAttributes *wa); static void mappingnotify(XEvent *e); @@ -215,6 +217,7 @@ static void spawn(const Arg *arg); static void tag(const Arg *arg); static void tagmon(const Arg *arg); static void tile(Monitor *m); +static void togglealttag(const Arg *arg); static void togglebar(const Arg *arg); static void togglefloating(const Arg *arg); static void togglesticky(const Arg *arg); @@ -266,6 +269,7 @@ static void (*handler[LASTEvent]) (XEvent *) = { [Expose] = expose, [FocusIn] = focusin, [KeyPress] = keypress, + [KeyRelease] = keyrelease, [MappingNotify] = mappingnotify, [MapRequest] = maprequest, [MotionNotify] = motionnotify, @@ -762,7 +766,7 @@ dirtomon(int dir) void drawbar(Monitor *m) { - int x, w, tw = 0; + int x, w, wdelta, tw = 0; int boxs = drw->fonts->h / 9; int boxw = drw->fonts->h / 6 + 2; unsigned int i, occ = 0, urg = 0; @@ -804,8 +808,9 @@ drawbar(Monitor *m) if(!(occ & 1 << i || m->tagset[m->seltags] & 1 << i)) continue; 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); x += w; } w = TEXTW(m->ltsymbol); @@ -1128,6 +1133,25 @@ keypress(XEvent *e) keys[i].func(&(keys[i].arg)); } +void +keyrelease(XEvent *e) +{ + unsigned int i; + KeySym keysym; + XKeyEvent *ev; + + ev = &e->xkey; + keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); + + for (i = 0; i < LENGTH(keys); i++) + if (momentaryalttags + && keys[i].func && keys[i].func == togglealttag + && selmon->alttag + && (keysym == keys[i].keysym + || CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))) + keys[i].func(&(keys[i].arg)); +} + void killclient(const Arg *arg) { @@ -1883,6 +1907,13 @@ tile(Monitor *m) } } +void +togglealttag(const Arg *arg) +{ + selmon->alttag = !selmon->alttag; + drawbar(selmon); +} + void togglebar(const Arg *arg) { -- cgit v1.2.3