X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.h;h=6aa009b12d1aea70b93ce63eed5f0e1c91f2a198;hp=0cdfad25fe9a12430f3b3c0d18695f14f28d95a4;hb=caf5a162716ebdcca0ba7dda1e7335697f3b9208;hpb=6c5dc7017cff322b6402b3849c07529f5ab916fe diff --git a/dwm.h b/dwm.h index 0cdfad2..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; @@ -90,9 +88,8 @@ struct Client { }; 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 */ @@ -119,9 +116,7 @@ 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*/ @@ -147,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 */ @@ -163,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 */