X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/af9714ebd2edff02b4d5f89238dac5dffe1df6d1..617675d6c3a7b79d650bfcd52a3c13e8dcdfa459:/widgets/calendar.lua?ds=sidebyside

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index bbd6eed..76faca4 100644
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -14,7 +14,6 @@ local naughty      = require("naughty")
 
 local io           = { popen = io.popen }
 local os           = { date = os.date }
-local mouse        = mouse
 local string       = { format = string.format,
                        sub    = string.sub,
                        gsub   = string.gsub }
@@ -27,15 +26,15 @@ local setmetatable = setmetatable
 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
 
-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
@@ -47,26 +46,24 @@ function calendar:show(t_out, inc_offset, scr)
     if offs == 0 or calendar.offset == 0
     then -- current month showing, today highlighted
         calendar.offset = 0
-        calendar.notify_icon = calendar.icons .. today .. ".png"
+        calendar.notify_icon = string.format("%s%s.png", calendar.icons, today)
 
         -- 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'))
+       local year  = tonumber(os.date('%Y'))
 
        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
-	   month = month + 12
-	   year = year - 1
+           month = month + 12
+           year = year - 1
        end
 
        calendar.notify_icon = nil
@@ -81,8 +78,8 @@ function calendar:show(t_out, inc_offset, scr)
              .. "</span></tt>"
     f:close()
 
-    if calendar.followmouse then
-        scrp = mouse.screen
+    if calendar.followtag then
+        scrp = awful.screen.focused()
     else
         scrp = scr or calendar.scr_pos
     end
@@ -98,10 +95,14 @@ function calendar:show(t_out, inc_offset, scr)
     })
 end
 
-function calendar:attach(widget, args)
+function calendar.attach(widget, args)
     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
@@ -109,24 +110,21 @@ function calendar:attach(widget, args)
     calendar.bg          = args.bg or beautiful.bg_normal or "#000000"
     calendar.position    = args.position or "top_right"
     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.followtag   = args.followtag or false
 
     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 ()
-                                             calendar:show(0, -1, calendar.scr_pos) end),
+                                             calendar.show(0, -1, calendar.scr_pos) end),
                                          awful.button({ }, 3, function ()
-                                             calendar:show(0, 1, calendar.scr_pos) end),
+                                             calendar.show(0, 1, calendar.scr_pos) end),
                                          awful.button({ }, 4, function ()
-                                             calendar:show(0, -1, calendar.scr_pos) end),
+                                             calendar.show(0, -1, calendar.scr_pos) end),
                                          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 })