Merge pull request #396 from BarbUk/icons/calendar-black

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

diff --git a/layout/centerwork.lua b/layout/centerwork.lua
index 154b87dedb5ff5143b349e2cdd80be08d2548466..cb8370933b660ae496cf562780f7c477f871f4f4 100644 (file)
--- a/layout/centerwork.lua
+++ b/layout/centerwork.lua
@@ -1,131 +1,135 @@
-

 --[[
 --[[

-                                                  
-     Licensed under GNU General Public License v2 
-      * (c) 2014,      projektile                 
-      * (c) 2013,      Luke Bonham                
-      * (c) 2010-2012, Peter Hofmann              
-                                                  
+
+     Licensed under GNU General Public License v2
+      * (c) 2016,      Henrik Antonsson
+      * (c) 2015,      Joerg Jaspert
+      * (c) 2014,      projektile
+      * (c) 2013,      Luca CPZ
+      * (c) 2010-2012, Peter Hofmann
+

 --]]
 
 --]]
 

-local awful     = require("awful")
-local beautiful = require("beautiful")
-local tonumber  = tonumber
-local math      = { floor = math.floor }
-
-local centerwork =
-{
-    name         = "centerwork",
-    top_left     = 0,
-    top_right    = 1,
-    bottom_left  = 3,
-    bottom_right = 2
+local floor, max, screen = math.floor, math.max, screen
+
+local centerwork = {
+    name       = "centerwork",
+    horizontal = { name = "centerworkh" }

 }
 
 }
 

-function centerwork.arrange(p)
-    -- A useless gap (like the dwm patch) can be defined with
-    -- beautiful.useless_gap_width .
-    local useless_gap = tonumber(beautiful.useless_gap_width) or 0
+local function arrange(p, layout)
+    local t   = p.tag or screen[p.screen].selected_tag
+    local wa  = p.workarea
+    local cls = p.clients

 
 

-    -- A global border can be defined with
-    -- beautiful.global_border_width
-    local global_border = tonumber(beautiful.global_border_width) or 0
-    if global_border < 0 then global_border = 0 end
+    if #cls == 0 then return end

 
 

-    -- Themes border width requires an offset
-    local bw = tonumber(beautiful.border_width) or 0
+    local c, g = cls[1], {}

 
 

