new stuff (some warning elimination)

[dwm.git] / wm.c

diff --git a/wm.c b/wm.c
index 02b9a68..6d67bfc 100644 (file)
--- a/wm.c
+++ b/wm.c
@@ -3,52 +3,51 @@
  * 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 "wm.h"
 
 #include <X11/cursorfont.h>
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
 
 #include "wm.h"
 

+/********** CUSTOMIZE **********/
+
+char *tags[TLast] = {
+       [Tscratch] = "scratch",
+       [Tdev] = "dev",
+       [Tirc] = "irc",
+       [Twww] = "www",
+       [Twork] = "work",
+};
+
+/********** CUSTOMIZE **********/
+

 /* X structs */
 Display *dpy;
 Window root, barwin;
 Atom wm_atom[WMLast], net_atom[NetLast];
 Cursor cursor[CurLast];
 Bool running = True;
 /* X structs */
 Display *dpy;
 Window root, barwin;
 Atom wm_atom[WMLast], net_atom[NetLast];
 Cursor cursor[CurLast];
 Bool running = True;

-Bool sel_screen;
+Bool issel;

 
 

-char statustext[1024], tag[256];
-int screen, sx, sy, sw, sh, bx, by, bw, bh;
+char stext[1024];
+int tsel = Tdev; /* default tag */
+int screen, sx, sy, sw, sh, th;

 
 Brush brush = {0};
 Client *clients = NULL;
 Client *stack = NULL;
 
 static Bool other_wm_running;
 
 Brush brush = {0};
 Client *clients = NULL;
 Client *stack = NULL;
 
 static Bool other_wm_running;

-static const char version[] = "gridwm - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n";
+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 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
 static void

-usage()
-{
-       fputs("usage: gridwm [-v]\n", stderr);
-       exit(1);
-}
+usage() {      error("usage: gridwm [-v]\n"); }

 
 static void
 scan_wins()
 
 static void
 scan_wins()


@@ -95,13 +94,12 @@ win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
 int
 win_proto(Window w)
 {
 int
 win_proto(Window w)
 {

-       Atom *protocols;
+       unsigned char *protocols;

        long res;
        int protos = 0;
        int i;
 
        long res;
        int protos = 0;
        int i;
 

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

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


@@ -175,12 +173,6 @@ cleanup()
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
 }
 
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
 }
 

-void
-run(void *aux)
-{
-       spawn(dpy, aux);
-}
-

 void
 quit(void *aux)
 {
 void
 quit(void *aux)
 {


@@ -195,11 +187,6 @@ 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++) {


@@ -234,7 +221,7 @@ main(int argc, char *argv[])
        sx = sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        sx = sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);

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

 
        XSetErrorHandler(0);
        x_error_handler = XSetErrorHandler(error_handler);
 
        XSetErrorHandler(0);
        x_error_handler = XSetErrorHandler(error_handler);


@@ -257,51 +244,26 @@ main(int argc, char *argv[])
        update_keys();
 
        /* style */
        update_keys();
 
        /* style */

-       loadcolors(dpy, screen, &brush, BGCOLOR, FGCOLOR, BORDERCOLOR);
-       loadfont(dpy, &brush.font, FONT);
-
-       wa.override_redirect = 1;
-       wa.background_pixmap = ParentRelative;
-       wa.event_mask = ExposureMask;
-
-       bx = by = 0;
-       bw = sw;
-       bh = texth(&brush.font);
-       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);
-
-       brush.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
-       brush.gc = XCreateGC(dpy, root, 0, 0);
+       loadcolors(screen, &brush, BGCOLOR, FGCOLOR, BORDERCOLOR);
+       loadfont(&brush.font, FONT);

 
 

-       pipe_spawn(statustext, sizeof(statustext), dpy, (char **)status);
-       draw_bar();
+       th = texth(&brush.font);
+
+       brush.drawable = XCreatePixmap(dpy, root, sw, th, DefaultDepth(dpy, screen));
+       brush.gc = XCreateGC(dpy, root, 0, 0);

 
        wa.event_mask = SubstructureRedirectMask | EnterWindowMask \
                                        | LeaveWindowMask;
        wa.cursor = cursor[CurNormal];
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 
 
        wa.event_mask = SubstructureRedirectMask | EnterWindowMask \
                                        | LeaveWindowMask;
        wa.cursor = cursor[CurNormal];
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 

+       arrange = grid;

        scan_wins();
 
        while(running) {
        scan_wins();
 
        while(running) {

-               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();
-               }
+               XNextEvent(dpy, &ev);
+               if(handler[ev.type])
+                       (handler[ev.type])(&ev); /* call handler */

        }
 
        cleanup();
        }
 
        cleanup();