Refactor wibar code to declarative interface

rc.lua

@@ -6,6 +6,7 @@ naughty     = require("naughty")
 conf        = require("localconf")
               require("errors")
 inspect = require("lib.inspect")
+wibox = require("wibox")
 -- }}}
 
 beautiful.init(awful.util.getdir("config") .. "/theme.lua")
@@ -28,33 +29,27 @@ tags.setup()
 -- {{{ widgets
 widgets = require("widgets")
 for s in screen do
-	local ltop = widgets.container(s, "left", "top")
+    widgets(s).left(
-	local rtop = widgets.container(s, "right", "top")
+	{
-	local lbottom = widgets.container(s, "left", "bottom")
+	    widgets.screennum(s),
-	local rbottom = widgets.container(s, "right", "bottom")
+	    widgets.spacer,
+	    widgets.layout(s),
+	    widgets.taglist(s),
+	    layout = wibox.layout.fixed.horizontal
+	},
+	wibox.widget.textclock()
+	)
 
-	local clock = widgets.add.clock("clock", ltop)
+    widgets(s).right(
-
+	{
-	widgets.add.text(" (S:" .. s.index .. ") ", lbottom)
+	    widgets.cpu(),
-	widgets.add.layout_indicator(lbottom)
+	    widgets.ram(),
-	widgets.add.taglist("tags", lbottom)
+	    widgets.battery(s),
-
+	    widgets.systray(s),
-	local mail = widgets.add.mail("mail", rbottom, { os.getenv("HOME") .. "/.maildir/uber" }, "bottom_right", "uber")
+	    layout = wibox.layout.fixed.horizontal
-	mail:set_left(15)
+	},
-
+	widgets.mail({ os.getenv("HOME") .. "/.maildir/uber" }, "bottom_right", "uber")
-	if s == screen.primary then
+	)
-	    widgets.add.cpu("cpu", rtop)
-	    widgets.add.spacer(rtop)
-	    widgets.add.battery("int", rtop, "BAT0")
-	    widgets.add.spacer(rtop)
-	    widgets.add.battery("ext", rtop, "BAT1")
-	    widgets.add.spacer(rtop)
-	    widgets.add.wifi("wlan", rtop, "wlan0")
-	    widgets.add.spacer(rtop)
-	    widgets.add.systray(rtop)
-	end
-
-	widgets.set_spacer_text("  ◈  ")
 end
 -- }}}
 

theme.lua

