summaryrefslogtreecommitdiff
path: root/volumearc-widget
diff options
context:
space:
mode:
Diffstat (limited to 'volumearc-widget')
-rw-r--r--volumearc-widget/volumearc.lua63
1 files changed, 55 insertions, 8 deletions
diff --git a/volumearc-widget/volumearc.lua b/volumearc-widget/volumearc.lua
index 91ae763..86f3a14 100644
--- a/volumearc-widget/volumearc.lua
+++ b/volumearc-widget/volumearc.lua
@@ -13,6 +13,7 @@ local beautiful = require("beautiful")
local spawn = require("awful.spawn")
local watch = require("awful.widget.watch")
local wibox = require("wibox")
+local gears = require("gears")
local GET_VOLUME_CMD = 'amixer -D pulse sget Master'
local INC_VOLUME_CMD = 'amixer -q -D pulse sset Master 5%+'
@@ -23,16 +24,30 @@ local PATH_TO_ICON = "/usr/share/icons/Arc/status/symbolic/audio-volume-muted-sy
local widget = {}
-local function worker(args)
-
- local args = args or {}
+local popup = awful.popup{
+ ontop = true,
+ visible = false,
+ shape = gears.shape.rounded_rect,
+ border_width = 1,
+ border_color = beautiful.bg_focus,
+ maximum_width = 400,
+ offset = { y = 5 },
+ widget = {}
+}
+local rows = {
+ { widget = wibox.widget.textbox },
+ layout = wibox.layout.fixed.vertical,
+}
+local function worker(user_args)
+
+ local args = user_args or {}
local main_color = args.main_color or beautiful.fg_color
local bg_color = args.bg_color or '#ffffff11'
local mute_color = args.mute_color or beautiful.fg_urgent
local path_to_icon = args.path_to_icon or PATH_TO_ICON
local thickness = args.thickness or 2
- local height = args.height or 18
+ local margins = args.height or 18
local timeout = args.timeout or 1
local get_volume_cmd = args.get_volume_cmd or GET_VOLUME_CMD
@@ -52,14 +67,14 @@ local function worker(args)
max_value = 1,
thickness = thickness,
start_angle = 4.71238898, -- 2pi*3/4
- forced_height = height,
- forced_width = height,
+ forced_height = margins,
+ forced_width = margins,
bg = bg_color,
paddings = 2,
widget = wibox.container.arcchart
}
- local update_graphic = function(widget, stdout, _, _, _)
+ local update_graphic = function(_, stdout, _, _, _)
local mute = string.match(stdout, "%[(o%D%D?)%]") -- \[(o\D\D?)\] - [on] or [off]
local volume = string.match(stdout, "(%d?%d?%d)%%") -- (\d?\d?\d)\%)
volume = tonumber(string.format("% 3d", volume))
@@ -70,7 +85,7 @@ local function worker(args)
or { main_color }
end
- local button_press = args.button_press or function(_, _, _, button)
+ local button_press = args.button_press or function(_, _, _, button)
if (button == 4) then awful.spawn(inc_volume_cmd, false)
elseif (button == 5) then awful.spawn(dec_volume_cmd, false)
elseif (button == 1) then awful.spawn(tog_volume_cmd, false)
@@ -82,6 +97,38 @@ local function worker(args)
end
volumearc:connect_signal("button::press", button_press)
+ local rebuild_widget = function(stdout, stderr)
+ for i = 0, #rows do rows[i]=nil end
+
+ for line in stdout:gmatch("[^\r\n]+") do
+
+ local row = wibox.widget {
+ text = line,
+ widget = wibox.widget.textbox
+ }
+ table.insert(rows, row)
+ end
+
+ popup:setup(rows)
+ end
+
+ volumearc:buttons(
+ awful.util.table.join(
+ awful.button({}, 3, function()
+ if popup.visible then
+ popup.visible = not popup.visible
+ else
+ spawn.easy_async([[bash -c "cat /proc/asound/cards"]], function(stdout, stderr)
+ rebuild_widget(stdout, stderr)
+ popup:move_next_to(mouse.current_widget_geometry)
+ end)
+ end
+ end)
+ )
+ )
+
+
+
watch(get_volume_cmd, timeout, update_graphic, volumearc)
return volumearc