new colorscheme (16-bit compliant)

[dwm.git] / main.c

diff --git a/main.c b/main.c
index c65cfc8..1e1ad4c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,5 +1,4 @@
-/* © 2004-2007 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 <locale.h>
 #include "dwm.h"
 #include <errno.h>
 #include <locale.h>


@@ -12,22 +11,23 @@
 #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 */
 
 char stext[256];
 int screen, sx, sy, sw, sh, wax, way, waw, wah;
 
 /* extern */
 
 char stext[256];
 int screen, sx, sy, sw, sh, wax, way, waw, wah;

-unsigned int bh, ntags, numlockmask;
+unsigned int ntags;
+unsigned int numlockmask = 0;

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

-Bool *seltag;
+Bool *seltags;

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

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

 
 /* static */
 
 
 /* static */
 


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

-               if(stack->isbanned)
-                       XMoveWindow(dpy, stack->win, stack->x, stack->y);
+               unban(stack);

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


@@ -56,58 +55,25 @@ cleanup(void) {
        XFreeCursor(dpy, cursor[CurMove]);
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
        XSync(dpy, False);
        XFreeCursor(dpy, cursor[CurMove]);
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
        XSync(dpy, False);

-       free(seltag);
+       free(seltags);

 }
 
 }
 

-static unsigned long
-initcolor(const char *colstr) {
-       Colormap cmap = DefaultColormap(dpy, screen);
-       XColor color;
+static long
+getstate(Window w) {
+       int format, status;
+       long result = -1;
+       unsigned char *p = NULL;
+       unsigned long n, extra;
+       Atom real;

 
 

-       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;
+       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


@@ -122,7 +88,14 @@ scan(void) {
                        if(!XGetWindowAttributes(dpy, wins[i], &wa)
                        || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
                                continue;
                        if(!XGetWindowAttributes(dpy, wins[i], &wa)
                        || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
                                continue;

-                       if(wa.map_state == IsViewable)
+                       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;
+                       if(XGetTransientForHint(dpy, wins[i], &d1)
+                       && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))

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


@@ -141,6 +114,7 @@ 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);
        wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
        netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);


@@ -151,7 +125,6 @@ setup(void) {
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
        /* init modifier map */
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
        /* init modifier map */

-       numlockmask = 0;

        modmap = XGetModifierMapping(dpy);
        for (i = 0; i < 8; i++)
                for (j = 0; j < modmap->max_keypermod; j++) {
        modmap = XGetModifierMapping(dpy);
        for (i = 0; i < 8; i++)
                for (j = 0; j < modmap->max_keypermod; j++) {


@@ -162,49 +135,22 @@ setup(void) {
        XFreeModifiermap(modmap);
        /* select for events */
        wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
        XFreeModifiermap(modmap);
        /* 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();
        compileregs();
        for(ntags = 0; tags[ntags]; ntags++);
        grabkeys();
        compileregs();
        for(ntags = 0; tags[ntags]; ntags++);

-       seltag = emallocz(sizeof(Bool) * ntags);
-       seltag[0] = True;
-       /* style */
-       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);
+       seltags = emallocz(sizeof(Bool) * ntags);
+       seltags[0] = True;

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

+       initstyle();

        initlayouts();
        initlayouts();

-       /* bar */
-       dc.h = bh = dc.font.height + 2;
-       wa.override_redirect = 1;
-       wa.background_pixmap = ParentRelative;
-       wa.event_mask = ButtonPressMask | ExposureMask;
-       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 + (TOPBAR ? bh : 0);
-       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);
-       if(!dc.font.set)
-               XSetFont(dpy, dc.gc, dc.font.xfont->fid);
+       initbar();

        /* multihead support */
        selscreen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
 }
        /* multihead support */
        selscreen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
 }


@@ -221,6 +167,33 @@ xerrorstart(Display *dsply, XErrorEvent *ee) {
 
 /* extern */
 
 
 /* extern */
 

+Bool
+gettextprop(Window w, Atom atom, char *text, unsigned int size) {
+       char **list = NULL;
+       int n;
+       XTextProperty name;
+
+       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
 quit(const char *arg) {
        readin = running = False;
 void
 quit(const char *arg) {
        readin = running = False;


@@ -253,8 +226,8 @@ main(int argc, char *argv[]) {
        fd_set rd;
        XEvent ev;
 
        fd_set rd;
        XEvent ev;
 

-       if(argc == 2 && !strncmp("-v", argv[1], 3))
-               eprint("dwm-"VERSION", © 2004-2007 Anselm R. Garbe\n");
+       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");
        setlocale(LC_CTYPE, "");
        else if(argc != 1)
                eprint("usage: dwm [-v]\n");
        setlocale(LC_CTYPE, "");


@@ -276,7 +249,7 @@ 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 */
        scan();
 
        /* main event loop, also reads status text from stdin */


@@ -309,7 +282,7 @@ main(int argc, char *argv[]) {
                                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);
                }
                while(XPending(dpy)) {
                        XNextEvent(dpy, &ev);