mirror of https://github.com/lcpz/lain.git
fs: options moved to constructor; #closes 259
This commit is contained in:
parent
d5fb6326d2
commit
f5700be12b
|
@ -15,8 +15,8 @@ description = {
|
||||||
license = "GPL v2"
|
license = "GPL v2"
|
||||||
}
|
}
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"lua >= 5.1",
|
"lua >= 5.3",
|
||||||
"awesome >= 3.5",
|
"awesome >= 4.0",
|
||||||
"alsa-utils",
|
"alsa-utils",
|
||||||
"curl",
|
"curl",
|
||||||
"imagemagick"
|
"imagemagick"
|
||||||
|
|
|
@ -33,7 +33,7 @@ local util = { _NAME = "lain.util" }
|
||||||
-- tags.
|
-- tags.
|
||||||
function util.menu_clients_current_tags(menu, args)
|
function util.menu_clients_current_tags(menu, args)
|
||||||
-- List of currently selected tags.
|
-- List of currently selected tags.
|
||||||
local cls_tags = awful.tag.selectedlist(mouse.screen)
|
local cls_tags = awful.screen.focused().selected_tags
|
||||||
|
|
||||||
-- Final list of menu items.
|
-- Final list of menu items.
|
||||||
local cls_t = {}
|
local cls_t = {}
|
||||||
|
@ -89,15 +89,18 @@ end
|
||||||
function util.mc(c)
|
function util.mc(c)
|
||||||
c = c or magnified_client
|
c = c or magnified_client
|
||||||
if not c then return end
|
if not c then return end
|
||||||
awful.client.floating.set(c, true)
|
|
||||||
local mg = screen[mouse.screen].geometry
|
c.floating = true
|
||||||
local tag = awful.tag.selected(mouse.screen)
|
local s = awful.screen.selected()
|
||||||
local mwfact = awful.tag.getmwfact(tag)
|
local mg = s.geometry
|
||||||
|
local tag = s.selected_tag
|
||||||
|
local mwfact = beautiful.master_width_factor or 0.5
|
||||||
local g = {}
|
local g = {}
|
||||||
g.width = math.sqrt(mwfact) * mg.width
|
g.width = math.sqrt(mwfact) * mg.width
|
||||||
g.height = math.sqrt(mwfact) * mg.height
|
g.height = math.sqrt(mwfact) * mg.height
|
||||||
g.x = mg.x + (mg.width - g.width) / 2
|
g.x = mg.x + (mg.width - g.width) / 2
|
||||||
g.y = mg.y + (mg.height - g.height) / 2
|
g.y = mg.y + (mg.height - g.height) / 2
|
||||||
|
|
||||||
if c then c:geometry(g) end -- if c is still a valid object
|
if c then c:geometry(g) end -- if c is still a valid object
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -148,12 +151,12 @@ end
|
||||||
-- Non-empty tag browsing
|
-- Non-empty tag browsing
|
||||||
-- direction in {-1, 1} <-> {previous, next} non-empty tag
|
-- direction in {-1, 1} <-> {previous, next} non-empty tag
|
||||||
function util.tag_view_nonempty(direction, sc)
|
function util.tag_view_nonempty(direction, sc)
|
||||||
local s = sc or mouse.screen or 1
|
local s = sc or awful.screen.focused()
|
||||||
local scr = screen[s]
|
local scr = screen[s]
|
||||||
|
|
||||||
for i = 1, #awful.tag.gettags(s) do
|
for i = 1, #s.tags do
|
||||||
awful.tag.viewidx(direction, s)
|
awful.tag.viewidx(direction, s)
|
||||||
if #awful.client.visible(s) > 0 then
|
if #s.clients > 0 then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -191,7 +194,7 @@ end
|
||||||
-- Move current tag
|
-- Move current tag
|
||||||
-- pos in {-1, 1} <-> {previous, next} tag position
|
-- pos in {-1, 1} <-> {previous, next} tag position
|
||||||
function util.move_tag(pos)
|
function util.move_tag(pos)
|
||||||
local tag = awful.tag.selected(mouse.screen)
|
local tag = awful.screen.focused().selected_tag
|
||||||
local idx = awful.tag.getidx(tag)
|
local idx = awful.tag.getidx(tag)
|
||||||
if tonumber(pos) <= -1 then
|
if tonumber(pos) <= -1 then
|
||||||
awful.tag.move(idx - 1, tag)
|
awful.tag.move(idx - 1, tag)
|
||||||
|
|
|
@ -35,10 +35,10 @@ function fs.hide()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function fs.show(seconds, options, scr)
|
function fs.show(seconds, scr)
|
||||||
fs.hide()
|
fs.hide()
|
||||||
|
|
||||||
local cmd = (options and string.format("dfs %s", options)) or "dfs"
|
local cmd = (fs.options and string.format("dfs %s", fs.options)) or "dfs"
|
||||||
local ws = helpers.read_pipe(helpers.scripts_dir .. cmd):gsub("\n*$", "")
|
local ws = helpers.read_pipe(helpers.scripts_dir .. cmd):gsub("\n*$", "")
|
||||||
|
|
||||||
if fs.followtag then
|
if fs.followtag then
|
||||||
|
@ -65,6 +65,7 @@ local function worker(args)
|
||||||
local notify = args.notify or "on"
|
local notify = args.notify or "on"
|
||||||
local settings = args.settings or function() end
|
local settings = args.settings or function() end
|
||||||
|
|
||||||
|
fs.options = args.options
|
||||||
fs.followtag = args.followtag or false
|
fs.followtag = args.followtag or false
|
||||||
fs.notification_preset = args.notification_preset or { fg = beautiful.fg_normal }
|
fs.notification_preset = args.notification_preset or { fg = beautiful.fg_normal }
|
||||||
|
|
||||||
|
|
2
wiki
2
wiki
|
@ -1 +1 @@
|
||||||
Subproject commit 42ecadbcd535153aa7229b8afed660a3bd349b78
|
Subproject commit d288b2dc5a2021af8ccd23e02c9fb0c6a97eda2a
|
Loading…
Reference in New Issue