X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=49229a798d04141e7d2c4be38c780302a80d0c96;hb=6f20315dff5de33e9ff9d3e6856769bccc4a6548;hp=e8fe150f3ff63cce9d7564839dc304fdfc826b1e;hpb=0a25fe91888f30a382ca0cfb492283ce9aa3296c;p=dwm.git diff --git a/client.c b/client.c index e8fe150..49229a7 100644 --- a/client.c +++ b/client.c @@ -11,6 +11,14 @@ /* static functions */ static void +detachstack(Client *c) +{ + Client **tc; + for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext); + *tc = c->snext; +} + +static void grabbuttons(Client *c, Bool focus) { XUngrabButton(dpy, AnyButton, AnyModifier, c->win); @@ -52,8 +60,6 @@ grabbuttons(Client *c, Bool focus) static void resizetitle(Client *c) { - int i; - c->tw = textw(c->name); if(c->tw > c->w) c->tw = c->w + 2; @@ -84,22 +90,32 @@ ban(Client *c) void focus(Client *c) { - Client *old = sel; + Client *old; if(!issel) return; if(!sel) sel = c; else if(sel != c) { - if(sel->ismax) + if(maximized) togglemax(NULL); + old = sel; sel = c; - grabbuttons(old, False); - drawtitle(old); + if(old) { + grabbuttons(old, False); + drawtitle(old); + } + } + if(c) { + detachstack(c); + c->snext = stack; + stack = c; + grabbuttons(c, True); + drawtitle(c); + XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); } - grabbuttons(c, True); - drawtitle(c); - XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); + else + XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); } Client * @@ -193,8 +209,7 @@ killclient(Arg *arg) void manage(Window w, XWindowAttributes *wa) { - unsigned int i; - Client *c, *tc; + Client *c; Window trans; XSetWindowAttributes twa; @@ -232,30 +247,26 @@ manage(Window w, XWindowAttributes *wa) DefaultVisual(dpy, screen), CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa); - if(clients) - clients->prev = c; - c->next = clients; - clients = c; - grabbuttons(c, False); - - if((tc = getclient(trans))) /* inherit tags */ - for(i = 0; i < ntags; i++) - c->tags[i] = tc->tags[i]; - else - settags(c); + settags(c, getclient(trans)); if(!c->isfloat) c->isfloat = trans || (c->maxw && c->minw && c->maxw == c->minw && c->maxh == c->minh); + + if(clients) + clients->prev = c; + c->next = clients; + c->snext = stack; + stack = clients = c; + settitle(c); - if(isvisible(c)) - sel = c; - arrange(NULL); + ban(c); XMapWindow(dpy, c->win); XMapWindow(dpy, c->twin); if(isvisible(c)) focus(c); + arrange(NULL); } void @@ -340,7 +351,7 @@ void settitle(Client *c) { char **list = NULL; - int i, n; + int n; XTextProperty name; name.nitems = 0; @@ -368,12 +379,13 @@ void togglemax(Arg *arg) { int ox, oy, ow, oh; + Client *c; XEvent ev; if(!sel) return; - if((sel->ismax = !sel->ismax)) { + if((maximized = !maximized)) { ox = sel->x; oy = sel->y; ow = sel->w; @@ -384,6 +396,9 @@ togglemax(Arg *arg) sel->h = sh - 2 - bh; restack(); + for(c = getnext(clients); c; c = getnext(c->next)) + if(c != sel) + ban(c); resize(sel, arrange == dofloat, TopLeft); sel->x = ox; @@ -392,42 +407,31 @@ togglemax(Arg *arg) sel->h = oh; } else - resize(sel, False, TopLeft); + arrange(NULL); while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); } void unmanage(Client *c) { - Client *tc; - Window trans; XGrabServer(dpy); XSetErrorHandler(xerrordummy); - XGetTransientForHint(dpy, c->win, &trans); + detach(c); + detachstack(c); + if(sel == c) { + for(sel = stack; sel && !isvisible(sel); sel = sel->snext); + focus(sel); + } XUngrabButton(dpy, AnyButton, AnyModifier, c->win); XDestroyWindow(dpy, c->twin); - if(c->prev) - c->prev->next = c->next; - if(c->next) - c->next->prev = c->prev; - if(c == clients) - clients = c->next; - if(sel == c) { - if(trans && (tc = getclient(trans)) && isvisible(tc)) - sel = tc; - else - sel = getnext(clients); - } free(c->tags); free(c); XSync(dpy, False); XSetErrorHandler(xerror); XUngrabServer(dpy); - if(sel) - focus(sel); arrange(NULL); }