summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorarg@suckless.org <unknown>2008-06-04 11:49:46 +0200
committerarg@suckless.org <unknown>2008-06-04 11:49:46 +0200
commit32f36ab2d58b7bcbadc0b1c9c88654cdf906c71d (patch)
tree85633b832ef76e2f5e6c2772590070b762f7c7d0
parent08bcf721b436018306bdbb9fbaca87f941ee6441 (diff)
applied nsz's patches (many thanks!)
-rw-r--r--dwm.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/dwm.c b/dwm.c
index ada272c..05fbf58 100644
--- a/dwm.c
+++ b/dwm.c
@@ -551,8 +551,7 @@ drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]) {
void
drawtext(const char *text, ulong col[ColLast], Bool invert) {
- int i, x, y, h;
- uint len, olen;
+ int i, x, y, h, len, olen;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
char buf[256];
@@ -612,7 +611,7 @@ expose(XEvent *e) {
void
focus(Client *c) {
- if(!c || (c && c->isbanned))
+ if(!c || c->isbanned)
for(c = stack; c && c->isbanned; c = c->snext);
if(sel && sel != c) {
grabbuttons(sel, False);
@@ -622,14 +621,12 @@ focus(Client *c) {
detachstack(c);
attachstack(c);
grabbuttons(c, True);
- }
- sel = c;
- if(c) {
XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
}
else
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+ sel = c;
drawbar();
}
@@ -1565,8 +1562,8 @@ updatebar(void) {
void
updategeom(void) {
- int i;
#ifdef XINERAMA
+ int i;
XineramaScreenInfo *info = NULL;
/* window area geometry */