From fb8daed2b5a0f8735791cd78154346eeade06fdd Mon Sep 17 00:00:00 2001 From: Martin Duquesnoy Date: Sun, 4 Apr 2010 20:04:54 +0200 Subject: [PATCH] Layout: Fix free geometry of client --- src/client.c | 3 +++ src/status.c | 26 -------------------------- 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/src/client.c b/src/client.c index 50d6ca7..b779f05 100644 --- a/src/client.c +++ b/src/client.c @@ -686,6 +686,9 @@ client_moveresize(Client *c, XRectangle geo, Bool r) c->flags &= ~MaxFlag; c->geo = c->ogeo = geo; + if(c->flags & FreeFlag || tags[c->screen][c->tag].layout.func == freelayout) + c->free_geo = geo; + if((c->screen = screen_get_with_geo(c->geo.x, c->geo.y)) != os) c->tag = seltag[c->screen]; diff --git a/src/status.c b/src/status.c index 4367e09..ef6164d 100644 --- a/src/status.c +++ b/src/status.c @@ -80,32 +80,6 @@ statustext_text(StatusText *s, char *str) return n; } -#ifdef HAVE_IMLIB -/** Check images blocks in str and return properties - * --> \i[x;y;w;h;name]\ - *\param im ImageAttr pointer, image properties - *\param str String - *\return n Lenght of i - */ -int -statustext_image(ImageAttr *im, char *str) -{ - char as; - int n, i, j, k; - - for(i = j = n = 0; i < strlen(str); ++i, ++j) - if(sscanf(&str[i], "\\i[%d;%d;%d;%d;%512[^]]]%c", &im[n].x, &im[n].y, &im[n].w, &im[n].h, im[n].name, &as) == 6 - && as == '\\') - for(++n, ++i, --j; str[i] != as || str[i - 1] != ']'; ++i); - else if(j != i) - str[j] = str[i]; - - for(k = j; k < i; str[k++] = 0); - - return n; -} -#endif /* HAVE_IMLIB */ - /** Draw normal text and colored normal text * --> \#color\ text in color *\param sc Screen