aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnselm R. Garbe <arg@10kloc.org>2006-08-28 08:02:29 +0200
committerAnselm R. Garbe <arg@10kloc.org>2006-08-28 08:02:29 +0200
commit2dd5212a795b27422d601df0566ae0d6644bd4c8 (patch)
tree6d2bb1e654511bbf9a0ee8a762d93d75eb320e16
parent00e95e1f38f7f63584925182a98fb36e84b0f246 (diff)
applied sanders somepatches.patch
-rw-r--r--config.default.h2
-rw-r--r--draw.c9
-rw-r--r--dwm.17
-rw-r--r--event.c6
4 files changed, 16 insertions, 8 deletions
diff --git a/config.default.h b/config.default.h
index f28f5b8..6147c98 100644
--- a/config.default.h
+++ b/config.default.h
@@ -55,7 +55,7 @@ static Key key[] = { \
};
/* 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) }' */
+ * 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 */ \
diff --git a/draw.c b/draw.c
index 64b11af..3938e5e 100644
--- a/draw.c
+++ b/draw.c
@@ -97,9 +97,7 @@ drawstatus()
int i, x;
dc.x = dc.y = 0;
- dc.w = bw;
- drawtext(NULL, dc.status, False);
for(i = 0; i < ntags; i++) {
dc.w = textw(tags[i]);
if(seltag[i])
@@ -121,9 +119,12 @@ drawstatus()
}
drawtext(stext, dc.status, False);
- if(sel && ((dc.w = dc.x - x) > bh)) {
+ if((dc.w = dc.x - x) > bh) {
dc.x = x;
- drawtext(sel->name, dc.sel, False);
+ if(sel)
+ drawtext(sel->name, dc.sel, False);
+ else
+ drawtext(NULL, dc.norm, False);
}
XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
XSync(dpy, False);
diff --git a/dwm.1 b/dwm.1
index 61663ff..4e23f1c 100644
--- a/dwm.1
+++ b/dwm.1
@@ -40,7 +40,12 @@ is read and displayed in the status text area.
.TP
.B Button1
click on a tag label views all windows with that
-.BR tag .
+.BR tag ,
+click on the mode label toggles between
+.B tiled
+and
+.B floating
+mode.
.TP
.B Button3
click on a tag label adds/removes all windows with that
diff --git a/event.c b/event.c
index 3c83aa8..1d2227d 100644
--- a/event.c
+++ b/event.c
@@ -116,8 +116,10 @@ buttonpress(XEvent *e)
return;
}
}
- if(ev->x < x + bmw)
- togglemode(NULL);
+ if(ev->x < x + bmw) {
+ if(ev->button == Button1)
+ togglemode(NULL);
+ }
}
else if((c = getclient(ev->window))) {
focus(c);