-
--[[
-
- Licensed under GNU General Public License v2
- * (c) 2013, Luke Bonham
- * (c) 2013, Rman
-
+ Licensed under GNU General Public License v2
+ * (c) 2013, Luke Bonham
+ * (c) 2013, Rman
--]]
-local newtimer = require("lain.helpers").newtimer
-local read_pipe = require("lain.helpers").read_pipe
-
+local helpers = require("lain.helpers")
local awful = require("awful")
-local beautiful = require("beautiful")
local naughty = require("naughty")
local wibox = require("wibox")
-
local math = { modf = math.modf }
local string = { format = string.format,
match = string.match,
rep = string.rep }
local tonumber = tonumber
-
+local type = type
local setmetatable = setmetatable
+local terminal = "urxvtc" or "xterm"
-- ALSA volume bar
-- lain.widgets.alsabar
local alsabar = {
+<<<<<<< HEAD
+=======
channel = "Master",
step = "1%",
+ mixer = "amixer",
+>>>>>>> 09c0a3f27b6c0b61a55e7875b9a967e98cd3daf8
colors = {
- background = beautiful.bg_normal,
+ background = "#000000",
mute = "#EB8F8F",
unmute = "#A4CE8A"
},
- terminal = terminal or "xterm",
- mixer = string.format("%s -e alsamixer", terminal),
-
- notifications = {
- font = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")),
- font_size = "11",
- color = beautiful.fg_normal,
- screen = 1
- },
-
_current_level = 0,
_muted = false
}
-function alsabar.notify()
- alsabar.update()
-
- local preset = {
- title = "",
- text = "",
- timeout = 5,
- screen = alsabar.notifications.screen,
- font = string.format("%s %s", alsabar.notifications.font,
- alsabar.notifications.font_size),
- fg = alsabar.notifications.color
- }
-
- if alsabar._muted
- then
- preset.title = string.format("%s - Muted", alsabar.channel)
- else
- preset.title = string.format("%s - %s%%", alsabar.channel, alsabar._current_level)
- end
-
- int = math.modf((alsabar._current_level / 100) * awful.screen.focused().mywibox.height)
- preset.text = string.format("[%s%s]", string.rep("|", int),
- string.rep(" ", awful.screen.focused().mywibox.height - int))
-
- if alsabar.followtag then
- preset.screen = awful.screen.focused()
- end
-
- if alsabar._notify ~= nil then
- alsabar._notify = naughty.notify ({
- replaces_id = alsabar._notify.id,
- preset = preset,
- })
- else
- alsabar._notify = naughty.notify ({
- preset = preset,
- })
- end
-end
-
local function worker(args)
local args = args or {}
local timeout = args.timeout or 5
local settings = args.settings or function() end
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_size = args.ticks_size or 7
local vertical = args.vertical or false
- alsabar.cmd = args.cmd or "amixer"
+<<<<<<< HEAD
+ alsabar.cmd = args.cmd or "amixer"
+ alsabar.channel = args.channel or "Master"
+ alsabar.colors = args.colors or alsabar.colors
+ alsabar.followtag = args.followtag or false
+ alsabar._notify = args.notify or "on"
+ alsabar.notification_preset = args.notification_preset
+
+ if not alsabar.notification_preset then
+ alsabar.notification_preset = naughty.config.defaults
+ alsabar.notification_preset.font = "Monospace 11"
+=======
+ alsabar.mixer = args.mixer or alsabar.mixer
alsabar.channel = args.channel or alsabar.channel
- alsabar.togglechannel = args.togglechannel
+ 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.colors = args.colors or alsabar.colors
alsabar.notifications = args.notifications or alsabar.notifications
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)}
+>>>>>>> 09c0a3f27b6c0b61a55e7875b9a967e98cd3daf8
+ end
alsabar.bar = wibox.widget {
forced_height = height,
layout = vertical and wibox.container.rotate
}
- alsabar.tooltip = awful.tooltip({ objects = { alsabar.bar } })
+ 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)))
- function alsabar.update()
- -- Get mixer control contents
- local mixer = read_pipe(string.format("%s get %s", alsabar.cmd, alsabar.channel))
+ alsabar.tooltip = awful.tooltip({ objects = { alsabar.bar } })
- -- Capture mixer control state: [5%] ... ... [on]
- local volu, mute = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
+ function alsabar.update(callback)
+ helpers.async(alsabar.cmd, function(mixer)
+ local volu,mute = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
+ if (volu and tonumber(volu) ~= alsabar._current_level) or (mute and string.match(mute, "on") ~= alsabar._muted)
+ then
+ alsabar._current_level = tonumber(volu) or alsabar._current_level
+ alsabar.bar:set_value(alsabar._current_level / 100)
+ if (not mute and tonumber(volu) == 0) or mute == "off" then
+ alsabar._muted = true
+ alsabar.tooltip:set_text ("[Muted]")
+ alsabar.bar.color = alsabar.colors.mute
+ else
+ alsabar._muted = false
+ alsabar.tooltip:set_text(string.format("%s: %s", alsabar.channel, volu))
+ alsabar.bar.color = alsabar.colors.unmute
+ end
+
+ volume_now = {}
+ volume_now.level = tonumber(volu)
+ volume_now.status = mute
+
+ settings()
+
+ if type(callback) == "function" then callback() end
+ end
+ end)
+ end
- -- HDMIs can have a channel different from Master for toggling mute
- if alsabar.togglechannel then
- mute = string.match(read_pipe(string.format("%s get %s", alsabar.cmd, alsabar.togglechannel)), "%[(%a+)%]")
- end
+ function alsabar.notify()
+ alsabar.update(function()
+ local preset = alsabar.notification_preset
- if (volu and tonumber(volu) ~= alsabar._current_level) or (mute and string.match(mute, "on") ~= alsabar._muted)
- then
- alsabar._current_level = tonumber(volu) or alsabar._current_level
- alsabar.bar:set_value(alsabar._current_level / 100)
- if (not mute and tonumber(volu) == 0) or mute == "off"
- then
- alsabar._muted = true
- alsabar.tooltip:set_text ("[Muted]")
- alsabar.bar.color = alsabar.colors.mute
+ if alsabar._muted then
+ preset.title = string.format("%s - Muted", alsabar.channel)
else
- alsabar._muted = false
- alsabar.tooltip:set_text(string.format("%s: %s", alsabar.channel, volu))
- alsabar.bar.color = alsabar.colors.unmute
+ preset.title = string.format("%s - %s%%", alsabar.channel, alsabar._current_level)
end
- volume_now = {}
- volume_now.level = tonumber(volu)
- volume_now.status = mute
+ int = math.modf((alsabar._current_level / 100) * awful.screen.focused().mywibox.height)
+ preset.text = string.format("[%s%s]", string.rep("|", int),
+ string.rep(" ", awful.screen.focused().mywibox.height - int))
- settings()
- end
- end
+ if alsabar.followtag then preset.screen = awful.screen.focused() end
- alsabar.bar:buttons(awful.util.table.join (
- awful.button({}, 1, function()
- awful.util.spawn(alsabar.mixer)
- end),
- awful.button({}, 2, function()
- awful.util.spawn(string.format("%s set %s 100%%", alsabar.cmd, alsabar.channel))
- alsabar.update()
- end),
- awful.button({}, 3, function()
- awful.util.spawn(string.format("%s set %s toggle", alsabar.cmd, alsabar.togglechannel or alsabar.channel))
- alsabar.update()
- end),
- awful.button({}, 4, function()
- awful.util.spawn(string.format("%s set %s %s+", alsabar.cmd, alsabar.channel, alsabar.step))
- alsabar.update()
- end),
- awful.button({}, 5, function()
- awful.util.spawn(string.format("%s set %s %s-", alsabar.cmd, alsabar.channel, alsabar.step))
- alsabar.update()
- end)
- ))
+ if alsabar._notify == "on" then
+ alsabar.id = naughty.notify ({
+ replaces_id = alsabar.id,
+ preset = preset
+ }).id
+ end
+ end)
+ end
timer_id = string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel)
- newtimer(timer_id, timeout, alsabar.update)
+ helpers.newtimer(timer_id, timeout, alsabar.update)
return alsabar
end
projects / etc / awesome.git / blobdiff