-    -- Screen.
-    local wa = p.workarea
-    local cls = p.clients
+    -- Main column, fixed width and height
+    local mwfact          = t.master_width_factor
+    local mainhei         = floor(wa.height * mwfact)
+    local mainwid         = floor(wa.width * mwfact)
+    local slavewid        = wa.width - mainwid
+    local slaveLwid       = floor(slavewid / 2)
+    local slaveRwid       = slavewid - slaveLwid
+    local slavehei        = wa.height - mainhei
+    local slaveThei       = floor(slavehei / 2)
+    local slaveBhei       = slavehei - slaveThei
+    local nbrFirstSlaves  = floor(#cls / 2)
+    local nbrSecondSlaves = floor((#cls - 1) / 2)
+
+    local slaveFirstDim, slaveSecondDim = 0, 0
+
+    if layout.name == "centerwork" then -- vertical
+        if nbrFirstSlaves  > 0 then slaveFirstDim  = floor(wa.height / nbrFirstSlaves) end
+        if nbrSecondSlaves > 0 then slaveSecondDim = floor(wa.height / nbrSecondSlaves) end
+
+        g.height = wa.height
+        g.width  = mainwid
+
+        g.x = wa.x + slaveLwid
+        g.y = wa.y
+    else -- horizontal
+        if nbrFirstSlaves  > 0 then slaveFirstDim  = floor(wa.width / nbrFirstSlaves) end
+        if nbrSecondSlaves > 0 then slaveSecondDim = floor(wa.width / nbrSecondSlaves) end
+
+        g.height  = mainhei
+        g.width = wa.width
+
+        g.x = wa.x
+        g.y = wa.y + slaveThei
+    end
+
+    g.width  = max(g.width, 1)
+    g.height = max(g.height, 1)

 
 

-    -- Borders are factored in.
-    wa.height = wa.height - ((global_border * 2) + (bw * 2))
-    wa.width = wa.width - ((global_border * 2) + (bw * 2))
-
-    -- Width of main column?
-    local t = awful.tag.selected(p.screen)
-    local mwfact = awful.tag.getmwfact(t)
-
-    if #cls > 0
-    then
-        -- Main column, fixed width and height.
-        local c = cls[1]
-        local g = {}
-        local mainwid = math.floor(wa.width * mwfact)
-        local slavewid = wa.width - mainwid
-        local slaveLwid = math.floor(slavewid / 2)
-        local slaveRwid = slavewid - slaveLwid
-        local slaveThei = math.floor(wa.height / 2)
-        local slaveBhei = wa.height - slaveThei
-
-        g.height = wa.height - 2 * useless_gap
-        g.width = mainwid
-        g.x = wa.x + slaveLwid + global_border
-        g.y = wa.y + useless_gap + global_border
-
-        c:geometry(g)
-
-        -- Auxiliary windows.
-        if #cls > 1
-        then
-            local at = 0
-            for i = (#cls),2,-1
-            do
-                -- It's all fixed. If there are more than 5 clients,
-                -- those additional clients will float. This is
-                -- intentional.
-                if at == 4
-                then
-                    break
-                end
-
-                c = cls[i]
-                g = {}
-
-                if i - 2 == centerwork.top_left
-                then
-                    -- top left
-                    g.x = wa.x + useless_gap + global_border
-                    g.y = wa.y + useless_gap + global_border
-                    g.width = slaveLwid - 2 * useless_gap
-                    g.height = slaveThei - useless_gap
-                elseif i - 2 == centerwork.top_right
-                then
-                    -- top right
-                    g.x = wa.x + slaveLwid + mainwid + useless_gap + global_border
-                    g.y = wa.y + useless_gap + global_border
-                    g.width = slaveRwid - 2 * useless_gap
-                    g.height = slaveThei - useless_gap
-                elseif i - 2 == centerwork.bottom_left
-                then
-                    -- bottom left
-                    g.x = wa.x + useless_gap + global_border
-                    g.y = wa.y + slaveThei + useless_gap + global_border
-                    g.width = slaveLwid - 2 * useless_gap
-                    g.height = slaveBhei - 2 * useless_gap
-                elseif i - 2 == centerwork.bottom_right
-                then
-                    -- bottom right
-                    g.x = wa.x + slaveLwid + mainwid + useless_gap + global_border
-                    g.y = wa.y + slaveThei + useless_gap + global_border
-                    g.width = slaveRwid - 2 * useless_gap
-                    g.height = slaveBhei - 2 * useless_gap
-                end
-
-                c:geometry(g)
-
-                at = at + 1
+    p.geometries[c] = g
+
+    -- Auxiliary clients
+    if #cls <= 1 then return end
+    for i = 2, #cls do
+        local c, g = cls[i], {}
+        local idxChecker, dimToAssign
+
+        local rowIndex = floor(i/2)
+
+        if layout.name == "centerwork" then
+            if i % 2 == 0 then -- left slave
+                g.x     = wa.x
+                g.y     = wa.y + (rowIndex - 1) * slaveFirstDim
+                g.width = slaveLwid
+
+                idxChecker, dimToAssign = nbrFirstSlaves, slaveFirstDim
+            else -- right slave
+                g.x     = wa.x + slaveLwid + mainwid
+                g.y     = wa.y + (rowIndex - 1) * slaveSecondDim
+                g.width = slaveRwid
+
+                idxChecker, dimToAssign = nbrSecondSlaves, slaveSecondDim
+            end
+
+            -- if last slave in row, use remaining space for it
+            if rowIndex == idxChecker then
+                g.height = wa.y + wa.height - g.y
+            else
+                g.height = dimToAssign
+            end
+        else
+            if i % 2 == 0 then -- top slave
+                g.x      = wa.x + (rowIndex - 1) * slaveFirstDim
+                g.y      = wa.y
+                g.height = slaveThei
+
+                idxChecker, dimToAssign = nbrFirstSlaves, slaveFirstDim
+            else -- bottom slave
+                g.x      = wa.x + (rowIndex - 1) * slaveSecondDim
+                g.y      = wa.y + slaveThei + mainhei
+                g.height = slaveBhei
+
+                idxChecker, dimToAssign = nbrSecondSlaves, slaveSecondDim

             end
 
             end
 

-            -- Set remaining clients to floating.
-            for i = (#cls - 1 - 4),1,-1
-            do
-                c = cls[i]
-                awful.client.floating.set(c, true)
+            -- if last slave in row, use remaining space for it
+            if rowIndex == idxChecker then
+                g.width = wa.x + wa.width - g.x
+            else
+                g.width = dimToAssign

             end
         end
             end
         end

+
+        g.width  = max(g.width, 1)
+        g.height = max(g.height, 1)
+
+        p.geometries[c] = g

     end
 end
 
     end
 end
 

+function centerwork.arrange(p)
+    return arrange(p, centerwork)
+end
+
+function centerwork.horizontal.arrange(p)
+    return arrange(p, centerwork.horizontal)
+end
+

 return centerwork
 return centerwork