--[[
Licensed under GNU General Public License v2
+ * (c) 2018, Eugene Pakhomov
* (c) 2016, Henrik Antonsson
* (c) 2015, Joerg Jaspert
* (c) 2014, projektile
- * (c) 2013, Luke Bonham
+ * (c) 2013, Luca CPZ
* (c) 2010-2012, Peter Hofmann
--]]
-local floor = math.floor
-local screen = screen
+local floor, max, mouse, mousegrabber, screen = math.floor, math.max, mouse, mousegrabber, screen
local centerwork = {
- name = "centerwork",
- horizontal = { name = "centerworkh" }
+ name = "centerwork",
+ horizontal = { name = "centerworkh" }
}
-local function do_centerwork(p, orientation)
- local t = p.tag or screen[p.screen].selected_tag
- local wa = p.workarea
+local function arrange(p, layout)
+ local t = p.tag or screen[p.screen].selected_tag
+ local wa = p.workarea
local cls = p.clients
if #cls == 0 then return end
- local c = cls[1]
- local g = {}
+ local c, g = cls[1], {}
- -- Main column, fixed width and height.
+ -- 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 slaveFirstDim, slaveSecondDim = 0, 0
- if orientation == "vertical" then
+ 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.x = wa.x + slaveLwid
g.y = wa.y
- else
+ else -- horizontal
if nbrFirstSlaves > 0 then slaveFirstDim = floor(wa.width / nbrFirstSlaves) end
if nbrSecondSlaves > 0 then slaveSecondDim = floor(wa.width / nbrSecondSlaves) end
g.y = wa.y + slaveThei
end
- if g.width < 1 then g.width = 1 end
- if g.height < 1 then g.height = 1 end
+ g.width = max(g.width, 1)
+ g.height = max(g.height, 1)
p.geometries[c] = g
- -- Auxiliary windows.
+ -- Auxiliary clients
if #cls <= 1 then return end
- for i = 2,#cls do
- local c = cls[i]
- local g = {}
+ for i = 2, #cls do
+ local c, g = cls[i], {}
+ local idxChecker, dimToAssign
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
-
+ 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
- -- 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
-
+ idxChecker, dimToAssign = nbrFirstSlaves, slaveFirstDim
+ 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
+ idxChecker, dimToAssign = nbrSecondSlaves, slaveSecondDim
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
+ -- if last slave in row, use remaining space for it
+ if rowIndex == idxChecker then
+ g.height = wa.y + wa.height - g.y
else
- -- bottom slave
- g.x = wa.x + (rowIndex-1)*slaveSecondDim
- g.y = wa.y + slaveThei + mainhei
+ 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
- -- 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
+ idxChecker, dimToAssign = nbrSecondSlaves, slaveSecondDim
+ end
+ -- 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
- if g.width < 1 then g.width = 1 end
- if g.height < 1 then g.height = 1 end
+ g.width = max(g.width, 1)
+ g.height = max(g.height, 1)
p.geometries[c] = g
end
end
+local function mouse_resize_handler(c, corner, x, y, orientation)
+ local wa = c.screen.workarea
+ local mwfact = c.screen.selected_tag.master_width_factor
+ local g = c:geometry()
+ local offset = 0
+ local cursor = "cross"
+
+ local corner_coords
+
+ if orientation == 'vertical' then
+ if g.height + 15 >= wa.height then
+ offset = g.height * .5
+ cursor = "sb_h_double_arrow"
+ elseif not (g.y + g.height + 15 > wa.y + wa.height) then
+ offset = g.height
+ end
+ corner_coords = { x = wa.x + wa.width * (1 - mwfact) / 2, y = g.y + offset }
+ else
+ if g.width + 15 >= wa.width then
+ offset = g.width * .5
+ cursor = "sb_v_double_arrow"
+ elseif not (g.x + g.width + 15 > wa.x + wa.width) then
+ offset = g.width
+ end
+ corner_coords = { y = wa.y + wa.height * (1 - mwfact) / 2, x = g.x + offset }
+ end
+
+ mouse.coords(corner_coords)
-function centerwork.horizontal.arrange(p)
- return do_centerwork(p, "horizontal")
+ local prev_coords = {}
+
+ mousegrabber.run(function(_mouse)
+ if not c.valid then return false end
+ for _, v in ipairs(_mouse.buttons) do
+ if v then
+ prev_coords = { x = _mouse.x, y = _mouse.y }
+ local new_mwfact
+ if orientation == 'vertical' then
+ new_mwfact = 1 - (_mouse.x - wa.x) / wa.width * 2
+ else
+ new_mwfact = 1 - (_mouse.y - wa.y) / wa.height * 2
+ end
+ c.screen.selected_tag.master_width_factor = math.min(math.max(new_mwfact, 0.01), 0.99)
+ return true
+ end
+ end
+ return prev_coords.x == _mouse.x and prev_coords.y == _mouse.y
+ end, cursor)
end
function centerwork.arrange(p)
- return do_centerwork(p, "vertical")
+ return arrange(p, centerwork)
+end
+
+function centerwork.horizontal.arrange(p)
+ return arrange(p, centerwork.horizontal)
+end
+
+function centerwork.mouse_resize_handler(c, corner, x, y)
+ return mouse_resize_handler(c, corner, x, y, 'vertical')
+end
+
+function centerwork.horizontal.mouse_resize_handler(c, corner, x, y)
+ return mouse_resize_handler(c, corner, x, y, 'horizontal')
end
return centerwork
projects / etc / awesome.git / blobdiff