Merge pull request #173 from guotsuan/master

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

diff --git a/widgets/contrib/moc.lua b/widgets/contrib/moc.lua
index cfdbec7e71068f2c140e3f37134115c99a7ab192..b79dbe2034ae44d071ade51ea9c976c606c4735d 100644 (file)
--- a/widgets/contrib/moc.lua
+++ b/widgets/contrib/moc.lua
@@ -21,6 +21,8 @@ local string = { format  = string.format,
 
 local setmetatable = setmetatable
 
 
 local setmetatable = setmetatable
 

+-- MOC audio player
+-- lain.widgets.contrib.moc

 local moc = {}
 
 local function worker(args)
 local moc = {}
 
 local function worker(args)


@@ -29,6 +31,7 @@ local function worker(args)
     local music_dir   = args.music_dir or os.getenv("HOME") .. "/Music"
     local cover_size  = args.cover_size or 100
     local default_art = args.default_art or ""
     local music_dir   = args.music_dir or os.getenv("HOME") .. "/Music"
     local cover_size  = args.cover_size or 100
     local default_art = args.default_art or ""

+    local followmouse = args.followmouse or false

     local settings    = args.settings or function() end
 
     local mpdcover = helpers.scripts_dir .. "mpdcover"
     local settings    = args.settings or function() end
 
     local mpdcover = helpers.scripts_dir .. "mpdcover"


@@ -58,7 +61,7 @@ local function worker(args)
                 total   = "N/A"
             }
 
                 total   = "N/A"
             }
 

-            for line in f:lines() do
+            for line in string.gmatch(f, "[^\n]+") do

                 for k, v in string.gmatch(line, "([%w]+):[%s](.*)$") do
                     if k == "State" then moc_now.state = v
                     elseif k == "File" then moc_now.file = v
                 for k, v in string.gmatch(line, "([%w]+):[%s](.*)$") do
                     if k == "State" then moc_now.state = v
                     elseif k == "File" then moc_now.file = v


@@ -82,6 +85,10 @@ local function worker(args)
                     os.execute(string.format("%s %q %q %d %q", mpdcover, "",
                                moc_now.file, cover_size, default_art))
 
                     os.execute(string.format("%s %q %q %d %q", mpdcover, "",
                                moc_now.file, cover_size, default_art))
 

+                    if followmouse then
+                        moc_notification_preset.screen = mouse.screen
+                    end
+

                     moc.id = naughty.notify({
                         preset = moc_notification_preset,
                         icon = "/tmp/mpdcover.png",
                     moc.id = naughty.notify({
                         preset = moc_notification_preset,
                         icon = "/tmp/mpdcover.png",