don't access sel in restack without checking for NULL (multihead crashing bug)

[dwm.git] / view.c

diff --git a/view.c b/view.c
index ac336e3..ac3d495 100644 (file)
--- a/view.c
+++ b/view.c
@@ -3,65 +3,45 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
  * See LICENSE file for license details.
  */
 #include "dwm.h"

+#include <stdio.h>

 
 /* static */
 
 static Client *
 
 /* static */
 
 static Client *

-getslot(Client *c)
+minclient()

 {
 {

-       unsigned int i, tic;
-       Client *p;
-
-       for(tic = 0; tic < ntags && !c->tags[tic]; tic++);
-       for(p = clients; p; p = p->next) {
-               for(i = 0; i < ntags && !p->tags[i]; i++);
-               if(tic < i)
-                       return p;
-       }
-       return p;
+       Client *c, *min;
+
+       for(min = c = clients; c; c = c->next)
+               if(c->weight < min->weight)
+                       min = c;
+       return min;

 }
 
 }
 

-static Client *
-tail()
+
+static void
+reorder()

 {
 {

-       Client *c;
-       for(c = clients; c && c->next; c = c->next);
-       return c;
+       Client *c, *newclients, *tail;
+
+       newclients = tail = NULL;
+       while((c = minclient())) {
+               detach(c);
+               if(tail) {
+                       c->prev = tail;
+                       tail->next = c;
+                       tail = c;
+               }
+               else
+                       tail = newclients = c;
+       }
+       clients = newclients;

 }
 
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
 
 }
 
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
 

-void
-attach(Client *c)
-{
-       Client *p;
-
-       if(!clients) {
-               clients = c;
-               return;
-       }
-       if(!(p = getnext(clients)) && !(p = getslot(c))) {
-               p = tail();
-               c->prev = p;
-               p->next = c;
-               return;
-       }
-
-       if(p == clients) {
-               c->next = clients;
-               clients->prev = c;
-               clients = c;
-       }
-       else {
-               p->prev->next = c;
-               c->prev = p->prev;
-               p->prev = c;
-               c->next = p;
-       }
-}
-

 void
 detach(Client *c)
 {
 void
 detach(Client *c)
 {


@@ -79,8 +59,9 @@ dofloat(Arg *arg)
 {
        Client *c;
 
 {
        Client *c;
 

+       maximized = False;
+

        for(c = clients; c; c = c->next) {
        for(c = clients; c; c = c->next) {

-               c->ismax = False;

                if(isvisible(c)) {
                        resize(c, True, TopLeft);
                }
                if(isvisible(c)) {
                        resize(c, True, TopLeft);
                }


@@ -88,11 +69,7 @@ dofloat(Arg *arg)
                        ban(c);
        }
        if(!sel || !isvisible(sel))
                        ban(c);
        }
        if(!sel || !isvisible(sel))

-               sel = getnext(clients);
-       if(sel)
-               focus(sel);
-       else
-               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+               focus(getnext(clients));

        restack();
 }
 
        restack();
 }
 


@@ -102,6 +79,8 @@ dotile(Arg *arg)
        int h, i, n, w;
        Client *c;
 
        int h, i, n, w;
        Client *c;
 

+       maximized = False;
+

        w = sw - mw;
        for(n = 0, c = clients; c; c = c->next)
                if(isvisible(c) && !c->isfloat)
        w = sw - mw;
        for(n = 0, c = clients; c; c = c->next)
                if(isvisible(c) && !c->isfloat)


@@ -113,7 +92,6 @@ dotile(Arg *arg)
                h = sh - bh;
 
        for(i = 0, c = clients; c; c = c->next) {
                h = sh - bh;
 
        for(i = 0, c = clients; c; c = c->next) {

-               c->ismax = False;

                if(isvisible(c)) {
                        if(c->isfloat) {
                                resize(c, True, TopLeft);
                if(isvisible(c)) {
                        if(c->isfloat) {
                                resize(c, True, TopLeft);


@@ -153,11 +131,7 @@ dotile(Arg *arg)
                        ban(c);
        }
        if(!sel || !isvisible(sel))
                        ban(c);
        }
        if(!sel || !isvisible(sel))

-               sel = getnext(clients);
-       if(sel)
-               focus(sel);
-       else
-               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+               focus(getnext(clients));

        restack();
 }
 
        restack();
 }
 


@@ -233,13 +207,15 @@ restack()
 
        fi = 0;
        mi = 2 * f;
 
        fi = 0;
        mi = 2 * f;

-       if(sel->isfloat || arrange == dofloat) {
-               wins[fi++] = sel->twin;
-               wins[fi++] = sel->win;
-       }
-       else {
-               wins[mi++] = sel->twin;
-               wins[mi++] = sel->win;
+       if(sel) {
+               if(sel->isfloat || arrange == dofloat) {
+                       wins[fi++] = sel->twin;
+                       wins[fi++] = sel->win;
+               }
+               else {
+                       wins[mi++] = sel->twin;
+                       wins[mi++] = sel->win;
+               }

        }
        for(c = clients; c; c = c->next)
                if(isvisible(c) && c != sel) {
        }
        for(c = clients; c; c = c->next)
                if(isvisible(c) && c != sel) {


@@ -277,6 +253,7 @@ toggleview(Arg *arg)
        for(i = 0; i < ntags && !seltag[i]; i++);
        if(i == ntags)
                seltag[arg->i] = True; /* cannot toggle last view */
        for(i = 0; i < ntags && !seltag[i]; i++);
        if(i == ntags)
                seltag[arg->i] = True; /* cannot toggle last view */

+       reorder();

        arrange(NULL);
 }
 
        arrange(NULL);
 }
 


@@ -288,6 +265,18 @@ view(Arg *arg)
        for(i = 0; i < ntags; i++)
                seltag[i] = False;
        seltag[arg->i] = True;
        for(i = 0; i < ntags; i++)
                seltag[i] = False;
        seltag[arg->i] = True;

+       reorder();
+       arrange(NULL);
+}
+
+void
+viewall(Arg *arg)
+{
+       unsigned int i;
+
+       for(i = 0; i < ntags; i++)
+               seltag[i] = True;
+       reorder();

        arrange(NULL);
 }
 
        arrange(NULL);
 }
 


@@ -296,14 +285,16 @@ zoom(Arg *arg)
 {
        Client *c = sel;
 
 {
        Client *c = sel;
 

-       if(!c || (arrange != dotile) || c->isfloat || c->ismax)
+       if(!c || (arrange != dotile) || c->isfloat || maximized)

                return;
 
        if(c == getnext(clients))
                if(!(c = getnext(c->next)))
                        return;
        detach(c);
                return;
 
        if(c == getnext(clients))
                if(!(c = getnext(c->next)))
                        return;
        detach(c);

-       attach(c);
+       c->next = clients;
+       clients->prev = c;
+       clients = c;

        focus(c);
        arrange(NULL);
 }
        focus(c);
        arrange(NULL);
 }