changeset: 555:7a2391025a02
tag: tip
user: Andrew Antle <andrew_AT_antlechrist.org>
date: Tue Jun 15 22:04:45 2010 -0400
files: dwm.suckless.org/patches/bottom_stack.md dwm.suckless.org/patches/bstack.c dwm.suckless.org/patches/bstackhoriz.c dwm.suckless.org/patches/dwm-5.8.2-bstack.diff dwm.suckless.org/patches/historical/bottom_stack.md dwm.suckless.org/patches/historical/bstack.c dwm.suckless.org/patches/historical/bstackhoriz.c
description:
Added dwm-5.8.2-bstack.diff. Moved old bstack to historical.
diff -r 91b7ee89f03e -r 7a2391025a02 dwm.suckless.org/patches/bottom_stack.md
--- a/dwm.suckless.org/patches/bottom_stack.md Sun Jun 13 23:06:26 2010 +0200
+++ b/dwm.suckless.org/patches/bottom_stack.md Tue Jun 15 22:04:45 2010 -0400
_AT_@ -5,19 +5,6 @@
-----------
`bstack` and `bstackhoriz` are two bottom stack layouts for dwm.
-Include the sources in your `config.h` (after the definition of `mfact`)
-and update the layouts and key bindings.
-
- #include "bstack.c"
- #include "bstackhoriz.c"
-
- static const Layout layouts[] = {
- /* symbol arrange function */
- ...
- { "TTT", bstack },
- { "===", bstackhoriz },
-
-
Bottom Stack Tiling
-------------------
_AT_@ -43,6 +30,5 @@
Download
--------
-* [bstack.c](bstack.c) (dwm 5.6.1) (20090908)
-* [bstackhoriz.c](bstackhoriz.c) (dwm 5.6.1) (20090908)
+* [dwm-5.8.2-bstack.diff](dwm-5.8.2-bstack.diff)
* see older versions in [historical patches](historical)
diff -r 91b7ee89f03e -r 7a2391025a02 dwm.suckless.org/patches/bstack.c
--- a/dwm.suckless.org/patches/bstack.c Sun Jun 13 23:06:26 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
_AT_@ -1,29 +0,0 @@
-static void
-bstack(Monitor *m) {
- int x, y, h, w, mh;
- unsigned int i, n;
- Client *c;
-
- for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
- if(n == 0)
- return;
- /* master */
- c = nexttiled(m->clients);
- mh = m->mfact * m->wh;
- resize(c, m->wx, m->wy, m->ww - 2 * c->bw, (n == 1 ? m->wh : mh) - 2 * c->bw, False);
- if(--n == 0)
- return;
- /* tile stack */
- x = m->wx;
- y = (m->wy + mh > c->y + c->h) ? c->y + c->h + 2 * c->bw : m->wy + mh;
- w = m->ww / n;
- h = (m->wy + mh > c->y + c->h) ? m->wy + m->wh - y : m->wh - mh;
- if(w < bh)
- w = m->ww;
- for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
- resize(c, x, y, /* remainder */ ((i + 1 == n)
- ? m->wx + m->ww - x - 2 * c->bw : w - 2 * c->bw), h - 2 * c->bw, False);
- if(w != m->ww)
- x = c->x + WIDTH(c);
- }
-}
diff -r 91b7ee89f03e -r 7a2391025a02 dwm.suckless.org/patches/bstackhoriz.c
--- a/dwm.suckless.org/patches/bstackhoriz.c Sun Jun 13 23:06:26 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
_AT_@ -1,30 +0,0 @@
-static void
-bstackhoriz(Monitor *m) {
- int x, y, h, w, mh;
- unsigned int i, n;
- Client *c;
-
- for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
- if(n == 0)
- return;
- /* master */
- c = nexttiled(m->clients);
- mh = m->mfact * m->wh;
- resize(c, m->wx, m->wy, m->ww - 2 * c->bw, (n == 1 ? m->wh : mh) - 2 * c->bw, False);
- if(--n == 0)
- return;
- /* tile stack */
- x = m->wx;
- y = (m->wy + mh > c->y + c->h) ? c->y + c->h + 2 * c->bw : m->wy + mh;
- w = m->ww;
- h = (m->wy + mh > c->y + c->h) ? m->wy + m->wh - y : m->wh - mh;
- h /= 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);
- }
-}
diff -r 91b7ee89f03e -r 7a2391025a02 dwm.suckless.org/patches/dwm-5.8.2-bstack.diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dwm.suckless.org/patches/dwm-5.8.2-bstack.diff Tue Jun 15 22:04:45 2010 -0400
_AT_@ -0,0 +1,82 @@
+diff -NU5 -r dwm-5.8.2/bstack.c dwm-5.8.2-bstack/bstack.c
+--- dwm-5.8.2/bstack.c 1970-01-01 01:00:00.000000000 +0100
++++ dwm-5.8.2-bstack/bstack.c 2010-06-15 17:47:44.000000000 +0200
+_AT_@ -0,0 +1,29 @@
++static void
++bstack(Monitor *m) {
++ int x, y, h, w, mh;
++ unsigned int i, n;
++ Client *c;
++
++ for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
++ if(n == 0)
++ return;
++ /* master */
++ c = nexttiled(m->clients);
++ mh = m->mfact * m->wh;
++ resize(c, m->wx, m->wy, m->ww - 2 * c->bw, (n == 1 ? m->wh : mh) - 2 * c->bw, False);
++ if(--n == 0)
++ return;
++ /* tile stack */
++ x = m->wx;
++ y = (m->wy + mh > c->y + c->h) ? c->y + c->h + 2 * c->bw : m->wy + mh;
++ w = m->ww / n;
++ h = (m->wy + mh > c->y + c->h) ? m->wy + m->wh - y : m->wh - mh;
++ if(w < bh)
++ w = m->ww;
++ for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
++ resize(c, x, y, /* remainder */ ((i + 1 == n)
++ ? m->wx + m->ww - x - 2 * c->bw : w - 2 * c->bw), h - 2 * c->bw, False);
++ if(w != m->ww)
++ x = c->x + WIDTH(c);
++ }
++}
+diff -NU5 -r dwm-5.8.2/bstackhoriz.c dwm-5.8.2-bstack/bstackhoriz.c
+--- dwm-5.8.2/bstackhoriz.c 1970-01-01 01:00:00.000000000 +0100
++++ dwm-5.8.2-bstack/bstackhoriz.c 2010-06-15 17:47:44.000000000 +0200
+_AT_@ -0,0 +1,30 @@
++static void
++bstackhoriz(Monitor *m) {
++ int x, y, h, w, mh;
++ unsigned int i, n;
++ Client *c;
++
++ for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
++ if(n == 0)
++ return;
++ /* master */
++ c = nexttiled(m->clients);
++ mh = m->mfact * m->wh;
++ resize(c, m->wx, m->wy, m->ww - 2 * c->bw, (n == 1 ? m->wh : mh) - 2 * c->bw, False);
++ if(--n == 0)
++ return;
++ /* tile stack */
++ x = m->wx;
++ y = (m->wy + mh > c->y + c->h) ? c->y + c->h + 2 * c->bw : m->wy + mh;
++ w = m->ww;
++ h = (m->wy + mh > c->y + c->h) ? m->wy + m->wh - y : m->wh - mh;
++ h /= 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);
++ }
++}
+diff -NU5 -r dwm-5.8.2/config.def.h dwm-5.8.2-bstack/config.def.h
+--- dwm-5.8.2/config.def.h 2010-06-04 12:39:15.000000000 +0200
++++ dwm-5.8.2-bstack/config.def.h 2010-06-15 17:47:44.000000000 +0200
+_AT_@ -29,1 +29,3 @@
++#include "bstack.c"
++#include "bstackhoriz.c"
+ static const Layout layouts[] = {
+_AT_@ -34,5 +36,7 @@
++ { "TTT", bstack },
++ { "===", bstackhoriz },
+ };
+
+ /* key definitions */
+ #define MODKEY Mod1Mask
+ #define TAGKEYS(KEY,TAG) \
diff -r 91b7ee89f03e -r 7a2391025a02 dwm.suckless.org/patches/historical/bottom_stack.md
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dwm.suckless.org/patches/historical/bottom_stack.md Tue Jun 15 22:04:45 2010 -0400
_AT_@ -0,0 +1,48 @@
+BOTTOM STACK
+============
+
+Description
+-----------
+`bstack` and `bstackhoriz` are two bottom stack layouts for dwm.
+
+Include the sources in your `config.h` (after the definition of `mfact`)
+and update the layouts and key bindings.
+
+ #include "bstack.c"
+ #include "bstackhoriz.c"
+
+ static const Layout layouts[] = {
+ /* symbol arrange function */
+ ...
+ { "TTT", bstack },
+ { "===", bstackhoriz },
+
+
+Bottom Stack Tiling
+-------------------
+
+ bstack (TTT)
+ +-----------------+
+ | |
+ | |
+ | |
+ +-----+-----+-----+
+ | | | |
+ | | | |
+ +-----+-----+-----+
+
+ bstackhoriz (===)
+ +-----------------+
+ | |
+ | |
+ | |
+ +-----------------+
+ +-----------------+
+ +-----------------+
+ +-----------------+
+
+Download
+--------
+* [bstack.c](bstack.c) (dwm 5.6.1) (20090908)
+* [bstackhoriz.c](bstackhoriz.c) (dwm 5.6.1) (20090908)
+* see older versions in [historical patches](historical)
diff -r 91b7ee89f03e -r 7a2391025a02 dwm.suckless.org/patches/historical/bstack.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dwm.suckless.org/patches/historical/bstack.c Tue Jun 15 22:04:45 2010 -0400
_AT_@ -0,0 +1,29 @@
+static void
+bstack(Monitor *m) {
+ int x, y, h, w, mh;
+ unsigned int i, n;
+ Client *c;
+
+ for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
+ if(n == 0)
+ return;
+ /* master */
+ c = nexttiled(m->clients);
+ mh = m->mfact * m->wh;
+ resize(c, m->wx, m->wy, m->ww - 2 * c->bw, (n == 1 ? m->wh : mh) - 2 * c->bw, False);
+ if(--n == 0)
+ return;
+ /* tile stack */
+ x = m->wx;
+ y = (m->wy + mh > c->y + c->h) ? c->y + c->h + 2 * c->bw : m->wy + mh;
+ w = m->ww / n;
+ h = (m->wy + mh > c->y + c->h) ? m->wy + m->wh - y : m->wh - mh;
+ if(w < bh)
+ w = m->ww;
+ for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
+ resize(c, x, y, /* remainder */ ((i + 1 == n)
+ ? m->wx + m->ww - x - 2 * c->bw : w - 2 * c->bw), h - 2 * c->bw, False);
+ if(w != m->ww)
+ x = c->x + WIDTH(c);
+ }
+}
diff -r 91b7ee89f03e -r 7a2391025a02 dwm.suckless.org/patches/historical/bstackhoriz.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dwm.suckless.org/patches/historical/bstackhoriz.c Tue Jun 15 22:04:45 2010 -0400
_AT_@ -0,0 +1,30 @@
+static void
+bstackhoriz(Monitor *m) {
+ int x, y, h, w, mh;
+ unsigned int i, n;
+ Client *c;
+
+ for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
+ if(n == 0)
+ return;
+ /* master */
+ c = nexttiled(m->clients);
+ mh = m->mfact * m->wh;
+ resize(c, m->wx, m->wy, m->ww - 2 * c->bw, (n == 1 ? m->wh : mh) - 2 * c->bw, False);
+ if(--n == 0)
+ return;
+ /* tile stack */
+ x = m->wx;
+ y = (m->wy + mh > c->y + c->h) ? c->y + c->h + 2 * c->bw : m->wy + mh;
+ w = m->ww;
+ h = (m->wy + mh > c->y + c->h) ? m->wy + m->wh - y : m->wh - mh;
+ h /= 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);
+ }
+}
Received on Wed Jun 16 2010 - 04:06:03 CEST