wiki updated

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

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index 8c707c8e1745e8e35a042c08232fc34ed9c1a10f..93f171f12932d2d0656dd4136b193e3492d44143 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -12,14 +12,18 @@ local awful        = require("awful")
 local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 
-local io           = io
+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
--- lain.widgets.calendar
+-- lain.widgets.cal
 local calendar = {}
 local cal_notification = nil
 
@@ -30,41 +34,31 @@ function calendar:hide()
     end
 end
 
-function calendar:show(t_out, inc_offset)
+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 offs  = inc_offset or 0
+    local tims  = t_out or 0
     local today = tonumber(os.date('%d'))
-    local init_t = '/usr/bin/cal | sed -r -e "s/(^| )( '
-    -- let's take font only, font size is set in calendar table
-    local font = beautiful.font:sub(beautiful.font:find(""),
-                 beautiful.font:find(" "))
+    local init_t = string.format("%s %s | sed -e 's/[\b]\\{3\\}//g'",
+                   calendar.cal, calendar.post_cal)
 
-    if offs == 0
-    then -- current month showing, today highlighted
-        if today >= 10
-        then
-           init_t = '/usr/bin/cal | sed -r -e "s/(^| )('
-        end
+    calendar.offset = calendar.offset + offs
 
+    if offs == 0 or calendar.offset == 0
+    then -- current month showing, today highlighted
         calendar.offset = 0
         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'))
        local year = tonumber(os.date('%Y'))
 
-       calendar.offset = calendar.offset + offs
        month = month + calendar.offset
 
        if month > 12 then
@@ -83,10 +77,10 @@ function calendar:show(t_out, inc_offset)
 
        calendar.notify_icon = nil
 
-       f = io.popen('/usr/bin/cal ' .. month .. ' ' .. year)
+       f = io.popen(string.format('%s %s %s %s', calendar.cal, month, year, calendar.post_cal))
     end
 
-    c_text = "<tt><span font='" .. font .. " "
+    c_text = " <tt><span font='" .. calendar.font .. " "
              .. calendar.font_size .. "'><b>"
              .. f:read() .. "</b>\n\n"
              .. f:read() .. "\n"
@@ -94,31 +88,53 @@ function calendar:show(t_out, inc_offset)
              .. "</span></tt>"
     f:close()
 
-    cal_notification = naughty.notify({ text = c_text,
-                                        icon = calendar.notify_icon,
-                                        position = calendar.position,
-                                        fg = calendar.fg,
-                                        bg = calendar.bg,
-                                        timeout = tims })
+    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,
+        position = calendar.position,
+        fg = calendar.fg,
+        bg = calendar.bg,
+        timeout = tims,
+        screen = scrp
+    })
 end
 
 function calendar:attach(widget, args)
     local args = args or {}
-    calendar.icons = args.icons or icons_dir .. "cal/white/"
-    calendar.font_size = tonumber(args.font_size) or 12
-    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:gsub(" %d.*", "")
+    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) ))
+    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 })