X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=67fa0a74647ed30d3b983914ad73f2bca57ca7f4;hb=7b65b763bc5ef74071b48192e7174ba8a103bee0;hp=ab9c11b8b1d2905edf42c6685406f16786bc0731;hpb=04de5720e6593cbe0ef31be3e78778fe0f46a774;p=dwm.git diff --git a/dwm.c b/dwm.c index ab9c11b..67fa0a7 100644 --- a/dwm.c +++ b/dwm.c @@ -25,8 +25,6 @@ * * To understand everything else, start reading main(). */ -#include "dwm.h" - #include #include #include @@ -41,6 +39,7 @@ #include #include #include +#include #include #include @@ -49,7 +48,58 @@ #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask)) #define MOUSEMASK (BUTTONMASK | PointerMotionMask) -/* local typedefs */ +/* enums */ +enum { BarTop, BarBot, BarOff }; /* bar position */ +enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ +enum { ColBorder, ColFG, ColBG, ColLast }; /* color */ +enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */ +enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */ + +/* typedefs */ +typedef struct Client Client; +struct Client { + char name[256]; + int x, y, w, h; + int rx, ry, rw, rh; /* revert geometry */ + int basew, baseh, incw, inch, maxw, maxh, minw, minh; + int minax, maxax, minay, maxay; + long flags; + unsigned int border, oldborder; + Bool isbanned, isfixed, ismax, isfloating, wasfloating; + Bool *tags; + Client *next; + Client *prev; + Client *snext; + Window win; +}; + +typedef struct { + int x, y, w, h; + unsigned long norm[ColLast]; + unsigned long sel[ColLast]; + Drawable drawable; + GC gc; + struct { + int ascent; + int descent; + int height; + XFontSet set; + XFontStruct *xfont; + } font; +} DC; /* draw context */ + +typedef struct { + unsigned long mod; + KeySym keysym; + void (*func)(const char *arg); + const char *arg; +} Key; + +typedef struct { + const char *symbol; + void (*arrange)(void); +} Layout; + typedef struct { const char *prop; const char *tags; @@ -61,6 +111,86 @@ typedef struct { regex_t *tagregex; } Regs; +/* function declarations */ +void applyrules(Client *c); +void arrange(void); +void attach(Client *c); +void attachstack(Client *c); +void ban(Client *c); +void buttonpress(XEvent *e); +void checkotherwm(void); +void cleanup(void); +void compileregs(void); +void configure(Client *c); +void configurenotify(XEvent *e); +void configurerequest(XEvent *e); +void destroynotify(XEvent *e); +void detach(Client *c); +void detachstack(Client *c); +void drawbar(void); +void drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]); +void drawtext(const char *text, unsigned long col[ColLast]); +void *emallocz(unsigned int size); +void enternotify(XEvent *e); +void eprint(const char *errstr, ...); +void expose(XEvent *e); +void floating(void); /* default floating layout */ +void focus(Client *c); +void focusnext(const char *arg); +void focusprev(const char *arg); +Client *getclient(Window w); +unsigned long getcolor(const char *colstr); +long getstate(Window w); +Bool gettextprop(Window w, Atom atom, char *text, unsigned int size); +void grabbuttons(Client *c, Bool focused); +unsigned int idxoftag(const char *tag); +void initfont(const char *fontstr); +Bool isarrange(void (*func)()); +Bool isoccupied(unsigned int t); +Bool isprotodel(Client *c); +Bool isvisible(Client *c); +void keypress(XEvent *e); +void killclient(const char *arg); +void leavenotify(XEvent *e); +void manage(Window w, XWindowAttributes *wa); +void mappingnotify(XEvent *e); +void maprequest(XEvent *e); +void movemouse(Client *c); +Client *nexttiled(Client *c); +void propertynotify(XEvent *e); +void quit(const char *arg); +void resize(Client *c, int x, int y, int w, int h, Bool sizehints); +void resizemouse(Client *c); +void restack(void); +void run(void); +void scan(void); +void setclientstate(Client *c, long state); +void setlayout(const char *arg); +void setmwfact(const char *arg); +void setup(void); +void spawn(const char *arg); +void tag(const char *arg); +unsigned int textnw(const char *text, unsigned int len); +unsigned int textw(const char *text); +void tile(void); +void togglebar(const char *arg); +void togglefloating(const char *arg); +void togglemax(const char *arg); +void toggletag(const char *arg); +void toggleview(const char *arg); +void unban(Client *c); +void unmanage(Client *c); +void unmapnotify(XEvent *e); +void updatebarpos(void); +void updatesizehints(Client *c); +void updatetitle(Client *c); +void view(const char *arg); +void viewprevtag(const char *arg); /* views previous selected tags */ +int xerror(Display *dpy, XErrorEvent *ee); +int xerrordummy(Display *dsply, XErrorEvent *ee); +int xerrorstart(Display *dsply, XErrorEvent *ee); +void zoom(const char *arg); + /* variables */ char stext[256]; double mwfact; @@ -102,12 +232,12 @@ Regs *regs = NULL; /* configuration, allows nested code to access above variables */ #include "config.h" -/* Statically define the number of tags. */ +/* statically define the number of tags. */ unsigned int ntags = sizeof tags / sizeof tags[0]; Bool seltags[sizeof tags / sizeof tags[0]] = {[0] = True}; Bool prevtags[sizeof tags / sizeof tags[0]] = {[0] = True}; -/* functions*/ +/* function implementations */ void applyrules(Client *c) { static char buf[512]; @@ -216,7 +346,7 @@ buttonpress(XEvent *e) { movemouse(c); } else if(ev->button == Button2) { - if(ISTILE && !c->isfixed && c->isfloating) + if((ISTILE) && !c->isfixed && c->isfloating) togglefloating(NULL); else zoom(NULL); @@ -1032,7 +1162,6 @@ quit(const char *arg) { void resize(Client *c, int x, int y, int w, int h, Bool sizehints) { - double dx, dy, max, min, ratio; XWindowChanges wc; if(sizehints) { @@ -1273,7 +1402,7 @@ void setmwfact(const char *arg) { double delta; - if(!ISTILE) + if(!(ISTILE)) return; /* arg handling, manipulate mwfact */ if(arg == NULL) @@ -1734,7 +1863,7 @@ void zoom(const char *arg) { Client *c; - if(!sel || !ISTILE || sel->isfloating) + if(!sel || !(ISTILE) || sel->isfloating) return; if((c = sel) == nexttiled(clients)) if(!(c = nexttiled(c->next)))