pull #238: set step to 1%; added same middle click event to alsabar

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

diff --git a/widgets/contrib/task.lua b/widgets/contrib/task.lua
index 3b8039f329b817b9bfa88a96c144bb97ee327144..27061b9573be578ae1eeeb90ef1b27b7aac051dd 100644 (file)
--- a/widgets/contrib/task.lua
+++ b/widgets/contrib/task.lua
@@ -12,6 +12,7 @@ local awful        = require("awful")
 local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 
 local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 

+local mouse        = mouse

 local io           = io
 local string       = { len = string.len }
 local tonumber     = tonumber
 local io           = io
 local string       = { len = string.len }
 local tonumber     = tonumber


@@ -24,6 +25,11 @@ local task = {}
 
 local task_notification = nil
 
 
 local task_notification = nil
 

+function findLast(haystack, needle)
+    local i=haystack:match(".*"..needle.."()")
+    if i==nil then return nil else return i-1 end
+end
+

 function task:hide()
     if task_notification ~= nil then
         naughty.destroy(task_notification)
 function task:hide()
     if task_notification ~= nil then
         naughty.destroy(task_notification)


@@ -34,13 +40,19 @@ end
 function task:show(scr_pos)
     task:hide()
 
 function task:show(scr_pos)
     task:hide()
 

-    local f, c_text
+    local f, c_text, scrp

 
 

-    f = io.popen('task')
+    if task.followmouse then
+        scrp = mouse.screen
+    else
+        scrp = scr_pos or task.scr_pos
+    end
+
+    f = io.popen('task ' .. task.cmdline)

     c_text = "<span font='"
              .. task.font .. " "
              .. task.font_size .. "'>"
     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()
 


@@ -51,7 +63,7 @@ function task:show(scr_pos)
                                          fg = task.fg,
                                          bg = task.bg,
                                          timeout = task.timeout,
                                          fg = task.fg,
                                          bg = task.bg,
                                          timeout = task.timeout,

-                                         screen = scr_pos or 1
+                                         screen = scrp

                                      })
 end
 
                                      })
 end
 


@@ -63,7 +75,7 @@ function task:prompt_add()
           c_text = "\n<span font='"
                    .. task.font .. " "
                    .. task.font_size .. "'>"
           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()
 


@@ -95,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
 


@@ -115,21 +127,23 @@ function task:prompt_search()
 end
 
 function task:attach(widget, args)
 end
 
 function task:attach(widget, args)

-    local args     = args or {}
-
-    task.font_size = tonumber(args.font_size) or 12
-    task.font      = beautiful.font:sub(beautiful.font:find(""),
-                     beautiful.font:find(" "))
-    task.fg        = args.fg or beautiful.fg_normal or "#FFFFFF"
-    task.bg        = args.bg or beautiful.bg_normal or "#FFFFFF"
-    task.position  = args.position or "top_right"
-    task.timeout   = args.timeout or 7
-    task.scr_pos   = args.scr_pos or 1
+    local args       = args or {}
+
+    task.font_size   = tonumber(args.font_size) or 12
+    task.font        = args.font or beautiful.font:sub(beautiful.font:find(""),
+                       findLast(beautiful.font, " "))
+    task.fg          = args.fg or beautiful.fg_normal or "#FFFFFF"
+    task.bg          = args.bg or beautiful.bg_normal or "#FFFFFF"
+    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.cmdline     = args.cmdline or "next"

 
     task.notify_icon = icons_dir .. "/taskwarrior/task.png"
     task.notify_icon_small = icons_dir .. "/taskwarrior/tasksmall.png"
 
 
     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(scr_pos) end)
+    widget:connect_signal("mouse::enter", function () task:show(task.scr_pos) end)

     widget:connect_signal("mouse::leave", function () task:hide() end)
 end
 
     widget:connect_signal("mouse::leave", function () task:hide() end)
 end