small fixes

This commit is contained in:
luke bonham 2013-09-12 17:18:08 +02:00
parent 4cd75de2ed
commit e9e2e6ccd5
3 changed files with 53 additions and 51 deletions

View File

@ -6,7 +6,6 @@
Licensed under GNU General Public License v2 Licensed under GNU General Public License v2
* (c) 2013, Luke Bonham * (c) 2013, Luke Bonham
* (c) 2010-2012, Peter Hofmann
--]] --]]

View File

@ -4,6 +4,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 newtimer = require("lain.helpers").newtimer local newtimer = require("lain.helpers").newtimer
@ -12,9 +13,10 @@ local awful = require("awful")
local beautiful = require("beautiful") local beautiful = require("beautiful")
local naughty = require("naughty") local naughty = require("naughty")
local io = io local io = { popen = io.popen }
local math = { modf = math.modf } local math = { modf = math.modf }
local string = { match = string.match, local string = { format = string.format,
match = string.match,
rep = string.rep } rep = string.rep }
local tonumber = tonumber local tonumber = tonumber
@ -42,47 +44,60 @@ local alsabar =
font = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")), font = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")),
font_size = "11", font_size = "11",
color = beautiful.fg_focus, color = beautiful.fg_focus,
bar_size = 18 -- Awesome default bar_size = 18
}, },
_current_level = 0, _current_level = 0,
_muted = false _muted = false
} }
function alsabar:notify() function alsabar.notify()
alsabar.update()
local preset = local preset =
{ {
title = "", text = "", title = "",
timeout = 15, text = "",
font = alsabar.notifications.font .. " " .. alsabar.notifications.font_size, timeout = 4,
font = alsabar.notifications.font .. " " ..
alsabar.notifications.font_size,
fg = alsabar.notifications.color fg = alsabar.notifications.color
} }
if alsabar._muted then if alsabar._muted
then
preset.title = alsabar.channel .. " - Muted" preset.title = alsabar.channel .. " - Muted"
else else
preset.title = alsabar.channel .. " - " .. alsabar._current_level * 100 .. "%" preset.title = alsabar.channel .. " - " .. alsabar._current_level * 100 .. "%"
end end
local int = math.modf(alsabar._current_level * alsabar.notifications.bar_size) int = math.modf(alsabar._current_level * alsabar.notifications.bar_size)
preset.text = "[" .. string.rep("|", int) preset.text = "["
.. string.rep(" ", alsabar.notifications.bar_size - int) .. "]" .. string.rep("|", int)
.. string.rep(" ", alsabar.notifications.bar_size - int)
.. "]"
if alsabar._notify ~= nil then if alsabar._notify ~= nil then
alsabar._notify = naughty.notify ({ replaces_id = alsabar._notify.id, alsabar._notify = naughty.notify ({
preset = preset }) replaces_id = alsabar._notify.id,
preset = preset
})
else else
alsabar._notify = naughty.notify ({ preset = preset }) alsabar._notify = naughty.notify ({
preset = preset
})
end end
end end
local function worker(args) local function worker(args)
local args = args or {} local args = args or {}
local timeout = args.timeout or 4
local width = args.width or 63 local width = args.width or 63
local height = args.heigth or 1 local height = args.heigth or 1
local ticks = args.ticks or true local ticks = args.ticks or true
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.channel = args.channel or alsabar.channel alsabar.channel = args.channel or 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
@ -98,11 +113,9 @@ local function worker(args)
alsabar.bar:set_ticks(ticks) alsabar.bar:set_ticks(ticks)
alsabar.bar:set_ticks_size(ticks_size) alsabar.bar:set_ticks_size(ticks_size)
if vertical then if vertical then alsabar.bar:set_vertical(true) end
alsabar.bar:set_vertical(true)
end
function update() function alsabar.update()
-- Get mixer control contents -- Get mixer control contents
local f = io.popen("amixer get " .. alsabar.channel) local f = io.popen("amixer get " .. alsabar.channel)
local mixer = f:read("*all") local mixer = f:read("*all")
@ -119,49 +132,39 @@ local function worker(args)
alsabar._current_level = tonumber(volu) / 100 alsabar._current_level = tonumber(volu) / 100
alsabar.bar:set_value(alsabar._current_level) alsabar.bar:set_value(alsabar._current_level)
if mute == "" and volu == "0" or mute == "off" if not mute and tonumber(volu) == 0 or mute == "off"
then then
alsabar._muted = true alsabar._muted = true
alsabar.tooltip:set_text (" [Muted] ") alsabar.tooltip:set_text (" [Muted] ")
alsabar.bar:set_color(alsabar.colors.mute) alsabar.bar:set_color(alsabar.colors.mute)
else else
alsabar._muted = false alsabar._muted = false
alsabar.tooltip:set_text(" " .. alsabar.channel .. ": " .. volu .. "% ") alsabar.tooltip:set_text(string.format(" %s:%s ", alsabar.channel, volu))
alsabar.bar:set_color(alsabar.colors.unmute) alsabar.bar:set_color(alsabar.colors.unmute)
end end
end end
newtimer("alsabar", 5, update) newtimer("alsabar", timeout, alsabar.update)
alsabar.bar:buttons (awful.util.table.join ( alsabar.bar:buttons (awful.util.table.join (
awful.button ({}, 1, function() awful.button ({}, 1, function()
awful.util.spawn(alsabar.mixer) awful.util.spawn(alsabar.mixer)
end), end),
awful.button ({}, 3, function() awful.button ({}, 3, function()
awful.util.spawn("amixer sset " .. alsabar.channel .. " toggle") awful.util.spawn(string.format("amixer set %s toggle", alsabar.channel))
myvolumebarupdate() alsabar.update()
end), end),
awful.button ({}, 4, function() awful.button ({}, 4, function()
awful.util.spawn("amixer sset " .. alsabar.channel .. " " awful.util.spawn(string.format("amixer set %s %s+", alsabar.channel, alsabar.step))
.. alsabar.step .. "+") alsabar.update()
myvolumebarupdate()
end), end),
awful.button ({}, 5, function() awful.button ({}, 5, function()
awful.util.spawn("amixer sset " .. alsabar.channel .. " " awful.util.spawn(string.format("amixer set %s %s-", alsabar.channel, alsabar.step))
.. alsabar.step .. "-") alsabar.update()
myvolumebarupdate()
end) end)
)) ))
return { return alsabar
widget = alsabar.bar,
channel = alsabar.channel,
step = alsabar.step,
notify = function()
update()
alsabar.notify()
end
}
end end
return setmetatable(alsabar, { __call = function(_, ...) return worker(...) end }) return setmetatable(alsabar, { __call = function(_, ...) return worker(...) end })

View File

@ -14,7 +14,7 @@ Isolated Thunderstorms|Temporali Isolati
Scattered Thunderstorms|Temporali Sparsi Scattered Thunderstorms|Temporali Sparsi
Thundershowers|Rovesci Temporaleschi Thundershowers|Rovesci Temporaleschi
Thunderstorms|Temporali Thunderstorms|Temporali
Thunder in the Vicinity|Temporale In Arrivo Thunder in the Vicinity|Tuoni in avvicinamento
Thunder|Temporale Thunder|Temporale
AM|In Mattinata AM|In Mattinata
PM|Nel Pomeriggio PM|Nel Pomeriggio