+
--[[
- 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 helpers = require("lain.helpers")
local string = { format = string.format,
match = string.match,
rep = string.rep }
-local tonumber = tonumber
local type = type
+local tonumber = tonumber
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 = "#000000",
mute = "#EB8F8F",
}
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.height or 1
- local ticks = args.ticks or false
- local ticks_size = args.ticks_size or 7
- local vertical = args.vertical or false
-
-<<<<<<< HEAD
+ 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.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"
alsabar.channel = args.channel or "Master"
+ alsabar.togglechannel = args.togglechannel
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 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
+ alsabar.notification_preset = {}
+ alsabar.notification_preset.font = "Monospace 10"
+ end
+
+ local format_cmd = string.format("%s get %s", alsabar.cmd, alsabar.channel)
+
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
+ format_cmd = { awful.util.shell, "-c", string.format("%s get %s; %s get %s",
+ alsabar.cmd, alsabar.channel, alsabar.cmd, alsabar.togglechannel) }
end
alsabar.bar = wibox.widget {
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 } })
function alsabar.update(callback)
- helpers.async(alsabar.cmd, function(mixer)
+ helpers.async(format_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
+ 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
if alsabar.followtag then preset.screen = awful.screen.focused() end
- if alsabar._notify == "on" then
- alsabar.id = naughty.notify ({
- replaces_id = alsabar.id,
- preset = preset
- }).id
+ if not alsabar.notification then
+ alsabar.notification = naughty.notify {
+ preset = preset,
+ destroy = function() alsabar.notification = nil end
+ }
+ else
+ naughty.replace_text(alsabar.notification, preset.title, preset.text)
+ naughty.reset_timeout(alsabar.notification, preset.timeout)
end
end)
end
- timer_id = string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel)
-
- helpers.newtimer(timer_id, timeout, alsabar.update)
+ helpers.newtimer(string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel), timeout, alsabar.update)
return alsabar
end
projects / etc / awesome.git / blobdiff