X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/525ef3c178a889266affee5853870907751e074a..64871a7045077bb2ec4cbcd62a74cabbe6b45096:/client.c diff --git a/client.c b/client.c index f92df83..45f2d19 100644 --- a/client.c +++ b/client.c @@ -1,5 +1,4 @@ -/* - * (C)opyright MMVI Anselm R. Garbe +/* (C)opyright MMVI-MMVII Anselm R. Garbe * See LICENSE file for license details. */ #include "dwm.h" @@ -8,102 +7,183 @@ #include #include -/* static functions */ +/* static */ static void -resizetitle(Client *c) -{ - int i; - - c->tw = 0; - for(i = 0; i < ntags; i++) - if(c->tags[i]) - c->tw += textw(tags[i]); - 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); +grabbuttons(Client *c, Bool focused) { + 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 - XMoveResizeWindow(dpy, c->title, c->tx + 2 * sw, c->ty, c->tw, c->th); + XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK, + GrabModeAsync, GrabModeSync, None, None); +} +static Bool +isprotodel(Client *c) { + int i, n; + Atom *protocols; + Bool ret = False; + + if(XGetWMProtocols(dpy, c->win, &protocols, &n)) { + for(i = 0; !ret && i < n; i++) + if(protocols[i] == wmatom[WMDelete]) + ret = True; + XFree(protocols); + } + return ret; +} + +static void +setclientstate(Client *c, long state) { + long data[] = {state, None}; + XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32, + PropModeReplace, (unsigned char *)data, 2); } static int -xerrordummy(Display *dsply, XErrorEvent *ee) -{ +xerrordummy(Display *dsply, XErrorEvent *ee) { return 0; } -/* extern functions */ +/* extern */ void -ban(Client *c) -{ - XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); - XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty); +attach(Client *c) { + if(clients) + clients->prev = c; + c->next = clients; + clients = c; } void -focus(Client *c) -{ - Client *old = sel; - XEvent ev; +attachstack(Client *c) { + c->snext = stack; + stack = c; +} + +void +configure(Client *c) { + XConfigureEvent ce; + + ce.type = ConfigureNotify; + ce.display = dpy; + ce.event = c->win; + ce.window = c->win; + ce.x = c->x; + ce.y = c->y; + ce.width = c->w; + ce.height = c->h; + ce.border_width = c->border; + ce.above = None; + ce.override_redirect = False; + XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce); +} + +void +detach(Client *c) { + if(c->prev) + c->prev->next = c->next; + if(c->next) + c->next->prev = c->prev; + if(c == clients) + clients = c->next; + c->next = c->prev = NULL; +} + +void +detachstack(Client *c) { + Client **tc; + for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext); + *tc = c->snext; +} +void +focus(Client *c) { + if(c && !isvisible(c)) + return; + if(sel && sel != c) { + grabbuttons(sel, False); + XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]); + } + if(c) { + detachstack(c); + attachstack(c); + grabbuttons(c, True); + } sel = c; - if(old && old != c) - drawtitle(old); - drawtitle(c); - XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); - XSync(dpy, False); - while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); + drawstatus(); + if(!selscreen) + return; + if(c) { + XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]); + XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); + } + else + XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); } void -focusnext(Arg *arg) -{ +focusnext(Arg *arg) { Client *c; if(!sel) return; - - if(sel->ismax) - togglemax(NULL); - - if(!(c = getnext(sel->next))) - c = getnext(clients); + for(c = sel->next; c && !isvisible(c); c = c->next); + if(!c) + for(c = clients; c && !isvisible(c); c = c->next); if(c) { - higher(c); focus(c); + restack(); } } void -focusprev(Arg *arg) -{ +focusprev(Arg *arg) { Client *c; if(!sel) return; - - if(sel->ismax) - togglemax(NULL); - - if(!(c = getprev(sel->prev))) { + for(c = sel->prev; c && !isvisible(c); c = c->prev); + if(!c) { for(c = clients; c && c->next; c = c->next); - c = getprev(c); + for(; c && !isvisible(c); c = c->prev); } if(c) { - higher(c); focus(c); + restack(); } } Client * -getclient(Window w) -{ +getclient(Window w) { Client *c; for(c = clients; c; c = c->next) @@ -112,226 +192,140 @@ getclient(Window w) return NULL; } -Client * -getctitle(Window w) -{ - Client *c; - - for(c = clients; c; c = c->next) - if(c->title == w) - return c; - return NULL; -} - void -gravitate(Client *c, Bool invert) -{ - int dx = 0, dy = 0; - - switch(c->grav) { - default: - break; - case StaticGravity: - case NorthWestGravity: - case NorthGravity: - case NorthEastGravity: - dy = c->border; - break; - case EastGravity: - case CenterGravity: - case WestGravity: - dy = -(c->h / 2) + c->border; - break; - case SouthEastGravity: - case SouthGravity: - case SouthWestGravity: - dy = -(c->h); - break; - } - - switch (c->grav) { - default: - break; - case StaticGravity: - case NorthWestGravity: - case WestGravity: - case SouthWestGravity: - dx = c->border; - break; - case NorthGravity: - case CenterGravity: - case SouthGravity: - dx = -(c->w / 2) + c->border; - break; - case NorthEastGravity: - case EastGravity: - case SouthEastGravity: - dx = -(c->w + c->border); - break; - } - - if(invert) { - dx = -dx; - dy = -dy; - } - c->x += dx; - c->y += dy; -} - -void -higher(Client *c) -{ - XRaiseWindow(dpy, c->win); - XRaiseWindow(dpy, c->title); -} - -void -killclient(Arg *arg) -{ +killclient(Arg *arg) { if(!sel) return; - if(sel->proto & PROTODELWIN) + if(isprotodel(sel)) 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; +manage(Window w, XWindowAttributes *wa) { + Client *c, *t; Window trans; - XSetWindowAttributes twa; + XWindowChanges wc; 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; - c->w = c->tw = wa->width; + c->x = wa->x; + c->y = wa->y; + c->w = wa->width; c->h = wa->height; - c->th = bh; - - c->border = 0; - setsize(c); - - if(c->h != sh && c->y < bh) - c->y = c->ty = bh; - - c->proto = getproto(c->win); + if(c->w == sw && c->h == sh) { + c->border = 0; + c->x = sx; + c->y = sy; + } + else { + c->border = BORDERPX; + if(c->x + c->w + 2 * c->border > wax + waw) + c->x = wax + waw - c->w - 2 * c->border; + if(c->y + c->h + 2 * c->border > way + wah) + c->y = way + wah - c->h - 2 * c->border; + if(c->x < wax) + c->x = wax; + if(c->y < way) + c->y = way; + } + updatesizehints(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 | EnterWindowMask; - - c->title = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th, - 0, DefaultDepth(dpy, screen), CopyFromParent, - DefaultVisual(dpy, screen), - CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa); - - if(clients) - clients->prev = c; - c->next = clients; - clients = c; - - 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); - - settags(c); + grabbuttons(c, False); + wc.border_width = c->border; + XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); + XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]); + configure(c); /* propagates border_width, if size doesn't change */ + updatetitle(c); + t = getclient(trans); + settags(c, t); if(!c->isfloat) - c->isfloat = trans - || (c->maxw && c->minw && - c->maxw == c->minw && c->maxh == c->minh); - settitle(c); - arrange(NULL); - - /* mapping the window now prevents flicker */ - XMapRaised(dpy, c->win); - XMapRaised(dpy, c->title); - if(c->tags[tsel]) + c->isfloat = (t != 0) || c->isfixed; + attach(c); + attachstack(c); + c->isbanned = True; + XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); + XMapWindow(dpy, c->win); + setclientstate(c, NormalState); + if(isvisible(c)) focus(c); + arrange(); } void -resize(Client *c, Bool sizehints, Corner sticky) -{ - int bottom = c->y + c->h; - int right = c->x + c->w; - /*XConfigureEvent e;*/ +resize(Client *c, int x, int y, int w, int h, Bool sizehints) { + float actual, dx, dy, max, min; XWindowChanges wc; + if(w <= 0 || h <= 0) + return; if(sizehints) { + if(c->minw && w < c->minw) + w = c->minw; + if(c->minh && h < c->minh) + h = c->minh; + if(c->maxw && w > c->maxw) + w = c->maxw; + if(c->maxh && h > c->maxh) + h = c->maxh; + /* inspired by algorithm from fluxbox */ + if(c->minay > 0 && c->maxay && (h - c->baseh) > 0) { + dx = (float)(w - c->basew); + dy = (float)(h - c->baseh); + min = (float)(c->minax) / (float)(c->minay); + max = (float)(c->maxax) / (float)(c->maxay); + actual = dx / dy; + if(max > 0 && min > 0 && actual > 0) { + if(actual < min) { + dy = (dx * min + dy) / (min * min + 1); + dx = dy * min; + w = (int)dx + c->basew; + h = (int)dy + c->baseh; + } + else if(actual > max) { + dy = (dx * min + dy) / (max * max + 1); + dx = dy * min; + w = (int)dx + c->basew; + h = (int)dy + c->baseh; + } + } + } if(c->incw) - c->w -= (c->w - c->basew) % c->incw; + w -= (w - c->basew) % c->incw; if(c->inch) - c->h -= (c->h - c->baseh) % c->inch; - if(c->minw && c->w < c->minw) - c->w = c->minw; - if(c->minh && c->h < c->minh) - c->h = c->minh; - if(c->maxw && c->w > c->maxw) - c->w = c->maxw; - if(c->maxh && c->h > c->maxh) - c->h = c->maxh; + h -= (h - c->baseh) % c->inch; } - if(c->x > right) /* might happen on restart */ - c->x = right - c->w; - if(c->y > bottom) - c->y = bottom - c->h; - if(sticky == TopRight || sticky == BotRight) - c->x = right - c->w; - if(sticky == BotLeft || sticky == BotRight) - c->y = bottom - c->h; - - resizetitle(c); - 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; + if(w == sw && h == sh) + c->border = 0; else - wc.border_width = 1; - XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc); - XSync(dpy, False); + c->border = BORDERPX; + /* offscreen appearance fixes */ + if(x > sw) + x = sw - w - 2 * c->border; + if(y > sh) + y = sh - h - 2 * c->border; + if(x + w + 2 * c->border < sx) + x = sx; + if(y + h + 2 * c->border < sy) + y = sy; + if(c->x != x || c->y != y || c->w != w || c->h != h) { + c->x = wc.x = x; + c->y = wc.y = y; + c->w = wc.width = w; + c->h = wc.height = h; + wc.border_width = c->border; + XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc); + configure(c); + XSync(dpy, False); + } } void -setsize(Client *c) -{ +updatesizehints(Client *c) { long msize; XSizeHints size; @@ -362,15 +356,20 @@ setsize(Client *c) } else c->minw = c->minh = 0; - if(c->flags & PWinGravity) - c->grav = size.win_gravity; + if(c->flags & PAspect) { + c->minax = size.min_aspect.x; + c->minay = size.min_aspect.y; + c->maxax = size.max_aspect.x; + c->maxay = size.max_aspect.y; + } else - c->grav = NorthWestGravity; + c->minax = c->minay = c->maxax = c->maxay = 0; + c->isfixed = (c->maxw && c->minw && c->maxh && c->minh + && c->maxw == c->minw && c->maxh == c->minh); } void -settitle(Client *c) -{ +updatetitle(Client *c) { char **list = NULL; int n; XTextProperty name; @@ -383,109 +382,37 @@ settitle(Client *c) if(!name.nitems) return; if(name.encoding == XA_STRING) - strncpy(c->name, (char *)name.value, sizeof(c->name)); + strncpy(c->name, (char *)name.value, sizeof c->name); else { if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success - && n > 0 && *list) + && n > 0 && *list) { - strncpy(c->name, *list, sizeof(c->name)); + strncpy(c->name, *list, sizeof c->name); XFreeStringList(list); } } XFree(name.value); - resizetitle(c); } void -togglemax(Arg *arg) -{ - int ox, oy, ow, oh; - XEvent ev; +unmanage(Client *c) { + Client *nc; - if(!sel) - return; - - if((sel->ismax = !sel->ismax)) { - ox = sel->x; - oy = sel->y; - ow = sel->w; - oh = sel->h; - sel->x = sx; - sel->y = sy + bh; - sel->w = sw - 2; - sel->h = sh - 2 - bh; - - higher(sel); - resize(sel, False, TopLeft); - - sel->x = ox; - sel->y = oy; - sel->w = ow; - sel->h = oh; - } - else - resize(sel, False, TopLeft); - while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); -} - -void -unmanage(Client *c) -{ + /* The server grab construct avoids race conditions. */ XGrabServer(dpy); XSetErrorHandler(xerrordummy); - - XUngrabButton(dpy, AnyButton, AnyModifier, c->win); - XDestroyWindow(dpy, c->title); - - if(c->prev) - c->prev->next = c->next; - if(c->next) - c->next->prev = c->prev; - if(c == clients) - clients = c->next; + detach(c); + detachstack(c); if(sel == c) { - sel = getnext(c->next); - if(!sel) - sel = getprev(c->prev); - if(!sel) - sel = clients; + for(nc = stack; nc && !isvisible(nc); nc = nc->snext); + focus(nc); } + XUngrabButton(dpy, AnyButton, AnyModifier, c->win); + setclientstate(c, WithdrawnState); 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 || (arrange != dotile) || sel->isfloat) - return; - - if(sel == getnext(clients)) { - if((c = getnext(sel->next))) - sel = c; - else - return; - } - - /* pop */ - if(sel->prev) - sel->prev->next = sel->next; - if(sel->next) - sel->next->prev = sel->prev; - sel->prev = NULL; - if(clients) - clients->prev = sel; - sel->next = clients; - clients = sel; - arrange(NULL); - focus(sel); + arrange(); }