renamed draw into drw

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 90505b1..7941bd1 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -40,6 +40,9 @@
 #include <X11/extensions/Xinerama.h>
 #endif /* XINERAMA */
 
 #include <X11/extensions/Xinerama.h>
 #endif /* XINERAMA */
 

+#include "drw.h"
+#include "util.h"
+

 /* macros */
 #define BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)
 #define CLEANMASK(mask)         (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
 /* macros */
 #define BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)
 #define CLEANMASK(mask)         (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))


@@ -47,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)


@@ -174,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);


@@ -575,8 +575,9 @@ configurenotify(XEvent *e) {
        XConfigureEvent *ev = &e->xconfigure;
        Bool dirty;
 
        XConfigureEvent *ev = &e->xconfigure;
        Bool dirty;
 

+       // TODO: updategeom handling sucks, needs to be simplified

        if(ev->window == root) {
        if(ev->window == root) {

-               dirty = (sw != ev->width);
+               dirty = (sw != ev->width || sh != ev->height);

                sw = ev->width;
                sh = ev->height;
                if(updategeom() || dirty) {
                sw = ev->width;
                sh = ev->height;
                if(updategeom() || dirty) {


@@ -692,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;


@@ -1235,6 +1226,8 @@ movemouse(const Arg *arg) {
 
        if(!(c = selmon->sel))
                return;
 
        if(!(c = selmon->sel))
                return;

+       if(c->isfullscreen) /* no support moving fullscreen windows by mouse */
+               return;

        restack(selmon);
        ocx = c->x;
        ocy = c->y;
        restack(selmon);
        ocx = c->x;
        ocy = c->y;


@@ -1268,11 +1261,8 @@ movemouse(const Arg *arg) {
                                && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
                                        togglefloating(NULL);
                        }
                                && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
                                        togglefloating(NULL);
                        }

-                       if(!selmon->lt[selmon->sellt]->arrange || c->isfloating) {
-                               if(c->isfullscreen)
-                                       setfullscreen(c, False);
+                       if(!selmon->lt[selmon->sellt]->arrange || c->isfloating)

                                resize(c, nx, ny, c->w, c->h, True);
                                resize(c, nx, ny, c->w, c->h, True);

-                       }

                        break;
                }
        } while(ev.type != ButtonRelease);
                        break;
                }
        } while(ev.type != ButtonRelease);


@@ -1382,6 +1372,8 @@ resizemouse(const Arg *arg) {
 
        if(!(c = selmon->sel))
                return;
 
        if(!(c = selmon->sel))
                return;

+       if(c->isfullscreen) /* no support resizing fullscreen windows by mouse */
+               return;

        restack(selmon);
        ocx = c->x;
        ocy = c->y;
        restack(selmon);
        ocx = c->x;
        ocy = c->y;


@@ -1407,11 +1399,8 @@ resizemouse(const Arg *arg) {
                                && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
                                        togglefloating(NULL);
                        }
                                && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
                                        togglefloating(NULL);
                        }

-                       if(!selmon->lt[selmon->sellt]->arrange || c->isfloating) {
-                               if(c->isfullscreen)
-                                       setfullscreen(c, False);
+                       if(!selmon->lt[selmon->sellt]->arrange || c->isfloating)

                                resize(c, c->x, c->y, nw, nh, True);
                                resize(c, c->x, c->y, nw, nh, True);

-                       }

                        break;
                }
        } while(ev.type != ButtonRelease);
                        break;
                }
        } while(ev.type != ButtonRelease);


@@ -1759,12 +1748,12 @@ void
 togglefloating(const Arg *arg) {
        if(!selmon->sel)
                return;
 togglefloating(const Arg *arg) {
        if(!selmon->sel)
                return;

+       if(selmon->sel->isfullscreen) /* no support for fullscreen windows */
+               return;

        selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
        if(selmon->sel->isfloating)
                resize(selmon->sel, selmon->sel->x, selmon->sel->y,
                       selmon->sel->w, selmon->sel->h, False);
        selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
        if(selmon->sel->isfloating)
                resize(selmon->sel, selmon->sel->x, selmon->sel->y,
                       selmon->sel->w, selmon->sel->h, False);

-       else if(selmon->sel->isfullscreen)
-               setfullscreen(selmon->sel, False);

        arrange(selmon);
 }
 
        arrange(selmon);
 }