pull #239; better implementation

[etc/awesome.git] / widgets / contrib / task.lua

diff --git a/widgets/contrib/task.lua b/widgets/contrib/task.lua
index 98817f9fcabc8f511a0c0ee14b5261bfaa8d31c0..fc438d9bfce40fc7534a91765473391657e77197 100644 (file)
--- a/widgets/contrib/task.lua
+++ b/widgets/contrib/task.lua
@@ -30,22 +30,22 @@ function findLast(haystack, needle)
     if i==nil then return nil else return i-1 end
 end
 
-function task:hide()
+function task.hide()
     if task_notification ~= nil then
         naughty.destroy(task_notification)
         task_notification = nil
     end
 end
 
-function task:show(scr_pos)
-    task:hide()
+function task.show(scr_pos)
+    task.hide()
 
-    local f, c_text
+    local f, c_text, scrp
 
     if task.followmouse then
-        local scrp = mouse.screen
+        scrp = mouse.screen
     else
-        local scrp = scr_pos or task.scr_pos
+        scrp = scr_pos or task.scr_pos
     end
 
     f = io.popen('task ' .. task.cmdline)
@@ -67,7 +67,7 @@ function task:show(scr_pos)
                                      })
 end
 
-function task:prompt_add()
+function task.prompt_add()
   awful.prompt.run({ prompt = "Add task: " },
       mypromptbox[mouse.screen].widget,
       function (...)
@@ -92,7 +92,7 @@ function task:prompt_add()
       awful.util.getdir("cache") .. "/history_task_add")
 end
 
-function task:prompt_search()
+function task.prompt_search()
   awful.prompt.run({ prompt = "Search task: " },
       mypromptbox[mouse.screen].widget,
       function (...)
@@ -126,7 +126,7 @@ function task:prompt_search()
       awful.util.getdir("cache") .. "/history_task")
 end
 
-function task:attach(widget, args)
+function task.attach(widget, args)
     local args       = args or {}
 
     task.font_size   = tonumber(args.font_size) or 12
@@ -143,8 +143,8 @@ function task:attach(widget, args)
     task.notify_icon = icons_dir .. "/taskwarrior/task.png"
     task.notify_icon_small = icons_dir .. "/taskwarrior/tasksmall.png"
 
-    widget:connect_signal("mouse::enter", function () task:show(task.scr_pos) end)
-    widget:connect_signal("mouse::leave", function () task:hide() end)
+    widget:connect_signal("mouse::enter", function () task.show(task.scr_pos) end)
+    widget:connect_signal("mouse::leave", function () task.hide() end)
 end
 
 return setmetatable(task, { __call = function(_, ...) return create(...) end })