yet another fix of copyright compactisition

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 5ed8981..66645b3 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,7 +1,6 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-
+/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+ * See LICENSE file for license details. */
 #include "dwm.h"
 #include <errno.h>
 #include <locale.h>
@@ -18,10 +17,9 @@
 /* extern */
 
 char stext[256];
-int bh, bmw, screen, sx, sy, sw, sh, wax, way, waw, wah;
-unsigned int master, nmaster, ntags, numlockmask;
+int screen, sx, sy, sw, sh, wax, way, waw, wah;
+unsigned int bh, ntags, numlockmask;
 Atom wmatom[WMLast], netatom[NetLast];
-Bool running = True;
 Bool *seltag;
 Bool selscreen = True;
 Client *clients = NULL;
@@ -36,6 +34,7 @@ Window root, barwin;
 
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static Bool otherwm, readin;
+static Bool running = True;
 
 static void
 cleanup(void) {
@@ -61,6 +60,57 @@ cleanup(void) {
        free(seltag);
 }
 
+static unsigned long
+initcolor(const char *colstr) {
+       Colormap cmap = DefaultColormap(dpy, screen);
+       XColor color;
+
+       if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
+               eprint("error, cannot allocate color '%s'\n", colstr);
+       return color.pixel;
+}
+
+static void
+initfont(const char *fontstr) {
+       char *def, **missing;
+       int i, n;
+
+       missing = NULL;
+       if(dc.font.set)
+               XFreeFontSet(dpy, dc.font.set);
+       dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
+       if(missing) {
+               while(n--)
+                       fprintf(stderr, "missing fontset: %s\n", missing[n]);
+               XFreeStringList(missing);
+       }
+       if(dc.font.set) {
+               XFontSetExtents *font_extents;
+               XFontStruct **xfonts;
+               char **font_names;
+               dc.font.ascent = dc.font.descent = 0;
+               font_extents = XExtentsOfFontSet(dc.font.set);
+               n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
+               for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
+                       if(dc.font.ascent < (*xfonts)->ascent)
+                               dc.font.ascent = (*xfonts)->ascent;
+                       if(dc.font.descent < (*xfonts)->descent)
+                               dc.font.descent = (*xfonts)->descent;
+                       xfonts++;
+               }
+       }
+       else {
+               if(dc.font.xfont)
+                       XFreeFont(dpy, dc.font.xfont);
+               dc.font.xfont = NULL;
+               if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)))
+                       eprint("error, cannot load font: '%s'\n", fontstr);
+               dc.font.ascent = dc.font.xfont->ascent;
+               dc.font.descent = dc.font.xfont->descent;
+       }
+       dc.font.height = dc.font.ascent + dc.font.descent;
+}
+
 static void
 scan(void) {
        unsigned int i, num;
@@ -117,25 +167,23 @@ setup(void) {
        wa.cursor = cursor[CurNormal];
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
        grabkeys();
-       initrregs();
+       compileregs();
        for(ntags = 0; tags[ntags]; ntags++);
        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.sel[ColBorder] = getcolor(SELBORDERCOLOR);
-       dc.sel[ColBG] = getcolor(SELBGCOLOR);
-       dc.sel[ColFG] = getcolor(SELFGCOLOR);
-       setfont(FONT);
+       dc.norm[ColBorder] = initcolor(NORMBORDERCOLOR);
+       dc.norm[ColBG] = initcolor(NORMBGCOLOR);
+       dc.norm[ColFG] = initcolor(NORMFGCOLOR);
+       dc.sel[ColBorder] = initcolor(SELBORDERCOLOR);
+       dc.sel[ColBG] = initcolor(SELBGCOLOR);
+       dc.sel[ColFG] = initcolor(SELFGCOLOR);
+       initfont(FONT);
        /* geometry */
        sx = sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
-       master = MASTER;
-       nmaster = NMASTER;
-       bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL);
+       initlayouts();
        /* bar */
        dc.h = bh = dc.font.height + 2;
        wa.override_redirect = 1;
@@ -156,6 +204,8 @@ setup(void) {
        dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
        dc.gc = XCreateGC(dpy, root, 0, 0);
        XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+       if(!dc.font.set)
+               XSetFont(dpy, dc.gc, dc.font.xfont->fid);
        /* multihead support */
        selscreen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
 }
@@ -173,21 +223,7 @@ xerrorstart(Display *dsply, XErrorEvent *ee) {
 /* extern */
 
 void
-sendevent(Window w, Atom a, long value) {
-       XEvent e;
-
-       e.type = ClientMessage;
-       e.xclient.window = w;
-       e.xclient.message_type = a;
-       e.xclient.format = 32;
-       e.xclient.data.l[0] = value;
-       e.xclient.data.l[1] = CurrentTime;
-       XSendEvent(dpy, w, False, NoEventMask, &e);
-       XSync(dpy, False);
-}
-
-void
-quit(Arg *arg) {
+quit(const char *arg) {
        readin = running = False;
 }
 
@@ -216,16 +252,14 @@ main(int argc, char *argv[]) {
        char *p;
        int r, xfd;
        fd_set rd;
+       XEvent ev;
 
-       if(argc == 2 && !strncmp("-v", argv[1], 3)) {
-               fputs("dwm-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n", stdout);
-               exit(EXIT_SUCCESS);
-       }
+       if(argc == 2 && !strncmp("-v", argv[1], 3))
+               eprint("dwm-"VERSION", © 2004-2007 Anselm R. Garbe, Sander van Dijk\n");
        else if(argc != 1)
                eprint("usage: dwm [-v]\n");
        setlocale(LC_CTYPE, "");
-       dpy = XOpenDisplay(0);
-       if(!dpy)
+       if(!(dpy = XOpenDisplay(0)))
                eprint("dwm: cannot open display\n");
        xfd = ConnectionNumber(dpy);
        screen = DefaultScreen(dpy);
@@ -248,7 +282,6 @@ main(int argc, char *argv[]) {
 
        /* main event loop, also reads status text from stdin */
        XSync(dpy, False);
-       procevent();
        readin = True;
        while(running) {
                FD_ZERO(&rd);
@@ -279,8 +312,11 @@ main(int argc, char *argv[]) {
                        }
                        drawstatus();
                }
-               if(FD_ISSET(xfd, &rd))
-                       procevent();
+               while(XPending(dpy)) {
+                       XNextEvent(dpy, &ev);
+                       if(handler[ev.type])
+                               (handler[ev.type])(&ev); /* call handler */
+               }
        }
        cleanup();
        XCloseDisplay(dpy);