whitespaces removed

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

diff --git a/widgets/contrib/task.lua b/widgets/contrib/task.lua
index 6e6ebaeb7b4c0e74265527150eab69c76751da01..6f131e216fe4f925deecc5b7ac65771688959fb1 100644 (file)
--- a/widgets/contrib/task.lua
+++ b/widgets/contrib/task.lua
@@ -2,7 +2,6 @@
 --[[
                                                   
      Licensed under GNU General Public License v2 
 --[[
                                                   
      Licensed under GNU General Public License v2 

-      * (c) 2013, Luke Bonham                     

       * (c) 2013, Jan Xie                         
                                                   
 --]]
       * (c) 2013, Jan Xie                         
                                                   
 --]]


@@ -13,6 +12,7 @@ local awful        = require("awful")
 local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 
 local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 

+local mouse        = mouse

 local io           = io
 local string       = { len = string.len }
 local tonumber     = tonumber
 local io           = io
 local string       = { len = string.len }
 local tonumber     = tonumber


@@ -20,7 +20,7 @@ local tonumber     = tonumber
 local setmetatable = setmetatable
 
 -- Taskwarrior notification
 local setmetatable = setmetatable
 
 -- Taskwarrior notification

--- lain.widgets.task
+-- lain.widgets.contrib.task

 local task = {}
 
 local task_notification = nil
 local task = {}
 
 local task_notification = nil


@@ -32,11 +32,17 @@ function task:hide()
     end
 end
 
     end
 end
 

-function task:show()
+function task:show(scr_pos)

     task:hide()
 
     local f, c_text
 
     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 = "<span font='"
              .. task.font .. " "
     f = io.popen('task')
     c_text = "<span font='"
              .. task.font .. " "


@@ -52,7 +58,7 @@ function task:show()
                                          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
+                                         screen = scrp

                                      })
 end
 
                                      })
 end
 


@@ -61,7 +67,7 @@ function task:prompt_add()
       mypromptbox[mouse.screen].widget,
       function (...)
           local f = io.popen("task add " .. ...)
       mypromptbox[mouse.screen].widget,
       function (...)
           local f = io.popen("task add " .. ...)

-          c_text = "\n<span font='" 
+          c_text = "\n<span font='"

                    .. task.font .. " "
                    .. task.font_size .. "'>"
                    .. f:read("*all")
                    .. task.font .. " "
                    .. task.font_size .. "'>"
                    .. f:read("*all")


@@ -75,7 +81,6 @@ function task:prompt_add()
               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,
           })
       end,
       nil,


@@ -97,7 +102,7 @@ function task:prompt_search()
               c_text = "<span font='"
                        .. task.font .. " "
                        .. task.font_size .. "'>"
               c_text = "<span font='"
                        .. task.font .. " "
                        .. task.font_size .. "'>"

-                       .. c_text 
+                       .. c_text

                        .. "</span>"
           end
 
                        .. "</span>"
           end
 


@@ -109,7 +114,7 @@ function task:prompt_search()
               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
+              screen   = mouse.screen

           })
       end,
       nil,
           })
       end,
       nil,


@@ -117,20 +122,22 @@ function task:prompt_search()
 end
 
 function task:attach(widget, args)
 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"
 
 
     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
 
     widget:connect_signal("mouse::leave", function () task:hide() end)
 end