]> git.madduck.net Git - etc/awesome.git/blobdiff - widget/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:

centerwork: remove capi reference
[etc/awesome.git] / widget / calendar.lua
index ce2d346b1f5dbb9ede1d2be1cbb389709fc53435..84b025d5d9b5f707fecf4c0a4b551fc4bc566e20 100644 (file)
@@ -1,9 +1,8 @@
-
 --[[
-                                                  
-     Licensed under GNU General Public License v2 
-      * (c) 2013, Luke Bonham                     
-                                                  
+
+     Licensed under GNU General Public License v2
+      * (c) 2013, Luca CPZ
+
 --]]
 
 local helpers      = require("lain.helpers")
@@ -38,8 +37,8 @@ function calendar.show(t_out, inc_offset, scr)
 
     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
+        calendar.icon   = calendar.icons:len() > 0 and string.format("%s%s.png", calendar.icons, tonumber(os.date("%d")))
+        f               = calendar.cal
     else -- no current month showing, no day to highlight
        local month = tonumber(os.date("%m"))
        local year  = tonumber(os.date("%Y"))
@@ -63,11 +62,11 @@ function calendar.show(t_out, inc_offset, scr)
     helpers.async(f, function(ws)
         local fg, bg = calendar.notification_preset.fg, calendar.notification_preset.bg
         calendar.notification_preset.text = ws:gsub("%c%[%d+[m]?%s?%d+%c%[%d+[m]?",
-        markup.bold(markup.color(bg, fg, os.date("%e")))):gsub("\n*$", "")
+        markup.bold(markup.color(bg, fg, os.date("%e")))):gsub("[\n%s]*$", "")
 
         local widget_focused = true
 
-        if t_out == 0 then
+        if t_out == 0 and mouse.current_widgets then
             widget_focused = false
             for i, widget in ipairs(calendar.attach_to) do
                 for _,v in ipairs(mouse.current_widgets) do
@@ -90,13 +89,20 @@ function calendar.show(t_out, inc_offset, scr)
     end)
 end
 
+function calendar.hover_on() calendar.show(0) end
+function calendar.hover_off() calendar.hide() end
+function calendar.prev() calendar.show(0, -1) end
+function calendar.next() 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) 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:connect_signal("mouse::enter", calendar.hover_on)
+    widget:connect_signal("mouse::leave", calendar.hover_off)
+    widget:buttons(awful.util.table.join(
+                awful.button({}, 1, calendar.prev),
+                awful.button({}, 3, calendar.next),
+                awful.button({}, 2, calendar.hover_on),
+                awful.button({}, 4, calendar.prev),
+                awful.button({}, 5, calendar.next)))
 end
 
 local function factory(args)