this variant is known to work, but focus() is ugly - we need in general a better...

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 067f383..ae5d6ef 100644 (file)
--- a/main.c
+++ b/main.c
@@ -17,9 +17,9 @@
 
 /* extern */
 
 
 /* extern */
 

-char stext[1024], mtext[32];
+char stext[256];

 Bool *seltag;
 Bool *seltag;

-int bx, by, bw, bh, bmw, masterd, screen, sx, sy, sw, sh, wax, way, waw, wah;
+int bh, bmw, screen, sx, sy, sw, sh, wax, way, waw, wah;

 unsigned int master, nmaster, ntags, numlockmask;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 unsigned int master, nmaster, ntags, numlockmask;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;


@@ -41,7 +41,7 @@ static void
 cleanup(void) {
        close(STDIN_FILENO);
        while(stack) {
 cleanup(void) {
        close(STDIN_FILENO);
        while(stack) {

-               resize(stack, True, TopLeft);
+               resize(stack, True);

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


@@ -121,12 +121,12 @@ setup(void) {
        seltag = emallocz(sizeof(Bool) * ntags);
        seltag[0] = True;
        /* style */
        seltag = emallocz(sizeof(Bool) * ntags);
        seltag[0] = True;
        /* style */

+       dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);

        dc.norm[ColBG] = getcolor(NORMBGCOLOR);
        dc.norm[ColFG] = getcolor(NORMFGCOLOR);
        dc.norm[ColBG] = getcolor(NORMBGCOLOR);
        dc.norm[ColFG] = getcolor(NORMFGCOLOR);

+       dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);

        dc.sel[ColBG] = getcolor(SELBGCOLOR);
        dc.sel[ColFG] = getcolor(SELFGCOLOR);
        dc.sel[ColBG] = getcolor(SELBGCOLOR);
        dc.sel[ColFG] = getcolor(SELFGCOLOR);

-       dc.status[ColBG] = getcolor(STATUSBGCOLOR);
-       dc.status[ColFG] = getcolor(STATUSFGCOLOR);

        setfont(FONT);
        /* geometry */
        sx = sy = 0;
        setfont(FONT);
        /* geometry */
        sx = sy = 0;


@@ -134,16 +134,13 @@ setup(void) {
        sh = DisplayHeight(dpy, screen);
        master = MASTER;
        nmaster = NMASTER;
        sh = DisplayHeight(dpy, screen);
        master = MASTER;
        nmaster = NMASTER;

-       updatemodetext();
+       bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL);

        /* bar */
        /* bar */

-       bx = sx;
-       by = sy;
-       bw = sw;

        dc.h = bh = dc.font.height + 2;
        wa.override_redirect = 1;
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ButtonPressMask | ExposureMask;
        dc.h = bh = dc.font.height + 2;
        wa.override_redirect = 1;
        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, sx, sy, sw, bh, 0, DefaultDepth(dpy, screen),

                        CopyFromParent, DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
        XDefineCursor(dpy, barwin, cursor[CurNormal]);
                        CopyFromParent, DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
        XDefineCursor(dpy, barwin, cursor[CurNormal]);