From a7162d803d0517eb5d11b8d531db658113f84706 Mon Sep 17 00:00:00 2001
From: Martin Duquesnoy <xorg62@gmail.com>
Date: Wed, 4 May 2011 16:15:49 +0200
Subject: [PATCH] Cfactor: Add cfactor_scan_row to arrange row parents of
 factorized client

---
 src/cfactor.c | 73 ++++++++++++++++++++++++++++++++++++++++++---------
 src/client.c  |  4 +--
 2 files changed, 63 insertions(+), 14 deletions(-)

diff --git a/src/cfactor.c b/src/cfactor.c
index 7c3d0d1..8cd5c92 100644
--- a/src/cfactor.c
+++ b/src/cfactor.c
@@ -32,6 +32,14 @@
 
 #include "wmfs.h"
 
+#define RPOS(x) (x % 2 ? p - 1 : p + 1)
+
+char scanfac[4][2] =
+{
+     { 1,  0 }, { -1, 0 }, /* Right, Left   */
+     { 0, -1 }, {  0, 1 }  /* Top,   Bottom */
+};
+
 /** Clean client tile factors
   *\param c Client pointer
 */
@@ -77,6 +85,53 @@ cfactor_geo(XRectangle geo, int fact[4])
      return cgeo;
 }
 
+static Bool
+cfactor_parentrow(Client *c, Client *cc, Position p)
+{
+     Bool ret;
+
+     if(!c || !cc)
+          return False;
+
+     switch(p)
+     {
+          default:
+          case Right:
+               ret = (cc->frame_geo.x + cc->frame_geo.width == c->frame_geo.x + c->frame_geo.width);
+               break;
+          case Left:
+               ret = (cc->frame_geo.x == c->frame_geo.x);
+               break;
+          case Top:
+               ret = (cc->frame_geo.y == c->frame_geo.y);
+               break;
+          case Bottom:
+               ret = (cc->frame_geo.y + cc->frame_geo.height == c->frame_geo.y + c->frame_geo.height);
+               break;
+     }
+
+      return ret;
+}
+
+static void
+cfactor_scan_row(Client *c, Position p, int fac)
+{
+     Client *cc;
+
+     for(cc = tiled_client(c->screen, clients); cc; cc = tiled_client(c->screen, cc->next))
+     {
+          if(cc == c)
+               continue;
+
+          if(cfactor_parentrow(c, cc, p))
+          {
+               cc->tilefact[p] += fac;
+               client_moveresize(cc, cc->geo,  tags[cc->screen][cc->tag].resizehint);
+          }
+     }
+
+     return;
+}
 
 /** Manual resizing of tiled clients
   * \param c Client pointer
@@ -89,13 +144,7 @@ cfactor_set(Client *c, Position p, int fac)
      Client *gc = NULL;
      int x, y;
      XRectangle cgeo, scgeo;
-     Position reversepos[4] = { Left, Right, Bottom, Top };
      int cfact[4] = { 0 }, scfact[4] = { 0 };
-     char scanfac[4][3] =
-     {
-          { 1,  0 }, { -1, 0 }, /* Right, Left */
-          { 0, -1 }, {  0, 1 }  /* Top, Bottom */
-     };
 
      if(!c || p > Bottom)
           return;
@@ -113,7 +162,7 @@ cfactor_set(Client *c, Position p, int fac)
           return;
 
      cfact[p] += fac;
-     scfact[reversepos[p]] -= fac;
+     scfact[RPOS(p)] -= fac;
 
      cgeo  = cfactor_geo(c->geo,  cfact);
      scgeo = cfactor_geo(gc->geo, scfact);
@@ -128,12 +177,12 @@ cfactor_set(Client *c, Position p, int fac)
           || cgeo.width < 1 || cgeo.height < 1)
           return;
 
-     /* Check if move/resize is needed for same col/row clients */
-     /*for(sc = tiled_client(c->screen, clients); sc; tiled_client(c->screen, c->next))
-          if(sc->geo.*/
-
      c->tilefact[p] += fac;
-     gc->tilefact[reversepos[p]] -= fac;
+     gc->tilefact[RPOS(p)] -= fac;
+
+     /* Arrange row parents */
+     cfactor_scan_row(c, p, fac);
+     cfactor_scan_row(gc, RPOS(p), -fac);
 
      /* Magic moment */
      client_moveresize(c,  cgeo,  tags[c->screen][c->tag].resizehint);
diff --git a/src/client.c b/src/client.c
index 1ab58e6..42e0ce1 100644
--- a/src/client.c
+++ b/src/client.c
@@ -527,8 +527,8 @@ client_urgent(Client *c, Bool u)
      {
           Client *cc;
 
-          if(x < 0 || x > sgeo[selscreen].x + sgeo[selscreen].width
-                    || y < 0 || y > sgeo[selscreen].y + sgeo[selscreen].height)
+          if(x < 0 || x > spgeo[selscreen].x + spgeo[selscreen].width
+                    || y < 0 || y > spgeo[selscreen].y + spgeo[selscreen].height)
                return NULL;
 
           for(cc = clients; cc; cc = cc->next)