using MASTERWIDTH=640 and 32px steps by default (incmasterw())

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index 8e665ea..a556b73 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -1,41 +1,33 @@
-/*
- * (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
  * driven through handling X events. In contrast to other X clients, a window
  * See LICENSE file for license details.
  *
  * dynamic window manager is designed like any other X client as well. It is
  * driven through handling X events. In contrast to other X clients, a window

- * manager like dwm selects for SubstructureRedirectMask on the root window, to
- * receive events about child window appearance and disappearance.  Only one X
- * connection at a time is allowed to select for this event mask.
+ * manager selects for SubstructureRedirectMask on the root window, to receive
+ * events about window (dis-)appearance.  Only one X connection at a time is
+ * allowed to select for this event mask.

  *
  *

- * Calls to fetch an X event from the event queue of the X connection are
- * blocking.  Due the fact, that dwm reads status text from standard input, a
- * select-driven main loop has been implemented which selects for reads on the
- * X connection and STDIN_FILENO to handle all data smoothly and without
- * busy-loop quirks. The event handlers of dwm are organized in an array which
- * is accessed whenever a new event has been fetched. This allows event
- * dispatching in O(1) time.
+ * Calls to fetch an X event from the event queue are blocking.  Due reading
+ * status text from standard input, a select()-driven main loop has been
+ * implemented which selects for reads on the X connection and STDIN_FILENO to
+ * handle all data smoothly. The event handlers of dwm are organized in an
+ * array which is accessed whenever a new event has been fetched. This allows
+ * event dispatching in O(1) time.

  *
  *

- * Each child window of the root window is called a client in window manager
- * terminology, except windows which have set the override_redirect flag.
- * Clients are organized in a global doubly-linked client list, the focus
- * history is remembered through a global stack list. Each client contains an
- * array of Bools of the same size as the global tags array to indicate the
- * tags of a client. There are no other data structures to organize the clients
- * in tag lists. All clients which have at least one tag enabled of the current
- * tags viewed, will be visible on the screen, all other clients are banned to
- * the x-location x + 2 * screen width.  This avoids having additional layers
- * of workspace handling.
+ * Each child of the root window is called a client, except windows which have
+ * set the override_redirect flag.  Clients are organized in a global
+ * doubly-linked client list, the focus history is remembered through a global
+ * stack list. Each client contains an array of Bools of the same size as the
+ * global tags array to indicate the tags of a client.  For each client dwm
+ * creates a small title window, which is resized whenever the (_NET_)WM_NAME
+ * properties are updated or the client is moved/resized.

  *
  *

- * For each client dwm creates a small title window which is resized whenever
- * the WM_NAME or _NET_WM_NAME properties are updated or the client is resized.

  * 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 with reading main.c:main().
+ * To understand everything else, start reading main.c:main().

  */
 
 #include "config.h"
  */
 
 #include "config.h"


@@ -43,22 +35,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)

