prepared 0.3

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index 6843870..5a714f2 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -8,9 +8,14 @@
 /********** CUSTOMIZE **********/
 
 #define FONT                           "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*"
+#define BGCOLOR                                "#0a2c2d"
+#define FGCOLOR                                "#ddeeee"
+#define BORDERCOLOR                    "#176164"
+/*
 #define BGCOLOR                                "#666699"
 #define FGCOLOR                                "#eeeeee"
 #define BORDERCOLOR                    "#9999CC"
+*/
 #define MASTERW                                52 /* percent */
 #define WM_PROTOCOL_DELWIN     1
 
@@ -20,8 +25,9 @@ enum { Tscratch, Tdev, Twww, Twork, TLast };
 /********** CUSTOMIZE **********/
 
 typedef union Arg Arg;
-typedef struct DC DC;
 typedef struct Client Client;
+typedef enum Corner Corner;
+typedef struct DC DC;
 typedef struct Fnt Fnt;
 typedef struct Key Key;
 typedef struct Rule Rule;
@@ -32,52 +38,56 @@ union Arg {
 };
 
 /* atoms */
-enum { WMProtocols, WMDelete, WMLast };
 enum { NetSupported, NetWMName, NetLast };
+enum { WMProtocols, WMDelete, WMLast };
 
 /* cursor */
-enum { CurNormal, CurResize, CurMove, CurInput, CurLast };
+enum { CurNormal, CurResize, CurMove, CurLast };
+
+enum Corner { TopLeft, TopRight, BotLeft, BotRight };
 
 struct Fnt {
-       XFontStruct *xfont;
-       XFontSet set;
        int ascent;
        int descent;
        int height;
+       XFontSet set;
+       XFontStruct *xfont;
 };
 
 struct DC { /* draw context */
-       GC gc;
-       Drawable drawable;
        int x, y, w, h;
-       Fnt font;
        unsigned long bg;
        unsigned long fg;
        unsigned long border;
+       Drawable drawable;
+       Fnt font;
+       GC gc;
 };
 
 struct Client {
        char name[256];
        char *tags[TLast];
        int proto;
-       int x, y, w, h;
-       int tx, ty, tw, th;
+       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 basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int grav;
        unsigned int border;
        long flags; 
-       Bool floating;
-       Window win;
-       Window title;
+       Bool isfloat;
        Client *next;
        Client *revert;
+       Window win;
+       Window title;
 };
 
 struct Rule {
        const char *class;
        const char *instance;
        char *tags[TLast];
-       Bool floating;
+       Bool isfloat;
 };
 
 struct Key {
@@ -87,69 +97,68 @@ struct Key {
        Arg arg;
 };
 
-extern Display *dpy;
-extern Window root, barwin;
-extern Atom wm_atom[WMLast], net_atom[NetLast];
-extern Cursor cursor[CurLast];
-extern Bool running, issel;
+extern char *tags[TLast], stext[1024];
+extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
 extern void (*handler[LASTEvent])(XEvent *);
 extern void (*arrange)(Arg *);
-
-extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
-extern char *tags[TLast], stext[1024];
-
-extern DC dc;
+extern Atom wmatom[WMLast], netatom[NetLast];
+extern Bool running, issel;
 extern Client *clients, *sel;
-
-/* bar.c */
-extern void draw_bar();
-extern void barclick(XButtonPressedEvent *e);
+extern Cursor cursor[CurLast];
+extern DC dc;
+extern Display *dpy;
+extern Key key[];
+extern Window root, barwin;
 
 /* client.c */
-extern void manage(Window w, XWindowAttributes *wa);
-extern void unmanage(Client *c);
-extern Client *getclient(Window w);
+extern void ban(Client *c);
 extern void focus(Client *c);
-extern void update_name(Client *c);
-extern void draw_client(Client *c);
-extern void resize(Client *c, Bool inc);
-extern void update_size(Client *c);
-extern Client *gettitle(Window w);
-extern void craise(Client *c);
+extern void focusnext(Arg *arg);
+extern void focusprev(Arg *arg);
+extern Client *getclient(Window w);
+extern Client *getctitle(Window w);
+extern void gravitate(Client *c, Bool invert);
+extern void higher(Client *c);
+extern void killclient(Arg *arg);
 extern void lower(Client *c);
-extern void ckill(Arg *arg);
-extern void nextc(Arg *arg);
-extern void prevc(Arg *arg);
-extern void max(Arg *arg);
-extern void floating(Arg *arg);
-extern void tiling(Arg *arg);
-extern void ttrunc(Arg *arg);
-extern void tappend(Arg *arg);
-extern void view(Arg *arg);
+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 unmanage(Client *c);
 extern void zoom(Arg *arg);
-extern void gravitate(Client *c, Bool invert);
 
 /* draw.c */
-extern void drawtext(const char *text, Bool invert, Bool border);
-extern unsigned long initcolor(const char *colstr);
-extern void initfont(const char *fontstr);
-extern unsigned int textnw(char *text, unsigned int len);
+extern void drawall();
+extern void drawstatus();
+extern void drawtitle(Client *c);
+extern unsigned long getcolor(const char *colstr);
+extern void setfont(const char *fontstr);
 extern unsigned int textw(char *text);
-extern unsigned int texth(void);
 
-/* dev.c */
-extern void update_keys(void);
-extern void keypress(XEvent *e);
-extern void mresize(Client *c);
-extern void mmove(Client *c);
+/* event.c */
+extern void grabkeys();
 
 /* main.c */
-extern int error_handler(Display *dsply, XErrorEvent *e);
-extern void send_message(Window w, Atom a, long value);
-extern int win_proto(Window w);
+extern int getproto(Window w);
 extern void quit(Arg *arg);
+extern void sendevent(Window w, Atom a, long value);
+extern int xerror(Display *dsply, XErrorEvent *ee);
+
+/* tag.c */
+extern void appendtag(Arg *arg);
+extern void dofloat(Arg *arg);
+extern void dotile(Arg *arg);
+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 view(Arg *arg);
 
 /* util.c */
-extern void error(const char *errstr, ...);
 extern void *emallocz(unsigned int size);
+extern void eprint(const char *errstr, ...);
 extern void spawn(Arg *arg);