[wiki] [sites] wiki updated

From: <hg_AT_suckless.org>
Date: Tue, 1 Jun 2010 13:06:25 +0000 (UTC)

changeset: 533:03d59abb1461
tag: tip
user: joten <joten_AT_freenet.de>
date: Tue Jun 01 15:06:15 2010 +0200
files: dwm.suckless.org/patches/flextile-5.8.1.diff
description:
added the patch file 'flextile-5.8.1' (joten <joten_AT_freenet.de>)


diff -r f2fb4809179c -r 03d59abb1461 dwm.suckless.org/patches/flextile-5.8.1.diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dwm.suckless.org/patches/flextile-5.8.1.diff Tue Jun 01 15:06:15 2010 +0200
_AT_@ -0,0 +1,418 @@
+diff -up ../dwm-5.8.1-0/config.def.h ./config.def.h
+--- ../dwm-5.8.1-0/config.def.h 2010-05-29 13:49:12.000000000 +0200
++++ ./config.def.h 2010-05-31 15:18:43.686311000 +0200
+_AT_@ -25,6 +25,11 @@ static const Rule rules[] = {
+ /* layout(s) */
+ static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
+ static const Bool resizehints = True; /* True means respect size hints in tiled resizals */
++static const int layoutaxis[] = {
++ 1, /* layout axis: 1 = x, 2 = y; negative values mirror the layout, setting the master area to the right / bottom instead of left / top */
++ 2, /* master axis: 1 = x (from left to right), 2 = y (from top to bottom), 3 = z (monocle) */
++ 2, /* stack axis: 1 = x (from left to right), 2 = y (from top to bottom), 3 = z (monocle) */
++};
+
+ static const Layout layouts[] = {
+ /* symbol arrange function */
+_AT_@ -81,6 +86,12 @@ static Key keys[] = {
+ TAGKEYS( XK_8, 7)
+ TAGKEYS( XK_9, 8)
+ { MODKEY|ShiftMask, XK_q, quit, {0} },
++ { MODKEY|ControlMask, XK_t, rotatelayoutaxis, {.i = 0} }, /* 0 = layout axis */
++ { MODKEY|ControlMask, XK_Tab, rotatelayoutaxis, {.i = 1} }, /* 1 = master axis */
++ { MODKEY|ControlMask|ShiftMask, XK_Tab, rotatelayoutaxis, {.i = 2} }, /* 2 = stack axis */
++ { MODKEY|ControlMask, XK_Return, mirrorlayout, {0} },
++ { MODKEY|ControlMask, XK_j, shiftmastersplit, {.i = -1} }, /* reduce the number of tiled clients in the master area */
++ { MODKEY|ControlMask, XK_k, shiftmastersplit, {.i = +1} }, /* increase the number of tiled clients in the master area */
+ };
+
+ /* button definitions */
+diff -up ../dwm-5.8.1-0/dwm.c ./dwm.c
+--- ../dwm-5.8.1-0/dwm.c 2010-05-29 13:49:12.000000000 +0200
++++ ./dwm.c 2010-05-31 16:02:14.553316000 +0200
+_AT_@ -120,26 +120,6 @@ typedef struct {
+ void (*arrange)(Monitor *);
+ } Layout;
+
+-struct Monitor {
+- char ltsymbol[16];
+- float mfact;
+- int num;
+- int by; /* bar geometry */
+- int mx, my, mw, mh; /* screen size */
+- int wx, wy, ww, wh; /* window area */
+- unsigned int seltags;
+- unsigned int sellt;
+- unsigned int tagset[2];
+- Bool showbar;
+- Bool topbar;
+- Client *clients;
+- Client *sel;
+- Client *stack;
+- Monitor *next;
+- Window barwin;
+- const Layout *lt[2];
+-};
+-
+ typedef struct {
+ const char *class;
+ const char *instance;
+_AT_@ -193,6 +173,7 @@ static void killclient(const Arg *arg);
+ static void manage(Window w, XWindowAttributes *wa);
+ static void mappingnotify(XEvent *e);
+ static void maprequest(XEvent *e);
++static void mirrorlayout(const Arg *arg);
+ static void monocle(Monitor *m);
+ static void movemouse(const Arg *arg);
+ static Client *nexttiled(Client *c);
+_AT_@ -202,6 +183,7 @@ static void quit(const Arg *arg);
+ static void resize(Client *c, int x, int y, int w, int h, Bool interact);
+ static void resizemouse(const Arg *arg);
+ static void restack(Monitor *m);
++static void rotatelayoutaxis(const Arg *arg);
+ static void run(void);
+ static void scan(void);
+ static void sendmon(Client *c, Monitor *m);
+_AT_@ -209,6 +191,7 @@ static void setclientstate(Client *c, lo
+ static void setlayout(const Arg *arg);
+ static void setmfact(const Arg *arg);
+ static void setup(void);
++static void shiftmastersplit(const Arg *arg);
+ static void showhide(Client *c);
+ static void sigchld(int unused);
+ static void spawn(const Arg *arg);
+_AT_@ -275,6 +258,34 @@ static Window root;
+
+ /* compile-time check if all tags fit into an unsigned int bit array. */
+ struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
++struct Monitor {
++ char ltsymbol[16];
++ float mfact;
++ double mfacts[LENGTH(tags) + 1];
++ int ltaxis[3];
++ int ltaxes[LENGTH(tags) + 1][3];
++ int num;
++ int curtag;
++ int prevtag;
++ int by; /* bar geometry */
++ int mx, my, mw, mh; /* screen size */
++ int wx, wy, ww, wh; /* window area */
++ unsigned int msplit;
++ unsigned int msplits[LENGTH(tags) + 1];
++ unsigned int seltags;
++ unsigned int sellt;
++ unsigned int tagset[2];
++ Bool showbar;
++ Bool showbars[LENGTH(tags) + 1];
++ Bool topbar;
++ Client *clients;
++ Client *sel;
++ Client *stack;
++ Monitor *next;
++ Window barwin;
++ const Layout *lt[2];
++ const Layout *lts[LENGTH(tags) + 1];
++};
+
+ /* function implementations */
+ void
+_AT_@ -616,6 +627,10 @@ createmon(void) {
+ m->lt[0] = &layouts[0];
+ m->lt[1] = &layouts[1 % LENGTH(layouts)];
+ strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
++ m->ltaxis[0] = layoutaxis[0];
++ m->ltaxis[1] = layoutaxis[1];
++ m->ltaxis[2] = layoutaxis[2];
++ m->msplit = 1;
+ return m;
+ }
+
+_AT_@ -1173,6 +1188,15 @@ maprequest(XEvent *e) {
+ }
+
+ void
++mirrorlayout(const Arg *arg) {
++ if(!selmon->lt[selmon->sellt]->arrange)
++ return;
++ selmon->ltaxis[0] *= -1;
++ selmon->ltaxes[selmon->curtag][0] = selmon->ltaxis[0];
++ arrange(selmon);
++}
++
++void
+ monocle(Monitor *m) {
+ unsigned int n = 0;
+ Client *c;
+_AT_@ -1387,6 +1411,21 @@ restack(Monitor *m) {
+ }
+
+ void
++rotatelayoutaxis(const Arg *arg) {
++ if(!selmon->lt[selmon->sellt]->arrange)
++ return;
++ if(arg->i == 0) {
++ if(selmon->ltaxis[0] > 0)
++ selmon->ltaxis[0] = selmon->ltaxis[0] + 1 > 2 ? 1 : selmon->ltaxis[0] + 1;
++ else
++ selmon->ltaxis[0] = selmon->ltaxis[0] - 1 < -2 ? -1 : selmon->ltaxis[0] - 1;
++ } else
++ selmon->ltaxis[arg->i] = selmon->ltaxis[arg->i] + 1 > 3 ? 1 : selmon->ltaxis[arg->i] + 1;
++ selmon->ltaxes[selmon->curtag][arg->i] = selmon->ltaxis[arg->i];
++ arrange(selmon);
++}
++
++void
+ run(void) {
+ XEvent ev;
+ /* main event loop */
+_AT_@ -1451,7 +1490,7 @@ setlayout(const Arg *arg) {
+ if(!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
+ selmon->sellt ^= 1;
+ if(arg && arg->v)
+- selmon->lt[selmon->sellt] = (Layout *)arg->v;
++ selmon->lt[selmon->sellt] = selmon->lts[selmon->curtag] = (Layout *)arg->v;
+ strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof selmon->ltsymbol);
+ if(selmon->sel)
+ arrange(selmon);
+_AT_@ -1469,14 +1508,16 @@ setmfact(const Arg *arg) {
+ f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
+ if(f < 0.1 || f > 0.9)
+ return;
+- selmon->mfact = f;
++ selmon->mfact = selmon->mfacts[selmon->curtag] = f;
+ arrange(selmon);
+ }
+
+ void
+ setup(void) {
+ XSetWindowAttributes wa;
+-
++ Monitor *m;
++ unsigned int i;
++
+ /* clean up any zombies immediately */
+ sigchld(0);
+
+_AT_@ -1511,7 +1552,19 @@ setup(void) {
+ XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+ if(!dc.font.set)
+ XSetFont(dpy, dc.gc, dc.font.xfont->fid);
+- /* init bars */
++ /* init tags, bars, layouts, axes, msplits and mfacts */
++ for(m = mons; m; m = m->next) {
++ m->curtag = m->prevtag = 1;
++ for(i=0; i < LENGTH(tags) + 1; i++) {
++ m->showbars[i] = m->showbar;
++ m->lts[i] = &layouts[0];
++ m->mfacts[i] = m->mfact;
++ m->ltaxes[i][0] = m->ltaxis[0];
++ m->ltaxes[i][1] = m->ltaxis[1];
++ m->ltaxes[i][2] = m->ltaxis[2];
++ m->msplits[i] = m->msplit;
++ }
++ }
+ updatebars();
+ updatestatus();
+ /* EWMH support per view */
+_AT_@ -1528,6 +1581,19 @@ setup(void) {
+ }
+
+ void
++shiftmastersplit(const Arg *arg) {
++ unsigned int n;
++ Client *c;
++
++ for(n = 0, c = nexttiled(selmon->clients); c; c = nexttiled(c->next), n++);
++ if(!arg || !selmon->lt[selmon->sellt]->arrange || selmon->msplit + arg->i < 1 || selmon->msplit + arg->i > n)
++ return;
++ selmon->msplit += arg->i;
++ selmon->msplits[selmon->curtag] = selmon->msplit;
++ arrange(selmon);
++}
++
++void
+ showhide(Client *c) {
+ if(!c)
+ return;
+_AT_@ -1592,37 +1658,95 @@ textnw(const char *text, unsigned int le
+
+ void
+ tile(Monitor *m) {
+- int x, y, h, w, mw;
+- unsigned int i, n;
++ char sym1 = 61, sym2 = 93, sym3 = 61, sym;
++ int x1 = m->wx, y1 = m->wy, h1 = m->wh, w1 = m->ww, X1 = x1 + w1, Y1 = y1 + h1;
++ int x2 = m->wx, y2 = m->wy, h2 = m->wh, w2 = m->ww, X2 = x2 + w2, Y2 = y2 + h2;
++ unsigned int i, n, n1, n2;
+ Client *c;
+
+ for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
++ if(m->msplit > n)
++ m->msplit = (n == 0) ? 1 : n;
++ if(n == 0 && m->ltaxis[1] != 3)
++ return;
++ /* layout symbol */
++ if(abs(m->ltaxis[0]) == m->ltaxis[1]) /* explicitly: ((abs(m->ltaxis[0]) == 1 && m->ltaxis[1] == 1) || (abs(m->ltaxis[0]) == 2 && m->ltaxis[1] == 2)) */
++ sym1 = 124;
++ if(abs(m->ltaxis[0]) == m->ltaxis[2])
++ sym3 = 124;
++ if(m->ltaxis[1] == 3)
++ sym1 = (n == 0) ? 0 : m->msplit;
++ if(m->ltaxis[2] == 3)
++ sym3 = (n == 0) ? 0 : n - m->msplit;
++ if(m->ltaxis[0] < 0) {
++ sym = sym1;
++ sym1 = sym3;
++ sym2 = 91;
++ sym3 = sym;
++ }
++ if(m->msplit == 1) {
++ if(m->ltaxis[0] > 0)
++ sym1 = 91;
++ else
++ sym3 = 93;
++ }
++ if(m->msplit > 1 && m->ltaxis[1] == 3 && m->ltaxis[2] == 3)
++ snprintf(m->ltsymbol, sizeof m->ltsymbol, "%d%c%d", sym1, sym2, sym3);
++ else if((m->msplit > 1 && m->ltaxis[1] == 3 && m->ltaxis[0] > 0) || (m->ltaxis[2] == 3 && m->ltaxis[0] < 0))
++ snprintf(m->ltsymbol, sizeof m->ltsymbol, "%d%c%c", sym1, sym2, sym3);
++ else if((m->ltaxis[2] == 3 && m->ltaxis[0] > 0) || (m->msplit > 1 && m->ltaxis[1] == 3 && m->ltaxis[0] < 0))
++ snprintf(m->ltsymbol, sizeof m->ltsymbol, "%c%c%d", sym1, sym2, sym3);
++ else
++ snprintf(m->ltsymbol, sizeof m->ltsymbol, "%c%c%c", sym1, sym2, sym3);
+ if(n == 0)
+ return;
++ /* master and stack area */
++ if(abs(m->ltaxis[0]) == 1 && n > m->msplit) {
++ w1 *= m->mfact;
++ w2 -= w1;
++ x1 += (m->ltaxis[0] < 0) ? w2 : 0;
++ x2 += (m->ltaxis[0] < 0) ? 0 : w1;
++ X1 = x1 + w1;
++ X2 = x2 + w2;
++ } else if(abs(m->ltaxis[0]) == 2 && n > m->msplit) {
++ h1 *= m->mfact;
++ h2 -= h1;
++ y1 += (m->ltaxis[0] < 0) ? h2 : 0;
++ y2 += (m->ltaxis[0] < 0) ? 0 : h1;
++ Y1 = y1 + h1;
++ Y2 = y2 + h2;
++ }
+ /* master */
+- c = nexttiled(m->clients);
+- mw = m->mfact * m->ww;
+- resize(c, m->wx, m->wy, (n == 1 ? m->ww : mw) - 2 * c->bw, m->wh - 2 * c->bw, False);
+- if(--n == 0)
+- return;
+- /* tile stack */
+- x = (m->wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : m->wx + mw;
+- y = m->wy;
+- w = (m->wx + mw > c->x + c->w) ? m->wx + m->ww - x : m->ww - mw;
+- h = m->wh / n;
+- if(h < bh)
+- h = m->wh;
+- for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
+- resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
+- ? m->wy + m->wh - y - 2 * c->bw : h - 2 * c->bw), False);
+- if(h != m->wh)
+- y = c->y + HEIGHT(c);
++ n1 = (m->ltaxis[1] != 1 || w1 / m->msplit < bh) ? 1 : m->msplit;
++ n2 = (m->ltaxis[1] != 2 || h1 / m->msplit < bh) ? 1 : m->msplit;
++ for(i = 0, c = nexttiled(m->clients); i < m->msplit; c = nexttiled(c->next), i++) {
++ resize(c, x1, y1,
++ (m->ltaxis[1] == 1 && i + 1 == m->msplit) ? X1 - x1 - 2 * c->bw : w1 / n1 - 2 * c->bw,
++ (m->ltaxis[1] == 2 && i + 1 == m->msplit) ? Y1 - y1 - 2 * c->bw : h1 / n2 - 2 * c->bw, False);
++ if(n1 > 1)
++ x1 = c->x + WIDTH(c);
++ if(n2 > 1)
++ y1 = c->y + HEIGHT(c);
++ }
++ /* stack */
++ if(n > m->msplit) {
++ n1 = (m->ltaxis[2] != 1 || w2 / (n - m->msplit) < bh) ? 1 : n - m->msplit;
++ n2 = (m->ltaxis[2] != 2 || h2 / (n - m->msplit) < bh) ? 1 : n - m->msplit;
++ for(i = 0; c; c = nexttiled(c->next), i++) {
++ resize(c, x2, y2,
++ (m->ltaxis[2] == 1 && i + 1 == n - m->msplit) ? X2 - x2 - 2 * c->bw : w2 / n1 - 2 * c->bw,
++ (m->ltaxis[2] == 2 && i + 1 == n - m->msplit) ? Y2 - y2 - 2 * c->bw : h2 / n2 - 2 * c->bw, False);
++ if(n1 > 1)
++ x2 = c->x + WIDTH(c);
++ if(n2 > 1)
++ y2 = c->y + HEIGHT(c);
++ }
+ }
+ }
+
+ void
+ togglebar(const Arg *arg) {
+- selmon->showbar = !selmon->showbar;
++ selmon->showbar = selmon->showbars[selmon->curtag] = !selmon->showbar;
+ updatebarpos(selmon);
+ XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
+ arrange(selmon);
+_AT_@ -1642,12 +1766,31 @@ togglefloating(const Arg *arg) {
+ void
+ toggletag(const Arg *arg) {
+ unsigned int newtags;
++ unsigned int i;
+
+ if(!selmon->sel)
+ return;
+ newtags = selmon->sel->tags ^ (arg->ui & TAGMASK);
+ if(newtags) {
+ selmon->sel->tags = newtags;
++ if(newtags == ~0) {
++ selmon->prevtag = selmon->curtag;
++ selmon->curtag = 0;
++ }
++ if(!(newtags & 1 << (selmon->curtag - 1))) {
++ selmon->prevtag = selmon->curtag;
++ for (i=0; !(newtags & 1 << i); i++);
++ selmon->curtag = i + 1;
++ }
++ selmon->sel->tags = newtags;
++ selmon->lt[selmon->sellt] = selmon->lts[selmon->curtag];
++ selmon->mfact = selmon->mfacts[selmon->curtag];
++ if (selmon->showbar != selmon->showbars[selmon->curtag])
++ togglebar(NULL);
++ selmon->ltaxis[0] = selmon->ltaxes[selmon->curtag][0];
++ selmon->ltaxis[1] = selmon->ltaxes[selmon->curtag][1];
++ selmon->ltaxis[2] = selmon->ltaxes[selmon->curtag][2];
++ selmon->msplit = selmon->msplits[selmon->curtag];
+ arrange(selmon);
+ }
+ }
+_AT_@ -1914,11 +2057,33 @@ updatewmhints(Client *c) {
+
+ void
+ view(const Arg *arg) {
++ unsigned int i;
++
+ 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->prevtag = selmon->curtag;
++ if(arg->ui == ~0)
++ selmon->curtag = 0;
++ else {
++ for (i=0; !(arg->ui & 1 << i); i++);
++ selmon->curtag = i + 1;
++ }
++ } else {
++ selmon->prevtag = selmon->curtag ^ selmon->prevtag;
++ selmon->curtag ^= selmon->prevtag;
++ selmon->prevtag = selmon->curtag ^ selmon->prevtag;
++ }
++ selmon->lt[selmon->sellt] = selmon->lts[selmon->curtag];
++ selmon->mfact = selmon->mfacts[selmon->curtag];
++ if(selmon->showbar != selmon->showbars[selmon->curtag])
++ togglebar(NULL);
++ selmon->ltaxis[0] = selmon->ltaxes[selmon->curtag][0];
++ selmon->ltaxis[1] = selmon->ltaxes[selmon->curtag][1];
++ selmon->ltaxis[2] = selmon->ltaxes[selmon->curtag][2];
++ selmon->msplit = selmon->msplits[selmon->curtag];
+ arrange(selmon);
+ }
+
Received on Tue Jun 01 2010 - 15:06:25 CEST

This archive was generated by hypermail 2.3.0 : Thu Sep 13 2012 - 19:31:17 CEST