Merge pull request #253 from aajjbb/fix-alsabar-typo

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

diff --git a/widgets/contrib/task.lua b/widgets/contrib/task.lua
index f721548fabe0870c9b76a3ff12645836d7776c8f..1b8f119811059cfaa6a6bfde6ce936a84b3291c8 100644 (file)
--- a/widgets/contrib/task.lua
+++ b/widgets/contrib/task.lua
@@ -30,29 +30,29 @@ function findLast(haystack, needle)
     if i==nil then return nil else return i-1 end
 end
 
     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
 
     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
+    if task.followtag then
+        scrp = awful.screen.focused()

     else
     else

-        local scrp = scr_pos or task.scr_pos
+        scrp = scr_pos or task.scr_pos

     end
 
     f = io.popen('task ' .. task.cmdline)
     c_text = "<span font='"
              .. task.font .. " "
              .. task.font_size .. "'>"
     end
 
     f = io.popen('task ' .. task.cmdline)
     c_text = "<span font='"
              .. task.font .. " "
              .. task.font_size .. "'>"

-             .. f:read("*all"):gsub("\n*$", "")
+             .. awful.util.escape(f:read("*all"):gsub("\n*$", ""))

              .. "</span>"
     f:close()
 
              .. "</span>"
     f:close()
 


@@ -67,15 +67,15 @@ function task:show(scr_pos)
                                      })
 end
 
                                      })
 end
 

-function task:prompt_add()
+function task.prompt_add()

   awful.prompt.run({ prompt = "Add task: " },
   awful.prompt.run({ prompt = "Add task: " },

-      mypromptbox[mouse.screen].widget,
+      mypromptbox[awful.screen.focused()].widget,

       function (...)
           local f = io.popen("task add " .. ...)
           c_text = "\n<span font='"
                    .. task.font .. " "
                    .. task.font_size .. "'>"
       function (...)
           local f = io.popen("task add " .. ...)
           c_text = "\n<span font='"
                    .. task.font .. " "
                    .. task.font_size .. "'>"

-                   .. f:read("*all")
+                   .. awful.util.escape(f:read("*all"))

                    .. "</span>"
           f:close()
 
                    .. "</span>"
           f:close()
 


@@ -92,9 +92,9 @@ function task:prompt_add()
       awful.util.getdir("cache") .. "/history_task_add")
 end
 
       awful.util.getdir("cache") .. "/history_task_add")
 end
 

-function task:prompt_search()
+function task.prompt_search()

   awful.prompt.run({ prompt = "Search task: " },
   awful.prompt.run({ prompt = "Search task: " },

-      mypromptbox[mouse.screen].widget,
+      mypromptbox[awful.screen.focused()].widget,

       function (...)
           local f = io.popen("task " .. ...)
           c_text = f:read("*all"):gsub(" \n*$", "")
       function (...)
           local f = io.popen("task " .. ...)
           c_text = f:read("*all"):gsub(" \n*$", "")


@@ -107,7 +107,7 @@ function task:prompt_search()
               c_text = "<span font='"
                        .. task.font .. " "
                        .. task.font_size .. "'>"
               c_text = "<span font='"
                        .. task.font .. " "
                        .. task.font_size .. "'>"

-                       .. c_text
+                       .. awful.util.escape(c_text)

                        .. "</span>"
           end
 
                        .. "</span>"
           end
 


@@ -119,14 +119,14 @@ function task:prompt_search()
               fg       = task.fg,
               bg       = task.bg,
               timeout  = task.timeout,
               fg       = task.fg,
               bg       = task.bg,
               timeout  = task.timeout,

-              screen   = mouse.screen
+              screen   = awful.screen.focused()

           })
       end,
       nil,
       awful.util.getdir("cache") .. "/history_task")
 end
 
           })
       end,
       nil,
       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
     local args       = args or {}
 
     task.font_size   = tonumber(args.font_size) or 12


@@ -137,14 +137,14 @@ function task:attach(widget, args)
     task.position    = args.position or "top_right"
     task.timeout     = args.timeout or 7
     task.scr_pos     = args.scr_pos or 1
     task.position    = args.position or "top_right"
     task.timeout     = args.timeout or 7
     task.scr_pos     = args.scr_pos or 1

-    task.followmouse = args.followmouse or false
+    task.followtag   = args.followtag or false

     task.cmdline     = args.cmdline or "next"
 
     task.notify_icon = icons_dir .. "/taskwarrior/task.png"
     task.notify_icon_small = icons_dir .. "/taskwarrior/tasksmall.png"
 
     task.cmdline     = args.cmdline or "next"
 
     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 })
 end
 
 return setmetatable(task, { __call = function(_, ...) return create(...) end })