applied Jukka's stdinread patch

[dwm.git] / main.c

diff --git a/main.c b/main.c
index daeaa0a..86cd3f9 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,5 +1,4 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>

  * See LICENSE file for license details.
  */
 
  * See LICENSE file for license details.
  */
 


@@ -19,14 +18,14 @@
 
 char stext[1024];
 Bool *seltag;
 
 char stext[1024];
 Bool *seltag;

-int bx, by, bw, bh, bmw, mw, screen, sx, sy, sw, sh;
-unsigned int ntags, numlockmask;
+int bx, by, bw, bh, bmw, masterd, screen, sx, sy, sw, sh, wax, way, waw, wah;
+unsigned int master, ntags, numlockmask;

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

-Bool maximized = False;

 Client *clients = NULL;
 Client *sel = NULL;
 Client *clients = NULL;
 Client *sel = NULL;

+Client *stack = NULL;

 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};
 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};


@@ -38,8 +37,7 @@ static int (*xerrorxlib)(Display *, XErrorEvent *);
 static Bool otherwm, readin;
 
 static void
 static Bool otherwm, readin;
 
 static void

-cleanup()
-{
+cleanup(void) {

        close(STDIN_FILENO);
        while(sel) {
                resize(sel, True, TopLeft);
        close(STDIN_FILENO);
        while(sel) {
                resize(sel, True, TopLeft);


@@ -59,8 +57,7 @@ cleanup()
 }
 
 static void
 }
 
 static void

-scan()
-{
+scan(void) {

        unsigned int i, num;
        Window *wins, d1, d2;
        XWindowAttributes wa;
        unsigned int i, num;
        Window *wins, d1, d2;
        XWindowAttributes wa;


@@ -81,8 +78,7 @@ scan()
 }
 
 static void
 }
 
 static void

-setup()
-{
+setup(void) {

        int i, j;
        unsigned int mask;
        Window w;
        int i, j;
        unsigned int mask;
        Window w;


@@ -96,12 +92,11 @@ setup()
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
        XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
                        PropModeReplace, (unsigned char *) netatom, NetLast);
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
        XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
                        PropModeReplace, (unsigned char *) netatom, NetLast);

-

        /* init cursors */
        cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
        /* init cursors */
        cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);

-
+       /* init modifier map */

        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++) {


@@ -110,18 +105,16 @@ setup()
                }
        }
        XFree(modmap);
                }
        }
        XFree(modmap);

-
-       wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask | EnterWindowMask | LeaveWindowMask;
+       /* select for events */
+       wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
+               | EnterWindowMask | LeaveWindowMask;

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

-

        grabkeys();
        initrregs();
        grabkeys();
        initrregs();

-

        for(ntags = 0; tags[ntags]; ntags++);
        seltag = emallocz(sizeof(Bool) * ntags);
        seltag[0] = True;
        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);
        /* style */
        dc.norm[ColBG] = getcolor(NORMBGCOLOR);
        dc.norm[ColFG] = getcolor(NORMFGCOLOR);


@@ -130,14 +123,15 @@ setup()
        dc.status[ColBG] = getcolor(STATUSBGCOLOR);
        dc.status[ColFG] = getcolor(STATUSFGCOLOR);
        setfont(FONT);
        dc.status[ColBG] = getcolor(STATUSBGCOLOR);
        dc.status[ColFG] = getcolor(STATUSFGCOLOR);
        setfont(FONT);

-
-       bmw = textw(FLOATSYMBOL) > textw(TILESYMBOL) ? textw(FLOATSYMBOL) : textw(TILESYMBOL);
+       /* 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);

-       mw = (sw * MASTERW) / 100;
-
-       bx = by = 0;
+       master = MASTER;
+       /* bar */
+       bx = sx;
+       by = sy;

        bw = sw;
        dc.h = bh = dc.font.height + 2;
        wa.override_redirect = 1;
        bw = sw;
        dc.h = bh = dc.font.height + 2;
        wa.override_redirect = 1;


@@ -148,13 +142,18 @@ setup()
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
        XDefineCursor(dpy, barwin, cursor[CurNormal]);
        XMapRaised(dpy, barwin);
                        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);
        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);

-
+       /* multihead support */

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

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

 }
 
 /*
 }
 
 /*


@@ -162,8 +161,7 @@ setup()
  * is already running.
  */
 static int
  * is already running.
  */
 static int

-xerrorstart(Display *dsply, XErrorEvent *ee)
-{
+xerrorstart(Display *dsply, XErrorEvent *ee) {

        otherwm = True;
        return -1;
 }
        otherwm = True;
        return -1;
 }


@@ -171,8 +169,7 @@ xerrorstart(Display *dsply, XErrorEvent *ee)
 /* extern */
 
 int
 /* extern */
 
 int

-getproto(Window w)
-{
+getproto(Window w) {

        int i, format, protos, status;
        unsigned long extra, res;
        Atom *protocols, real;
        int i, format, protos, status;
        unsigned long extra, res;
        Atom *protocols, real;


@@ -190,8 +187,7 @@ getproto(Window w)
 }
 
 void
 }
 
 void