@@ -7,7 +7,8 @@ theme.wallpaper = "~/.wallpaper"
 -- }}}
 -- {{{ Styles
 theme.fontface = "Menlo for Powerline"
-theme.fontsize = math.floor(awful.screen.focused().dpi / 8)
+--theme.fontface = "Terminus for Powerline"
+theme.fontsize = math.floor(awful.screen.focused().dpi / 10)
 theme.font     = theme.fontface .. " " .. theme.fontsize
 
 -- {{{ Colors

vicious

@@ -1 +1 @@
-Subproject commit 983253a27f829f4fabd44e4b9843057fafc9949b
+Subproject commit 3bd7b59b2c8f999f39600ab640856342f6436d7c

widgets.lua

@@ -7,9 +7,6 @@ local tag = require("awful.tag")
 local beautiful = require("beautiful")
 local widgets = { add = {} }
 
---------------------------------------------------------------------------------
--- table declarations {{{
---------------------------------------------------------------------------------
 local wlist = {}
 local bars = {}
 local leftwibar = {}
@@ -24,172 +21,65 @@ awful.button({ modkey }, 3, awful.client.toggletag),
 awful.button({ }, 4, function(t) awful.tag.viewnext(awful.tag.getscreen(t)) end),
 awful.button({ }, 5, function(t) awful.tag.viewprev(awful.tag.getscreen(t)) end)
 )
--- }}}
---------------------------------------------------------------------------------
-
---------------------------------------------------------------------------------
--- setup {{{
---------------------------------------------------------------------------------
-local function setup()
-	for s in screen do
-		wlist[s]={}
-		bars[s]={}
 
 
+local function percentage_overlay(p, color, prefix, suffix)
+	return (
+		'<span color="%s">%s%d%%%s</span>'
+	):format(color, prefix or "", p, suffix or "")
+end
 
-		-- Create the wibar
+
-		leftwibar[s] = awful.wibar({
+function widgets.setup(s)
-			position = "left",
+	return {
-			screen = s,
+		left = function(bottom, top) s.leftwibar = add_bar(s, "left", "east", bottom, top) end,
-			width = math.floor(s.dpi / 5)
+		right = function(top, bottom) s.rightwibar = add_bar(s, "right", "west", top, bottom) end
-		})
+	}
-		rightwibar[s] = awful.wibar({
+end
-			position = "right",
+
+function add_bar(s, position, direction, first, second)
+	newbar = awful.wibar({
+		position = position,
 		screen = s,
 		width = math.floor(s.dpi / 5)
 	})
 
-		-- {{{ create containers
+	newbar:setup {
-		local left_bottom_container = wibox.layout.fixed.horizontal()
+		{
-		local left_top_container = wibox.layout.fixed.horizontal()
+			first,
-
+			nil,
-		local left_container = wibox.layout.align.horizontal()
+			second,
-		left_container:set_left(left_bottom_container)
+			layout = wibox.layout.align.horizontal
-		left_container:set_right(left_top_container)
+		},
-
+		direction = direction,
-		local right_bottom_container = wibox.layout.fixed.horizontal()
+		widget = wibox.container.rotate
-		local right_top_container = wibox.layout.fixed.horizontal()
+	}
-
+	return newbar
-		local right_container = wibox.layout.align.horizontal()
-		right_container:set_left(right_top_container)
-		right_container:set_right(right_bottom_container)
-		--}}}
-
-
-		-- {{{ rotate containers and add to wibox
-		local leftrotate = wibox.container.rotate()
-		leftrotate:set_direction('east')
-		leftrotate:set_widget(left_container)
-		leftwibar[s]:set_widget(leftrotate)
-
-		local rightrotate = wibox.container.rotate()
-		rightrotate:set_direction('west')
-		rightrotate:set_widget(right_container)
-		rightwibar[s]:set_widget(rightrotate)
-		--}}}
-
-
-		bars[s] = {}
-		bars[s].left = {}
-		bars[s].left.bottom = left_bottom_container
-		bars[s].left.top = left_top_container
-		bars[s].right = {}
-		bars[s].right.bottom = right_bottom_container
-		bars[s].right.top = right_top_container
-	end
-end
-
--- }}}
---------------------------------------------------------------------------------
-
---------------------------------------------------------------------------------
--- Utility {{{
---------------------------------------------------------------------------------
-
--- force update of a widget
-local function update(widgetname, index)
-	for s in screen do
-		if wlist[s] ~= nil and wlist[s][widgetname] ~= nil then
-			if index ~= nil then
-				vicious.force({ wlist[s][widgetname][index] })
-			else
-				vicious.force({ wlist[s][widgetname] })
-			end
-		end
-	end
-end
---}}}
-widgets.update = update
-
--- get container for adding widgets
-local function get_container(screen, bar, align)
-	if bars[screen][bar] == nil then return nil end
-
-	return {screen = screen, container = bars[screen][bar][align]}
-end
-widgets.container = get_container
-
--- }}}
---------------------------------------------------------------------------------
-
---------------------------------------------------------------------------------
--- widget creators {{{
---------------------------------------------------------------------------------
-
-local show = function(self)
-	self:set_widget(self.widget)
-end
-
-local hide = function(self)
-	self:set_widget(nil)
-end
-
-local function wrap_and_add(name, parent, widget, callback_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.container:add(container)
-	return container
 end
 
 
--- mail widget
+function widgets.mail(mailboxes, notify_pos, title)
-local function mailwidget(name, parent, mailboxes, notify_pos, title)
 	local widget = wibox.widget.textbox()
-	local bg = wibox.container.background()
+	local bg = wibox.widget { widget, widget = wibox.container.background }
-	bg:set_widget(widget)
 
-	local container = wrap_and_add(name, parent, bg, widget)
 	vicious.register(widget, vicious.widgets.mdir, function(widget, args)
 		if args[1] > 0 then
-			naughty.notify({
-				title = "New mail arrived in box " .. title,
-				text = title .. " " ..args[2].." / "..args[1],
-				position = notify_pos or "top_left"
-
-			})
 			bg:set_bg(beautiful.bg_urgent)
 			bg:set_fg(beautiful.fg_urgent)
-			container:show()
+			bg.visible = true
 		elseif args[2] > 0 then
 			bg:set_bg(beautiful.bg_focus)
 			bg:set_fg(beautiful.fg_focus)
-			container:show()
+			bg.visible = true
 		else
-			bg:set_bg(beautiful.bg_normal)
+			bg.visible = false
-			bg:set_fg(beautiful.fg_normal)
-			container:hide()
 		end
 		return "⬓⬓ Unread "..args[2].." / New "..args[1].. " "
-	end, 0, mailboxes)
+	end, 60, mailboxes)
-	widgets.update(name)
+	return bg
-	return container
 end
---}}}
-widgets.add.mail = mailwidget
 
--- text clock
+function widgets.layout(s)
-local function clockwidget(name, parent)
-	return wrap_and_add(name, parent, wibox.widget.textclock())
-end
---}}}
-widgets.add.clock = clockwidget
-
--- containerbox
-local function layoutwidget(parent)
 	local mylayoutbox = awful.widget.layoutbox(s)
 
 	mylayoutbox:buttons(awful.util.table.join(
@@ -198,114 +88,142 @@ local function layoutwidget(parent)
 		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);
+	return mylayoutbox
 end
---}}}
-widgets.add.layout_indicator = layoutwidget
 
