removed trailing spaces reported by Soleen

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 1c52d80..29af1bd 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -224,13 +224,11 @@ static Client *stack = NULL;
 static Cursor cursor[CurLast];
 static Display *dpy;
 static DC dc = {0};
 static Cursor cursor[CurLast];
 static Display *dpy;
 static DC dc = {0};

+static Layout *lt = NULL;

 static Window root, barwin;
 static Window root, barwin;

-

 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 

-static Layout *lt = layouts;
-

 /* compile-time check if all tags fit into an uint bit array. */
 struct NumTags { char limitexceeded[sizeof(uint) * 8 < LENGTH(tags) ? -1 : 1]; };
 
 /* compile-time check if all tags fit into an uint bit array. */
 struct NumTags { char limitexceeded[sizeof(uint) * 8 < LENGTH(tags) ? -1 : 1]; };
 


@@ -326,9 +324,9 @@ buttonpress(XEvent *e) {
                        }
                }
                if(ev->x < x + blw) {
                        }
                }
                if(ev->x < x + blw) {

-                       if(ev->button == Button1) 
+                       if(ev->button == Button1)

                                togglelayout(NULL);
                                togglelayout(NULL);

-                       else if(ev->button == Button3) 
+                       else if(ev->button == Button3)

                                togglemax(NULL);
                }
        }
                                togglemax(NULL);
                }
        }


@@ -363,8 +361,11 @@ checkotherwm(void) {
 void
 cleanup(void) {
        Arg a = {.i = ~0};
 void
 cleanup(void) {
        Arg a = {.i = ~0};

+       Layout foo = { "", NULL };
+

        close(STDIN_FILENO);
        view(&a);
        close(STDIN_FILENO);
        view(&a);

+       lt = &foo;

        while(stack)
                unmanage(stack);
        if(dc.font.set)
        while(stack)
                unmanage(stack);
        if(dc.font.set)


@@ -661,7 +662,7 @@ focusstack(const Arg *arg) {
                for(i = clients; i != sel; i = i->next)
                        if (!i->isbanned)
                                c = i;
                for(i = clients; i != sel; i = i->next)
                        if (!i->isbanned)
                                c = i;

-               if(!c) 
+               if(!c)

                        for(; i; i = i->next)
                                if (!i->isbanned)
                                        c = i;
                        for(; i; i = i->next)
                                if (!i->isbanned)
                                        c = i;


@@ -1322,6 +1323,7 @@ setup(void) {
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        bh = dc.font.height + 2;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        bh = dc.font.height + 2;

+       lt = layouts;

        updategeom();
 
        /* init atoms */
        updategeom();
 
        /* init atoms */


@@ -1476,7 +1478,9 @@ togglefloating(const Arg *arg) {
 
 void
 togglelayout(const Arg *arg) {
 
 void
 togglelayout(const Arg *arg) {

-       if(++lt == &layouts[LENGTH(layouts)])
+       if(arg && arg->v)
+               lt = (Layout *)arg->v;
+       else if(++lt == &layouts[LENGTH(layouts)])

                lt = &layouts[0];
        if(sel)
                arrange();
                lt = &layouts[0];
        if(sel)
                arrange();