X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=client.c;h=46e6e83a27f62453debe601254dedc61bd9c91ac;hp=b961d8676a67972fc6a5e2ebdfc2d202eb82320e;hb=8b59083eb13c0712e04d9a5b6d7bf4af5913c442;hpb=4641aa2925731ac180b08c80f57db176391ea4a9 diff --git a/client.c b/client.c index b961d86..46e6e83 100644 --- a/client.c +++ b/client.c @@ -7,17 +7,44 @@ #include #include #include +#include -#include "util.h" #include "wm.h" +void (*arrange)(void *aux); + void -arrange(void *aux) +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); +} + +void +floating(void *aux) +{ + Client *c; + + arrange = floating; + for(c = stack; c; c = c->snext) + resize(c); + discard_events(EnterWindowMask); +} + +void +grid(void *aux) { Client *c; int n, cols, rows, gw, gh, i, j; float rt, fd; + arrange = grid; if(!clients) return; for(n = 0, c = clients; c; c = c->next, n++); @@ -31,12 +58,12 @@ arrange(void *aux) else cols = rows; - gw = (sw - 1) / cols; - gh = (sh - bh - 1) / 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 + bh; + c->y = j * gh; c->w = gw; c->h = gh; resize(c); @@ -45,6 +72,7 @@ arrange(void *aux) i = 0; } } + discard_events(EnterWindowMask); } void @@ -61,12 +89,12 @@ sel(void *aux) for(c = stack; c && c->snext; c = c->snext); if(!c) c = stack; - raise(c); + craise(c); focus(c); } void -kill(void *aux) +ckill(void *aux) { Client *c = stack; @@ -81,7 +109,13 @@ kill(void *aux) static void resize_title(Client *c) { - c->tw = textw(&brush.font, c->name) + bh; + int i; + + c->tw = 0; + for(i = 0; i < TLast; i++) + if(c->tags[i]) + c->tw += textw(&brush.font, c->tags[i]) + brush.font.height; + c->tw += textw(&brush.font, c->name) + brush.font.height; if(c->tw > c->w) c->tw = c->w + 2; c->tx = c->x + c->w - c->tw + 2; @@ -149,10 +183,14 @@ update_size(Client *c) } else c->minw = c->minh = 0; + if(c->flags & PWinGravity) + c->grav = size.win_gravity; + else + c->grav = NorthWestGravity; } void -raise(Client *c) +craise(Client *c) { XRaiseWindow(dpy, c->win); XRaiseWindow(dpy, c->title); @@ -172,8 +210,8 @@ focus(Client *c) old = stack; for(l = &stack; *l && *l != c; l = &(*l)->snext); - eassert(*l == c); - *l = c->snext; + if(*l) + *l = c->snext; c->snext = stack; stack = c; if(old && old != c) { @@ -196,11 +234,10 @@ manage(Window w, XWindowAttributes *wa) 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->th = th; + c->border = 1; update_size(c); XSetWindowBorderWidth(dpy, c->win, 1); XSetWindowBorder(dpy, c->win, brush.border); @@ -211,17 +248,16 @@ manage(Window w, XWindowAttributes *wa) 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); + update_name(c); for(l=&clients; *l; l=&(*l)->next); c->next = *l; /* *l == nil */ *l = c; - c->snext = stack; - stack = c; XMapRaised(dpy, c->win); XMapRaised(dpy, c->title); XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask, @@ -230,15 +266,83 @@ manage(Window w, XWindowAttributes *wa) GrabModeAsync, GrabModeSync, None, None); XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask, GrabModeAsync, GrabModeSync, None, None); - resize(c); + 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; + } + + if(invert) { + dx = -dx; + dy = -dy; + } + 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; @@ -248,7 +352,7 @@ resize(Client *c) e.y = c->y; e.width = c->w; e.height = c->h; - e.border_width = 0; + e.border_width = c->border; e.above = None; e.override_redirect = False; XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&e); @@ -273,16 +377,15 @@ unmanage(Client *c) 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; free(c); XFlush(dpy); XSetErrorHandler(error_handler); XUngrabServer(dpy); + arrange(NULL); if(stack) focus(stack); } @@ -310,15 +413,23 @@ getclient(Window w) void draw_client(Client *c) { - if(c == stack) { - draw_bar(); + int i; + if(c == stack) return; - } brush.x = brush.y = 0; - brush.w = c->tw; 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]) + brush.font.height; + draw(dpy, &brush, True, c->tags[i]); + } + } + brush.x += brush.w; + brush.w = textw(&brush.font, c->name) + brush.font.height; draw(dpy, &brush, True, c->name); XCopyArea(dpy, brush.drawable, c->title, brush.gc, 0, 0, c->tw, c->th, 0, 0);