X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=etc%2Fcfg_tiling.lua;h=3942f08ba7d854b5376803d3819ed3400b732911;hb=20070318;hp=0225d3a472ab2c4bcc3616b22821981ad66206e6;hpb=8366314611bf30a0f31d25bf5f5023186fa87692;p=ion3.git

diff --git a/etc/cfg_tiling.lua b/etc/cfg_tiling.lua
index 0225d3a..3942f08 100644
--- a/etc/cfg_tiling.lua
+++ b/etc/cfg_tiling.lua
@@ -26,22 +26,6 @@ defbindings("WTiling", {
 
 -- Frame bindings
 
-defbindings("WFrame.tiled", {
-    submap(META.."K", {
-        bdoc("Detach window from tiled frame"),
-        kpress("D", "mod_tiling.detach(_sub)", "_sub:non-nil"),
-    }),
-})
-
-
-defbindings("WFrame.transient", {
-    submap(META.."K", {
-        bdoc("Detach transient frame"),
-        kpress("D", "mod_tiling.detach(_)", "_sub:non-nil"),
-    }),
-})
-
-
 defbindings("WFrame.floating", {
     submap(META.."K", {
         bdoc("Tile frame, if no tiling exists on the workspace"),
@@ -64,6 +48,8 @@ defctxmenu("WTiling", "Tiling", {
     menuentry("Flip", "WTiling.flip_at(_, _sub)"),
     menuentry("Transpose", "WTiling.transpose_at(_, _sub)"),
     
+    menuentry("Untile", "mod_tiling.untile(_)"),
+    
     submenu("Float split", {
         menuentry("At left", 
                   "WTiling.set_floating_at(_, _sub, 'toggle', 'left')"),
@@ -86,21 +72,6 @@ defctxmenu("WTiling", "Tiling", {
 })
 
 
--- Context menu entries for tiled frames.
-
-defctxmenu("WFrame.tiled", "Tiled frame", {
-    menuentry("Detach window", "mod_tiling.detach(_sub)", "_sub:non-nil"),
-})
-
-
--- Context menu entries for transient frames.
-
-defctxmenu("WFrame.transient", "Transient frame", {
-    append=true,
-    menuentry("Detach", "mod_tiling.detach(_)", "_sub:non-nil"),
-})
-
-
 -- Extra context menu extra entries for floatframes. 
 
 defctxmenu("WFrame.floating", "Floating frame", {
@@ -108,39 +79,3 @@ defctxmenu("WFrame.floating", "Floating frame", {
     menuentry("New tiling", "mod_tiling.mkbottom(_)"),
 })
 
-
--- Adjust default workspace layout
-
-local a_frame = {
-    type="WSplitRegion",
-    regparams = {
-        type = "WFrame", 
-        frame_style = "frame-tiled"
-    }
-}
-    
-ioncore.set{
-    default_ws_params = {
-        -- Destroy workspace if the 'bottom' tiling is destroyed last
-        bottom_last_close = true,
-        -- Layout
-        managed = {
-            {
-                type = "WTiling",
-                bottom = true,
-                -- The default is a single 1:1 horizontal split
-                split_tree = {
-                    type = "WSplitSplit",
-                    dir = "horizontal",
-                    tls = 1,
-                    brs = 1,
-                    tl = a_frame,
-                    br = a_frame
-                }
-                -- For a single frame
-                --split_tree = nil
-            }
-        }
-    }
-}
-