reverted bb3a0c1 and fixed scr_pos pointers in calendar widget

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index 2df2f0594ca8e1706999cb462e1f2c1acde54a70..a03503e4e3f678034a680685a23af8a2a9c04cbf 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -111,21 +111,21 @@ function calendar:attach(widget, args)
     calendar.fg        = args.fg or beautiful.fg_normal or "#FFFFFF"
     calendar.bg        = args.bg or beautiful.bg_normal or "#FFFFFF"
     calendar.position  = args.position or "top_right"
     calendar.fg        = args.fg or beautiful.fg_normal or "#FFFFFF"
     calendar.bg        = args.bg or beautiful.bg_normal or "#FFFFFF"
     calendar.position  = args.position or "top_right"

-    calendar.scr_pos   = args.scr_pos or 1
+    calendar.scr_pos   = args.scr_pos or mouse.screen

 
     calendar.offset = 0
     calendar.notify_icon = nil
 
 
     calendar.offset = 0
     calendar.notify_icon = nil
 

-    widget:connect_signal("mouse::enter", function () calendar:show(0, 0, scr_pos) end)
+    widget:connect_signal("mouse::enter", function () calendar:show(0, 0, calendar.scr_pos) end)

     widget:connect_signal("mouse::leave", function () calendar:hide() end)
     widget:buttons(awful.util.table.join( awful.button({ }, 1, function ()
     widget:connect_signal("mouse::leave", function () calendar:hide() end)
     widget:buttons(awful.util.table.join( awful.button({ }, 1, function ()

-                                              calendar:show(0, -1, scr_pos) end),
+                                              calendar:show(0, -1, calendar.scr_pos) end),

                                           awful.button({ }, 3, function ()
                                           awful.button({ }, 3, function ()

-                                              calendar:show(0, 1, scr_pos) end),
+                                              calendar:show(0, 1, calendar.scr_pos) end),

                                           awful.button({ }, 4, function ()
                                           awful.button({ }, 4, function ()

-                                              calendar:show(0, -1, scr_pos) end),
+                                              calendar:show(0, -1, calendar.scr_pos) end),

                                           awful.button({ }, 5, function ()
                                           awful.button({ }, 5, function ()

-                                              calendar:show(0, 1, scr_pos) end)))
+                                              calendar:show(0, 1, calendar.scr_pos) end)))

 end
 
 return setmetatable(calendar, { __call = function(_, ...) return create(...) end })
 end
 
 return setmetatable(calendar, { __call = function(_, ...) return create(...) end })

diff --git a/widgets/fs.lua b/widgets/fs.lua
index dbd45bfa79be7c26bfb52cfb0d5d60109e128e9d..a2d89906b675f1f24c39e794529bb3bef586ae39 100644 (file)
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -26,19 +26,21 @@ local setmetatable = setmetatable
 -- lain.widgets.fs
 local fs = {}
 
 -- lain.widgets.fs
 local fs = {}
 

-local notification  = nil
+local fs_notification  = nil

 fs_notification_preset = { fg = beautiful.fg_normal }
 
 function fs:hide()
 fs_notification_preset = { fg = beautiful.fg_normal }
 
 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
 
     end
 end
 

-function fs:show(t_out, scr)
+function fs:show(t_out)

     fs:hide()
 
     fs:hide()
 

+    naughty.notify({text=fs_notification_preset.screen})
+

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


@@ -46,8 +48,7 @@ function fs:show(t_out, scr)
     notification = naughty.notify({
         preset  = fs_notification_preset,
         text    = ws,
     notification = naughty.notify({
         preset  = fs_notification_preset,
         text    = ws,

-        timeout = t_out,
-        screen  = scr or 1
+        timeout = t_out

     })
 end
 
     })
 end
 


@@ -107,7 +108,7 @@ local function worker(args)
         end
     end
 
         end
     end
 

-    fs.widget:connect_signal('mouse::enter', function () fs:show(0, mouse.screen) end)
+    fs.widget:connect_signal('mouse::enter', function () fs:show(0) end)

     fs.widget:connect_signal('mouse::leave', function () fs:hide() end)
 
     helpers.newtimer(partition, timeout, update)
     fs.widget:connect_signal('mouse::leave', function () fs:hide() end)
 
     helpers.newtimer(partition, timeout, update)