X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/f291bd62b75e4d18b6e96fff845c3597640d92a7..dd19cbc77a15510b4bf9101feddf3b10968d9cf1:/widgets/fs.lua diff --git a/widgets/fs.lua b/widgets/fs.lua index a2d8990..5215c86 100644 --- a/widgets/fs.lua +++ b/widgets/fs.lua @@ -16,6 +16,7 @@ local naughty = require("naughty") local io = { popen = io.popen } local pairs = pairs +local mouse = mouse local string = { match = string.match, format = string.format } local tonumber = tonumber @@ -25,9 +26,7 @@ local setmetatable = setmetatable -- File system disk space usage -- lain.widgets.fs local fs = {} - local fs_notification = nil -fs_notification_preset = { fg = beautiful.fg_normal } function fs:hide() if fs_notification ~= nil then @@ -39,14 +38,14 @@ end function fs:show(t_out) fs:hide() - naughty.notify({text=fs_notification_preset.screen}) + local ws = helpers.read_pipe(helpers.scripts_dir .. "dfs"):gsub("\n*$", "") - local f = io.popen(helpers.scripts_dir .. "dfs") - ws = f:read("*all"):gsub("\n*$", "") - f:close() + if fs.followmouse then + fs.notification_preset.screen = mouse.screen + end - notification = naughty.notify({ - preset = fs_notification_preset, + fs_notification = naughty.notify({ + preset = fs.notification_preset, text = ws, timeout = t_out }) @@ -56,10 +55,15 @@ end local unit = { ["mb"] = 1024, ["gb"] = 1024^2 } local function worker(args) - local args = args or {} - local timeout = args.timeout or 600 - local partition = args.partition or "/" - local settings = args.settings or function() end + local args = args or {} + local timeout = args.timeout or 600 + local partition = args.partition or "/" + local showpopup = args.showpopup or "on" + local notify = args.notify or "on" + local settings = args.settings or function() end + + fs.followmouse = args.followmouse or false + fs.notification_preset = args.notification_preset or { fg = beautiful.fg_normal } fs.widget = wibox.widget.textbox('') @@ -90,10 +94,11 @@ local function worker(args) fs_now.size_mb = tonumber(fs_info[partition .. " size_mb"]) or 0 fs_now.size_gb = tonumber(fs_info[partition .. " size_gb"]) or 0 + notification_preset = fs.notification_preset widget = fs.widget settings() - if fs_now.used >= 99 and not helpers.get_map(partition) + if notify == "on" and fs_now.used >= 99 and not helpers.get_map(partition) then naughty.notify({ title = "warning", @@ -108,8 +113,10 @@ local function worker(args) end end - fs.widget:connect_signal('mouse::enter', function () fs:show(0) end) - fs.widget:connect_signal('mouse::leave', function () fs:hide() end) + if showpopup == "on" then + fs.widget:connect_signal('mouse::enter', function () fs:show(0) end) + fs.widget:connect_signal('mouse::leave', function () fs:hide() end) + end helpers.newtimer(partition, timeout, update)