X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.h;h=75aa50c70c397af322dce2897a38b48d576e312e;hb=901b3ed9b7e3e4c7542797301ae2442938bcea20;hp=5d7ff1a0bf0102e36e11268918b41e5c73dba189;hpb=6458d72572a30d2cc4af3385755033b2cca93057;p=dwm.git

diff --git a/dwm.h b/dwm.h
index 5d7ff1a..75aa50c 100644
--- a/dwm.h
+++ b/dwm.h
@@ -8,14 +8,19 @@
 /********** CUSTOMIZE **********/
 
 #define FONT				"-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*"
+#define BGCOLOR				"#0a2c2d"
+#define FGCOLOR				"#ddeeee"
+#define BORDERCOLOR			"#176164"
+/*
 #define BGCOLOR				"#666699"
-#define FGCOLOR				"#ffffff"
+#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 **********/
 
@@ -66,7 +71,7 @@ struct Client {
 	int grav;
 	unsigned int border;
 	long flags; 
-	Bool floating;
+	Bool isfloat;
 	Window win;
 	Window title;
 	Client *next;
@@ -77,7 +82,7 @@ struct Rule {
 	const char *class;
 	const char *instance;
 	char *tags[TLast];
-	Bool floating;
+	Bool isfloat;
 };
 
 struct Key {
@@ -89,11 +94,12 @@ struct Key {
 
 extern Display *dpy;
 extern Window root, barwin;
-extern Atom wm_atom[WMLast], net_atom[NetLast];
+extern Atom wmatom[WMLast], netatom[NetLast];
 extern Cursor cursor[CurLast];
 extern Bool running, issel;
 extern void (*handler[LASTEvent])(XEvent *);
 extern void (*arrange)(Arg *);
+extern Key key[];
 
 extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
 extern char *tags[TLast], stext[1024];
@@ -101,62 +107,52 @@ extern char *tags[TLast], stext[1024];
 extern DC dc;
 extern Client *clients, *sel;
 
-/* bar.c */
-extern void draw_bar();
-extern void barclick(XButtonPressedEvent *e);
-
 /* 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 resize(Client *c, Bool inc);
+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 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);
 
 /* event.c */
-extern void discard_events(long even_mask);
-
-/* dev.c */
-extern void update_keys(void);
-extern void keypress(XEvent *e);
-extern void mresize(Client *c);
-extern void mmove(Client *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);
+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 *emalloc(unsigned int size);
-extern void *erealloc(void *ptr, unsigned int size);
-extern char *estrdup(const char *str);
+extern void eprint(const char *errstr, ...);
 extern void spawn(Arg *arg);
-extern void swap(void **p1, void **p2);