introduced tile.c, some refactoring of functions

[dwm.git] / main.c

diff --git a/main.c b/main.c
index ed055c2..bd19e49 100644 (file)
--- a/main.c
+++ b/main.c
@@ -18,12 +18,12 @@
 /* extern */
 
 char stext[256];
-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;
-Bool issel = True;
+Bool *seltag;
+Bool selscreen = True;
 Client *clients = NULL;
 Client *sel = NULL;
 Client *stack = NULL;
@@ -41,7 +41,8 @@ static void
 cleanup(void) {
        close(STDIN_FILENO);
        while(stack) {
-               resize(stack, True, TopLeft);
+               if(stack->isbanned)
+                       XMoveWindow(dpy, stack->win, stack->x, stack->y);
                unmanage(stack);
        }
        if(dc.font.set)
@@ -69,9 +70,8 @@ scan(void) {
        wins = NULL;
        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {
-                       if(!XGetWindowAttributes(dpy, wins[i], &wa))
-                               continue;
-                       if(wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
+                       if(!XGetWindowAttributes(dpy, wins[i], &wa)
+                       || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
                                continue;
                        if(wa.map_state == IsViewable)
                                manage(wins[i], &wa);
@@ -92,6 +92,7 @@ setup(void) {
        /* init atoms */
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
        wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
+       wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
        netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
        XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
@@ -103,12 +104,12 @@ setup(void) {
        /* init modifier map */
        numlockmask = 0;
        modmap = XGetModifierMapping(dpy);
-       for (i = 0; i < 8; i++) {
+       for (i = 0; i < 8; i++)
                for (j = 0; j < modmap->max_keypermod; j++) {
-                       if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
+                       if(modmap->modifiermap[i * modmap->max_keypermod + j]
+                                       == XKeysymToKeycode(dpy, XK_Num_Lock))
                                numlockmask = (1 << i);
                }
-       }
        XFreeModifiermap(modmap);
        /* select for events */
        wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
@@ -116,7 +117,7 @@ setup(void) {
        wa.cursor = cursor[CurNormal];
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
        grabkeys();
-       initrregs();
+       compileregexps();
        for(ntags = 0; tags[ntags]; ntags++);
        seltag = emallocz(sizeof(Bool) * ntags);
        seltag[0] = True;
@@ -136,22 +137,19 @@ setup(void) {
        nmaster = NMASTER;
        bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL);
        /* 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;
-       barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
-                       CopyFromParent, DefaultVisual(dpy, screen),
+       barwin = XCreateWindow(dpy, root, sx, sy + (TOPBAR ? 0 : sh - bh), sw, bh, 0,
+                       DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
        XDefineCursor(dpy, barwin, cursor[CurNormal]);
        XMapRaised(dpy, barwin);
        strcpy(stext, "dwm-"VERSION);
        /* windowarea */
        wax = sx;
-       way = sy + bh;
+       way = sy + (TOPBAR ? bh : 0);
        wah = sh - bh;
        waw = sw;
        /* pixmap for everything */
@@ -159,7 +157,7 @@ setup(void) {
        dc.gc = XCreateGC(dpy, root, 0, 0);
        XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
        /* multihead support */
-       issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
+       selscreen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
 }
 
 /*
@@ -174,24 +172,6 @@ xerrorstart(Display *dsply, XErrorEvent *ee) {
 
 /* extern */
 
-int
-getproto(Window w) {
-       int i, format, protos, status;
-       unsigned long extra, res;
-       Atom *protocols, real;
-
-       protos = 0;
-       status = XGetWindowProperty(dpy, w, wmatom[WMProtocols], 0L, 20L, False,
-                       XA_ATOM, &real, &format, &res, &extra, (unsigned char **)&protocols);
-       if(status != Success || protocols == 0)
-               return protos;
-       for(i = 0; i < res; i++)
-               if(protocols[i] == wmatom[WMDelete])
-                       protos |= PROTODELWIN;
-       free(protocols);
-       return protos;
-}
-
 void
 sendevent(Window w, Atom a, long value) {
        XEvent e;
@@ -293,7 +273,7 @@ main(int argc, char *argv[]) {
                                break;
                        default:
                                for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0');
-                               for(p = stext + strlen(stext) - 1; p >= stext && *p != '\n'; --p);
+                               for(; p >= stext && *p != '\n'; --p);
                                if(p > stext)
                                        strncpy(stext, p + 1, sizeof stext);
                        }