X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=889daa5002c162ee03d87f1f75fdda2a69a12536;hb=184471b4bbd1736794a76d2b703659de0339322b;hp=34691be0b105a010cd2f8724f9ea9f27365baa5a;hpb=da2bbd371c522d63d737d43a127601a3fdbcb9d8;p=dwm.git diff --git a/client.c b/client.c index 34691be..8110263 100644 --- a/client.c +++ b/client.c @@ -1,161 +1,265 @@ -/* - * (C)opyright MMVI Anselm R. Garbe +/* (C)opyright MMVI-MMVII Anselm R. Garbe * See LICENSE file for license details. */ - -#include +#include "dwm.h" #include #include #include +#include -#include "util.h" -#include "wm.h" +/* static functions */ -void (*arrange)(void *aux); +static void +detachstack(Client *c) { + Client **tc; + for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext); + *tc = c->snext; +} -void -max(void *aux) -{ - if(!stack) - return; - stack->x = sx; - stack->y = bh; - stack->w = sw - 2 * stack->border; - stack->h = sh - bh - 2 * stack->border; - resize(stack); - discard_events(EnterWindowMask); +static void +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 + XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK, + GrabModeAsync, GrabModeSync, None, None); +} + +static int +xerrordummy(Display *dsply, XErrorEvent *ee) { + return 0; } +/* extern functions */ + void -floating(void *aux) -{ - Client *c; +ban(Client *c) { + XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); + XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty); +} - arrange = floating; - for(c = stack; c; c = c->snext) - resize(c); - discard_events(EnterWindowMask); +void +configure(Client *c) { + XEvent synev; + + synev.type = ConfigureNotify; + synev.xconfigure.display = dpy; + synev.xconfigure.event = c->win; + synev.xconfigure.window = c->win; + synev.xconfigure.x = c->x; + synev.xconfigure.y = c->y; + synev.xconfigure.width = c->w; + synev.xconfigure.height = c->h; + synev.xconfigure.border_width = c->border; + synev.xconfigure.above = None; + XSendEvent(dpy, c->win, True, NoEventMask, &synev); } void -grid(void *aux) -{ - Client *c; - int n, cols, rows, gw, gh, i, j; - float rt, fd; +focus(Client *c) { + Client *old; - arrange = grid; - if(!clients) + if(!issel || (c && !isvisible(c))) return; - for(n = 0, c = clients; c; c = c->next, n++); - rt = sqrt(n); - if(modff(rt, &fd) < 0.5) - rows = floor(rt); - else - rows = ceil(rt); - if(rows * rows < n) - cols = rows + 1; + if(!sel) + sel = c; + else if(sel != c) { + old = sel; + sel = c; + if(old) { + grabbuttons(old, False); + drawclient(old); + } + } + if(c) { + detachstack(c); + c->snext = stack; + stack = c; + grabbuttons(c, True); + drawclient(c); + XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); + } else - cols = rows; + XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); +} - gw = (sw - 2) / cols; - gh = (sh - bh - 2) / rows; +Client * +getclient(Window w) { + Client *c; - for(i = j = 0, c = clients; c; c = c->next) { - c->x = i * gw; - c->y = j * gh + bh; - c->w = gw; - c->h = gh; - resize(c); - if(++i == cols) { - j++; - i = 0; - } - } - discard_events(EnterWindowMask); + for(c = clients; c; c = c->next) + if(c->win == w) + return c; + return NULL; } -void -sel(void *aux) -{ - const char *arg = aux; - Client *c = NULL; +Client * +getctitle(Window w) { + Client *c; - if(!arg || !stack) - return; - if(!strncmp(arg, "next", 5)) - c = stack->snext ? stack->snext : stack; - else if(!strncmp(arg, "prev", 5)) - for(c = stack; c && c->snext; c = c->snext); - if(!c) - c = stack; - raise(c); - focus(c); + for(c = clients; c; c = c->next) + if(c->twin == w) + return c; + return NULL; } void -kill(void *aux) -{ - Client *c = stack; - - if(!c) +killclient(Arg *arg) { + if(!sel) return; - if(c->proto & WM_PROTOCOL_DELWIN) - send_message(c->win, wm_atom[WMProtocols], wm_atom[WMDelete]); + if(sel->proto & PROTODELWIN) + sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]); else - XKillClient(dpy, c->win); + XKillClient(dpy, sel->win); } -static void -resize_title(Client *c) -{ - int i; +void +manage(Window w, XWindowAttributes *wa) { + Client *c; + Window trans; + XSetWindowAttributes twa; - c->tw = 0; - for(i = 0; i < TLast; i++) - if(c->tags[i]) - c->tw += textw(&brush.font, c->tags[i]) + bh; - c->tw += textw(&brush.font, c->name) + bh; - if(c->tw > c->w) - c->tw = c->w + 2; - c->tx = c->x + c->w - c->tw + 2; - c->ty = c->y; - XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th); + c = emallocz(sizeof(Client)); + c->tags = emallocz(ntags * sizeof(Bool)); + c->win = w; + c->border = 0; + c->x = c->tx = wa->x; + c->y = c->ty = wa->y; + c->w = c->tw = wa->width; + c->h = wa->height; + c->th = bh; + updatesizehints(c); + if(c->x + c->w + 2 * BORDERPX > sw) + c->x = sw - c->w - 2 * BORDERPX; + if(c->x < sx) + c->x = sx; + if(c->y + c->h + 2 * BORDERPX > sh) + c->y = sh - c->h - 2 * BORDERPX; + if(c->h != sh && c->y < bh) + c->y = bh; + c->proto = getproto(c->win); + 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->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); + updatetitle(c); + settags(c, getclient(trans)); + if(!c->isfloat) + c->isfloat = trans || c->isfixed; + resizetitle(c); + if(clients) + clients->prev = c; + c->next = clients; + c->snext = stack; + stack = clients = c; + ban(c); + XMapWindow(dpy, c->win); + XMapWindow(dpy, c->twin); + if(isvisible(c)) + focus(c); + arrange(); } void -update_name(Client *c) -{ - XTextProperty name; - int n; - char **list = NULL; - - name.nitems = 0; - c->name[0] = 0; - XGetTextProperty(dpy, c->win, &name, net_atom[NetWMName]); - if(!name.nitems) - XGetWMName(dpy, c->win, &name); - if(!name.nitems) - return; - if(name.encoding == XA_STRING) - strncpy(c->name, (char *)name.value, sizeof(c->name)); - else { - if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success - && n > 0 && *list) - { - strncpy(c->name, *list, sizeof(c->name)); - XFreeStringList(list); - } +resize(Client *c, Bool sizehints, Corner sticky) { + int bottom = c->y + c->h; + int right = c->x + c->w; + XWindowChanges wc; + + if(sizehints) { + if(c->incw) + c->w -= (c->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; } - XFree(name.value); - resize_title(c); + if(sticky == TopRight || sticky == BotRight) + c->x = right - c->w; + if(sticky == BotLeft || sticky == BotRight) + c->y = bottom - c->h; + /* offscreen appearance fixes */ + if(c->x + c->w < sx) + c->x = sx; + 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 = BORDERPX; + XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc); + configure(c); + XSync(dpy, False); } void -update_size(Client *c) -{ - XSizeHints size; +resizetitle(Client *c) { + c->tw = textw(c->name); + if(c->tw > c->w) + c->tw = c->w + 2 * BORDERPX; + c->tx = c->x + c->w - c->tw + 2 * BORDERPX; + 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); +} + +void +updatesizehints(Client *c) { long msize; + XSizeHints size; + if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags) size.flags = PSize; c->flags = size.flags; @@ -183,261 +287,55 @@ update_size(Client *c) } else c->minw = c->minh = 0; - if(c->flags & PWinGravity) - c->grav = size.win_gravity; - else - c->grav = NorthWestGravity; + c->isfixed = (c->maxw && c->minw && c->maxh && c->minh && + c->maxw == c->minw && c->maxh == c->minh); } void -raise(Client *c) -{ - XRaiseWindow(dpy, c->win); - XRaiseWindow(dpy, c->title); -} - -void -lower(Client *c) -{ - XLowerWindow(dpy, c->title); - XLowerWindow(dpy, c->win); -} - -void -focus(Client *c) -{ - Client **l, *old; - - old = stack; - for(l = &stack; *l && *l != c; l = &(*l)->snext); - if(*l) - *l = c->snext; - c->snext = stack; - stack = c; - if(old && old != c) { - XMapWindow(dpy, old->title); - draw_client(old); - } - XUnmapWindow(dpy, c->title); - draw_client(c); - XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); - XFlush(dpy); -} - -void -manage(Window w, XWindowAttributes *wa) -{ - Client *c, **l; - XSetWindowAttributes twa; - - c = emallocz(sizeof(Client)); - c->win = w; - c->tx = c->x = wa->x; - c->ty = c->y = wa->y; - if(c->y < bh) - c->ty = c->y += bh; - c->tw = c->w = wa->width; - c->h = wa->height; - c->th = bh; - c->border = 1; - update_size(c); - XSetWindowBorderWidth(dpy, c->win, 1); - XSetWindowBorder(dpy, c->win, brush.border); - XSelectInput(dpy, c->win, - StructureNotifyMask | PropertyChangeMask | EnterWindowMask); - XGetTransientForHint(dpy, c->win, &c->trans); - twa.override_redirect = 1; - twa.background_pixmap = ParentRelative; - twa.event_mask = ExposureMask; - - c->tags[tsel] = tags[tsel]; - 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); - - update_name(c); - for(l=&clients; *l; l=&(*l)->next); - c->next = *l; /* *l == nil */ - *l = c; - XMapRaised(dpy, c->win); - XMapRaised(dpy, c->title); - XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask, - GrabModeAsync, GrabModeSync, None, None); - XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask, - GrabModeAsync, GrabModeSync, None, None); - XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask, - GrabModeAsync, GrabModeSync, None, None); - arrange(NULL); - focus(c); -} - -void -gravitate(Client *c, Bool invert) -{ - int dx = 0, dy = 0; - - switch(c->grav) { - 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; - default: - break; - } - - switch (c->grav) { - 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; - default: - break; - } +updatetitle(Client *c) { + char **list = NULL; + int n; + XTextProperty name; - if(invert) { - dx = -dx; - dy = -dy; + name.nitems = 0; + c->name[0] = 0; + XGetTextProperty(dpy, c->win, &name, netatom[NetWMName]); + if(!name.nitems) + XGetWMName(dpy, c->win, &name); + if(!name.nitems) + return; + if(name.encoding == XA_STRING) + strncpy(c->name, (char *)name.value, sizeof c->name); + else { + if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success + && n > 0 && *list) + { + strncpy(c->name, *list, sizeof c->name); + XFreeStringList(list); + } } - c->x += dx; - c->y += dy; -} - - -void -resize(Client *c) -{ - XConfigureEvent e; - - if(c->incw) - c->w -= (c->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; - resize_title(c); - 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); - XFlush(dpy); -} - -static int -dummy_error_handler(Display *dpy, XErrorEvent *error) -{ - return 0; + XFree(name.value); } void -unmanage(Client *c) -{ - Client **l; +unmanage(Client *c) { + Client *nc; + /* The server grab construct avoids race conditions. */ XGrabServer(dpy); - XSetErrorHandler(dummy_error_handler); - + 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->title); - - for(l=&clients; *l && *l != c; l=&(*l)->next); - eassert(*l == c); - *l = c->next; - for(l=&stack; *l && *l != c; l=&(*l)->snext); - eassert(*l == c); - *l = c->snext; + XDestroyWindow(dpy, c->twin); + free(c->tags); free(c); - - XFlush(dpy); - XSetErrorHandler(error_handler); + XSync(dpy, False); + XSetErrorHandler(xerror); XUngrabServer(dpy); - arrange(NULL); - if(stack) - focus(stack); -} - -Client * -gettitle(Window w) -{ - Client *c; - for(c = clients; c; c = c->next) - if(c->title == w) - return c; - return NULL; -} - -Client * -getclient(Window w) -{ - Client *c; - for(c = clients; c; c = c->next) - if(c->win == w) - return c; - return NULL; -} - -void -draw_client(Client *c) -{ - int i; - if(c == stack) { - draw_bar(); - return; - } - - brush.x = brush.y = 0; - brush.h = c->th; - - brush.w = 0; - for(i = 0; i < TLast; i++) { - if(c->tags[i]) { - brush.x += brush.w; - brush.w = textw(&brush.font, c->tags[i]) + bh; - draw(dpy, &brush, True, c->tags[i]); - } - } - brush.x += brush.w; - brush.w = textw(&brush.font, c->name) + bh; - draw(dpy, &brush, True, c->name); - XCopyArea(dpy, brush.drawable, c->title, brush.gc, - 0, 0, c->tw, c->th, 0, 0); - XFlush(dpy); + arrange(); }