changed restack, to fix undrawed tag indicators

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index 45879f3..03f8c1f 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -1,5 +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,7 +36,6 @@
 
 /* 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)

 /* other stuff used in different places */
 #define BORDERPX               1
 #define PROTODELWIN            1
 /* other stuff used in different places */
 #define BORDERPX               1
 #define PROTODELWIN            1


@@ -45,11 +43,7 @@
 enum { NetSupported, NetWMName, NetLast };             /* EWMH atoms */
 enum { WMProtocols, WMDelete, WMLast };                        /* default atoms */
 enum { CurNormal, CurResize, CurMove, CurLast };       /* cursor */
 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 {
-       StackLeft, StackBottom, StackRight
-} StackPos; /* stack position*/
+enum { ColBorder, ColFG, ColBG, ColLast };             /* color */

 
 typedef enum {
        TopLeft, TopRight, BotLeft, BotRight
 
 typedef enum {
        TopLeft, TopRight, BotLeft, BotRight


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


@@ -84,55 +77,47 @@ 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; 
        long flags; 

-       unsigned int border, weight;
-       Bool isfloat, ismax;
+       unsigned int border;
+       Bool isfloat, isfixed, 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 char stext[256];                                /* status text */

 extern int bx, by, bw, bh, bmw;                        /* bar geometry, bar mode label width */
 extern int bx, by, bw, bh, bmw;                        /* bar geometry, bar mode label width */

-extern int master, screen, sx, sy, sw, sh;     /* screen geometry, master dimension*/
+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 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 void (*arrange)(void);                  /* arrange function, indicates mode  */

 extern Atom wmatom[WMLast], netatom[NetLast];
 extern Bool running, issel, *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 Atom wmatom[WMLast], netatom[NetLast];
 extern Bool running, issel, *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 StackPos stackpos;

 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 resize(Client *c, Bool sizehints, Corner sticky); /* resize c*/
 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 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*/


@@ -163,16 +148,16 @@ 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 */
 
 /* 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 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 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 Bool isvisible(Client *c);              /* returns True if client is visible */

-extern void resizecol(Arg *arg);               /* resizes the master dimension with arg's index value */
+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 restack(void);                     /* restores z layers of all clients */

-extern void togglestackpos(Arg *arg);          /* toggles stack position */
+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 */
 extern void zoom(Arg *arg);                    /* zooms the focused client to master area, arg is ignored */