new colorscheme (16-bit compliant)

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 934bea4..1e1ad4c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,9 +1,7 @@
-/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-
+/* See LICENSE file for copyright and license details. */

 #include "dwm.h"
 #include <errno.h>
 #include "dwm.h"
 #include <errno.h>

+#include <locale.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>


@@ -13,35 +11,36 @@
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>

+#include <X11/Xutil.h>

 
 /* extern */
 
 
 /* extern */
 

-char stext[1024];
-Bool *seltag;
-int bx, by, bw, bh, bmw, masterd, screen, sx, sy, sw, sh, wax, way, waw, wah;
-unsigned int master, ntags, numlockmask;
+char stext[256];
+int screen, sx, sy, sw, sh, wax, way, waw, wah;
+unsigned int ntags;
+unsigned int numlockmask = 0;

 Atom wmatom[WMLast], netatom[NetLast];
 Atom wmatom[WMLast], netatom[NetLast];

-Bool running = True;
-Bool issel = True;
+Bool *seltags;
+Bool selscreen = True;

 Client *clients = NULL;
 Client *sel = NULL;
 Client *stack = NULL;
 Cursor cursor[CurLast];
 Display *dpy;
 Client *clients = NULL;
 Client *sel = NULL;
 Client *stack = NULL;
 Cursor cursor[CurLast];
 Display *dpy;

-DC dc = {0};
-Window root, barwin;
+Window root;

 
 /* static */
 
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static Bool otherwm, readin;
 
 /* static */
 
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static Bool otherwm, readin;

+static Bool running = True;

 
 static void
 cleanup(void) {
        close(STDIN_FILENO);
 
 static void
 cleanup(void) {
        close(STDIN_FILENO);

-       while(sel) {
-               resize(sel, True, TopLeft);
-               unmanage(sel);
+       while(stack) {
+               unban(stack);
+               unmanage(stack);

        }
        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
        }
        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);


@@ -51,9 +50,30 @@ cleanup(void) {
        XFreePixmap(dpy, dc.drawable);
        XFreeGC(dpy, dc.gc);
        XDestroyWindow(dpy, barwin);
        XFreePixmap(dpy, dc.drawable);
        XFreeGC(dpy, dc.gc);
        XDestroyWindow(dpy, barwin);

+       XFreeCursor(dpy, cursor[CurNormal]);
+       XFreeCursor(dpy, cursor[CurResize]);
+       XFreeCursor(dpy, cursor[CurMove]);

        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
        XSync(dpy, False);
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
        XSync(dpy, False);

-       free(seltag);
+       free(seltags);
+}
+
+static long
+getstate(Window w) {
+       int format, status;
+       long result = -1;
+       unsigned char *p = NULL;
+       unsigned long n, extra;
+       Atom real;
+
+       status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
+                       &real, &format, &n, &extra, (unsigned char **)&p);
+       if(status != Success)
+               return -1;
+       if(n != 0)
+               result = *p;
+       XFree(p);
+       return result;

 }
 
 static void
 }
 
 static void


@@ -65,11 +85,17 @@ scan(void) {
        wins = NULL;
        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {
        wins = NULL;
        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {

-                       if(!XGetWindowAttributes(dpy, wins[i], &wa))
+                       if(!XGetWindowAttributes(dpy, wins[i], &wa)
+                       || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))

                                continue;
                                continue;

-                       if(wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
+                       if(wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
+                               manage(wins[i], &wa);
+               }
+               for(i = 0; i < num; i++) { /* now the transients */
+                       if(!XGetWindowAttributes(dpy, wins[i], &wa))

                                continue;
                                continue;

-                       if(wa.map_state == IsViewable)
+                       if(XGetTransientForHint(dpy, wins[i], &d1)
+                       && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))

                                manage(wins[i], &wa);
                }
        }
                                manage(wins[i], &wa);
                }
        }


@@ -88,6 +114,8 @@ setup(void) {
        /* init atoms */
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
        wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
        /* init atoms */
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
        wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);

+       wmatom[WMName] = XInternAtom(dpy, "WM_NAME", 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,
        netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
        XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,


@@ -98,62 +126,33 @@ setup(void) {
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
        /* init modifier map */
        modmap = XGetModifierMapping(dpy);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
        /* init modifier map */
        modmap = XGetModifierMapping(dpy);

-       for (i = 0; i < 8; i++) {
+       for (i = 0; i < 8; i++)

                for (j = 0; j < modmap->max_keypermod; j++) {
                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);
                }
                                numlockmask = (1 << i);
                }

-       }
-       XFree(modmap);
+       XFreeModifiermap(modmap);

        /* select for events */
        wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
        /* select for events */
        wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask

-               | EnterWindowMask | LeaveWindowMask;
+               | EnterWindowMask | LeaveWindowMask | StructureNotifyMask;

        wa.cursor = cursor[CurNormal];
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
        wa.cursor = cursor[CurNormal];
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);

+       XSelectInput(dpy, root, wa.event_mask);

        grabkeys();
        grabkeys();

-       initrregs();
+       compileregs();

        for(ntags = 0; tags[ntags]; ntags++);
        for(ntags = 0; tags[ntags]; ntags++);

