X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=352e9dbaab802f203711e6bcb3344ad859374f19;hb=0fe2e783e9e6b097bc6529dc286b4b697f7e1fde;hp=8dc88fe64abf16c2610f0e5dc1630a74fdd8116b;hpb=f8525040148a727e212eaad2b20c3e11720489ca;p=dwm.git diff --git a/dwm.c b/dwm.c index 8dc88fe..352e9db 100644 --- a/dwm.c +++ b/dwm.c @@ -52,6 +52,7 @@ #define MAXTAGLEN 16 #define MOUSEMASK (BUTTONMASK|PointerMotionMask) #define TAGMASK ((int)((1LL << LENGTH(tags)) - 1)) +#define VISIBLE(x) ((x)->tags & tagset[seltags]) /* enums */ enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ @@ -61,6 +62,7 @@ enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */ /* typedefs */ typedef unsigned int uint; +typedef unsigned long ulong; typedef struct Client Client; struct Client { char name[256]; @@ -68,8 +70,8 @@ struct Client { int basew, baseh, incw, inch, maxw, maxh, minw, minh; int minax, maxax, minay, maxay; long flags; - uint bw, oldbw; - Bool isbanned, isfixed, isfloating, isurgent; + int bw, oldbw; + Bool isbanned, isfixed, isfloating, ismax, isurgent; uint tags; Client *next; Client *prev; @@ -79,8 +81,8 @@ struct Client { typedef struct { int x, y, w, h; - unsigned long norm[ColLast]; - unsigned long sel[ColLast]; + ulong norm[ColLast]; + ulong sel[ColLast]; Drawable drawable; GC gc; struct { @@ -93,7 +95,7 @@ typedef struct { } DC; /* draw context */ typedef struct { - unsigned long mod; + uint mod; KeySym keysym; void (*func)(const void *arg); const void *arg; @@ -118,7 +120,6 @@ 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); @@ -129,9 +130,8 @@ void destroynotify(XEvent *e); void detach(Client *c); void detachstack(Client *c); void drawbar(void); -void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]); -void drawtext(const char *text, unsigned long col[ColLast], Bool invert); -void *emallocz(uint size); +void drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]); +void drawtext(const char *text, ulong col[ColLast], Bool invert); void enternotify(XEvent *e); void eprint(const char *errstr, ...); void expose(XEvent *e); @@ -140,7 +140,7 @@ void focusin(XEvent *e); void focusnext(const void *arg); void focusprev(const void *arg); Client *getclient(Window w); -unsigned long getcolor(const char *colstr); +ulong getcolor(const char *colstr); long getstate(Window w); Bool gettextprop(Window w, Atom atom, char *text, uint size); void grabbuttons(Client *c, Bool focused); @@ -149,7 +149,6 @@ void initfont(const char *fontstr); Bool isoccupied(uint t); Bool isprotodel(Client *c); Bool isurgent(uint t); -Bool isvisible(Client *c); void keypress(XEvent *e); void killclient(const void *arg); void manage(Window w, XWindowAttributes *wa); @@ -176,9 +175,9 @@ void tileresize(Client *c, int x, int y, int w, int h); void togglebar(const void *arg); void togglefloating(const void *arg); void togglelayout(const void *arg); +void togglemax(const void *arg); void toggletag(const void *arg); void toggleview(const void *arg); -void unban(Client *c); void unmanage(Client *c); void unmapnotify(XEvent *e); void updatebar(void); @@ -217,6 +216,7 @@ void (*handler[LASTEvent]) (XEvent *) = { [UnmapNotify] = unmapnotify }; Atom wmatom[WMLast], netatom[NetLast]; +Bool domax = False; Bool otherwm, readin; Bool running = True; uint tagset[] = {1, 1}; /* after start, first tag is selected */ @@ -233,11 +233,10 @@ Window root, barwin; /* configuration, allows nested code to access above variables */ #include "config.h" -/* check if all tags will fit into a uint bitarray. */ -static char tags_is_a_sign_that_your_IQ[sizeof(int) * 8 < LENGTH(tags) ? -1 : 1]; +/* compile-time check if all tags fit into an uint bit array. */ +struct NumTags { char limitexceeded[sizeof(uint) * 8 < LENGTH(tags) ? -1 : 1]; }; /* function implementations */ - void applyrules(Client *c) { uint i; @@ -268,16 +267,17 @@ arrange(void) { Client *c; for(c = clients; c; c = c->next) - if(isvisible(c)) { - unban(c); + if(VISIBLE(c)) { if(!lt->arrange || c->isfloating) resize(c, c->x, c->y, c->w, c->h, True); } - else - ban(c); + else if(!c->isbanned) { + XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); + c->isbanned = True; + } focus(NULL); - if(lt->arrange) + if(lt->arrange && !domax) lt->arrange(); restack(); } @@ -297,14 +297,6 @@ attachstack(Client *c) { } void -ban(Client *c) { - if(c->isbanned) - return; - XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); - c->isbanned = True; -} - -void buttonpress(XEvent *e) { uint i, x, mask; Client *c; @@ -331,23 +323,23 @@ buttonpress(XEvent *e) { return; } } - if((ev->x < x + blw) && ev->button == Button1) - togglelayout(NULL); + if(ev->x < x + blw) { + if(ev->button == Button1) + togglelayout(NULL); + else if(ev->button == Button3) + togglemax(NULL); + } } else if((c = getclient(ev->window))) { focus(c); - if(CLEANMASK(ev->state) != MODKEY) + if(CLEANMASK(ev->state) != MODKEY || domax) return; - if(ev->button == Button1) { - restack(); + if(ev->button == Button1) movemouse(c); - } else if(ev->button == Button2) togglefloating(NULL); - else if(ev->button == Button3 && !c->isfixed) { - restack(); + else if(ev->button == Button3 && !c->isfixed) resizemouse(c); - } } } @@ -370,10 +362,9 @@ checkotherwm(void) { void cleanup(void) { close(STDIN_FILENO); - while(stack) { - unban(stack); + view(NULL); + while(stack) unmanage(stack); - } if(dc.font.set) XFreeFontSet(dpy, dc.font.set); else @@ -445,7 +436,7 @@ configurerequest(XEvent *e) { if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight))) configure(c); - if(isvisible(c)) + if(VISIBLE(c)) XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); } else @@ -498,7 +489,7 @@ drawbar(void) { Client *c; dc.x = 0; - for(c = stack; c && !isvisible(c); c = c->snext); + for(c = stack; c && !VISIBLE(c); c = c->snext); for(i = 0; i < LENGTH(tags); i++) { dc.w = textw(tags[i]); if(tagset[seltags] & 1 << i) { @@ -513,7 +504,7 @@ drawbar(void) { } if(blw > 0) { dc.w = blw; - drawtext(lt->symbol, dc.norm, False); + drawtext(lt->symbol, dc.norm, domax); x = dc.x + dc.w; } else @@ -539,7 +530,7 @@ drawbar(void) { } void -drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) { +drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]) { int x; XGCValues gcv; XRectangle r = { dc.x, dc.y, dc.w, dc.h }; @@ -560,7 +551,7 @@ drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) { } void -drawtext(const char *text, unsigned long col[ColLast], Bool invert) { +drawtext(const char *text, ulong col[ColLast], Bool invert) { int x, y, w, h; uint len, olen; XRectangle r = { dc.x, dc.y, dc.w, dc.h }; @@ -596,15 +587,6 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) { XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); } -void * -emallocz(uint size) { - void *res = calloc(1, size); - - if(!res) - eprint("fatal: could not malloc() %u bytes\n", size); - return res; -} - void enternotify(XEvent *e) { Client *c; @@ -638,8 +620,8 @@ expose(XEvent *e) { void focus(Client *c) { - if(!c || (c && !isvisible(c))) - for(c = stack; c && !isvisible(c); c = c->snext); + if(!c || (c && !VISIBLE(c))) + for(c = stack; c && !VISIBLE(c); c = c->snext); if(sel && sel != c) { grabbuttons(sel, False); XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]); @@ -651,6 +633,10 @@ focus(Client *c) { } sel = c; if(c) { + if(domax) { + XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw); + c->ismax = True; + } XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]); XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); } @@ -673,9 +659,9 @@ focusnext(const void *arg) { if(!sel) return; - for(c = sel->next; c && !isvisible(c); c = c->next); + for(c = sel->next; c && !VISIBLE(c); c = c->next); if(!c) - for(c = clients; c && !isvisible(c); c = c->next); + for(c = clients; c && !VISIBLE(c); c = c->next); if(c) { focus(c); restack(); @@ -688,10 +674,10 @@ focusprev(const void *arg) { if(!sel) return; - for(c = sel->prev; c && !isvisible(c); c = c->prev); + for(c = sel->prev; c && !VISIBLE(c); c = c->prev); if(!c) { for(c = clients; c && c->next; c = c->next); - for(; c && !isvisible(c); c = c->prev); + for(; c && !VISIBLE(c); c = c->prev); } if(c) { focus(c); @@ -707,7 +693,7 @@ getclient(Window w) { return c; } -unsigned long +ulong getcolor(const char *colstr) { Colormap cmap = DefaultColormap(dpy, screen); XColor color; @@ -722,7 +708,7 @@ getstate(Window w) { int format, status; long result = -1; unsigned char *p = NULL; - unsigned long n, extra; + ulong n, extra; Atom real; status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState], @@ -883,11 +869,6 @@ isurgent(uint t) { return False; } -Bool -isvisible(Client *c) { - return c->tags & tagset[seltags]; -} - void keypress(XEvent *e) { uint i; @@ -931,7 +912,8 @@ manage(Window w, XWindowAttributes *wa) { Window trans; XWindowChanges wc; - c = emallocz(sizeof(Client)); + if(!(c = calloc(1, sizeof(Client)))) + eprint("fatal: could not calloc() %u bytes\n", sizeof(Client)); c->win = w; /* geometry */ @@ -974,7 +956,6 @@ manage(Window w, XWindowAttributes *wa) { attach(c); attachstack(c); XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */ - ban(c); XMapWindow(dpy, c->win); setclientstate(c, NormalState); arrange(); @@ -1009,6 +990,7 @@ movemouse(Client *c) { Window dummy; XEvent ev; + restack(); ocx = nx = c->x; ocy = ny = c->y; if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, @@ -1052,7 +1034,7 @@ movemouse(Client *c) { Client * nexttiled(Client *c) { - for(; c && (c->isfloating || !isvisible(c)); c = c->next); + for(; c && (c->isfloating || !VISIBLE(c)); c = c->next); return c; } @@ -1144,7 +1126,8 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) { x = sx; if(y + h + 2 * c->bw < sy) y = sy; - if(c->x != x || c->y != y || c->w != w || c->h != h) { + if(c->x != x || c->y != y || c->w != w || c->h != h || c->isbanned || c->ismax) { + c->isbanned = c->ismax = False; c->x = wc.x = x; c->y = wc.y = y; c->w = wc.width = w; @@ -1163,6 +1146,7 @@ resizemouse(Client *c) { int nw, nh; XEvent ev; + restack(); ocx = c->x; ocy = c->y; if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, @@ -1210,13 +1194,13 @@ restack(void) { drawbar(); if(!sel) return; - if(sel->isfloating || !lt->arrange) + if(domax || sel->isfloating || !lt->arrange) XRaiseWindow(dpy, sel->win); - if(lt->arrange) { + if(!domax && lt->arrange) { wc.stack_mode = Below; wc.sibling = barwin; for(c = stack; c; c = c->snext) - if(!c->isfloating && isvisible(c)) { + if(!c->isfloating && VISIBLE(c)) { XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc); wc.sibling = c->win; } @@ -1546,15 +1530,13 @@ togglelayout(const void *arg) { } void -toggletag(const void *arg) { - int i, m = *(int *)arg; - for(i = 0; i < sizeof(int) * 8; i++) - fputc(m & 1 << i ? '1' : '0', stdout); - puts(""); - for(i = 0; i < sizeof(int) * 8; i++) - fputc(TAGMASK & 1 << i ? '1' : '0', stdout); - puts("aaa"); +togglemax(const void *arg) { + domax = !domax; + arrange(); +} +void +toggletag(const void *arg) { if(sel && (sel->tags ^ ((*(int *)arg) & TAGMASK))) { sel->tags ^= (*(int *)arg) & TAGMASK; arrange(); @@ -1570,14 +1552,6 @@ toggleview(const void *arg) { } void -unban(Client *c) { - if(!c->isbanned) - return; - XMoveWindow(dpy, c->win, c->x, c->y); - c->isbanned = False; -} - -void unmanage(Client *c) { XWindowChanges wc;