]> git.madduck.net Git - etc/awesome.git/blobdiff - layout/centerwork.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Fix bugs with v4 API update
[etc/awesome.git] / layout / centerwork.lua
index 2035c655d1c71e4b45eddb0f922eeb3477bfbada..a8d9a962d510a82b5581c22bd5fa774aef2648f4 100644 (file)
 --[[
                                                   
      Licensed under GNU General Public License v2 
+      * (c) 2016,      Henrik Antonsson           
+      * (c) 2015,      Joerg Jaspert              
+      * (c) 2014,      projektile                 
       * (c) 2013,      Luke Bonham                
       * (c) 2010-2012, Peter Hofmann              
                                                   
 --]]
 
-local awful     = require("awful")
-local beautiful = require("beautiful")
-local tonumber  = tonumber
-local math      = { floor = math.floor }
+local tonumber = tonumber
+local math     = { floor = math.floor }
+local scr      = require("awful.screen")
 
-local centerwork =
-{
+local centerwork = {
     name         = "centerwork",
-    top_left     = 0,
-    top_right    = 1,
-    bottom_left  = 2,
-    bottom_right = 3
+    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)
-    if useless_gap == nil
-    then
-        useless_gap = 0
-    end
-
+local function do_centerwork(p, orientation)
     -- Screen.
-    local wa = p.workarea
+    local wa  = p.workarea
     local cls = p.clients
+    local ta = scr.focused().selected_tag
 
-    -- Width of main column?
-    local t = awful.tag.selected(p.screen)
-    local mwfact = awful.tag.getmwfact(t)
+    if not ta then return end
+
+    if #cls <= 0 then return end
+
+    -- Useless gaps.
+    local useless_gap = p.useless_gap or 0
+
+    local c = cls[1]
+    local g = {}
+
+    -- Main column, fixed width and height.
+    local mwfact          = ta.master_width_factor
+    local mainhei         = math.floor(wa.height * mwfact)
+    local mainwid         = math.floor(wa.width * mwfact)
+    local slavewid        = wa.width - mainwid
+    local slaveLwid       = math.floor(slavewid / 2)
+    local slaveRwid       = slavewid - slaveLwid
+    local slavehei        = wa.height - mainhei
+    local slaveThei       = math.floor(slavehei / 2)
+    local slaveBhei       = slavehei - slaveThei
+    local nbrFirstSlaves  = math.floor(#cls / 2)
+    local nbrSecondSlaves = math.floor((#cls - 1) / 2)
+
+    local slaveFirstDim, slaveSecondDim = 0, 0
+
+    if orientation == "vertical" then
+        if nbrFirstSlaves  > 0 then slaveFirstDim  = math.floor(wa.height / nbrFirstSlaves) end
+        if nbrSecondSlaves > 0 then slaveSecondDim = math.floor(wa.height / nbrSecondSlaves) end
+
+        g.height = wa.height - 2*useless_gap - 2*c.border_width
+        g.width  = mainwid - 2*c.border_width
 
-    if #cls > 0
-    then
-        -- Main column, fixed width and height.
-        local c = cls[#cls]
-        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
         g.y = wa.y + useless_gap
+    else
+        if nbrFirstSlaves  > 0 then slaveFirstDim  = math.floor(wa.width / nbrFirstSlaves) end
+        if nbrSecondSlaves > 0 then slaveSecondDim = math.floor(wa.width / nbrSecondSlaves) end
 
-        c:geometry(g)
+        g.height  = mainhei - 2*c.border_width
+        g.width = wa.width - 2*useless_gap - 2*c.border_width
 
-        -- Auxiliary windows.
-        if #cls > 1
-        then
-            local at = 0
-            for i = (#cls - 1),1,-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
+        g.x = wa.x + useless_gap
+        g.y = wa.y + slaveThei
+    end
 
-                c = cls[i]
-                g = {}
-
-                if at == centerwork.top_left
-                then
-                    -- top left
-                    g.x = wa.x + useless_gap
-                    g.y = wa.y + useless_gap
-                    g.width = slaveLwid - 2 * useless_gap
-                    g.height = slaveThei - useless_gap
-                elseif at == centerwork.top_right
-                then
-                    -- top right
-                    g.x = wa.x + slaveLwid + mainwid + useless_gap
-                    g.y = wa.y + useless_gap
-                    g.width = slaveRwid - 2 * useless_gap
-                    g.height = slaveThei - useless_gap
-                elseif at == centerwork.bottom_left
-                then
-                    -- bottom left
-                    g.x = wa.x + useless_gap
-                    g.y = wa.y + slaveThei + useless_gap
-                    g.width = slaveLwid - 2 * useless_gap
-                    g.height = slaveBhei - 2 * useless_gap
-                elseif at == centerwork.bottom_right
-                then
-                    -- bottom right
-                    g.x = wa.x + slaveLwid + mainwid + useless_gap
-                    g.y = wa.y + slaveThei + useless_gap
-                    g.width = slaveRwid - 2 * useless_gap
-                    g.height = slaveBhei - 2 * useless_gap
-                end
+    if g.width  < 1 then g.width  = 1 end
+    if g.height < 1 then g.height = 1 end
 
-                c:geometry(g)
+    c:geometry(g)
+
+    -- Auxiliary windows.
+    if #cls <= 1 then return end
+    for i = 2,#cls do
+        local c = cls[i]
+        local g = {}
 
-                at = at + 1
+        local rowIndex = math.floor(i/2)
+
+        if orientation == "vertical" then
+            if i % 2 == 0 then
+                -- left slave
+                g.x = wa.x + useless_gap
+                g.y = wa.y + useless_gap + (rowIndex-1)*slaveFirstDim
+
+                g.width = slaveLwid - 2*useless_gap - 2*c.border_width
+
+                -- if last slave in left row use remaining space for that slave
+                if rowIndex == nbrFirstSlaves then
+                    g.height = wa.y + wa.height - g.y - useless_gap - 2*c.border_width
+                else
+                    g.height = slaveFirstDim - useless_gap - 2*c.border_width
+                end
+            else
+                -- right slave
+                g.x = wa.x + slaveLwid + mainwid + useless_gap
+                g.y = wa.y + useless_gap + (rowIndex-1)*slaveSecondDim
+
+                g.width = slaveRwid - 2*useless_gap - 2*c.border_width
+
+                -- if last slave in right row use remaining space for that slave
+                if rowIndex == nbrSecondSlaves then
+                    g.height = wa.y + wa.height - g.y - useless_gap - 2*c.border_width
+                else
+                    g.height = slaveSecondDim - useless_gap - 2*c.border_width
+                end
             end
+        else
+            if i % 2 == 0 then
+                -- top slave
+                g.x = wa.x + useless_gap + (rowIndex-1)*slaveFirstDim
+                g.y = wa.y + useless_gap
+
+                g.height = slaveThei - 2*useless_gap - 2*c.border_width
+
+                -- if last slave in top row use remaining space for that slave
+                if rowIndex == nbrFirstSlaves then
+                    g.width = wa.x + wa.width - g.x - useless_gap - 2*c.border_width
+                else
+                    g.width = slaveFirstDim - useless_gap - 2*c.border_width
+                end
+            else
+                -- bottom slave
+                g.x = wa.x + useless_gap + (rowIndex-1)*slaveFirstDim
+                g.y = wa.y + slaveThei + mainhei + useless_gap
+
+                g.height = slaveBhei - 2*useless_gap - 2*c.border_width
+
+                -- if last slave in bottom row use remaining space for that slave
+                if rowIndex == nbrSecondSlaves then
+                    g.width = wa.x + wa.width - g.x - useless_gap - 2*c.border_width
+                else
+                    g.width = slaveSecondDim - useless_gap - 2*c.border_width
+                end
 
-            -- Set remaining clients to floating.
-            for i = (#cls - 1 - 4),1,-1
-            do
-                c = cls[i]
-                awful.client.floating.set(c, true)
             end
         end
+
+        if g.width  < 1 then g.width  = 1 end
+        if g.height < 1 then g.height = 1 end
+
+        c:geometry(g)
     end
 end
 
+
+function centerwork.horizontal.arrange(p)
+    return do_centerwork(p, "horizontal")
+end
+
+function centerwork.arrange(p)
+    return do_centerwork(p, "vertical")
+end
+
 return centerwork