From 2dd5212a795b27422d601df0566ae0d6644bd4c8 Mon Sep 17 00:00:00 2001 From: "Anselm R. Garbe" Date: Mon, 28 Aug 2006 08:02:29 +0200 Subject: applied sanders somepatches.patch --- config.default.h | 2 +- draw.c | 9 +++++---- dwm.1 | 7 ++++++- event.c | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/config.default.h b/config.default.h index f28f5b83..6147c989 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 64b11afc..3938e5e6 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 61663ffd..4e23f1cb 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 3c83aa80..1d2227d2 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); -- cgit v1.2.3