X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=a27a1ca01dcef278e8e2707ed7dd8f52958af634;hb=5a04edecb1eb3a49f659938f7d2eba11d42760ae;hp=90ba67b20bde1ce7a6b86cbfb54702b2d28ca6b6;hpb=60444daa70591946f352446906e498c8ae3dafdf;p=dwm.git diff --git a/dwm.c b/dwm.c index 90ba67b..a27a1ca 100644 --- a/dwm.c +++ b/dwm.c @@ -25,20 +25,22 @@ * * To understand everything else, start reading main(). */ +#include "dwm.h" + #include #include -#include #include #include #include #include #include #include +#include #include +#include #include #include #include -#include #include #include @@ -47,58 +49,7 @@ #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask)) #define MOUSEMASK (BUTTONMASK | PointerMotionMask) -/* 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; - +/* local typedefs */ typedef struct { const char *prop; const char *tags; @@ -110,91 +61,12 @@ typedef struct { regex_t *tagregex; } Regs; -/* forward 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); -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; int screen, sx, sy, sw, sh, wax, way, waw, wah; int (*xerrorxlib)(Display *, XErrorEvent *); -unsigned int bh, bpos, ntags; +unsigned int bh, bpos; unsigned int blw = 0; unsigned int ltidx = 0; /* default */ unsigned int nlayouts = 0; @@ -217,7 +89,6 @@ void (*handler[LASTEvent]) (XEvent *) = { Atom wmatom[WMLast], netatom[NetLast]; Bool otherwm, readin; Bool running = True; -Bool *seltags; Bool selscreen = True; Client *clients = NULL; Client *sel = NULL; @@ -231,6 +102,11 @@ Regs *regs = NULL; /* configuration, allows nested code to access above variables */ #include "config.h" +/* 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) { @@ -260,8 +136,7 @@ applyrules(Client *c) { if(ch.res_name) XFree(ch.res_name); if(!matched) - for(i = 0; i < ntags; i++) - c->tags[i] = seltags[i]; + memcpy(c->tags, seltags, sizeof seltags); } void @@ -341,7 +216,7 @@ buttonpress(XEvent *e) { movemouse(c); } else if(ev->button == Button2) { - if(isarrange(tile) && !c->isfixed && c->isfloating) + if(ISTILE && !c->isfixed && c->isfloating) togglefloating(NULL); else zoom(NULL); @@ -392,7 +267,6 @@ cleanup(void) { XFreeCursor(dpy, cursor[CurMove]); XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); XSync(dpy, False); - free(seltags); } void @@ -998,14 +872,13 @@ leavenotify(XEvent *e) { void manage(Window w, XWindowAttributes *wa) { - unsigned int i; Client *c, *t = NULL; Window trans; Status rettrans; XWindowChanges wc; c = emallocz(sizeof(Client)); - c->tags = emallocz(ntags * sizeof(Bool)); + c->tags = emallocz(sizeof seltags); c->win = w; c->x = wa->x; c->y = wa->y; @@ -1040,8 +913,7 @@ manage(Window w, XWindowAttributes *wa) { if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success)) for(t = clients; t && t->win != trans; t = t->next); if(t) - for(i = 0; i < ntags; i++) - c->tags[i] = t->tags[i]; + memcpy(c->tags, t->tags, sizeof seltags); applyrules(c); if(!c->isfloating) c->isfloating = (rettrans == Success) || c->isfixed; @@ -1161,7 +1033,7 @@ 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; + XWindowChanges wc; if(sizehints) { if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0 && (w - c->basew) > 0) { @@ -1398,7 +1270,7 @@ void setmwfact(const char *arg) { double delta; - if(isarrange(floating)) + if(!ISTILE) return; /* arg handling, manipulate mwfact */ if(arg == NULL) @@ -1466,9 +1338,6 @@ setup(void) { /* init tags */ compileregs(); - for(ntags = 0; tags[ntags]; ntags++); - seltags = emallocz(sizeof(Bool) * ntags); - seltags[0] = True; /* init appearance */ dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR); @@ -1568,7 +1437,7 @@ textw(const char *text) { void tile(void) { unsigned int i, n, nx, ny, nw, nh, mw, th; - Client *c; + Client *c, *mc; for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next)) n++; @@ -1581,7 +1450,8 @@ tile(void) { nx = wax; ny = way; - for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++) { + nw = 0; /* gcc stupidity requires this */ + for(i = 0, c = mc = nexttiled(clients); c; c = nexttiled(c->next), i++) { c->ismax = False; if(i == 0) { /* master */ nw = mw - 2 * c->border; @@ -1590,9 +1460,9 @@ tile(void) { else { /* tile window */ if(i == 1) { ny = way; - nx += mw; + nx += mc->w + 2 * mc->border; + nw = waw - nx - 2 * c->border; } - nw = waw - mw - 2 * c->border; if(i + 1 == n) /* remainder */ nh = (way + wah) - ny - 2 * c->border; else @@ -1600,7 +1470,7 @@ tile(void) { } resize(c, nx, ny, nw, nh, RESIZEHINTS); if(n > 1 && th != wah) - ny += nh + 2 * c->border; + ny = c->y + c->h + 2 * c->border; } } @@ -1838,6 +1708,7 @@ void view(const char *arg) { unsigned int i; + memcpy(prevtags, seltags, sizeof seltags); for(i = 0; i < ntags; i++) seltags[i] = arg == NULL; i = idxoftag(arg); @@ -1847,10 +1718,20 @@ view(const char *arg) { } void +viewprevtag(const char *arg) { + static Bool tmptags[sizeof tags / sizeof tags[0]]; + + memcpy(tmptags, seltags, sizeof seltags); + memcpy(seltags, prevtags, sizeof seltags); + memcpy(prevtags, tmptags, sizeof seltags); + arrange(); +} + +void zoom(const char *arg) { Client *c; - if(!sel || isarrange(floating) || sel->isfloating) + if(!sel || !ISTILE || sel->isfloating) return; if((c = sel) == nexttiled(clients)) if(!(c = nexttiled(c->next)))