X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=889daa5002c162ee03d87f1f75fdda2a69a12536;hb=184471b4bbd1736794a76d2b703659de0339322b;hp=e9075a25b95462eaeeb5db7d47cf557e7f00272c;hpb=72655f0ce7abe85853aca98a051df2aab07116f9;p=dwm.git diff --git a/client.c b/client.c index e9075a2..8110263 100644 --- a/client.c +++ b/client.c @@ -1,270 +1,265 @@ -/* - * (C)opyright MMVI Anselm R. Garbe +/* (C)opyright MMVI-MMVII Anselm R. Garbe * See LICENSE file for license details. */ - +#include "dwm.h" #include -#include #include #include #include -#include "dwm.h" - -void (*arrange)(Arg *) = tiling; +/* static functions */ -static Rule rule[] = { - /* class instance tags floating */ - { "Firefox-bin", "Gecko", { [Twww] = "www" }, False }, -}; - -static Client * -next(Client *c) -{ - for(; c && !c->tags[tsel]; c = c->next); - return c; +static void +detachstack(Client *c) { + Client **tc; + for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext); + *tc = c->snext; } -void -zoom(Arg *arg) -{ - Client **l, *old; - - if(!(old = sel)) - return; - - for(l = &clients; *l && *l != sel; l = &(*l)->next); - *l = sel->next; +static void +grabbuttons(Client *c, Bool focused) { + XUngrabButton(dpy, AnyButton, AnyModifier, c->win); - old->next = clients; /* pop */ - clients = old; - sel = old; - arrange(NULL); - focus(sel); + 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); } -void -max(Arg *arg) -{ - if(!sel) - return; - sel->x = sx; - sel->y = sy; - sel->w = sw - 2 * sel->border; - sel->h = sh - 2 * sel->border; - craise(sel); - resize(sel, False); - discard_events(EnterWindowMask); +static int +xerrordummy(Display *dsply, XErrorEvent *ee) { + return 0; } -void -view(Arg *arg) -{ - Client *c; - - tsel = arg->i; - arrange(NULL); - - for(c = clients; c; c = next(c->next)) - draw_client(c); -} +/* extern functions */ void -tappend(Arg *arg) -{ - if(!sel) - return; - - sel->tags[arg->i] = tags[arg->i]; - arrange(NULL); -} - -void -ttrunc(Arg *arg) -{ - int i; - if(!sel) - return; - - for(i = 0; i < TLast; i++) - sel->tags[i] = NULL; - tappend(arg); -} - -static void -ban_client(Client *c) -{ +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 -floating(Arg *arg) -{ - Client *c; - - arrange = floating; - for(c = clients; c; c = c->next) { - if(c->tags[tsel]) - resize(c, True); - else - ban_client(c); - } - if(sel && !sel->tags[tsel]) { - if((sel = next(clients))) { - craise(sel); - focus(sel); - } - } - discard_events(EnterWindowMask); +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 -tiling(Arg *arg) -{ - Client *c; - int n, i, w, h; - - w = sw - mw; - arrange = tiling; - for(n = 0, c = clients; c; c = c->next) - if(c->tags[tsel] && !c->floating) - n++; +focus(Client *c) { + Client *old; - h = (n > 1) ? sh / (n - 1) : sh; - - for(i = 0, c = clients; c; c = c->next) { - if(c->tags[tsel]) { - if(c->floating) { - craise(c); - resize(c, True); - continue; - } - if(n == 1) { - c->x = sx; - c->y = sy; - c->w = sw - 2 * c->border; - c->h = sh - 2 * c->border; - } - else if(i == 0) { - c->x = sx; - c->y = sy; - c->w = mw - 2 * c->border; - c->h = sh - 2 * c->border; - } - else { - c->x = sx + mw; - c->y = sy + (i - 1) * h; - c->w = w - 2 * c->border; - c->h = h - 2 * c->border; - } - resize(c, False); - i++; + if(!issel || (c && !isvisible(c))) + return; + if(!sel) + sel = c; + else if(sel != c) { + old = sel; + sel = c; + if(old) { + grabbuttons(old, False); + drawclient(old); } - else - ban_client(c); } - if(sel && !sel->tags[tsel]) { - if((sel = next(clients))) { - craise(sel); - focus(sel); - } + if(c) { + detachstack(c); + c->snext = stack; + stack = c; + grabbuttons(c, True); + drawclient(c); + XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); } - discard_events(EnterWindowMask); + else + XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); } -void -prevc(Arg *arg) -{ +Client * +getclient(Window w) { Client *c; - if(!sel) - return; - - if((c = sel->revert && sel->revert->tags[tsel] ? sel->revert : NULL)) { - craise(c); - focus(c); - } + for(c = clients; c; c = c->next) + if(c->win == w) + return c; + return NULL; } -void -nextc(Arg *arg) -{ +Client * +getctitle(Window w) { Client *c; - - if(!sel) - return; - if(!(c = next(sel->next))) - c = next(clients); - if(c) { - craise(c); - c->revert = sel; - focus(c); - } + for(c = clients; c; c = c->next) + if(c->twin == w) + return c; + return NULL; } void -ckill(Arg *arg) -{ +killclient(Arg *arg) { if(!sel) return; - if(sel->proto & WM_PROTOCOL_DELWIN) - send_message(sel->win, wm_atom[WMProtocols], wm_atom[WMDelete]); + if(sel->proto & PROTODELWIN) + sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]); else 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(c->tags[i]) + dc.font.height; - c->tw += textw(c->name) + dc.font.height; - 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; +resize(Client *c, Bool sizehints, Corner sticky) { + int bottom = c->y + c->h; + int right = c->x + c->w; + XWindowChanges wc; - 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); - } + 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; @@ -292,307 +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 -craise(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 *old = sel; - - sel = c; - if(old && old != c) - draw_client(old); - draw_client(c); - XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); - XFlush(dpy); - discard_events(EnterWindowMask); -} - -static void -init_tags(Client *c) -{ - XClassHint ch; - static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0; - unsigned int i, j; - Bool matched = False; +updatetitle(Client *c) { + char **list = NULL; + int n; + XTextProperty name; - if(!len) { - c->tags[tsel] = tags[tsel]; + 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(XGetClassHint(dpy, c->win, &ch)) { - if(ch.res_class && ch.res_name) { - for(i = 0; i < len; i++) - if(!strncmp(rule[i].class, ch.res_class, sizeof(rule[i].class)) - && !strncmp(rule[i].instance, ch.res_name, sizeof(rule[i].instance))) - { - for(j = 0; j < TLast; j++) - c->tags[j] = rule[i].tags[j]; - c->floating = rule[i].floating; - matched = True; - break; - } + 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); } - if(ch.res_class) - XFree(ch.res_class); - if(ch.res_name) - XFree(ch.res_name); - } - - if(!matched) - c->tags[tsel] = tags[tsel]; -} - -void -manage(Window w, XWindowAttributes *wa) -{ - Client *c, **l; - XSetWindowAttributes twa; - Window trans; - - c = emallocz(sizeof(Client)); - c->win = w; - c->tx = c->x = wa->x; - c->ty = c->y = wa->y; - c->tw = c->w = wa->width; - c->h = wa->height; - c->th = th; - c->border = 1; - c->proto = win_proto(c->win); - update_size(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; - - 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); - init_tags(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); - - if(!c->floating) - c->floating = trans - || ((c->maxw == c->minw) && (c->maxh == c->minh)); - - arrange(NULL); - if(c->tags[tsel]) - focus(c); - else - ban_client(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; - } - - if(invert) { - dx = -dx; - dy = -dy; - } - c->x += dx; - c->y += dy; -} - - -void -resize(Client *c, Bool inc) -{ - XConfigureEvent e; - - if(inc) { - 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); - 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); - XFlush(dpy); -} - -static int -dummy_error_handler(Display *dsply, XErrorEvent *err) -{ - 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); - *l = c->next; - for(l = &clients; *l; l = &(*l)->next) - if((*l)->revert == c) - (*l)->revert = NULL; - if(sel == c) - sel = sel->revert ? sel->revert : clients; - + XDestroyWindow(dpy, c->twin); + free(c->tags); free(c); - - XFlush(dpy); - XSetErrorHandler(error_handler); + XSync(dpy, False); + XSetErrorHandler(xerror); XUngrabServer(dpy); - arrange(NULL); - if(sel) - focus(sel); -} - -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 == sel) { - XUnmapWindow(dpy, c->title); - XSetWindowBorder(dpy, c->win, dc.fg); - return; - } - - XSetWindowBorder(dpy, c->win, dc.bg); - XMapWindow(dpy, c->title); - - dc.x = dc.y = 0; - dc.h = c->th; - - dc.w = 0; - for(i = 0; i < TLast; i++) { - if(c->tags[i]) { - dc.x += dc.w; - dc.w = textw(c->tags[i]) + dc.font.height; - draw(True, c->tags[i]); - } - } - dc.x += dc.w; - dc.w = textw(c->name) + dc.font.height; - draw(True, c->name); - XCopyArea(dpy, dc.drawable, c->title, dc.gc, - 0, 0, c->tw, c->th, 0, 0); - XFlush(dpy); + arrange(); }