@@ -238,6 +238,11 @@ static Window root, barwin; /* configuration, allows nested code to access above variables */ #include "config.h" +static int curtag = 1, prevtag = 1; +static Layout *lts[LENGTH(tags) + 1]; +static double mfacts[LENGTH(tags) + 1]; +static Bool showbars[LENGTH(tags) + 1]; + /* compile-time check if all tags fit into an unsigned int bit array. */ struct NumTags { char limitexceeded[sizeof(unsigned int) * 8 < LENGTH(tags) ? -1 : 1]; }; @@ -1307,7 +1312,7 @@ setlayout(const Arg *arg) { if(!arg || !arg->v || arg->v != lt[sellt]) sellt ^= 1; if(arg && arg->v) - lt[sellt] = (Layout *)arg->v; + lt[sellt] = lts[curtag] = (Layout *)arg->v; if(sel) arrange(); else @@ -1324,7 +1329,7 @@ setmfact(const Arg *arg) { f = arg->f < 1.0 ? arg->f + mfact : arg->f - 1.0; if(f < 0.1 || f > 0.9) return; - mfact = f; + mfact = mfacts[curtag] = f; arrange(); } @@ -1373,12 +1378,27 @@ setup(void) { if(!dc.font.set) XSetFont(dpy, dc.gc, dc.font.xfont->fid); + /* init mfacts */ + for(i=0; i < LENGTH(tags) + 1 ; i++) { + mfacts[i] = mfact; + } + + /* init layouts */ + for(i=0; i < LENGTH(tags) + 1; i++) { + lts[i] = &layouts[0]; + } + + /* init bar */ for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) { w = TEXTW(layouts[i].symbol); blw = MAX(blw, w); } + for(i=0; i < LENGTH(tags) + 1; i++) { + showbars[i] = showbar; + } + wa.override_redirect = 1; wa.background_pixmap = ParentRelative; wa.event_mask = ButtonPressMask|ExposureMask; @@ -1479,7 +1499,7 @@ tile(void) { void togglebar(const Arg *arg) { - showbar = !showbar; + showbar = showbars[curtag] = !showbar; updategeom(); updatebar(); arrange(); @@ -1508,9 +1528,23 @@ toggletag(const Arg *arg) { void toggleview(const Arg *arg) { unsigned int mask = tagset[seltags] ^ (arg->ui & TAGMASK); + unsigned int i; if(mask) { + if(mask == ~0) { + prevtag = curtag; + curtag = 0; + } + if(!(mask & 1 << (curtag - 1))) { + prevtag = curtag; + for (i=0; !(mask & 1 << i); i++); + curtag = i + 1; + } tagset[seltags] = mask; + lt[sellt] = lts[curtag]; + mfact = mfacts[curtag]; + if (showbar != showbars[curtag]) + togglebar(NULL); clearurgent(); arrange(); } @@ -1663,11 +1697,29 @@ updatewmhints(Client *c) { void view(const Arg *arg) { + unsigned int i; + if(arg && (arg->i & TAGMASK) == tagset[seltags]) return; seltags ^= 1; /* toggle sel tagset */ - if(arg && (arg->ui & TAGMASK)) + if(arg && (arg->ui & TAGMASK)) { tagset[seltags] = arg->i & TAGMASK; + prevtag = curtag; + if(arg->ui == ~0) + curtag = 0; + else { + for (i=0; !(arg->ui & 1 << i); i++); + curtag = i + 1; + } + } else { + prevtag= curtag ^ prevtag; + curtag^= prevtag; + prevtag= curtag ^ prevtag; + } + lt[sellt]= lts[curtag]; + mfact = mfacts[curtag]; + if(showbar != showbars[curtag]) + togglebar(NULL); clearurgent(); arrange(); } dwm.c 1f62c83b59ece9c1960c641664c18a987d91a3b4 Christian Neukirchen chneukirchen@gmail.com http://github.com/chneukirchen/dwm-chris2/commit/f83156e8b1d5e886edfdc4f898a79d9d144d5b23 f83156e8b1d5e886edfdc4f898a79d9d144d5b23 2008-08-02T05:23:36-07:00 2008-08-02T05:23:36-07:00 Apply dwm-5.1-pertag.diff d7001346c5a5df5add5dc34220c7d1601f02a08e Christian Neukirchen chneukirchen@gmail.com