applied dfenze cleanups, fixed some comments in dwm.h

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index 318ce9e..ed5a304 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -1,4 +1,5 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
+/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Sander van Dijk <a dot h dot vandijk 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


@@ -24,9 +25,8 @@
  *
  * Keys and tagging rules are organized as arrays and defined in the config.h
  * file. These arrays are kept static in event.o and tag.o respectively,
  *
  * Keys and tagging rules are organized as arrays and defined in the config.h
  * file. These arrays are kept static in event.o and tag.o respectively,

- * because no other part of dwm needs access to them.  The current mode is
- * represented by the arrange() function pointer, which wether points to
- * dofloat() or dotile(). 
+ * because no other part of dwm needs access to them.  The current layout is
+ * represented by the lt pointer.

  *
  * To understand everything else, start reading main.c:main().
  */
  *
  * To understand everything else, start reading main.c:main().
  */


@@ -42,38 +42,16 @@ enum { WMProtocols, WMDelete, WMState, WMLast };    /* default atoms */
 enum { CurNormal, CurResize, CurMove, CurLast };       /* cursor */
 enum { ColBorder, ColFG, ColBG, ColLast };             /* color */
 
 enum { CurNormal, CurResize, CurMove, CurLast };       /* cursor */
 enum { ColBorder, ColFG, ColBG, ColLast };             /* color */
 