--- taglist
+function widgets.screennum(s)
-local function taglistwidget(name, parent)
+		return wibox.widget.textbox("Screen " .. s.index)
-	local filter_urgentonly = function(t, args)
+end
-		for k, c in pairs(t:clients()) do
+
-			if c.urgent then return true end
+function widgets.taglist(s)
-		end
+	return awful.widget.taglist(
-		return t.selected
+		s, awful.widget.taglist.filter.noempty, mytaglist.buttons
-	end
-	-- Create a taglist widget
-	return wrap_and_add(name, parent,
-	awful.widget.taglist(parent.screen, awful.widget.taglist.filter.noempty, mytaglist.buttons)
 	)
-end --}}}
+end
-widgets.add.taglist = taglistwidget
 
--- system tray
+function widgets.systray(s)
--- not using a name argument, because only one systray is allowed
+	return {
-local function systraywidget(parent)
+		wibox.widget.systray(),
-	if (wlist["systray"] ~= nil) then
+		layout = awful.widget.only_on_screen,
-		return
+		screen = s and s.index or "primary",
-	end
+	}
-	wlist["systray"] = wibox.widget.systray()
+end
-	parent.container:add(wlist["systray"])
-	return wlist["systray"]
-end --}}}
-widgets.add.systray = systraywidget
 
--- cpu usage
+local function graph_label(graph, label, rotation, fontsize)
-local function cpuwidget(name, parent)
+	return wibox.widget {
-	local cpu = wrap_and_add(name, parent, wibox.widget.textbox())
+		{
-	vicious.register(wlist[parent.screen][name], vicious.widgets.cpu, "CPU: $1%")
+			{
-	return cpu
+				text = label,
-end --}}}
+				font = beautiful.fontface and (beautiful.fontface .. " " .. (fontsize or 7)) or beautiful.font,
-widgets.add.cpu = cpuwidget
+				widget = wibox.widget.textbox
+			},
+			direction = rotation or 'east', widget = wibox.container.rotate 
+		},
+		graph,
+		layout = wibox.layout.fixed.horizontal
+	}
+end
+
+function widgets.cpu(s)
+	vicious.cache(vicious.widgets.cpu)
+	return widgets.graph(s, "CPU", vicious.widgets.cpu, "$1", 1)
+end
+
+function widgets.ram(s)
+	return widgets.graph(s, "RAM", vicious.widgets.mem, "$1", 1)
+end
+
+function widgets.graph(s, label, viciouswidget, viciousformat, interval)
+	local graph = wibox.widget {
+		width = 60,
+		background_color = beautiful.bg_focus,
+		color = "linear:0,0:0,20:0,#FF0000:0.3,#FFFF00:0.6," .. beautiful.fg_normal,
+		widget = wibox.widget.graph,
+	}
+	local overlay = wibox.widget {
+		align = 'center',
+		widget = wibox.widget.textbox
+	}
+	vicious.register(
+		graph,
+		viciouswidget,
+		function(widget, args)
+			overlay.markup = percentage_overlay(args[1], beautiful.bg_normal)
+			return args[1]
+		end,
+		interval or 1
+		)
+	return {
+		layout = awful.widget.only_on_screen,
+		screen = s and s.index or "primary",
+		graph_label(
+			{
+				graph,
+				overlay,
+				layout = wibox.layout.stack
+			},
+			label,
+			nil,
+			7
+		)
+	}
+end
+
+local function bar_with_overlay(fg, bg, width, height)
+	local progress = wibox.widget {
+		max_value = 1,
+		color = fg,
+		background_color = bg,
+		forced_width = width,
+		forced_height = height,
+		widget        = wibox.widget.progressbar,
+	}
+
+	progress.overlay = wibox.widget {
+		font = beautiful.fontface and (beautiful.fontface .. " " .. 7) or beautiful.font,
+		align = center,
+		widget = wibox.widget.textbox
+	}
+
+	return {
+		progress,
+		progress.overlay,
+		layout = wibox.layout.stack
+	}
+end
 
 -- battery
