slight changes

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 2fe70e4..12ad997 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -193,7 +193,7 @@ void zoom(const void *arg);
 /* variables */
 char stext[256];
 int screen, sx, sy, sw, sh;
-int bx, by, bw, bh, blw, wx, wy, ww, wh;
+int by, bh, blw, wx, wy, ww, wh;
 uint seltags = 0;
 int (*xerrorxlib)(Display *, XErrorEvent *);
 uint numlockmask = 0;
@@ -212,7 +212,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
        [UnmapNotify] = unmapnotify
 };
 Atom wmatom[WMLast], netatom[NetLast];
-Bool domax = False;
+Bool ismax = False;
 Bool otherwm, readin;
 Bool running = True;
 uint tagset[] = {1, 1}; /* after start, first tag is selected */
@@ -273,7 +273,7 @@ arrange(void) {
                }
 
        focus(NULL);
-       if(lt->arrange && !domax)
+       if(lt->arrange && !ismax)
                lt->arrange();
        restack();
 }
@@ -328,7 +328,7 @@ buttonpress(XEvent *e) {
        }
        else if((c = getclient(ev->window))) {
                focus(c);
-               if(CLEANMASK(ev->state) != MODKEY || domax)
+               if(CLEANMASK(ev->state) != MODKEY || ismax)
                        return;
                if(ev->button == Button1)
                        movemouse(c);
@@ -349,7 +349,6 @@ checkotherwm(void) {
        XSync(dpy, False);
        if(otherwm)
                eprint("dwm: another window manager is already running\n");
-       XSync(dpy, False);
        XSetErrorHandler(NULL);
        xerrorxlib = XSetErrorHandler(xerror);
        XSync(dpy, False);
@@ -500,16 +499,16 @@ drawbar(void) {
        }
        if(blw > 0) {
                dc.w = blw;
-               drawtext(lt->symbol, dc.norm, domax);
+               drawtext(lt->symbol, dc.norm, ismax);
                x = dc.x + dc.w;
        }
        else
                x = dc.x;
        dc.w = TEXTW(stext);
-       dc.x = bw - dc.w;
+       dc.x = ww - dc.w;
        if(dc.x < x) {
                dc.x = x;
-               dc.w = bw - x;
+               dc.w = ww - x;
        }
        drawtext(stext, dc.norm, False);
        if((dc.w = dc.x - x) > bh) {
@@ -521,7 +520,7 @@ drawbar(void) {
                else
                        drawtext(NULL, dc.norm, False);
        }
-       XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
+       XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, ww, bh, 0, 0);
        XSync(dpy, False);
 }
 
@@ -629,7 +628,7 @@ focus(Client *c) {
        }
        sel = c;
        if(c) {
-               if(domax) {
+               if(ismax) {
                        XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
                        c->ismax = True;
                }
@@ -875,11 +874,9 @@ keypress(XEvent *e) {
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        for(i = 0; i < LENGTH(keys); i++)
                if(keysym == keys[i].keysym
-               && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))
-               {
-                       if(keys[i].func)
-                               keys[i].func(keys[i].arg);
-               }
+                  && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
+                  && keys[i].func)
+                       keys[i].func(keys[i].arg);
 }
 
 void
@@ -1194,9 +1191,9 @@ restack(void) {
        drawbar();
        if(!sel)
                return;
-       if(domax || sel->isfloating || !lt->arrange)
+       if(ismax || sel->isfloating || !lt->arrange)
                XRaiseWindow(dpy, sel->win);
-       if(!domax && lt->arrange) {
+       if(!ismax && lt->arrange) {
                wc.stack_mode = Below;
                wc.sibling = barwin;
                for(c = stack; c; c = c->snext)
@@ -1372,7 +1369,7 @@ setup(void) {
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ButtonPressMask|ExposureMask;
 
-       barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
+       barwin = XCreateWindow(dpy, root, wx, by, ww, bh, 0, DefaultDepth(dpy, screen),
                        CopyFromParent, DefaultVisual(dpy, screen),
                        CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
        XDefineCursor(dpy, barwin, cursor[CurNormal]);
@@ -1512,7 +1509,7 @@ togglelayout(const void *arg) {
 
 void
 togglemax(const void *arg) {
-       domax = !domax;
+       ismax = !ismax;
        arrange();
 }
 
@@ -1567,8 +1564,8 @@ void
 updatebar(void) {
        if(dc.drawable != 0)
                XFreePixmap(dpy, dc.drawable);
-       dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen));
-       XMoveResizeWindow(dpy, barwin, bx, by, bw, bh);
+       dc.drawable = XCreatePixmap(dpy, root, ww, bh, DefaultDepth(dpy, screen));
+       XMoveResizeWindow(dpy, barwin, wx, by, ww, bh);
 }
 
 void
@@ -1595,10 +1592,8 @@ updategeom(void) {
                wh = showbar ? sh - bh : sh;
        }
 
-       /* bar geometry */
-       bx = wx;
+       /* bar position */
        by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;
-       bw = ww;
 }
 
 void