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 bb0647a..ac3d495 100644 (file)
--- a/view.c
+++ b/view.c
@@ -59,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);
                }


@@ -68,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();
 }
 


@@ -82,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)


@@ -93,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);


@@ -133,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();
 }
 


@@ -213,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) {


@@ -280,6 +276,7 @@ viewall(Arg *arg)
 
        for(i = 0; i < ntags; i++)
                seltag[i] = True;
 
        for(i = 0; i < ntags; i++)
                seltag[i] = True;

+       reorder();

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


@@ -288,7 +285,7 @@ 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))
                return;
 
        if(c == getnext(clients))