-       seltag = emallocz(sizeof(Bool) * ntags);
-       seltag[0] = True;
-       /* style */
-       dc.norm[ColBG] = getcolor(NORMBGCOLOR);
-       dc.norm[ColFG] = getcolor(NORMFGCOLOR);
-       dc.sel[ColBG] = getcolor(SELBGCOLOR);
-       dc.sel[ColFG] = getcolor(SELFGCOLOR);
-       dc.status[ColBG] = getcolor(STATUSBGCOLOR);
-       dc.status[ColFG] = getcolor(STATUSFGCOLOR);
-       setfont(FONT);
+       seltags = emallocz(sizeof(Bool) * ntags);
+       seltags[0] = True;

        /* geometry */
        /* geometry */

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

        sx = sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        sx = sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);

-       master = MASTER;
-       /* 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),
-                       CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
-       XDefineCursor(dpy, barwin, cursor[CurNormal]);
-       XMapRaised(dpy, barwin);
-       strcpy(stext, "dwm-"VERSION);
-       /* windowarea */
-       wax = sx;
-       way = sy + bh;
-       wah = sh - bh;
-       waw = sw;
-       /* pixmap for everything */
-       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);
+       initstyle();
+       initlayouts();
+       initbar();

        /* multihead support */
        /* multihead support */

-       issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
+       selscreen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);

 }
 
 /*
 }
 
 /*


@@ -168,40 +167,35 @@ xerrorstart(Display *dsply, XErrorEvent *ee) {
 
 /* extern */
 
 
 /* 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;
+Bool
+gettextprop(Window w, Atom atom, char *text, unsigned int size) {
+       char **list = NULL;
+       int n;
+       XTextProperty name;

 
 

-       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);
+       if(!text || size == 0)
+               return False;
+       text[0] = '\0';
+       XGetTextProperty(dpy, w, &name, atom);
+       if(!name.nitems)
+               return False;
+       if(name.encoding == XA_STRING)
+               strncpy(text, (char *)name.value, size - 1);
+       else {
+               if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
+               && n > 0 && *list)
+               {
+                       strncpy(text, *list, size - 1);
+                       XFreeStringList(list);
+               }
+       }
+       text[size - 1] = '\0';
+       XFree(name.value);
+       return True;

 }
 
 void
 }
 
 void

-quit(Arg *arg) {
+quit(const char *arg) {

        readin = running = False;
 }
 
        readin = running = False;
 }
 


@@ -230,15 +224,14 @@ main(int argc, char *argv[]) {
        char *p;
        int r, xfd;
        fd_set rd;
        char *p;
        int r, xfd;
        fd_set rd;

+       XEvent ev;

 
 

-       if(argc == 2 && !strncmp("-v", argv[1], 3)) {
-               fputs("dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
-               exit(EXIT_SUCCESS);
-       }
+       if(argc == 2 && !strcmp("-v", argv[1]))
+               eprint("dwm-"VERSION", © 2006-2007 A. R. Garbe, S. van Dijk, J. Salmi, P. Hruby, S. Nagy\n");

        else if(argc != 1)
                eprint("usage: dwm [-v]\n");
        else if(argc != 1)
                eprint("usage: dwm [-v]\n");

-       dpy = XOpenDisplay(0);
-       if(!dpy)
+       setlocale(LC_CTYPE, "");
+       if(!(dpy = XOpenDisplay(0)))

                eprint("dwm: cannot open display\n");
        xfd = ConnectionNumber(dpy);
        screen = DefaultScreen(dpy);
                eprint("dwm: cannot open display\n");
        xfd = ConnectionNumber(dpy);
        screen = DefaultScreen(dpy);


@@ -256,12 +249,11 @@ main(int argc, char *argv[]) {
        xerrorxlib = XSetErrorHandler(xerror);
        XSync(dpy, False);
        setup();
        xerrorxlib = XSetErrorHandler(xerror);
        XSync(dpy, False);
        setup();

-       drawstatus();
+       drawbar();

        scan();
 
        /* main event loop, also reads status text from stdin */
        XSync(dpy, False);
        scan();
 
        /* main event loop, also reads status text from stdin */
        XSync(dpy, False);

-       procevent();

        readin = True;
        while(running) {
                FD_ZERO(&rd);
        readin = True;
        while(running) {
                FD_ZERO(&rd);


@@ -277,22 +269,26 @@ main(int argc, char *argv[]) {
                        switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
                        case -1:
                                strncpy(stext, strerror(errno), sizeof stext - 1);
                        switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
                        case -1:
                                strncpy(stext, strerror(errno), sizeof stext - 1);

+                               stext[sizeof stext - 1] = '\0';

                                readin = False;
                                break;
                        case 0:
                                readin = False;
                                break;
                        case 0:

-                               strncpy(stext, "EOF", sizeof stext);
+                               strncpy(stext, "EOF", 4);

                                readin = False;
                                break;
                        default:
                                for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0');
                                readin = False;
                                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);
                        }
                                if(p > stext)
                                        strncpy(stext, p + 1, sizeof stext);
                        }

-                       drawstatus();
+                       drawbar();
+               }
+               while(XPending(dpy)) {
+                       XNextEvent(dpy, &ev);
+                       if(handler[ev.type])
+                               (handler[ev.type])(&ev); /* call handler */

                }
                }

-               if(FD_ISSET(xfd, &rd))
-                       procevent();

        }
        cleanup();
        XCloseDisplay(dpy);
        }
        cleanup();
        XCloseDisplay(dpy);