X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.h;h=88640b8411315bf206be263eefaa00c273d7d447;hb=00255728aae0dcbb657e8a4e145515c673b546a4;hp=0ed778cb149230dc6eab7121bab2e5add43e6137;hpb=080a38d62d18be2ab98f66ed190d3d9e3463fec9;p=dwm.git

diff --git a/dwm.h b/dwm.h
index 0ed778c..88640b8 100644
--- a/dwm.h
+++ b/dwm.h
@@ -3,8 +3,8 @@
  * 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)
@@ -17,7 +17,7 @@ typedef struct DC DC;
 typedef struct Fnt Fnt;
 
 union Arg {
-	const char **argv;
+	const char *cmd;
 	int i;
 };
 
@@ -51,24 +51,26 @@ 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;
 	Client *next;
 	Client *prev;
 	Window win;
 	Window title;
 };
 
-extern char *tags[TLast], stext[1024];
+extern const char *tags[];
+extern char stext[1024];
 extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
+extern unsigned int ntags;
 extern void (*handler[LASTEvent])(XEvent *);
 extern void (*arrange)(Arg *);
 extern Atom wmatom[WMLast], netatom[NetLast];
@@ -89,7 +91,6 @@ 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 manage(Window w, XWindowAttributes *wa);
 extern void resize(Client *c, Bool sizehints, Corner sticky);
 extern void setsize(Client *c);
@@ -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();
@@ -119,6 +120,7 @@ extern int xerror(Display *dsply, XErrorEvent *ee);
 extern void appendtag(Arg *arg);
 extern void dofloat(Arg *arg);
 extern void dotile(Arg *arg);
+extern void initrregs();
 extern Client *getnext(Client *c);
 extern Client *getprev(Client *c);
 extern void replacetag(Arg *arg);