reverted bb3a0c1 and fixed scr_pos pointers in calendar widget

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

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index cc0ebe74b40469780fab3ef9a51f9ab8d7ea165a..a03503e4e3f678034a680685a23af8a2a9c04cbf 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -37,7 +37,7 @@ function calendar:show(t_out, inc_offset, scr)
     local tims = t_out or 0
     local f, c_text
     local today = tonumber(os.date('%d'))
-    local init_t = calendar.cal .. ' ' .. calendar.post_cal  .. ' ' .. 
+    local init_t = calendar.cal .. ' ' .. calendar.post_cal  .. ' ' ..
         ' | sed -r -e "s/_\\x08//g" | sed -r -e "s/(^| )('
 
     calendar.offset = calendar.offset + offs
@@ -77,7 +77,7 @@ function calendar:show(t_out, inc_offset, scr)
 
        calendar.notify_icon = nil
 
-       f = io.popen(calendar.cal .. ' ' .. month .. ' ' .. year .. ' ' .. 
+       f = io.popen(calendar.cal .. ' ' .. month .. ' ' .. year .. ' ' ..
             calendar.post_cal)
     end
 
@@ -85,7 +85,7 @@ function calendar:show(t_out, inc_offset, scr)
              .. calendar.font_size .. "'><b>"
              .. f:read() .. "</b>\n\n"
              .. f:read() .. "\n"
-             .. f:read("*a"):gsub("\n*$", "")
+             .. f:read("*all"):gsub("\n*$", "")
              .. "</span></tt>"
     f:close()
 
@@ -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.scr_pos   = args.scr_pos or 1
+    calendar.scr_pos   = args.scr_pos or mouse.screen
 
     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 ()
-                                              calendar:show(0, -1, scr_pos) end),
+                                              calendar:show(0, -1, calendar.scr_pos) end),
                                           awful.button({ }, 3, function ()
-                                              calendar:show(0, 1, scr_pos) end),
+                                              calendar:show(0, 1, calendar.scr_pos) end),
                                           awful.button({ }, 4, function ()
-                                              calendar:show(0, -1, scr_pos) end),
+                                              calendar:show(0, -1, calendar.scr_pos) end),
                                           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 })