From 9636f9188dc305e1d20c0b2ca01a514c3c66ca24 Mon Sep 17 00:00:00 2001
From: Martin Duquesnoy <xorg62@gmail.com>
Date: Fri, 3 Jun 2011 16:03:24 +0200
Subject: [PATCH] Tag/Split: Disable split mode with tag additional

---
 src/cfactor.c |  3 ---
 src/split.c   | 35 +----------------------------------
 src/structs.h |  1 -
 src/tag.c     |  8 ++------
 4 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/src/cfactor.c b/src/cfactor.c
index e6d672b..c1fd750 100644
--- a/src/cfactor.c
+++ b/src/cfactor.c
@@ -236,9 +236,6 @@ cfactor_arrange_row(Client *c, Client *gc, Position p, int fac)
           _cfactor_arrange_row(gc, RPOS(p), -fac);
      }
 
-     /* in case of tag additional, use selscreen/seltag */
-     split_store_geo(selscreen, seltag[selscreen]);
-
      return;
 }
 
diff --git a/src/split.c b/src/split.c
index 5af57ca..07b1f74 100644
--- a/src/split.c
+++ b/src/split.c
@@ -89,19 +89,6 @@ split_apply_current(int screen, int tag)
 {
      Client *c;
 
-     /* Need to use split geo */
-     if(tags[screen][tag].layout.flags & UseGeoFlag)
-     {
-          for(c = tiled_client(screen, clients); c; c = tiled_client(screen, c->next))
-          {
-               cfactor_clean(c);
-               client_moveresize(c, (c->pgeo = c->split_geo), (tags[screen][tag].flags & ResizeHintFlag));
-          }
-
-          tags[screen][tag].layout.flags &= ~UseGeoFlag;
-          tags[screen][tag].flags &= ~CleanFactFlag;
-     }
-
      /* Integrate in split mode */
      if(tags[screen][tag].layout.flags & IntegrationFlag)
      {
@@ -123,21 +110,6 @@ split_apply_current(int screen, int tag)
      return;
 }
 
-/** Store split geos of clients
-*/
-void
-split_store_geo(int screen, int tag)
-{
-     Client *c;
-
-     for(c = clients; c; c = c->next)
-          if(c->screen == screen && c->tag == tag
-                    && (c->flags & TileFlag))
-               c->split_geo = c->wrgeo;
-
-     return;
-}
-
 /** Check if row direction is available to resize from it
   *\param c Client pointer
   *\param g Client pointer
@@ -235,8 +207,6 @@ split_arrange_closed(Client *ghost)
                     }
           }
 
-     split_store_geo(screen, tag);
-
      return;
 }
 
@@ -350,8 +320,6 @@ split_client_integrate(Client *c, Client *sc, int screen, int tag)
      g = split_client(sc, (sc->frame_geo.height < sc->frame_geo.width));
      split_client_fill(c, g);
 
-     split_store_geo(screen, tag);
-
      return;
 }
 
@@ -362,8 +330,7 @@ uicb_split_toggle(uicb_t cmd)
 {
      (void)cmd;
 
-     if((tags[selscreen][seltag[selscreen]].flags ^= SplitFlag) & SplitFlag)
-          split_store_geo(selscreen, seltag[selscreen]);
+     tags[selscreen][seltag[selscreen]].flags ^= SplitFlag;
 
      layout_func(selscreen, seltag[selscreen]);
 
diff --git a/src/structs.h b/src/structs.h
index 18dcf65..796869f 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -57,7 +57,6 @@
 /* Layout flags definition */
 #define IntegrationFlag  (1 << 1)
 #define ArrangeFlag      (1 << 2)
-#define UseGeoFlag       (1 << 3)
 
 /* Tag flags definition */
 #define TagUrgentFlag     (1 << 1)
diff --git a/src/tag.c b/src/tag.c
index 2532bb3..b05073a 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -511,7 +511,7 @@ tag_additional(int sc, int tag, int adtag)
           return;
 
      if(tags[sc][tag].flags & SplitFlag)
-          return;
+          tags[sc][tag].flags &= ~SplitFlag;
 
      tags[sc][tag].tagad ^= TagFlag(adtag);
      tags[sc][adtag].flags |= RequestUpdateFlag;
@@ -519,11 +519,7 @@ tag_additional(int sc, int tag, int adtag)
      tags[sc][adtag].flags |= CleanFactFlag;
 
      if(tags[sc][adtag].flags & SplitFlag)
-     {
-          tags[sc][adtag].layout.flags |= UseGeoFlag;
-          tags[sc][adtag].flags |= CleanFactFlag;
-          split_apply_current(sc, adtag);
-     }
+          tags[sc][adtag].flags &= ~SplitFlag;
 
      arrange(sc, True);