-/*
- * (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
/* 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
enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
char name[256];
int proto;
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 grav;
long flags;
- unsigned int border, weight;
- Bool isfloat;
+ unsigned int border;
+ Bool isfloat, isfixed, ismax;
Bool *tags;
Client *next;
Client *prev;
Client *snext;
Window win;
- Window twin;
};
extern const char *tags[]; /* all tags */
extern char stext[1024]; /* status text */
+extern char mtext[32]; /* mode 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 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)(Arg *); /* arrange function, indicates mode */
+extern void (*arrange)(void); /* arrange function, indicates mode */
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 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 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 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 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 togglemax(Arg *arg); /* (un)maximize 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 void drawall(void); /* draw all visible client titles and the bar */
+extern void drawstatus(void); /* draw the bar */
+extern void drawclient(Client *c); /* draw title and set border 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*/
/* 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 */
+extern void procevent(void); /* process pending X events */
/* main.c */
extern int getproto(Window w); /* return protocol mask of WMProtocols property of 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 void initrregs(void); /* 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 settags(Client *c, Client *trans); /* sets tags of c */
/* 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 incnmaster(Arg *arg); /* increments nmaster with arg's index value */
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 resizemaster(Arg *arg); /* resizes the master percent with arg's index value */
+extern void restack(void); /* restores z layers of all clients */
+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 updatemodetext(void); /* updates mtext */
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 */