added dev.c instead of kb.c

[dwm.git] / wm.c

diff --git a/wm.c b/wm.c
index 1c9e1f9..ed002f7 100644 (file)
--- a/wm.c
+++ b/wm.c
@@ -3,15 +3,10 @@
  * 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>


@@ -28,17 +23,6 @@ char *tags[TLast] = {
        [Twork] = "work",
 };
 
        [Twork] = "work",
 };
 

-/* commands */
-static char *cmdwallpaper[] = {
-       "feh", "--bg-scale", "/home/garbeam/wallpaper/bg.jpg", NULL
-};
-
-static char *cmdstatus[] = {
-       "sh", "-c", "echo -n `date '+%Y-%m-%d %H:%M'`" 
-       " `uptime | sed 's/.*://; s/,//g'`"
-       " `acpi | awk '{print $4}' | sed 's/,//'`", NULL
-};
-

 /********** CUSTOMIZE **********/
 
 /* X structs */
 /********** CUSTOMIZE **********/
 
 /* X structs */


@@ -51,19 +35,19 @@ Bool issel;
 
 char stext[1024];
 int tsel = Tdev; /* default tag */
 
 char stext[1024];
 int tsel = Tdev; /* default tag */

-int screen, sx, sy, sw, sh, bx, by, bw, bh;
+int screen, sx, sy, sw, sh, th;

 
 

-Brush brush = {0};
+DC dc = {0};

 Client *clients = NULL;
 Client *stack = NULL;
 
 static Bool other_wm_running;
 static const char version[] =
 Client *clients = NULL;
 Client *stack = NULL;
 
 static Bool other_wm_running;
 static const char version[] =

-       "gridwm - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n";
+       "dwm - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n";

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

-usage() {      error("usage: gridwm [-v]\n"); }
+usage() {      error("usage: dwm [-v]\n"); }

 
 static void
 scan_wins()
 
 static void
 scan_wins()


@@ -165,7 +149,7 @@ error_handler(Display *dpy, XErrorEvent *error)
                        || (error->request_code == X_GrabKey
                                && error->error_code == BadAccess))
                return 0;
                        || (error->request_code == X_GrabKey
                                && error->error_code == BadAccess))
                return 0;

-       fprintf(stderr, "gridwm: fatal error: request code=%d, error code=%d\n",
+       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() */
 }
                        error->request_code, error->error_code);
        return x_error_handler(dpy, error); /* may call exit() */
 }


@@ -189,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)
 {


@@ -209,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++) {


@@ -230,7 +203,7 @@ main(int argc, char *argv[])
 
        dpy = XOpenDisplay(0);
        if(!dpy)
 
        dpy = XOpenDisplay(0);
        if(!dpy)

-               error("gridwm: cannot connect X server\n");
+               error("dwm: cannot connect X server\n");

 
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
 
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);


@@ -243,9 +216,8 @@ main(int argc, char *argv[])
        XFlush(dpy);
 
        if(other_wm_running)
        XFlush(dpy);
 
        if(other_wm_running)

-               error("gridwm: another window manager is already running\n");
+               error("dwm: another window manager is already running\n");

 
 

-       spawn(dpy, cmdwallpaper);

        sx = sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        sx = sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);


@@ -272,52 +244,25 @@ 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;
+       initcolors(BGCOLOR, FGCOLOR, BORDERCOLOR);
+       initfont(&dc.font, FONT);

 
 

-       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);
+       th = texth(&dc.font);

 
 

-       brush.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
-       brush.gc = XCreateGC(dpy, root, 0, 0);
-
-       pipe_spawn(stext, sizeof(stext), dpy, cmdstatus);
-       draw_bar();
+       dc.drawable = XCreatePixmap(dpy, root, sw, th, DefaultDepth(dpy, screen));
+       dc.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(stext, sizeof(stext), dpy, cmdstatus);
-                       draw_bar();
-               }
+               XNextEvent(dpy, &ev);
+               if(handler[ev.type])
+                       (handler[ev.type])(&ev); /* call handler */

        }
 
        cleanup();
        }
 
        cleanup();