X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=99920d034e20752699aae2e3ad034a58c0dd75f4;hb=cd7ebaad25fa5f10a4442f9d80a05f344ca271d3;hp=a27a1ca01dcef278e8e2707ed7dd8f52958af634;hpb=5a04edecb1eb3a49f659938f7d2eba11d42760ae;p=dwm.git diff --git a/dwm.c b/dwm.c index a27a1ca..99920d0 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; +/* functions */ +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,10 @@ 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*/ void applyrules(Client *c) { static char buf[512]; @@ -1032,43 +1160,45 @@ 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) { - if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0 && (w - c->basew) > 0) { - dx = (double)(w - c->basew); - dy = (double)(h - c->baseh); - min = (double)(c->minax) / (double)(c->minay); - max = (double)(c->maxax) / (double)(c->maxay); - ratio = dx / dy; - if(max > 0 && min > 0 && ratio > 0) { - if(ratio < min) { - dy = (dx * min + dy) / (min * min + 1); - dx = dy * min; - w = (int)dx + c->basew; - h = (int)dy + c->baseh; - } - else if(ratio > max) { - dy = (dx * min + dy) / (max * max + 1); - dx = dy * min; - w = (int)dx + c->basew; - h = (int)dy + c->baseh; - } - } + /* set minimum possible */ + if (w < 1) + w = 1; + if (h < 1) + h = 1; + + /* temporarily remove base dimensions */ + w -= c->basew; + h -= c->baseh; + + /* adjust for aspect limits */ + if (c->minay > 0 && c->maxay > 0 && c->minax > 0 && c->maxax > 0) { + if (w * c->maxay > h * c->maxax) + w = h * c->maxax / c->maxay; + else if (w * c->minay < h * c->minax) + h = w * c->minay / c->minax; } - if(c->minw && w < c->minw) + + /* adjust for increment value */ + if(c->incw) + w -= w % c->incw; + if(c->inch) + h -= h % c->inch; + + /* restore base dimensions */ + w += c->basew; + h += c->baseh; + + if(c->minw > 0 && w < c->minw) w = c->minw; - if(c->minh && h < c->minh) + if(c->minh > 0 && h < c->minh) h = c->minh; - if(c->maxw && w > c->maxw) + if(c->maxw > 0 && w > c->maxw) w = c->maxw; - if(c->maxh && h > c->maxh) + if(c->maxh > 0 && h > c->maxh) h = c->maxh; - if(c->incw) - w -= (w - c->basew) % c->incw; - if(c->inch) - h -= (h - c->baseh) % c->inch; } if(w <= 0 || h <= 0) return;