fs: elseif -> else in scr argument check; #322

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

diff --git a/widget/calendar.lua b/widget/calendar.lua
index eec14e75074fd6b41428156fe9975c153af30fbe..789676dc404788b91bb8469e71d4ba74fe607a92 100644 (file)
--- a/widget/calendar.lua
+++ b/widget/calendar.lua
@@ -79,26 +79,34 @@ 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 worker(args)
+local function factory(args)
     local args                   = args or {}
     calendar.cal                 = args.cal or "/usr/bin/cal"
     calendar.attach_to           = args.attach_to or {}
@@ -117,4 +125,4 @@ local function worker(args)
     for i, widget in ipairs(calendar.attach_to) do calendar.attach(widget) end
 end
 
-return setmetatable(calendar, { __call = function(_, ...) return worker(...) end })
+return setmetatable(calendar, { __call = function(_, ...) return factory(...) end })