removed getnext/getprev, redundant

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index 609ce9c..a6db1d5 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -1,4 +1,4 @@
-/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>

  * See LICENSE file for license details.
  */
 #include "dwm.h"
  * See LICENSE file for license details.
  */
 #include "dwm.h"


@@ -31,18 +31,6 @@ static unsigned int len = 0;
 
 /* extern */
 
 
 /* extern */
 

-Client *
-getnext(Client *c) {
-       for(; c && !isvisible(c); c = c->next);
-       return c;
-}
-
-Client *
-getprev(Client *c) {
-       for(; c && !isvisible(c); c = c->prev);
-       return c;
-}
-

 void
 initrregs(void) {
        unsigned int i;
 void
 initrregs(void) {
        unsigned int i;


@@ -76,13 +64,13 @@ settags(Client *c, Client *trans) {
        unsigned int i, j;
        regmatch_t tmp;
        Bool matched = trans != NULL;
        unsigned int i, j;
        regmatch_t tmp;
        Bool matched = trans != NULL;

-       XClassHint ch;
+       XClassHint ch = { 0 };

 
 

-       if(matched) {
+       if(matched)

                for(i = 0; i < ntags; i++)
                        c->tags[i] = trans->tags[i];
                for(i = 0; i < ntags; i++)
                        c->tags[i] = trans->tags[i];

-       }
-       else if(XGetClassHint(dpy, c->win, &ch)) {
+       else {
+               XGetClassHint(dpy, c->win, &ch);

                snprintf(prop, sizeof prop, "%s:%s:%s",
                                ch.res_class ? ch.res_class : "",
                                ch.res_name ? ch.res_name : "", c->name);
                snprintf(prop, sizeof prop, "%s:%s:%s",
                                ch.res_class ? ch.res_class : "",
                                ch.res_name ? ch.res_name : "", c->name);


@@ -114,7 +102,8 @@ tag(Arg *arg) {
                return;
        for(i = 0; i < ntags; i++)
                sel->tags[i] = (arg->i == -1) ? True : False;
                return;
        for(i = 0; i < ntags; i++)
                sel->tags[i] = (arg->i == -1) ? True : False;

-       sel->tags[arg->i] = True;
+       if(arg->i >= 0 && arg->i < ntags)
+               sel->tags[arg->i] = True;

        arrange();
 }
 
        arrange();
 }