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

#289 fix attempt
[etc/awesome.git] / widgets / calendar.lua
index a00cabaa170a3dbd98d4311f4e7595aca94dcfba..0793bc0e2f056cb889f56288d237008fa29318af 100644 (file)
@@ -6,14 +6,14 @@
                                                   
 --]]
 
-local async        = require("lain.helpers").async
-local icons_dir    = require("lain.helpers").icons_dir
+local helpers      = require("lain.helpers")
 local markup       = require("lain.util.markup")
 local awful        = require("awful")
 local naughty      = require("naughty")
 local os           = { date   = os.date }
 local string       = { format = string.format,
                        gsub   = string.gsub }
+local ipairs       = ipairs
 local tonumber     = tonumber
 local setmetatable = setmetatable
 
@@ -28,8 +28,6 @@ function calendar.hide()
 end
 
 function calendar.show(t_out, inc_offset, scr)
-    calendar.hide()
-
     local today = os.date("%d")
     local offs = inc_offset or 0
     local f
@@ -68,33 +66,21 @@ function calendar.show(t_out, inc_offset, scr)
         calendar.notification_preset.screen = src or 1
     end
 
-    async(string.format("%s -c '%s'", awful.util.shell, f), function(ws)
+    helpers.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)))
+        ws = ws:gsub("%c%[%d+[m]?%d+%c%[%d+[m]?", markup.bold(markup.color(bg, fg, today)))
+        calendar.hide()
         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
+            preset      = calendar.notification_preset,
+            text        = ws:gsub("\n*$", ""),
+            icon        = calendar.notify_icon,
+            timeout     = t_out or calendar.notification_preset.timeout or 5
         })
     end)
 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
-
-    widget:connect_signal("mouse::enter", function () calendar.show(0, 0, calendar.scr_pos) 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),
@@ -106,4 +92,23 @@ function calendar.attach(widget, args)
                                              calendar.show(0, 1, calendar.scr_pos) end)))
 end
 
-return setmetatable(calendar, { __call = function(_, ...) return create(...) end })
+local function worker(args)
+    local args                   = args or {}
+    calendar.cal                 = args.cal or "/usr/bin/cal --color=always"
+    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
+end
+
+return setmetatable(calendar, { __call = function(_, ...) return worker(...) end })