X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.h;h=4d23cab2b273003d9fb6e16cc2816e789208a26a;hb=e995c1b5325f88d197675950c15762d001dd80ef;hp=b96facdf652a398e94d5ac0224b4f1546b07e8f1;hpb=aa13727067af829b94461eb36aa029297ed8e6b9;p=dwm.git

diff --git a/dwm.h b/dwm.h
index b96facd..4d23cab 100644
--- a/dwm.h
+++ b/dwm.h
@@ -11,15 +11,10 @@
 #define MOUSEMASK		(BUTTONMASK | PointerMotionMask)
 #define PROTODELWIN		1
 
-typedef union Arg Arg;
-typedef struct Client Client;
-typedef struct DC DC;
-typedef struct Fnt Fnt;
-
-union Arg {
+typedef union {
 	const char *cmd;
 	int i;
-};
+} Arg;
 
 /* atoms */
 enum { NetSupported, NetWMName, NetLast };
@@ -28,27 +23,31 @@ enum { WMProtocols, WMDelete, WMLast };
 /* cursor */
 enum { CurNormal, CurResize, CurMove, CurLast };
 
-/* windowcorners */
+/* color */
+enum { ColFG, ColBG, ColLast };
+
+/* window corners */
 typedef enum { TopLeft, TopRight, BotLeft, BotRight } Corner;
 
-struct Fnt {
+typedef struct {
 	int ascent;
 	int descent;
 	int height;
 	XFontSet set;
 	XFontStruct *xfont;
-};
+} Fnt;
 
-struct DC { /* draw context */
+typedef struct { /* draw context */
 	int x, y, w, h;
-	unsigned long bg;
-	unsigned long fg;
-	unsigned long border;
+	unsigned long norm[ColLast];
+	unsigned long sel[ColLast];
+	unsigned long status[ColLast];
 	Drawable drawable;
 	Fnt font;
 	GC gc;
-};
+} DC;
 
+typedef struct Client Client;
 struct Client {
 	char name[256];
 	int proto;
@@ -64,12 +63,12 @@ struct Client {
 	Client *next;
 	Client *prev;
 	Window win;
-	Window title;
+	Window twin;
 };
 
 extern const char *tags[];
 extern char stext[1024];
-extern int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
+extern int bx, by, bw, bh, bmw, mw, screen, sx, sy, sw, sh;
 extern unsigned int ntags, numlockmask;
 extern void (*handler[LASTEvent])(XEvent *);
 extern void (*arrange)(Arg *);