X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.h;h=a556b73041ff94475ad9f2a35e0c5234ce638fe0;hb=587100873a66e34251041678504a8c1e28410591;hp=f9c409478ddab99b2672c4d9c12ecb7768cfe1cc;hpb=4b5b3d90af58f860569178e554604717ef51152d;p=dwm.git diff --git a/dwm.h b/dwm.h index f9c4094..a556b73 100644 --- a/dwm.h +++ b/dwm.h @@ -1,4 +1,4 @@ -/* (C)opyright MMVI Anselm R. Garbe +/* (C)opyright MMVI-MMVII Anselm R. Garbe * See LICENSE file for license details. * * dynamic window manager is designed like any other X client as well. It is @@ -24,9 +24,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(). + * because no other part of dwm needs access to them. The current layout is + * represented by the lt pointer. * * To understand everything else, start reading main.c:main(). */ @@ -36,23 +35,11 @@ /* 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 { WMProtocols, WMDelete, WMState, WMLast }; /* default atoms */ enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ -enum { ColFG, ColBG, ColLast }; /* color */ - -typedef enum { - TopLeft, TopRight, BotLeft, BotRight -} Corner; /* window corners */ - -typedef union { - const char *cmd; - int i; -} Arg; /* argument type */ +enum { ColBorder, ColFG, ColBG, ColLast }; /* color */ typedef struct { int ascent; @@ -66,7 +53,6 @@ typedef struct { int x, y, w, h; unsigned long norm[ColLast]; unsigned long sel[ColLast]; - unsigned long status[ColLast]; Drawable drawable; Fnt font; GC gc; @@ -75,96 +61,91 @@ typedef struct { typedef struct Client Client; 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; + int minax, minay, maxax, maxay; long flags; - unsigned int border, weight; - Bool isfloat, isfixed, ismax; + unsigned int border; + Bool isbanned, isfixed, ismax, isuntiled; Bool *tags; Client *next; Client *prev; Client *snext; Window win; - Window twin; }; +typedef struct { + const char *symbol; + void (*arrange)(void); +} Layout; + 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 screen, sx, sy, sw, sh; /* screen geometry */ -extern unsigned int master, ntags, numlockmask; /* master percent, number of tags, dynamic lock mask */ +extern int wax, way, wah, waw; /* windowarea geometry */ +extern unsigned int bh, blw; /* bar height, bar layout label width */ +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 Bool running, issel, *seltag; /* seltag is array of Bool */ +extern Bool 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 Display *dpy; +extern Layout *lt; extern Window root, barwin; /* client.c */ -extern void ban(Client *c); /* ban c from screen */ +extern void attach(Client *c); /* attaches c to global client list */ extern void configure(Client *c); /* send synthetic configure event */ +extern void detach(Client *c); /* detaches c from global client list */ 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 killclient(const char *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, int x, int y, + int w, int h, Bool sizehints); /* resize with given coordinates c*/ +extern void toggletiled(const char *arg); /* toggles focused client between tiled/untiled state */ +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 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 void drawtext(const char *text, unsigned long col[ColLast]); /* draw text */ extern unsigned int textw(const char *text); /* return the width of text in px*/ /* event.c */ extern void grabkeys(void); /* grab all keys defined in config.h */ -extern void procevent(void); /* process pending X events */ + +/* layout.c */ +extern void focusclient(const char *arg); /* focuses next(1)/previous(-1) visible client */ +extern void incmasterw(const char *arg); /* increments the master width with arg's index value */ +extern void incnmaster(const char *arg); /* increments nmaster with arg's index value */ +extern void initlayouts(void); /* initialize layout array */ +extern Client *nexttiled(Client *c); /* returns tiled successor of c */ +extern void restack(void); /* restores z layers of all clients */ +extern void setlayout(const char *arg); /* sets layout, -1 toggles */ +extern void togglemax(const char *arg); /* toggles maximization of untiled client */ +extern void untile(void); /* arranges all windows untiled */ +extern void zoom(const char *arg); /* zooms the focused client to master area, arg is ignored */ /* main.c */ -extern int getproto(Window w); /* return protocol mask of WMProtocols property of w */ -extern void quit(Arg *arg); /* quit dwm nicely */ +extern void quit(const char *arg); /* quit dwm nicely */ extern void sendevent(Window w, Atom a, long value); /* send synthetic event to w */ extern int xerror(Display *dsply, XErrorEvent *ee); /* dwm's X error handler */ /* tag.c */ -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 compileregs(void); /* initialize regexps of rules defined in config.h */ +extern Bool isvisible(Client *c); /* returns True if client is visible */ extern void settags(Client *c, Client *trans); /* sets tags of c */ -extern void tag(Arg *arg); /* tags c with arg's index */ -extern void toggletag(Arg *arg); /* toggles c tags with arg's index */ +extern void tag(const char *arg); /* tags c with arg's index */ +extern void toggletag(const char *arg); /* toggles c tags with arg's index */ +extern void toggleview(const char *arg); /* toggles the tag with arg's index (in)visible */ +extern void view(const char *arg); /* views the tag 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 */ -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 */ +extern void spawn(const char *arg); /* forks a new subprocess with arg's cmd */ -/* view.c */ -extern void detach(Client *c); /* detaches c from global client list */ -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 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 zoom(Arg *arg); /* zooms the focused client to master area, arg is ignored */