X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.h;h=c44da292561800611c446b04e62faf4fc9f05dc0;hb=f80688f1c79ae813965c7c9cac35931a07c4cc90;hp=f7bebb05ef5899664b2d3ea452164afcda0eb58f;hpb=a73a88280681acdab047bd11a9ba77d97d6a0b72;p=dwm.git

diff --git a/dwm.h b/dwm.h
index f7bebb0..c44da29 100644
--- a/dwm.h
+++ b/dwm.h
@@ -3,12 +3,13 @@
  * See LICENSE file for license details.
  */
 
+#include "config.h"
 #include <X11/Xlib.h>
-#include CONFIG
 
 /* mask shorthands, used in event.c and client.c */
-#define ButtonMask	(ButtonPressMask | ButtonReleaseMask)
-#define MouseMask	(ButtonMask | PointerMotionMask)
+#define BUTTONMASK		(ButtonPressMask | ButtonReleaseMask)
+#define MOUSEMASK		(BUTTONMASK | PointerMotionMask)
+#define PROTODELWIN		1
 
 typedef union Arg Arg;
 typedef struct Client Client;
@@ -50,23 +51,24 @@ struct DC { /* draw context */
 
 struct Client {
 	char name[256];
-	char *tags[TLast];
 	int proto;
 	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; 
+	unsigned int border;
 	Bool isfloat;
 	Bool ismax;
+	Bool tags[TLast];
 	Client *next;
 	Client *prev;
 	Window win;
 	Window title;
 };
 
-extern char *tags[TLast], stext[1024];
+extern const char *tags[TLast];
+extern char stext[1024];
 extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
 extern void (*handler[LASTEvent])(XEvent *);
 extern void (*arrange)(Arg *);
@@ -103,7 +105,7 @@ 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 textw(const char *text);
 
 /* event.c */
 extern void grabkeys();