]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/contrib/task.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
Merge pull request #262 from sim590/multiple-batteries-status
[etc/awesome.git] / widgets / contrib / task.lua
diff --git a/widgets/contrib/task.lua b/widgets/contrib/task.lua
index a6c9f31deba21dc16b6d25dc9729125832db5393..1b8f119811059cfaa6a6bfde6ce936a84b3291c8 100644 (file)
--- a/widgets/contrib/task.lua
+++ b/widgets/contrib/task.lua
@@ -2,7 +2,6 @@
 --[[
                                                   
      Licensed under GNU General Public License v2 
 --[[
                                                   
      Licensed under GNU General Public License v2 
-      * (c) 2013, Luke Bonham                     
       * (c) 2013, Jan Xie                         
                                                   
 --]]
       * (c) 2013, Jan Xie                         
                                                   
 --]]
@@ -13,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
@@ -20,28 +20,39 @@ local tonumber     = tonumber
 local setmetatable = setmetatable
 
 -- Taskwarrior notification
 local setmetatable = setmetatable
 
 -- Taskwarrior notification
--- lain.widgets.task
+-- lain.widgets.contrib.task
 local task = {}
 
 local task_notification = nil
 
 local task = {}
 
 local task_notification = nil
 
-function task:hide()
+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)
         task_notification = nil
     end
 end
 
     if task_notification ~= nil then
         naughty.destroy(task_notification)
         task_notification = nil
     end
 end
 
-function task:show()
-    task:hide()
+function task.show(scr_pos)
+    task.hide()
 
 
-    local f, c_text
+    local f, c_text, scrp
+
+    if task.followtag then
+        scrp = awful.screen.focused()
+    else
+        scrp = scr_pos or task.scr_pos
+    end
 
 
-    f = io.popen('task')
+    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,18 +62,20 @@ function task:show()
                                          position = task.position,
                                          fg = task.fg,
                                          bg = task.bg,
                                          position = task.position,
                                          fg = task.fg,
                                          bg = task.bg,
-                                         timeout = task.timeout })
+                                         timeout = task.timeout,
+                                         screen = scrp
+                                     })
 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 " .. ...)
       function (...)
           local f = io.popen("task add " .. ...)
-          c_text = "\n<span font='" 
+          c_text = "\n<span font='"
                    .. task.font .. " "
                    .. task.font_size .. "'>"
                    .. task.font .. " "
                    .. task.font_size .. "'>"
-                   .. f:read("*all")
+                   .. awful.util.escape(f:read("*all"))
                    .. "</span>"
           f:close()
 
                    .. "</span>"
           f:close()
 
@@ -72,16 +85,16 @@ function task:prompt_add()
               position = task.position,
               fg       = task.fg,
               bg       = task.bg,
               position = task.position,
               fg       = task.fg,
               bg       = task.bg,
-              timeout  = task.timeout
+              timeout  = task.timeout,
           })
       end,
       nil,
       awful.util.getdir("cache") .. "/history_task_add")
 end
 
           })
       end,
       nil,
       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*$", "")
@@ -94,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
 
@@ -105,29 +118,33 @@ function task:prompt_search()
               position = task.position,
               fg       = task.fg,
               bg       = task.bg,
               position = task.position,
               fg       = task.fg,
               bg       = task.bg,
-              timeout  = task.timeout
+              timeout  = task.timeout,
+              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)
-    local args     = args or {}
+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.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.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.notify_icon = icons_dir .. "/taskwarrior/task.png"
     task.notify_icon_small = icons_dir .. "/taskwarrior/tasksmall.png"
 
-    widget:connect_signal("mouse::enter", function () task:show() 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 })
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.