Merge pull request #1 from copycat-killer/master

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

diff --git a/widgets/fs.lua b/widgets/fs.lua
index 6ec8dac5edaef6f0113794fb413f5e5b3b7d4cef..6038746cc0d797c48c18d00841ebfe3dbae0de4c 100644 (file)
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -28,26 +28,29 @@ local setmetatable = setmetatable
 local fs = {}
 local fs_notification  = nil
 
 local fs = {}
 local fs_notification  = nil
 

-function fs:hide()
+function fs.hide()

     if fs_notification ~= nil then
         naughty.destroy(fs_notification)
         fs_notification = nil
     end
 end
 
     if fs_notification ~= nil then
         naughty.destroy(fs_notification)
         fs_notification = nil
     end
 end
 

-function fs:show(t_out)
-    fs:hide()
+function fs.show(seconds, options, scr)
+    fs.hide()

 
 

-    local ws = helpers.read_pipe(helpers.scripts_dir .. "dfs"):gsub("\n*$", "")
+    local cmd = (options and string.format("dfs %s", options)) or "dfs"
+    local ws = helpers.read_pipe(helpers.scripts_dir .. cmd):gsub("\n*$", "")

 
     if fs.followmouse then
         fs.notification_preset.screen = mouse.screen
 
     if fs.followmouse then
         fs.notification_preset.screen = mouse.screen

+    elseif scr then
+                         fs.notification_preset.screen = scr

     end
 
     fs_notification = naughty.notify({
         preset  = fs.notification_preset,
         text    = ws,
     end
 
     fs_notification = naughty.notify({
         preset  = fs.notification_preset,
         text    = ws,

-        timeout = t_out
+        timeout = seconds or 5

     })
 end
 
     })
 end
 


@@ -58,6 +61,8 @@ local function worker(args)
     local args             = args or {}
     local timeout          = args.timeout or 600
     local partition        = args.partition or "/"
     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
     local settings         = args.settings or function() end
 
     fs.followmouse         = args.followmouse or false


@@ -96,7 +101,7 @@ local function worker(args)
         widget = fs.widget
         settings()
 
         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",
         then
             naughty.notify({
                 title = "warning",


@@ -111,8 +116,10 @@ local function worker(args)
         end
     end
 
         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)
 
 
     helpers.newtimer(partition, timeout, update)