add .gitignore

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 664c527..1ee4ea2 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -487,6 +487,7 @@ cleanup(void)
                drw_cur_free(drw, cursor[i]);
        for (i = 0; i < LENGTH(colors); i++)
                free(scheme[i]);
                drw_cur_free(drw, cursor[i]);
        for (i = 0; i < LENGTH(colors); i++)
                free(scheme[i]);

+       free(scheme);

        XDestroyWindow(dpy, wmcheckwin);
        drw_free(drw);
        XSync(dpy, False);
        XDestroyWindow(dpy, wmcheckwin);
        drw_free(drw);
        XSync(dpy, False);


@@ -702,6 +703,9 @@ drawbar(Monitor *m)
        unsigned int i, occ = 0, urg = 0;
        Client *c;
 
        unsigned int i, occ = 0, urg = 0;
        Client *c;
 

+       if (!m->showbar)
+               return;
+

        /* draw status first so it can be overdrawn by tags later */
        if (m == selmon) { /* status is only drawn on selected monitor */
                drw_setscheme(drw, scheme[SchemeNorm]);
        /* draw status first so it can be overdrawn by tags later */
        if (m == selmon) { /* status is only drawn on selected monitor */
                drw_setscheme(drw, scheme[SchemeNorm]);


@@ -835,7 +839,7 @@ focusstack(const Arg *arg)
 {
        Client *c = NULL, *i;
 
 {
        Client *c = NULL, *i;
 

-       if (!selmon->sel)
+       if (!selmon->sel || (selmon->sel->isfullscreen && lockfullscreen))

                return;
        if (arg->i > 0) {
                for (c = selmon->sel->next; c && !ISVISIBLE(c); c = c->next);
                return;
        if (arg->i > 0) {
                for (c = selmon->sel->next; c && !ISVISIBLE(c); c = c->next);