some more refactoring

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index 37151f9..4a820b0 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -1,4 +1,4 @@
-/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>

  * See LICENSE file for license details.
  *
  * dynamic window manager is designed like any other X client as well. It is
  * See LICENSE file for license details.
  *
  * dynamic window manager is designed like any other X client as well. It is


@@ -36,18 +36,11 @@
 
 /* mask shorthands, used in event.c and client.c */
 #define BUTTONMASK             (ButtonPressMask | ButtonReleaseMask)
 
 /* 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 { 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 { 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;
 
 typedef union {
        const char *cmd;


@@ -66,7 +59,6 @@ typedef struct {
        int x, y, w, h;
        unsigned long norm[ColLast];
        unsigned long sel[ColLast];
        int x, y, w, h;
        unsigned long norm[ColLast];
        unsigned long sel[ColLast];

-       unsigned long status[ColLast];

        Drawable drawable;
        Fnt font;
        GC gc;
        Drawable drawable;
        Fnt font;
        GC gc;


@@ -75,33 +67,31 @@ typedef struct {
 typedef struct Client Client;
 struct Client {
        char name[256];
 typedef struct Client Client;
 struct Client {
        char name[256];

-       int proto;

        int x, y, w, h;
        int rx, ry, rw, rh; /* revert geometry */
        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;
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;

-       int grav;
+       int minax, minay, maxax, maxay;

        long flags; 
        long flags; 

-       unsigned int border, weight;
-       Bool isfloat, isfixed, ismax;
+       unsigned int border;
+       Bool isbanned, isfixed, isfloat, ismax;

        Bool *tags;
        Client *next;
        Client *prev;
        Client *snext;
        Window win;
        Bool *tags;
        Client *next;
        Client *prev;
        Client *snext;
        Window win;

-       Window twin;

 };
 
 extern const char *tags[];                     /* all tags */
 };
 
 extern const char *tags[];                     /* all tags */

-extern char stext[1024];                       /* status 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 int screen, sx, sy, sw, sh;             /* screen geometry */
 extern int wax, way, wah, waw;                 /* windowarea geometry */

-extern unsigned int master, ntags, numlockmask;        /* master percent, number of tags, dynamic lock mask */
+extern unsigned int master, nmaster;           /* master percent, number of master clients */
+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 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 */
 extern Client *clients, *sel, *stack;          /* global client list and stack */
 extern Cursor cursor[CurLast];
 extern DC dc;                                  /* global draw context */


@@ -109,24 +99,19 @@ extern Display *dpy;
 extern Window root, barwin;
 
 /* client.c */
 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 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 gravitate(Client *c, Bool invert); /* gravitate c */
+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 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 updatesize(Client *c);                     /* update the size structs of c */
+extern void resize(Client *c, int x, int y,
+               int w, int h, 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 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 drawstatus(void);                  /* draw the bar */

-extern void drawtitle(Client *c);              /* draw title 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*/
 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*/


@@ -136,36 +121,40 @@ extern void grabkeys(void);                       /* grab all keys defined in config.h */
 extern void procevent(void);                   /* process pending X events */
 
 /* main.c */
 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 */
 
 /* tag.c */
 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 */
 
 /* tag.c */

-extern void initrregs(void);                   /* initialize regexps of rules defined in config.h */
-extern Client *getnext(Client *c);             /* returns next visible client */
-extern Client *getprev(Client *c);             /* returns previous visible client */
+extern void compileregexps(void);              /* initialize regexps of rules defined in config.h */

 extern void settags(Client *c, Client *trans); /* sets tags of c */
 extern void tag(Arg *arg);                     /* tags c with arg's index */
 extern void toggletag(Arg *arg);               /* toggles c tags with arg's index */
 
 extern void settags(Client *c, Client *trans); /* sets tags of c */
 extern void tag(Arg *arg);                     /* tags c with arg's index */
 extern void toggletag(Arg *arg);               /* toggles c tags with arg's index */
 

+/* tile.c */
+extern void dotile(void);                      /* arranges all windows tiled */
+extern void incnmaster(Arg *arg);              /* increments nmaster with arg's index value */
+extern void resizemaster(Arg *arg);            /* resizes the master percent with arg's index value */
+extern void zoom(Arg *arg);                    /* zooms the focused client to master area, arg is ignored */
+

 /* 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 */
 /* 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 */
 extern void spawn(Arg *arg);                   /* forks a new subprocess with to arg's cmd */
 
 /* view.c */

-extern void detach(Client *c);                 /* detaches c from global client list */
+extern void attach(Client *c);                 /* attaches c to global client list */
+extern void attachstack(Client *c);            /* attaches client to stack */

 extern void dofloat(void);                     /* arranges all windows floating */
 extern void dofloat(void);                     /* arranges all windows floating */

-extern void dotile(void);                      /* arranges all windows tiled */
+extern void detach(Client *c);                 /* detaches c from global client list */
+extern void detachstack(Client *c);            /* detaches client from stack */

 extern void focusnext(Arg *arg);               /* focuses next visible client, arg is ignored  */
 extern void focusprev(Arg *arg);               /* focuses previous visible client, arg is ignored */
 extern void focusnext(Arg *arg);               /* focuses next visible client, arg is ignored  */
 extern void focusprev(Arg *arg);               /* focuses previous visible client, arg is ignored */

+extern Client *getclient(Window w);            /* return client of w */

 extern Bool isvisible(Client *c);              /* returns True if client is visible */
 extern Bool isvisible(Client *c);              /* returns True if client is visible */

-extern void resizemaster(Arg *arg);            /* resizes the master percent with arg's index value */
+extern Client *nextmanaged(Client *c);         /* returns managed successor of c */

 extern void restack(void);                     /* restores z layers of all clients */
 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 view(Arg *arg);                    /* views the tag with arg's index */
 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 view(Arg *arg);                    /* views the tag with arg's index */

-extern void viewall(Arg *arg);                 /* views all tags, arg is ignored */
-extern void zoom(Arg *arg);                    /* zooms the focused client to master area, arg is ignored */