applied Sanders doc changes, added a PHONY line and changed the output of config...

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index 9b34210..c44da29 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -3,13 +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 WM_PROTOCOL_DELWIN     1
+#define PROTODELWIN            1
 
 typedef union Arg Arg;
 typedef struct Client Client;
@@ -51,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 *);
@@ -104,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();