some other space fixes

[etc/awesome.git] / widgets / mpd.lua

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index dcb7101da5c47c59ee5e75378a2c218e6f90d12a..8db62ae365af9561bc9fc3e20189127e37beb4c6 100644 (file)
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -33,11 +33,11 @@ function worker(args)
     local port = args.port or "6600"
     local music_dir = args.music_dir or os.getenv("HOME") .. "/Music"
     local refresh_timeout = args.refresh_timeout or 1
-    local notify_timeout = args.notify_timeout or 5
-    local color_artist = args.color_artist or beautiful.fg_normal or "#FFFFFF"
-    local color_song = args.color_song or beautiful.fg_focus or "#FFFFFF"
-    local spr = args.spr or ""
-    local musicplr = args.musicplr or "ncmpcpp"
+    local header_color = args.header_color or beautiful.fg_normal or "#FFFFFF"
+    local color = args.color or beautiful.fg_focus or "#FFFFFF"
+    local spr = args.spr or " "
+    local footer = args.footer or ""
+    local app = args.app or "ncmpcpp"
     local shadow = args.shadow or false
 
     local mpdcover = helpers.scripts_dir .. "mpdcover"
@@ -54,7 +54,7 @@ function worker(args)
             then
                 mympd:set_text('')
             else
-                mympd:set_markup(markup(color_artist, " mpd "), markup(color_song , "off "))
+                mympd:set_markup(markup(header_color, "mpd ") .. markup(color , "off") .. footer)
             end
         end
 
@@ -98,20 +98,19 @@ function worker(args)
                            mpd_state["{Date}"]   .. "\n"   ..
                            mpd_state["{Title}"],
                     icon = "/tmp/mpdcover.png",
-                    fg = beautiful.fg_focus or "#FFFFFF",
-                    bg = beautiful.bg_normal or "#000000" ,
-                    timeout = notify_timeout,
+                    fg = color,
+                    timeout = 6, 
                     replaces_id = mpd.id
                 }).id
             end
-            mympd:set_markup(markup(color_artist, " " .. mpd_state["{Artist}"])
+            mympd:set_markup(markup(header_color, mpd_state["{Artist}"])
                              .. spr ..
-                             markup(color_song, " " .. mpd_state["{Title}"] .. " "))
+                             markup(color, mpd_state["{Title}"]) .. footer)
         elseif mpd_state["{state}"] == "pause"
         then
-            mympd:set_markup(markup(color_artist, " mpd")
+            mympd:set_markup(markup(header_color, "mpd")
                              .. spr ..
-                             markup(color_song, " paused "))
+                             markup(color, "paused") .. footer)
         else
             helpers.set_map("current mpd track", nil)
                        set_nompd()
@@ -126,7 +125,7 @@ function worker(args)
     mympd:buttons(awful.util.table.join(
         awful.button({}, 0,
             function()
-                helpers.run_in_terminal(musicplr)
+                helpers.run_in_terminal(app)
             end)
     ))