X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=b6caa93dc616bfba62f918ccda464ec19dc3f81d;hb=281f0981a6edd51417f9bb427cc870370748e43f;hp=c18d88b582a40584085370f3354357076c3b6036;hpb=7e597ae204ce94398f8c722e335f20d5a4a30c8a;p=dwm.git diff --git a/client.c b/client.c index c18d88b..b6caa93 100644 --- a/client.c +++ b/client.c @@ -11,23 +11,55 @@ /* static functions */ static void -grabbutton(Client *c, unsigned int button, unsigned int modifier) +detachstack(Client *c) { - XGrabButton(dpy, button, modifier, c->win, False, BUTTONMASK, - GrabModeAsync, GrabModeSync, None, None); - XGrabButton(dpy, button, modifier | LockMask, c->win, False, BUTTONMASK, - GrabModeAsync, GrabModeSync, None, None); - XGrabButton(dpy, button, modifier | numlockmask, c->win, False, BUTTONMASK, - GrabModeAsync, GrabModeSync, None, None); - XGrabButton(dpy, button, modifier | numlockmask | LockMask, c->win, False, BUTTONMASK, - GrabModeAsync, GrabModeSync, None, None); + Client **tc; + for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext); + *tc = c->snext; } static void -resizetitle(Client *c) +grabbuttons(Client *c, Bool focused) { - int i; + XUngrabButton(dpy, AnyButton, AnyModifier, c->win); + + if(focused) { + XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK, + GrabModeAsync, GrabModeSync, None, None); + XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK, + GrabModeAsync, GrabModeSync, None, None); + XGrabButton(dpy, Button1, MODKEY | numlockmask, c->win, False, BUTTONMASK, + GrabModeAsync, GrabModeSync, None, None); + XGrabButton(dpy, Button1, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK, + GrabModeAsync, GrabModeSync, None, None); + + XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK, + GrabModeAsync, GrabModeSync, None, None); + XGrabButton(dpy, Button2, MODKEY | LockMask, c->win, False, BUTTONMASK, + GrabModeAsync, GrabModeSync, None, None); + XGrabButton(dpy, Button2, MODKEY | numlockmask, c->win, False, BUTTONMASK, + GrabModeAsync, GrabModeSync, None, None); + XGrabButton(dpy, Button2, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK, + GrabModeAsync, GrabModeSync, None, None); + + XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK, + GrabModeAsync, GrabModeSync, None, None); + XGrabButton(dpy, Button3, MODKEY | LockMask, c->win, False, BUTTONMASK, + GrabModeAsync, GrabModeSync, None, None); + XGrabButton(dpy, Button3, MODKEY | numlockmask, c->win, False, BUTTONMASK, + GrabModeAsync, GrabModeSync, None, None); + XGrabButton(dpy, Button3, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK, + GrabModeAsync, GrabModeSync, None, None); + } + else + XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK, + GrabModeAsync, GrabModeSync, None, None); +} + +static void +resizetitle(Client *c) +{ c->tw = textw(c->name); if(c->tw > c->w) c->tw = c->w + 2; @@ -40,15 +72,6 @@ resizetitle(Client *c) } -static void -ungrabbutton(Client *c, unsigned int button, unsigned int modifier) -{ - XUngrabButton(dpy, button, modifier, c->win); - XUngrabButton(dpy, button, modifier | LockMask, c->win); - XUngrabButton(dpy, button, modifier | numlockmask, c->win); - XUngrabButton(dpy, button, modifier | numlockmask | LockMask, c->win); -} - static int xerrordummy(Display *dsply, XErrorEvent *ee) { @@ -67,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; - grabbutton(old, AnyButton, 0); - drawtitle(old); + if(old) { + grabbuttons(old, False); + drawtitle(old); + } } - ungrabbutton(c, AnyButton, 0); - drawtitle(c); - XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); + if(c) { + detachstack(c); + c->snext = stack; + stack = c; + grabbuttons(c, True); + drawtitle(c); + XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); + } + else + XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); } Client * @@ -176,8 +209,7 @@ killclient(Arg *arg) void manage(Window w, XWindowAttributes *wa) { - unsigned int i; - Client *c, *tc; + Client *c; Window trans; XSetWindowAttributes twa; @@ -215,32 +247,26 @@ manage(Window w, XWindowAttributes *wa) DefaultVisual(dpy, screen), CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa); - if(clients) - clients->prev = c; - c->next = clients; - clients = c; - - grabbutton(c, Button1, MODKEY); - grabbutton(c, Button2, MODKEY); - grabbutton(c, Button3, MODKEY); - - if((tc = getclient(trans))) /* inherit tags */ - for(i = 0; i < ntags; i++) - c->tags[i] = tc->tags[i]; - else - settags(c); + grabbuttons(c, False); + 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 @@ -278,7 +304,7 @@ resize(Client *c, Bool sizehints, Corner sticky) wc.border_width = 0; else wc.border_width = 1; - XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc); + XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc); XSync(dpy, False); } @@ -325,7 +351,7 @@ void settitle(Client *c) { char **list = NULL; - int i, n; + int n; XTextProperty name; name.nitems = 0; @@ -353,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; @@ -369,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; @@ -377,34 +407,33 @@ togglemax(Arg *arg) sel->h = oh; } else - resize(sel, False, TopLeft); + arrange(NULL); while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); } void unmanage(Client *c) { + Client *nc; + XGrabServer(dpy); XSetErrorHandler(xerrordummy); + detach(c); + detachstack(c); + if(sel == c) { + for(nc = stack; nc && !isvisible(nc); nc = nc->snext); + focus(nc); + } + 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) - sel = getnext(clients); free(c->tags); free(c); XSync(dpy, False); XSetErrorHandler(xerror); XUngrabServer(dpy); - if(sel) - focus(sel); arrange(NULL); }