made status bar drawing more robust, implemented togglemax and togglemode, works...

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index d3138be..1529d17 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -11,6 +11,7 @@
 #define BGCOLOR                                "#0a2c2d"
 #define FGCOLOR                                "#ddeeee"
 #define BORDERCOLOR                    "#176164"
+#define MODKEY                          Mod1Mask /* Mod4Mask */
 /*
 #define BGCOLOR                                "#666699"
 #define FGCOLOR                                "#eeeeee"
@@ -25,12 +26,10 @@ enum { Tscratch, Tdev, Twww, Twork, TLast };
 /********** CUSTOMIZE **********/
 
 typedef union Arg Arg;
+typedef struct Client Client;
 typedef enum Corner Corner;
 typedef struct DC DC;
-typedef struct Client Client;
 typedef struct Fnt Fnt;
-typedef struct Key Key;
-typedef struct Rule Rule;
 
 union Arg {
        const char **argv;
@@ -44,7 +43,7 @@ enum { WMProtocols, WMDelete, WMLast };
 /* cursor */
 enum { CurNormal, CurResize, CurMove, CurLast };
 
-enum Corner { TopLeft, TopRight, BottomLeft, BottomRight };
+enum Corner { TopLeft, TopRight, BotLeft, BotRight };
 
 struct Fnt {
        int ascent;
@@ -68,35 +67,20 @@ struct Client {
        char name[256];
        char *tags[TLast];
        int proto;
-       int *x, *y, *w, *h; /* current geom */
-       int bx, by, bw, bh; /* title bar */
-       int fx, fy, fw, fh; /* floating geom */
-       int tx, ty, tw, th; /* tiled geom */
+       int x, y, w, h;
+       int tx, ty, tw, th; /* title */
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int grav;
        unsigned int border;
        long flags; 
        Bool isfloat;
+       Bool ismax;
        Client *next;
        Client *revert;
        Window win;
        Window title;
 };
 
-struct Rule {
-       const char *class;
-       const char *instance;
-       char *tags[TLast];
-       Bool isfloat;
-};
-
-struct Key {
-       unsigned long mod;
-       KeySym keysym;
-       void (*func)(Arg *arg);
-       Arg arg;
-};
-
 extern char *tags[TLast], stext[1024];
 extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
 extern void (*handler[LASTEvent])(XEvent *);
@@ -107,7 +91,6 @@ extern Client *clients, *sel;
 extern Cursor cursor[CurLast];
 extern DC dc;
 extern Display *dpy;
-extern Key key[];
 extern Window root, barwin;
 
 /* client.c */
@@ -122,12 +105,11 @@ extern void higher(Client *c);
 extern void killclient(Arg *arg);
 extern void lower(Client *c);
 extern void manage(Window w, XWindowAttributes *wa);
-extern void maximize(Arg *arg);
 extern void pop(Client *c);
 extern void resize(Client *c, Bool inc, Corner sticky);
-extern void setgeom(Client *c);
 extern void setsize(Client *c);
 extern void settitle(Client *c);
+extern void togglemax(Arg *arg);
 extern void unmanage(Client *c);
 extern void zoom(Arg *arg);
 
@@ -156,6 +138,7 @@ extern Client *getnext(Client *c, unsigned int t);
 extern void heretag(Arg *arg);
 extern void replacetag(Arg *arg);
 extern void settags(Client *c);
+extern void togglemode(Arg *arg);
 extern void view(Arg *arg);
 
 /* util.c */