X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.h;h=939b54678016c56c67a47ec9d4e487f9f033787a;hb=9955ddc978c2e6acfe246f29f1d317b55d860757;hp=0ed778cb149230dc6eab7121bab2e5add43e6137;hpb=080a38d62d18be2ab98f66ed190d3d9e3463fec9;p=dwm.git diff --git a/dwm.h b/dwm.h index 0ed778c..939b546 100644 --- a/dwm.h +++ b/dwm.h @@ -3,8 +3,8 @@ * See LICENSE file for license details. */ +#include "config.h" #include -#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]; @@ -104,7 +106,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();