Add tabbar_{fg,bg}_{normal, focus}_inactive theme vars (#114); closes #112

module/tabbed.lua

@@ -23,6 +23,14 @@ local bar = require(
 
 tabbed = {}
 
+-- helper function to connect to the (un)focus signals
+local function update_tabbar_from(c)
+    if not c or not c.bling_tabbed then
+        return
+    end
+    tabbed.update_tabbar(c.bling_tabbed)
+end
+
 -- used to change focused tab relative to the currently focused one
 tabbed.iter = function(idx)
     if not idx then
@@ -50,6 +58,8 @@ tabbed.remove = function(c)
         awful.titlebar.hide(c, bar.position)
     end
     c.bling_tabbed = nil
+    c:disconnect_signal("focus", update_tabbar_from)
+    c:disconnect_signal("unfocus", update_tabbar_from)
     awesome.emit_signal("bling::tabbed::client_removed", tabobj, c)
     tabbed.switch_to(tabobj, 1)
 end
@@ -67,6 +77,8 @@ tabbed.add = function(c, tabobj)
     if c.bling_tabbed then
         tabbed.remove(c)
     end
+    c:connect_signal("focus", update_tabbar_from)
+    c:connect_signal("unfocus", update_tabbar_from)
     helpers.client.sync(c, tabobj.clients[tabobj.focused_idx])
     tabobj.clients[#tabobj.clients + 1] = c
     tabobj.focused_idx = #tabobj.clients
@@ -218,12 +230,15 @@ end
 
 tabbed.update_tabbar = function(tabobj)
     local flexlist = bar.layout()
+    local tabobj_focused_client = tabobj.clients[tabobj.focused_idx]
+    local tabobj_is_focused = (client.focus == tabobj_focused_client)
     -- itearte over all tabbed clients to create the widget tabbed list
     for idx, c in ipairs(tabobj.clients) do
         local buttons = gears.table.join(awful.button({}, 1, function()
             tabbed.switch_to(tabobj, idx)
         end))
-        wid_temp = bar.create(c, (idx == tabobj.focused_idx), buttons)
+        local wid_temp = bar.create(c, (idx == tabobj.focused_idx), buttons,
+            not tabobj_is_focused)
         flexlist:add(wid_temp)
     end
     -- add tabbar to each tabbed client (clients will be hided anyway)
@@ -240,6 +255,8 @@ end
 tabbed.init = function(c)
     local tabobj = {}
     tabobj.clients = { c }
+    c:connect_signal("focus", update_tabbar_from)
+    c:connect_signal("unfocus", update_tabbar_from)
     tabobj.focused_idx = 1
     tabbed.update(tabobj)
 end

theme-var-template.lua

@@ -36,6 +36,10 @@ theme.tabbar_bg_normal = "#000000" -- background color of the focused client on
 theme.tabbar_fg_normal = "#ffffff" -- foreground color of the focused client on the tabbar
 theme.tabbar_bg_focus = "#1A2026" -- background color of unfocused clients on the tabbar
 theme.tabbar_fg_focus = "#ff0000" -- foreground color of unfocused clients on the tabbar
+theme.tabbar_bg_focus_inactive = nil -- background color of the focused client on the tabbar when inactive
+theme.tabbar_fg_focus_inactive = nil -- foreground color of the focused client on the tabbar when inactive
+theme.tabbar_bg_normal_inactive = nil -- background color of unfocused clients on the tabbar when inactive
+theme.tabbar_fg_normal_inactive = nil -- foreground color of unfocused clients on the tabbar when inactive
 
 -- mstab
 theme.mstab_bar_ontop = false -- whether you want to allow the bar to be ontop of clients

widget/tabbar/boxes.lua

@@ -8,16 +8,20 @@ local bg_normal = beautiful.tabbar_bg_normal or beautiful.bg_normal or "#ffffff"
 local fg_normal = beautiful.tabbar_fg_normal or beautiful.fg_normal or "#000000"
 local bg_focus = beautiful.tabbar_bg_focus or beautiful.bg_focus or "#000000"
 local fg_focus = beautiful.tabbar_fg_focus or beautiful.fg_focus or "#ffffff"
+local bg_focus_inactive = beautiful.tabbar_bg_focus_inactive or bg_focus
+local fg_focus_inactive = beautiful.tabbar_fg_focus_inactive or fg_focus
+local bg_normal_inactive = beautiful.tabbar_bg_normal_inactive or bg_normal
+local fg_normal_inactive = beautiful.tabbar_fg_normal_inactive or fg_normal
 local font = beautiful.tabbar_font or beautiful.font or "Hack 15"
 local size = beautiful.tabbar_size or 40
 local position = beautiful.tabbar_position or "bottom"
 
-local function create(c, focused_bool, buttons)
-    local bg_temp = bg_normal
-    local fg_temp = fg_normal
+local function create(c, focused_bool, buttons, inactive_bool)
+    local bg_temp = inactive_bool and bg_normal_inactive or bg_normal
+    local fg_temp = inactive_bool and fg_normal_inactive or fg_normal
     if focused_bool then
-        bg_temp = bg_focus
-        fg_temp = fg_focus
+        bg_temp = inactive_bool and bg_focus_inactive or bg_focus
+        fg_temp = inactive_bool and fg_focus_inactive or fg_focus
     end
     local wid_temp = wibox.widget({
         {

widget/tabbar/default.lua

@@ -7,18 +7,22 @@ local bg_normal = beautiful.tabbar_bg_normal or beautiful.bg_normal or "#ffffff"
 local fg_normal = beautiful.tabbar_fg_normal or beautiful.fg_normal or "#000000"
 local bg_focus = beautiful.tabbar_bg_focus or beautiful.bg_focus or "#000000"
 local fg_focus = beautiful.tabbar_fg_focus or beautiful.fg_focus or "#ffffff"
+local bg_focus_inactive = beautiful.tabbar_bg_focus_inactive or bg_focus
+local fg_focus_inactive = beautiful.tabbar_fg_focus_inactive or fg_focus
+local bg_normal_inactive = beautiful.tabbar_bg_normal_inactive or bg_normal
+local fg_normal_inactive = beautiful.tabbar_fg_normal_inactive or fg_normal
 local font = beautiful.tabbar_font or beautiful.font or "Hack 15"
 local size = beautiful.tabbar_size or 20
 local position = beautiful.tabbar_position or "top"
 
-local function create(c, focused_bool, buttons)
+local function create(c, focused_bool, buttons, inactive_bool)
     local flexlist = wibox.layout.flex.horizontal()
     local title_temp = c.name or c.class or "-"
-    local bg_temp = bg_normal
-    local fg_temp = fg_normal
+    local bg_temp = inactive_bool and bg_normal_inactive or bg_normal
+    local fg_temp = inactive_bool and fg_normal_inactive or fg_normal
     if focused_bool then
-        bg_temp = bg_focus
-        fg_temp = fg_focus
+        bg_temp = inactive_bool and bg_focus_inactive or bg_focus
+        fg_temp = inactive_bool and fg_focus_inactive or fg_focus
     end
     local text_temp = wibox.widget.textbox()
     text_temp.align = "center"

widget/tabbar/modern.lua

@@ -10,6 +10,10 @@ local bg_normal = beautiful.tabbar_bg_normal or beautiful.bg_normal or "#ffffff"
 local fg_normal = beautiful.tabbar_fg_normal or beautiful.fg_normal or "#000000"
 local bg_focus = beautiful.tabbar_bg_focus or beautiful.bg_focus or "#000000"
 local fg_focus = beautiful.tabbar_fg_focus or beautiful.fg_focus or "#ffffff"
+local bg_focus_inactive = beautiful.tabbar_bg_focus_inactive or bg_focus
+local fg_focus_inactive = beautiful.tabbar_fg_focus_inactive or fg_focus
+local bg_normal_inactive = beautiful.tabbar_bg_normal_inactive or bg_normal
+local fg_normal_inactive = beautiful.tabbar_fg_normal_inactive or fg_normal
 local font = beautiful.tabbar_font or beautiful.font or "Hack 15"
 local size = beautiful.tabbar_size or dpi(40)
 local border_radius = beautiful.mstab_border_radius
@@ -66,14 +70,14 @@ local function create_title_button(c, color_focus, color_unfocus)
     return tb
 end
 
-local function create(c, focused_bool, buttons)
+local function create(c, focused_bool, buttons, inactive_bool)
     -- local flexlist = wibox.layout.flex.horizontal()
     local title_temp = c.name or c.class or "-"
-    local bg_temp = bg_normal
-    local fg_temp = fg_normal
+    local bg_temp = inactive_bool and bg_normal_inactive or bg_normal
+    local fg_temp = inactive_bool and fg_normal_inactive or fg_normal
     if focused_bool then
-        bg_temp = bg_focus
-        fg_temp = fg_focus
+        bg_temp = inactive_bool and bg_focus_inactive or bg_focus
+        fg_temp = inactive_bool and fg_focus_inactive or fg_focus
     end
     local text_temp = wibox.widget.textbox()
     text_temp.align = "center"

widget/tabbar/pure.lua

@@ -8,13 +8,21 @@ local bg_normal = beautiful.tabbar_bg_normal or beautiful.bg_normal or "#ffffff"
 local fg_normal = beautiful.tabbar_fg_normal or beautiful.fg_normal or "#000000"
 local bg_focus = beautiful.tabbar_bg_focus or beautiful.bg_focus or "#000000"
 local fg_focus = beautiful.tabbar_fg_focus or beautiful.fg_focus or "#ffffff"
+local bg_focus_inactive = beautiful.tabbar_bg_focus_inactive or bg_focus
+local fg_focus_inactive = beautiful.tabbar_fg_focus_inactive or fg_focus
+local bg_normal_inactive = beautiful.tabbar_bg_normal_inactive or bg_normal
+local fg_normal_inactive = beautiful.tabbar_fg_normal_inactive or fg_normal
 local font = beautiful.tabbar_font or beautiful.font or "Hack 15"
 local size = beautiful.tabbar_size or 20
 local position = beautiful.tabbar_position or "top"
 
-local function create(c, focused_bool, buttons)
-    local bg_temp = focused_bool and bg_focus or bg_normal
-    local fg_temp = focused_bool and fg_focus or fg_normal
+local function create(c, focused_bool, buttons, inactive_bool)
+    local bg_temp = inactive_bool and bg_normal_inactive or bg_normal
+    local fg_temp = inactive_bool and fg_normal_inactive or fg_normal
+    if focused_bool then
+        bg_temp = inactive_bool and bg_focus_inactive or bg_focus
+        fg_temp = inactive_bool and fg_focus_inactive or fg_focus
+    end
 
     local wid_temp = wibox.widget({
         {