Tovi Jaeschke-Rogers
5 days ago
6 changed files with 588 additions and 24 deletions
Split View
Diff Options
-
+4 -0config.def.h
-
+147 -0config.h
-
+118 -24dwm.c
-
+94 -0patches/dwm-fullgaps-6.4.diff
-
+48 -0patches/dwm-hide_vacant_tags-6.4.diff
-
+177 -0patches/dwm-pertag-20200914-61bb8b2.diff
+ 4
- 0
config.def.h
View File
+ 147
- 0
config.h
View File
| @ -0,0 +1,147 @@ | |||
| /* See LICENSE file for copyright and license details. */ | |||
| /* Needed for XF86keysym bindings */ | |||
| #include <X11/XF86keysym.h> | |||
| /* appearance */ | |||
| static const unsigned int borderpx = 2; /* border pixel of windows */ | |||
| static const unsigned int gappx = 5; /* 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 */ | |||
| static const char *fonts[] = { "JetBrains Mono Nerd Font:size=11" }; | |||
| static const char dmenufont[] = "JetBrains Mono Nerd Font:size=11"; | |||
| static const char col_black[] = "#000000"; | |||
| static const char col_white[] = "#c8c093"; | |||
| static const char col_bg[] = "#1f1f28"; | |||
| static const char col_fg[] = "#c8d3f5"; | |||
| static const char col_border_normal[] = "#2A2A37"; | |||
| static const char col_border_selected[] = "#938AA9"; | |||
| static const char *colors[][3] = { | |||
| /* fg bg border */ | |||
| [SchemeNorm] = { col_white, col_bg, col_border_normal }, | |||
| [SchemeSel] = { col_bg, col_border_selected, col_border_selected }, | |||
| }; | |||
| /* tagging */ | |||
| static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; | |||
| static const Rule rules[] = { | |||
| /* xprop(1): | |||
| * WM_CLASS(STRING) = instance, class | |||
| * WM_NAME(STRING) = title | |||
| */ | |||
| /* class instance title tags mask isfloating monitor */ | |||
| { "Firefox", NULL, NULL, 1 << 8, 0, -1 }, | |||
| }; | |||
| /* layout(s) */ | |||
| static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ | |||
| static const int nmaster = 1; /* number of clients in master area */ | |||
| static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ | |||
| static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */ | |||
| static const Layout layouts[] = { | |||
| /* symbol arrange function */ | |||
| { "[]=", tile }, /* first entry is default */ | |||
| { "><>", NULL }, /* no layout function means floating behavior */ | |||
| { "[M]", monocle }, | |||
| }; | |||
| /* key definitions */ | |||
| #define MODKEY Mod4Mask | |||
| #define TAGKEYS(KEY,TAG) \ | |||
| { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ | |||
| { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ | |||
| { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ | |||
| { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, | |||
| /* 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 char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ | |||
| static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_bg, "-nf", col_white, "-sb", col_border_selected, "-sf", col_black, NULL }; | |||
| static const char *termcmd[] = { "st", NULL }; | |||
| /* Custom commands */ | |||
| static const char *volupcmd[] = { "sh", "-c", "/home/tovi/.local/bin/volup", NULL }; | |||
| static const char *voldowncmd[] = { "sh", "-c", "/home/tovi/.local/bin/voldown", NULL }; | |||
| static const char *spotifytoggle[] = { "sh", "-c", "/home/tovi/.local/bin/spotify-toggle", NULL }; | |||
| static const char *spotifynext[] = { "sh", "-c", "/home/tovi/.local/bin/spotify-next", NULL }; | |||
| static const char *spotifyprev[] = { "sh", "-c", "/home/tovi/.local/bin/spotify-prev", NULL }; | |||
| static const char *screencapture[] = { "sh", "-c", "/home/tovi/.local/bin/screencapture", NULL }; | |||
| static const char *lockcmd[] = { "slock", NULL }; | |||
| static const Key keys[] = { | |||
| /* modifier key function argument */ | |||
| { MODKEY, XK_p, spawn, {.v = dmenucmd } }, | |||
| { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, | |||
| { MODKEY, XK_b, togglebar, {0} }, | |||
| { MODKEY, XK_j, focusstack, {.i = +1 } }, | |||
| { MODKEY, XK_k, focusstack, {.i = -1 } }, | |||
| { MODKEY, XK_i, incnmaster, {.i = +1 } }, | |||
| { MODKEY, XK_d, incnmaster, {.i = -1 } }, | |||
| { MODKEY, XK_h, setmfact, {.f = -0.05} }, | |||
| { MODKEY, XK_l, setmfact, {.f = +0.05} }, | |||
| { MODKEY, XK_Return, zoom, {0} }, | |||
| { MODKEY, XK_Tab, view, {0} }, | |||
| { MODKEY|ShiftMask, XK_c, killclient, {0} }, | |||
| { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, | |||
| { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, | |||
| { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, | |||
| { MODKEY, XK_space, setlayout, {0} }, | |||
| { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, | |||
| { MODKEY, XK_0, view, {.ui = ~0 } }, | |||
| { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, | |||
| { MODKEY, XK_comma, focusmon, {.i = -1 } }, | |||
| { 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) | |||
| TAGKEYS( XK_4, 3) | |||
| TAGKEYS( XK_5, 4) | |||
| TAGKEYS( XK_6, 5) | |||
| TAGKEYS( XK_7, 6) | |||
| TAGKEYS( XK_8, 7) | |||
| TAGKEYS( XK_9, 8) | |||
| { MODKEY|ShiftMask, XK_q, quit, {0} }, | |||
| { MODKEY|ShiftMask, XK_l, spawn, {.v = lockcmd } }, | |||
| /* Custom Keybindings */ | |||
| { MODKEY, XK_q, killclient, {0} }, | |||
| { MODKEY, XK_s, spawn, {.v = screencapture } }, | |||
| { 0, XF86XK_AudioRaiseVolume, spawn, {.v = volupcmd } }, | |||
| { 0, XF86XK_AudioLowerVolume, spawn, {.v = voldowncmd } }, | |||
| { 0, XF86XK_AudioPlay, spawn, {.v = spotifytoggle } }, | |||
| { 0, XF86XK_AudioNext, spawn, {.v = spotifynext } }, | |||
| { 0, XF86XK_AudioPrev, spawn, {.v = spotifyprev } }, | |||
| }; | |||
| /* button definitions */ | |||
| /* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ | |||
| static const Button buttons[] = { | |||
| /* click event mask button function argument */ | |||
| { ClkLtSymbol, 0, Button1, setlayout, {0} }, | |||
| { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, | |||
| { ClkWinTitle, 0, Button2, zoom, {0} }, | |||
| { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, | |||
| { ClkClientWin, MODKEY, Button1, movemouse, {0} }, | |||
| { ClkClientWin, MODKEY, Button2, togglefloating, {0} }, | |||
| { ClkClientWin, MODKEY, Button3, resizemouse, {0} }, | |||
| { ClkTagBar, 0, Button1, view, {0} }, | |||
| { ClkTagBar, 0, Button3, toggleview, {0} }, | |||
| { ClkTagBar, MODKEY, Button1, tag, {0} }, | |||
| { ClkTagBar, MODKEY, Button3, toggletag, {0} }, | |||
| }; | |||
+ 118
- 24
dwm.c
View File
+ 94
- 0
patches/dwm-fullgaps-6.4.diff
View File
| @ -0,0 +1,94 @@ | |||
| diff -up a/config.def.h b/config.def.h | |||
| --- 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 int showbar = 1; /* 0 means no bar */ | |||
| static const int topbar = 1; /* 0 means bottom bar */ | |||
| @@ -85,6 +86,9 @@ static const 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 -up a/dwm.c b/dwm.c | |||
| --- a/dwm.c 2023-04-30 | |||
| +++ b/dwm.c 2023-04-30 | |||
| @@ -119,6 +119,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]; | |||
| @@ -200,6 +201,7 @@ static void sendmon(Client *c, Monitor * | |||
| 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); | |||
| @@ -641,6 +643,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); | |||
| @@ -1508,6 +1511,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) | |||
| { | |||
| if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt]) | |||
| @@ -1697,18 +1710,18 @@ 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++) | |||
| - 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); | |||
| - if (my + HEIGHT(c) < m->wh) | |||
| - my += HEIGHT(c); | |||
| + 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) - m->gappx; | |||
| + resize(c, m->wx + m->gappx, m->wy + my, mw - (2*c->bw) - m->gappx, h - (2*c->bw), 0); | |||
| + if (my + HEIGHT(c) + m->gappx < m->wh) | |||
| + 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); | |||
| - if (ty + HEIGHT(c) < m->wh) | |||
| - 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); | |||
| + if (ty + HEIGHT(c) + m->gappx < m->wh) | |||
| + ty += HEIGHT(c) + m->gappx; | |||
| } | |||
| } | |||
+ 48
- 0
patches/dwm-hide_vacant_tags-6.4.diff
View File
| @ -0,0 +1,48 @@ | |||
| :100644 100644 f1d86b2 0000000 M dwm.c | |||
| diff --git a/dwm.c b/dwm.c | |||
| index f1d86b2..d41cc14 100644 | |||
| --- a/dwm.c | |||
| +++ b/dwm.c | |||
| @@ -433,9 +433,15 @@ buttonpress(XEvent *e) | |||
| } | |||
| if (ev->window == selmon->barwin) { | |||
| i = x = 0; | |||
| - do | |||
| + unsigned int occ = 0; | |||
| + for(c = m->clients; c; c=c->next) | |||
| + occ |= c->tags == TAGMASK ? 0 : c->tags; | |||
| + do { | |||
| + /* Do not reserve space for vacant tags */ | |||
| + if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i)) | |||
| + continue; | |||
| x += TEXTW(tags[i]); | |||
| - while (ev->x >= x && ++i < LENGTH(tags)); | |||
| + } while (ev->x >= x && ++i < LENGTH(tags)); | |||
| if (i < LENGTH(tags)) { | |||
| click = ClkTagBar; | |||
| arg.ui = 1 << i; | |||
| @@ -715,19 +721,18 @@ drawbar(Monitor *m) | |||
| } | |||
| for (c = m->clients; c; c = c->next) { | |||
| - occ |= c->tags; | |||
| + occ |= c->tags == TAGMASK ? 0 : c->tags; | |||
| if (c->isurgent) | |||
| urg |= c->tags; | |||
| } | |||
| x = 0; | |||
| for (i = 0; i < LENGTH(tags); i++) { | |||
| + /* Do not draw vacant tags */ | |||
| + if(!(occ & 1 << i || m->tagset[m->seltags] & 1 << i)) | |||
| + continue; | |||
| w = TEXTW(tags[i]); | |||
| 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); | |||
| - if (occ & 1 << i) | |||
| - drw_rect(drw, x + boxs, boxs, boxw, boxw, | |||
| - m == selmon && selmon->sel && selmon->sel->tags & 1 << i, | |||
| - urg & 1 << i); | |||
| x += w; | |||
| } | |||
| w = TEXTW(m->ltsymbol); | |||
+ 177
- 0
patches/dwm-pertag-20200914-61bb8b2.diff
View File
| @ -0,0 +1,177 @@ | |||
| diff --git a/dwm.c b/dwm.c | |||
| index 664c527..ac8e4ec 100644 | |||
| --- a/dwm.c | |||
| +++ b/dwm.c | |||
| @@ -111,6 +111,7 @@ typedef struct { | |||
| void (*arrange)(Monitor *); | |||
| } Layout; | |||
| +typedef struct Pertag Pertag; | |||
| struct Monitor { | |||
| char ltsymbol[16]; | |||
| float mfact; | |||
| @@ -130,6 +131,7 @@ struct Monitor { | |||
| Monitor *next; | |||
| Window barwin; | |||
| const Layout *lt[2]; | |||
| + Pertag *pertag; | |||
| }; | |||
| typedef struct { | |||
| @@ -272,6 +274,15 @@ static Window root, wmcheckwin; | |||
| /* configuration, allows nested code to access above variables */ | |||
| #include "config.h" | |||
| +struct Pertag { | |||
| + unsigned int curtag, prevtag; /* current and previous tag */ | |||
| + int nmasters[LENGTH(tags) + 1]; /* number of windows in master area */ | |||
| + float mfacts[LENGTH(tags) + 1]; /* mfacts per tag */ | |||
| + unsigned int sellts[LENGTH(tags) + 1]; /* selected layouts */ | |||
| + const Layout *ltidxs[LENGTH(tags) + 1][2]; /* matrix of tags and layouts indexes */ | |||
| + int showbars[LENGTH(tags) + 1]; /* display bar for the current tag */ | |||
| +}; | |||
| + | |||
| /* compile-time check if all tags fit into an unsigned int bit array. */ | |||
| struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; }; | |||
| @@ -632,6 +643,7 @@ Monitor * | |||
| createmon(void) | |||
| { | |||
| Monitor *m; | |||
| + unsigned int i; | |||
| m = ecalloc(1, sizeof(Monitor)); | |||
| m->tagset[0] = m->tagset[1] = 1; | |||
| @@ -642,6 +654,20 @@ createmon(void) | |||
| m->lt[0] = &layouts[0]; | |||
| m->lt[1] = &layouts[1 % LENGTH(layouts)]; | |||
| strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol); | |||
| + m->pertag = ecalloc(1, sizeof(Pertag)); | |||
| + m->pertag->curtag = m->pertag->prevtag = 1; | |||
| + | |||
| + for (i = 0; i <= LENGTH(tags); i++) { | |||
| + m->pertag->nmasters[i] = m->nmaster; | |||
| + m->pertag->mfacts[i] = m->mfact; | |||
| + | |||
| + m->pertag->ltidxs[i][0] = m->lt[0]; | |||
| + m->pertag->ltidxs[i][1] = m->lt[1]; | |||
| + m->pertag->sellts[i] = m->sellt; | |||
| + | |||
| + m->pertag->showbars[i] = m->showbar; | |||
| + } | |||
| + | |||
| return m; | |||
| } | |||
| @@ -967,7 +993,7 @@ grabkeys(void) | |||
| void | |||
| incnmaster(const Arg *arg) | |||
| { | |||
| - selmon->nmaster = MAX(selmon->nmaster + arg->i, 0); | |||
| + selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag] = MAX(selmon->nmaster + arg->i, 0); | |||
| arrange(selmon); | |||
| } | |||
| @@ -1502,9 +1528,9 @@ void | |||
| setlayout(const Arg *arg) | |||
| { | |||
| if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt]) | |||
| - selmon->sellt ^= 1; | |||
| + selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag] ^= 1; | |||
| if (arg && arg->v) | |||
| - selmon->lt[selmon->sellt] = (Layout *)arg->v; | |||
| + selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt] = (Layout *)arg->v; | |||
| strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof selmon->ltsymbol); | |||
| if (selmon->sel) | |||
| arrange(selmon); | |||
| @@ -1523,7 +1549,7 @@ setmfact(const Arg *arg) | |||
| f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0; | |||
| if (f < 0.05 || f > 0.95) | |||
| return; | |||
| - selmon->mfact = f; | |||
| + selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag] = f; | |||
| arrange(selmon); | |||
| } | |||
| @@ -1702,7 +1728,7 @@ tile(Monitor *m) | |||
| void | |||
| togglebar(const Arg *arg) | |||
| { | |||
| - selmon->showbar = !selmon->showbar; | |||
| + selmon->showbar = selmon->pertag->showbars[selmon->pertag->curtag] = !selmon->showbar; | |||
| updatebarpos(selmon); | |||
| XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh); | |||
| arrange(selmon); | |||
| @@ -1741,9 +1767,33 @@ void | |||
| toggleview(const Arg *arg) | |||
| { | |||
| unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK); | |||
| + int i; | |||
| if (newtagset) { | |||
| selmon->tagset[selmon->seltags] = newtagset; | |||
| + | |||
| + if (newtagset == ~0) { | |||
| + selmon->pertag->prevtag = selmon->pertag->curtag; | |||
| + selmon->pertag->curtag = 0; | |||
| + } | |||
| + | |||
| + /* test if the user did not select the same tag */ | |||
| + if (!(newtagset & 1 << (selmon->pertag->curtag - 1))) { | |||
| + selmon->pertag->prevtag = selmon->pertag->curtag; | |||
| + for (i = 0; !(newtagset & 1 << i); i++) ; | |||
| + selmon->pertag->curtag = i + 1; | |||
| + } | |||
| + | |||
| + /* apply settings for this view */ | |||
| + selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag]; | |||
| + selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag]; | |||
| + selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag]; | |||
| + selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt]; | |||
| + selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1]; | |||
| + | |||
| + if (selmon->showbar != selmon->pertag->showbars[selmon->pertag->curtag]) | |||
| + togglebar(NULL); | |||
| + | |||
| focus(NULL); | |||
| arrange(selmon); | |||
| } | |||
| @@ -2038,11 +2088,37 @@ updatewmhints(Client *c) | |||
| void | |||
| view(const Arg *arg) | |||
| { | |||
| + int i; | |||
| + unsigned int tmptag; | |||
| + | |||
| if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags]) | |||
| return; | |||
| selmon->seltags ^= 1; /* toggle sel tagset */ | |||
| - if (arg->ui & TAGMASK) | |||
| + if (arg->ui & TAGMASK) { | |||
| selmon->tagset[selmon->seltags] = arg->ui & TAGMASK; | |||
| + selmon->pertag->prevtag = selmon->pertag->curtag; | |||
| + | |||
| + if (arg->ui == ~0) | |||
| + selmon->pertag->curtag = 0; | |||
| + else { | |||
| + for (i = 0; !(arg->ui & 1 << i); i++) ; | |||
| + selmon->pertag->curtag = i + 1; | |||
| + } | |||
| + } else { | |||
| + tmptag = selmon->pertag->prevtag; | |||
| + selmon->pertag->prevtag = selmon->pertag->curtag; | |||
| + selmon->pertag->curtag = tmptag; | |||
| + } | |||
| + | |||
| + selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag]; | |||
| + selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag]; | |||
| + selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag]; | |||
| + selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt]; | |||
| + selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1]; | |||
| + | |||
| + if (selmon->showbar != selmon->pertag->showbars[selmon->pertag->curtag]) | |||
| + togglebar(NULL); | |||
| + | |||
| focus(NULL); | |||
| arrange(selmon); | |||
| } | |||