X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/f4f4f1e14dae1191571893b26e9f4667d78acb5e..9358f8ac54a20f2351e4e4b7c45735f2388c3c42:/widgets/contrib/task.lua?ds=inline diff --git a/widgets/contrib/task.lua b/widgets/contrib/task.lua index a6c9f31..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,11 +32,17 @@ 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") @@ -72,7 +80,7 @@ function task:prompt_add() position = task.position, fg = task.fg, bg = task.bg, - timeout = task.timeout + timeout = task.timeout, }) end, nil, @@ -94,7 +102,7 @@ function task:prompt_search() c_text = "" - .. c_text + .. c_text .. "" end @@ -105,7 +113,8 @@ function task:prompt_search() position = task.position, fg = task.fg, bg = task.bg, - timeout = task.timeout + timeout = task.timeout, + screen = mouse.screen }) end, nil, @@ -113,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