X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/66dde90206fe181cbe49d236925a8d4e6a86ec54..6aca9e17306d260a4742318d994aee5b181e7aee:/widgets/contrib/task.lua?ds=inline
diff --git a/widgets/contrib/task.lua b/widgets/contrib/task.lua
index 88baa71..6f131e2 100644
--- a/widgets/contrib/task.lua
+++ b/widgets/contrib/task.lua
@@ -2,7 +2,6 @@
--[[
Licensed under GNU General Public License v2
- * (c) 2013, Luke Bonham
* (c) 2013, Jan Xie
--]]
@@ -13,6 +12,7 @@ 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
@@ -20,7 +20,7 @@ local tonumber = tonumber
local setmetatable = setmetatable
-- Taskwarrior notification
--- lain.widgets.task
+-- lain.widgets.contrib.task
local task = {}
local task_notification = nil
@@ -32,17 +32,23 @@ function task:hide()
end
end
-function task:show()
+function task:show(scr_pos)
task:hide()
local f, c_text
+ if task.followmouse then
+ local scrp = mouse.screen
+ else
+ local scrp = scr_pos or task.scr_pos
+ end
+
f = io.popen('task')
- c_text = ""
.. f:read("*all"):gsub("\n*$", "")
- .. ""
+ .. ""
f:close()
task_notification = naughty.notify({ title = "[task next]",
@@ -51,7 +57,9 @@ function task:show()
position = task.position,
fg = task.fg,
bg = task.bg,
- timeout = task.timeout })
+ timeout = task.timeout,
+ screen = scrp
+ })
end
function task:prompt_add()
@@ -59,19 +67,20 @@ function task:prompt_add()
mypromptbox[mouse.screen].widget,
function (...)
local f = io.popen("task add " .. ...)
- c_text = "\n"
.. f:read("*all")
- .. ""
+ .. ""
+ f:close()
naughty.notify({
- text = c_text,
- icon = task.notify_icon,
+ text = c_text,
+ icon = task.notify_icon,
position = task.position,
- fg = task.fg,
- bg = task.bg,
- timeout = task.timeout
+ fg = task.fg,
+ bg = task.bg,
+ timeout = task.timeout,
})
end,
nil,
@@ -83,27 +92,29 @@ function task:prompt_search()
mypromptbox[mouse.screen].widget,
function (...)
local f = io.popen("task " .. ...)
- c_text = f:read("*all")
+ c_text = f:read("*all"):gsub(" \n*$", "")
f:close()
if string.len(c_text) == 0
then
c_text = "No results found."
else
- c_text = ""
- .. c_text .. "\n"
- .. ""
+ .. c_text
+ .. ""
end
naughty.notify({
- text = c_text,
- icon = task.notify_icon,
+ title = "[task next " .. ... .. "]",
+ text = c_text,
+ icon = task.notify_icon,
position = task.position,
- fg = task.fg,
- bg = task.bg,
- timeout = task.timeout
+ fg = task.fg,
+ bg = task.bg,
+ timeout = task.timeout,
+ screen = mouse.screen
})
end,
nil,
@@ -111,20 +122,22 @@ function task:prompt_search()
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
+ 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
+ task.followmouse = args.followmouse or false
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::enter", function () task:show(task.scr_pos) end)
widget:connect_signal("mouse::leave", function () task:hide() end)
end