X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/7a4d6f5ffa594603ef83bc8b0e9945d12e082490..d99ce8fdba3d86c7837a1ee60c398fa477365eab:/layout/centerwork.lua?ds=sidebyside diff --git a/layout/centerwork.lua b/layout/centerwork.lua index 2035c65..aff2771 100644 --- a/layout/centerwork.lua +++ b/layout/centerwork.lua @@ -1,122 +1,153 @@ - --[[ - - Licensed under GNU General Public License v2 - * (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, Luke Bonham + * (c) 2010-2012, Peter Hofmann + --]] -local awful = require("awful") -local beautiful = require("beautiful") -local tonumber = tonumber -local math = { floor = math.floor } +local floor = math.floor +local screen = 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 - - -- Screen. +local function do_centerwork(p, orientation) + local t = p.tag or screen[p.screen].selected_tag local wa = p.workarea local cls = p.clients - -- Width of main column? - local t = awful.tag.selected(p.screen) - local mwfact = awful.tag.getmwfact(t) + if #cls == 0 then return end + + local c = cls[1] + local g = {} + + -- 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 orientation == "vertical" then + 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 - 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 - - c:geometry(g) - - -- 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.y = wa.y + else + if nbrFirstSlaves > 0 then slaveFirstDim = floor(wa.width / nbrFirstSlaves) end + if nbrSecondSlaves > 0 then slaveSecondDim = floor(wa.width / nbrSecondSlaves) 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 + g.height = mainhei + g.width = wa.width + + g.x = wa.x + 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) + p.geometries[c] = g - at = at + 1 + -- Auxiliary windows. + if #cls <= 1 then return end + for i = 2,#cls do + local c = cls[i] + local g = {} + + local rowIndex = floor(i/2) + + if orientation == "vertical" then + if i % 2 == 0 then + -- left slave + g.x = wa.x + g.y = wa.y + (rowIndex-1)*slaveFirstDim + + g.width = slaveLwid + + -- if last slave in left row use remaining space for that slave + if rowIndex == nbrFirstSlaves then + g.height = wa.y + wa.height - g.y + else + g.height = slaveFirstDim + end + else + -- right slave + g.x = wa.x + slaveLwid + mainwid + g.y = wa.y + (rowIndex-1)*slaveSecondDim + + g.width = slaveRwid + + -- if last slave in right row use remaining space for that slave + if rowIndex == nbrSecondSlaves then + g.height = wa.y + wa.height - g.y + else + g.height = slaveSecondDim + end end + else + if i % 2 == 0 then + -- top slave + g.x = wa.x + (rowIndex-1)*slaveFirstDim + g.y = wa.y + + g.height = slaveThei + + -- if last slave in top row use remaining space for that slave + if rowIndex == nbrFirstSlaves then + g.width = wa.x + wa.width - g.x + else + g.width = slaveFirstDim + end + else + -- bottom slave + g.x = wa.x + (rowIndex-1)*slaveSecondDim + g.y = wa.y + slaveThei + mainhei + + g.height = slaveBhei + + -- if last slave in bottom row use remaining space for that slave + if rowIndex == nbrSecondSlaves then + g.width = wa.x + wa.width - g.x + else + g.width = slaveSecondDim + 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 + + p.geometries[c] = 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