-#define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
-#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 */
-
-typedef union {
-       const char *cmd;
-       int i;
-} Arg; /* argument type */
+enum { ColBorder, ColFG, ColBG, ColLast };             /* color */

 
 typedef struct {
        int ascent;
 
 typedef struct {
        int ascent;


@@ -72,7 +53,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;


@@ -81,94 +61,91 @@ 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 x, y, w, h;

-       int tx, ty, tw, th; /* title window geometry */
+       int rx, ry, rw, rh; /* revert 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;
+       unsigned int border;
+       Bool isbanned, isfixed, ismax, isuntiled;

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

-       Window twin;

 };
 
 };
 

+typedef struct {
+       const char *symbol;
+       void (*arrange)(void);
+} Layout;
+

 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 int mw, screen, sx, sy, sw, sh;         /* screen geometry, master width */
+extern char stext[256];                                /* status text */
+extern int screen, sx, sy, sw, sh;             /* screen geometry */
+extern int wax, way, wah, waw;                 /* windowarea geometry */
+extern unsigned int bh, blw;                   /* bar height, bar layout label width */

 extern unsigned int ntags, numlockmask;                /* number of tags, dynamic lock mask */
 extern void (*handler[LASTEvent])(XEvent *);   /* event handler */
 extern unsigned int ntags, numlockmask;                /* number of tags, dynamic lock mask */
 extern void (*handler[LASTEvent])(XEvent *);   /* event handler */

-extern void (*arrange)(Arg *);                 /* arrange function, indicates mode  */

 extern Atom wmatom[WMLast], netatom[NetLast];
 extern Atom wmatom[WMLast], netatom[NetLast];

-extern Bool running, issel, maximized, *seltag;        /* seltag is array of Bool */
-extern Client *clients, *sel, *stack;          /* global cleint list and stack */
+extern Bool 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 Cursor cursor[CurLast];
 extern DC dc;                                  /* global draw context */
 extern Display *dpy;

+extern Layout *lt;

 extern Window root, barwin;
 
 /* client.c */
 extern Window root, barwin;
 
 /* client.c */

-extern void ban(Client *c);                    /* ban c from screen */
+extern void attach(Client *c);                 /* attaches c to global client list */
+extern void configure(Client *c);              /* send synthetic configure event */
+extern void detach(Client *c);                 /* detaches c from global client list */

 extern void focus(Client *c);                  /* focus c, c may be NULL */
 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 void killclient(Arg *arg);              /* kill c nicely */
+extern void killclient(const char *arg);               /* kill c nicely */

 extern void manage(Window w, XWindowAttributes *wa);   /* manage new client */
 extern void manage(Window w, XWindowAttributes *wa);   /* manage new client */

-extern void resize(Client *c, Bool sizehints, Corner sticky); /* resize c*/
-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 with given coordinates c*/
+extern void toggletiled(const char *arg);      /* toggles focused client between tiled/untiled state */
+extern void updatesizehints(Client *c);                /* update the size hint variables of c */

 extern void updatetitle(Client *c);            /* update the name of c */
 extern void updatetitle(Client *c);            /* update the name of c */

-extern void togglemax(Arg *arg);               /* (un)maximize c */

 extern void unmanage(Client *c);               /* destroy c */
 
 /* draw.c */
 extern void unmanage(Client *c);               /* destroy c */
 
 /* draw.c */

-extern void drawall();                         /* draw all visible client titles and the bar */
-extern void drawstatus();                      /* 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 void drawstatus(void);                  /* draw the bar */
+extern void drawtext(const char *text, unsigned long col[ColLast]);    /* draw text */

 extern unsigned int textw(const char *text);   /* return the width of text in px*/
 
 /* event.c */
 extern unsigned int textw(const char *text);   /* return the width of text in px*/
 
 /* event.c */

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

 
 /* main.c */
 
 /* 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 quit(const char *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 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();                       /* 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 compileregs(void);                 /* initialize regexps of rules defined in config.h */
+extern Bool isvisible(Client *c);              /* returns True if client is visible */

 extern void settags(Client *c, Client *trans); /* sets tags of c */
 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 tag(const char *arg);              /* tags c with arg's index */
+extern void toggletag(const char *arg);                /* toggles c tags with arg's index */
+extern void toggleview(const char *arg);       /* toggles the tag with arg's index (in)visible */
+extern void view(const char *arg);             /* views the tag 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 */
 
 /* 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 */
+extern void spawn(const char *arg);            /* forks a new subprocess with arg's cmd */

 
 

-/* view.c */
-extern void detach(Client *c);                 /* detaches c from global client list */
-extern void dofloat(Arg *arg);                 /* arranges all windows floating, arg is ignored */
-extern void dotile(Arg *arg);                  /* arranges all windows, 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 Bool isvisible(Client *c);              /* returns True if client is visible */
-extern void resizecol(Arg *arg);               /* resizes the master width with arg's index value */
-extern void restack();                         /* restores z layers of all clients */
-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 column, arg is ignored */