awesome/theme: add missing awful import

[dotfiles.git] / awesome / widgets / mpd_widget.lua

diff --git a/awesome/widgets/mpd_widget.lua b/awesome/widgets/mpd_widget.lua
index f5f0ce74f640a32424504a1fc27d53e8bb539202..e71e0873787dbcce971f75c498e52337726fd477 100644 (file)
--- a/awesome/widgets/mpd_widget.lua
+++ b/awesome/widgets/mpd_widget.lua
@@ -1,23 +1,31 @@
-local mpc = require("widgets/mpc")
-local textbox = require("wibox.widget.textbox")
-local gears = require("gears")
-local awful = require("awful")
+local awful   = require("awful")
+local gears   = require("gears")
+local mpc     = require("widgets/mpc")
 local naughty = require("naughty")
-local timer = require("gears.timer")
-
---TODO remove
-local dbg = require("gears.debug")
+local textbox = require("wibox.widget.textbox")
+local timer   = require("gears.timer")
+local wibox   = require("wibox")
 
 local widget = {}
 widget._textbox = textbox()
 widget._currentsong = {}
 
+widget.scroll = wibox.widget {
+    layout = wibox.container.scroll.horizontal,
+    max_size = 200,
+    extra_space = 10,
+    step_function = wibox.container.scroll.step_functions.linear_increase,
+    speed = 20,
+    {
+        widget = widget._textbox,
+    }
+}
+
 function widget:update_widget()
     local text = ""
     local artist = self._currentsong.artist
     local title = self._currentsong.title
     local file = self._currentsong.file
-    text = text .. tostring(artist or "") .. " - " .. tostring(title or "")
     if not artist then
         text = string.format("%s", title or file )
     else
@@ -40,16 +48,29 @@ function widget:get_info(callback)
     self._connection:send("status", function(_, s) status = s end)
 
     local song = nil
-    self._connection:send("currentsong", function(_, s) song = s end)
 
-    self._connection:send("ping", function()
+    self._connection:send("currentsong", function(_, s)
+        song = s
+        self._connection:albumart(song.file, function(_, art)
+            local info = {}
+            if art and art.binary then
+                info.icon = '/tmp/test.jpg'
+                local f = io.open(info.icon, 'w')
+                f:write(art.binary)
+                f:close()
+            end
 
-        local info = {}
-        info.title = status.state .. " " .. status.song .. "/" .. status.playlistlength .. " " .. song_duration(status.elapsed, status.duration)
-        info.text = tostring(song.artist or "") .. " - " .. tostring(song.title or "") .. "\n"
-            .. tostring(song.album or "")
-        callback(info)
-        return false
+            info.title = status.state .. " " .. status.song .. "/" .. status.playlistlength .. " " .. song_duration(status.elapsed, status.duration)
+            if not song.artist then
+                info.text = string.format("%s", song.title or song.file)
+            else
+                info.text = string.format("%s - %s", song.artist, song.title)
+            end
+            if song.album then
+                info.text = info.text .. "\n" .. tostring(song.album or "")
+            end
+            callback(info)
+        end)
     end)
 end
 
@@ -58,29 +79,38 @@ function widget:popup_show()
         if self._notification then return end
         self._notification = naughty.notify(
             { title = table.title
-            -- , icon = img
+            , icon = table.icon or beautiful.mpd_default_album
+            , icon_size = 64
             , text = table.text
             , timeout = 0
-            , destroy = function() self._timer:stop() end
+            , destroy = function() self._timer:stop(); self._notification = nil end
             })
         self._timer:start()
     end)
 end
 
 function widget:popup_hide(delay)
+    local function destroy()
+        if self._hover then return end
+        if not self._notification then return end
+        naughty.destroy(self._notification)
+        self._notification = nil
+    end
+
+    if not delay then
+        destroy()
+        return
+    end
+
     if self._hide_timer and self._hide_timer.started then
+        self._hide_timer.timeout = delay
         self._hide_timer:again()
     else
         self._hide_timer = timer(
             { timeout = delay
             , autostart = true
             , single_shot = true
-            , callback = function()
-                if self._hover then return end
-                if not self._notification then return end
-                naughty.destroy(self._notification)
-                self._notification = nil
-                end
+            , callback = destroy
             })
     end
 end
@@ -94,12 +124,12 @@ end
 
 function widget:popup_oneshot(timeout)
     if self._notification then
-        self:popup_update()
-        self:popup_hide(5)
+        self:popup_hide()
+        self:popup_show()
     else
         self:popup_show()
-        self:popup_hide(5)
     end
+    self:popup_hide(5)
 end
 
 function widget:error_handler(err)
@@ -131,13 +161,13 @@ function widget:run()
     self._timer:connect_signal("timeout", function() self:popup_update() end)
 
     self._hover = false;
-    self._textbox:connect_signal("mouse::enter", function() self._hover = true;  self:popup_show()  end)
-    self._textbox:connect_signal("mouse::leave", function() self._hover = false; self:popup_hide(2) end)
+    self.scroll:connect_signal("mouse::enter", function() self._hover = true;  self:popup_show()  end)
+    self.scroll:connect_signal("mouse::leave", function() self._hover = false; self:popup_hide(2) end)
 end
 
 widget:run()
 
-widget._textbox:buttons(gears.table.join(
+widget.scroll:buttons(gears.table.join(
   awful.button({}, 1, function() widget._connection:toggle_play() end)
 , awful.button({}, 4, function() widget._connection:change_volume(5) end)
 , awful.button({}, 5, function() widget._connection:change_volume(-5) end))
@@ -153,4 +183,11 @@ globalkeys = gears.table.join(globalkeys,
     awful.key({ modkey }, ".", function() widget._connection:send("next") end,
               { description = "next track", group = "mpd" })
 )
-return widget._textbox
+return {
+    layout = wibox.layout.align.horizontal,
+    forced_width = 200,
+    expand = "outside",
+    nil,
+    widget.scroll,
+    nil,
+}