Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make taglists garbage-collectable 

Similar to what the previous commit does for layoutboxes, this changes the code
for the taglist so that there is only a single, global connection to the various
signals and these update all taglists via weak tables.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2015-09-27 14:03:59 +02:00
parent 6f2e7bba25
commit 40db0b7337
2 changed files with 47 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
lib/awful/widget/taglist.lua
View File

@ -27,6 +27,8 @@ local timer = require("gears.timer")
local taglist = { mt = {} } local taglist = { mt = {} }
taglist.filter = {} taglist.filter = {}
local instances = nil
function taglist.taglist_label(t, args) function taglist.taglist_label(t, args)
if not args then args = {} end if not args then args = {} end
local theme = beautiful.get() local theme = beautiful.get()
@ -159,39 +161,53 @@ function taglist.new(screen, filter, buttons, style, update_function, base_widge
local data = setmetatable({}, { __mode = 'k' }) local data = setmetatable({}, { __mode = 'k' })
local queued_update = {} local queued_update = {}
local u = function (s) function w._do_taglist_update()
if s ~= screen then return end
-- Add a delayed callback for the first update. -- Add a delayed callback for the first update.
if not queued_update[s] then if not queued_update[screen] then
timer.delayed_call(function() timer.delayed_call(function()
taglist_update(s, w, buttons, filter, data, style, uf) taglist_update(screen, w, buttons, filter, data, style, uf)
queued_update[s] = false queued_update[screen] = false
end) end)
queued_update[s] = true queued_update[screen] = true
end end
end end
local uc = function (c) return u(c.screen) end if instances == nil then
local ut = function (t) return u(tag.getscreen(t)) end instances = {}
capi.client.connect_signal("focus", uc) local function u(s)
capi.client.connect_signal("unfocus", uc) local i = instances[s]
tag.attached_connect_signal(screen, "property::selected", ut) if i then
tag.attached_connect_signal(screen, "property::icon", ut) for _, tlist in pairs(i) do
tag.attached_connect_signal(screen, "property::hide", ut) tlist._do_taglist_update()
tag.attached_connect_signal(screen, "property::name", ut) end
tag.attached_connect_signal(screen, "property::activated", ut) end
tag.attached_connect_signal(screen, "property::screen", ut)
tag.attached_connect_signal(screen, "property::index", ut)
tag.attached_connect_signal(screen, "property::urgent", ut)
capi.client.connect_signal("property::screen", function(c, old_screen)
if screen == c.screen or screen == old_screen then
u(screen)
end end
end) local uc = function (c) return u(c.screen) end
capi.client.connect_signal("tagged", uc) local ut = function (t) return u(tag.getscreen(t)) end
capi.client.connect_signal("untagged", uc) capi.client.connect_signal("focus", uc)
capi.client.connect_signal("unmanage", uc) capi.client.connect_signal("unfocus", uc)
u(screen) tag.attached_connect_signal(screen, "property::selected", ut)
tag.attached_connect_signal(screen, "property::icon", ut)
tag.attached_connect_signal(screen, "property::hide", ut)
tag.attached_connect_signal(screen, "property::name", ut)
tag.attached_connect_signal(screen, "property::activated", ut)
tag.attached_connect_signal(screen, "property::screen", ut)
tag.attached_connect_signal(screen, "property::index", ut)
tag.attached_connect_signal(screen, "property::urgent", ut)
capi.client.connect_signal("property::screen", function(c, old_screen)
u(c.screen)
u(old_screen)
end)
capi.client.connect_signal("tagged", uc)
capi.client.connect_signal("untagged", uc)
capi.client.connect_signal("unmanage", uc)
end
w._do_taglist_update()
local list = instances[s]
if not list then
list = setmetatable({}, { __mode = "v" })
instances[screen] = list
end
table.insert(list, w)
return w return w
end end

4
tests/test-leaks.lua
View File

@ -37,6 +37,10 @@ collectable(awful.widget.launcher({ image = cairo.ImageSurface(cairo.Format.ARGB
collectable(awful.widget.prompt()) collectable(awful.widget.prompt())
collectable(awful.widget.textclock()) collectable(awful.widget.textclock())
collectable(awful.widget.layoutbox(1)) collectable(awful.widget.layoutbox(1))
function prepare_for_collect()
-- Only after doing the pending update can a taglist be GC'd.
awesome.emit_signal("refresh")
end
collectable(awful.widget.taglist(1, awful.widget.taglist.filter.all)) collectable(awful.widget.taglist(1, awful.widget.taglist.filter.all))
-- And finally a full wibox -- And finally a full wibox