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

Merge pull request #284 from BarbUk/master
[etc/awesome.git] / widgets / calendar.lua
index b15d182a4849e6cfff4a1e4835597dfaef2faf8e..7988ba26f60caa96a9978d8fcbfaa164b952b1d8 100644 (file)
                                                   
 --]]
 
                                                   
 --]]
 
+local async        = require("lain.helpers").async
 local icons_dir    = require("lain.helpers").icons_dir
 local icons_dir    = require("lain.helpers").icons_dir
-
+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           = { popen = io.popen }
-local os           = { date = os.date }
-local mouse        = mouse
+local os           = { date   = os.date }
 local string       = { format = string.format,
 local string       = { format = string.format,
-                       sub    = string.sub,
                        gsub   = string.gsub }
 local tonumber     = tonumber
 
                        gsub   = string.gsub }
 local tonumber     = tonumber
 
-local setmetatable = setmetatable
-
 -- Calendar notification
 -- lain.widgets.calendar
 -- Calendar notification
 -- lain.widgets.calendar
-local calendar = {}
-local cal_notification = nil
+local calendar = { offset = 0 }
 
 
-function calendar:hide()
-    if cal_notification ~= nil then
-        naughty.destroy(cal_notification)
-        cal_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, scr)
-    calendar:hide()
+function calendar.show(t_out, inc_offset, scr)
+    calendar.hide()
 
 
-    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 = string.format("%s %s | sed -e 's/[\b]\\{3\\}//g'",
-                   calendar.cal, calendar.post_cal)
+    local today = os.date("%d")
+    local offs = inc_offset or 0
+    local f
 
     calendar.offset = calendar.offset + offs
 
 
     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(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))
+    local current_month = (offs == 0 or calendar.offset == 0)
 
 
+    if current_month then -- today highlighted
+        calendar.offset = 0
+        calendar.notify_icon = string.format("%s%s.png", calendar.icons, today)
+        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"))
 
        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
 
        calendar.notify_icon = nil
        end
 
        calendar.notify_icon = nil
-
-       f = io.popen(string.format('%s %s %s %s', calendar.cal, month, year, calendar.post_cal))
+       f = string.format("%s %s %s", calendar.cal, month, year)
     end
 
     end
 
-    c_text = "<tt><span font='" .. calendar.font .. " "
-             .. calendar.font_size .. "'><b>"
-             .. f:read() .. "</b>\n\n"
-             .. f:read() .. "\n"
-             .. f:read("*all"):gsub("\n*$", "")
-             .. "</span></tt>"
-    f:close()
-
-    if calendar.followmouse then
-        scrp = mouse.screen
+    if calendar.followtag then
+        calendar.notification_preset.screen = awful.screen.focused()
     else
     else
-        scrp = scr or calendar.scr_pos
+        calendar.notification_preset.screen = src or 1
     end
 
     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
-    })
+    async(f, function(ws)
+        fg, bg = calendar.notification_preset.fg, calendar.notification_preset.bg
+        ws = ws:gsub("%c%[7m%d+%c%[27m", markup.bold(markup.color(bg, fg, today)))
+        calendar.notification = naughty.notify({
+            preset  = calendar.notification_preset,
+            text    = ws:gsub("\n*$", ""),
+            icon    = calendar.notify_icon,
+            timeout = t_out or calendar.notification.preset.timeout or 5
+        })
+    end)
 end
 
 end
 
-function calendar:attach(widget, args)
-    local args = args or {}
-
-    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(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),
-                                         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)))
+function calendar.attach(widget, args)
+    local args                   = args or {}
+    calendar.cal                 = args.cal or "/usr/bin/cal --color=always"
+    calendar.followtag           = args.followtag or false
+    calendar.icons               = args.icons or icons_dir .. "cal/white/"
+    calendar.notification_preset = args.notification_preset
+
+    if not calendar.notification_preset then
+        calendar.notification_preset      = naughty.config.defaults
+        calendar.notification_preset.font = "Monospace 10"
+        calendar.notification_preset.fg   = "#FFFFFF"
+        calendar.notification_preset.bg   = "#000000"
+    end
+
+    if widget then
+        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
 end
 
 end
 
-return setmetatable(calendar, { __call = function(_, ...) return create(...) end })
+return calendar