Merge pull request #43 from mrmen/master

[etc/awesome.git] / layout / termfair.lua

diff --git a/layout/termfair.lua b/layout/termfair.lua
index 62eef9ab6663d585a1054d33f361d024646b22eb..89a44bbd0e9e3145b2df77448e44e13663cb541b 100644 (file)
--- a/layout/termfair.lua
+++ b/layout/termfair.lua
@@ -14,15 +14,7 @@ local math      = { ceil  = math.ceil,
                     max   = math.max }
 local tonumber  = tonumber
 
                     max   = math.max }
 local tonumber  = tonumber
 

-local termfair =
-{
-    name    = "termfair",
-
-    -- You can set the number of columns and rows,
-    -- -- otherwise they are read from awful.tag
-    nmaster = 0, -- columns
-    ncol    = 0  -- rows
-}
+local termfair  = { name = "termfair" }

 
 function termfair.arrange(p)
     -- Layout with fixed number of vertical columns (read from nmaster).
 
 function termfair.arrange(p)
     -- Layout with fixed number of vertical columns (read from nmaster).


@@ -45,11 +37,7 @@ function termfair.arrange(p)
 
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width.
 
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width.

-    local useless_gap = tonumber(beautiful.useless_gap_width)
-    if useless_gap == nil
-    then
-        useless_gap = 0
-    end
+    local useless_gap = tonumber(beautiful.useless_gap_width) or 0

 
     -- Screen.
     local wa = p.workarea
 
     -- Screen.
     local wa = p.workarea


@@ -57,22 +45,10 @@ function termfair.arrange(p)
 
     -- How many vertical columns?
     local t = tag.selected(p.screen)
 
     -- How many vertical columns?
     local t = tag.selected(p.screen)

-    local num_x
-    if termfair.nmaster ~= 0
-    then
-        num_x = termfair.nmaster
-    else
-        num_x = tag.getnmaster(t)
-    end
+    local num_x = termfair.nmaster or tag.getnmaster(t)

 
     -- Do at least "desired_y" rows.
 
     -- Do at least "desired_y" rows.

-    local desired_y
-    if termfair.ncol ~= 0
-    then
-        desired_y = termfair.ncol
-    else
-        desired_y = tag.getncol(t)
-    end
+    local desired_y = termfair.ncol or tag.getncol(t)

 
     if #cls > 0
     then
 
     if #cls > 0
     then


@@ -113,27 +89,32 @@ function termfair.arrange(p)
             else
                 g.height = height
             end
             else
                 g.height = height
             end

+

             g.x = wa.x + this_x * width
             g.y = wa.y + this_y * height
             g.x = wa.x + this_x * width
             g.y = wa.y + this_y * height

+

             if useless_gap > 0
             then
                 -- Top and left clients are shrinked by two steps and
                 -- get moved away from the border. Other clients just
                 -- get shrinked in one direction.
             if useless_gap > 0
             then
                 -- Top and left clients are shrinked by two steps and
                 -- get moved away from the border. Other clients just
                 -- get shrinked in one direction.

+                
+                gap_factor = (useless_gap / 100) * 2
+

                 if this_x == 0
                 then
                 if this_x == 0
                 then

-                    g.width = g.width - 2 * useless_gap
+                    g.width = g.width - (2 + gap_factor) * useless_gap

                     g.x = g.x + useless_gap
                 else
                     g.x = g.x + useless_gap
                 else

-                    g.width = g.width - useless_gap
+                    g.width = g.width - (1 + gap_factor) * useless_gap

                 end
 
                 if this_y == 0
                 then
                 end
 
                 if this_y == 0
                 then

-                    g.height = g.height - 2 * useless_gap
+                    g.height = g.height - (2 + gap_factor) * useless_gap

                     g.y = g.y + useless_gap
                 else
                     g.y = g.y + useless_gap
                 else

-                    g.height = g.height - useless_gap
+                    g.height = g.height - (1 + gap_factor) * useless_gap

                 end
             end
             c:geometry(g)
                 end
             end
             c:geometry(g)