configs/awesomewm
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

modules refactored

Browse source
This commit is contained in:
crater2150 2013-04-15 14:30:23 +02:00
parent b6ca62465d
commit ba5d63eebd
2 changed files with 35 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
rc.lua
View file

@ -33,20 +33,22 @@ for s = 1, screen.count() do
local lbottom = widgets.layout(s,"left","bottom") local lbottom = widgets.layout(s,"left","bottom")
-- {{{ -- {{{
widgets.add.mail(s, ltop, { os.getenv("HOME") .. "/.maildir/" }) widgets.add.mail("mail_me", s, ltop, { os.getenv("HOME") .. "/.maildir/me" })
widgets.add.spacer(ltop) widgets.add.spacer(ltop)
widgets.add.clock(s, ltop) widgets.add.mail("mail_uber", s, ltop, { os.getenv("HOME") .. "/.maildir/uber" })
widgets.add.spacer(ltop)
widgets.add.clock("clock", s, ltop)
widgets.add.layout(s, lbottom) widgets.add.layout(s, lbottom)
widgets.add.taglist(s, lbottom) widgets.add.taglist("tags", s, lbottom)
widgets.add.cpu(s, rtop) widgets.add.cpu("cpu", s, rtop)
widgets.add.spacer(rtop) widgets.add.spacer(rtop)
widgets.add.battery(s, rtop, "BAT0") widgets.add.battery("bat", s, rtop, "BAT0")
widgets.add.spacer(rtop) widgets.add.spacer(rtop)
widgets.add.battery(s, rtop, "BAT1") widgets.add.battery("slice", s, rtop, "BAT1")
widgets.add.spacer(rtop) widgets.add.spacer(rtop)
widgets.add.wifi(s, rtop, "wlan0") widgets.add.wifi("wlan", s, rtop, "wlan0")
widgets.add.spacer(rtop) widgets.add.spacer(rtop)
widgets.add.systray(s, rtop) widgets.add.systray(s, rtop)

53
widgets.lua
View file

@ -125,7 +125,7 @@ widgets.layout = get_layout
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
-- mail widget -- mail widget
local function mailwidget(screen, parent_layout, mailboxes) --{{{ local function mailwidget(name, screen, parent_layout, mailboxes) --{{{
local widget = wibox.widget.textbox() local widget = wibox.widget.textbox()
local bg = wibox.widget.background() local bg = wibox.widget.background()
bg:set_widget(widget) bg:set_widget(widget)
@ -148,17 +148,17 @@ local function mailwidget(screen, parent_layout, mailboxes) --{{{
end end
return "⬓⬓ Unread "..args[2].." / New "..args[1].. " " return "⬓⬓ Unread "..args[2].." / New "..args[1].. " "
end, 0, mailboxes) end, 0, mailboxes)
wlist[screen]["mail"] = widget wlist[screen][name] = widget
parent_layout:add(bg) parent_layout:add(bg)
widgets.update("mail") widgets.update(name)
end end
--}}} --}}}
widgets.add.mail = mailwidget widgets.add.mail = mailwidget
-- text clock -- text clock
local function clockwidget(screen, parent_layout) -- {{{ local function clockwidget(name, screen, parent_layout) -- {{{
wlist[screen]["clock"] = awful.widget.textclock() wlist[screen][name] = awful.widget.textclock()
parent_layout:add(wlist[screen]["clock"]) parent_layout:add(wlist[screen][name])
end end
--}}} --}}}
widgets.add.clock = clockwidget widgets.add.clock = clockwidget
@ -172,16 +172,17 @@ end
widgets.add.layout = layoutwidget widgets.add.layout = layoutwidget
-- taglist -- taglist
local function taglistwidget(screen, parent_layout) --{{{ local function taglistwidget(name, screen, parent_layout) --{{{
-- Create a taglist widget -- Create a taglist widget
wlist[screen]["taglist"] = awful.widget.taglist(screen, wlist[screen][name] = awful.widget.taglist(screen,
awful.widget.taglist.filter.all, awful.widget.taglist.filter.all,
mytaglist.buttons) mytaglist.buttons)
parent_layout:add(wlist[screen]["taglist"]) parent_layout:add(wlist[screen][name])
end --}}} end --}}}
widgets.add.taglist = taglistwidget widgets.add.taglist = taglistwidget
-- system tray -- system tray
-- not using a name argument, because only one systray is allowed
local function systraywidget(screen, parent_layout) --{{{ local function systraywidget(screen, parent_layout) --{{{
if (wlist["systray"] ~= nil) then if (wlist["systray"] ~= nil) then
return return
@ -192,24 +193,20 @@ end --}}}
widgets.add.systray = systraywidget widgets.add.systray = systraywidget
-- cpu usage -- cpu usage
local function cpuwidget(screen, parent_layout) --{{{ local function cpuwidget(name, screen, parent_layout) --{{{
wlist[screen]["cpu"] = wibox.widget.textbox() wlist[screen][name] = wibox.widget.textbox()
vicious.register(wlist[screen]["cpu"], vicious.widgets.cpu, "CPU: $1%") vicious.register(wlist[screen][name], vicious.widgets.cpu, "CPU: $1%")
parent_layout:add(wlist[screen]["cpu"]) parent_layout:add(wlist[screen][name])
end --}}} end --}}}
widgets.add.cpu = cpuwidget widgets.add.cpu = cpuwidget
-- battery -- battery
local function batterywidget(screen, parent_layout, batname) --{{{ local function batterywidget(name, screen, parent_layout, batname) --{{{
if(wlist[screen]["bat"] == nil) then local widget = wibox.widget.textbox()
wlist[screen]["bat"] = {}
end
-- more than one batwidget is possible
local batwidget = wibox.widget.textbox()
local bg = wibox.widget.background() local bg = wibox.widget.background()
bg:set_widget(batwidget) print("creating batwidget '" .. name .. "' for battery '"..batname.."'")
table.insert(wlist[screen]["bat"], batwidget) bg:set_widget(widget)
vicious.register(batwidget, vicious.widgets.bat, function (widget, args) vicious.register(widget, vicious.widgets.bat, function (widget, args)
if args[2] == 0 then return "" if args[2] == 0 then return ""
else else
if args[2] < 15 then if args[2] < 15 then
@ -219,20 +216,22 @@ local function batterywidget(screen, parent_layout, batname) --{{{
bg:set_bg(theme.bg_normal) bg:set_bg(theme.bg_normal)
bg:set_fg(theme.fg_normal) bg:set_fg(theme.fg_normal)
end end
return batname .. ": " .. return name .. ": " ..
args[1]..args[2].."% - "..args[3] args[1]..args[2].."% - "..args[3]
end end
end, 61, batname) end, 61, batname)
wlist[screen][name] = widget
parent_layout:add(bg) parent_layout:add(bg)
widgets.update(name)
end --}}} end --}}}
widgets.add.battery = batterywidget widgets.add.battery = batterywidget
-- wireless status -- wireless status
local function wifiwidget(screen, parent_layout, interface) --{{{ local function wifiwidget(name, screen, parent_layout, interface) --{{{
wlist[screen]["wifi"] = wibox.widget.textbox() wlist[screen][name] = wibox.widget.textbox()
vicious.register(wlist[screen]["wifi"], vicious.widgets.wifi, vicious.register(wlist[screen][name], vicious.widgets.wifi,
"WLAN ${ssid} @ ${sign}, Q:${link}/70", 31, interface) "WLAN ${ssid} @ ${sign}, Q:${link}/70", 31, interface)
parent_layout:add(wlist[screen]["wifi"]) parent_layout:add(wlist[screen][name])
end --}}} end --}}}
widgets.add.wifi = wifiwidget widgets.add.wifi = wifiwidget