Added tag 3.2.1 for changeset f2cabc83a18f

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index 2f3ce74..e5c623d 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


@@ -37,17 +37,12 @@
 /* mask shorthands, used in event.c and client.c */
 #define BUTTONMASK             (ButtonPressMask | ButtonReleaseMask)
 /* other stuff used in different places */
 /* 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 { CurNormal, CurResize, CurMove, CurLast };       /* cursor */
 #define PROTODELWIN            1
 
 enum { NetSupported, NetWMName, NetLast };             /* EWMH atoms */
 enum { WMProtocols, WMDelete, 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;
 
 typedef union {
        const char *cmd;


@@ -66,7 +61,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;


@@ -78,9 +72,7 @@ struct Client {
        int proto;
        int x, y, w, h;
        int rx, ry, rw, rh; /* revert geometry */
        int proto;
        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;

        long flags; 
        unsigned int border;
        Bool isfloat, isfixed, ismax;
        long flags; 
        unsigned int border;
        Bool isfloat, isfixed, ismax;


@@ -89,19 +81,19 @@ struct Client {
        Client *prev;
        Client *snext;
        Window win;
        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 +101,18 @@ 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 Client *getclient(Window w);            /* return client of w */
 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 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, 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*/


@@ -152,7 +138,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 */
 /* 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 */


@@ -161,6 +146,7 @@ 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 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 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 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 */


@@ -168,5 +154,4 @@ extern void togglefloat(Arg *arg);          /* toggles focusesd client between floating/
 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 */
 extern void zoom(Arg *arg);                    /* zooms the focused client to master area, arg is ignored */