override_redirect is Bool

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index bad06f4..0866c06 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -128,7 +128,6 @@ typedef struct {
 } Rule;
 
 /* function declarations */
 } Rule;
 
 /* function declarations */

-static void adjustborder(Client *c, unsigned int bw);

 static void applyrules(Client *c);
 static void arrange(void);
 static void attach(Client *c);
 static void applyrules(Client *c);
 static void arrange(void);
 static void attach(Client *c);


@@ -245,16 +244,6 @@ static Window root, barwin;
 struct NumTags { char limitexceeded[sizeof(unsigned int) * 8 < LENGTH(tags) ? -1 : 1]; };
 
 /* function implementations */
 struct NumTags { char limitexceeded[sizeof(unsigned int) * 8 < LENGTH(tags) ? -1 : 1]; };
 
 /* function implementations */

-void
-adjustborder(Client *c, unsigned int bw) {
-       XWindowChanges wc;
-
-       if(c->bw != bw) {
-               c->bw = wc.border_width = bw;
-               XConfigureWindow(dpy, c->win, CWBorderWidth, &wc);
-       }
-}
-

 void
 applyrules(Client *c) {
        unsigned int i;
 void
 applyrules(Client *c) {
        unsigned int i;


@@ -939,12 +928,9 @@ maprequest(XEvent *e) {
 
 void
 monocle(void) {
 
 void
 monocle(void) {

-       unsigned int n;

        Client *c;
 
        Client *c;
 

-       for(n = 0, c = nexttiled(clients); c && n < 2; c = nexttiled(c->next), n++);

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

-               adjustborder(c, n == 1 ? 0 : borderpx);

                resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints);
        }
 }
                resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints);
        }
 }


@@ -1015,7 +1001,7 @@ propertynotify(XEvent *e) {
        Window trans;
        XPropertyEvent *ev = &e->xproperty;
 
        Window trans;
        XPropertyEvent *ev = &e->xproperty;
 

-       if((ev->window == root) && (ev->atom = XA_WM_NAME))
+       if((ev->window == root) && (ev->atom == XA_WM_NAME))

                updatestatus();
        else if(ev->state == PropertyDelete)
                return; /* ignore */
                updatestatus();
        else if(ev->state == PropertyDelete)
                return; /* ignore */


@@ -1319,7 +1305,7 @@ setup(void) {
                blw = MAX(blw, w);
        }
 
                blw = MAX(blw, w);
        }
 

-       wa.override_redirect = 1;
+       wa.override_redirect = True;

        wa.background_pixmap = ParentRelative;
        wa.event_mask = ButtonPressMask|ExposureMask;
 
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ButtonPressMask|ExposureMask;
 


@@ -1349,8 +1335,6 @@ showhide(Client *c, unsigned int ntiled) {
        if(!c)
                return;
        if(ISVISIBLE(c)) { /* show clients top down */
        if(!c)
                return;
        if(ISVISIBLE(c)) { /* show clients top down */

-               if(ntiled > 1) /* avoid unnecessary border reverts */
-                       adjustborder(c, borderpx);

                XMoveWindow(dpy, c->win, c->x, c->y);
                if(!lt[sellt]->arrange || c->isfloating)
                        resize(c, c->x, c->y, c->w, c->h, True);
                XMoveWindow(dpy, c->win, c->x, c->y);
                if(!lt[sellt]->arrange || c->isfloating)
                        resize(c, c->x, c->y, c->w, c->h, True);


@@ -1414,7 +1398,6 @@ tile(void) {
        /* master */
        c = nexttiled(clients);
        mw = mfact * ww;
        /* master */
        c = nexttiled(clients);
        mw = mfact * ww;

-       adjustborder(c, n == 1 ? 0 : borderpx);

        resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
 
        if(--n == 0)
        resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
 
        if(--n == 0)


@@ -1429,7 +1412,6 @@ tile(void) {
                h = wh;
 
        for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
                h = wh;
 
        for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {

-               adjustborder(c, borderpx);

                resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
                       ? wy + wh - y - 2 * c->bw : h - 2 * c->bw), resizehints);
                if(h != wh)
                resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
                       ? wy + wh - y - 2 * c->bw : h - 2 * c->bw), resizehints);
                if(h != wh)


@@ -1463,7 +1445,7 @@ toggletag(const Arg *arg) {
                return;
        
        mask = sel->tags ^ (arg->ui & TAGMASK);
                return;
        
        mask = sel->tags ^ (arg->ui & TAGMASK);

-       if(sel && mask) {
+       if(mask) {

                sel->tags = mask;
                arrange();
        }
                sel->tags = mask;
                arrange();
        }


@@ -1708,12 +1690,12 @@ zoom(const Arg *arg) {
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))

-               die("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");
+               die("dwm-"VERSION", © 2006-2009 dwm engineers, see LICENSE for details\n");

        else if(argc != 1)
                die("usage: dwm [-v]\n");
 
        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
        else if(argc != 1)
                die("usage: dwm [-v]\n");
 
        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())

-               fprintf(stderr, "warning: no locale support\n");
+               fputs("warning: no locale support\n", stderr);

 
        if(!(dpy = XOpenDisplay(0)))
                die("dwm: cannot open display\n");
 
        if(!(dpy = XOpenDisplay(0)))
                die("dwm: cannot open display\n");