quake: uncomment client.border

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

diff --git a/widgets/fs.lua b/widgets/fs.lua
index ad5b204e48d0e2c8ffb00dae2e627443461d9f0a..60b112cbaedb76c10b830a8cfda0f3d17ad8588d 100644 (file)
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -35,20 +35,22 @@ function fs.hide()
     end
 end
 
     end
 end
 

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

     fs.hide()
 
     fs.hide()
 

-    local cmd = (fs_args and string.format("dfs %s", fs_args)) or "dfs"
+    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
     local ws = helpers.read_pipe(helpers.scripts_dir .. cmd):gsub("\n*$", "")
 
     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
 


@@ -115,8 +117,8 @@ local function worker(args)
     end
 
     if showpopup == "on" then
     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)
+       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)
     end
 
     helpers.newtimer(partition, timeout, update)