about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorarg@mmvi <unknown>2006-09-25 20:38:30 +0200
committerarg@mmvi <unknown>2006-09-25 20:38:30 +0200
commit7d7cde0fd6ceae2f7d759b924afd8df279a4ddde (patch)
tree3e4ff9369e553ce44126d3163928532329dd096e
parent6b25d06d7d159bf89d740847fedc876ab0137b6b (diff)
downloaddwm-7d7cde0fd6ceae2f7d759b924afd8df279a4ddde.tar.gz
applied sanders jukka patch
-rw-r--r--dwm.h2
-rw-r--r--event.c6
-rw-r--r--view.c8
3 files changed, 5 insertions, 11 deletions
diff --git a/dwm.h b/dwm.h
index e749f2c..c30f2b3 100644
--- a/dwm.h
+++ b/dwm.h
@@ -101,7 +101,7 @@ 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 Client *clients, *sel, *stack;		/* global cleint list and stack */
+extern Client *clients, *sel, *stack;		/* global client list and stack */
 extern Cursor cursor[CurLast];
 extern DC dc;					/* global draw context */
 extern Display *dpy;
diff --git a/event.c b/event.c
index 83301bc..df0a5ef 100644
--- a/event.c
+++ b/event.c
@@ -190,11 +190,7 @@ configurerequest(XEvent *e) {
 	XWindowChanges wc;
 
 	if((c = getclient(ev->window))) {
-		if((c == sel) && !c->isfloat && (arrange != dofloat)) {
-			synconfig(c, sx, sy + bh, sw - 2, sh - 2 - bh, ev->border_width);
-			XSync(dpy, False);
-			return;
-		}
+		c->ismax = False;
 		gravitate(c, True);
 		if(ev->value_mask & CWX)
 			c->x = ev->x;
diff --git a/view.c b/view.c
index 44c0b30..e799094 100644
--- a/view.c
+++ b/view.c
@@ -101,9 +101,8 @@ dotile(Arg *arg) {
 	Client *c;
 
 	w = sw - mw;
-	for(n = 0, c = clients; c; c = c->next)
-		if(isvisible(c) && !c->isfloat)
-			n++;
+	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+		n++;
 
 	if(n > 1)
 		h = (sh - bh) / (n - 1);
@@ -116,8 +115,7 @@ dotile(Arg *arg) {
 				resize(c, True, TopLeft);
 				continue;
 			}
-			if(c->ismax)
-				togglemax(c);
+			c->ismax = False;
 			if(n == 1) {
 				c->x = sx;
 				c->y = sy + bh;
eger.Long */
/*
 * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
 * See LICENSE file for license details.
 */

#define TAGS \
const char *tags[] = { "1", "2", "3", "4", "5", NULL };

#define DEFMODE			dotile /* dofloat */
#define FLOATSYMBOL		"~"
#define TILESYMBOL		"#"

#define FONT			"fixed"
#define SELBGCOLOR		"#666699"
#define SELFGCOLOR		"#eeeeee"
#define NORMBGCOLOR		"#333366"
#define NORMFGCOLOR		"#cccccc"
#define STATUSBGCOLOR		"#dddddd"
#define STATUSFGCOLOR		"#222222"

#define MODKEY			Mod1Mask
#define MASTERW			60 /* percent */

#define KEYS \
static Key key[] = { \
	/* modifier			key		function	arguments */ \
	{ MODKEY|ShiftMask,		XK_Return,	spawn,		{ .cmd = "exec xterm" } }, \
	{ MODKEY,			XK_Tab,		focusnext,	{ 0 } }, \
	{ MODKEY|ShiftMask,		XK_Tab,		focusprev,	{ 0 } }, \
	{ MODKEY,			XK_Return,	zoom,		{ 0 } }, \
	{ MODKEY,			XK_m,		togglemax,	{ 0 } }, \
	{ MODKEY|ShiftMask,		XK_1,		tag,		{ .i = 0 } }, \
	{ MODKEY|ShiftMask,		XK_2,		tag,		{ .i = 1 } }, \
	{ MODKEY|ShiftMask,		XK_3,		tag,		{ .i = 2 } }, \
	{ MODKEY|ShiftMask,		XK_4,		tag,		{ .i = 3 } }, \
	{ MODKEY|ShiftMask,		XK_5,		tag,		{ .i = 4 } }, \
	{ MODKEY|ControlMask|ShiftMask,	XK_1,		toggletag,	{ .i = 0 } }, \
	{ MODKEY|ControlMask|ShiftMask,	XK_2,		toggletag,	{ .i = 1 } }, \
	{ MODKEY|ControlMask|ShiftMask,	XK_3,		toggletag,	{ .i = 2 } }, \
	{ MODKEY|ControlMask|ShiftMask,	XK_4,		toggletag,	{ .i = 3 } }, \
	{ MODKEY|ControlMask|ShiftMask,	XK_5,		toggletag,	{ .i = 4 } }, \
	{ MODKEY|ShiftMask,		XK_c,		killclient,	{ 0 } }, \
	{ MODKEY,			XK_space,	togglemode,	{ 0 } }, \
	{ MODKEY,			XK_1,		view,		{ .i = 0 } }, \
	{ MODKEY,			XK_2,		view,		{ .i = 1 } }, \
	{ MODKEY,			XK_3,		view,		{ .i = 2 } }, \
	{ MODKEY,			XK_4,		view,		{ .i = 3 } }, \
	{ MODKEY,			XK_5,		view,		{ .i = 4 } }, \
	{ MODKEY|ControlMask,		XK_1,		toggleview,	{ .i = 0 } }, \
	{ MODKEY|ControlMask,		XK_2,		toggleview,	{ .i = 1 } }, \
	{ MODKEY|ControlMask,		XK_3,		toggleview,	{ .i = 2 } }, \
	{ MODKEY|ControlMask,		XK_4,		toggleview,	{ .i = 3 } }, \
	{ MODKEY|ControlMask,		XK_5,		toggleview,	{ .i = 4 } }, \
	{ MODKEY|ShiftMask,		XK_q,		quit,		{ 0 } }, \
};

/* Query class:instance:title for regex matching info with following command:
 * xprop | awk -F '"' '/^WM_CLASS/ { printf("%s:%s:",$4,$2) }; /^WM_NAME/ { printf("%s\n",$2) }' */
#define RULES \
static Rule rule[] = { \
	/* class:instance:title regex	tags regex	isfloat */ \
	{ "Firefox.*",			"2",		False }, \
	{ "Gimp.*",			NULL,		True}, \
};