From c63a9af49257c7a315ffcf1baccfc4c6b8fbaf54 Mon Sep 17 00:00:00 2001
From: Martin Duquesnoy <xorg62@gmail.com>
Date: Thu, 5 Aug 2010 16:06:39 +0200
Subject: [PATCH] Layout: Remove layer layout (was for testing)

---
 src/config.c |   2 -
 src/init.c   |   1 -
 src/layout.c | 103 ---------------------------------------------------
 src/wmfs.h   |   3 --
 4 files changed, 109 deletions(-)

diff --git a/src/config.c b/src/config.c
index 12a67a5..89626f6 100644
--- a/src/config.c
+++ b/src/config.c
@@ -87,8 +87,6 @@ func_name_list_t tmp_func_list[] =
      {"launcher",                 uicb_launcher },
      {"set_layout",               uicb_set_layout },
      {"menu",                     uicb_menu },
-     {"set_client_layer",         uicb_set_client_layer },
-     {"set_layer",                uicb_set_layer },
      {"ignore_next_client_rules", uicb_ignore_next_client_rules },
      {"check_max",                uicb_checkmax },
      {"check_free",               uicb_checkfree },
diff --git a/src/init.c b/src/init.c
index 4c93124..063c530 100644
--- a/src/init.c
+++ b/src/init.c
@@ -48,7 +48,6 @@ const func_name_list_t layout_list[] =
      {"tile_mirror_vertical",    mirror_vertical },
      {"mirror_horizontal",       mirror_horizontal },
      {"tile_mirror_horizontal",  mirror_horizontal },
-     {"layer",                   layer },
      {"max",                     maxlayout },
      {"maxlayout",               maxlayout },
      {"freelayout",              freelayout },
diff --git a/src/layout.c b/src/layout.c
index 536c239..db75a91 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -230,43 +230,6 @@ uicb_set_nmaster(uicb_t cmd)
      return;
 }
 
-void
-uicb_set_client_layer(uicb_t cmd)
-{
-     int n = atoi(cmd);
-
-     screen_get_sel();
-
-     CHECK(sel);
-
-     if(sel->layer + n < 1
-               || sel->layer + n > tags[selscreen][seltag[selscreen]].layers)
-          return;
-
-     sel->layer += n;
-
-     tags[selscreen][seltag[selscreen]].layout.func(selscreen);
-
-     return;
-}
-
-void
-uicb_set_layer(uicb_t cmd)
-{
-     int n = atoi(cmd);
-
-     screen_get_sel();
-
-     if(tags[selscreen][seltag[selscreen]].layers + n < 1)
-          return;
-
-     tags[selscreen][seltag[selscreen]].layers += n;
-     tags[selscreen][seltag[selscreen]].layout.func(selscreen);
-
-     return;
-}
-
-
 /** Grid layout function
 */
 void
@@ -638,72 +601,6 @@ mirror(int screen, Bool horizontal)
      return;
 }
 
-/** Layer layout function
-*/
-void
-layer(int screen)
-{
-     Client *c;
-     XRectangle geo = { 0 };
-     XRectangle sg = sgeo[screen];
-     int n, i, l = tags[screen][seltag[screen]].layers;
-     int *x = NULL;
-     int *nl = NULL;
-     int *ncl = NULL;
-
-     for(n = 0, c = tiled_client(screen, clients); c; c = tiled_client(screen, c->next), ++n);
-     CHECK(n);
-
-     x = emalloc(l + 1, sizeof(int));
-     nl = emalloc(l + 1, sizeof(int));
-     ncl = emalloc(l + 1, sizeof(int));
-
-     for(i = 0; i < l + 1; ++i)
-     {
-          x[i] = sg.x;
-          nl[i] = 0;
-          ncl[i] = 0;
-     }
-
-     for(c = tiled_client(screen, clients); c; c = tiled_client(screen, c->next))
-     {
-          for(; c->layer > l; --(c->layer));
-          ++nl[c->layer];
-     }
-
-     for(i = 0, c = tiled_client(screen, clients); c; c = tiled_client(screen, c->next), ++i)
-     {
-          /* Set client property */
-          c->flags &= ~(MaxFlag | LMaxFlag);
-          c->flags |= TileFlag;
-
-          ++ncl[c->layer];
-
-          geo.x = x[c->layer];
-          geo.height = (sg.height / l) - (BORDH + TBARH);
-          geo.width = (sg.width / ((nl[c->layer]) ? nl[c->layer] : 1)) - BORDH * 2;
-          geo.y = sg.y + ((geo.height + TBARH + BORDH) * c->layer) - (geo.height + TBARH + BORDH);
-
-          if(c->layer == l)
-               geo.height = (sg.y + sg.height) - geo.y - BORDH;
-
-          if(ncl[c->layer] == nl[c->layer])
-               geo.width = sg.width - (geo.x - (sg.x - (BORDH * 2)));
-
-          client_moveresize(c, geo, False);
-
-          x[c->layer] = geo.x + geo.width + BORDH * 2;
-     }
-
-     free(x);
-     free(nl);
-     free(ncl);
-
-     ewmh_update_current_tag_prop();
-
-     return;
-}
-
 /** Tile Right function
 */
 void
diff --git a/src/wmfs.h b/src/wmfs.h
index cbf3b1f..f3c0033 100644
--- a/src/wmfs.h
+++ b/src/wmfs.h
@@ -371,7 +371,6 @@ Client *tiled_client(int screen, Client *c);
  void tile_bottom(int screen);
  void mirror_vertical(int screen);
  void mirror_horizontal(int screen);
- void layer(int screen);
  void grid_vertical(int screen);
  void grid_horizontal(int screen);
  /* }}} */
@@ -384,8 +383,6 @@ void uicb_set_nmaster(uicb_t);
 void uicb_set_layout(uicb_t);
 void uicb_toggle_resizehint(uicb_t);
 void uicb_toggle_abovefc(uicb_t cmd);
-void uicb_set_layer(uicb_t cmd);
-void uicb_set_client_layer(uicb_t cmd);
 void layout_set_client_master(Client *c);
 Bool uicb_checkmax(uicb_t);
 Bool uicb_checkfree(uicb_t);