X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/b9f31a6c6237f326405d6530b34416f94250c475..6cce5b6fe11fe8c69b08140d645c604fef59e42a:/widgets/contrib/task.lua?ds=inline
diff --git a/widgets/contrib/task.lua b/widgets/contrib/task.lua
index 946966a..6c8c9cc 100644
--- a/widgets/contrib/task.lua
+++ b/widgets/contrib/task.lua
@@ -12,7 +12,6 @@ local awful = require("awful")
local beautiful = require("beautiful")
local naughty = require("naughty")
-local mouse = mouse
local io = io
local string = { len = string.len }
local tonumber = tonumber
@@ -25,29 +24,34 @@ 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
-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
- local scrp = scr_pos or task.scr_pos
+ scrp = scr_pos or task.scr_pos
end
f = io.popen('task ' .. task.cmdline)
c_text = ""
- .. f:read("*all"):gsub("\n*$", "")
+ .. awful.util.escape(f:read("*all"):gsub("\n*$", ""))
.. ""
f:close()
@@ -62,15 +66,15 @@ function task:show(scr_pos)
})
end
-function task:prompt_add()
+function task.prompt_add()
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"
- .. f:read("*all")
+ .. awful.util.escape(f:read("*all"))
.. ""
f:close()
@@ -87,9 +91,9 @@ 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,
+ mypromptbox[awful.screen.focused()].widget,
function (...)
local f = io.popen("task " .. ...)
c_text = f:read("*all"):gsub(" \n*$", "")
@@ -102,7 +106,7 @@ function task:prompt_search()
c_text = ""
- .. c_text
+ .. awful.util.escape(c_text)
.. ""
end
@@ -114,32 +118,32 @@ function task:prompt_search()
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
-function task:attach(widget, args)
+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.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.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"
- 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 })