remove naughty

[etc/awesome.git] / widgets / contrib / task.lua

diff --git a/widgets/contrib/task.lua b/widgets/contrib/task.lua
index 88baa71e6206076b76c4d22fe6400167c8391d03..6e6ebaeb7b4c0e74265527150eab69c76751da01 100644 (file)
--- a/widgets/contrib/task.lua
+++ b/widgets/contrib/task.lua
@@ -38,11 +38,11 @@ function task:show()
     local f, c_text
 
     f = io.popen('task')
-    c_text = "<tt><span font='"
+    c_text = "<span font='"
              .. task.font .. " "
              .. task.font_size .. "'>"
              .. f:read("*all"):gsub("\n*$", "")
-             .. "</span></tt>"
+             .. "</span>"
     f:close()
 
     task_notification = naughty.notify({ title = "[task next]",
@@ -51,7 +51,9 @@ function task:show()
                                          position = task.position,
                                          fg = task.fg,
                                          bg = task.bg,
-                                         timeout = task.timeout })
+                                         timeout = task.timeout,
+                                         screen = client.focus and client.focus.screen or 1
+                                     })
 end
 
 function task:prompt_add()
@@ -59,19 +61,21 @@ function task:prompt_add()
       mypromptbox[mouse.screen].widget,
       function (...)
           local f = io.popen("task add " .. ...)
-          c_text = "\n<tt><span font='" 
+          c_text = "\n<span font='" 
                    .. task.font .. " "
                    .. task.font_size .. "'>"
                    .. f:read("*all")
-                   .. "</span></tt>"
+                   .. "</span>"
+          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,
+              screen = client.focus and client.focus.screen or 1
           })
       end,
       nil,
@@ -83,27 +87,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 = "<tt><span font='"
+              c_text = "<span font='"
                        .. task.font .. " "
                        .. task.font_size .. "'>"
-                       .. c_text .. "\n"
-                       .. "</span></tt>"
+                       .. c_text 
+                       .. "</span>"
           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 = client.focus and client.focus.screen or 1
           })
       end,
       nil,