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

projects / etc / awesome.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
pull #307: worker -> factory
[etc/awesome.git] / widget / calendar.lua
diff --git a/widget/calendar.lua b/widget/calendar.lua
index 4a3d207ab14a6680d251ddc91740a09f56da4b8a..d3e8d4be7b9072a0ed6f26737a62672434dc07e7 100644 (file)
--- a/widget/calendar.lua
+++ b/widget/calendar.lua
@@ -10,6 +10,7 @@ local helpers      = require("lain.helpers")
 local markup       = require("lain.util.markup")
 local awful        = require("awful")
 local naughty      = require("naughty")
 local markup       = require("lain.util.markup")
 local awful        = require("awful")
 local naughty      = require("naughty")
+local mouse        = mouse
 local os           = { date   = os.date }
 local string       = { format = string.format,
                        gsub   = string.gsub }
 local os           = { date   = os.date }
 local string       = { format = string.format,
                        gsub   = string.gsub }
@@ -30,6 +31,7 @@ end
 function calendar.show(t_out, inc_offset, scr)
     local f, offs = nil, inc_offset or 0
 
 function calendar.show(t_out, inc_offset, scr)
     local f, offs = nil, inc_offset or 0
 
+    calendar.notification_preset.screen = scr or (calendar.followtag and awful.screen.focused()) or 1
     calendar.offset = calendar.offset + offs
 
     local current_month = (offs == 0 or calendar.offset == 0)
     calendar.offset = calendar.offset + offs
 
     local current_month = (offs == 0 or calendar.offset == 0)
@@ -58,62 +60,45 @@ function calendar.show(t_out, inc_offset, scr)
        f = string.format("%s %s %s", calendar.cal, month, year)
     end
 
        f = string.format("%s %s %s", calendar.cal, month, year)
     end
 
-    if calendar.followtag then
-        calendar.notification_preset.screen = awful.screen.focused()
-    else
-        calendar.notification_preset.screen = src or 1
-    end
+    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*$", "")
+
+        local widget_focused = true
+
+        if t_out == 0 then
+            widget_focused = false
+            for i, widget in ipairs(calendar.attach_to) do
+                for _,v in ipairs(mouse.current_widgets) do
+                    if widget == v then
+                        widget_focused = true
+                        break
+                    end
+                end
+            end
+        end
 
 
-    if f == calendar then
-        calendar.update(f, false)
         calendar.hide()
         calendar.hide()
+
         calendar.notification = naughty.notify({
         calendar.notification = naughty.notify({
-            preset      = calendar.notification_preset,
-            icon        = calendar.icon,
-            timeout     = t_out or calendar.notification_preset.timeout or 5
+            preset  = calendar.notification_preset,
+            icon    = calendar.icon,
+            timeout = (widget_focused and t_out) or calendar.notification_preset.timeout or 5
         })
         })
-    else
-        calendar.update(f, true, t_out)
-    end
-end
-
-function calendar.update(f, show, t_out)
-    local fg, bg = calendar.notification_preset.fg, calendar.notification_preset.bg
-
-    helpers.async(f, function(ws)
-        ws = ws:gsub("%c%[%d+[m]?%s?%d+%c%[%d+[m]?",
-             markup.bold(markup.color(bg, fg, os.date("%e")))):gsub("\n*$", "")
-
-        if f == calendar.cal then
-            calendar.notification_preset.text = ws
-        end
-
-        if show then
-            calendar.hide()
-            calendar.notification = naughty.notify({
-                preset      = calendar.notification_preset,
-                text        = ws,
-                icon        = calendar.icon,
-                timeout     = t_out or calendar.notification_preset.timeout or 5
-            })
-        end
     end)
 end
 
 function calendar.attach(widget)
     widget:connect_signal("mouse::enter", function () calendar.show(0) end)
     widget:connect_signal("mouse::leave", function () calendar.hide() end)
     end)
 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),
-                                         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)))
+    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)))
 end
 
 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 {}
     local args                   = args or {}
     calendar.cal                 = args.cal or "/usr/bin/cal"
     calendar.attach_to           = args.attach_to or {}
@@ -130,8 +115,6 @@ local function worker(args)
     end
 
     for i, widget in ipairs(calendar.attach_to) do calendar.attach(widget) end
     end
 
     for i, widget in ipairs(calendar.attach_to) do calendar.attach(widget) end
-
-    calendar.update(calendar.cal, false)
 end
 
 end
 
-return setmetatable(calendar, { __call = function(_, ...) return worker(...) end })
+return setmetatable(calendar, { __call = function(_, ...) return factory(...) end })
awesome window-manager configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.