From 931e712eac3dad86e9447944ac70f7b238f8a58d Mon Sep 17 00:00:00 2001
From: "arg@mig29" <unknown>
Date: Tue, 21 Nov 2006 14:49:13 +0100
Subject: [PATCH] applied Gottox patches
---
config.mk | 2 +-
draw.c | 7 ++-----
main.c | 5 +++--
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/config.mk b/config.mk
index 63ffb69..dd70d38 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
# dwm version
-VERSION = 2.2
+VERSION = 2.3
# Customize below to fit your system
diff --git a/draw.c b/draw.c
index 178f1d2..c2c47dc 100644
--- a/draw.c
+++ b/draw.c
@@ -99,7 +99,7 @@ drawstatus(void) {
drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.status, False);
x = dc.x + dc.w;
dc.w = textw(stext);
- dc.x = bx + bw - dc.w;
+ dc.x = bw - dc.w;
if(dc.x < x) {
dc.x = x;
dc.w = bw - x;
@@ -107,10 +107,7 @@ drawstatus(void) {
drawtext(stext, dc.status, False);
if((dc.w = dc.x - x) > bh) {
dc.x = x;
- if(sel)
- drawtext(sel->name, dc.sel, False);
- else
- drawtext(NULL, dc.norm, False);
+ drawtext(sel ? sel->name : NULL, dc.sel, False);
}
XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
XSync(dpy, False);
diff --git a/main.c b/main.c
index 0f22c44..f114bae 100644
--- a/main.c
+++ b/main.c
@@ -130,7 +130,8 @@ setup(void) {
sh = DisplayHeight(dpy, screen);
master = MASTER;
/* bar */
- bx = by = 0;
+ bx = sx;
+ by = sy;
bw = sw;
dc.h = bh = dc.font.height + 2;
wa.override_redirect = 1;
@@ -144,7 +145,7 @@ setup(void) {
strcpy(stext, "dwm-"VERSION);
/* windowarea */
wax = sx;
- way = bh;
+ way = sy + bh;
wah = sh - bh;
waw = sw;
/* pixmap for everything */
--
2.20.1