small fixes to calls; wiki updated

diff --git a/widgets/fs.lua b/widgets/fs.lua
index ad5b204e48d0e2c8ffb00dae2e627443461d9f0a..6038746cc0d797c48c18d00841ebfe3dbae0de4c 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
 

diff --git a/widgets/pulsebar.lua b/widgets/pulsebar.lua
index 51de3a7460834e9fad61c810fe81aab9575d5bae..006515ccc2c08bb0095abbc9b7b1ee70bd1a2173 100644 (file)
--- a/widgets/pulsebar.lua
+++ b/widgets/pulsebar.lua
@@ -155,8 +155,7 @@ local function worker(args)
             awful.util.spawn(pulsebar.mixer)
           end),
           awful.button({}, 2, function()
             awful.util.spawn(pulsebar.mixer)
           end),
           awful.button({}, 2, function()

-                                               awful.util.spawn(string.format("pactl set-sink-lolume %d 100%%", pulsebar.sink))
-            pulsebar.update()
+                                               awful.util.spawn(string.format("pactl set-sink-volume %d 100%%", pulsebar.sink))

           end),
           awful.button({}, 3, function()
                                                awful.util.spawn(string.format("pactl set-sink-mute %d toggle", pulsebar.sink))
           end),
           awful.button({}, 3, function()
                                                awful.util.spawn(string.format("pactl set-sink-mute %d toggle", pulsebar.sink))

diff --git a/wiki b/wiki
index 871d249789aa00159943fc8553fe0cbfc2159cfd..d0df450d05655c5d8f724c42dc6b5d18b3676a60 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 871d249789aa00159943fc8553fe0cbfc2159cfd
+Subproject commit d0df450d05655c5d8f724c42dc6b5d18b3676a60