From 4057e5c379f48c02f8997e307c607a9d4f0b5b85 Mon Sep 17 00:00:00 2001 From: pmakhov Date: Mon, 9 Oct 2017 16:20:20 -0400 Subject: volumearc widget --- volumearc-widget/volumearc.lua | 44 +++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 24 deletions(-) (limited to 'volumearc-widget/volumearc.lua') diff --git a/volumearc-widget/volumearc.lua b/volumearc-widget/volumearc.lua index 54e2f4f..6ae5fe9 100644 --- a/volumearc-widget/volumearc.lua +++ b/volumearc-widget/volumearc.lua @@ -1,25 +1,20 @@ local awful = require("awful") +local beautiful = require("beautiful") local spawn = require("awful.spawn") local watch = require("awful.widget.watch") local wibox = require("wibox") -local request_command = 'amixer -D pulse sget Master' -local bar_color = "#74aeab" -local mute_color = "#ff0000" - -volumearc_widget = wibox.widget { --- { --- id = "txt", --- text = "1", --- font = "Play 5", --- widget = wibox.widget.textbox --- }, +local GET_VOLUME_CMD = 'amixer -D pulse sget Master' +local INC_VOLUME_CMD = 'amixer -D pulse sset Master 5%+' +local DEC_VOLUME_CMD = 'amixer -D pulse sset Master 5%-' +local TOG_VOLUME_CMD = 'amixer -D pulse sset Master toggle' + +local volumearc = wibox.widget { max_value = 1, - rounded_edge = true, thickness = 2, start_angle = 4.71238898, -- 2pi*3/4 - forced_height = 16, - forced_width = 16, + forced_height = 17, + forced_width = 17, bg = "#ffffff11", paddings = 2, widget = wibox.container.arcchart, @@ -28,29 +23,30 @@ volumearc_widget = wibox.widget { end, } +volumearc_widget = wibox.container.mirror(volumearc, { horizontal = true }) + local update_graphic = function(widget, stdout, _, _, _) local mute = string.match(stdout, "%[(o%D%D?)%]") local volume = string.match(stdout, "(%d?%d?%d)%%") volume = tonumber(string.format("% 3d", volume)) widget.value = volume / 100; --- widget.txt.text = volume; if mute == "off" then - widget.colors = { mute_color } + widget.colors = { beautiful.widget_red } else - widget.colors = { bar_color } + widget.colors = { beautiful.widget_main_color } end end -volumearc_widget:connect_signal("button::press", function(_, _, _, button) - if (button == 4) then awful.spawn("amixer -D pulse sset Master 5%+", false) - elseif (button == 5) then awful.spawn("amixer -D pulse sset Master 5%-", false) - elseif (button == 1) then awful.spawn("amixer -D pulse sset Master toggle", false) +volumearc:connect_signal("button::press", 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) end - spawn.easy_async(request_command, function(stdout, stderr, exitreason, exitcode) - update_graphic(volumearc_widget, stdout, stderr, exitreason, exitcode) + spawn.easy_async(GET_VOLUME_CMD, function(stdout, stderr, exitreason, exitcode) + update_graphic(volumearc, stdout, stderr, exitreason, exitcode) end) end) -watch(request_command, 1, update_graphic, volumearc_widget) +watch(GET_VOLUME_CMD, 1, update_graphic, volumearc) -- cgit v1.2.3