Merge branch 'master' of https://github.com/copycat-killer/lain

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

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index f83b9662546a0c68ff3ce5350ad63aacd203d979..f9aed39820f38e6484825bb7779cf5912e63b97d 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 io           = io
+local io           = { popen = io.popen }
 local os           = { date = os.date }
 local tonumber     = tonumber
 
@@ -39,11 +39,13 @@ function calendar:show(t_out, inc_offset)
     local today = tonumber(os.date('%d'))
     local init_t = calendar.cal .. ' | sed -r -e "s/(^| )( '
 
-    if offs == 0
+    calendar.offset = calendar.offset + offs
+
+    if offs == 0 or calendar.offset == 0
     then -- current month showing, today highlighted
         if today >= 10
         then
-           init_t = calendar.cal .. ' | sed -r -e "s/(^| )('
+           init_t = calendar.cal .. ' | sed -r -e "s/_\\x08//g" | sed -r -e "s/(^| )('
         end
 
         calendar.offset = 0
@@ -61,7 +63,6 @@ function calendar:show(t_out, inc_offset)
        local month = tonumber(os.date('%m'))
        local year = tonumber(os.date('%Y'))
 
-       calendar.offset = calendar.offset + offs
        month = month + calendar.offset
 
        if month > 12 then
@@ -87,7 +88,7 @@ function calendar:show(t_out, inc_offset)
              .. calendar.font_size .. "'><b>"
              .. f:read() .. "</b>\n\n"
              .. f:read() .. "\n"
-             .. f:read("*all"):gsub("\n*$", "")
+             .. f:read("*a"):gsub("\n*$", "")
              .. "</span></tt>"
     f:close()
 
@@ -97,7 +98,7 @@ function calendar:show(t_out, inc_offset)
         position = calendar.position,
         fg = calendar.fg,
         bg = calendar.bg,
-        timeout = tims
+        timeout = tims,
     })
 end