X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.h;h=b33d07379d88e6a75d373fd01bd3c6300589fd31;hb=010fd21b2037923e9ba1f0d67a67bbf8d8da2c89;hp=b31a91dd0715ad723e3a778323b5689ddbdeef8d;hpb=551d6bb23dd4772a1a53a99d8d823ada5de9c3b6;p=dwm.git

diff --git a/dwm.h b/dwm.h
index b31a91d..b33d073 100644
--- a/dwm.h
+++ b/dwm.h
@@ -9,7 +9,7 @@
  * allowed to select for this event mask.
  *
  * 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
+ * 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
@@ -26,8 +26,8 @@
  * 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. 
+ * represented by the arrange() function pointer, which wether points to
+ * dofloat() or dotile(). 
  *
  * To understand everything else, start reading main.c:main().
  */
@@ -38,6 +38,9 @@
 /* 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 MINW			100
 #define PROTODELWIN		1
 
 enum { NetSupported, NetWMName, NetLast };		/* EWMH atoms */
@@ -46,6 +49,10 @@ enum { CurNormal, CurResize, CurMove, CurLast };	/* cursor */
 enum { ColFG, ColBG, ColLast };				/* color */
 
 typedef enum {
+	StackLeft, StackBottom, StackRight
+} StackPos; /* stack position*/
+
+typedef enum {
 	TopLeft, TopRight, BotLeft, BotRight
 } Corner; /* window corners */
 
@@ -77,12 +84,13 @@ struct Client {
 	char name[256];
 	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 grav;
 	long flags; 
 	unsigned int border, weight;
-	Bool isfloat;
+	Bool isfloat, ismax;
 	Bool *tags;
 	Client *next;
 	Client *prev;
@@ -94,20 +102,22 @@ 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 int mw, screen, sx, sy, sw, sh;		/* screen geometry, master width */
+extern int master, screen, sx, sy, sw, sh;	/* screen geometry, master dimension*/
 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 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 StackPos stackpos;
 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 */
@@ -115,22 +125,22 @@ 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 resizetitle(Client *c);		/* resizes c->twin correctly */
 extern void updatesize(Client *c);			/* update the size structs 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 drawall(void);			/* draw all visible client titles and 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*/
 
 /* 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 */
@@ -139,7 +149,7 @@ extern void sendevent(Window w, Atom a, long value);	/* send synthetic event to
 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 */
@@ -159,10 +169,11 @@ 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 resizecol(Arg *arg);		/* resizes the master dimension with arg's index value */
+extern void restack(void);			/* restores z layers of all clients */
+extern void togglestackpos(Arg *arg);		/* toggles stack position */
 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 */