X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.h;h=def66bfd3a80c73c0144fb29a29b6f0d44403d07;hb=c0705eeb65733e8c5091e47d5bdc701a0779a949;hp=49aa1260cf938bfc51aa2d87fa1f42002345b3d0;hpb=efa7e514012865fcb3e9ea6e7d5b5c87d84353e5;p=dwm.git

diff --git a/dwm.h b/dwm.h
index 49aa126..def66bf 100644
--- a/dwm.h
+++ b/dwm.h
@@ -7,22 +7,24 @@
 
 /********** CUSTOMIZE **********/
 
-#define FONT		"-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*"
-#define BGCOLOR		"DarkSlateGrey"
-#define FGCOLOR		"LightSteelBlue"
-#define BORDERCOLOR	"SlateGray"
-#define WM_PROTOCOL_DELWIN 1
+#define FONT				"-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*"
+#define BGCOLOR				"#666699"
+#define FGCOLOR				"#eeeeee"
+#define BORDERCOLOR			"#9999CC"
+#define MASTERW				52 /* percent */
+#define WM_PROTOCOL_DELWIN	1
 
 /* tags */
-enum { Tscratch, Tdev, Tirc, Twww, Twork, TLast };
+enum { Tscratch, Tdev, Twww, Twork, TLast };
 
 /********** CUSTOMIZE **********/
 
+typedef union Arg Arg;
 typedef struct DC DC;
 typedef struct Client Client;
 typedef struct Fnt Fnt;
 typedef struct Key Key;
-typedef union Arg Arg;
+typedef struct Rule Rule;
 
 union Arg {
 	const char **argv;
@@ -64,13 +66,20 @@ struct Client {
 	int grav;
 	unsigned int border;
 	long flags; 
+	Bool floating;
 	Window win;
-	Window trans;
 	Window title;
 	Client *next;
 	Client *revert;
 };
 
+struct Rule {
+	const char *class;
+	const char *instance;
+	char *tags[TLast];
+	Bool floating;
+};
+
 struct Key {
 	unsigned long mod;
 	KeySym keysym;
@@ -79,14 +88,16 @@ struct Key {
 };
 
 extern Display *dpy;
-extern Window root;
+extern Window root, barwin;
 extern Atom wm_atom[WMLast], net_atom[NetLast];
 extern Cursor cursor[CurLast];
 extern Bool running, issel;
-extern void (*handler[LASTEvent]) (XEvent *);
+extern void (*handler[LASTEvent])(XEvent *);
+extern void (*arrange)(Arg *);
+extern Key key[];
 
-extern int tsel, screen, sx, sy, sw, sh, th;
-extern char stext[1024], *tags[TLast];
+extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
+extern char *tags[TLast], stext[1024];
 
 extern DC dc;
 extern Client *clients, *sel;
@@ -96,52 +107,42 @@ extern void manage(Window w, XWindowAttributes *wa);
 extern void unmanage(Client *c);
 extern Client *getclient(Window w);
 extern void focus(Client *c);
-extern void update_name(Client *c);
-extern void draw_client(Client *c);
-extern void resize(Client *c);
-extern void update_size(Client *c);
+extern void settitle(Client *c);
+extern void resize(Client *c, Bool inc);
+extern void setsize(Client *c);
 extern Client *gettitle(Window w);
-extern void craise(Client *c);
+extern void higher(Client *c);
 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 tag(Arg *arg);
-extern void view(Arg *arg);
-extern void zoom(Arg *arg);
 extern void gravitate(Client *c, Bool invert);
+extern void ban(Client *c);
+extern Client *getnext(Client *c);
 
 /* draw.c */
-extern void draw(Bool border, const char *text);
-extern unsigned long initcolor(const char *colstr);
-extern void initfont(const char *fontstr);
+extern void drawstatus();
+extern void drawtitle(Client *c);
+extern void drawtext(const char *text, Bool invert, Bool border);
+extern unsigned long getcolor(const char *colstr);
+extern void setfont(const char *fontstr);
 extern unsigned int textnw(char *text, unsigned int len);
 extern unsigned int textw(char *text);
 extern unsigned int texth(void);
 
-/* event.c */
-extern void discard_events(long even_mask);
-
-/* dev.c */
-extern void update_keys(void);
+/* key.c */
+extern void grabkeys();
 extern void keypress(XEvent *e);
-extern void mresize(Client *c);
-extern void mmove(Client *c);
 
 /* 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 xerror(Display *dsply, XErrorEvent *e);
+extern void sendevent(Window w, Atom a, long value);
+extern int proto(Window w);
 extern void quit(Arg *arg);
 
+/* screen.c */
+extern void floating(Arg *arg);
+extern void tiling(Arg *arg);
+extern void view(Arg *arg);
+
 /* util.c */
 extern void error(const char *errstr, ...);
 extern void *emallocz(unsigned int size);
-extern void *emalloc(unsigned int size);
-extern void *erealloc(void *ptr, unsigned int size);
-extern char *estrdup(const char *str);
 extern void spawn(Arg *arg);
-extern void swap(void **p1, void **p2);