-sendevent(Window w, Atom a, long value)
-{
+sendevent(Window w, Atom a, long value) {

        XEvent e;
 
        e.type = ClientMessage;
        XEvent e;
 
        e.type = ClientMessage;


@@ -205,35 +201,32 @@ sendevent(Window w, Atom a, long value)
 }
 
 void
 }
 
 void

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

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

-/*
- * There's no way to check accesses to destroyed windows, thus those cases are
+/* There's no way to check accesses to destroyed windows, thus those cases are

  * ignored (especially on UnmapNotify's).  Other types of errors call Xlibs
  * ignored (especially on UnmapNotify's).  Other types of errors call Xlibs

- * default error handler, which calls exit().
+ * default error handler, which may call exit.

  */
 int
  */
 int

-xerror(Display *dpy, XErrorEvent *ee)
-{
+xerror(Display *dpy, XErrorEvent *ee) {

        if(ee->error_code == BadWindow
        || (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)
        || (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable)
        || (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
        || (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
        || (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)
        if(ee->error_code == BadWindow
        || (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)
        || (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable)
        || (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
        || (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
        || (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)

-       || (ee->request_code == X_GrabKey && ee->error_code == BadAccess))
+       || (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
+       || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))

                return 0;
        fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
                ee->request_code, ee->error_code);
                return 0;
        fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
                ee->request_code, ee->error_code);

-       return xerrorxlib(dpy, ee); /* may call exit() */
+       return xerrorxlib(dpy, ee); /* may call exit */

 }
 
 int
 }
 
 int

-main(int argc, char *argv[])
-{
+main(int argc, char *argv[]) {

        int r, xfd;
        fd_set rd;
 
        int r, xfd;
        fd_set rd;
 


@@ -243,21 +236,17 @@ main(int argc, char *argv[])
        }
        else if(argc != 1)
                eprint("usage: dwm [-v]\n");
        }
        else if(argc != 1)
                eprint("usage: dwm [-v]\n");

-

        dpy = XOpenDisplay(0);
        if(!dpy)
                eprint("dwm: cannot open display\n");
        dpy = XOpenDisplay(0);
        if(!dpy)
                eprint("dwm: cannot open display\n");

-

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

-

        otherwm = False;
        XSetErrorHandler(xerrorstart);
        /* this causes an error if some other window manager is running */
        XSelectInput(dpy, root, SubstructureRedirectMask);
        XSync(dpy, False);
        otherwm = False;
        XSetErrorHandler(xerrorstart);
        /* 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");
 
        if(otherwm)
                eprint("dwm: another window manager is already running\n");
 


@@ -265,7 +254,6 @@ main(int argc, char *argv[])
        XSetErrorHandler(NULL);
        xerrorxlib = XSetErrorHandler(xerror);
        XSync(dpy, False);
        XSetErrorHandler(NULL);
        xerrorxlib = XSetErrorHandler(xerror);
        XSync(dpy, False);

-

        setup();
        drawstatus();
        scan();
        setup();
        drawstatus();
        scan();


@@ -279,25 +267,32 @@ main(int argc, char *argv[])
                if(readin)
                        FD_SET(STDIN_FILENO, &rd);
                FD_SET(xfd, &rd);
                if(readin)
                        FD_SET(STDIN_FILENO, &rd);
                FD_SET(xfd, &rd);

-               r = select(xfd + 1, &rd, NULL, NULL, NULL);
-               if((r == -1) && (errno == EINTR))
-                       continue;
-               if(r > 0) {
-                       if(readin && FD_ISSET(STDIN_FILENO, &rd)) {
-                               readin = NULL != fgets(stext, sizeof(stext), stdin);
-                               if(readin)
-                                       stext[strlen(stext) - 1] = 0;
-                               else 
-                                       strcpy(stext, "broken pipe");
-                               drawstatus();
+               if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) {
+                       if(errno == EINTR)
+                               continue;
+                       else
+                               eprint("select failed\n");
+               }
+               if(FD_ISSET(STDIN_FILENO, &rd)) {
+                       switch(r = read(STDIN_FILENO, stext, sizeof(stext) - 1)) {
+                       case -1:
+                               strncpy(stext, strerror(errno), sizeof(stext));
+                               stext[sizeof(stext) - 1] = '\0';
+                               readin = False;
+                               break;
+                       case 0:
+                               strncpy(stext, "EOF", sizeof(stext));
+                               readin = False;
+                               break;
+                       default:
+                               stext[r - (stext[r - 1] == '\n' ? 1 : 0)] = '\0';

                        }
                        }

+                       drawstatus();

                }
                }

-               else if(r < 0)
-                       eprint("select failed\n");
-               procevent();
+               if(FD_ISSET(xfd, &rd))
+                       procevent();

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

-

        return 0;
 }
        return 0;
 }