removed useless inclusion

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 9ee4c78..80d483a 100644 (file)
--- a/view.c
+++ b/view.c
@@ -3,13 +3,11 @@
  * 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 *

-minclient()
-{
+minclient() {

        Client *c, *min;
 
        if((clients && clients->isfloat) || arrange == dofloat)
        Client *c, *min;
 
        if((clients && clients->isfloat) || arrange == dofloat)


@@ -21,8 +19,7 @@ minclient()
 }
 
 static void
 }
 
 static void

-reorder()
-{
+reorder() {

        Client *c, *newclients, *tail;
 
        newclients = tail = NULL;
        Client *c, *newclients, *tail;
 
        newclients = tail = NULL;


@@ -40,8 +37,7 @@ reorder()
 }
 
 static Client *
 }
 
 static Client *

-nexttiled(Client *c)
-{
+nexttiled(Client *c) {

        for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
        return c;
 }
        for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
        return c;
 }


@@ -51,8 +47,7 @@ nexttiled(Client *c)
 void (*arrange)(Arg *) = DEFMODE;
 
 void
 void (*arrange)(Arg *) = DEFMODE;
 
 void

-detach(Client *c)
-{
+detach(Client *c) {

        if(c->prev)
                c->prev->next = c->next;
        if(c->next)
        if(c->prev)
                c->prev->next = c->next;
        if(c->next)


@@ -63,8 +58,7 @@ detach(Client *c)
 }
 
 void
 }
 
 void

-dofloat(Arg *arg)
-{
+dofloat(Arg *arg) {

        Client *c;
 
        maximized = False;
        Client *c;
 
        maximized = False;


@@ -76,14 +70,15 @@ dofloat(Arg *arg)
                else
                        ban(c);
        }
                else
                        ban(c);
        }

-       if(!sel || !isvisible(sel))
-               focus(getnext(clients));
+       if(!sel || !isvisible(sel)) {
+               for(c = stack; c && !isvisible(c); c = c->snext);
+               focus(c);
+       }

        restack();
 }
 
 void
        restack();
 }
 
 void

-dotile(Arg *arg)
-{
+dotile(Arg *arg) {

        int h, i, n, w;
        Client *c;
 
        int h, i, n, w;
        Client *c;
 


@@ -138,14 +133,15 @@ dotile(Arg *arg)
                else
                        ban(c);
        }
                else
                        ban(c);
        }

-       if(!sel || !isvisible(sel))
-               focus(getnext(clients));
+       if(!sel || !isvisible(sel)) {
+               for(c = stack; c && !isvisible(c); c = c->snext);
+               focus(c);
+       }

        restack();
 }
 
 void
        restack();
 }
 
 void

-focusnext(Arg *arg)
-{
+focusnext(Arg *arg) {

        Client *c;
    
        if(!sel)
        Client *c;
    
        if(!sel)


@@ -160,8 +156,7 @@ focusnext(Arg *arg)
 }
 
 void
 }
 
 void

-focusprev(Arg *arg)
-{
+focusprev(Arg *arg) {

        Client *c;
 
        if(!sel)
        Client *c;
 
        if(!sel)


@@ -178,8 +173,7 @@ focusprev(Arg *arg)
 }
 
 Bool
 }
 
 Bool

-isvisible(Client *c)
-{
+isvisible(Client *c) {

        unsigned int i;
 
        for(i = 0; i < ntags; i++)
        unsigned int i;
 
        for(i = 0; i < ntags; i++)


@@ -189,8 +183,7 @@ isvisible(Client *c)
 }
 
 void
 }
 
 void

-resizecol(Arg *arg)
-{
+resizecol(Arg *arg) {

        unsigned int n;
        Client *c;
 
        unsigned int n;
        Client *c;
 


@@ -214,8 +207,7 @@ resizecol(Arg *arg)
 }
 
 void
 }
 
 void

-restack()
-{
+restack() {

        Client *c;
        XEvent ev;
        
        Client *c;
        XEvent ev;
        


@@ -227,7 +219,7 @@ restack()
                XRaiseWindow(dpy, sel->win);
                XRaiseWindow(dpy, sel->twin);
        }
                XRaiseWindow(dpy, sel->win);
                XRaiseWindow(dpy, sel->twin);
        }

-       if(arrange != dofloat) 
+       if(arrange != dofloat)

                for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
                        XLowerWindow(dpy, c->twin);
                        XLowerWindow(dpy, c->win);
                for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
                        XLowerWindow(dpy, c->twin);
                        XLowerWindow(dpy, c->win);


@@ -238,8 +230,7 @@ restack()
 }
 
 void
 }
 
 void

-togglemode(Arg *arg)
-{
+togglemode(Arg *arg) {

        arrange = (arrange == dofloat) ? dotile : dofloat;
        if(sel)
                arrange(NULL);
        arrange = (arrange == dofloat) ? dotile : dofloat;
        if(sel)
                arrange(NULL);


@@ -248,8 +239,7 @@ togglemode(Arg *arg)
 }
 
 void
 }
 
 void

-toggleview(Arg *arg)
-{
+toggleview(Arg *arg) {

        unsigned int i;
 
        seltag[arg->i] = !seltag[arg->i];
        unsigned int i;
 
        seltag[arg->i] = !seltag[arg->i];


@@ -261,8 +251,7 @@ toggleview(Arg *arg)
 }
 
 void
 }
 
 void

-view(Arg *arg)
-{
+view(Arg *arg) {

        unsigned int i;
 
        for(i = 0; i < ntags; i++)
        unsigned int i;
 
        for(i = 0; i < ntags; i++)


@@ -273,8 +262,7 @@ view(Arg *arg)
 }
 
 void
 }
 
 void

-viewall(Arg *arg)
-{
+viewall(Arg *arg) {

        unsigned int i;
 
        for(i = 0; i < ntags; i++)
        unsigned int i;
 
        for(i = 0; i < ntags; i++)


@@ -284,8 +272,7 @@ viewall(Arg *arg)
 }
 
 void
 }
 
 void

-zoom(Arg *arg)
-{
+zoom(Arg *arg) {

        unsigned int n;
        Client *c;
 
        unsigned int n;
        Client *c;