X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=3578beb31abf3d9d8f6d4749a866afac030c5a79;hb=15abade2720158fd35dcf59aa2cd5cbb325a849c;hp=4afa70526c6391f356859984899f9fb0c7a63199;hpb=04eb016e782743ec88f150ec6f5389703bed3ce2;p=dwm.git diff --git a/client.c b/client.c index 4afa705..3578beb 100644 --- a/client.c +++ b/client.c @@ -3,7 +3,6 @@ * See LICENSE file for license details. */ #include "dwm.h" - #include #include #include @@ -12,23 +11,64 @@ /* static functions */ static void -resizetitle(Client *c) +detachstack(Client *c) +{ + Client **tc; + for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext); + *tc = c->snext; +} + +static void +grabbuttons(Client *c, Bool focus) { - int i; + XUngrabButton(dpy, AnyButton, AnyModifier, c->win); + + if(focus) { + 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); + +} - c->tw = 0; - for(i = 0; i < TLast; i++) - if(c->tags[i]) - c->tw += textw(c->tags[i]); - c->tw += textw(c->name); +static void +resizetitle(Client *c) +{ + c->tw = textw(c->name); if(c->tw > c->w) c->tw = c->w + 2; c->tx = c->x + c->w - c->tw + 2; c->ty = c->y; - if(c->tags[tsel]) - XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th); + if(isvisible(c)) + XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th); else - XMoveResizeWindow(dpy, c->title, c->tx + 2 * sw, c->ty, c->tw, c->th); + XMoveResizeWindow(dpy, c->twin, c->tx + 2 * sw, c->ty, c->tw, c->th); } @@ -44,62 +84,38 @@ void ban(Client *c) { XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); - XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty); + XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty); } void focus(Client *c) { - Client *old = sel; - XEvent ev; + Client *old; - sel = c; - if(old && old != c) - drawtitle(old); - drawtitle(c); - XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); - XSync(dpy, False); - while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); -} - -void -focusnext(Arg *arg) -{ - Client *c; - - if(!sel) + if(!issel) return; - - if(sel->ismax) - togglemax(NULL); - - if(!(c = getnext(sel->next, tsel))) - c = getnext(clients, tsel); - if(c) { - higher(c); - focus(c); - } -} - -void -focusprev(Arg *arg) -{ - Client *c; - if(!sel) - return; - - if(sel->ismax) - togglemax(NULL); - - if(!(c = getprev(sel->prev))) { - for(c = clients; c && c->next; c = c->next); - c = getprev(c); + sel = c; + else if(sel != c) { + if(maximized) + togglemax(NULL); + old = sel; + sel = c; + if(old) { + grabbuttons(old, False); + drawtitle(old); + } } if(c) { - higher(c); - focus(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 * @@ -119,7 +135,7 @@ getctitle(Window w) Client *c; for(c = clients; c; c = c->next) - if(c->title == w) + if(c->twin == w) return c; return NULL; } @@ -180,31 +196,17 @@ gravitate(Client *c, Bool invert) } void -higher(Client *c) -{ - XRaiseWindow(dpy, c->win); - XRaiseWindow(dpy, c->title); -} - -void killclient(Arg *arg) { if(!sel) return; - if(sel->proto & WM_PROTOCOL_DELWIN) + if(sel->proto & PROTODELWIN) sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]); else XKillClient(dpy, sel->win); } void -lower(Client *c) -{ - XLowerWindow(dpy, c->title); - XLowerWindow(dpy, c->win); -} - -void manage(Window w, XWindowAttributes *wa) { Client *c; @@ -212,6 +214,7 @@ manage(Window w, XWindowAttributes *wa) XSetWindowAttributes twa; c = emallocz(sizeof(Client)); + c->tags = emallocz(ntags * sizeof(Bool)); c->win = w; c->x = c->tx = wa->x; c->y = c->ty = wa->y; @@ -219,76 +222,50 @@ manage(Window w, XWindowAttributes *wa) c->h = wa->height; c->th = bh; - if(c->y < bh) - c->y = c->ty = bh; + c->border = 0; + setsize(c); + + if(c->x + c->w + 2 > sw) + c->x = sw - c->w - 2; + if(c->x < 0) + c->x = 0; + if(c->y + c->h + 2 > sh) + c->y = sh - c->h - 2; + if(c->h != sh && c->y < bh) + c->y = bh; - c->border = 1; c->proto = getproto(c->win); - setsize(c); XSelectInput(dpy, c->win, StructureNotifyMask | PropertyChangeMask | EnterWindowMask); XGetTransientForHint(dpy, c->win, &trans); twa.override_redirect = 1; twa.background_pixmap = ParentRelative; - twa.event_mask = ExposureMask; + twa.event_mask = ExposureMask | EnterWindowMask; - c->title = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th, + c->twin = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th, 0, DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen), CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa); - 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; - clients = c; - - XGrabButton(dpy, Button1, MODKEY, c->win, False, ButtonPressMask, - GrabModeAsync, GrabModeSync, None, None); - XGrabButton(dpy, Button2, MODKEY, c->win, False, ButtonPressMask, - GrabModeAsync, GrabModeSync, None, None); - XGrabButton(dpy, Button3, MODKEY, c->win, False, ButtonPressMask, - GrabModeAsync, GrabModeSync, None, None); - - if(!c->isfloat) - c->isfloat = trans || (c->maxw && c->minw && - (c->maxw == c->minw) && (c->maxh == c->minh)); - + c->snext = stack; + stack = clients = c; settitle(c); - arrange(NULL); - - /* mapping the window now prevents flicker */ - if(c->tags[tsel]) { - XMapRaised(dpy, c->win); - XMapRaised(dpy, c->title); + ban(c); + XMapWindow(dpy, c->win); + XMapWindow(dpy, c->twin); + if(isvisible(c)) focus(c); - } - else { - XMapRaised(dpy, c->win); - XMapRaised(dpy, c->title); - - } -} - -void -pop(Client *c) -{ - Client **l; - - for(l = &clients; *l && *l != c; l = &(*l)->next); - if(c->prev) - c->prev->next = c->next; - if(c->next) - c->next->prev = c->prev; - *l = c->next; - - c->prev = NULL; - if(clients) - clients->prev = c; - c->next = clients; - clients = c; arrange(NULL); } @@ -297,7 +274,7 @@ resize(Client *c, Bool sizehints, Corner sticky) { int bottom = c->y + c->h; int right = c->x + c->w; - XConfigureEvent e; + XWindowChanges wc; if(sizehints) { if(c->incw) @@ -313,30 +290,21 @@ resize(Client *c, Bool sizehints, Corner sticky) if(c->maxh && c->h > c->maxh) c->h = c->maxh; } - if(c->x > sw) /* might happen on restart */ - c->x = sw - c->w; - if(c->y > sh) - c->y = sh - c->h; if(sticky == TopRight || sticky == BotRight) c->x = right - c->w; if(sticky == BotLeft || sticky == BotRight) c->y = bottom - c->h; resizetitle(c); - XSetWindowBorderWidth(dpy, c->win, 1); - XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); - - e.type = ConfigureNotify; - e.event = c->win; - e.window = c->win; - e.x = c->x; - e.y = c->y; - e.width = c->w; - e.height = c->h; - e.border_width = c->border; - e.above = None; - e.override_redirect = False; - XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&e); + wc.x = c->x; + wc.y = c->y; + wc.width = c->w; + wc.height = c->h; + if(c->w == sw && c->h == sh) + wc.border_width = 0; + else + wc.border_width = 1; + XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc); XSync(dpy, False); } @@ -411,23 +379,27 @@ 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; oh = sel->h; sel->x = sx; sel->y = sy + bh; - sel->w = sw - 2 * sel->border; - sel->h = sh - 2 * sel->border - bh; + sel->w = sw - 2; + sel->h = sh - 2 - bh; - higher(sel); - resize(sel, False, TopLeft); + restack(); + for(c = getnext(clients); c; c = getnext(c->next)) + if(c != sel) + ban(c); + resize(sel, arrange == dofloat, TopLeft); sel->x = ox; sel->y = oy; @@ -435,57 +407,37 @@ togglemax(Arg *arg) sel->h = oh; } else - resize(sel, False, TopLeft); + arrange(NULL); while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); } void unmanage(Client *c) { - Client **l; - + Client *tc, *fc; + Window trans; XGrabServer(dpy); XSetErrorHandler(xerrordummy); - XUngrabButton(dpy, AnyButton, AnyModifier, c->win); - XDestroyWindow(dpy, c->title); - - for(l = &clients; *l && *l != c; l = &(*l)->next); - if(c->prev) - c->prev->next = c->next; - if(c->next) - c->next->prev = c->prev; - *l = c->next; + detach(c); if(sel == c) { - sel = getnext(c->next, tsel); - if(!sel) - sel = getprev(c->prev); - if(!sel) - sel = clients; + XGetTransientForHint(dpy, c->win, &trans); + if(trans && (tc = getclient(trans)) && isvisible(tc)) + fc = tc; + else + fc = getnext(clients); + focus(fc); } + + XUngrabButton(dpy, AnyButton, AnyModifier, c->win); + XDestroyWindow(dpy, c->twin); + + detachstack(c); + free(c->tags); free(c); XSync(dpy, False); XSetErrorHandler(xerror); XUngrabServer(dpy); arrange(NULL); - if(sel) - focus(sel); -} - -void -zoom(Arg *arg) -{ - Client *c; - - if(!sel) - return; - - if(sel == getnext(clients, tsel) && sel->next) { - if((c = getnext(sel->next, tsel))) - sel = c; - } - - pop(sel); - focus(sel); }