X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/7a4d6f5ffa594603ef83bc8b0e9945d12e082490..2697333bdcc6d1ec84e28e76892a007e62ecad2c:/layout/centerwork.lua?ds=inline diff --git a/layout/centerwork.lua b/layout/centerwork.lua index 2035c65..954826e 100644 --- a/layout/centerwork.lua +++ b/layout/centerwork.lua @@ -2,6 +2,7 @@ --[[ Licensed under GNU General Public License v2 + * (c) 2014, projektile * (c) 2013, Luke Bonham * (c) 2010-2012, Peter Hofmann @@ -15,25 +16,32 @@ local math = { floor = math.floor } local centerwork = { name = "centerwork", - top_left = 0, - top_right = 1, + top_right = 0, + bottom_right = 1, bottom_left = 2, - bottom_right = 3 + top_left = 3 } 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 useless_gap = tonumber(beautiful.useless_gap_width) or 0 + + -- 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 -- Screen. local wa = p.workarea local cls = p.clients + -- Borders are factored in. + wa.height = wa.height - (global_border * 2) + wa.width = wa.width - (global_border * 2) + wa.x = wa.x + global_border + wa.y = wa.y + global_border + -- Width of main column? local t = awful.tag.selected(p.screen) local mwfact = awful.tag.getmwfact(t) @@ -41,7 +49,7 @@ function centerwork.arrange(p) if #cls > 0 then -- Main column, fixed width and height. - local c = cls[#cls] + local c = cls[1] local g = {} local mainwid = math.floor(wa.width * mwfact) local slavewid = wa.width - mainwid @@ -49,19 +57,23 @@ function centerwork.arrange(p) local slaveRwid = slavewid - slaveLwid local slaveThei = math.floor(wa.height / 2) local slaveBhei = wa.height - slaveThei + local Thalfgap = math.floor(useless_gap / 2) + local Bhalfgap = useless_gap - Thalfgap - g.height = wa.height - 2 * useless_gap - g.width = mainwid + g.height = wa.height - 2*useless_gap - 2*c.border_width + g.width = mainwid - 2*c.border_width g.x = wa.x + slaveLwid g.y = wa.y + useless_gap + 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 local at = 0 - for i = (#cls - 1),1,-1 + for i = 2,#cls do -- It's all fixed. If there are more than 5 clients, -- those additional clients will float. This is @@ -74,36 +86,38 @@ function centerwork.arrange(p) c = cls[i] g = {} - if at == centerwork.top_left + if i - 2 == 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 + g.width = slaveLwid - 2*useless_gap - 2*c.border_width + g.height = slaveThei - useless_gap - Thalfgap - 2*c.border_width + elseif i - 2 == 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 + g.width = slaveRwid - 2*useless_gap - 2*c.border_width + g.height = slaveThei - useless_gap - Thalfgap - 2*c.border_width + elseif i - 2 == 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 + g.y = wa.y + slaveThei + Bhalfgap + g.width = slaveLwid - 2*useless_gap - 2*c.border_width + g.height = slaveBhei - useless_gap - Bhalfgap - 2*c.border_width + elseif i - 2 == 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 + g.y = wa.y + slaveThei + Bhalfgap + g.width = slaveRwid - 2*useless_gap - 2*c.border_width + g.height = slaveBhei - useless_gap - Bhalfgap - 2*c.border_width end + if g.width < 1 then g.width = 1 end + if g.height < 1 then g.height = 1 end c:geometry(g) at = at + 1