fixing remaining space calculation

[dwm.git] / main.c

diff --git a/main.c b/main.c
index c65cfc8..63f791f 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,5 @@
-/* © 2004-2007 Anselm R. Garbe <garbeam at gmail dot com>
+/* © 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>
  * See LICENSE file for license details. */
 #include "dwm.h"
 #include <errno.h>


@@ -80,7 +81,7 @@ initfont(const char *fontstr) {
        dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
        if(missing) {
                while(n--)
        dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
        if(missing) {
                while(n--)

-                       fprintf(stderr, "missing fontset: %s\n", missing[n]);
+                       fprintf(stderr, "dwm: missing fontset: %s\n", missing[n]);

                XFreeStringList(missing);
        }
        if(dc.font.set) {
                XFreeStringList(missing);
        }
        if(dc.font.set) {


@@ -162,9 +163,10 @@ 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++);


@@ -254,7 +256,7 @@ main(int argc, char *argv[]) {
        XEvent ev;
 
        if(argc == 2 && !strncmp("-v", argv[1], 3))
        XEvent ev;
 
        if(argc == 2 && !strncmp("-v", argv[1], 3))

-               eprint("dwm-"VERSION", © 2004-2007 Anselm R. Garbe\n");
+               eprint("dwm-"VERSION", © 2004-2007 Anselm R. Garbe, Sander van Dijk\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, "");