-typedef union {
-       const char *cmd;
-       int i;
-} Arg; /* argument type */
-
-typedef struct {
-       int ascent;
-       int descent;
-       int height;
-       XFontSet set;
-       XFontStruct *xfont;
-} Fnt;
-
-typedef struct {
-       int x, y, w, h;
-       unsigned long norm[ColLast];
-       unsigned long sel[ColLast];
-       Drawable drawable;
-       Fnt font;
-       GC gc;
-} DC; /* draw context */
-

 typedef struct Client Client;
 struct Client {
        char name[256];
        int x, y, w, h;
        int rx, ry, rw, rh; /* revert geometry */
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 typedef struct Client Client;
 struct Client {
        char name[256];
        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;
+       int minax, maxax, minay, maxay;

        long flags; 
        long flags; 

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

        Bool *tags;
        Client *next;
        Client *prev;
        Bool *tags;
        Client *next;
        Client *prev;


@@ -81,74 +59,91 @@ struct Client {
        Window win;
 };
 
        Window win;
 };
 

-extern const char *tags[];                     /* all tags */
-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 */
-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, 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 Display *dpy;
-extern Window root, barwin;
+typedef struct {
+       int x, y, w, h;
+       unsigned long norm[ColLast];
+       unsigned long sel[ColLast];
+       Drawable drawable;
+       GC gc;
+       struct {
+               int ascent;
+               int descent;
+               int height;
+               XFontSet set;
+               XFontStruct *xfont;
+       } font;
+} DC; /* draw context */
+
+typedef struct {
+       const char *symbol;
+       void (*arrange)(void);
+} Layout;
+
+extern const char *tags[];             /* all tags */
+char stext[256];                       /* status text */
+int screen, sx, sy, sw, sh;            /* screen geometry */
+int wax, way, wah, waw;                        /* windowarea geometry */
+unsigned int bh, blw;                  /* bar height, bar layout label width */
+unsigned int ntags, numlockmask;       /* number of tags, dynamic lock mask */
+void (*handler[LASTEvent])(XEvent *);  /* event handler */
+Atom wmatom[WMLast], netatom[NetLast];
+Bool selscreen, *seltag;               /* seltag is array of Bool */
+Client *clients, *sel, *stack;         /* global client list and stack */
+Cursor cursor[CurLast];
+DC dc;                                 /* global draw context */
+Display *dpy;
+Layout *lt;
+Window root, barwin;

 
 /* client.c */
 
 /* client.c */

-extern void configure(Client *c);              /* send synthetic configure event */
-extern void focus(Client *c);                  /* focus c, c may be NULL */
-extern void killclient(Arg *arg);              /* kill c nicely */
-extern void manage(Window w, XWindowAttributes *wa);   /* manage new client */
-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 */
+void attach(Client *c);                        /* attaches c to global client list */
+void configure(Client *c);             /* send synthetic configure event */
+void detach(Client *c);                        /* detaches c from global client list */
+void focus(Client *c);                 /* focus c, c may be NULL */
+void focustopvisible(void);        /* focus top visible window on stack */
+void killclient(const char *arg);              /* kill sel  nicely */
+void manage(Window w, XWindowAttributes *wa);  /* manage new client */
+void resize(Client *c, int x, int y,
+               int w, int h, Bool sizehints);  /* resize with given coordinates c*/
+void togglefloating(const char *arg);  /* toggles sel between floating/tiled state */
+void updatesizehints(Client *c);               /* update the size hint variables of c */
+void updatetitle(Client *c);           /* update the name of c */
+void unmanage(Client *c);              /* destroy c */

 
 /* draw.c */
 
 /* draw.c */

-extern void drawstatus(void);                  /* draw the bar */
-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*/
+void drawstatus(void);                 /* draw the bar */
+void drawtext(const char *text, unsigned long col[ColLast]);   /* draw text */
+unsigned int textw(const char *text);  /* return the width of text in px*/

 
 /* event.c */
 
 /* event.c */

-extern void grabkeys(void);                    /* grab all keys defined in config.h */
-extern void procevent(void);                   /* process pending X events */
+void grabkeys(void);                   /* grab all keys defined in config.h */
+
+/* layout.c */
+void floating(void);                   /* arranges all windows floating */
+void focusclient(const char *arg);     /* focuses next(1)/previous(-1) visible client */
+void incmasterw(const char *arg);      /* increments the master width with arg's index value */
+void incnmaster(const char *arg);      /* increments nmaster with arg's index value */
+void initlayouts(void);                        /* initialize layout array */
+Client *nexttiled(Client *c);          /* returns tiled successor of c */
+void restack(void);                    /* restores z layers of all clients */
+void setlayout(const char *arg);               /* sets layout, -1 toggles */
+void togglemax(const char *arg);               /* toggles maximization of floating client */
+void zoom(const char *arg);            /* zooms the focused client to master area, arg is ignored */

 
 /* main.c */
 
 /* main.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 */
+void quit(const char *arg);            /* quit dwm nicely */
+int xerror(Display *dsply, XErrorEvent *ee);   /* dwm's X error handler */

 
 

-/* manage.c */
-extern void attach(Client *c);                 /* attaches c to global client list */
-extern void attachstack(Client *c);            /* attaches client to stack */
-extern void compileregexps(void);              /* initialize regexps of rules defined in config.h */
-extern void detach(Client *c);                 /* detaches c from global client list */
-extern void detachstack(Client *c);            /* detaches client from stack */
-extern void dofloat(void);                     /* arranges all windows floating */
-extern void dotile(void);                      /* arranges all windows tiled */
-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 void incnmaster(Arg *arg);              /* increments nmaster with arg's index value */
-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 void restack(void);                     /* restores z layers of all clients */
-extern void settags(Client *c, Client *trans); /* sets tags of c */
-extern void tag(Arg *arg);                     /* tags c with arg's index */
-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 toggletag(Arg *arg);               /* toggles c tags with arg's index */
-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 zoom(Arg *arg);                    /* zooms the focused client to master area, arg is ignored */
+/* tag.c */
+void compileregs(void);                        /* initialize regexps of rules defined in config.h */
+Bool isvisible(Client *c);             /* returns True if client is visible */
+void settags(Client *c, Client *trans);        /* sets tags of c */
+void tag(const char *arg);             /* tags sel with arg's index */
+void toggletag(const char *arg);               /* toggles sel tags with arg's index */
+void toggleview(const char *arg);      /* toggles the tag with arg's index (in)visible */
+void view(const char *arg);            /* views the tag with arg's index */

 
 /* util.c */
 
 /* 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 spawn(Arg *arg);                   /* forks a new subprocess with to arg's cmd */
+void *emallocz(unsigned int size);     /* allocates zero-initialized memory, exits on error */
+void eprint(const char *errstr, ...);  /* prints errstr and exits with 1 */
+void spawn(const char *arg);           /* forks a new subprocess with arg's cmd */