X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=client.c;h=537336caff514f5510031509375695fc197df682;hb=6db5ffb6c9a9c0db5c425c64a96a3896a682c95e;hp=b7c9455259a68bc529aa1dc28c716f5f6f15e3aa;hpb=83d23908d3438d7f1f62533a7c8d96fc1019df55;p=dwm.git diff --git a/client.c b/client.c index b7c9455..537336c 100644 --- a/client.c +++ b/client.c @@ -3,6 +3,7 @@ * See LICENSE file for license details. */ +#include #include #include #include @@ -10,7 +11,95 @@ #include "util.h" #include "wm.h" -#define CLIENT_MASK (StructureNotifyMask | PropertyChangeMask | EnterWindowMask) +void +max(void *aux) +{ + if(!stack) + return; + stack->x = sx; + stack->y = bh; + stack->w = sw - 2; + stack->h = sh - bh - 2; + resize(stack); +} + +void +arrange(void *aux) +{ + 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 - 1) / cols; + gh = (sh - bh - 1) / rows; + + 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; + } + } +} + +void +sel(void *aux) +{ + 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; + raise(c); + focus(c); +} + +void +kill(void *aux) +{ + 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); +} + +static void +resize_title(Client *c) +{ + 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); +} void update_name(Client *c) @@ -37,6 +126,7 @@ update_name(Client *c) } } XFree(name.value); + resize_title(c); } void @@ -73,26 +163,38 @@ update_size(Client *c) c->minw = c->minh = 0; } +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); + for(l = &stack; *l && *l != c; l = &(*l)->snext); eassert(*l == c); *l = c->snext; c->snext = stack; stack = c; - XRaiseWindow(dpy, c->win); - XRaiseWindow(dpy, c->title); - XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); if(old && old != c) { XMapWindow(dpy, old->title); draw_client(old); } XUnmapWindow(dpy, c->title); - draw_bar(); + draw_client(c); + XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); XFlush(dpy); } @@ -104,19 +206,24 @@ manage(Window w, XWindowAttributes *wa) c = emallocz(sizeof(Client)); c->win = w; - c->x = wa->x; - c->y = wa->y; - c->w = wa->width; + 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; update_size(c); XSetWindowBorderWidth(dpy, c->win, 1); - XSelectInput(dpy, c->win, CLIENT_MASK); + 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->title = XCreateWindow(dpy, root, c->x, c->y, c->w, barrect.height, + 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); @@ -127,8 +234,8 @@ manage(Window w, XWindowAttributes *wa) *l = c; c->snext = stack; stack = c; - XMapWindow(dpy, c->win); - XMapWindow(dpy, c->title); + 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, @@ -144,8 +251,8 @@ resize(Client *c) { XConfigureEvent e; + resize_title(c); XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); - XMoveResizeWindow(dpy, c->title, c->x + c->w / 3, c->y, 2 * c->w / 3, barrect.height); e.type = ConfigureNotify; e.event = c->win; e.window = c->win; @@ -156,9 +263,7 @@ resize(Client *c) e.border_width = 0; e.above = None; e.override_redirect = False; - XSelectInput(dpy, c->win, CLIENT_MASK & ~StructureNotifyMask); XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&e); - XSelectInput(dpy, c->win, CLIENT_MASK); XFlush(dpy); } @@ -177,7 +282,6 @@ unmanage(Client *c) XSetErrorHandler(dummy_error_handler); XUngrabButton(dpy, AnyButton, AnyModifier, c->win); - XUnmapWindow(dpy, c->win); XDestroyWindow(dpy, c->title); for(l=&clients; *l && *l != c; l=&(*l)->next); @@ -191,11 +295,19 @@ unmanage(Client *c) XFlush(dpy); XSetErrorHandler(error_handler); XUngrabServer(dpy); - discard_events(EnterWindowMask); 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) @@ -210,17 +322,17 @@ getclient(Window w) void draw_client(Client *c) { - if(!c) - return; - if(c == stack) + if(c == stack) { draw_bar(); + return; + } - brush.rect.x = brush.rect.y = 0; - brush.rect.width = 2 * c->w / 3; - brush.rect.height = barrect.height; + brush.x = brush.y = 0; + brush.w = c->tw; + brush.h = c->th; draw(dpy, &brush, True, c->name); - XCopyArea(dpy, brush.drawable, c->title, brush.gc, 0, 0, - brush.rect.width, brush.rect.height, 0, 0); + XCopyArea(dpy, brush.drawable, c->title, brush.gc, + 0, 0, c->tw, c->th, 0, 0); XFlush(dpy); }