X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/724eaa3ad77cab7f229c405d046dcebeab6552ab..fa69c1ae7ffc2ab3955d0c6812beb1de0c1226a0:/widgets/contrib/task.lua diff --git a/widgets/contrib/task.lua b/widgets/contrib/task.lua index 2e30cdc..27061b9 100644 --- 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 mouse = mouse local io = io local string = { len = string.len } local tonumber = tonumber @@ -24,6 +25,11 @@ local task = {} 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) @@ -31,16 +37,22 @@ function task:hide() end end -function task:show() +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 = "" - .. f:read("*all"):gsub("\n*$", "") + .. awful.util.escape(f:read("*all"):gsub("\n*$", "")) .. "" f:close() @@ -51,6 +63,7 @@ function task:show() fg = task.fg, bg = task.bg, timeout = task.timeout, + screen = scrp }) end @@ -59,10 +72,10 @@ function task:prompt_add() mypromptbox[mouse.screen].widget, function (...) local f = io.popen("task add " .. ...) - c_text = "\n" - .. f:read("*all") + .. awful.util.escape(f:read("*all")) .. "" f:close() @@ -94,7 +107,7 @@ function task:prompt_search() c_text = "" - .. c_text + .. awful.util.escape(c_text) .. "" end @@ -106,6 +119,7 @@ function task:prompt_search() fg = task.fg, bg = task.bg, timeout = task.timeout, + screen = mouse.screen }) end, nil, @@ -113,20 +127,23 @@ 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 = 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" - 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