From 0daa2ca83d9bd8c225ce0ec709531765e79308f6 Mon Sep 17 00:00:00 2001 From: streetturtle Date: Sun, 1 Nov 2020 14:03:06 -0500 Subject: [experiments] volume widget improvements --- experiments/volume/arc-widget.lua | 37 +++++++++ experiments/volume/icon-and-text-widget.lua | 46 +++++++++++ .../volume/icons/audio-volume-high-symbolic.svg | 88 ++++++++++++++++++++++ .../volume/icons/audio-volume-low-symbolic.svg | 88 ++++++++++++++++++++++ .../volume/icons/audio-volume-medium-symbolic.svg | 88 ++++++++++++++++++++++ .../volume/icons/audio-volume-muted-symbolic.svg | 88 ++++++++++++++++++++++ experiments/volume/volume.lua | 59 +++++++-------- 7 files changed, 464 insertions(+), 30 deletions(-) create mode 100644 experiments/volume/arc-widget.lua create mode 100644 experiments/volume/icon-and-text-widget.lua create mode 100644 experiments/volume/icons/audio-volume-high-symbolic.svg create mode 100644 experiments/volume/icons/audio-volume-low-symbolic.svg create mode 100644 experiments/volume/icons/audio-volume-medium-symbolic.svg create mode 100644 experiments/volume/icons/audio-volume-muted-symbolic.svg (limited to 'experiments') diff --git a/experiments/volume/arc-widget.lua b/experiments/volume/arc-widget.lua new file mode 100644 index 0000000..fb56518 --- /dev/null +++ b/experiments/volume/arc-widget.lua @@ -0,0 +1,37 @@ +local wibox = require("wibox") +local beautiful = require('beautiful') + +local widget = {} + +function widget.get_widget() + + return wibox.widget { + { + id = "icon", + image = '/usr/share/icons/Arc/status/symbolic/audio-volume-muted-symbolic.svg', + resize = true, + widget = wibox.widget.imagebox, + }, + max_value = 100, + thickness = 2, + start_angle = 4.71238898, -- 2pi*3/4 + forced_height = 18, + forced_width = 18, + bg = '#ffffff11', + paddings = 2, + widget = wibox.container.arcchart, + set_volume_level = function(self, new_value) + self.value = new_value + end, + mute = function(self) + self.colors = {'#BF616A'} + end, + unmute = function(self) + self.colors = {beautiful.fg_color} + end + } + +end + + +return widget \ No newline at end of file diff --git a/experiments/volume/icon-and-text-widget.lua b/experiments/volume/icon-and-text-widget.lua new file mode 100644 index 0000000..929d32d --- /dev/null +++ b/experiments/volume/icon-and-text-widget.lua @@ -0,0 +1,46 @@ +local wibox = require("wibox") + +local widget = {} + +local WIDGET_DIR = os.getenv("HOME") .. '/.config/awesome/awesome-wm-widgets/experiments/volume/icons/' + +function widget.get_widget() + + return wibox.widget { + { + { + id = "icon", + image = '/usr/share/icons/Arc/status/symbolic/audio-volume-muted-symbolic.svg', + resize = false, + widget = wibox.widget.imagebox, + }, + valign = 'center', + layout = wibox.container.place + }, + { + id = 'txt', + widget = wibox.widget.textbox + }, + layout = wibox.layout.fixed.horizontal, + set_volume_level = function(self, new_value) + self:get_children_by_id('txt')[1]:set_text(new_value) + local new_value_num = tonumber(new_value) + local volume_icon_name = '' + if (new_value_num >= 0 and new_value_num < 33) then + volume_icon_name="audio-volume-low-symbolic" + elseif (new_value_num < 66) then + volume_icon_name="audio-volume-medium-symbolic" + else + volume_icon_name="audio-volume-high-symbolic" + end + self:get_children_by_id('icon')[1]:set_image(WIDGET_DIR .. volume_icon_name .. '.svg') + end, + mute = function(self) self:get_children_by_id('icon')[1]:set_image(WIDGET_DIR .. 'audio-volume-muted-symbolic.svg') end, + unmute = function() end, + + } + +end + + +return widget \ No newline at end of file diff --git a/experiments/volume/icons/audio-volume-high-symbolic.svg b/experiments/volume/icons/audio-volume-high-symbolic.svg new file mode 100644 index 0000000..985c107 --- /dev/null +++ b/experiments/volume/icons/audio-volume-high-symbolic.svg @@ -0,0 +1,88 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/experiments/volume/icons/audio-volume-low-symbolic.svg b/experiments/volume/icons/audio-volume-low-symbolic.svg new file mode 100644 index 0000000..7eb4531 --- /dev/null +++ b/experiments/volume/icons/audio-volume-low-symbolic.svg @@ -0,0 +1,88 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/experiments/volume/icons/audio-volume-medium-symbolic.svg b/experiments/volume/icons/audio-volume-medium-symbolic.svg new file mode 100644 index 0000000..11e44fe --- /dev/null +++ b/experiments/volume/icons/audio-volume-medium-symbolic.svg @@ -0,0 +1,88 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/experiments/volume/icons/audio-volume-muted-symbolic.svg b/experiments/volume/icons/audio-volume-muted-symbolic.svg new file mode 100644 index 0000000..e577d05 --- /dev/null +++ b/experiments/volume/icons/audio-volume-muted-symbolic.svg @@ -0,0 +1,88 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/experiments/volume/volume.lua b/experiments/volume/volume.lua index beaa119..ae7605e 100644 --- a/experiments/volume/volume.lua +++ b/experiments/volume/volume.lua @@ -12,39 +12,22 @@ local wibox = require("wibox") local spawn = require("awful.spawn") local gears = require("gears") local beautiful = require("beautiful") +local watch = require("awful.widget.watch") local utils = require("awesome-wm-widgets.experiments.volume.utils") +local arc_widget = require("awesome-wm-widgets.experiments.volume.arc-widget") +local icon_and_text_widget = require("awesome-wm-widgets.experiments.volume.icon-and-text-widget") -local HOME_DIR = os.getenv("HOME") -local WIDGET_DIR = HOME_DIR .. '/.config/awesome/awesome-wm-widgets/experiments/volume' local LIST_DEVICES_CMD = [[sh -c "pacmd list-sinks; pacmd list-sources"]] +local GET_VOLUME_CMD = 'amixer -D pulse sget Master' +local INC_VOLUME_CMD = 'amixer -q -D pulse sset Master 5%+' +local DEC_VOLUME_CMD = 'amixer -q -D pulse sset Master 5%-' +local TOG_VOLUME_CMD = 'amixer -q -D pulse sset Master toggle' -local rows = { layout = wibox.layout.fixed.vertical } -local volume_widget = wibox.widget { - { - { - id = "icon", - image = WIDGET_DIR .. '/volume-2.svg', - widget = wibox.widget.imagebox - }, - id = "margin", - margins = 4, - layout = wibox.container.margin - }, - { - id = "txt", - widget = wibox.widget.textbox - }, - layout = wibox.layout.fixed.horizontal, - set_text = function(self, new_value) - self.txt.text = new_value - end, - set_icon = function(self, new_value) - self.margin.icon.image = new_value - end -} +local volume_widget = wibox.widget{} +local rows = { layout = wibox.layout.fixed.vertical } local popup = awful.popup{ bg = beautiful.bg_normal, @@ -82,7 +65,6 @@ local function build_rows(devices, on_checkbox_click, device_type) } checkbox:connect_signal("button::press", function(c) - print(string.format([[sh -c 'pacmd set-default-%s "%s"']], device_type, device.name)) spawn.easy_async(string.format([[sh -c 'pacmd set-default-%s "%s"']], device_type, device.name), function() on_checkbox_click() end) @@ -147,25 +129,42 @@ local function rebuild_popup() popup:setup(rows) end) - end local function worker(args) + volume_widget = arc_widget.get_widget() + -- volume_widget = icon_and_text_widget.get_widget() + volume_widget:buttons( awful.util.table.join( - awful.button({}, 1, function() + awful.button({}, 3, function() if popup.visible then popup.visible = not popup.visible else rebuild_popup() popup:move_next_to(mouse.current_widget_geometry) end - end) + end), + awful.button({}, 4, function() awful.spawn(INC_VOLUME_CMD, false) end), + awful.button({}, 5, function() awful.spawn(DEC_VOLUME_CMD, false) end), + awful.button({}, 1, function() awful.spawn(TOG_VOLUME_CMD, false) end) ) ) + local function update_graphic(widget, stdout) + local mute = string.match(stdout, "%[(o%D%D?)%]") -- \[(o\D\D?)\] - [on] or [off] + if mute == 'off' then volume_widget:mute() + elseif mute == 'on' then volume_widget:unmute() + end + local volume = string.match(stdout, "(%d?%d?%d)%%") -- (\d?\d?\d)\%) + volume = string.format("% 3d", volume) + widget:set_volume_level(volume) + end + + watch(GET_VOLUME_CMD, 1, update_graphic, volume_widget) + return volume_widget end -- cgit v1.2.3