removed unnecessary border color

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 86d72fa..534402c 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>


@@ -15,7 +14,6 @@
 #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 *);


@@ -87,6 +85,7 @@ xerrorstart(Display *dsply, XErrorEvent *ee)
 char stext[1024];
 int tsel = DEFTAG;
 int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
 char stext[1024];
 int tsel = DEFTAG;
 int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;

+unsigned int ntags;

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


@@ -103,9 +102,10 @@ getproto(Window w)
        int protos = 0;
        int i;
        long res;
        int protos = 0;
        int i;
        long res;

-       unsigned char *protocols;
+       Atom *protocols;

 
 

-       res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L, &protocols);
+       res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L,
+                       ((unsigned char **)&protocols));

        if(res <= 0) {
                return protos;
        }
        if(res <= 0) {
                return protos;
        }


@@ -165,6 +165,7 @@ main(int argc, char *argv[])
        int i;
        unsigned int mask;
        fd_set rd;
        int i;
        unsigned int mask;
        fd_set rd;

+       Bool readin = True;

        Window w;
        XEvent ev;
        XSetWindowAttributes wa;
        Window w;
        XEvent ev;
        XSetWindowAttributes wa;


@@ -178,15 +179,14 @@ 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");

 
        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);
 
        XSelectInput(dpy, root, SubstructureRedirectMask);
        XSync(dpy, False);
 


@@ -210,11 +210,13 @@ main(int argc, char *argv[])
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
        grabkeys();
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
        grabkeys();

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

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

-       dc.border = getcolor(BORDERCOLOR);

        setfont(FONT);
 
        sx = sy = 0;
        setfont(FONT);
 
        sx = sy = 0;


@@ -237,6 +239,8 @@ 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);


@@ -245,13 +249,13 @@ main(int argc, char *argv[])
        wa.cursor = cursor[CurNormal];
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 
        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 */

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

-               FD_SET(STDIN_FILENO, &rd);
+               if(readin)
+                       FD_SET(STDIN_FILENO, &rd);

                FD_SET(ConnectionNumber(dpy), &rd);
 
                i = select(ConnectionNumber(dpy) + 1, &rd, 0, 0, 0);
                FD_SET(ConnectionNumber(dpy), &rd);
 
                i = select(ConnectionNumber(dpy) + 1, &rd, 0, 0, 0);


@@ -267,11 +271,12 @@ main(int argc, char *argv[])
                                                (handler[ev.type])(&ev); /* call handler */
                                }
                        }
                                                (handler[ev.type])(&ev); /* call handler */
                                }
                        }

-                       if(FD_ISSET(STDIN_FILENO, &rd)) {
-                               if(!fgets(stext, sizeof(stext), stdin))
-                                       break;
-                               else 
+                       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();
                        }
                }