X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=client.c;h=3be154b50543069a6bfb50bbc190966567f4440d;hp=d5bc30eba90bf642b0318c2817608bbe14716087;hb=d934296476be7345842fec1a2630d1752c704078;hpb=05c10c5776738fdfe73c1e66e14c869e2e5e338d diff --git a/client.c b/client.c index d5bc30e..3be154b 100644 --- a/client.c +++ b/client.c @@ -1,18 +1,27 @@ -/* - * (C)opyright MMVI Anselm R. Garbe - * See LICENSE file for license details. - */ +/* © 2006-2007 Anselm R. Garbe + * © 2006-2007 Sander van Dijk + * © 2006-2007 Jukka Salmi + * © 2007 Premysl Hruby + * © 2007 Szabolcs Nagy + * See LICENSE file for license details. */ #include "dwm.h" #include #include #include #include -/* static functions */ +/* static */ + +static void +attachstack(Client *c) { + c->snext = stack; + stack = c; +} static void detachstack(Client *c) { Client **tc; + for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext); *tc = c->snext; } @@ -54,17 +63,27 @@ grabbuttons(Client *c, Bool focused) { 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 -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(isvisible(c)) - XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th); - else - XMoveResizeWindow(dpy, c->twin, c->tx + 2 * sw, c->ty, c->tw, c->th); +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 @@ -72,238 +91,221 @@ 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->twin, 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; +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); +} - if(!issel || (c && !isvisible(c))) - return; - if(!sel) - sel = c; - else if(sel != c) { - old = sel; - sel = c; - if(old) { - grabbuttons(old, False); - drawtitle(old); - } +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 +focus(Client *c) { + if((!c && selscreen)|| (c && !isvisible(c))) + for(c = stack; c && !isvisible(c); c = c->snext); + if(sel && sel != c) { + grabbuttons(sel, False); + XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]); } if(c) { detachstack(c); - c->snext = stack; - stack = c; + attachstack(c); grabbuttons(c, True); - drawtitle(c); + } + sel = c; + 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); } -Client * -getclient(Window w) { - Client *c; - - for(c = clients; c; c = c->next) - if(c->win == w) - return c; - return NULL; -} - -Client * -getctitle(Window w) { - Client *c; - - for(c = clients; c; c = c->next) - if(c->twin == 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; -} +killclient(const char *arg) { + XEvent ev; -void -killclient(Arg *arg) { if(!sel) return; - if(sel->proto & PROTODELWIN) - sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]); + if(isprotodel(sel)) { + ev.type = ClientMessage; + ev.xclient.window = sel->win; + ev.xclient.message_type = wmatom[WMProtocols]; + ev.xclient.format = 32; + ev.xclient.data.l[0] = wmatom[WMDelete]; + ev.xclient.data.l[1] = CurrentTime; + XSendEvent(dpy, sel->win, False, NoEventMask, &ev); + } else XKillClient(dpy, sel->win); } void manage(Window w, XWindowAttributes *wa) { - Client *c; + Client *c, *t = NULL; Window trans; - XSetWindowAttributes twa; + Status rettrans; + 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; - updatesize(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->proto = getproto(c->win); - XSelectInput(dpy, c->win, + c->oldborder = wa->border_width; + if(c->w == sw && c->h == sh) { + c->x = sx; + c->y = sy; + c->border = wa->border_width; + } + else { + 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; + c->border = BORDERPX; + } + wc.border_width = c->border; + XConfigureWindow(dpy, w, CWBorderWidth, &wc); + XSetWindowBorder(dpy, w, dc.norm[ColBorder]); + configure(c); /* propagates border_width, if size doesn't change */ + updatesizehints(c); + XSelectInput(dpy, w, StructureNotifyMask | PropertyChangeMask | EnterWindowMask); - XGetTransientForHint(dpy, c->win, &trans); - twa.override_redirect = 1; - twa.background_pixmap = ParentRelative; - twa.event_mask = ExposureMask | EnterWindowMask; - - 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); - 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; - updatetitle(c); - ban(c); - XMapWindow(dpy, c->win); - XMapWindow(dpy, c->twin); - if(isvisible(c)) - focus(c); - arrange(NULL); + if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success)) + for(t = clients; t && t->win != trans; t = t->next); + settags(c, t); + if(!c->isfloating) + c->isfloating = (rettrans == Success) || c->isfixed; + attach(c); + attachstack(c); + c->isbanned = True; + XMoveWindow(dpy, w, c->x + 2 * sw, c->y); + XMapWindow(dpy, w); + setclientstate(c, NormalState); + focus(c); + lt->arrange(); } void -resize(Client *c, Bool sizehints, Corner sticky) { - int bottom = c->y + c->h; - int right = c->x + c->w; +resize(Client *c, int x, int y, int w, int h, Bool sizehints) { + float dx, dy, max, min, ratio; XWindowChanges wc; + if(w <= 0 || h <= 0) + return; if(sizehints) { + if(c->minay > 0 && c->maxay > 0 && (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); + ratio = dx / dy; + if(max > 0 && min > 0 && ratio > 0) { + if(ratio < min) { + dy = (dx * min + dy) / (min * min + 1); + dx = dy * min; + w = (int)dx + c->basew; + h = (int)dy + c->baseh; + } + else if(ratio > max) { + dy = (dx * min + dy) / (max * max + 1); + dx = dy * min; + w = (int)dx + c->basew; + h = (int)dy + c->baseh; + } + } + } + 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; 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(sticky == TopRight || sticky == BotRight) - c->x = right - c->w; - if(sticky == BotLeft || sticky == BotRight) - c->y = bottom - c->h; - + if(w <= 0 || h <= 0) + return; /* offscreen appearance fixes */ - if(c->x + c->w < 0) - c->x = 0; - if(c->y + c->h < bh) - c->y = bh; - if(c->x > sw) - c->x = sw - c->w; - if(c->y > sh) - c->y = sh - 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; - else - wc.border_width = 1; - XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc); - XSync(dpy, False); + 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 +togglefloating(const char *arg) { + if(!sel || lt->arrange == floating) + return; + sel->isfloating = !sel->isfloating; + if(sel->isfloating) + resize(sel, sel->x, sel->y, sel->w, sel->h, True); + lt->arrange(); } void -updatesize(Client *c) { +updatesizehints(Client *c) { long msize; XSizeHints size; @@ -314,6 +316,10 @@ updatesize(Client *c) { c->basew = size.base_width; c->baseh = size.base_height; } + else if(c->flags & PMinSize) { + c->basew = size.min_width; + c->baseh = size.min_height; + } else c->basew = c->baseh = 0; if(c->flags & PResizeInc) { @@ -332,12 +338,22 @@ updatesize(Client *c) { c->minw = size.min_width; c->minh = size.min_height; } + else if(c->flags & PBaseSize) { + c->minw = size.base_width; + c->minh = size.base_height; + } 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->maxax = size.max_aspect.x; + c->minay = size.min_aspect.y; + c->maxay = size.max_aspect.y; + } else - c->grav = NorthWestGravity; + c->minax = c->maxax = c->minay = c->maxay = 0; + c->isfixed = (c->maxw && c->minw && c->maxh && c->minh + && c->maxw == c->minw && c->maxh == c->minh); } void @@ -354,42 +370,38 @@ updatetitle(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 - 1); 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 - 1); XFreeStringList(list); } } + c->name[sizeof c->name - 1] = '\0'; XFree(name.value); - resizetitle(c); } void unmanage(Client *c) { - Client *nc; + XWindowChanges wc; + wc.border_width = c->oldborder; /* The server grab construct avoids race conditions. */ XGrabServer(dpy); XSetErrorHandler(xerrordummy); - + XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */ detach(c); detachstack(c); - if(sel == c) { - for(nc = stack; nc && !isvisible(nc); nc = nc->snext); - focus(nc); - } - + if(sel == c) + focus(NULL); XUngrabButton(dpy, AnyButton, AnyModifier, c->win); - XDestroyWindow(dpy, c->twin); - + setclientstate(c, WithdrawnState); free(c->tags); free(c); - XSync(dpy, False); XSetErrorHandler(xerror); XUngrabServer(dpy); - arrange(NULL); + lt->arrange(); }