t* dwm + patches
URI git clone git://git.codevoid.de/dwm-sdk
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit 36178933ed53857d59046278afb25b7525cafb39
DIR parent ad0da9a571ecbdfa8fe0a397185b314f5654f094
URI Author: Anselm R. Garbe <arg@10kloc.org>
Date: Fri, 29 Sep 2006 17:02:56 +0200
removed the direction flipping
Diffstat:
M config.arg.h | 2 --
M config.default.h | 2 --
M dwm.h | 2 --
M view.c | 78 +++++++------------------------
4 files changed, 18 insertions(+), 66 deletions(-)
---
DIR diff --git a/config.arg.h b/config.arg.h
t@@ -10,7 +10,6 @@ const char *tags[] = { "dev", "work", "net", "fnord", NULL };
#define FLOATSYMBOL "><>"
#define STACKPOS StackRight /* StackLeft */
#define TILESYMBOL "[]="
-#define VERTICALSTACK True /* False == horizontal stack */
#define FONT "-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*"
#define NORMBGCOLOR "#333333"
t@@ -37,7 +36,6 @@ static Key key[] = { \
{ MODKEY, XK_k, focusprev, { 0 } }, \
{ MODKEY, XK_Return, zoom, { 0 } }, \
{ MODKEY, XK_b, togglestackpos, { 0 } }, \
- { MODKEY, XK_d, togglestackdir, { 0 } }, \
{ MODKEY, XK_g, resizecol, { .i = 20 } }, \
{ MODKEY, XK_s, resizecol, { .i = -20 } }, \
{ MODKEY|ShiftMask, XK_1, tag, { .i = 0 } }, \
DIR diff --git a/config.default.h b/config.default.h
t@@ -10,7 +10,6 @@ const char *tags[] = { "1", "2", "3", "4", "5", NULL };
#define FLOATSYMBOL "><>"
#define STACKPOS StackRight /* StackLeft */
#define TILESYMBOL "[]="
-#define VERTICALSTACK True /* False == horizontal stack */
#define FONT "fixed"
#define NORMBGCOLOR "#333366"
t@@ -31,7 +30,6 @@ static Key key[] = { \
{ MODKEY|ShiftMask, XK_Tab, focusprev, { 0 } }, \
{ MODKEY, XK_Return, zoom, { 0 } }, \
{ MODKEY, XK_b, togglestackpos, { 0 } }, \
- { MODKEY, XK_d, togglestackdir, { 0 } }, \
{ MODKEY, XK_g, resizecol, { .i = 20 } }, \
{ MODKEY, XK_s, resizecol, { .i = -20 } }, \
{ MODKEY|ShiftMask, XK_1, tag, { .i = 0 } }, \
DIR diff --git a/dwm.h b/dwm.h
t@@ -108,7 +108,6 @@ extern void (*handler[LASTEvent])(XEvent *); /* event handler */
extern void (*arrange)(Arg *); /* arrange function, indicates mode */
extern Atom wmatom[WMLast], netatom[NetLast];
extern Bool running, issel, *seltag; /* seltag is array of Bool */
-extern Bool isvertical; /* stack direction */
extern Client *clients, *sel, *stack; /* global client list and stack */
extern Cursor cursor[CurLast];
extern DC dc; /* global draw context */
t@@ -172,7 +171,6 @@ extern void focusprev(Arg *arg); /* focuses previous visible client, arg is ign
extern Bool isvisible(Client *c); /* returns True if client is visible */
extern void resizecol(Arg *arg); /* resizes the master dimension with arg's index value */
extern void restack(void); /* restores z layers of all clients */
-extern void togglestackdir(Arg *arg); /* toggles stack direction */
extern void togglestackpos(Arg *arg); /* toggles stack position */
extern void togglemode(Arg *arg); /* toggles global arrange function (dotile/dofloat) */
extern void toggleview(Arg *arg); /* toggles the tag with arg's index (in)visible */
DIR diff --git a/view.c b/view.c
t@@ -65,7 +65,6 @@ togglemax(Client *c)
/* extern */
void (*arrange)(Arg *) = DEFMODE;
-Bool isvertical = VERTICALSTACK;
StackPos stackpos = STACKPOS;
void
t@@ -119,20 +118,11 @@ dotile(Arg *arg) {
stackh = sh - bh;
}
- if(isvertical) {
- tw = stackw;
- if(n > 1)
- th = stackh / (n - 1);
- else
- th = stackh;
- }
- else {
+ tw = stackw;
+ if(n > 1)
+ th = stackh / (n - 1);
+ else
th = stackh;
- if(n > 1)
- tw = stackw / (n - 1);
- else
- tw = stackw;
- }
for(i = 0, c = clients; c; c = c->next) {
if(isvisible(c)) {
t@@ -169,56 +159,32 @@ dotile(Arg *arg) {
break;
}
}
- else if((isvertical && th > bh) || (!isvertical && tw > MINW)) {
+ else if(th > bh) {
/* tile window */
c->w = tw - 2 * BORDERPX;
c->h = th - 2 * BORDERPX;
switch(stackpos) {
case StackLeft:
- if(isvertical) {
- c->x = sx;
- c->y = sy + (i - 1) * th + bh;
- if(i + 1 == n)
- c->h = sh - c->y - 2 * BORDERPX;
- }
- else {
- c->x = sx + (i - 1) * tw;
- c->y = sy + bh;
- if(i + 1 == n)
- c->w = sx + stackw - c->x - 2 * BORDERPX;
- }
+ c->x = sx;
+ c->y = sy + (i - 1) * th + bh;
+ if(i + 1 == n)
+ c->h = sh - c->y - 2 * BORDERPX;
break;
case StackBottom:
- if(isvertical) {
- c->x = sx;
- c->y = sy + master + (i - 1) * th + bh;
- if(i + 1 == n)
- c->h = sh - c->y - 2 * BORDERPX;
- }
- else {
- c->x = sx + (i - 1) * tw;
- c->y = sy + bh + master;
- if(i + 1 == n)
- c->w = sw - c->x - 2 * BORDERPX;
- }
+ c->x = sx;
+ c->y = sy + master + (i - 1) * th + bh;
+ if(i + 1 == n)
+ c->h = sh - c->y - 2 * BORDERPX;
break;
case StackRight:
- if(isvertical) {
- c->x = sx + master;
- c->y = sy + (i - 1) * th + bh;
- if(i + 1 == n)
- c->h = sh - c->y - 2 * BORDERPX;
- }
- else {
- c->x = sx + master + (i - 1) * tw;
- c->y = sy + bh;
- if(i + 1 == n)
- c->w = sw - c->x - 2 * BORDERPX;
- }
+ c->x = sx + master;
+ c->y = sy + (i - 1) * th + bh;
+ if(i + 1 == n)
+ c->h = sh - c->y - 2 * BORDERPX;
break;
}
}
- else { /* fallback if th < bh resp. tw < MINW */
+ else { /* fallback if th < bh */
c->w = stackw - 2 * BORDERPX;
c->h = stackh - 2 * BORDERPX;
switch(stackpos) {
t@@ -360,14 +326,6 @@ toggleview(Arg *arg) {
}
void
-togglestackdir(Arg *arg) {
- if(arrange == dofloat)
- return;
- isvertical = !isvertical;
- arrange(NULL);
-}
-
-void
togglestackpos(Arg *arg) {
if(arrange == dofloat)
return;