rearranged getproto

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 86d72fa..6da3ccd 100644 (file)
--- a/main.c
+++ b/main.c
@@ -4,7 +4,6 @@
  */
 
 #include "dwm.h"
  */
 
 #include "dwm.h"

-

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


@@ -12,23 +11,33 @@
 #include <unistd.h>
 #include <sys/select.h>
 #include <X11/cursorfont.h>
 #include <unistd.h>
 #include <sys/select.h>
 #include <X11/cursorfont.h>

+#include <X11/keysym.h>

 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
 
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
 

-

 /* static */
 
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 /* static */
 
 static int (*xerrorxlib)(Display *, XErrorEvent *);

-static Bool otherwm;
+static Bool otherwm, readin;

 
 static void
 cleanup()
 {
 
 static void
 cleanup()
 {

+       close(STDIN_FILENO);

        while(sel) {
                resize(sel, True, TopLeft);
                unmanage(sel);
        }
        while(sel) {
                resize(sel, True, TopLeft);
                unmanage(sel);
        }

+       if(dc.font.set)
+               XFreeFontSet(dpy, dc.font.set);
+       else
+               XFreeFont(dpy, dc.font.xfont);
+       XUngrabKey(dpy, AnyKey, AnyModifier, root);
+       XFreePixmap(dpy, dc.drawable);
+       XFreeGC(dpy, dc.gc);
+       XDestroyWindow(dpy, barwin);

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

+       XSync(dpy, False);

 }
 
 static void
 }
 
 static void


@@ -38,6 +47,7 @@ scan()
        Window *wins, d1, d2;
        XWindowAttributes wa;
 
        Window *wins, d1, d2;
        XWindowAttributes wa;
 

+       wins = NULL;

        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {
                        if(!XGetWindowAttributes(dpy, wins[i], &wa))
        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {
                        if(!XGetWindowAttributes(dpy, wins[i], &wa))


@@ -52,25 +62,6 @@ scan()
                XFree(wins);
 }
 
                XFree(wins);
 }
 

-static int
-win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
-{
-       int status, format;
-       unsigned long res, extra;
-       Atom real;
-
-       status = XGetWindowProperty(dpy, w, a, 0L, l, False, t, &real, &format,
-                       &res, &extra, prop);
-
-       if(status != Success || *prop == 0) {
-               return 0;
-       }
-       if(res == 0) {
-               free((void *) *prop);
-       }
-       return res;
-}
-

 /*
  * Startup Error handler to check if another window manager
  * is already running.
 /*
  * Startup Error handler to check if another window manager
  * is already running.


@@ -85,8 +76,9 @@ xerrorstart(Display *dsply, XErrorEvent *ee)
 /* extern */
 
 char stext[1024];
 /* extern */
 
 char stext[1024];

-int tsel = DEFTAG;
+Bool *seltag;

 int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
 int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;

+unsigned int ntags, numlockmask;

 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 Bool issel = True;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 Bool issel = True;


@@ -100,20 +92,19 @@ Window root, barwin;
 int
 getproto(Window w)
 {
 int
 getproto(Window w)
 {

-       int protos = 0;
-       int i;
-       long res;
-       unsigned char *protocols;
-
-       res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L, &protocols);
-       if(res <= 0) {
+       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;
                return protos;

-       }
-       for(i = 0; i < res; i++) {
+       for(i = 0; i < res; i++)

                if(protocols[i] == wmatom[WMDelete])
                        protos |= PROTODELWIN;
                if(protocols[i] == wmatom[WMDelete])
                        protos |= PROTODELWIN;

-       }
-       free((char *) protocols);
+       free(protocols);

        return protos;
 }
 
        return protos;
 }
 


@@ -135,7 +126,7 @@ sendevent(Window w, Atom a, long value)
 void
 quit(Arg *arg)
 {
 void
 quit(Arg *arg)
 {

-       running = False;
+       readin = running = False;

 }
 
 /*
 }
 
 /*


@@ -162,11 +153,11 @@ xerror(Display *dpy, XErrorEvent *ee)
 int
 main(int argc, char *argv[])
 {
 int
 main(int argc, char *argv[])
 {

-       int i;
+       int i, j, xfd;

        unsigned int mask;
        fd_set rd;
        Window w;
        unsigned int mask;
        fd_set rd;
        Window w;

-       XEvent ev;
+       XModifierKeymap *modmap;

        XSetWindowAttributes wa;
 
        if(argc == 2 && !strncmp("-v", argv[1], 3)) {
        XSetWindowAttributes wa;
 
        if(argc == 2 && !strncmp("-v", argv[1], 3)) {


@@ -178,23 +169,25 @@ main(int argc, char *argv[])
 
        dpy = XOpenDisplay(0);
        if(!dpy)
 
        dpy = XOpenDisplay(0);
        if(!dpy)

-               eprint("dwm: cannot connect X server\n");
+               eprint("dwm: cannot open display\n");

 
 

+       xfd = ConnectionNumber(dpy);

        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
 
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
 

-       /* check if another WM is already running */

        otherwm = False;
        XSetErrorHandler(xerrorstart);
        otherwm = False;
        XSetErrorHandler(xerrorstart);

-       /* this causes an error if some other WM is running */
+       /* this causes an error if some other window manager is running */

        XSelectInput(dpy, root, SubstructureRedirectMask);
        XSync(dpy, False);
 
        if(otherwm)
                eprint("dwm: another window manager is already running\n");
 
        XSelectInput(dpy, root, SubstructureRedirectMask);
        XSync(dpy, False);
 
        if(otherwm)
                eprint("dwm: another window manager is already running\n");
 

+       XSync(dpy, False);

        XSetErrorHandler(NULL);
        xerrorxlib = XSetErrorHandler(xerror);
        XSetErrorHandler(NULL);
        xerrorxlib = XSetErrorHandler(xerror);

+       XSync(dpy, False);

 
        /* init atoms */
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
 
        /* init atoms */
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);


