awesomewm-mirrors
/
lain
mirror of https://github.com/lcpz/lain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #275 from ProfessorOptics/master 

Alsabar.lua revert changes
This commit is contained in:
Luke Bonham 2017-01-23 14:09:44 +01:00 committed by GitHub
parent 23318f8eea ba91548161
commit 09c0a3f27b
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
widgets/alsabar.lua
View File

@ -1,10 +1,7 @@
--[[ --[[
Licensed under GNU General Public License v2 Licensed under GNU General Public License v2
* (c) 2013, Luke Bonham * (c) 2013, Luke Bonham
* (c) 2013, Rman * (c) 2013, Rman
--]] --]]
local helpers = require("lain.helpers") local helpers = require("lain.helpers")
@ -19,12 +16,14 @@ local string = { format = string.format,
local tonumber = tonumber local tonumber = tonumber
local type = type local type = type
local setmetatable = setmetatable local setmetatable = setmetatable
local terminal = "urxvtc" or "xterm"
-- ALSA volume bar -- ALSA volume bar
-- lain.widgets.alsabar -- lain.widgets.alsabar
local alsabar = { local alsabar = {
channel = "Master", channel = "Master",
step = "1%", step = "1%",
mixer = "amixer",
colors = { colors = {
background = beautiful.bg_normal, background = beautiful.bg_normal,
@ -48,17 +47,22 @@ local function worker(args)
local timeout = args.timeout or 5 local timeout = args.timeout or 5
local settings = args.settings or function() end local settings = args.settings or function() end
local width = args.width or 63 local width = args.width or 63
local height = args.heigth or 1 local height = args.height or 1
local ticks = args.ticks or false local ticks = args.ticks or false
local ticks_size = args.ticks_size or 7 local ticks_size = args.ticks_size or 7
local vertical = args.vertical or false local vertical = args.vertical or false
alsabar.cmd = args.cmd or "amixer" alsabar.mixer = args.mixer or alsabar.mixer
alsabar.channel = args.channel or alsabar.channel alsabar.channel = args.channel or alsabar.channel
alsabar.togglechannel = args.togglechannel or alsabar.togglechannel
alsabar.cmd = args.cmd or {"bash", "-c", string.format("%s get %s", alsabar.mixer, alsabar.channel)}
alsabar.step = args.step or alsabar.step alsabar.step = args.step or alsabar.step
alsabar.colors = args.colors or alsabar.colors alsabar.colors = args.colors or alsabar.colors
alsabar.notifications = args.notifications or alsabar.notifications alsabar.notifications = args.notifications or alsabar.notifications
alsabar.followtag = args.followtag or false alsabar.followtag = args.followtag or false
if alsabar.togglechannel then
alsabar.cmd = args.cmd or { "bash", "-c", string.format("%s get %s; %s get %s", alsabar.mixer, alsabar.channel, alsabar.mixer, alsabar.togglechannel)}
end
alsabar.bar = wibox.widget { alsabar.bar = wibox.widget {
forced_height = height, forced_height = height,
@ -73,6 +77,27 @@ local function worker(args)
layout = vertical and wibox.container.rotate layout = vertical and wibox.container.rotate
} }
alsabar.bar:buttons (awful.util.table.join(
awful.button({}, 1, function()
awful.spawn(string.format('%s -e alsamixer', terminal))
end),
awful.button({}, 2, function()
awful.spawn(string.format("%s set %s 100%%", alsabar.mixer, alsabar.channel))
alsabar.update()
end),
awful.button({}, 3, function()
awful.spawn(string.format("%s set %s toggle", alsabar.mixer, alsabar.togglechannel or alsabar.channel))
alsabar.update()
end),
awful.button({}, 4, function()
awful.spawn(string.format("%s set %s %s+", alsabar.mixer, alsabar.channel, alsabar.step))
alsabar.update()
end),
awful.button({}, 5, function()
awful.spawn(string.format("%s set %s %s-", alsabar.mixer, alsabar.channel, alsabar.step))
alsabar.update()
end)))
alsabar.tooltip = awful.tooltip({ objects = { alsabar.bar } }) alsabar.tooltip = awful.tooltip({ objects = { alsabar.bar } })
function alsabar.update(callback) function alsabar.update(callback)