applied yet another proposal of Manuel

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index 234a734..18672d0 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 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


@@ -84,8 +82,8 @@ struct Client {
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int grav;
        long flags; 
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int grav;
        long flags; 

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

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


@@ -97,10 +95,11 @@ struct Client {
 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 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 unsigned int ntags, numlockmask;                /* number of tags, dynamic lock mask */
+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 void (*handler[LASTEvent])(XEvent *);   /* event handler */
 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 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 */


@@ -158,15 +157,15 @@ 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 Bool isvisible(Client *c);              /* returns True if client is visible */
 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 resizemaster(Arg *arg);            /* resizes the master percent with arg's index value */

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