@@ -209,7 +202,25 @@ main(int argc, char *argv[])
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 

+       modmap = XGetModifierMapping(dpy);
+       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))
+                               numlockmask = (1 << i);
+               }
+       }
+       XFree(modmap);
+
+       wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask | EnterWindowMask | LeaveWindowMask;
+       wa.cursor = cursor[CurNormal];
+       XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
+

        grabkeys();
        grabkeys();

+       initrregs();
+
+       for(ntags = 0; tags[ntags]; ntags++);
+       seltag = emallocz(sizeof(Bool) * ntags);
+       seltag[0] = True;

 
        /* style */
        dc.bg = getcolor(BGCOLOR);
 
        /* style */
        dc.bg = getcolor(BGCOLOR);


@@ -222,13 +233,12 @@ main(int argc, char *argv[])
        sh = DisplayHeight(dpy, screen);
        mw = (sw * MASTERW) / 100;
 
        sh = DisplayHeight(dpy, screen);
        mw = (sw * MASTERW) / 100;
 

-       wa.override_redirect = 1;
-       wa.background_pixmap = ParentRelative;
-       wa.event_mask = ButtonPressMask | ExposureMask;
-

        bx = by = 0;
        bw = sw;
        dc.h = bh = dc.font.height + 4;
        bx = by = 0;
        bw = sw;
        dc.h = bh = dc.font.height + 4;

+       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);
        barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
                        CopyFromParent, DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);


@@ -237,46 +247,40 @@ main(int argc, char *argv[])
 
        dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
        dc.gc = XCreateGC(dpy, root, 0, 0);
 
        dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
        dc.gc = XCreateGC(dpy, root, 0, 0);

+
+       strcpy(stext, "dwm-"VERSION);

        drawstatus();
 
        issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
 
        drawstatus();
 
        issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
 

-       wa.event_mask = SubstructureRedirectMask | EnterWindowMask | LeaveWindowMask;
-       wa.cursor = cursor[CurNormal];
-       XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
-
-       strcpy(stext, "dwm-"VERSION);

        scan();
 
        scan();
 

-       /* main event loop, reads status text from stdin as well */
+       /* main event loop, also reads status text from stdin */
+       XSync(dpy, False);
+       procevent();
+       readin = True;

        while(running) {
                FD_ZERO(&rd);
        while(running) {
                FD_ZERO(&rd);

-               FD_SET(STDIN_FILENO, &rd);
-               FD_SET(ConnectionNumber(dpy), &rd);
-
-               i = select(ConnectionNumber(dpy) + 1, &rd, 0, 0, 0);
-               if(i == -1 && errno == EINTR)
+               if(readin)
+                       FD_SET(STDIN_FILENO, &rd);
+               FD_SET(xfd, &rd);
+               i = select(xfd + 1, &rd, NULL, NULL, NULL);
+               if((i == -1) && (errno == EINTR))

                        continue;
                        continue;

-               if(i < 0)
-                       eprint("select failed\n");
-               else if(i > 0) {
-                       if(FD_ISSET(ConnectionNumber(dpy), &rd)) {
-                               while(XPending(dpy)) {
-                                       XNextEvent(dpy, &ev);
-                                       if(handler[ev.type])
-                                               (handler[ev.type])(&ev); /* call handler */
-                               }
-                       }
-                       if(FD_ISSET(STDIN_FILENO, &rd)) {
-                               if(!fgets(stext, sizeof(stext), stdin))
-                                       break;
-                               else 
+               if(i > 0) {
+                       if(readin && FD_ISSET(STDIN_FILENO, &rd)) {
+                               readin = NULL != fgets(stext, sizeof(stext), stdin);
+                               if(readin)

                                        stext[strlen(stext) - 1] = 0;
                                        stext[strlen(stext) - 1] = 0;

+                               else 
+                                       strcpy(stext, "broken pipe");

                                drawstatus();
                        }
                }
                                drawstatus();
                        }
                }

+               else if(i < 0)
+                       eprint("select failed\n");
+               procevent();

        }
        }

-

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