removed NET_ACTIVE_WINDOW handling

[dwm.git] / main.c

diff --git a/main.c b/main.c
index de59244..5efe599 100644 (file)
--- a/main.c
+++ b/main.c
@@ -4,21 +4,20 @@
  */
 
 #include "dwm.h"
  */
 
 #include "dwm.h"

-

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

+#include <sys/select.h>

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

-

 /* static */
 
 /* static */
 

-static Bool otherwm;

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

+static Bool otherwm;

 
 static void
 cleanup()
 
 static void
 cleanup()


@@ -34,9 +33,8 @@ static void
 scan()
 {
        unsigned int i, num;
 scan()
 {
        unsigned int i, num;

-       Window *wins;
+       Window *wins, d1, d2;

        XWindowAttributes wa;
        XWindowAttributes wa;

-       Window d1, d2;

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


@@ -55,10 +53,9 @@ scan()
 static int
 win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
 {
 static int
 win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
 {

-       Atom real;
-       int format;
+       int status, format;

        unsigned long res, extra;
        unsigned long res, extra;

-       int status;
+       Atom real;

 
        status = XGetWindowProperty(dpy, w, a, 0L, l, False, t, &real, &format,
                        &res, &extra, prop);
 
        status = XGetWindowProperty(dpy, w, a, 0L, l, False, t, &real, &format,
                        &res, &extra, prop);


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

-int tsel = Tdev; /* default tag */
+int tsel = DEFTAG;

 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;

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


@@ -101,18 +99,19 @@ Window root, barwin;
 int
 getproto(Window w)
 {
 int
 getproto(Window w)
 {

-       unsigned char *protocols;
-       long res;

        int protos = 0;
        int i;
        int protos = 0;
        int i;

+       long res;
+       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;
        }
        for(i = 0; i < res; i++) {
                if(protocols[i] == wmatom[WMDelete])
        if(res <= 0) {
                return protos;
        }
        for(i = 0; i < res; i++) {
                if(protocols[i] == wmatom[WMDelete])

-                       protos |= WM_PROTOCOL_DELWIN;
+                       protos |= PROTODELWIN;

        }
        free((char *) protocols);
        return protos;
        }
        free((char *) protocols);
        return protos;


@@ -148,58 +147,46 @@ int
 xerror(Display *dpy, XErrorEvent *ee)
 {
        if(ee->error_code == BadWindow
 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)
-                       || (ee->request_code == X_GrabKey
-                               && ee->error_code == BadAccess))
+       || (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))

                return 0;
        fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
                return 0;
        fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",

-                       ee->request_code, ee->error_code);
+               ee->request_code, ee->error_code);

        return xerrorxlib(dpy, ee); /* may call exit() */
 }
 
 int
 main(int argc, char *argv[])
 {
        return xerrorxlib(dpy, ee); /* may call exit() */
 }
 
 int
 main(int argc, char *argv[])
 {

-       int i, n;
-       fd_set rd;
-       XSetWindowAttributes wa;
+       int i;

        unsigned int mask;
        unsigned int mask;

-       Bool readstdin = True;
+       fd_set rd;
+       Bool readin = True;

        Window w;
        XEvent ev;
        Window w;
        XEvent ev;

+       XSetWindowAttributes wa;

 
 

-       for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
-               switch (argv[i][1]) {
-               default:
-                       eprint("usage: dwm [-v]\n");
-                       break;
-               case 'v':
-                       fputs("dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
-                       exit(EXIT_SUCCESS);
-                       break;
-               }
+       if(argc == 2 && !strncmp("-v", argv[1], 3)) {
+               fputs("dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
+               exit(EXIT_SUCCESS);

        }
        }

+       else if(argc != 1)
+               eprint("usage: dwm [-v]\n");

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


@@ -223,6 +210,9 @@ 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);
 
        /* style */
        dc.bg = getcolor(BGCOLOR);


@@ -250,25 +240,22 @@ 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.event_mask = SubstructureRedirectMask | EnterWindowMask | LeaveWindowMask;

        wa.cursor = cursor[CurNormal];
        wa.cursor = cursor[CurNormal];

-

        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 

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

        scan();
 
        scan();
 

-       /* main event loop, reads status text from stdin as well */
-Mainloop:
+       /* main event loop, also reads status text from stdin */

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

-               if(readstdin)
+               if(readin)

                        FD_SET(STDIN_FILENO, &rd);
                FD_SET(ConnectionNumber(dpy), &rd);
 
                        FD_SET(STDIN_FILENO, &rd);
                FD_SET(ConnectionNumber(dpy), &rd);
 


@@ -285,20 +272,12 @@ Mainloop:
                                                (handler[ev.type])(&ev); /* call handler */
                                }
                        }
                                                (handler[ev.type])(&ev); /* call handler */
                                }
                        }

-                       if(readstdin && FD_ISSET(STDIN_FILENO, &rd)) {
-                               i = n = 0;
-                               for(;;) {
-                                       if((i = getchar()) == EOF) {
-                                               /* broken pipe/end of producer */
-                                               readstdin = False;
-                                               strcpy(stext, "broken pipe");
-                                               goto Mainloop;
-                                       }
-                                       if(i == '\n' || n >= sizeof(stext) - 1)
-                                               break;
-                                       stext[n++] = i;
-                               }
-                               stext[n] = 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();
                        }
                }
                                drawstatus();
                        }
                }