X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=client.c;h=60f1cbeff8777bc9f16cbb0bddc8bba0550a4300;hp=49229a798d04141e7d2c4be38c780302a80d0c96;hb=6651dd7fd9e8e95cfc6c472f1adfeff41735d798;hpb=2e68f22118438fed885c8cc3ccb8be94437eb327 diff --git a/client.c b/client.c index 49229a7..60f1cbe 100644 --- a/client.c +++ b/client.c @@ -1,5 +1,4 @@ -/* - * (C)opyright MMVI Anselm R. Garbe +/* (C)opyright MMVI Anselm R. Garbe * See LICENSE file for license details. */ #include "dwm.h" @@ -11,19 +10,17 @@ /* static functions */ static void -detachstack(Client *c) -{ +detachstack(Client *c) { Client **tc; for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext); *tc = c->snext; } static void -grabbuttons(Client *c, Bool focus) -{ +grabbuttons(Client *c, Bool focused) { XUngrabButton(dpy, AnyButton, AnyModifier, c->win); - if(focus) { + if(focused) { XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None); XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK, @@ -54,51 +51,47 @@ grabbuttons(Client *c, Bool focus) else XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None); - -} - -static void -resizetitle(Client *c) -{ - c->tw = textw(c->name); - if(c->tw > c->w) - c->tw = c->w + 2; - c->tx = c->x + c->w - c->tw + 2; - 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); - } static int -xerrordummy(Display *dsply, XErrorEvent *ee) -{ +xerrordummy(Display *dsply, XErrorEvent *ee) { return 0; } /* extern functions */ void -ban(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); } void -focus(Client *c) -{ +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 +focus(Client *c) { Client *old; - if(!issel) + if(!issel || (c && !isvisible(c))) return; if(!sel) sel = c; else if(sel != c) { - if(maximized) - togglemax(NULL); old = sel; sel = c; if(old) { @@ -119,8 +112,7 @@ focus(Client *c) } Client * -getclient(Window w) -{ +getclient(Window w) { Client *c; for(c = clients; c; c = c->next) @@ -130,8 +122,7 @@ getclient(Window w) } Client * -getctitle(Window w) -{ +getctitle(Window w) { Client *c; for(c = clients; c; c = c->next) @@ -141,8 +132,7 @@ getctitle(Window w) } void -gravitate(Client *c, Bool invert) -{ +gravitate(Client *c, Bool invert) { int dx = 0, dy = 0; switch(c->grav) { @@ -165,7 +155,6 @@ gravitate(Client *c, Bool invert) dy = -(c->h); break; } - switch (c->grav) { default: break; @@ -186,7 +175,6 @@ gravitate(Client *c, Bool invert) dx = -(c->w + c->border); break; } - if(invert) { dx = -dx; dy = -dy; @@ -196,8 +184,7 @@ gravitate(Client *c, Bool invert) } void -killclient(Arg *arg) -{ +killclient(Arg *arg) { if(!sel) return; if(sel->proto & PROTODELWIN) @@ -207,8 +194,7 @@ killclient(Arg *arg) } void -manage(Window w, XWindowAttributes *wa) -{ +manage(Window w, XWindowAttributes *wa) { Client *c; Window trans; XSetWindowAttributes twa; @@ -221,19 +207,16 @@ manage(Window w, XWindowAttributes *wa) c->w = c->tw = wa->width; c->h = wa->height; c->th = bh; - c->border = 0; - setsize(c); - - if(c->x + c->w + 2 > sw) - c->x = sw - c->w - 2; - if(c->x < 0) - c->x = 0; - if(c->y + c->h + 2 > sh) - c->y = sh - c->h - 2; + updatesize(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); @@ -241,26 +224,23 @@ manage(Window w, XWindowAttributes *wa) 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->maxw && c->minw && c->maxw == c->minw && c->maxh == c->minh); - + resizetitle(c); if(clients) clients->prev = c; c->next = clients; c->snext = stack; stack = clients = c; - - settitle(c); ban(c); XMapWindow(dpy, c->win); XMapWindow(dpy, c->twin); @@ -270,8 +250,7 @@ manage(Window w, XWindowAttributes *wa) } void -resize(Client *c, Bool sizehints, Corner sticky) -{ +resize(Client *c, Bool sizehints, Corner sticky) { int bottom = c->y + c->h; int right = c->x + c->w; XWindowChanges wc; @@ -294,7 +273,15 @@ resize(Client *c, Bool sizehints, Corner sticky) 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; @@ -303,14 +290,27 @@ resize(Client *c, Bool sizehints, Corner sticky) if(c->w == sw && c->h == sh) wc.border_width = 0; else - wc.border_width = 1; - XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc); + wc.border_width = BORDERPX; + XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc); + configure(c); XSync(dpy, False); } void -setsize(Client *c) -{ +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 +updatesize(Client *c) { long msize; XSizeHints size; @@ -348,8 +348,7 @@ setsize(Client *c) } void -settitle(Client *c) -{ +updatetitle(Client *c) { char **list = NULL; int n; XTextProperty name; @@ -372,64 +371,25 @@ settitle(Client *c) } } XFree(name.value); - resizetitle(c); } void -togglemax(Arg *arg) -{ - int ox, oy, ow, oh; - Client *c; - XEvent ev; - - if(!sel) - return; - - if((maximized = !maximized)) { - ox = sel->x; - oy = sel->y; - ow = sel->w; - oh = sel->h; - sel->x = sx; - sel->y = sy + bh; - sel->w = sw - 2; - sel->h = sh - 2 - bh; - - restack(); - for(c = getnext(clients); c; c = getnext(c->next)) - if(c != sel) - ban(c); - resize(sel, arrange == dofloat, TopLeft); +unmanage(Client *c) { + Client *nc; - sel->x = ox; - sel->y = oy; - sel->w = ow; - sel->h = oh; - } - else - arrange(NULL); - while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); -} - -void -unmanage(Client *c) -{ + /* The server grab construct avoids race conditions. */ XGrabServer(dpy); XSetErrorHandler(xerrordummy); - detach(c); detachstack(c); if(sel == c) { - for(sel = stack; sel && !isvisible(sel); sel = sel->snext); - focus(sel); + for(nc = stack; nc && !isvisible(nc); nc = nc->snext); + focus(nc); } - XUngrabButton(dpy, AnyButton, AnyModifier, c->win); XDestroyWindow(dpy, c->twin); - free(c->tags); free(c); - XSync(dpy, False); XSetErrorHandler(xerror); XUngrabServer(dpy);