Update to Awesome 4.0
Configuration works mostly identical to previous state. Some exceptions: - Minor changes in tag names (removed unicode symbols), as they are now referenced by name in the rules. - Calendar module is not yet ported and not loaded. - Scratch terminal on F12 key currently moves to bottom of the screen after first opening. Probably will be reimplemented using the new extended awful.spawn API. - awsetbg util writes different wallpaperrc (preexisting wallpaperrc is ignored, as the filename now includes .lua)
This commit is contained in:
crater2150
parent
457f474a2c
commit
a43b908350
10 changed files with 549 additions and 633 deletions
141
widgets.lua
141
widgets.lua
|
|
@ -3,6 +3,7 @@ local vicious = require("vicious")
|
|||
local modkey = conf.modkey or "Mod4"
|
||||
local awful = require("awful")
|
||||
local tag = require("awful.tag")
|
||||
local beautiful = require("beautiful")
|
||||
local widgets = { add = {} }
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
|
|
@ -10,8 +11,8 @@ local widgets = { add = {} }
|
|||
--------------------------------------------------------------------------------
|
||||
local wlist = {}
|
||||
local bars = {}
|
||||
local leftwibox = {}
|
||||
local rightwibox = {}
|
||||
local leftwibar = {}
|
||||
local rightwibar = {}
|
||||
|
||||
local mytaglist = {}
|
||||
mytaglist.buttons = awful.util.table.join(
|
||||
|
|
@ -28,64 +29,64 @@ awful.button({ }, 5, function(t) awful.tag.viewprev(awful.tag.getscreen(t)) end)
|
|||
--------------------------------------------------------------------------------
|
||||
-- setup {{{
|
||||
--------------------------------------------------------------------------------
|
||||
local function setup() -- {{{
|
||||
local function setup()
|
||||
for s = 1, screen.count() do
|
||||
wlist[s]={}
|
||||
bars[s]={}
|
||||
|
||||
|
||||
|
||||
-- Create the wibox
|
||||
leftwibox[s] = awful.wibox({
|
||||
-- Create the wibar
|
||||
leftwibar[s] = awful.wibar({
|
||||
position = "left",
|
||||
screen = s,
|
||||
width = 18
|
||||
})
|
||||
rightwibox[s] = awful.wibox({
|
||||
rightwibar[s] = awful.wibar({
|
||||
position = "right",
|
||||
screen = s,
|
||||
width = 18
|
||||
})
|
||||
|
||||
-- {{{ create layouts
|
||||
local left_bottom_layout = wibox.layout.fixed.horizontal()
|
||||
local left_top_layout = wibox.layout.fixed.horizontal()
|
||||
-- {{{ create containers
|
||||
local left_bottom_container = wibox.layout.fixed.horizontal()
|
||||
local left_top_container = wibox.layout.fixed.horizontal()
|
||||
|
||||
local left_layout = wibox.layout.align.horizontal()
|
||||
left_layout:set_left(left_bottom_layout)
|
||||
left_layout:set_right(left_top_layout)
|
||||
local left_container = wibox.layout.align.horizontal()
|
||||
left_container:set_left(left_bottom_container)
|
||||
left_container:set_right(left_top_container)
|
||||
|
||||
local right_bottom_layout = wibox.layout.fixed.horizontal()
|
||||
local right_top_layout = wibox.layout.fixed.horizontal()
|
||||
local right_bottom_container = wibox.layout.fixed.horizontal()
|
||||
local right_top_container = wibox.layout.fixed.horizontal()
|
||||
|
||||
local right_layout = wibox.layout.align.horizontal()
|
||||
right_layout:set_left(right_top_layout)
|
||||
right_layout:set_right(right_bottom_layout)
|
||||
local right_container = wibox.layout.align.horizontal()
|
||||
right_container:set_left(right_top_container)
|
||||
right_container:set_right(right_bottom_container)
|
||||
--}}}
|
||||
|
||||
|
||||
-- {{{ rotate layouts and add to wibox
|
||||
local leftrotate = wibox.layout.rotate()
|
||||
-- {{{ rotate containers and add to wibox
|
||||
local leftrotate = wibox.container.rotate()
|
||||
leftrotate:set_direction('east')
|
||||
leftrotate:set_widget(left_layout)
|
||||
leftwibox[s]:set_widget(leftrotate)
|
||||
leftrotate:set_widget(left_container)
|
||||
leftwibar[s]:set_widget(leftrotate)
|
||||
|
||||
local rightrotate = wibox.layout.rotate()
|
||||
local rightrotate = wibox.container.rotate()
|
||||
rightrotate:set_direction('west')
|
||||
rightrotate:set_widget(right_layout)
|
||||
rightwibox[s]:set_widget(rightrotate)
|
||||
rightrotate:set_widget(right_container)
|
||||
rightwibar[s]:set_widget(rightrotate)
|
||||
--}}}
|
||||
|
||||
|
||||
bars[s] = {}
|
||||
bars[s].left = {}
|
||||
bars[s].left.bottom = left_bottom_layout
|
||||
bars[s].left.top = left_top_layout
|
||||
bars[s].left.bottom = left_bottom_container
|
||||
bars[s].left.top = left_top_container
|
||||
bars[s].right = {}
|
||||
bars[s].right.bottom = right_bottom_layout
|
||||
bars[s].right.top = right_top_layout
|
||||
bars[s].right.bottom = right_bottom_container
|
||||
bars[s].right.top = right_top_container
|
||||
end
|
||||
end -- }}}
|
||||
end
|
||||
|
||||
-- }}}
|
||||
--------------------------------------------------------------------------------
|
||||
|
|
@ -95,7 +96,7 @@ end -- }}}
|
|||
--------------------------------------------------------------------------------
|
||||
|
||||
-- force update of a widget
|
||||
local function update(widgetname, index) -- {{{
|
||||
local function update(widgetname, index)
|
||||
for s = 1, screen.count() do
|
||||
if wlist[s] ~= nil and wlist[s][widgetname] ~= nil then
|
||||
if index ~= nil then
|
||||
|
|
@ -109,13 +110,13 @@ end
|
|||
--}}}
|
||||
widgets.update = update
|
||||
|
||||
-- get layout for adding widgets
|
||||
local function get_layout(screen, bar, align) --{{{
|
||||
-- get container for adding widgets
|
||||
local function get_container(screen, bar, align)
|
||||
if bars[screen][bar] == nil then return nil end
|
||||
|
||||
return {screen = screen, layout = bars[screen][bar][align]}
|
||||
end --}}}
|
||||
widgets.layout = get_layout
|
||||
return {screen = screen, container = bars[screen][bar][align]}
|
||||
end
|
||||
widgets.container = get_container
|
||||
|
||||
-- }}}
|
||||
--------------------------------------------------------------------------------
|
||||
|
|
@ -133,21 +134,21 @@ local hide = function(self)
|
|||
end
|
||||
|
||||
local function wrap_and_add(name, parent, widget, callback_widget)
|
||||
local container = wibox.layout.margin(widget)
|
||||
local container = wibox.container.margin(widget)
|
||||
container.widget = widget
|
||||
container.show = show
|
||||
container.hide = hide
|
||||
|
||||
wlist[parent.screen][name] = callback_widget == nil and widget or callback_widget
|
||||
parent.layout:add(container)
|
||||
parent.container:add(container)
|
||||
return container
|
||||
end
|
||||
|
||||
|
||||
-- mail widget
|
||||
local function mailwidget(name, parent, mailboxes, notify_pos, title) --{{{
|
||||
local function mailwidget(name, parent, mailboxes, notify_pos, title)
|
||||
local widget = wibox.widget.textbox()
|
||||
local bg = wibox.widget.background()
|
||||
local bg = wibox.container.background()
|
||||
bg:set_widget(widget)
|
||||
|
||||
local container = wrap_and_add(name, parent, bg, widget)
|
||||
|
|
@ -159,16 +160,16 @@ local function mailwidget(name, parent, mailboxes, notify_pos, title) --{{{
|
|||
position = notify_pos or "top_left"
|
||||
|
||||
})
|
||||
bg:set_bg(theme.bg_urgent)
|
||||
bg:set_fg(theme.fg_urgent)
|
||||
bg:set_bg(beautiful.bg_urgent)
|
||||
bg:set_fg(beautiful.fg_urgent)
|
||||
container:show()
|
||||
elseif args[2] > 0 then
|
||||
bg:set_bg(theme.bg_focus)
|
||||
bg:set_fg(theme.fg_focus)
|
||||
bg:set_bg(beautiful.bg_focus)
|
||||
bg:set_fg(beautiful.fg_focus)
|
||||
container:show()
|
||||
else
|
||||
bg:set_bg(theme.bg_normal)
|
||||
bg:set_fg(theme.fg_normal)
|
||||
bg:set_bg(beautiful.bg_normal)
|
||||
bg:set_fg(beautiful.fg_normal)
|
||||
container:hide()
|
||||
end
|
||||
return "⬓⬓ Unread "..args[2].." / New "..args[1].. " "
|
||||
|
|
@ -180,21 +181,29 @@ end
|
|||
widgets.add.mail = mailwidget
|
||||
|
||||
-- text clock
|
||||
local function clockwidget(name, parent) -- {{{
|
||||
return wrap_and_add(name, parent, awful.widget.textclock())
|
||||
local function clockwidget(name, parent)
|
||||
return wrap_and_add(name, parent, wibox.widget.textclock())
|
||||
end
|
||||
--}}}
|
||||
widgets.add.clock = clockwidget
|
||||
|
||||
-- layoutbox
|
||||
local function layoutwidget(parent) -- {{{
|
||||
return wrap_and_add("layout", parent, awful.widget.layoutbox(s))
|
||||
-- containerbox
|
||||
local function layoutwidget(parent)
|
||||
local mylayoutbox = awful.widget.layoutbox(s)
|
||||
|
||||
mylayoutbox:buttons(awful.util.table.join(
|
||||
awful.button({ }, 1, function () awful.layout.inc( 1) end),
|
||||
awful.button({ }, 3, function () awful.layout.inc(-1) end),
|
||||
awful.button({ }, 4, function () awful.layout.inc( 1) end),
|
||||
awful.button({ }, 5, function () awful.layout.inc(-1) end)
|
||||
))
|
||||
return wrap_and_add("layout", parent, mylayoutbox);
|
||||
end
|
||||
--}}}
|
||||
widgets.add.layout_indicator = layoutwidget
|
||||
|
||||
-- taglist
|
||||
local function taglistwidget(name, parent) --{{{
|
||||
local function taglistwidget(name, parent)
|
||||
local filter_urgentonly = function(t, args)
|
||||
for k, c in pairs(t:clients()) do
|
||||
if c.urgent then return true end
|
||||
|
|
@ -203,25 +212,25 @@ local function taglistwidget(name, parent) --{{{
|
|||
end
|
||||
-- Create a taglist widget
|
||||
return wrap_and_add(name, parent,
|
||||
awful.widget.taglist(parent.screen, awful.widget.taglist.filter.noempty, mytaglist.buttons)
|
||||
awful.widget.taglist(parent.screen, awful.widget.taglist.filter.noempty, mytaglist.buttons)
|
||||
)
|
||||
end --}}}
|
||||
widgets.add.taglist = taglistwidget
|
||||
|
||||
-- system tray
|
||||
-- not using a name argument, because only one systray is allowed
|
||||
local function systraywidget(parent) --{{{
|
||||
local function systraywidget(parent)
|
||||
if (wlist["systray"] ~= nil) then
|
||||
return
|
||||
end
|
||||
wlist["systray"] = wibox.widget.systray()
|
||||
parent.layout:add(wlist["systray"])
|
||||
parent.container:add(wlist["systray"])
|
||||
return wlist["systray"]
|
||||
end --}}}
|
||||
widgets.add.systray = systraywidget
|
||||
|
||||
-- cpu usage
|
||||
local function cpuwidget(name, parent) --{{{
|
||||
local function cpuwidget(name, parent)
|
||||
local cpu = wrap_and_add(name, parent, wibox.widget.textbox())
|
||||
vicious.register(wlist[parent.screen][name], vicious.widgets.cpu, "CPU: $1%")
|
||||
return cpu
|
||||
|
|
@ -229,22 +238,22 @@ end --}}}
|
|||
widgets.add.cpu = cpuwidget
|
||||
|
||||
-- battery
|
||||
local function batterywidget(name, parent, batname) --{{{
|
||||
local function batterywidget(name, parent, batname)
|
||||
local widget = wibox.widget.textbox()
|
||||
local bg = wibox.widget.background()
|
||||
local bg = wibox.container.background()
|
||||
bg:set_widget(widget)
|
||||
vicious.register(widget, vicious.widgets.bat, function (widget, args)
|
||||
if args[2] == 0 then return ""
|
||||
else
|
||||
if args[2] < 15 then
|
||||
bg:set_bg(theme.bg_urgent)
|
||||
bg:set_fg(theme.fg_urgent)
|
||||
bg:set_bg(beautiful.bg_urgent)
|
||||
bg:set_fg(beautiful.fg_urgent)
|
||||
else
|
||||
bg:set_bg(theme.bg_normal)
|
||||
bg:set_fg(theme.fg_normal)
|
||||
bg:set_bg(beautiful.bg_normal)
|
||||
bg:set_fg(beautiful.fg_normal)
|
||||
end
|
||||
return name .. ": " ..
|
||||
args[1]..args[2].."% - "..args[3]
|
||||
args[1]..args[2].."% - "..args[3]
|
||||
end
|
||||
end, 61, batname)
|
||||
widgets.update(name)
|
||||
|
|
@ -253,7 +262,7 @@ end --}}}
|
|||
widgets.add.battery = batterywidget
|
||||
|
||||
-- wireless status
|
||||
local function wifiwidget(name, parent, interface) --{{{
|
||||
local function wifiwidget(name, parent, interface)
|
||||
local wifi = wrap_and_add(name, parent, wibox.widget.textbox())
|
||||
vicious.register(wlist[parent.screen][name], vicious.widgets.wifi,
|
||||
"WLAN ${ssid} @ ${sign}dBm, Q:${link}/70", 31, interface)
|
||||
|
|
@ -272,13 +281,13 @@ local spacer = wibox.widget.textbox()
|
|||
spacer:set_text(" ")
|
||||
|
||||
-- manual spacing between widgets
|
||||
local function spacerwidget(parent) --{{{
|
||||
parent.layout:add(spacer)
|
||||
local function spacerwidget(parent)
|
||||
parent.container:add(spacer)
|
||||
end --}}}
|
||||
widgets.add.spacer = spacerwidget
|
||||
|
||||
-- change appearance of spacers
|
||||
local function spacertext(text) --{{{
|
||||
local function spacertext(text)
|
||||
spacer:set_text(text)
|
||||
end --}}}
|
||||
widgets.set_spacer_text = spacertext
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue