summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnselm R. Garbe <arg@10kloc.org>2006-08-31 08:48:04 +0200
committerAnselm R. Garbe <arg@10kloc.org>2006-08-31 08:48:04 +0200
commit4c368bcd24172166aab32948fc63feaa6a1bec93 (patch)
treedddc175fd0f072d6b7ea09a9b91cbcdf8f9f64d6
parent9927b9e64253643f409bd1ef22349cf4e9ca7727 (diff)
applied sanders patch to remove unnecessary commit()
-rw-r--r--config.mk2
-rw-r--r--tag.c15
-rw-r--r--view.c8
3 files changed, 9 insertions, 16 deletions
diff --git a/config.mk b/config.mk
index 262fbde..af775ae 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
# dwm version
-VERSION = 1.2
+VERSION = 1.3
# Customize below to fit your system
diff --git a/tag.c b/tag.c
index b7c06de..dcda6dc 100644
--- a/tag.c
+++ b/tag.c
@@ -30,17 +30,6 @@ RULES
static RReg *rreg = NULL;
static unsigned int len = 0;
-static void
-commit()
-{
- /* asserts sel != NULL */
- settitle(sel);
- if(!isvisible(sel))
- arrange(NULL);
- else
- drawstatus();
-}
-
/* extern */
Client *
@@ -132,7 +121,7 @@ tag(Arg *arg)
for(i = 0; i < ntags; i++)
sel->tags[i] = False;
sel->tags[arg->i] = True;
- commit();
+ arrange(NULL);
}
void
@@ -147,5 +136,5 @@ toggletag(Arg *arg)
for(i = 0; i < ntags && !sel->tags[i]; i++);
if(i == ntags)
sel->tags[arg->i] = True;
- commit();
+ arrange(NULL);
}
diff --git a/view.c b/view.c
index 424ee5a..aa0a23a 100644
--- a/view.c
+++ b/view.c
@@ -67,7 +67,9 @@ dofloat(Arg *arg)
else
ban(c);
}
- if((sel = getnext(clients)))
+ if(!sel || !isvisible(sel))
+ sel = getnext(clients);
+ if(sel)
focus(sel);
else
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
@@ -130,7 +132,9 @@ dotile(Arg *arg)
else
ban(c);
}
- if((sel = getnext(clients)))
+ if(!sel || !isvisible(sel))
+ sel = getnext(clients);
+ if(sel)
focus(sel);
else
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);