]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/calendar.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / etc / awesome.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
calendar: fix #289
[etc/awesome.git] / widgets / calendar.lua
diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index 38b4d8b3d46e2a0ae91b29d32131c1154432f4fa..a02b13d62be442c63780037f18d39d046f8f959c 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -6,119 +6,132 @@
                                                   
 --]]
 
                                                   
 --]]
 
-local icons_dir    = require("lain.helpers").icons_dir
-
+local helpers      = require("lain.helpers")
+local markup       = require("lain.util.markup")
 local awful        = require("awful")
 local awful        = require("awful")
-local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 local naughty      = require("naughty")
-
-local io           = io
-local os           = { date  = os.date }
+local os           = { date   = os.date }
+local string       = { format = string.format,
+                       gsub   = string.gsub }
+local ipairs       = ipairs
 local tonumber     = tonumber
 local tonumber     = tonumber
-
 local setmetatable = setmetatable
 
 -- Calendar notification
 -- lain.widgets.calendar
 local setmetatable = setmetatable
 
 -- Calendar notification
 -- lain.widgets.calendar
-local calendar = {}
-local notification = nil
-
-local function create(background, foreground)
-    calendar.offset = 0
-    calendar.icons_dir = icons_dir .. "cal/white/" -- default
-    calendar.notify_icon = nil
-    calendar.font_size = 12
-    calendar.bg = background or beautiful.bg_normal or "#FFFFFF"
-    calendar.fg = foreground or beautiful.fg_focus or "#FFFFFF"
-end
+local calendar = { offset = 0 }
 
 
-function calendar:hide()
-    if notification ~= nil then
-        naughty.destroy(notification)
-        notification = nil
-    end
+function calendar.hide()
+    if not calendar.notification then return end
+    naughty.destroy(calendar.notification)
+    calendar.notification = nil
 end
 
 end
 
-function calendar:show(t_out, inc_offset)
-    calendar:hide()
-
-    local offs = inc_offset or 0
-    local tims = t_out or 0
-    local f, c_text
-    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(" "))
-
-    if offs == 0
-    then -- current month showing, today highlighted
-        if today >= 10
-        then
-           init_t = '/usr/bin/cal | sed -r -e "s/(^| )('
-        end
+function calendar.show(t_out, inc_offset, scr)
+    local f, offs = nil, inc_offset or 0
 
 
-        calendar.offset = 0
-        calendar.notify_icon = calendar.icons_dir .. today .. ".png"
+    calendar.offset = calendar.offset + offs
 
 
-        -- 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/"' )
+    local current_month = (offs == 0 or calendar.offset == 0)
 
 
+    if current_month then -- today highlighted
+        calendar.offset = 0
+        calendar.icon = string.format("%s%s.png", calendar.icons, tonumber(os.date("%d")))
+        f = calendar.cal
     else -- no current month showing, no day to highlight
     else -- no current month showing, no day to highlight
-       local month = tonumber(os.date('%m'))
-       local year = tonumber(os.date('%Y'))
+       local month = tonumber(os.date("%m"))
+       local year  = tonumber(os.date("%Y"))
 
 
-       calendar.offset = calendar.offset + offs
        month = month + calendar.offset
 
        month = month + calendar.offset
 
-       if month > 12 then
-           month = month % 12
+       while month > 12 do
+           month = month - 12
            year = year + 1
            year = year + 1
-           if month <= 0 then
-               month = 12
-           end
-       elseif month < 1 then
+       end
+
+       while month < 1 do
            month = month + 12
            year = year - 1
            month = month + 12
            year = year - 1
-           if month <= 0 then
-               month = 1
-           end
        end
 
        end
 
-       calendar.notify_icon = nil
+       calendar.icon = nil
+       f = string.format("%s %s %s", calendar.cal, month, year)
+    end
+
+    if calendar.followtag then
+        calendar.notification_preset.screen = awful.screen.focused()
+    else
+        calendar.notification_preset.screen = src or 1
+    end
 
 
-       f = io.popen('/usr/bin/cal ' .. month .. ' ' .. year)
+    if f == calendar then
+        calendar.update(f, false)
+        calendar.hide()
+        calendar.notification = naughty.notify({
+            preset      = calendar.notification_preset,
+            icon        = calendar.icon,
+            timeout     = t_out or calendar.notification_preset.timeout or 5
+        })
+    else
+        calendar.update(f, true, t_out)
     end
     end
+end
 
 
+function calendar.update(f, show, t_out)
+    local fg, bg = calendar.notification_preset.fg, calendar.notification_preset.bg
 
 
-    c_text = "<tt><span font='" .. font .. " "
-             .. calendar.font_size .. "'><b>"
-             .. f:read() .. "</b>\n\n"
-             .. f:read() .. "\n"
-             .. f:read("*all"):gsub("\n*$", "")
-             .. "</span></tt>"
-    f:close()
+    helpers.async(f, function(ws)
+        ws = ws:gsub("%c%[%d+[m]?%s?%d+%c%[%d+[m]?",
+             markup.bold(markup.color(bg, fg, os.date("%e")))):gsub("\n*$", "")
 
 
-    notification = naughty.notify({ text = c_text,
-                                    icon = calendar.notify_icon,
-                                    fg = calendar.fg,
-                                    bg = calendar.bg,
-                                    timeout = tims })
+        if f == calendar.cal then
+            calendar.notification_preset.text = ws
+        end
+
+        if show then
+            calendar.hide()
+            calendar.notification = naughty.notify({
+                preset      = calendar.notification_preset,
+                text        = ws,
+                icon        = calendar.icon,
+                timeout     = t_out or calendar.notification_preset.timeout or 5
+            })
+        end
+    end)
 end
 
 end
 
-function calendar:attach(widget, background, foreground)
-    create(background, foreground)
-    widget:connect_signal("mouse::enter", function () calendar:show() 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) ))
+function calendar.attach(widget)
+    widget:connect_signal("mouse::enter", function () calendar.show(0) 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),
+                                         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
+
+local function worker(args)
+    local args                   = args or {}
+    calendar.cal                 = args.cal or "/usr/bin/cal"
+    calendar.attach_to           = args.attach_to or {}
+    calendar.followtag           = args.followtag or false
+    calendar.icons               = args.icons or helpers.icons_dir .. "cal/white/"
+    calendar.notification_preset = args.notification_preset
+
+    if not calendar.notification_preset then
+        calendar.notification_preset = {
+            font = "Monospace 10",
+            fg   = "#FFFFFF",
+            bg   = "#000000"
+        }
+    end
+
+    for i, widget in ipairs(calendar.attach_to) do calendar.attach(widget) end
+
+    calendar.update(calendar.cal, false)
 end
 
 end
 
-return setmetatable(calendar, { __call = function(_, ...) return create(...) end })
+return setmetatable(calendar, { __call = function(_, ...) return worker(...) end })
awesome window-manager configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.