Merge commit '33c0e0c2360a04fcc6f51bccb0ad2a7a9e9c07b3'

[etc/awesome.git] / .config / awesome / lain / widget / contrib / task.lua

diff --git a/.config/awesome/lain/widget/contrib/task.lua b/.config/awesome/lain/widget/contrib/task.lua
index ba795538647f1b711e32056e5e0fd88cc5e6383a..536e0063087abd4b5152516dbbc218be735fd7ed 100644 (file)
--- a/.config/awesome/lain/widget/contrib/task.lua
+++ b/.config/awesome/lain/widget/contrib/task.lua
@@ -1,16 +1,16 @@
-
 --[[
-                                                  
-     Licensed under GNU General Public License v2 
-      * (c) 2013, Jan Xie                         
-                                                  
+
+     Licensed under GNU General Public License v2
+      * (c) 2013, Jan Xie
+
 --]]
 
 local helpers = require("lain.helpers")
 local markup  = require("lain.util").markup
 local awful   = require("awful")
 local naughty = require("naughty")
-local string  = { format = string.format, gsub = string.gsub }
+local mouse   = mouse
+local string  = string
 
 -- Taskwarrior notification
 -- lain.widget.contrib.task
@@ -23,21 +23,30 @@ function task.hide()
 end
 
 function task.show(scr)
-    task.hide()
+    task.notification_preset.screen = task.followtag and awful.screen.focused() or scr or 1
 
-    if task.followtag then
-        task.notification_preset.screen = awful.screen.focused()
-    elseif scr then
-        task.notification_preset.screen = scr
-    end
+    helpers.async({ awful.util.shell, "-c", task.show_cmd }, function(f)
+        local widget_focused = true
+
+        if mouse.current_widgets then
+            widget_focused = false
+            for _,v in ipairs(mouse.current_widgets) do
+                if task.widget == v then
+                    widget_focused = true
+                    break
+                end
+            end
+        end
 
-    helpers.async(task.show_cmd, function(f)
-        task.notification = naughty.notify({
-            preset = task.notification_preset,
-            title  = task.show_cmd,
-            text   = markup.font(task.notification_preset.font,
-                     awful.util.escape(f:gsub("\n*$", "")))
-        })
+        if widget_focused then
+            task.hide()
+            task.notification = naughty.notify {
+                preset = task.notification_preset,
+                title  = "task next",
+                text   = markup.font(task.notification_preset.font,
+                         awful.util.escape(f:gsub("\n*$", "")))
+            }
+        end
     end)
 end
 
@@ -49,9 +58,9 @@ function task.prompt()
             helpers.async(t, function(f)
                 naughty.notify {
                     preset = task.notification_preset,
-                    title    = t,
-                    text     = markup.font(task.notification_preset.font,
-                               awful.util.escape(f:gsub("\n*$", "")))
+                    title  = t,
+                    text   = markup.font(task.notification_preset.font,
+                             awful.util.escape(f:gsub("\n*$", "")))
                 }
             end)
         end,
@@ -65,6 +74,7 @@ function task.attach(widget, args)
     task.prompt_text         = args.prompt_text or "Enter task command: "
     task.followtag           = args.followtag or false
     task.notification_preset = args.notification_preset
+    task.widget              = widget
 
     if not task.notification_preset then
         task.notification_preset = {