From 8516faf0b1b835f337ff06a7c731f797beffbb3b Mon Sep 17 00:00:00 2001 From: Marcus Fritzsch Date: Fri, 25 Aug 2017 10:08:22 +0200 Subject: app/id_alloc: remove destroyed surfaces Also, make away with those overloaded operators for generation and lookup. Signed-off-by: Marcus Fritzsch --- src/app.hpp | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'src/app.hpp') diff --git a/src/app.hpp b/src/app.hpp index c3c2060..8f30d96 100644 --- a/src/app.hpp +++ b/src/app.hpp @@ -53,8 +53,8 @@ struct id_allocator { id_allocator &operator=(id_allocator const &); id_allocator &operator=(id_allocator &&) = delete; - // Allocate a new ID - unsigned operator()(std::string const &name) { + // Insert and return a new ID + unsigned generate_id(std::string const &name) { unsigned sid = this->next++; this->surfaces[sid] = name; // this->pending_surfaces.insert({sid}); @@ -64,16 +64,34 @@ struct id_allocator { } // Lookup by ID or by name - optional operator[](std::string const &name) { + optional lookup(std::string const &name) const { auto i = this->names.find(name); return i == this->names.end() ? nullopt : optional(i->second); } - optional operator[](unsigned id) { + optional lookup(unsigned id) const { auto i = this->surfaces.find(id); return i == this->surfaces.end() ? nullopt : optional(i->second); } + + // Remove a surface id and name + // I don't think I will need this, do I? + void remove_id(std::string const &name) { + auto i = this->names.find(name); + if (i != this->names.end()) { + this->surfaces.erase(i->second); + this->names.erase(i); + } + } + + void remove_id(unsigned id) { + auto i = this->surfaces.find(id); + if (i != this->surfaces.end()) { + this->names.erase(i->second); + this->surfaces.erase(i); + } + } }; struct App { -- cgit 1.2.3-korg