wiki updated

[etc/awesome.git] / widgets / fs.lua

diff --git a/widgets/fs.lua b/widgets/fs.lua
index 07490faa905cad335220b23bce4fd296bbc44bba..8b2886b23fe1cc3688cfdc32832e6452929150ae 100644 (file)
--- 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 io           = { popen  = io.popen }
 local pairs        = pairs

+local mouse        = mouse

 local string       = { match  = string.match,
                        format = string.format }
 local tonumber     = tonumber
 local string       = { match  = string.match,
                        format = string.format }
 local tonumber     = tonumber


@@ -26,27 +27,28 @@ local setmetatable = setmetatable
 -- lain.widgets.fs
 local fs = {}
 
 -- lain.widgets.fs
 local fs = {}
 

-local notification  = nil
-fs_notification_preset = { fg = beautiful.fg_normal }
+local fs_notification = nil

 
 function fs:hide()
 
 function fs:hide()

-    if notification ~= nil then
-        naughty.destroy(notification)
-        notification = nil
+    if fs_notification ~= nil then
+        naughty.destroy(fs_notification)
+        fs_notification = nil

     end
 end
 
 function fs:show(t_out)
     fs:hide()
 
     end
 end
 
 function fs:show(t_out)
     fs:hide()
 

-    local f = io.popen(helpers.scripts_dir .. "dfs")
-    ws = f:read("*all"):gsub("\n*$", "")
-    f:close()
+    local ws = helpers.read_pipe(helpers.scripts_dir .. "dfs"):gsub("\n*$", "")

 
 

-    notification = naughty.notify({
-        preset = fs_notification_preset,
-        text = ws,
-        timeout = t_out,
+    if fs.followmouse then
+        fs_notification_preset.screen = mouse.screen
+    end
+
+    fs_notification = naughty.notify({
+        preset  = fs_notification_preset,
+        text    = ws,
+        timeout = t_out

     })
 end
 
     })
 end
 


@@ -54,14 +56,18 @@ end
 local unit = { ["mb"] = 1024, ["gb"] = 1024^2 }
 
 local function worker(args)
 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)
 
     fs.widget = wibox.widget.textbox('')
 
     helpers.set_map(partition, false)

+    helpers.set_map("fsused", 0)

 
     function update()
         fs_info = {}
 
     function update()
         fs_info = {}


@@ -88,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
 
         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
 
         if fs_now.used >= 99 and not helpers.get_map(partition)
         then