sites

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs

commit a2392cece4a572babf9e3e6898cf4db0adb45ee7
parent 41bb857b4437e2de4ff119eafc694e6abe9e4d21
Author: Pascal Wittmann <mail@pascal-wittmann.de>
Date:   Fri,  4 Mar 2011 12:22:49 +0100

bugfix for flextile
Diffstat:
Mdwm.suckless.org/patches/flextile-5.8.2.diff | 49+++++++++++++++++++++++++++----------------------
Mdwm.suckless.org/patches/flextile.md | 2+-
2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/dwm.suckless.org/patches/flextile-5.8.2.diff b/dwm.suckless.org/patches/flextile-5.8.2.diff @@ -66,7 +66,15 @@ diff -up ../dwm-5.8.2-0/dwm.c ./dwm.c typedef struct { const char *class; const char *instance; -@@ -621,6 +601,10 @@ createmon(void) { +@@ -610,6 +590,7 @@ configurerequest(XEvent *e) { + + Monitor * + createmon(void) { ++ unsigned int i; + Monitor *m; + + if(!(m = (Monitor *)calloc(1, sizeof(Monitor)))) +@@ -621,6 +602,21 @@ createmon(void) { m->lt[0] = &layouts[0]; m->lt[1] = &layouts[1 % LENGTH(layouts)]; strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol); @@ -74,10 +82,21 @@ diff -up ../dwm-5.8.2-0/dwm.c ./dwm.c + m->ltaxis[1] = layoutaxis[1]; + m->ltaxis[2] = layoutaxis[2]; + m->msplit = 1; ++ /* init tags, bars, layouts, axes, msplits and mfacts */ ++ 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; ++ } return m; } -@@ -1494,7 +1478,7 @@ setlayout(const Arg *arg) { +@@ -1494,7 +1490,7 @@ setlayout(const Arg *arg) { if(!arg || !arg->v || arg->v != selmon->lt[selmon->sellt]) selmon->sellt ^= 1; if(arg && arg->v) @@ -86,7 +105,7 @@ diff -up ../dwm-5.8.2-0/dwm.c ./dwm.c strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof selmon->ltsymbol); if(selmon->sel) arrange(selmon); -@@ -1512,14 +1496,16 @@ setmfact(const Arg *arg) { +@@ -1512,14 +1508,14 @@ 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; @@ -99,34 +118,19 @@ diff -up ../dwm-5.8.2-0/dwm.c ./dwm.c setup(void) { XSetWindowAttributes wa; - -+ Monitor *m; -+ unsigned int i; + /* clean up any zombies immediately */ sigchld(0); -@@ -1555,7 +1541,19 @@ setup(void) { +@@ -1555,7 +1551,6 @@ 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 */ -@@ -1635,38 +1633,8 @@ textnw(const char *text, unsigned int le +@@ -1635,38 +1631,8 @@ textnw(const char *text, unsigned int le } void @@ -166,7 +170,7 @@ diff -up ../dwm-5.8.2-0/dwm.c ./dwm.c updatebarpos(selmon); XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh); arrange(selmon); -@@ -1686,12 +1654,31 @@ togglefloating(const Arg *arg) { +@@ -1686,12 +1652,31 @@ togglefloating(const Arg *arg) { void toggletag(const Arg *arg) { unsigned int newtags; @@ -198,7 +202,7 @@ diff -up ../dwm-5.8.2-0/dwm.c ./dwm.c arrange(selmon); } } -@@ -1959,11 +1946,33 @@ updatewmhints(Client *c) { +@@ -1959,11 +1944,33 @@ updatewmhints(Client *c) { void view(const Arg *arg) { @@ -233,6 +237,7 @@ diff -up ../dwm-5.8.2-0/dwm.c ./dwm.c arrange(selmon); } + diff -up ../dwm-5.8.2-0/flextile.h ./flextile.h --- ../dwm-5.8.2-0/flextile.h 2010-06-10 23:08:24.000000000 +0200 +++ ./flextile.h 2010-06-10 22:59:20.632706000 +0200 diff --git a/dwm.suckless.org/patches/flextile.md b/dwm.suckless.org/patches/flextile.md @@ -58,7 +58,7 @@ The original `tile` layout is only available by setting the above parameters, bu ## Download ## * [flextile-5.8.1.diff][1] (14k) (20100531, joten (at) freenet (dot) de) - * [flextile-5.8.2.diff][2] (13k, +169 SLOC) (20100611, joten (at) freenet (dot) de) + * [flextile-5.8.2.diff][2] (13k, +164 SLOC) (20100611, joten (at) freenet (dot) de) updated by Pascal Wittmann `<mail at pascal-wittmann dot de>` [1]: http://dwm.suckless.org/patches/flextile-5.8.1.diff