replaced getproto with a saner function, now old-school artifacts of WM times in...

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index 0cdfad2..674ab1e 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -36,18 +36,11 @@
 
 /* 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 { WMProtocols, WMDelete, WMState, WMLast };       /* default atoms */
 enum { CurNormal, CurResize, CurMove, CurLast };       /* cursor */
-enum { ColFG, ColBG, ColLast };                                /* color */
-
-typedef enum {
-       TopLeft, TopRight, BotLeft, BotRight
-} Corner; /* window corners */
+enum { ColBorder, ColFG, ColBG, ColLast };             /* color */
 
 typedef union {
        const char *cmd;
@@ -66,7 +59,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;
@@ -75,13 +67,13 @@ typedef struct {
 typedef struct Client Client;
 struct Client {
        char name[256];
-       int proto;
        int x, y, w, h;
        int rx, ry, rw, rh; /* revert geometry */
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
+       int minax, minay, maxax, maxay;
        long flags; 
        unsigned int border;
-       Bool isfloat, isfixed, ismax;
+       Bool isfixed, isfloat, ismax;
        Bool *tags;
        Client *next;
        Client *prev;
@@ -90,9 +82,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 */
@@ -100,7 +91,7 @@ extern unsigned int ntags, numlockmask;              /* number of tags, dynamic lock mask */
 extern void (*handler[LASTEvent])(XEvent *);   /* event handler */
 extern void (*arrange)(void);                  /* arrange function, indicates mode  */
 extern Atom wmatom[WMLast], netatom[NetLast];
-extern Bool running, issel, *seltag;           /* seltag is array of Bool */
+extern Bool running, selscreen, *seltag;       /* seltag is array of Bool */
 extern Client *clients, *sel, *stack;          /* global client list and stack */
 extern Cursor cursor[CurLast];
 extern DC dc;                                  /* global draw context */
@@ -111,17 +102,16 @@ extern Window root, barwin;
 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 Bool isprotodel(Client *c);             /* returns True if c->win supports wmatom[WMDelete] */
 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 resize(Client *c, Bool sizehints); /* resize c*/
 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*/
@@ -131,7 +121,6 @@ extern void grabkeys(void);                 /* grab all keys defined in config.h */
 extern void procevent(void);                   /* process pending X events */
 
 /* main.c */
-extern int getproto(Window w);                 /* return protocol mask of WMProtocols property of w */
 extern void quit(Arg *arg);                    /* quit dwm nicely */
 extern void sendevent(Window w, Atom a, long value);   /* send synthetic event to w */
 extern int xerror(Display *dsply, XErrorEvent *ee);    /* dwm's X error handler */
@@ -147,7 +136,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 +151,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 */