Xinqi Bao's Git

projects / dwm.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
rearranged several stuff
[dwm.git] / main.c
diff --git a/main.c b/main.c
index eff5ce9..39172ee 100644 (file)
--- a/main.c
+++ b/main.c
@@ -3,9 +3,12 @@
  * See LICENSE file for license details.
  */
 
  * See LICENSE file for license details.
  */
 
+#include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include <X11/cursorfont.h>
 #include <X11/Xatom.h>
 
 #include <X11/cursorfont.h>
 #include <X11/Xatom.h>
@@ -18,7 +21,6 @@
 char *tags[TLast] = {
        [Tscratch] = "scratch",
        [Tdev] = "dev",
 char *tags[TLast] = {
        [Tscratch] = "scratch",
        [Tdev] = "dev",
-       [Tirc] = "irc",
        [Twww] = "www",
        [Twork] = "work",
 };
        [Twww] = "www",
        [Twork] = "work",
 };
@@ -34,22 +36,23 @@ Bool running = True;
 Bool issel;
 
 int tsel = Tdev; /* default tag */
 Bool issel;
 
 int tsel = Tdev; /* default tag */
-int screen, sx, sy, sw, sh, mw, th;
+int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
+char stext[1024];
 
 DC dc = {0};
 Client *clients = NULL;
 Client *sel = NULL;
 
 
 DC dc = {0};
 Client *clients = NULL;
 Client *sel = NULL;
 
-static Bool other_wm_running;
+static Bool otherwm;
 static const char version[] =
 static const char version[] =
-       "dwm - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n";
-static int (*x_error_handler) (Display *, XErrorEvent *);
+       "dwm-" VERSION ", (C)opyright MMVI Anselm R. Garbe\n";
+static int (*xerrorxlib)(Display *, XErrorEvent *);
 
 static void
 
 static void
-usage() {      error("usage: dwm [-v]\n"); }
+usage() {      eprint("usage: dwm [-v]\n"); }
 
 static void
 
 static void
-scan_wins()
+scan()
 {
        unsigned int i, num;
        Window *wins;
 {
        unsigned int i, num;
        Window *wins;
@@ -70,6 +73,22 @@ scan_wins()
                XFree(wins);
 }
 
                XFree(wins);
 }
 
+static void
+cleanup()
+{
+       while(sel) {
+               resize(sel, True);
+               unmanage(sel);
+       }
+       XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
+}
+
+void
+quit(Arg *arg)
+{
+       running = False;
+}
+
 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)
 {
@@ -91,7 +110,7 @@ win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
 }
 
 int
 }
 
 int
-win_proto(Window w)
+getproto(Window w)
 {
        unsigned char *protocols;
        long res;
 {
        unsigned char *protocols;
        long res;
@@ -111,7 +130,7 @@ win_proto(Window w)
 }
 
 void
 }
 
 void
-send_message(Window w, Atom a, long value)
+sendevent(Window w, Atom a, long value)
 {
        XEvent e;
 
 {
        XEvent e;
 
@@ -125,71 +144,56 @@ send_message(Window w, Atom a, long value)
        XFlush(dpy);
 }
 
        XFlush(dpy);
 }
 
-/*
- * There's no way to check accesses to destroyed windows, thus
- * those cases are ignored (especially on UnmapNotify's).
- * Other types of errors call Xlib's default error handler, which
- * calls exit().
- */
-int
-error_handler(Display *dpy, XErrorEvent *error)
-{
-       if(error->error_code == BadWindow
-                       || (error->request_code == X_SetInputFocus
-                               && error->error_code == BadMatch)
-                       || (error->request_code == X_PolyText8
-                               && error->error_code == BadDrawable)
-                       || (error->request_code == X_PolyFillRectangle
-                               && error->error_code == BadDrawable)
-                       || (error->request_code == X_PolySegment
-                               && error->error_code == BadDrawable)
-                       || (error->request_code == X_ConfigureWindow
-                               && error->error_code == BadMatch)
-                       || (error->request_code == X_GrabKey
-                               && error->error_code == BadAccess))
-               return 0;
-       fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
-                       error->request_code, error->error_code);
-       return x_error_handler(dpy, error); /* may call exit() */
-}
-
 /*
  * Startup Error handler to check if another window manager
  * is already running.
  */
 static int
 /*
  * Startup Error handler to check if another window manager
  * is already running.
  */
 static int
-startup_error_handler(Display *dpy, XErrorEvent *error)
+xerrorstart(Display *dsply, XErrorEvent *ee)
 {
 {
-       other_wm_running = True;
+       otherwm = True;
        return -1;
 }
 
        return -1;
 }
 
