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

wlr_output_layout: use wlr_addons

This commit is contained in:
Kirill Primak 2021-08-09 20:19:17 +03:00 committed by Simon Ser
parent 11f799e88e
commit debd6c5f0b
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wlr/types/wlr_output_layout.h
View File

@ -12,6 +12,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <wayland-util.h> #include <wayland-util.h>
#include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output.h>
#include <wlr/util/addon.h>
struct wlr_box; struct wlr_box;
struct wlr_output_layout_state; struct wlr_output_layout_state;
@ -45,6 +46,7 @@ struct wlr_output_layout_output {
struct wl_list link; struct wl_list link;
struct wlr_output_layout_output_state *state; struct wlr_output_layout_output_state *state;
struct wlr_addon addon;
struct { struct {
struct wl_signal destroy; struct wl_signal destroy;
} events; } events;

37
types/wlr_output_layout.c
View File

@ -21,9 +21,10 @@ struct wlr_output_layout_output_state {
struct wl_listener mode; struct wl_listener mode;
struct wl_listener commit; struct wl_listener commit;
struct wl_listener output_destroy;
}; };
static const struct wlr_addon_interface addon_impl;
struct wlr_output_layout *wlr_output_layout_create(void) { struct wlr_output_layout *wlr_output_layout_create(void) {
struct wlr_output_layout *layout = struct wlr_output_layout *layout =
calloc(1, sizeof(struct wlr_output_layout)); calloc(1, sizeof(struct wlr_output_layout));
@ -50,8 +51,8 @@ static void output_layout_output_destroy(
wlr_output_destroy_global(l_output->output); wlr_output_destroy_global(l_output->output);
wl_list_remove(&l_output->state->mode.link); wl_list_remove(&l_output->state->mode.link);
wl_list_remove(&l_output->state->commit.link); wl_list_remove(&l_output->state->commit.link);
wl_list_remove(&l_output->state->output_destroy.link);
wl_list_remove(&l_output->link); wl_list_remove(&l_output->link);
wlr_addon_finish(&l_output->addon);
free(l_output->state); free(l_output->state);
free(l_output); free(l_output);
} }
@ -154,14 +155,20 @@ static void handle_output_commit(struct wl_listener *listener, void *data) {
} }
} }
static void handle_output_destroy(struct wl_listener *listener, void *data) { static void addon_destroy(struct wlr_addon *addon) {
struct wlr_output_layout_output_state *state = assert(addon->impl == &addon_impl);
wl_container_of(listener, state, output_destroy); struct wlr_output_layout_output *l_output =
struct wlr_output_layout *layout = state->layout; wl_container_of(addon, l_output, addon);
output_layout_output_destroy(state->l_output); struct wlr_output_layout *layout = l_output->state->layout;
output_layout_output_destroy(l_output);
output_layout_reconfigure(layout); output_layout_reconfigure(layout);
} }
static const struct wlr_addon_interface addon_impl = {
.name = "wlr_output_layout_output",
.destroy = addon_destroy,
};
static struct wlr_output_layout_output *output_layout_output_create( static struct wlr_output_layout_output *output_layout_output_create(
struct wlr_output_layout *layout, struct wlr_output *output) { struct wlr_output_layout *layout, struct wlr_output *output) {
struct wlr_output_layout_output *l_output = struct wlr_output_layout_output *l_output =
@ -184,8 +191,8 @@ static struct wlr_output_layout_output *output_layout_output_create(
l_output->state->mode.notify = handle_output_mode; l_output->state->mode.notify = handle_output_mode;
wl_signal_add(&output->events.commit, &l_output->state->commit); wl_signal_add(&output->events.commit, &l_output->state->commit);
l_output->state->commit.notify = handle_output_commit; l_output->state->commit.notify = handle_output_commit;
wl_signal_add(&output->events.destroy, &l_output->state->output_destroy);
l_output->state->output_destroy.notify = handle_output_destroy; wlr_addon_init(&l_output->addon, &output->addons, layout, &addon_impl);
return l_output; return l_output;
} }
@ -216,13 +223,13 @@ void wlr_output_layout_add(struct wlr_output_layout *layout,
struct wlr_output_layout_output *wlr_output_layout_get( 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; struct wlr_output_layout_output *l_output = NULL;
wl_list_for_each(l_output, &layout->outputs, link) { struct wlr_addon *addon =
if (l_output->output == reference) { wlr_addon_find_by_owner(&reference->addons, layout);
return l_output; if (addon) {
} l_output = wl_container_of(addon, l_output, addon);
} }
return NULL; return l_output;
} }
bool wlr_output_layout_contains_point(struct wlr_output_layout *layout, bool wlr_output_layout_contains_point(struct wlr_output_layout *layout,