ultimate volume widget improvements
This commit is contained in:
parent
c319203fc9
commit
baa9177b70
|
@ -1,4 +1,75 @@
|
|||
# Volume widget
|
||||
|
||||
Righ-click opens a popup where you can choose a sink/source:
|
||||
![sink-sources](./screenshots/volume-sink-sources.png)
|
||||
Volume widget based on [amixer](https://linux.die.net/man/1/amixer) (is used for controlling the audio volume) and [pacmd](https://linux.die.net/man/1/pacmd) (is used for selecting a sink/source). Also, the widget provides an easy way to customize how it looks, following types are supported out-of-the-box:
|
||||
|
||||
![types](./screenshots/variations.png)
|
||||
|
||||
From left to right: `horizontal_bar`, `vertical_bar`, `icon`, `icon_and_text`, `arc`
|
||||
|
||||
Right-click on the widget opens a popup where you can choose a sink/source:
|
||||
![sink-sources](./screenshots/volume-sink-sources.png)
|
||||
|
||||
## Customization
|
||||
|
||||
It is possible to customize the widget by providing a table with all or some of the following config parameters:
|
||||
|
||||
### Generic parameter
|
||||
|
||||
| Name | Default | Description |
|
||||
|---|---|---|
|
||||
| `type`| `icon_and_text`| Widget type, one of `horizontal_bar`, `vertical_bar`, `icon`, `icon_and_text`, `arc` |
|
||||
|
||||
### `icon` parameters
|
||||
|
||||
| Name | Default | Description |
|
||||
|---|---|---|
|
||||
| `icon_dir`| `./icons`| Path to the folder with icons |
|
||||
|
||||
_Note:_ if you are changing icons, the folder should contain following .svg images:
|
||||
- audio-volume-high-symbolic
|
||||
- audio-volume-medium-symbolic
|
||||
- audio-volume-low-symbolic
|
||||
- audio-volume-muted-symbolic
|
||||
|
||||
### `icon_and_text` parameters
|
||||
|
||||
| Name | Default | Description |
|
||||
|---|---|---|
|
||||
| `icon_dir`| `./icons`| Path to the folder with icons |
|
||||
| `font` | `beautiful.font` | Font name and size, like `Play 12` |
|
||||
|
||||
### `arc` parameters
|
||||
|
||||
| Name | Default | Description |
|
||||
|---|---|---|
|
||||
| `thickness` | 2 | Thickness of the arc |
|
||||
| `main_color` | `beautiful.fg_color` | Color of the arc |
|
||||
| `bg_color` | `#ffffff11` | Color of the arc's background |
|
||||
| `mute_color` | `beautiful.fg_urgent` | Color of the arc when mute |
|
||||
| `size` | 18 | Size of the widget |
|
||||
|
||||
### `horizontal_bar` parameters
|
||||
|
||||
| Name | Default | Description |
|
||||
|---|---|---|
|
||||
| `main_color` | `beautiful.fg_normal` | Color of the bar |
|
||||
| `mute_color` | `beautiful.fg_urgent` | Color of the bar when mute |
|
||||
| `bg_color` | `'#ffffff11'` | Color of the bar's background |
|
||||
| `width` | `50` | The bar width |
|
||||
| `margins` | `10` | Top and bottom margins (if your wibar is 22 px high, bar will be 2 px = 22 - 2*10) |
|
||||
| `shape` | `'bar'` | [gears.shape](https://awesomewm.org/doc/api/libraries/gears.shape.html), could be `octogon`, `hexagon`, `powerline`, etc |
|
||||
| `with_icon` | `true` | Show volume icon|
|
||||
|
||||
_Note:_ I didn't figure out how does the `forced_height` property of progressbar widget works (maybe it doesn't work at all), thus there is a workaround with margins.
|
||||
|
||||
### `vertical_bar` parameters
|
||||
|
||||
| Name | Default | Description |
|
||||
|---|---|---|
|
||||
| `main_color` | `beautiful.fg_normal` | Color of the bar |
|
||||
| `mute_color` | `beautiful.fg_urgent` | Color of the bar when mute |
|
||||
| `bg_color` | `'#ffffff11'` | Color of the bar's background |
|
||||
| `width` | `10` | The bar width |
|
||||
| `margins` | `20` | Top and bottom margins (if your wibar is 22 px high, bar will be 2 px = 22 - 2*10) |
|
||||
| `shape` | `'bar'` | [gears.shape](https://awesomewm.org/doc/api/libraries/gears.shape.html), could be `octogon`, `hexagon`, `powerline`, etc |
|
||||
| `with_icon` | `true` | Show volume icon|
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 8.9 KiB |
|
@ -26,7 +26,9 @@ local TOG_VOLUME_CMD = 'amixer -q -D pulse sset Master toggle'
|
|||
local widget_types = {
|
||||
icon_and_text = require("awesome-wm-widgets.experiments.volume.widgets.icon-and-text-widget"),
|
||||
icon = require("awesome-wm-widgets.experiments.volume.widgets.icon-widget"),
|
||||
arc = require("awesome-wm-widgets.experiments.volume.widgets.arc-widget")
|
||||
arc = require("awesome-wm-widgets.experiments.volume.widgets.arc-widget"),
|
||||
horizontal_bar = require("awesome-wm-widgets.experiments.volume.widgets.horizontal-bar-widget"),
|
||||
vertical_bar = require("awesome-wm-widgets.experiments.volume.widgets.vertical-bar-widget")
|
||||
}
|
||||
|
||||
local volume_widget = wibox.widget{}
|
||||
|
@ -58,14 +60,14 @@ local function build_rows(devices, on_checkbox_click, device_type)
|
|||
for _, device in pairs(devices) do
|
||||
|
||||
local checkbox = wibox.widget {
|
||||
checked = device.is_default,
|
||||
color = beautiful.bg_normal,
|
||||
paddings = 2,
|
||||
shape = gears.shape.circle,
|
||||
checked = device.is_default,
|
||||
color = beautiful.bg_normal,
|
||||
paddings = 2,
|
||||
shape = gears.shape.circle,
|
||||
forced_width = 20,
|
||||
forced_height = 20,
|
||||
check_color = beautiful.fg_urgent,
|
||||
widget = wibox.widget.checkbox
|
||||
widget = wibox.widget.checkbox
|
||||
}
|
||||
|
||||
checkbox:connect_signal("button::press", function()
|
||||
|
@ -163,11 +165,12 @@ local function worker(user_args)
|
|||
local args = user_args or {}
|
||||
|
||||
local widget_type = args.widget_type
|
||||
local refresh_rate = args.refresh_rate or 1
|
||||
|
||||
if widget_types[widget_type] == nil then
|
||||
volume_widget = widget_types['icon_and_text'].get_widget()
|
||||
volume_widget = widget_types['icon_and_text'].get_widget(user_args.icon_and_text_args)
|
||||
else
|
||||
volume_widget = widget_types[widget_type].get_widget()
|
||||
volume_widget = widget_types[widget_type].get_widget(user_args[widget_type .. '_args'])
|
||||
end
|
||||
|
||||
volume_widget:buttons(
|
||||
|
@ -180,23 +183,23 @@ local function worker(user_args)
|
|||
popup:move_next_to(mouse.current_widget_geometry)
|
||||
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)
|
||||
awful.button({}, 4, function() spawn(INC_VOLUME_CMD, false) end),
|
||||
awful.button({}, 5, function() spawn(DEC_VOLUME_CMD, false) end),
|
||||
awful.button({}, 1, function() 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()
|
||||
if mute == 'off' then widget:mute()
|
||||
elseif mute == 'on' then 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)
|
||||
watch(GET_VOLUME_CMD, refresh_rate, update_graphic, volume_widget)
|
||||
|
||||
return volume_widget
|
||||
end
|
||||
|
|
|
@ -5,7 +5,14 @@ local ICON_DIR = os.getenv("HOME") .. '/.config/awesome/awesome-wm-widgets/exper
|
|||
|
||||
local widget = {}
|
||||
|
||||
function widget.get_widget()
|
||||
function widget.get_widget(widgets_args)
|
||||
local args = widgets_args or {}
|
||||
|
||||
local thickness = args.thickness or 2
|
||||
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 size = args.size or 18
|
||||
|
||||
return wibox.widget {
|
||||
{
|
||||
|
@ -15,21 +22,21 @@ function widget.get_widget()
|
|||
widget = wibox.widget.imagebox,
|
||||
},
|
||||
max_value = 100,
|
||||
thickness = 2,
|
||||
thickness = thickness,
|
||||
start_angle = 4.71238898, -- 2pi*3/4
|
||||
forced_height = 18,
|
||||
forced_width = 18,
|
||||
bg = '#ffffff11',
|
||||
forced_height = size,
|
||||
forced_width = size,
|
||||
bg = bg_color,
|
||||
paddings = 2,
|
||||
widget = wibox.container.arcchart,
|
||||
set_volume_level = function(self, new_value)
|
||||
self.value = new_value
|
||||
end,
|
||||
mute = function(self)
|
||||
self.colors = {'#BF616A'}
|
||||
self.colors = { mute_color }
|
||||
end,
|
||||
unmute = function(self)
|
||||
self.colors = {beautiful.fg_color}
|
||||
self.colors = { main_color }
|
||||
end
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,58 @@
|
|||
local wibox = require("wibox")
|
||||
local beautiful = require('beautiful')
|
||||
local gears = require("gears")
|
||||
|
||||
local ICON_DIR = os.getenv("HOME") .. '/.config/awesome/awesome-wm-widgets/experiments/volume/icons/'
|
||||
|
||||
local widget = {}
|
||||
|
||||
function widget.get_widget(widgets_args)
|
||||
local args = widgets_args or {}
|
||||
|
||||
local main_color = args.main_color or beautiful.fg_normal
|
||||
local mute_color = args.mute_color or beautiful.fg_urgent
|
||||
local bg_color = args.bg_color or '#ffffff11'
|
||||
local width = args.width or 50
|
||||
local margins = args.height or 10
|
||||
local shape = args.shape or 'bar'
|
||||
local with_icon = args.with_icon == true and true or false
|
||||
|
||||
local bar = wibox.widget {
|
||||
{
|
||||
{
|
||||
id = "icon",
|
||||
image = ICON_DIR .. 'audio-volume-high-symbolic.svg',
|
||||
resize = false,
|
||||
widget = wibox.widget.imagebox,
|
||||
},
|
||||
valign = 'center',
|
||||
visible = with_icon,
|
||||
layout = wibox.container.place,
|
||||
},
|
||||
{
|
||||
id = 'bar',
|
||||
max_value = 100,
|
||||
forced_width = width,
|
||||
color = main_color,
|
||||
margins = { top = margins, bottom = margins },
|
||||
background_color = bg_color,
|
||||
shape = gears.shape[shape],
|
||||
widget = wibox.widget.progressbar,
|
||||
},
|
||||
spacing = 4,
|
||||
layout = wibox.layout.fixed.horizontal,
|
||||
set_volume_level = function(self, new_value)
|
||||
self:get_children_by_id('bar')[1]:set_value(tonumber(new_value))
|
||||
end,
|
||||
mute = function(self)
|
||||
self:get_children_by_id('bar')[1]:set_color(mute_color)
|
||||
end,
|
||||
unmute = function(self)
|
||||
self:get_children_by_id('bar')[1]:set_color(main_color)
|
||||
end
|
||||
}
|
||||
|
||||
return bar
|
||||
end
|
||||
|
||||
return widget
|
|
@ -1,10 +1,15 @@
|
|||
local wibox = require("wibox")
|
||||
local beautiful = require('beautiful')
|
||||
|
||||
local widget = {}
|
||||
|
||||
local WIDGET_DIR = os.getenv("HOME") .. '/.config/awesome/awesome-wm-widgets/experiments/volume/icons/'
|
||||
local ICON_DIR = os.getenv("HOME") .. '/.config/awesome/awesome-wm-widgets/experiments/volume/icons/'
|
||||
|
||||
function widget.get_widget()
|
||||
function widget.get_widget(widgets_args)
|
||||
local args = widgets_args or {}
|
||||
|
||||
local font = args.font or beautiful.font
|
||||
local icon_dir = args.icon_dir or ICON_DIR
|
||||
|
||||
return wibox.widget {
|
||||
{
|
||||
|
@ -18,15 +23,15 @@ function widget.get_widget()
|
|||
},
|
||||
{
|
||||
id = 'txt',
|
||||
font = font,
|
||||
widget = wibox.widget.textbox
|
||||
},
|
||||
layout = wibox.layout.fixed.horizontal,
|
||||
is_muted = true,
|
||||
set_volume_level = function(self, new_value)
|
||||
self:get_children_by_id('txt')[1]:set_text(new_value)
|
||||
local volume_icon_name
|
||||
if self.is_muted then
|
||||
volume_icon_name = 'audio-volume-muted-symbolic.svg'
|
||||
volume_icon_name = 'audio-volume-muted-symbolic'
|
||||
else
|
||||
local new_value_num = tonumber(new_value)
|
||||
if (new_value_num >= 0 and new_value_num < 33) then
|
||||
|
@ -37,16 +42,16 @@ function widget.get_widget()
|
|||
volume_icon_name="audio-volume-high-symbolic"
|
||||
end
|
||||
end
|
||||
self:get_children_by_id('icon')[1]:set_image(WIDGET_DIR .. volume_icon_name .. '.svg')
|
||||
self:get_children_by_id('icon')[1]:set_image(icon_dir .. volume_icon_name .. '.svg')
|
||||
end,
|
||||
mute = function(self)
|
||||
print("called")
|
||||
self.is_muted = true
|
||||
self:get_children_by_id('icon')[1]:set_image(WIDGET_DIR .. 'audio-volume-muted-symbolic.svg')
|
||||
self:get_children_by_id('icon')[1]:set_image(icon_dir .. 'audio-volume-muted-symbolic.svg')
|
||||
end,
|
||||
unmute = function(self)
|
||||
self.is_muted = false
|
||||
end,
|
||||
|
||||
end
|
||||
}
|
||||
|
||||
end
|
||||
|
|
|
@ -2,9 +2,12 @@ local wibox = require("wibox")
|
|||
|
||||
local widget = {}
|
||||
|
||||
local WIDGET_DIR = os.getenv("HOME") .. '/.config/awesome/awesome-wm-widgets/experiments/volume/icons/'
|
||||
local ICON_DIR = os.getenv("HOME") .. '/.config/awesome/awesome-wm-widgets/experiments/volume/icons/'
|
||||
|
||||
function widget.get_widget()
|
||||
function widget.get_widget(widgets_args)
|
||||
local args = widgets_args or {}
|
||||
|
||||
local icon_dir = args.icon_dir or ICON_DIR
|
||||
|
||||
return wibox.widget {
|
||||
{
|
||||
|
@ -17,7 +20,7 @@ function widget.get_widget()
|
|||
set_volume_level = function(self, new_value)
|
||||
local volume_icon_name
|
||||
if self.is_muted then
|
||||
volume_icon_name = 'audio-volume-muted-symbolic.svg'
|
||||
volume_icon_name = 'audio-volume-muted-symbolic'
|
||||
else
|
||||
local new_value_num = tonumber(new_value)
|
||||
if (new_value_num >= 0 and new_value_num < 33) then
|
||||
|
@ -28,11 +31,11 @@ function widget.get_widget()
|
|||
volume_icon_name="audio-volume-high-symbolic"
|
||||
end
|
||||
end
|
||||
self:get_children_by_id('icon')[1]:set_image(WIDGET_DIR .. volume_icon_name .. '.svg')
|
||||
self:get_children_by_id('icon')[1]:set_image(icon_dir .. volume_icon_name .. '.svg')
|
||||
end,
|
||||
mute = function(self)
|
||||
self.is_muted = true
|
||||
self:get_children_by_id('icon')[1]:set_image(WIDGET_DIR .. 'audio-volume-muted-symbolic.svg')
|
||||
self:get_children_by_id('icon')[1]:set_image(icon_dir .. 'audio-volume-muted-symbolic.svg')
|
||||
end,
|
||||
unmute = function(self)
|
||||
self.is_muted = false
|
||||
|
|
|
@ -0,0 +1,64 @@
|
|||
local wibox = require("wibox")
|
||||
local beautiful = require('beautiful')
|
||||
local gears = require("gears")
|
||||
|
||||
local ICON_DIR = os.getenv("HOME") .. '/.config/awesome/awesome-wm-widgets/experiments/volume/icons/'
|
||||
|
||||
local widget = {}
|
||||
|
||||
function widget.get_widget(widgets_args)
|
||||
local args = widgets_args or {}
|
||||
|
||||
local main_color = args.main_color or beautiful.fg_normal
|
||||
local mute_color = args.mute_color or beautiful.fg_urgent
|
||||
local bg_color = args.bg_color or '#ffffff11'
|
||||
local width = args.width or 10
|
||||
local margins = args.height or 2
|
||||
local shape = args.shape or 'bar'
|
||||
local with_icon = args.with_icon == true and true or false
|
||||
|
||||
local bar = wibox.widget {
|
||||
{
|
||||
{
|
||||
id = "icon",
|
||||
image = ICON_DIR .. 'audio-volume-high-symbolic.svg',
|
||||
resize = false,
|
||||
widget = wibox.widget.imagebox,
|
||||
},
|
||||
valign = 'center',
|
||||
visible = with_icon,
|
||||
layout = wibox.container.place,
|
||||
},
|
||||
{
|
||||
{
|
||||
id = 'bar',
|
||||
max_value = 100,
|
||||
forced_width = width,
|
||||
forced_height = 5,
|
||||
margins = { top = margins, bottom = margins },
|
||||
color = main_color,
|
||||
background_color = bg_color,
|
||||
shape = gears.shape[shape],
|
||||
widget = wibox.widget.progressbar,
|
||||
},
|
||||
forced_width = width,
|
||||
direction = 'east',
|
||||
layout = wibox.container.rotate,
|
||||
},
|
||||
spacing = 4,
|
||||
layout = wibox.layout.fixed.horizontal,
|
||||
set_volume_level = function(self, new_value)
|
||||
self:get_children_by_id('bar')[1]:set_value(tonumber(new_value))
|
||||
end,
|
||||
mute = function(self)
|
||||
self:get_children_by_id('bar')[1]:set_color(mute_color)
|
||||
end,
|
||||
unmute = function(self)
|
||||
self:get_children_by_id('bar')[1]:set_color(main_color)
|
||||
end
|
||||
}
|
||||
|
||||
return bar
|
||||
end
|
||||
|
||||
return widget
|
|
@ -1,4 +1,4 @@
|
|||
# MPRIS Widget
|
||||
# MPRIS Widget (In progress)
|
||||
|
||||
Music Player Info widget cy @mgabs
|
||||
|
||||
|
|
|
@ -11,15 +11,16 @@ local spawn = require("awful.spawn")
|
|||
local watch = require("awful.widget.watch")
|
||||
local wibox = require("wibox")
|
||||
local naughty = require("naughty")
|
||||
local gears = require("gears")
|
||||
|
||||
local GET_MPD_CMD =
|
||||
"playerctl -f '{{status}};{{xesam:artist}};{{xesam:title}};{{mpris:artUrl}}' metadata"
|
||||
local GET_MPD_CMD = "playerctl -p %s -f '{{status}};{{xesam:artist}};{{xesam:title}};{{mpris:artUrl}}' metadata"
|
||||
|
||||
local TOGGLE_MPD_CMD = "playerctl play-pause"
|
||||
local PAUSE_MPD_CMD = "playerctl pause"
|
||||
local STOP_MPD_CMD = "playerctl stop"
|
||||
local NEXT_MPD_CMD = "playerctl next"
|
||||
local PREV_MPD_CMD = "playerctl previous"
|
||||
local LIST_PLAYERS_CMD = "playerctl -l"
|
||||
|
||||
local PATH_TO_ICONS = "/usr/share/icons/Arc"
|
||||
local PAUSE_ICON_NAME = PATH_TO_ICONS .. "/actions/24/player_pause.png"
|
||||
|
@ -27,7 +28,104 @@ local PLAY_ICON_NAME = PATH_TO_ICONS .. "/actions/24/player_play.png"
|
|||
local STOP_ICON_NAME = PATH_TO_ICONS .. "/actions/24/player_stop.png"
|
||||
local LIBRARY_ICON_NAME = PATH_TO_ICONS .. "/actions/24/music-library.png"
|
||||
|
||||
local mpdarc_widget = {}
|
||||
local default_player = ''
|
||||
|
||||
local mpris_widget = wibox.widget{
|
||||
{
|
||||
id = 'artist',
|
||||
widget = wibox.widget.textbox
|
||||
},
|
||||
{
|
||||
max_value = 1,
|
||||
value = 0,
|
||||
thickness = 2,
|
||||
start_angle = 4.71238898, -- 2pi*3/4
|
||||
forced_height = 24,
|
||||
forced_width = 24,
|
||||
rounded_edge = true,
|
||||
bg = "#ffffff11",
|
||||
paddings = 0,
|
||||
widget = wibox.container.arcchart
|
||||
},
|
||||
{
|
||||
id = 'title',
|
||||
widget = wibox.widget.textbox
|
||||
},
|
||||
layout = wibox.layout.fixed.horizontal,
|
||||
set_text = function(self, artis, title)
|
||||
self:get_children_by_id('artist')[1]:set_text(artis)
|
||||
self:get_children_by_id('title')[1]:set_text(title)
|
||||
end
|
||||
}
|
||||
|
||||
local rows = { layout = wibox.layout.fixed.vertical }
|
||||
|
||||
local popup = awful.popup{
|
||||
bg = beautiful.bg_normal,
|
||||
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 function rebuild_popup()
|
||||
awful.spawn.easy_async(LIST_PLAYERS_CMD, function(stdout, _, _, _)
|
||||
for player_name in stdout:gmatch("[^\r\n]+") do
|
||||
if player_name ~='' or player_name ~=nil then
|
||||
for i = 0, #rows do rows[i]=nil end
|
||||
|
||||
local checkbox = wibox.widget{
|
||||
{
|
||||
checked = player_name == default_player,
|
||||
color = beautiful.bg_normal,
|
||||
paddings = 2,
|
||||
shape = gears.shape.circle,
|
||||
forced_width = 20,
|
||||
forced_height = 20,
|
||||
check_color = beautiful.fg_urgent,
|
||||
widget = wibox.widget.checkbox
|
||||
},
|
||||
valign = 'center',
|
||||
layout = wibox.container.place,
|
||||
}
|
||||
|
||||
checkbox:connect_signal("button::press", function(c)
|
||||
default_player = player_name
|
||||
rebuild_popup()
|
||||
end)
|
||||
|
||||
table.insert(rows, wibox.widget {
|
||||
{
|
||||
{
|
||||
checkbox,
|
||||
{
|
||||
{
|
||||
text = player_name,
|
||||
align = 'left',
|
||||
widget = wibox.widget.textbox
|
||||
},
|
||||
left = 10,
|
||||
layout = wibox.container.margin
|
||||
},
|
||||
spacing = 8,
|
||||
layout = wibox.layout.align.horizontal
|
||||
},
|
||||
margins = 4,
|
||||
layout = wibox.container.margin
|
||||
},
|
||||
bg = beautiful.bg_normal,
|
||||
widget = wibox.container.background
|
||||
})
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
||||
popup:setup(rows)
|
||||
end
|
||||
|
||||
local function worker()
|
||||
|
||||
|
@ -55,8 +153,7 @@ local function worker()
|
|||
widget = wibox.container.arcchart
|
||||
}
|
||||
|
||||
local mpdarc_icon_widget = wibox.container.mirror(mpdarc,
|
||||
{horizontal = true})
|
||||
local mpdarc_icon_widget = wibox.container.mirror(mpdarc, {horizontal = true})
|
||||
local mpdarc_current_song_widget = wibox.widget {
|
||||
id = 'current_song',
|
||||
widget = wibox.widget.textbox,
|
||||
|
@ -85,11 +182,13 @@ local function worker()
|
|||
icon.image = PLAY_ICON_NAME
|
||||
widget.colors = {beautiful.widget_main_color}
|
||||
mpdarc_current_song_widget.markup = current_song
|
||||
widget:set_text(artist, current_song)
|
||||
elseif mpdstatus == "Paused" then
|
||||
mpdarc_icon_widget.visible = true
|
||||
icon.image = PAUSE_ICON_NAME
|
||||
widget.colors = {beautiful.widget_main_color}
|
||||
mpdarc_current_song_widget.markup = current_song
|
||||
widget.set_text(artist, current_song)
|
||||
elseif mpdstatus == "Stopped" then
|
||||
mpdarc_icon_widget.visible = true
|
||||
icon.image = STOP_ICON_NAME
|
||||
|
@ -115,12 +214,29 @@ local function worker()
|
|||
awful.spawn(PREV_MPD_CMD, false) -- scroll down
|
||||
end
|
||||
|
||||
spawn.easy_async(GET_MPD_CMD,
|
||||
function(stdout, stderr, exitreason, exitcode)
|
||||
update_graphic(mpdarc, stdout, stderr, exitreason, exitcode)
|
||||
end)
|
||||
-- spawn.easy_async(string.format(GET_MPD_CMD, "'" .. default_player .. "'"), function(stdout, stderr, exitreason, exitcode)
|
||||
-- update_graphic(mpdarc, stdout, stderr, exitreason, exitcode)
|
||||
-- end)
|
||||
end)
|
||||
|
||||
mpris_widget:buttons(
|
||||
awful.util.table.join(
|
||||
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),
|
||||
awful.button({}, 4, function() awful.spawn(NEXT_MPD_CMD, false) end),
|
||||
awful.button({}, 5, function() awful.spawn(PREV_MPD_CMD, false) end),
|
||||
awful.button({}, 1, function() awful.spawn(TOGGLE_MPD_CMD, false) end)
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
|
||||
local notification
|
||||
local function show_MPD_status()
|
||||
spawn.easy_async(GET_MPD_CMD, function()
|
||||
|
@ -140,20 +256,12 @@ local function worker()
|
|||
mpdarc:connect_signal("mouse::enter", function()
|
||||
if current_song ~= nil and artist ~= nil then show_MPD_status() end
|
||||
end)
|
||||
mpdarc:connect_signal("mouse::leave",
|
||||
function() naughty.destroy(notification) end)
|
||||
mpdarc:connect_signal("mouse::leave", function() naughty.destroy(notification) end)
|
||||
|
||||
watch(GET_MPD_CMD, 1, update_graphic, mpdarc)
|
||||
watch(string.format(GET_MPD_CMD, "'" .. default_player .. "'"), 1, update_graphic, mpris_widget)
|
||||
|
||||
mpdarc_widget = wibox.widget {
|
||||
screen = 'primary',
|
||||
mpdarc_icon_widget,
|
||||
mpdarc_current_song_widget,
|
||||
layout = wibox.layout.align.horizontal
|
||||
}
|
||||
return mpdarc_widget
|
||||
return mpris_widget
|
||||
|
||||
end
|
||||
|
||||
return setmetatable(mpdarc_widget,
|
||||
{__call = function(_, ...) return worker(...) end})
|
||||
return setmetatable(mpris_widget, {__call = function(_, ...) return worker(...) end})
|
||||
|
|
|
@ -208,7 +208,7 @@ local function worker(user_args)
|
|||
|
||||
|
||||
local move_up = wibox.widget {
|
||||
image = WIDGET_DIR .. '/up.png',
|
||||
image = WIDGET_DIR .. '/chevron-up.svg',
|
||||
resize = false,
|
||||
widget = wibox.widget.imagebox
|
||||
}
|
||||
|
@ -223,7 +223,7 @@ local function worker(user_args)
|
|||
end)
|
||||
|
||||
local move_down = wibox.widget {
|
||||
image = WIDGET_DIR .. '/down.png',
|
||||
image = WIDGET_DIR .. '/chevron-down.svg',
|
||||
resize = false,
|
||||
widget = wibox.widget.imagebox
|
||||
}
|
||||
|
|
|
@ -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,6 +24,20 @@ local PATH_TO_ICON = "/usr/share/icons/Arc/status/symbolic/audio-volume-muted-sy
|
|||
|
||||
local widget = {}
|
||||
|
||||
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 {}
|
||||
|
@ -32,7 +47,7 @@ local function worker(user_args)
|
|||
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,8 +67,8 @@ local function worker(user_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
|
||||
|
@ -70,7 +85,7 @@ local function worker(user_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(user_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
|
||||
|
|
Loading…
Reference in New Issue