-static void
-cleanup()
-{
-       while(sel) {
-               resize(sel);
-               unmanage(sel);
-       }
-       XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
-}
-
-void
-quit(Arg *arg)
+/*
+ * There's no way to check accesses to destroyed windows, thus
+ * those cases are ignored (especially on UnmapNotify's).
+ * Other types of errors call Xlib's default error handler, which
+ * calls exit().
+ */
+int
+xerror(Display *dpy, XErrorEvent *ee)
 {
 {
-       running = False;
+       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))
+               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() */
 }
 
 int
 main(int argc, char *argv[])
 {
 }
 
 int
 main(int argc, char *argv[])
 {
-       int i;
+       int i, n;
+       fd_set rd;
        XSetWindowAttributes wa;
        unsigned int mask;
        XSetWindowAttributes wa;
        unsigned int mask;
+       Bool readstdin = True;
        Window w;
        XEvent ev;
 
        Window w;
        XEvent ev;
 
-       /* command line args */
        for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
                switch (argv[i][1]) {
                case 'v':
        for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
                switch (argv[i][1]) {
                case 'v':
@@ -204,69 +208,116 @@ main(int argc, char *argv[])
 
        dpy = XOpenDisplay(0);
        if(!dpy)
 
        dpy = XOpenDisplay(0);
        if(!dpy)
-               error("dwm: cannot connect X server\n");
+               eprint("dwm: cannot connect X server\n");
 
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
 
        /* check if another WM is already running */
 
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
 
        /* check if another WM is already running */
-       other_wm_running = False;
-       XSetErrorHandler(startup_error_handler);
+       otherwm = False;
+       XSetErrorHandler(xerrorstart);
        /* this causes an error if some other WM is running */
        XSelectInput(dpy, root, SubstructureRedirectMask);
        XFlush(dpy);
 
        /* this causes an error if some other WM is running */
        XSelectInput(dpy, root, SubstructureRedirectMask);
        XFlush(dpy);
 
-       if(other_wm_running)
-               error("dwm: another window manager is already running\n");
-
-       sx = sy = 0;
-       sw = DisplayWidth(dpy, screen);
-       sh = DisplayHeight(dpy, screen);
-       mw = (sw * MASTERW) / 100;
-       issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
+       if(otherwm)
+               eprint("dwm: another window manager is already running\n");
 
        XSetErrorHandler(0);
 
        XSetErrorHandler(0);
-       x_error_handler = XSetErrorHandler(error_handler);
+       xerrorxlib = XSetErrorHandler(xerror);
 
        /* init atoms */
        wm_atom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
        wm_atom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
        net_atom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        net_atom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
 
        /* init atoms */
        wm_atom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
        wm_atom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
        net_atom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        net_atom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
-
        XChangeProperty(dpy, root, net_atom[NetSupported], XA_ATOM, 32,
                        PropModeReplace, (unsigned char *) net_atom, NetLast);
 
        XChangeProperty(dpy, root, net_atom[NetSupported], XA_ATOM, 32,
                        PropModeReplace, (unsigned char *) net_atom, 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);
 
-       update_keys();
+       grabkeys();
 
        /* style */
 
        /* style */
-       dc.bg = initcolor(BGCOLOR);
-       dc.fg = initcolor(FGCOLOR);
-       dc.border = initcolor(BORDERCOLOR);
-       initfont(FONT);
+       dc.bg = getcolor(BGCOLOR);
+       dc.fg = getcolor(FGCOLOR);
+       dc.border = getcolor(BORDERCOLOR);
+       setfont(FONT);
+
+       sx = sy = 0;
+       sw = DisplayWidth(dpy, screen);
+       sh = DisplayHeight(dpy, screen);
+       mw = (sw * MASTERW) / 100;
+
+       wa.override_redirect = 1;
+       wa.background_pixmap = ParentRelative;
+       wa.event_mask = ButtonPressMask | ExposureMask;
 
 
-       th = dc.font.height + 4;
+       bx = by = 0;
+       bw = sw;
+       dc.h = bh = dc.font.height + 4;
+       barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
+                       CopyFromParent, DefaultVisual(dpy, screen),
+                       CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
+       XDefineCursor(dpy, barwin, cursor[CurNormal]);
+       XMapRaised(dpy, barwin);
 
 
-       dc.drawable = XCreatePixmap(dpy, root, sw, th, DefaultDepth(dpy, screen));
+       dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
        dc.gc = XCreateGC(dpy, root, 0, 0);
        dc.gc = XCreateGC(dpy, root, 0, 0);
+       drawstatus();
+
+       issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
 
        wa.event_mask = SubstructureRedirectMask | EnterWindowMask \
                                        | LeaveWindowMask;
        wa.cursor = cursor[CurNormal];
 
        wa.event_mask = SubstructureRedirectMask | EnterWindowMask \
                                        | LeaveWindowMask;
        wa.cursor = cursor[CurNormal];
+
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 
-       scan_wins();
+       strcpy(stext, "dwm-"VERSION);
+       scan();
 
 
+       /* main event loop, reads status text from stdin as well */
+Mainloop:
        while(running) {
        while(running) {
-               XNextEvent(dpy, &ev);
-               if(handler[ev.type])
-                       (handler[ev.type])(&ev); /* call handler */
+               FD_ZERO(&rd);
+               if(readstdin)
+                       FD_SET(STDIN_FILENO, &rd);
+               FD_SET(ConnectionNumber(dpy), &rd);
+
+               i = select(ConnectionNumber(dpy) + 1, &rd, 0, 0, 0);
+               if(i == -1 && errno == EINTR)
+                       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(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;
+                               drawstatus();
+                       }
+               }
        }
 
        cleanup();
        }
 
        cleanup();