-local function batterywidget(name, parent, batname)
+function widgets.battery(s)
-	local widget = wibox.widget.textbox()
+	bat1 = bar_with_overlay(beautiful.fg_focus, beautiful.bg_focus, 100, math.floor(s.dpi / 10))
-	local bg = wibox.container.background()
+	bat2 = bar_with_overlay(beautiful.fg_focus, beautiful.bg_focus, 100, math.floor(s.dpi / 10))
-	bg:set_widget(widget)
+
-	vicious.register(widget, vicious.widgets.bat, function (widget, args)
+	combined_bats = graph_label(
-		if args[2] == 0 then return ""
+		{ bat1,bat2,layout = wibox.layout.fixed.vertical },
+		"BAT"
+	)
+
+	callback = function (widget, args)
+		if args[2] == 0 then
+			combined_bats:set_visible(false)
+			return ""
 		else
+			combined_bats.visible = true
 			if args[2] < 15 then
-				bg:set_bg(beautiful.bg_urgent)
+				widget.background_color = beautiful.bg_urgent
-				bg:set_fg(beautiful.fg_urgent)
 			else
-				bg:set_bg(beautiful.bg_normal)
+				widget.background_color = beautiful.bg_focus
-				bg:set_fg(beautiful.fg_normal)
+			end
+			widget.overlay.markup = percentage_overlay(
+				args[2] * 100, beautiful.bg_normal, args[1] .. " "
+			)
+			return args[2]
 		end
-			return name .. ": " ..
-			args[1]..args[2].."% - "..args[3]
 	end
-	end, 61, batname)
-	widgets.update(name)
-	return wrap_and_add(name, parent, bg)
-end --}}}
-widgets.add.battery = batterywidget
 
--- wireless status
+	vicious.register(bat1[1], vicious.widgets.bat, callback, 61, "BAT0")
-local function wifiwidget(name, parent, interface)
+	vicious.register(bat2[1], vicious.widgets.bat, callback, 61, "BAT1")
-	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)
-	return wifi
-end --}}}
-widgets.add.wifi = wifiwidget
 
--- }}}
+	return combined_bats
---------------------------------------------------------------------------------
+end
 
---------------------------------------------------------------------------------
+return setmetatable(widgets, { __call = function(_, ...) return widgets.setup(...) end })
--- spacers {{{
---------------------------------------------------------------------------------
-
-local spacer = wibox.widget.textbox()
-spacer:set_text(" ")
-
--- manual spacing between widgets
-local function spacerwidget(parent)
-	parent.container:add(spacer)
-end --}}}
-widgets.add.spacer = spacerwidget
-
--- manual spacing between widgets
-local function textwidget(text, parent)
-	local newtext = wibox.widget.textbox()
-	newtext:set_text(text)
-	parent.container:add(newtext)
-end --}}}
-widgets.add.text = textwidget
-
--- change appearance of spacers
-local function spacertext(text)
-	spacer:set_text(text)
-end --}}}
-widgets.set_spacer_text = spacertext
-
--- }}}
---------------------------------------------------------------------------------
-
-setup()
-
-return widgets
-
--- vim:foldmethod=marker