Merge branch 'worron-master'

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

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index c690e3f4893cdd436755986f4a2d6e5a045b506b..631b358eff5d00e8a15e30ab7e29a633b39bde62 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -12,7 +12,7 @@ local awful        = require("awful")
 local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 
 local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 

-local io           = io
+local io           = { popen = io.popen }

 local os           = { date = os.date }
 local tonumber     = tonumber
 
 local os           = { date = os.date }
 local tonumber     = tonumber
 


@@ -30,7 +30,7 @@ function calendar:hide()
     end
 end
 
     end
 end
 

-function calendar:show(t_out, inc_offset)
+function calendar:show(t_out, inc_offset, scr)

     calendar:hide()
 
     local offs = inc_offset or 0
     calendar:hide()
 
     local offs = inc_offset or 0


@@ -99,7 +99,7 @@ function calendar:show(t_out, inc_offset)
         fg = calendar.fg,
         bg = calendar.bg,
         timeout = tims,
         fg = calendar.fg,
         bg = calendar.bg,
         timeout = tims,

-        screen = client.focus and client.focus.screen or 1
+        screen = scr or 1

     })
 end
 
     })
 end
 


@@ -113,20 +113,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.offset = 0
     calendar.notify_icon = nil
 
 
     calendar.offset = 0
     calendar.notify_icon = nil
 

-    widget:connect_signal("mouse::enter", function () calendar:show() end)
+    widget:connect_signal("mouse::enter", function () calendar:show(0, 0, 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) end),
+                                              calendar:show(0, -1, scr_pos) end),

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

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

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

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

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

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

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