cal: highlight only first match of today number; #170

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index 4714a546f353dedd8c4ed1fecc71e105fd3d1659..93f171f12932d2d0656dd4136b193e3492d44143 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -15,12 +15,15 @@ local naughty      = require("naughty")
 local io           = { popen = io.popen }
 local os           = { date = os.date }
 local mouse        = mouse
 local io           = { popen = io.popen }
 local os           = { date = os.date }
 local mouse        = mouse

+local string       = { format = string.format,
+                       sub    = string.sub,
+                       gsub   = string.gsub }

 local tonumber     = tonumber
 
 local setmetatable = setmetatable
 
 -- Calendar notification
 local tonumber     = tonumber
 
 local setmetatable = setmetatable
 
 -- Calendar notification

--- lain.widgets.calendar
+-- lain.widgets.cal

 local calendar = {}
 local cal_notification = nil
 
 local calendar = {}
 local cal_notification = nil
 


@@ -34,12 +37,12 @@ end
 function calendar:show(t_out, inc_offset, scr)
     calendar:hide()
 
 function calendar:show(t_out, inc_offset, scr)
     calendar:hide()
 

-    local offs = inc_offset or 0
-    local tims = t_out or 0

     local f, c_text
     local f, c_text

+    local offs  = inc_offset or 0
+    local tims  = t_out or 0

     local today = tonumber(os.date('%d'))
     local today = tonumber(os.date('%d'))

-    local init_t = calendar.cal .. ' ' .. calendar.post_cal  .. ' ' ..
-        ' | sed -r -e "s/_\\x08//g" | sed -r -e "s/(^| )('
+    local init_t = string.format("%s %s | sed -e 's/[\b]\\{3\\}//g'",
+                   calendar.cal, calendar.post_cal)

 
     calendar.offset = calendar.offset + offs
 
 
     calendar.offset = calendar.offset + offs
 


@@ -49,12 +52,8 @@ function calendar:show(t_out, inc_offset, scr)
         calendar.notify_icon = calendar.icons .. today .. ".png"
 
         -- bg and fg inverted to highlight today
         calendar.notify_icon = calendar.icons .. today .. ".png"
 
         -- bg and fg inverted to highlight today

-        f = io.popen( init_t .. today ..
-                      ')($| )/\\1<b><span foreground=\\"'
-                      .. calendar.bg ..
-                      '\\" background=\\"'
-                      .. calendar.fg ..
-                      '\\">\\2<\\/span><\\/b>\\3/"' )
+        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))

 
     else -- no current month showing, no day to highlight
        local month = tonumber(os.date('%m'))
 
     else -- no current month showing, no day to highlight
        local month = tonumber(os.date('%m'))


@@ -78,11 +77,10 @@ function calendar:show(t_out, inc_offset, scr)
 
        calendar.notify_icon = nil
 
 
        calendar.notify_icon = nil
 

-       f = io.popen(calendar.cal .. ' ' .. month .. ' ' .. year .. ' ' ..
-            calendar.post_cal)
+       f = io.popen(string.format('%s %s %s %s', calendar.cal, month, year, calendar.post_cal))

     end
 
     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"
              .. calendar.font_size .. "'><b>"
              .. f:read() .. "</b>\n\n"
              .. f:read() .. "\n"