X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.h;h=6aa009b12d1aea70b93ce63eed5f0e1c91f2a198;hp=6a26e075c7fd25e297e523070a8be5d54943b7c9;hb=caf5a162716ebdcca0ba7dda1e7335697f3b9208;hpb=5a5851bac2670624f30c84efe4129f0101f62255

diff --git a/dwm.h b/dwm.h
index 6a26e07..6aa009b 100644
--- a/dwm.h
+++ b/dwm.h
@@ -37,13 +37,12 @@
 /* mask shorthands, used in event.c and client.c */
 #define BUTTONMASK		(ButtonPressMask | ButtonReleaseMask)
 /* other stuff used in different places */
-#define BORDERPX		1
 #define PROTODELWIN		1
 
 enum { NetSupported, NetWMName, NetLast };		/* EWMH atoms */
 enum { WMProtocols, WMDelete, WMLast };			/* default atoms */
 enum { CurNormal, CurResize, CurMove, CurLast };	/* cursor */
-enum { ColFG, ColBG, ColLast };				/* color */
+enum { ColBorder, ColFG, ColBG, ColLast };		/* color */
 
 typedef enum {
 	TopLeft, TopRight, BotLeft, BotRight
@@ -66,7 +65,6 @@ typedef struct {
 	int x, y, w, h;
 	unsigned long norm[ColLast];
 	unsigned long sel[ColLast];
-	unsigned long status[ColLast];
 	Drawable drawable;
 	Fnt font;
 	GC gc;
@@ -78,7 +76,6 @@ struct Client {
 	int proto;
 	int x, y, w, h;
 	int rx, ry, rw, rh; /* revert geometry */
-	int tx, ty, tw, th; /* title window geometry */
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 	long flags; 
 	unsigned int border;
@@ -88,13 +85,11 @@ struct Client {
 	Client *prev;
 	Client *snext;
 	Window win;
-	Window twin;
 };
 
 extern const char *tags[];			/* all tags */
-extern char stext[1024];			/* status text */
-extern char mtext[32];				/* mode text */
-extern int bx, by, bw, bh, bmw;			/* bar geometry, bar mode label width */
+extern char stext[256];				/* status text */
+extern int bh, bmw;				/* bar height, bar mode label width */
 extern int screen, sx, sy, sw, sh;		/* screen geometry */
 extern int wax, way, wah, waw;			/* windowarea geometry */
 extern unsigned int master, nmaster;		/* master percent, number of master clients */
@@ -110,23 +105,18 @@ extern Display *dpy;
 extern Window root, barwin;
 
 /* client.c */
-extern void ban(Client *c);			/* ban c from screen */
 extern void configure(Client *c);		/* send synthetic configure event */
 extern void focus(Client *c);			/* focus c, c may be NULL */
 extern Client *getclient(Window w);		/* return client of w */
-extern Client *getctitle(Window w);		/* return client of title window */
 extern void killclient(Arg *arg);		/* kill c nicely */
 extern void manage(Window w, XWindowAttributes *wa);	/* manage new client */
 extern void resize(Client *c, Bool sizehints, Corner sticky); /* resize c*/
-extern void resizetitle(Client *c);		/* resizes c->twin correctly */
 extern void updatesizehints(Client *c);		/* update the size hint variables of c */
 extern void updatetitle(Client *c);		/* update the name of c */
 extern void unmanage(Client *c);		/* destroy c */
 
 /* draw.c */
-extern void drawall(void);			/* draw all visible client titles and the bar */
 extern void drawstatus(void);			/* draw the bar */
-extern void drawclient(Client *c);		/* draw title and set border of c */
 extern unsigned long getcolor(const char *colstr);	/* return color of colstr */
 extern void setfont(const char *fontstr);	/* set the font for DC */
 extern unsigned int textw(const char *text);	/* return the width of text in px*/
@@ -152,7 +142,6 @@ extern void toggletag(Arg *arg);		/* toggles c tags with arg's index */
 /* util.c */
 extern void *emallocz(unsigned int size);	/* allocates zero-initialized memory, exits on error */
 extern void eprint(const char *errstr, ...);	/* prints errstr and exits with 1 */
-extern void *erealloc(void *ptr, unsigned int size);	/* reallocates memory, exits on error */
 extern void spawn(Arg *arg);			/* forks a new subprocess with to arg's cmd */
 
 /* view.c */
@@ -168,6 +157,5 @@ extern void restack(void);			/* restores z layers of all clients */
 extern void togglefloat(Arg *arg);		/* toggles focusesd client between floating/non-floating state */
 extern void togglemode(Arg *arg);		/* toggles global arrange function (dotile/dofloat) */
 extern void toggleview(Arg *arg);		/* toggles the tag with arg's index (in)visible */
-extern void updatemodetext(void);		/* updates mtext */
 extern void view(Arg *arg);			/* views the tag with arg's index */
 extern void zoom(Arg *arg);			/* zooms the focused client to master area, arg is ignored */