From fd27ce371e2c4140c8f2b0f51bd59cb6734aa529 Mon Sep 17 00:00:00 2001
From: Martin Duquesnoy <xorg62@gmail.com>
Date: Sat, 28 Jan 2012 01:52:40 +0100
Subject: [PATCH] Improve free client management

---
 src/client.c | 46 ++++++++++++++++++++++++++--------------------
 src/client.h |  2 +-
 src/layout.c |  3 +++
 src/mouse.c  | 14 ++++++++++----
 4 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/src/client.c b/src/client.c
index 1be48ce..06a004c 100644
--- a/src/client.c
+++ b/src/client.c
@@ -456,7 +456,9 @@ client_tab_focus(struct client *c)
 
           c->flags |=  CLIENT_TABMASTER;
           c->flags &= ~CLIENT_TABBED;
+
           client_moveresize(c, &c->tabmaster->geo);
+
           if(c->tag == c->screen->seltag)
                client_map(c);
 
@@ -900,10 +902,9 @@ client_new(Window w, XWindowAttributes *wa, bool scan)
      c->scol = c->theme->client_s;
 
      client_frame_new(c);
-
-     /* Set tag */
      client_get_sizeh(c);
 
+     /* Set tag */
      if(c->flags & CLIENT_HINT_FLAG /* && OPTIONKIVABIEN */)
           c->flags |= CLIENT_FREE;
 
@@ -1004,6 +1005,7 @@ client_geo_hints(struct geo *g, int *s)
           g->h = s[MAXH];
 }
 
+/* Manage window size in frame in tiling mode */
 bool
 client_winsize(struct client *c, struct geo *g)
 {
@@ -1020,13 +1022,11 @@ client_winsize(struct client *c, struct geo *g)
 
      /* Check possible problem for tile integration */
      if(ow < c->sizeh[MINW] || oh < c->sizeh[MINH])
-     {
           if(g->w < c->geo.w || g->h < c->geo.h)
           {
                c->wgeo = og;
                return true;
           }
-     }
 
      /* Balance position with new size */
      c->wgeo.x += (ow - c->wgeo.w) >> 1;
@@ -1036,28 +1036,36 @@ client_winsize(struct client *c, struct geo *g)
      return false;
 }
 
-bool
+void
 client_moveresize(struct client *c, struct geo *g)
 {
-     bool r = true;
-
      if(c->flags & CLIENT_TABBED)
-          return false;
+          return;
 
+     /* Adjust frame regarding window required size */
      if(c->flags & CLIENT_FREE)
-          c->ttgeo = c->fgeo = c->rgeo = c->geo = *g;
+     {
+          g->w -= c->border + c->border;
+          g->h -= c->tbarw + c->border;
+
+          client_geo_hints(g, (int*)c->sizeh);
+
+          c->wgeo = c->geo = c->rgeo = *g;
+          c->wgeo.x = c->border;
+          c->wgeo.y = c->tbarw;
+          c->geo.w = c->rgeo.w = c->wgeo.w + c->border + c->border;
+          c->geo.h = c->rgeo.h = c->wgeo.h + c->tbarw + c->border;
+
+          c->fgeo = c->geo;
+     }
+     /* Adjust window regarding required size for frame (tiling) */
      else
+     {
           c->ttgeo = c->tgeo = c->rgeo = c->geo = *g;
 
-     if(!(c->flags & CLIENT_DID_WINSIZE))
-          if(client_winsize(c, g))
-          {
-               r = false;
-               /* TODO
-                * Window required size not compatible
-                * with frame window size in tile mode
-                */
-          }
+          if(!(c->flags & CLIENT_DID_WINSIZE))
+               client_winsize(c, g);
+     }
 
      /* Real geo regarding full root size */
      c->rgeo.x += c->screen->ugeo.x;
@@ -1077,8 +1085,6 @@ client_moveresize(struct client *c, struct geo *g)
      client_frame_update(c, CCOL(c));
      client_update_props(c, CPROP_GEO);
      client_configure(c);
-
-     return r;
 }
 
 void
diff --git a/src/client.h b/src/client.h
index 1b8edf1..38a04c5 100644
--- a/src/client.h
+++ b/src/client.h
@@ -40,7 +40,7 @@ struct client *client_new(Window w, XWindowAttributes *wa, bool scan);
 void client_geo_hints(struct geo *g, int *s);
 void client_get_sizeh(struct client *c);
 bool client_winsize(struct client *c, struct geo *geo);
-bool client_moveresize(struct client *c, struct geo *g);
+void client_moveresize(struct client *c, struct geo *g);
 void client_maximize(struct client *c);
 void client_fac_resize(struct client *c, enum position p, int fac);
 void client_fac_adjust(struct client *c);
diff --git a/src/layout.c b/src/layout.c
index 744d024..eb60748 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -556,6 +556,9 @@ uicb_layout_hmirror(Uicb cmd)
 void
 layout_client(struct client *c)
 {
+     if(c->flags & CLIENT_TABBED)
+          c = c->tabmaster;
+
      if(c->flags & CLIENT_IGNORE_LAYOUT)
      {
           c->flags ^= CLIENT_IGNORE_LAYOUT;
diff --git a/src/mouse.c b/src/mouse.c
index 67d5cbb..5bc2d38 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -52,13 +52,19 @@ mouse_resize(struct client *c)
           {
                _REV_SBORDER(c);
 
-               c->geo.w = ((ev.xmotion.x_root - c->geo.x < c->sizeh[MINW])
-                           ? c->sizeh[MINW]
+               c->geo.w = ((ev.xmotion.x_root - c->geo.x <= c->sizeh[MINW] + c->border + c->border)
+                           ? c->sizeh[MINW] + c->border + c->border
                            : ev.xmotion.x_root - c->geo.x);
-               c->geo.h = ((ev.xmotion.y_root - c->geo.y < c->sizeh[MINH])
-                           ? c->sizeh[MINH]
+               c->geo.h = ((ev.xmotion.y_root - c->geo.y <= (c->sizeh[MINH] + c->tbarw + c->border))
+                           ? c->sizeh[MINH] + c->tbarw + c->border
                            : ev.xmotion.y_root - c->geo.y);
 
+               client_geo_hints(&c->geo, (int*)c->sizeh);
+
+               /* For border preview cohesion */
+               c->geo.h += c->tbarw + c->border;
+               c->geo.w += c->border + c->border;
+
                _REV_SBORDER(c);
           }
           else