widgets: no global tables, but one instance per call; closes #336; closes #337

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

diff --git a/widget/calendar.lua b/widget/calendar.lua
index d3e8d4be7b9072a0ed6f26737a62672434dc07e7..99e8817c8f621a7060601f59cb7b727455d9c0cb 100644 (file)
--- a/widget/calendar.lua
+++ b/widget/calendar.lua
@@ -67,7 +67,7 @@ function calendar.show(t_out, inc_offset, scr)
 
         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
@@ -79,23 +79,31 @@ function calendar.show(t_out, inc_offset, scr)
             end
         end
 
-        calendar.hide()
-
-        calendar.notification = naughty.notify({
-            preset  = calendar.notification_preset,
-            icon    = calendar.icon,
-            timeout = (widget_focused and t_out) or calendar.notification_preset.timeout or 5
-        })
+        if widget_focused then
+            calendar.hide()
+            calendar.notification = naughty.notify({
+                preset  = calendar.notification_preset,
+                icon    = calendar.icon,
+                timeout = t_out or calendar.notification_preset.timeout or 5
+            })
+        end
     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)