X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/ebd18c24f3ec2ea95e1ce0a30727183a0ce6b9af..3862c605420b4f815ef76970d0828e81e07935d2:/widgets/calendar.lua

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index bada79e..b811f70 100644
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -14,6 +14,7 @@ local naughty      = require("naughty")
 
 local io           = { popen = io.popen }
 local os           = { date = os.date }
+local mouse        = mouse
 local tonumber     = tonumber
 
 local setmetatable = setmetatable
@@ -37,17 +38,13 @@ function calendar:show(t_out, inc_offset, scr)
     local tims = t_out or 0
     local f, c_text
     local today = tonumber(os.date('%d'))
-    local init_t = calendar.cal .. ' | sed -r -e "s/(^| )( '
+    local init_t = calendar.cal .. ' ' .. calendar.post_cal  .. ' ' ..
+        ' | sed -r -e "s/_\\x08//g" | sed -r -e "s/(^| )('
 
     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/_\\x08//g" | sed -r -e "s/(^| )('
-        end
-
         calendar.offset = 0
         calendar.notify_icon = calendar.icons .. today .. ".png"
 
@@ -81,17 +78,24 @@ function calendar:show(t_out, inc_offset, scr)
 
        calendar.notify_icon = nil
 
-       f = io.popen(calendar.cal .. ' ' .. month .. ' ' .. year)
+       f = io.popen(calendar.cal .. ' ' .. month .. ' ' .. year .. ' ' ..
+            calendar.post_cal)
     end
 
     c_text = "<tt><span font='" .. calendar.font .. " "
              .. calendar.font_size .. "'><b>"
              .. f:read() .. "</b>\n\n"
              .. f:read() .. "\n"
-             .. f:read("*a"):gsub("\n*$", "")
+             .. f:read("*all"):gsub("\n*$", "")
              .. "</span></tt>"
     f:close()
 
+    if calendar.followmouse then
+        scrp = mouse.screen
+    else
+        scrp = scr or calendar.scr_pos
+    end
+
     cal_notification = naughty.notify({
         text = c_text,
         icon = calendar.notify_icon,
@@ -99,34 +103,41 @@ function calendar:show(t_out, inc_offset, scr)
         fg = calendar.fg,
         bg = calendar.bg,
         timeout = tims,
-        screen = scr or 1
+        screen = scrp
     })
 end
 
 function calendar:attach(widget, args)
     local args = args or {}
-    calendar.cal       = args.cal or "/usr/bin/cal"
-    calendar.icons     = args.icons or icons_dir .. "cal/white/"
-    calendar.font      = args.font or beautiful.font:sub(beautiful.font:find(""),
-                         beautiful.font:find(" "))
-    calendar.font_size = tonumber(args.font_size) or 11
-    calendar.fg        = args.fg or beautiful.fg_normal or "#FFFFFF"
-    calendar.bg        = args.bg or beautiful.bg_normal or "#FFFFFF"
-    calendar.position  = args.position or "top_right"
-
-    calendar.offset = 0
+
+    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:sub(beautiful.font:find(""),
+                           beautiful.font:find(" "))
+    calendar.font_size   = tonumber(args.font_size) or 11
+    calendar.fg          = args.fg or beautiful.fg_normal or "#FFFFFF"
+    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.offset      = 0
     calendar.notify_icon = nil
 
-    widget:connect_signal("mouse::enter", function () calendar:show() 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) end),
-                                          awful.button({ }, 3, function ()
-                                              calendar:show(0, 1) end),
-                                          awful.button({ }, 4, function ()
-                                              calendar:show(0, -1) end),
-                                          awful.button({ }, 5, function ()
-                                              calendar:show(0, 1) end)))
+    widget:buttons(awful.util.table.join(awful.button({ }, 1, function ()
+                                             calendar:show(0, -1, calendar.scr_pos) end),
+                                         awful.button({ }, 3, function ()
+                                             calendar:show(0, 1, calendar.scr_pos) end),
+                                         awful.button({ }, 4, function ()
+                                             calendar:show(0, -1, calendar.scr_pos) end),
+                                         awful.button({ }, 5, function ()
+                                             calendar:show(0, 1, calendar.scr_pos) end)))
 end
 
 return setmetatable(calendar, { __call = function(_, ...) return create(...) end })