blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

util/addon: find both by owner and impl 

This allows to have multiple addons of different types with the same
owner.
This commit is contained in:
Kirill Primak 2021-08-11 13:35:20 +03:00 committed by Simon Ser
parent debd6c5f0b
commit 111d4eafd7
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wlr/util/addon.h
View File

@ -37,7 +37,7 @@ void wlr_addon_init(struct wlr_addon *addon, struct wlr_addon_set *set,
const void *owner, const struct wlr_addon_interface *impl); const void *owner, const struct wlr_addon_interface *impl);
void wlr_addon_finish(struct wlr_addon *addon); void wlr_addon_finish(struct wlr_addon *addon);
struct wlr_addon *wlr_addon_find_by_owner(struct wlr_addon_set *set, struct wlr_addon *wlr_addon_find(struct wlr_addon_set *set, const void *owner,
const void *owner); const struct wlr_addon_interface *impl);
#endif #endif

2
types/wlr_output_layout.c
View File

@ -225,7 +225,7 @@ struct wlr_output_layout_output *wlr_output_layout_get(
struct wlr_output_layout *layout, struct wlr_output *reference) { struct wlr_output_layout *layout, struct wlr_output *reference) {
struct wlr_output_layout_output *l_output = NULL; struct wlr_output_layout_output *l_output = NULL;
struct wlr_addon *addon = struct wlr_addon *addon =
wlr_addon_find_by_owner(&reference->addons, layout); wlr_addon_find(&reference->addons, layout, &addon_impl);
if (addon) { if (addon) {
l_output = wl_container_of(addon, l_output, addon); l_output = wl_container_of(addon, l_output, addon);
} }

18
util/addon.c
View File

@ -18,11 +18,11 @@ void wlr_addon_set_finish(struct wlr_addon_set *set) {
void wlr_addon_init(struct wlr_addon *addon, struct wlr_addon_set *set, void wlr_addon_init(struct wlr_addon *addon, struct wlr_addon_set *set,
const void *owner, const struct wlr_addon_interface *impl) { const void *owner, const struct wlr_addon_interface *impl) {
assert(owner); assert(owner && impl);
struct wlr_addon *iter; struct wlr_addon *iter;
wl_list_for_each(iter, &set->addons, link) { wl_list_for_each(iter, &set->addons, link) {
if (iter->owner == addon->owner) { if (iter->owner == addon->owner && iter->impl == addon->impl) {
assert(0 && "Can't have two addons with the same owner"); assert(0 && "Can't have two addons of the same type with the same owner");
} }
} }
wl_list_insert(&set->addons, &addon->link); wl_list_insert(&set->addons, &addon->link);
@ -31,17 +31,15 @@ void wlr_addon_init(struct wlr_addon *addon, struct wlr_addon_set *set,
} }
void wlr_addon_finish(struct wlr_addon *addon) { void wlr_addon_finish(struct wlr_addon *addon) {
if (addon->owner) { wl_list_remove(&addon->link);
addon->owner = NULL; wl_list_init(&addon->link);
wl_list_remove(&addon->link);
}
} }
struct wlr_addon *wlr_addon_find_by_owner(struct wlr_addon_set *set, struct wlr_addon *wlr_addon_find(struct wlr_addon_set *set, const void *owner,
const void *owner) { const struct wlr_addon_interface *impl) {
struct wlr_addon *addon; struct wlr_addon *addon;
wl_list_for_each(addon, &set->addons, link) { wl_list_for_each(addon, &set->addons, link) {
if (addon->owner == owner) { if (addon->owner == owner && addon->impl == impl) {
return addon; return addon;
} }
} }