]> 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:

projects / etc / awesome.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
mem: math.floor->ceil and substract SReclaimable too from the total; closes #271
[etc/awesome.git] / layout / centerwork.lua
diff --git a/layout/centerwork.lua b/layout/centerwork.lua
index 1f07a7c01053ad25136ecdf190fa555f9656a1c9..a79314ee34bacd85b90cf902a8c5ee8e79b0ea94 100644 (file)
--- a/layout/centerwork.lua
+++ b/layout/centerwork.lua
@@ -2,130 +2,157 @@
 --[[
                                                   
      Licensed under GNU General Public License v2 
 --[[
                                                   
      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              
                                                   
 --]]
 
       * (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 tag      = require("awful.tag")
+local tonumber = tonumber
+local math     = { floor = math.floor }
 
 
-local centerwork =
-{
+local centerwork = {
     name         = "centerwork",
     name         = "centerwork",
-    top_left     = 0,
-    top_right    = 1,
-    bottom_left  = 3,
-    bottom_right = 2
+    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 do_centerwork(p, orientation)
+    -- Screen.
+    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
+    -- Useless gaps.
+    local useless_gap = p.useless_gap or 0
 
 
-    -- Screen.
-    local wa = p.workarea
-    local cls = p.clients
+    local c = cls[1]
+    local g = {}
 
 
-    -- Borders are factored in.
-    wa.height = wa.height - (global_border * 2)
-    wa.width = wa.width - (global_border * 2)
+    -- Main column, fixed width and height.
+    local mwfact          = tag.object.get_master_width_factor(t)
+    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)
 
 
-    -- Width of main column?
-    local t = awful.tag.selected(p.screen)
-    local mwfact = awful.tag.getmwfact(t)
+    local slaveFirstDim, slaveSecondDim = 0, 0
 
 
-    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 - 2*bw
-        g.width = mainwid - 2*bw
-        g.x = wa.x + slaveLwid + global_border
-        g.y = wa.y + useless_gap + global_border
+    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
 
 
-        c:geometry(g)
+        g.height = wa.height - 2*useless_gap - 2*c.border_width
+        g.width  = mainwid - 2*c.border_width
 
 
-        -- Auxiliary windows.
-        if #cls > 1
-        then
-            local at = 0
-            for i = 2,#cls
-            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 + 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 = 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 - 2*bw
-                    g.height = slaveThei - useless_gap - 2*bw
-                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 - 2*bw
-                    g.height = slaveThei - useless_gap - 2*bw
-                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 - 2*bw
-                    g.height = slaveBhei - 2*useless_gap - 2*bw
-                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 - 2*bw
-                    g.height = slaveBhei - 2*useless_gap - 2*bw
-                end
+        g.height  = mainhei - 2*c.border_width
+        g.width = wa.width - 2*useless_gap - 2*c.border_width
+
+        g.x = wa.x + useless_gap
+        g.y = wa.y + slaveThei
+    end
+
+    if g.width  < 1 then g.width  = 1 end
+    if g.height < 1 then g.height = 1 end
+
+    c:geometry(g)
+
+    -- Auxiliary windows.
+    if #cls <= 1 then return end
+    for i = 2,#cls do
+        local c = cls[i]
+        local g = {}
 
 
-                c:geometry(g)
+        local rowIndex = math.floor(i/2)
 
 
-                at = at + 1
+        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
             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
             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
 
     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
 return centerwork
awesome window-manager configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.