continued with draw.c and draw.h implementation, now the integration begins

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 6695ddf..d9443da 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -36,12 +36,12 @@
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>

-#include <X11/XKBlib.h>

 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif /* XINERAMA */
 
 #include "draw.h"
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif /* XINERAMA */
 
 #include "draw.h"

+#include "util.h"

 
 /* macros */
 #define BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)
 
 /* macros */
 #define BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)


@@ -50,8 +50,6 @@
                                * MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))
 #define ISVISIBLE(C)            ((C->tags & C->mon->tagset[C->mon->seltags]))
 #define LENGTH(X)               (sizeof X / sizeof X[0])
                                * MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))
 #define ISVISIBLE(C)            ((C->tags & C->mon->tagset[C->mon->seltags]))
 #define LENGTH(X)               (sizeof X / sizeof X[0])

-#define MAX(A, B)               ((A) > (B) ? (A) : (B))
-#define MIN(A, B)               ((A) < (B) ? (A) : (B))

 #define MOUSEMASK               (BUTTONMASK|PointerMotionMask)
 #define WIDTH(X)                ((X)->w + 2 * (X)->bw)
 #define HEIGHT(X)               ((X)->h + 2 * (X)->bw)
 #define MOUSEMASK               (BUTTONMASK|PointerMotionMask)
 #define WIDTH(X)                ((X)->w + 2 * (X)->bw)
 #define HEIGHT(X)               ((X)->h + 2 * (X)->bw)


@@ -177,7 +175,6 @@ static Monitor *createmon(void);
 static void destroynotify(XEvent *e);
 static void detach(Client *c);
 static void detachstack(Client *c);
 static void destroynotify(XEvent *e);
 static void detach(Client *c);
 static void detachstack(Client *c);

-static void die(const char *errstr, ...);

 static Monitor *dirtomon(int dir);
 static void drawbar(Monitor *m);
 static void drawbars(void);
 static Monitor *dirtomon(int dir);
 static void drawbar(Monitor *m);
 static void drawbars(void);


@@ -281,7 +278,7 @@ static void (*handler[LASTEvent]) (XEvent *) = {
        [UnmapNotify] = unmapnotify
 };
 static Atom wmatom[WMLast], netatom[NetLast];
        [UnmapNotify] = unmapnotify
 };
 static Atom wmatom[WMLast], netatom[NetLast];

-static Bool running = True, usexkb;
+static Bool running = True;

 static Cursor cursor[CurLast];
 static Display *dpy;
 static DC dc;
 static Cursor cursor[CurLast];
 static Display *dpy;
 static DC dc;


@@ -696,16 +693,6 @@ detachstack(Client *c) {
        }
 }
 
        }
 }
 

-void
-die(const char *errstr, ...) {
-       va_list ap;
-
-       va_start(ap, errstr);
-       vfprintf(stderr, errstr, ap);
-       va_end(ap);
-       exit(EXIT_FAILURE);
-}
-

 Monitor *
 dirtomon(int dir) {
        Monitor *m = NULL;
 Monitor *
 dirtomon(int dir) {
        Monitor *m = NULL;


@@ -1093,10 +1080,7 @@ keypress(XEvent *e) {
        XKeyEvent *ev;
 
        ev = &e->xkey;
        XKeyEvent *ev;
 
        ev = &e->xkey;

-       if(usexkb)
-               keysym = XkbKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0, 0);
-       else
-               keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
+       keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);

        for(i = 0; i < LENGTH(keys); i++)
                if(keysym == keys[i].keysym
                && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
        for(i = 0; i < LENGTH(keys); i++)
                if(keysym == keys[i].keysym
                && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)


@@ -1606,7 +1590,6 @@ setmfact(const Arg *arg) {
 void
 setup(void) {
        XSetWindowAttributes wa;
 void
 setup(void) {
        XSetWindowAttributes wa;

-       int dummy = 0, xkbmajor = XkbMajorVersion, xkbminor = XkbMinorVersion;

 
        /* clean up any zombies immediately */
        sigchld(0);
 
        /* clean up any zombies immediately */
        sigchld(0);


@@ -1661,8 +1644,6 @@ setup(void) {
                        |EnterWindowMask|LeaveWindowMask|StructureNotifyMask|PropertyChangeMask;
        XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
        XSelectInput(dpy, root, wa.event_mask);
                        |EnterWindowMask|LeaveWindowMask|StructureNotifyMask|PropertyChangeMask;
        XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
        XSelectInput(dpy, root, wa.event_mask);

-       /* init xkb */
-       usexkb = XkbQueryExtension(dpy, &dummy, &dummy, &dummy, &xkbmajor, &xkbminor);

        grabkeys();
 }
 
        grabkeys();
 }