X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/f291bd62b75e4d18b6e96fff845c3597640d92a7..912bd26ede8901c98fd8d7a35f8493ee448109ad:/widgets/fs.lua diff --git a/widgets/fs.lua b/widgets/fs.lua index a2d8990..8b2886b 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 @@ -26,8 +27,7 @@ local setmetatable = setmetatable -- lain.widgets.fs local fs = {} -local fs_notification = nil -fs_notification_preset = { fg = beautiful.fg_normal } +local fs_notification = nil function fs:hide() if fs_notification ~= nil then @@ -39,13 +39,13 @@ 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({ + fs_notification = naughty.notify({ preset = fs_notification_preset, text = ws, timeout = t_out @@ -56,14 +56,18 @@ 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 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('') helpers.set_map(partition, false) + helpers.set_map("fsused", 0) function update() fs_info = {} @@ -90,8 +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 - widget = fs.widget - settings() + if helpers.get_map("fsused") ~= fs_now.used then + widget = fs.widget + settings() + helpers.set_map("fsused", fs_now.used) + end if fs_now.used >= 99 and not helpers.get_map(partition) then