made code more readable

[dwm.git] / wm.c

diff --git a/wm.c b/wm.c
index 038e6b9..837be3c 100644 (file)
--- a/wm.c
+++ b/wm.c
@@ -3,10 +3,15 @@
  * 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 <sys/types.h>
+#include <sys/time.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>


@@ -20,19 +25,24 @@ Atom wm_atom[WMLast], net_atom[NetLast];
 Cursor cursor[CurLast];
 XRectangle rect, barrect;
 Bool running = True;
 Cursor cursor[CurLast];
 XRectangle rect, barrect;
 Bool running = True;

-Client *client = NULL;
+Bool sel_screen;

 
 

-char *bartext, tag[256];
-int screen, sel_screen;
+char statustext[1024], tag[256];
+int screen;

 
 

-/* draw structs */

 Brush brush = {0};
 Brush brush = {0};

-
-enum { WM_PROTOCOL_DELWIN = 1 };
+Client *clients = NULL;
+Client *stack = NULL;

 
 static Bool other_wm_running;
 
 static Bool other_wm_running;

+static const char version[] = "gridwm - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n";

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

-static char version[] = "gridwm - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n";
+
+static const char *status[] = {
+       "sh", "-c", "echo -n `date '+%Y/%m/%d %H:%M'`" 
+       " `uptime | sed 's/.*://; s/,//g'`"
+       " `acpi | awk '{print $4}' | sed 's/,//'`", 0
+};

 
 static void
 usage()
 
 static void
 usage()


@@ -56,7 +66,7 @@ scan_wins()
                        if(wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
                                continue;
                        if(wa.map_state == IsViewable)
                        if(wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
                                continue;
                        if(wa.map_state == IsViewable)

-                               manage(create_client(wins[i], &wa));
+                               manage(wins[i], &wa);

                }
        }
        if(wins)
                }
        }
        if(wins)


@@ -74,11 +84,12 @@ win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
        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);
 

-       if(status != Success || *prop == NULL) {
+       if(status != Success || *prop == 0) {

                return 0;
        }
                return 0;
        }

-       if(res == 0)
+       if(res == 0) {

                free((void *) *prop);
                free((void *) *prop);

+       }

        return res;
 }
 
        return res;
 }
 


@@ -103,13 +114,28 @@ win_proto(Window w)
        return protos;
 }
 
        return protos;
 }
 

+void
+send_message(Window w, Atom a, long value)
+{
+       XEvent e;
+
+       e.type = ClientMessage;
+       e.xclient.window = w;
+       e.xclient.message_type = a;
+       e.xclient.format = 32;
+       e.xclient.data.l[0] = value;
+       e.xclient.data.l[1] = CurrentTime;
+       XSendEvent(dpy, w, False, NoEventMask, &e);
+       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().
  */
 /*
  * 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().
  */

-static int
+int

 error_handler(Display *dpy, XErrorEvent *error)
 {
        if(error->error_code == BadWindow
 error_handler(Display *dpy, XErrorEvent *error)
 {
        if(error->error_code == BadWindow


@@ -145,12 +171,9 @@ startup_error_handler(Display *dpy, XErrorEvent *error)
 static void
 cleanup()
 {
 static void
 cleanup()
 {

-       /*
-       Client *c;
-       for(c=client; c; c=c->next)
-               reparent_client(c, root, c->sel->rect.x, c->sel->rect.y);
+       while(clients)
+               unmanage(clients);

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

-       */

 }
 
 int
 }
 
 int


@@ -161,6 +184,11 @@ main(int argc, char *argv[])
        unsigned int mask;
        Window w;
        XEvent ev;
        unsigned int mask;
        Window w;
        XEvent ev;

+       fd_set fds;
+       struct timeval t, timeout = {
+               .tv_usec = 0,
+               .tv_sec = STATUSDELAY,
+       };

 
        /* command line args */
        for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
 
        /* command line args */
        for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {


@@ -201,7 +229,6 @@ main(int argc, char *argv[])
        x_error_handler = XSetErrorHandler(error_handler);
 
        /* init atoms */
        x_error_handler = XSetErrorHandler(error_handler);
 
        /* init atoms */

-       wm_atom[WMState] = XInternAtom(dpy, "WM_STATE", False);

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


@@ -237,21 +264,34 @@ main(int argc, char *argv[])
                        barrect.width, barrect.height, 0, DefaultDepth(dpy, screen),
                        CopyFromParent, DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
                        barrect.width, barrect.height, 0, DefaultDepth(dpy, screen),
                        CopyFromParent, DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);

-       bartext = NULL;

        XDefineCursor(dpy, barwin, cursor[CurNormal]);
        XMapRaised(dpy, barwin);
        XDefineCursor(dpy, barwin, cursor[CurNormal]);
        XMapRaised(dpy, barwin);

+       pipe_spawn(statustext, sizeof(statustext), dpy, (char **)status);

        draw_bar();
 
        draw_bar();
 

-       wa.event_mask = SubstructureRedirectMask | EnterWindowMask | LeaveWindowMask;
+       wa.event_mask = SubstructureRedirectMask | EnterWindowMask \
+                                       | LeaveWindowMask;

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

-               XNextEvent(dpy, &ev);
-               if(handler[ev.type])
-                       (handler[ev.type]) (&ev); /* call handler */
+               if(XPending(dpy) > 0) {
+                       XNextEvent(dpy, &ev);
+                       if(handler[ev.type])
+                               (handler[ev.type]) (&ev); /* call handler */
+                       continue;
+               }
+               FD_ZERO(&fds);
+               FD_SET(ConnectionNumber(dpy), &fds);
+               t = timeout;
+               if(select(ConnectionNumber(dpy) + 1, &fds, NULL, NULL, &t) > 0)
+                       continue;
+               else if(errno != EINTR) {
+                       pipe_spawn(statustext, sizeof(statustext), dpy, (char **)status);
+                       draw_bar();
+               }

        }
 
        cleanup();
        }
 
        cleanup();