mirror of https://github.com/lcpz/lain.git
small fixes
This commit is contained in:
luke bonham
parent
4cd75de2ed
commit
e9e2e6ccd5
3
init.lua
3
init.lua
|
|
@ -5,8 +5,7 @@
|
|||
Layouts, widgets and utilities for Awesome WM
|
||||
|
||||
Licensed under GNU General Public License v2
|
||||
* (c) 2013, Luke Bonham
|
||||
* (c) 2010-2012, Peter Hofmann
|
||||
* (c) 2013, Luke Bonham
|
||||
|
||||
--]]
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
Licensed under GNU General Public License v2
|
||||
* (c) 2013, Luke Bonham
|
||||
* (c) 2013, Rman
|
||||
|
||||
--]]
|
||||
|
||||
local newtimer = require("lain.helpers").newtimer
|
||||
|
|
@ -12,10 +13,11 @@ local awful = require("awful")
|
|||
local beautiful = require("beautiful")
|
||||
local naughty = require("naughty")
|
||||
|
||||
local io = io
|
||||
local math = { modf = math.modf }
|
||||
local string = { match = string.match,
|
||||
rep = string.rep }
|
||||
local io = { popen = io.popen }
|
||||
local math = { modf = math.modf }
|
||||
local string = { format = string.format,
|
||||
match = string.match,
|
||||
rep = string.rep }
|
||||
local tonumber = tonumber
|
||||
|
||||
local setmetatable = setmetatable
|
||||
|
|
@ -25,64 +27,77 @@ local setmetatable = setmetatable
|
|||
local alsabar =
|
||||
{
|
||||
channel = "Master",
|
||||
step = "5%",
|
||||
step = "5%",
|
||||
|
||||
colors =
|
||||
{
|
||||
background = beautiful.bg_normal,
|
||||
mute = "#EB8F8F",
|
||||
unmute = "#A4CE8A"
|
||||
mute = "#EB8F8F",
|
||||
unmute = "#A4CE8A"
|
||||
},
|
||||
|
||||
terminal = terminal or "xterm",
|
||||
mixer = terminal .. " -e alsamixer",
|
||||
mixer = terminal .. " -e alsamixer",
|
||||
|
||||
notifications =
|
||||
{
|
||||
font = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")),
|
||||
font = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")),
|
||||
font_size = "11",
|
||||
color = beautiful.fg_focus,
|
||||
bar_size = 18 -- Awesome default
|
||||
color = beautiful.fg_focus,
|
||||
bar_size = 18
|
||||
},
|
||||
|
||||
_current_level = 0,
|
||||
_muted = false
|
||||
_muted = false
|
||||
}
|
||||
|
||||
function alsabar:notify()
|
||||
function alsabar.notify()
|
||||
alsabar.update()
|
||||
|
||||
local preset =
|
||||
{
|
||||
title = "", text = "",
|
||||
timeout = 15,
|
||||
font = alsabar.notifications.font .. " " .. alsabar.notifications.font_size,
|
||||
fg = alsabar.notifications.color
|
||||
title = "",
|
||||
text = "",
|
||||
timeout = 4,
|
||||
font = alsabar.notifications.font .. " " ..
|
||||
alsabar.notifications.font_size,
|
||||
fg = alsabar.notifications.color
|
||||
}
|
||||
|
||||
if alsabar._muted then
|
||||
if alsabar._muted
|
||||
then
|
||||
preset.title = alsabar.channel .. " - Muted"
|
||||
else
|
||||
preset.title = alsabar.channel .. " - " .. alsabar._current_level * 100 .. "%"
|
||||
end
|
||||
|
||||
local int = math.modf(alsabar._current_level * alsabar.notifications.bar_size)
|
||||
preset.text = "[" .. string.rep("|", int)
|
||||
.. string.rep(" ", alsabar.notifications.bar_size - int) .. "]"
|
||||
int = math.modf(alsabar._current_level * alsabar.notifications.bar_size)
|
||||
preset.text = "["
|
||||
.. string.rep("|", int)
|
||||
.. string.rep(" ", alsabar.notifications.bar_size - int)
|
||||
.. "]"
|
||||
|
||||
if alsabar._notify ~= nil then
|
||||
alsabar._notify = naughty.notify ({ replaces_id = alsabar._notify.id,
|
||||
preset = preset })
|
||||
alsabar._notify = naughty.notify ({
|
||||
replaces_id = alsabar._notify.id,
|
||||
preset = preset
|
||||
})
|
||||
else
|
||||
alsabar._notify = naughty.notify ({ preset = preset })
|
||||
alsabar._notify = naughty.notify ({
|
||||
preset = preset
|
||||
})
|
||||
end
|
||||
end
|
||||
|
||||
local function worker(args)
|
||||
local args = args or {}
|
||||
local timeout = args.timeout or 4
|
||||
local width = args.width or 63
|
||||
local height = args.heigth or 1
|
||||
local ticks = args.ticks or true
|
||||
local ticks_size = args.ticks_size or 7
|
||||
local vertical = args.vertical or false
|
||||
|
||||
alsabar.channel = args.channel or alsabar.channel
|
||||
alsabar.step = args.step or alsabar.step
|
||||
alsabar.colors = args.colors or alsabar.colors
|
||||
|
|
@ -98,11 +113,9 @@ local function worker(args)
|
|||
alsabar.bar:set_ticks(ticks)
|
||||
alsabar.bar:set_ticks_size(ticks_size)
|
||||
|
||||
if vertical then
|
||||
alsabar.bar:set_vertical(true)
|
||||
end
|
||||
if vertical then alsabar.bar:set_vertical(true) end
|
||||
|
||||
function update()
|
||||
function alsabar.update()
|
||||
-- Get mixer control contents
|
||||
local f = io.popen("amixer get " .. alsabar.channel)
|
||||
local mixer = f:read("*all")
|
||||
|
|
@ -119,49 +132,39 @@ local function worker(args)
|
|||
alsabar._current_level = tonumber(volu) / 100
|
||||
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
|
||||
alsabar._muted = true
|
||||
alsabar.tooltip:set_text (" [Muted] ")
|
||||
alsabar.bar:set_color(alsabar.colors.mute)
|
||||
else
|
||||
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)
|
||||
end
|
||||
end
|
||||
|
||||
newtimer("alsabar", 5, update)
|
||||
newtimer("alsabar", timeout, alsabar.update)
|
||||
|
||||
alsabar.bar:buttons (awful.util.table.join (
|
||||
awful.button ({}, 1, function()
|
||||
awful.util.spawn(alsabar.mixer)
|
||||
end),
|
||||
awful.button ({}, 3, function()
|
||||
awful.util.spawn("amixer sset " .. alsabar.channel .. " toggle")
|
||||
myvolumebarupdate()
|
||||
awful.util.spawn(string.format("amixer set %s toggle", alsabar.channel))
|
||||
alsabar.update()
|
||||
end),
|
||||
awful.button ({}, 4, function()
|
||||
awful.util.spawn("amixer sset " .. alsabar.channel .. " "
|
||||
.. alsabar.step .. "+")
|
||||
myvolumebarupdate()
|
||||
awful.util.spawn(string.format("amixer set %s %s+", alsabar.channel, alsabar.step))
|
||||
alsabar.update()
|
||||
end),
|
||||
awful.button ({}, 5, function()
|
||||
awful.util.spawn("amixer sset " .. alsabar.channel .. " "
|
||||
.. alsabar.step .. "-")
|
||||
myvolumebarupdate()
|
||||
awful.util.spawn(string.format("amixer set %s %s-", alsabar.channel, alsabar.step))
|
||||
alsabar.update()
|
||||
end)
|
||||
))
|
||||
|
||||
return {
|
||||
widget = alsabar.bar,
|
||||
channel = alsabar.channel,
|
||||
step = alsabar.step,
|
||||
notify = function()
|
||||
update()
|
||||
alsabar.notify()
|
||||
end
|
||||
}
|
||||
return alsabar
|
||||
end
|
||||
|
||||
return setmetatable(alsabar, { __call = function(_, ...) return worker(...) end })
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Isolated Thunderstorms|Temporali Isolati
|
|||
Scattered Thunderstorms|Temporali Sparsi
|
||||
Thundershowers|Rovesci Temporaleschi
|
||||
Thunderstorms|Temporali
|
||||
Thunder in the Vicinity|Temporale In Arrivo
|
||||
Thunder in the Vicinity|Tuoni in avvicinamento
|
||||
Thunder|Temporale
|
||||
AM|In Mattinata
|
||||
PM|Nel Pomeriggio
|
||||
|
|
|
|||
Loading…
Reference in New Issue