sites

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

commit a9e29da10092cd30f4e984de038a72fc8560e486
parent 2d9c66f7b2b4a3c48c0c0b468463f90ac7ba2c69
Author: Jan Christoph Ebersbach <jceb@e-jc.de>
Date:   Sun, 25 Mar 2012 11:47:00 +0200

update tagset and systray patches
Diffstat:
Mdwm.suckless.org/patches/dwm-6.0-single_tagset.diff | 11++++++++++-
Mdwm.suckless.org/patches/dwm-6.0-single_tagset_all.diff | 33+++++++++++++++++++++------------
Mdwm.suckless.org/patches/dwm-6.0-systray.diff | 12++----------
Mdwm.suckless.org/patches/single_tagset.md | 4++--
Mdwm.suckless.org/patches/systray.md | 2+-
5 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/dwm.suckless.org/patches/dwm-6.0-single_tagset.diff b/dwm.suckless.org/patches/dwm-6.0-single_tagset.diff @@ -17,7 +17,7 @@ Please be aware that this patch probably breaks any other patch! diff -r ad90e7fab364 dwm.c --- a/dwm.c Fri Feb 10 00:36:08 2012 +0000 -+++ b/dwm.c Sat Mar 24 13:41:03 2012 +0100 ++++ b/dwm.c Sun Mar 25 11:43:05 2012 +0200 @@ -45,7 +45,7 @@ #define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask)) #define INTERSECT(x,y,w,h,m) (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \ @@ -82,6 +82,15 @@ diff -r ad90e7fab364 dwm.c /* configuration, allows nested code to access above variables */ #include "config.h" +@@ -313,7 +320,7 @@ + { + c->isfloating = r->isfloating; + c->tags |= r->tags; +- for(m = mons; m && m->num != r->monitor; m = m->next); ++ for(m = mons; m && (m->tagset[m->seltags] & c->tags) == 0; m = m->next) ; + if(m) + c->mon = m; + } @@ -394,9 +401,9 @@ void arrange(Monitor *m) { diff --git a/dwm.suckless.org/patches/dwm-6.0-single_tagset_all.diff b/dwm.suckless.org/patches/dwm-6.0-single_tagset_all.diff @@ -15,9 +15,9 @@ Several deep changes needed to be made: Please be aware that this patch probably breaks any other patch! -diff -r 454a5dd61441 dwm.c ---- a/dwm.c Sun Mar 18 20:45:06 2012 +0100 -+++ b/dwm.c Sun Mar 18 21:10:25 2012 +0100 +diff -r 5144eaeed048 dwm.c +--- a/dwm.c Sat Mar 24 18:07:28 2012 +0100 ++++ b/dwm.c Sun Mar 25 11:08:22 2012 +0200 @@ -45,7 +45,7 @@ #define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask)) #define INTERSECT(x,y,w,h,m) (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \ @@ -83,6 +83,15 @@ diff -r 454a5dd61441 dwm.c /* configuration, allows nested code to access above variables */ #include "config.h" +@@ -329,7 +336,7 @@ + { + c->isfloating = r->isfloating; + c->tags |= r->tags; +- for(m = mons; m && m->num != r->monitor; m = m->next); ++ for(m = mons; m && (m->tagset[m->seltags] & c->tags) == 0; m = m->next) ; + if(m) + c->mon = m; + } @@ -410,9 +417,9 @@ void arrange(Monitor *m) { @@ -538,18 +547,18 @@ diff -r 454a5dd61441 dwm.c pop(c); /* swap windows instead of pushing the previous one down */ if(at && at != c) { -diff -r 454a5dd61441 focusmaster.c ---- a/focusmaster.c Sun Mar 18 20:45:06 2012 +0100 -+++ b/focusmaster.c Sun Mar 18 21:10:25 2012 +0100 +diff -r 5144eaeed048 focusmaster.c +--- a/focusmaster.c Sat Mar 24 18:07:28 2012 +0100 ++++ b/focusmaster.c Sun Mar 25 11:08:22 2012 +0200 @@ -1,4 +1,4 @@ static void focusmaster(const Arg *arg) { - focus(selmon->clients); + focus(selmon->cl->clients); } -diff -r 454a5dd61441 push.c ---- a/push.c Sun Mar 18 20:45:06 2012 +0100 -+++ b/push.c Sun Mar 18 21:10:25 2012 +0100 +diff -r 5144eaeed048 push.c +--- a/push.c Sat Mar 24 18:07:28 2012 +0100 ++++ b/push.c Sun Mar 25 11:08:22 2012 +0200 @@ -2,8 +2,8 @@ prevtiled(Client *c) { Client *p, *r; @@ -584,9 +593,9 @@ diff -r 454a5dd61441 push.c /* attach after c */ detach(sel); sel->next = c->next; -diff -r 454a5dd61441 tagall.c ---- a/tagall.c Sun Mar 18 20:45:06 2012 +0100 -+++ b/tagall.c Sun Mar 18 21:10:25 2012 +0100 +diff -r 5144eaeed048 tagall.c +--- a/tagall.c Sat Mar 24 18:07:28 2012 +0100 ++++ b/tagall.c Sun Mar 25 11:08:22 2012 +0200 @@ -1,6 +1,6 @@ void tagall(const Arg *arg) { diff --git a/dwm.suckless.org/patches/dwm-6.0-systray.diff b/dwm.suckless.org/patches/dwm-6.0-systray.diff @@ -4,7 +4,7 @@ Implements a system tray for dwm. diff -r ad90e7fab364 config.def.h --- a/config.def.h Fri Feb 10 00:36:08 2012 +0000 -+++ b/config.def.h Sat Mar 24 18:01:59 2012 +0100 ++++ b/config.def.h Sun Mar 25 11:43:07 2012 +0200 @@ -10,6 +10,8 @@ static const char selfgcolor[] = "#eeeeee"; static const unsigned int borderpx = 1; /* border pixel of windows */ @@ -14,17 +14,9 @@ diff -r ad90e7fab364 config.def.h static const Bool showbar = True; /* False means no bar */ static const Bool topbar = True; /* False means bottom bar */ -@@ -31,6 +33,7 @@ - static const int nmaster = 1; /* number of clients in master area */ - static const Bool resizehints = True; /* True means respect size hints in tiled resizals */ - -+ - static const Layout layouts[] = { - /* symbol arrange function */ - { "[]=", tile }, /* first entry is default */ diff -r ad90e7fab364 dwm.c --- a/dwm.c Fri Feb 10 00:36:08 2012 +0000 -+++ b/dwm.c Sat Mar 24 18:01:59 2012 +0100 ++++ b/dwm.c Sun Mar 25 11:43:07 2012 +0200 @@ -55,12 +55,15 @@ #define TAGMASK ((1 << LENGTH(tags)) - 1) #define TEXTW(X) (textnw(X, strlen(X)) + dc.font.height) diff --git a/dwm.suckless.org/patches/single_tagset.md b/dwm.suckless.org/patches/single_tagset.md @@ -19,7 +19,7 @@ Several deep changes needed to be made: Please be aware that this patch probably breaks any other patch! - * [dwm-6.0-single_tagset.diff](dwm-6.0-single_tagset.diff) (14K) (20120319) + * [dwm-6.0-single_tagset.diff](dwm-6.0-single_tagset.diff) (14K) (20120325) Special Version --------------- @@ -37,7 +37,7 @@ This is a special version of the patch that was created with following patches b * [tagall](tagall) * [zoomswap](zoomswap) -[dwm-6.0-single_tagset_all.diff](dwm-6.0-single_tagset_all.diff) (18K) (20120319) +[dwm-6.0-single_tagset_all.diff](dwm-6.0-single_tagset_all.diff) (18K) (20120325) Authors ------- diff --git a/dwm.suckless.org/patches/systray.md b/dwm.suckless.org/patches/systray.md @@ -8,7 +8,7 @@ is following the selected monitor. Download -------- -* [dwm-6.0-systray.diff](dwm-6.0-systray.diff) (14K) (20120324) +* [dwm-6.0-systray.diff](dwm-6.0-systray.diff) (14K) (20120325) Author ------