X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/c7616e3ded2a894b560c9b499d0e142e579bc658..013654cd1af4bb69f31c1c641cdb24bd8b7c58df:/widget/pulsebar.lua diff --git a/widget/pulsebar.lua b/widget/pulsebar.lua index f97b2d1..317468f 100644 --- a/widget/pulsebar.lua +++ b/widget/pulsebar.lua @@ -1,23 +1,21 @@ --[[ Licensed under GNU General Public License v2 - * (c) 2013, Luke Bonham + * (c) 2013, Luca CPZ * (c) 2013, Rman --]] -local helpers = require("lain.helpers") -local awful = require("awful") -local naughty = require("naughty") -local wibox = require("wibox") -local math = { modf = math.modf } -local string = { format = string.format, - match = string.match, - gmatch = string.gmatch, - rep = string.rep } -local type, tonumber = type, tonumber - --- Pulseaudio volume bar +local helpers = require("lain.helpers") +local awful = require("awful") +local naughty = require("naughty") +local wibox = require("wibox") +local math = math +local string = string +local type = type +local tonumber = tonumber + +-- PulseAudio volume bar -- lain.widget.pulsebar local function factory(args) @@ -30,38 +28,38 @@ local function factory(args) _current_level = 0, _mute = "no", + device = "N/A" } local args = args or {} local timeout = args.timeout or 5 local settings = args.settings or function() end local width = args.width or 63 - local height = args.heigth or 1 + local height = args.height or 1 + local margins = args.margins or 1 + local paddings = args.paddings or 1 local ticks = args.ticks or false local ticks_size = args.ticks_size or 7 - local scallback = args.scallback - pulsebar.cmd = args.cmd or "pacmd list-sinks | sed -n -e '0,/*/d' -e '/base volume/d' -e '/volume:/p' -e '/muted:/p' -e '/device\\.string/p'" - pulsebar.sink = args.sink or 0 -- Legacy, does nothing pulsebar.colors = args.colors or pulsebar.colors pulsebar.followtag = args.followtag or false pulsebar.notification_preset = args.notification_preset - pulsebar.device = "N/A" pulsebar.devicetype = args.devicetype or "sink" pulsebar.cmd = args.cmd or "pacmd list-" .. pulsebar.devicetype .. "s | sed -n -e '/*/,$!d' -e '/index/p' -e '/base volume/d' -e '/volume:/p' -e '/muted:/p' -e '/device\\.string/p'" if not pulsebar.notification_preset then - pulsebar.notification_preset = {} - pulsebar.notification_preset.font = "Monospace 10" + pulsebar.notification_preset = { + font = "Monospace 10" + } end pulsebar.bar = wibox.widget { - forced_height = height, - forced_width = width, color = pulsebar.colors.unmute, background_color = pulsebar.colors.background, - margins = 1, - paddings = 1, + forced_height = height, + forced_width = width, + margins = margins, + paddings = paddings, ticks = ticks, ticks_size = ticks_size, widget = wibox.widget.progressbar, @@ -70,14 +68,12 @@ local function factory(args) pulsebar.tooltip = awful.tooltip({ objects = { pulsebar.bar } }) function pulsebar.update(callback) - if scallback then pulsebar.cmd = scallback() end - - helpers.async({ awful.util.shell, "-c", pulsebar.cmd }, function(s) + helpers.async({ awful.util.shell, "-c", type(pulsebar.cmd) == "string" and pulsebar.cmd or pulsebar.cmd() }, + function(s) volume_now = { - index = string.match(s, "index: (%S+)") or "N/A", + index = string.match(s, "index: (%S+)") or "N/A", device = string.match(s, "device.string = \"(%S+)\"") or "N/A", - sink = device, -- legacy API - muted = string.match(s, "muted: (%S+)") or "N/A" + muted = string.match(s, "muted: (%S+)") or "N/A" } pulsebar.device = volume_now.index @@ -102,11 +98,11 @@ local function factory(args) pulsebar.bar:set_value(pulsebar._current_level / 100) if pulsebar._current_level == 0 or mute == "yes" then pulsebar._mute = mute - pulsebar.tooltip:set_text ("[Muted]") + pulsebar.tooltip:set_text ("[muted]") pulsebar.bar.color = pulsebar.colors.mute else pulsebar._mute = "no" - pulsebar.tooltip:set_text(string.format("%s: %s", pulsebar.device, volu)) + pulsebar.tooltip:set_text(string.format("%s %s: %s", pulsebar.devicetype, pulsebar.device, volu)) pulsebar.bar.color = pulsebar.colors.unmute end @@ -121,15 +117,29 @@ local function factory(args) pulsebar.update(function() local preset = pulsebar.notification_preset - preset.title = string.format("Sink %s - %s%%", pulsebar.device, pulsebar._current_level) + preset.title = string.format("%s %s - %s%%", pulsebar.devicetype, pulsebar.device, pulsebar._current_level) if pulsebar._mute == "yes" then - preset.title = preset.title .. " Muted" + preset.title = preset.title .. " muted" + end + + -- tot is the maximum number of ticks to display in the notification + -- fallback: default horizontal wibox height + local wib, tot = awful.screen.focused().mywibox, 20 + + -- if we can grab mywibox, tot is defined as its height if + -- horizontal, or width otherwise + if wib then + if wib.position == "left" or wib.position == "right" then + tot = wib.width + else + tot = wib.height + end end - int = math.modf((pulsebar._current_level / 100) * awful.screen.focused().mywibox.height) + int = math.modf((pulsebar._current_level / 100) * tot) preset.text = string.format("[%s%s]", string.rep("|", int), - string.rep(" ", awful.screen.focused().mywibox.height - int)) + string.rep(" ", tot - int)) if pulsebar.followtag then preset.screen = awful.screen.focused() end