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

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Aleksandr Beliaev 2016-05-30 11:47:42 +12:00
parent e6e0889fb2 153806998f
commit 5e28dd3f9f
5 changed files with 187 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
widgets/borderbox.lua
View File

@ -19,10 +19,7 @@ local function worker(relbox, s, args)
local color = args.color or '#FFFFFF'
local size = args.size or 1
local box = nil
local wiboxarg = {
position = nil,
bg = color
}
local wiboxarg = { position = nil, bg = color }
if where == 'top'
then

164
widgets/pulsebar.lua Normal file
View File

@ -0,0 +1,164 @@
--[[
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 awful = require("awful")
local beautiful = require("beautiful")
local naughty = require("naughty")
local math = { modf = math.modf }
local mouse = mouse
local string = { format = string.format,
match = string.match,
rep = string.rep }
local tonumber = tonumber
local setmetatable = setmetatable
-- ALSA volume bar
-- lain.widgets.pulsebar
local pulsebar = {
sink = 0,
colors = {
background = beautiful.bg_normal,
mute = "#EB8F8F",
unmute = "#A4CE8A"
},
mixer = "pavucontrol",
notifications = {
font = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")),
font_size = "11",
color = beautiful.fg_normal,
bar_size = 18,
screen = 1
},
_current_level = 0,
_muted = false
}
function pulsebar.notify()
pulsebar.update()
local preset = {
title = "",
text = "",
timeout = 5,
screen = pulsebar.notifications.screen,
font = pulsebar.notifications.font .. " " ..
pulsebar.notifications.font_size,
fg = pulsebar.notifications.color
}
if pulsebar._muted
then
preset.title = "Sink " .. pulsebar.sink .. " - Muted"
else
preset.title = "Sink " .. pulsebar.sink .. " - " .. pulsebar._current_level .. "%"
end
int = math.modf((pulsebar._current_level / 100) * pulsebar.notifications.bar_size)
preset.text = "["
.. string.rep("|", int)
.. string.rep(" ", pulsebar.notifications.bar_size - int)
.. "]"
if pulsebar.followmouse then
preset.screen = mouse.screen
end
if pulsebar._notify ~= nil then
pulsebar._notify = naughty.notify ({
replaces_id = pulsebar._notify.id,
preset = preset,
})
else
pulsebar._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 ticks = args.ticks or false
local ticks_size = args.ticks_size or 7
local vertical = args.vertical or false
local scallback = args.scallback
pulsebar.cmd = args.cmd or string.format("pacmd list-sinks | sed -n -e '0,/*/d' -e '/base volume/d' -e '/volume:/p' -e '/muted:/p'")
pulsebar.colors = args.colors or pulsebar.colors
pulsebar.notifications = args.notifications or pulsebar.notifications
pulsebar.sink = args.sink or 0
pulsebar.followmouse = args.followmouse or false
pulsebar.bar = awful.widget.progressbar()
pulsebar.bar:set_background_color(pulsebar.colors.background)
pulsebar.bar:set_color(pulsebar.colors.unmute)
pulsebar.tooltip = awful.tooltip({ objects = { pulsebar.bar } })
pulsebar.bar:set_width(width)
pulsebar.bar:set_height(height)
pulsebar.bar:set_ticks(ticks)
pulsebar.bar:set_ticks_size(ticks_size)
pulsebar.bar:set_vertical(vertical)
function pulsebar.update()
if scallback then pulseaudio.cmd = scallback() end
local s = read_pipe(pulsebar.cmd)
volume_now = {}
volume_now.left = tonumber(string.match(s, ":.-(%d+)%%"))
volume_now.right = tonumber(string.match(s, ":.-(%d+)%%"))
volume_now.muted = string.match(s, "muted: (%S+)")
local volu = volume_now.left
local mute = volume_now.muted
if (volu and volu ~= pulsebar._current_level) or (mute and mute ~= pulsebar._muted)
then
pulsebar._current_level = volu
pulsebar.bar:set_value(pulsebar._current_level / 100)
if not mute and volu == 0 or mute == "yes"
then
pulsebar._muted = true
pulsebar.tooltip:set_text (" [Muted] ")
pulsebar.bar:set_color(pulsebar.colors.mute)
else
pulsebar._muted = false
pulsebar.tooltip:set_text(string.format(" %s:%s ", pulsebar.sink, volu))
pulsebar.bar:set_color(pulsebar.colors.unmute)
end
settings()
end
end
pulsebar.bar:buttons (awful.util.table.join (
awful.button ({}, 1, function()
awful.util.spawn(pulsebar.mixer)
end)
))
timer_id = string.format("pulsebar-%s", pulsebar.sink)
newtimer(timer_id, timeout, pulsebar.update)
return pulsebar
end
return setmetatable(pulsebar, { __call = function(_, ...) return worker(...) end })

3
widgets/temp.lua
View File

@ -29,8 +29,7 @@ local function worker(args)
function update()
local f = io.open(tempfile)
if f ~= nil
then
if f then
coretemp_now = tonumber(f:read("*all")) / 1000
f:close()
else

31
widgets/weather.lua
View File

@ -18,9 +18,11 @@ local wibox = require("wibox")
local math = { floor = math.floor }
local mouse = mouse
local os = { time = os.time }
local string = { format = string.format,
gsub = string.gsub }
local tonumber = tonumber
local setmetatable = setmetatable
-- OpenWeatherMap
@ -36,6 +38,7 @@ local function worker(args)
local current_call = args.current_call or "curl -s 'http://api.openweathermap.org/data/2.5/weather?id=%s&units=%s&lang=%s&APPID=%s'"
local forecast_call = args.forecast_call or "curl -s 'http://api.openweathermap.org/data/2.5/forecast/daily?id=%s&units=%s&lang=%s&cnt=%s&APPID=%s'"
local city_id = args.city_id or 0 -- placeholder
local utc = args.utc or 0
local units = args.units or "metric"
local lang = args.lang or "en"
local cnt = args.cnt or 5
@ -70,10 +73,6 @@ local function worker(args)
weather.forecast_update()
end
if not weather.current_text then
weather.update()
end
weather.notification = naughty.notify({
text = weather.current_text .. weather.notification_text,
icon = weather.icon_path,
@ -121,20 +120,24 @@ local function worker(args)
function weather.update()
local cmd = string.format(current_call, city_id, units, lang, APPID)
async.request(cmd, function(f)
local pos, err, sunrise, sunset, current_dt, datetime, icon
local pos, err, icon
weather_now, pos, err = json.decode(f, 1, nil)
weather.current_text=''
if not err and weather_now and tonumber(weather_now["cod"]) == 200 then
current_dt = os.time()
sunrise = weather_now["sys"]["sunrise"]
sunset = weather_now["sys"]["sunset"]
if current_dt > sunrise and current_dt < sunset then
datetime="d"
else
datetime="n"
end
-- weather icon based on localtime
now = os.time() - (utc * 3600)
sunrise = tonumber(weather_now["sys"]["sunrise"])
sunset = tonumber(weather_now["sys"]["sunset"])
icon = weather_now["weather"][1]["icon"]
weather.icon_path = icons_path .. icon:sub(1,2) .. datetime .. ".png"
if sunrise <= now and now <= sunset then
icon = string.gsub(icon, "n", "d")
else
icon = string.gsub(icon, "d", "n")
end
weather.icon_path = icons_path .. icon .. ".png"
widget = weather.widget
weather.current_text = "Now:" .. weather_now["weather"][1]["description"] .. "\n"
settings()

2
wiki

@ -1 +1 @@
Subproject commit ac3af8c33cc593af15b85f68e20c262e847d566b
Subproject commit fea7079ab58cbbea9c18733485f264bc154fe580