applied sanders patch to remove unnecessary commit()

diff --git a/config.mk b/config.mk
index 262fbde..af775ae 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # dwm version
 # dwm version

-VERSION = 1.2
+VERSION = 1.3

 
 # Customize below to fit your system
 
 
 # Customize below to fit your system
 

diff --git a/tag.c b/tag.c
index b7c06de..dcda6dc 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -30,17 +30,6 @@ RULES
 static RReg *rreg = NULL;
 static unsigned int len = 0;
 
 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 *
 /* extern */
 
 Client *


@@ -132,7 +121,7 @@ tag(Arg *arg)
        for(i = 0; i < ntags; i++)
                sel->tags[i] = False;
        sel->tags[arg->i] = True;
        for(i = 0; i < ntags; i++)
                sel->tags[i] = False;
        sel->tags[arg->i] = True;

-       commit();
+       arrange(NULL);

 }
 
 void
 }
 
 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;
        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 (file)
--- a/view.c
+++ b/view.c
@@ -67,7 +67,9 @@ dofloat(Arg *arg)
                else
                        ban(c);
        }
                else
                        ban(c);
        }

-       if((sel = getnext(clients)))
+       if(!sel || !isvisible(sel))
+               sel = getnext(clients);
+       if(sel)

                focus(sel);
        else
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
                focus(sel);
        else
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);


@@ -130,7 +132,9 @@ dotile(Arg *arg)
                else
                        ban(c);
        }
                else
                        ban(c);
        }

-       if((sel = getnext(clients)))
+       if(!sel || !isvisible(sel))
+               sel = getnext(clients);
+       if(sel)

                focus(sel);
        else
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
                focus(sel);
        else
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);