fixed some issues with the tabbed module; closes #62

module/tabbed.lua

@@ -50,7 +50,9 @@ end
 
 -- adds a client to a given tabobj
 tabbed.add = function(c, tabobj)
-    if c.bling_tabbed then return end
+    if c.bling_tabbed then
+        tabbed.remove(c)
+    end
     helpers.client.sync(c, tabobj.clients[tabobj.focused_idx])
     tabobj.clients[#tabobj.clients + 1] = c
     tabobj.focused_idx = #tabobj.clients
@@ -91,8 +93,6 @@ end
 -- use dmenu to select a client and make it tab in the currently focused tab 
 tabbed.pick_with_dmenu = function(dmenu_command)
     if not client.focus then return end
-    if not client.focus.bling_tabbed then tabbed.init(client.focus) end
-    local tabobj = client.focus.bling_tabbed
 
     if not dmenu_command then dmenu_command = "rofi -dmenu -i" end
 
@@ -102,7 +102,7 @@ tabbed.pick_with_dmenu = function(dmenu_command)
     local list_clients = {}
     local list_clients_string = ""
     for idx, c in ipairs(t:clients()) do
-        if not c.bling_tabbed then 
+        if c.window ~= client.focus.window then
             list_clients[#list_clients + 1] = c
             if #list_clients ~= 1 then
                 list_clients_string = list_clients_string .. "\\n"
@@ -112,12 +112,13 @@ tabbed.pick_with_dmenu = function(dmenu_command)
     end
 
     if #list_clients == 0 then return end
-    
     -- calls the actual dmenu
     local xprop_cmd = [[ echo -e "]] .. list_clients_string .. [[" | ]] .. dmenu_command .. [[ | awk '{ print $1 }' ]]
     awful.spawn.easy_async_with_shell(xprop_cmd, function(output)
         for _, c in ipairs(list_clients) do
             if tonumber(c.window) == tonumber(output) then
+                if not client.focus.bling_tabbed then tabbed.init(client.focus) end
+                local tabobj = client.focus.bling_tabbed
                 tabbed.add(c, tabobj)
             end
         end