diff options
author | Anselm R. Garbe <arg@10kloc.org> | 2006-09-27 17:18:46 +0200 |
---|---|---|
committer | Anselm R. Garbe <arg@10kloc.org> | 2006-09-27 17:18:46 +0200 |
commit | 6092aa977e9cc87bcf72713af8e7c698ddea4b56 (patch) | |
tree | dfdbd6696217e5bb3af23e115168766550713a59 /client.c | |
parent | c9cc2b385aade3ce7db1404f4b5f8cd6e41e6bae (diff) |
fixing the settags issue, preparing 1.7.1
Diffstat (limited to 'client.c')
-rw-r--r-- | client.c | 30 |
1 files changed, 15 insertions, 15 deletions
@@ -54,19 +54,6 @@ grabbuttons(Client *c, Bool focused) { 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) { return 0; @@ -250,11 +237,13 @@ manage(Window w, XWindowAttributes *wa) { 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; @@ -262,7 +251,6 @@ manage(Window w, XWindowAttributes *wa) { c->snext = stack; stack = clients = c; - updatetitle(c); ban(c); XMapWindow(dpy, c->win); XMapWindow(dpy, c->twin); @@ -321,6 +309,19 @@ resize(Client *c, Bool sizehints, Corner sticky) { } 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); +} + +void updatesize(Client *c) { long msize; XSizeHints size; @@ -382,7 +383,6 @@ updatetitle(Client *c) { } } XFree(name.value); - resizetitle(c); } void |