X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/466c48d20a13a447afaec373b700a5cd2e3fa877..63455361db71b0dde286f85331c6c69f00a3fba7:/widgets/calendar.lua

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index 93f171f..bbd6eed 100644
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -23,7 +23,7 @@ local tonumber     = tonumber
 local setmetatable = setmetatable
 
 -- Calendar notification
--- lain.widgets.cal
+-- lain.widgets.calendar
 local calendar = {}
 local cal_notification = nil
 
@@ -41,8 +41,6 @@ function calendar:show(t_out, inc_offset, scr)
     local offs  = inc_offset or 0
     local tims  = t_out or 0
     local today = tonumber(os.date('%d'))
-    local init_t = string.format("%s %s | sed -e 's/[\b]\\{3\\}//g'",
-                   calendar.cal, calendar.post_cal)
 
     calendar.offset = calendar.offset + offs
 
@@ -52,8 +50,8 @@ function calendar:show(t_out, inc_offset, scr)
         calendar.notify_icon = calendar.icons .. today .. ".png"
 
         -- bg and fg inverted to highlight today
-        f = io.popen(string.format("%s -e '0,/%d/ s/%d/<b><span foreground=\"%s\" background=\"%s\">%d<\\/span><\\/b>/'",
-                     init_t, today, today, calendar.bg, calendar.fg, today))
+        f = io.popen(string.format("%s | sed -r -e 's/_\\x08//g' -e '0,/(^| )%d($| )/ s/(^| )%d($| )/\\1<b><span foreground=\"%s\" background=\"%s\">%d<\\/span><\\/b>\\2/'",
+                     calendar.cal, today, today, calendar.bg, calendar.fg, today))
 
     else -- no current month showing, no day to highlight
        local month = tonumber(os.date('%m'))
@@ -61,26 +59,21 @@ function calendar:show(t_out, inc_offset, scr)
 
        month = month + calendar.offset
 
-       if month > 12 then
-           month = month % 12
-           year = year + 1
-           if month <= 0 then
-               month = 12
-           end
-       elseif month < 1 then
-           month = month + 12
-           year = year - 1
-           if month <= 0 then
-               month = 1
-           end
+       while month > 12 do
+	   month = month - 12
+	   year = year + 1
        end
 
-       calendar.notify_icon = nil
+       while month < 1 do
+	   month = month + 12
+	   year = year - 1
+       end
 
-       f = io.popen(string.format('%s %s %s %s', calendar.cal, month, year, calendar.post_cal))
+       calendar.notify_icon = nil
+       f = io.popen(string.format('%s %s %s', calendar.cal, month, year))
     end
 
-    c_text = " <tt><span font='" .. calendar.font .. " "
+    c_text = "<tt><span font='" .. calendar.font .. " "
              .. calendar.font_size .. "'><b>"
              .. f:read() .. "</b>\n\n"
              .. f:read() .. "\n"
@@ -109,7 +102,6 @@ function calendar:attach(widget, args)
     local args = args or {}
 
     calendar.cal         = args.cal or "/usr/bin/cal"
-    calendar.post_cal    = args.post_cal or ""
     calendar.icons       = args.icons or icons_dir .. "cal/white/"
     calendar.font        = args.font or beautiful.font:gsub(" %d.*", "")
     calendar.font_size   = tonumber(args.font_size) or 11