X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=63fb1e58df7fce3554d4bddf54f0d1146206d42f;hb=29355bd38284ed9aec8d3ffabde61db73947c9f9;hp=5e7321d2123e39fffb44c0fbe03b6343e4c48b74;hpb=0a638a4cafb3dd754a596605bb55ac7977fba71e;p=dwm.git diff --git a/client.c b/client.c index 5e7321d..63fb1e5 100644 --- a/client.c +++ b/client.c @@ -3,119 +3,31 @@ * See LICENSE file for license details. */ -#include #include +#include #include #include #include #include "dwm.h" -static void floating(void); -static void tiling(void); -static void (*arrange)(void) = floating; +static Rule rule[] = { + /* class instance tags floating */ + { "Firefox-bin", "Gecko", { [Twww] = "www" }, False }, +}; -void -max(void *aux) -{ - if(!stack) - return; - stack->x = sx; - stack->y = sy; - stack->w = sw - 2 * stack->border; - stack->h = sh - 2 * stack->border; - resize(stack); - discard_events(EnterWindowMask); -} - -static void -floating(void) -{ - Client *c; - - for(c = stack; c; c = c->snext) - resize(c); - discard_events(EnterWindowMask); -} - -static void -tiling(void) -{ - Client *c; - int n, cols, rows, gw, gh, i, j; - float rt, fd; - - if(!clients) - 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; - else - cols = rows; - - gw = (sw - 2) / cols; - gh = (sh - 2) / rows; - - for(i = j = 0, c = clients; c; c = c->next) { - c->x = i * gw; - c->y = j * gh; - c->w = gw; - c->h = gh; - resize(c); - if(++i == cols) { - j++; - i = 0; - } - } - discard_events(EnterWindowMask); -} - -void -toggle(void *aux) -{ - if(arrange == floating) - arrange = tiling; - else - arrange = floating; - arrange(); -} - - -void -sel(void *aux) +Client * +next(Client *c) { - const char *arg = aux; - Client *c = NULL; - - 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; - craise(c); - XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w / 2, c->h / 2); - focus(c); + for(; c && !c->tags[tsel]; c = c->next); + return c; } void -ckill(void *aux) +ban_client(Client *c) { - Client *c = stack; - - if(!c) - return; - if(c->proto & WM_PROTOCOL_DELWIN) - send_message(c->win, wm_atom[WMProtocols], wm_atom[WMDelete]); - else - XKillClient(dpy, c->win); + XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); + XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty); } static void @@ -126,8 +38,8 @@ resize_title(Client *c) 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; + c->tw += textw(c->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; @@ -218,25 +130,53 @@ lower(Client *c) 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) { - XSetWindowBorder(dpy, old->win, dc.bg); - XMapWindow(dpy, old->title); + Client *old = sel; + XEvent ev; + + XFlush(dpy); + sel = c; + if(old && old != c) draw_client(old); - } - XUnmapWindow(dpy, c->title); - XSetWindowBorder(dpy, c->win, dc.fg); draw_client(c); XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); XFlush(dpy); - discard_events(EnterWindowMask); + while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); +} + +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; + + if(!len) { + c->tags[tsel] = tags[tsel]; + 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(ch.res_class) + XFree(ch.res_class); + if(ch.res_name) + XFree(ch.res_name); + } + + if(!matched) + c->tags[tsel] = tags[tsel]; } void @@ -244,45 +184,62 @@ 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; + if(c->y < bh) + c->ty = c->y += bh; c->tw = c->w = wa->width; c->h = wa->height; - c->th = th; + c->th = bh; c->border = 1; + c->proto = win_proto(c->win); update_size(c); XSelectInput(dpy, c->win, StructureNotifyMask | PropertyChangeMask | EnterWindowMask); - XGetTransientForHint(dpy, c->win, &c->trans); + XGetTransientForHint(dpy, c->win, &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); + init_tags(c); + + for(l = &clients; *l; l = &(*l)->next); c->next = *l; /* *l == nil */ *l = c; - XSetWindowBorderWidth(dpy, c->win, 1); - 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(); - XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w / 2, c->h / 2); - focus(c); + + if(!c->floating) + c->floating = trans + || ((c->maxw == c->minw) && (c->maxh == c->minh)); + + arrange(NULL); + /* mapping the window now prevents flicker */ + if(c->tags[tsel]) { + XMapRaised(dpy, c->win); + XMapRaised(dpy, c->title); + focus(c); + } + else { + ban_client(c); + XMapRaised(dpy, c->win); + XMapRaised(dpy, c->title); + } } void @@ -342,14 +299,20 @@ gravitate(Client *c, Bool invert) void -resize(Client *c) +resize(Client *c, Bool inc) { 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(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->x > sw) /* might happen on restart */ + c->x = sw - c->w; + if(c->y > sh) + c->ty = c->y = sh - c->h; if(c->minw && c->w < c->minw) c->w = c->minw; if(c->minh && c->h < c->minh) @@ -359,6 +322,7 @@ resize(Client *c) 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; @@ -391,18 +355,22 @@ unmanage(Client *c) XUngrabButton(dpy, AnyButton, AnyModifier, c->win); XDestroyWindow(dpy, c->title); - for(l=&clients; *l && *l != c; l=&(*l)->next); + for(l = &clients; *l && *l != c; l = &(*l)->next); *l = c->next; - for(l=&stack; *l && *l != c; l=&(*l)->snext); - *l = c->snext; + for(l = &clients; *l; l = &(*l)->next) + if((*l)->revert == c) + (*l)->revert = NULL; + if(sel == c) + sel = sel->revert ? sel->revert : clients; + free(c); XFlush(dpy); XSetErrorHandler(error_handler); XUngrabServer(dpy); - arrange(); - if(stack) - focus(stack); + arrange(NULL); + if(sel) + focus(sel); } Client * @@ -424,29 +392,3 @@ getclient(Window w) return c; return NULL; } - -void -draw_client(Client *c) -{ - int i; - if(c == stack) - return; - - 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); -}