Merge pull request #1 from copycat-killer/master

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

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index bbd6eed785bbfaecc8c9c3c1c05696f55f078363..1728dfc2aad3ebd76bf8c0cfc0c6ce124887256d 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -27,15 +27,15 @@ local setmetatable = setmetatable
 local calendar = {}
 local cal_notification = nil
 
 local calendar = {}
 local cal_notification = nil
 

-function calendar:hide()
+function calendar.hide()

     if cal_notification ~= nil then
         naughty.destroy(cal_notification)
         cal_notification = nil
     end
 end
 
     if cal_notification ~= nil then
         naughty.destroy(cal_notification)
         cal_notification = nil
     end
 end
 

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

 
     local f, c_text
     local offs  = inc_offset or 0
 
     local f, c_text
     local offs  = inc_offset or 0


@@ -50,9 +50,7 @@ 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(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))
-
+        f = io.popen(calendar.cal_format(today))

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


@@ -60,13 +58,13 @@ function calendar:show(t_out, inc_offset, scr)
        month = month + calendar.offset
 
        while month > 12 do
        month = month + calendar.offset
 
        while month > 12 do

-          month = month - 12
-          year = year + 1
+           month = month - 12
+           year = year + 1

        end
 
        while month < 1 do
        end
 
        while month < 1 do

-          month = month + 12
-          year = year - 1
+           month = month + 12
+           year = year - 1

        end
 
        calendar.notify_icon = nil
        end
 
        calendar.notify_icon = nil


@@ -98,10 +96,14 @@ function calendar:show(t_out, inc_offset, scr)
     })
 end
 
     })
 end
 

-function calendar:attach(widget, args)
+function calendar.attach(widget, args)

     local args = args or {}
 
     calendar.cal         = args.cal or "/usr/bin/cal"
     local args = args or {}
 
     calendar.cal         = args.cal or "/usr/bin/cal"

+    calendar.cal_format  = args.cal_format or function(today)
+        return 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)
+    end

     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
     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


@@ -111,22 +113,19 @@ function calendar:attach(widget, args)
     calendar.scr_pos     = args.scr_pos or 1
     calendar.followmouse = args.followmouse or false
 
     calendar.scr_pos     = args.scr_pos or 1
     calendar.followmouse = args.followmouse or false
 

-    calendar.fg = string.sub(calendar.fg, 1, 7)
-    calendar.bg = string.sub(calendar.bg, 1, 7)
-

     calendar.offset      = 0
     calendar.notify_icon = nil
 
     calendar.offset      = 0
     calendar.notify_icon = nil
 

-    widget:connect_signal("mouse::enter", function () calendar:show(0, 0, calendar.scr_pos) end)
-    widget:connect_signal("mouse::leave", function () calendar:hide() 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 ()
     widget:buttons(awful.util.table.join(awful.button({ }, 1, function ()

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

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

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

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

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

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

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

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