fs/alsabar: small fixes

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

diff --git a/widgets/contrib/task.lua b/widgets/contrib/task.lua
index fc438d9bfce40fc7534a91765473391657e77197..6c8c9cce01518496a654b29ed2afcca05b979458 100644 (file)
--- a/widgets/contrib/task.lua
+++ b/widgets/contrib/task.lua
@@ -12,7 +12,6 @@ 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


@@ -42,8 +41,8 @@ function task.show(scr_pos)
 
     local f, c_text, scrp
 
 
     local f, c_text, scrp
 

-    if task.followmouse then
-        scrp = mouse.screen
+    if task.followtag then
+        scrp = awful.screen.focused()

     else
         scrp = scr_pos or task.scr_pos
     end
     else
         scrp = scr_pos or task.scr_pos
     end


@@ -69,7 +68,7 @@ end
 
 function task.prompt_add()
   awful.prompt.run({ prompt = "Add task: " },
 
 function task.prompt_add()
   awful.prompt.run({ prompt = "Add task: " },

-      mypromptbox[mouse.screen].widget,
+      mypromptbox[awful.screen.focused()].widget,

       function (...)
           local f = io.popen("task add " .. ...)
           c_text = "\n<span font='"
       function (...)
           local f = io.popen("task add " .. ...)
           c_text = "\n<span font='"


@@ -94,7 +93,7 @@ end
 
 function task.prompt_search()
   awful.prompt.run({ prompt = "Search task: " },
 
 function task.prompt_search()
   awful.prompt.run({ prompt = "Search task: " },

-      mypromptbox[mouse.screen].widget,
+      mypromptbox[awful.screen.focused()].widget,

       function (...)
           local f = io.popen("task " .. ...)
           c_text = f:read("*all"):gsub(" \n*$", "")
       function (...)
           local f = io.popen("task " .. ...)
           c_text = f:read("*all"):gsub(" \n*$", "")


@@ -119,7 +118,7 @@ function task.prompt_search()
               fg       = task.fg,
               bg       = task.bg,
               timeout  = task.timeout,
               fg       = task.fg,
               bg       = task.bg,
               timeout  = task.timeout,

-              screen   = mouse.screen
+              screen   = awful.screen.focused()

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


@@ -137,7 +136,7 @@ function task.attach(widget, args)
     task.position    = args.position or "top_right"
     task.timeout     = args.timeout or 7
     task.scr_pos     = args.scr_pos or 1
     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.followtag   = args.followtag or false

     task.cmdline     = args.cmdline or "next"
 
     task.notify_icon = icons_dir .. "/taskwarrior/task.png"
     task.cmdline     = args.cmdline or "next"
 
     task.notify_icon = icons_dir .. "/taskwarrior/task.png"