From f4e6b138fb442085787712d71029f8d16c663a27 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Mon, 14 Aug 2017 19:22:28 +0200 Subject: Move wl_shell into wlroots --- examples/compositor/main.c | 5 +- examples/compositor/wl_shell.c | 133 ----------------------------------------- 2 files changed, 3 insertions(+), 135 deletions(-) delete mode 100644 examples/compositor/wl_shell.c (limited to 'examples/compositor') diff --git a/examples/compositor/main.c b/examples/compositor/main.c index 16851614..1d3cb237 100644 --- a/examples/compositor/main.c +++ b/examples/compositor/main.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -21,7 +22,7 @@ struct sample_state { struct wlr_renderer *renderer; struct wl_compositor_state compositor; - struct wl_shell_state shell; + struct wlr_wl_shell wl_shell; struct wlr_xdg_shell_v6 *xdg_shell; }; @@ -75,7 +76,7 @@ int main() { state.renderer = wlr_gles2_renderer_init(compositor.backend); wl_display_init_shm(compositor.display); wl_compositor_init(compositor.display, &state.compositor, state.renderer); - wl_shell_init(compositor.display, &state.shell); + wlr_wl_shell_init(&state.wl_shell, compositor.display); state.xdg_shell = wlr_xdg_shell_v6_init(compositor.display); compositor_run(&compositor); diff --git a/examples/compositor/wl_shell.c b/examples/compositor/wl_shell.c deleted file mode 100644 index e56f5c9e..00000000 --- a/examples/compositor/wl_shell.c +++ /dev/null @@ -1,133 +0,0 @@ -#include -#include -#include -#include -#include "compositor.h" - -static void shell_surface_pong(struct wl_client *client, struct wl_resource - *resource, uint32_t serial) { - wlr_log(L_DEBUG, "TODO: implement shell surface pong"); -} - -static void shell_surface_move(struct wl_client *client, struct wl_resource - *resource, struct wl_resource *seat, uint32_t serial) { - wlr_log(L_DEBUG, "TODO: implement shell surface move"); -} - -static void shell_surface_resize(struct wl_client *client, - struct wl_resource *resource, struct wl_resource *seat, uint32_t serial, - uint32_t edges) { - wlr_log(L_DEBUG, "TODO: implement shell surface resize"); -} - -static void shell_surface_set_toplevel(struct wl_client *client, - struct wl_resource *resource) { - wlr_log(L_DEBUG, "TODO: implement shell surface set_toplevel"); -} - -static void shell_surface_set_transient(struct wl_client *client, - struct wl_resource *resource, struct wl_resource *parent, int32_t x, - int32_t y, uint32_t flags) { - wlr_log(L_DEBUG, "TODO: implement shell surface set_transient"); -} - -static void shell_surface_set_fullscreen(struct wl_client *client, - struct wl_resource *resource, uint32_t method, uint32_t framerate, - struct wl_resource *output) { - wlr_log(L_DEBUG, "TODO: implement shell surface set_fullscreen"); -} - -static void shell_surface_set_popup(struct wl_client *client, - struct wl_resource *resource, struct wl_resource *seat, uint32_t serial, - struct wl_resource *parent, int32_t x, int32_t y, uint32_t flags) { - wlr_log(L_DEBUG, "TODO: implement shell surface set_popup"); -} - -static void shell_surface_set_maximized(struct wl_client *client, - struct wl_resource *resource, struct wl_resource *output) { - wlr_log(L_DEBUG, "TODO: implement shell surface set_maximized"); -} - -static void shell_surface_set_title(struct wl_client *client, - struct wl_resource *resource, const char *title) { - wlr_log(L_DEBUG, "TODO: implement shell surface set_title"); -} - -static void shell_surface_set_class(struct wl_client *client, - struct wl_resource *resource, const char *class_) { - wlr_log(L_DEBUG, "TODO: implement shell surface set_class"); -} - -struct wl_shell_surface_interface shell_surface_interface = { - .pong = shell_surface_pong, - .move = shell_surface_move, - .resize = shell_surface_resize, - .set_toplevel = shell_surface_set_toplevel, - .set_transient = shell_surface_set_transient, - .set_fullscreen = shell_surface_set_fullscreen, - .set_popup = shell_surface_set_popup, - .set_maximized = shell_surface_set_maximized, - .set_title = shell_surface_set_title, - .set_class = shell_surface_set_class, -}; - -struct shell_surface_state { - struct wlr_texture *wlr_texture; -}; - -static void destroy_shell_surface(struct wl_resource *resource) { - struct shell_surface_state *state = wl_resource_get_user_data(resource); - free(state); -} - -void wl_shell_get_shell_surface(struct wl_client *client, - struct wl_resource *resource, uint32_t id, - struct wl_resource *surface) { - struct wlr_texture *wlr_texture = wl_resource_get_user_data(surface); - struct shell_surface_state *state = malloc(sizeof(struct shell_surface_state)); - state->wlr_texture = wlr_texture; - struct wl_resource *shell_surface_resource = wl_resource_create(client, - &wl_shell_surface_interface, wl_resource_get_version(resource), id); - wl_resource_set_implementation(shell_surface_resource, - &shell_surface_interface, state, destroy_shell_surface); -} - -static struct wl_shell_interface wl_shell_impl = { - .get_shell_surface = wl_shell_get_shell_surface -}; - -static void wl_shell_destroy(struct wl_resource *resource) { - struct wl_shell_state *state = wl_resource_get_user_data(resource); - struct wl_resource *_resource = NULL; - wl_resource_for_each(_resource, &state->wl_resources) { - if (_resource == resource) { - struct wl_list *link = wl_resource_get_link(_resource); - wl_list_remove(link); - break; - } - } -} - -static void wl_shell_bind(struct wl_client *wl_client, void *_state, - uint32_t version, uint32_t id) { - struct wl_shell_state *state = _state; - assert(wl_client && state); - if (version > 1) { - wlr_log(L_ERROR, "Client requested unsupported wl_shell version, disconnecting"); - wl_client_destroy(wl_client); - return; - } - struct wl_resource *wl_resource = wl_resource_create( - wl_client, &wl_shell_interface, version, id); - wl_resource_set_implementation(wl_resource, &wl_shell_impl, - state, wl_shell_destroy); - wl_list_insert(&state->wl_resources, wl_resource_get_link(wl_resource)); -} - -void wl_shell_init(struct wl_display *display, - struct wl_shell_state *state) { - struct wl_global *wl_global = wl_global_create(display, - &wl_shell_interface, 1, state, wl_shell_bind); - state->wl_global = wl_global; - wl_list_init(&state->wl_resources); -} -- cgit v1.2.3 From 5dae8e1be81e12299d78b4319fd63c1edd24c08a Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Tue, 15 Aug 2017 02:08:32 +0200 Subject: example compositor: only iterate over wl_shell and xdg_shell surfaces --- examples/compositor/main.c | 45 ++++++++++++++++++++++--------------- examples/compositor/wl_compositor.c | 3 ++- include/wlr/types/wlr_wl_shell.h | 3 +++ types/wlr_wl_shell.c | 10 ++++++++- types/wlr_xdg_shell_v6.c | 1 + 5 files changed, 42 insertions(+), 20 deletions(-) (limited to 'examples/compositor') diff --git a/examples/compositor/main.c b/examples/compositor/main.c index 1d3cb237..2db4199c 100644 --- a/examples/compositor/main.c +++ b/examples/compositor/main.c @@ -33,6 +33,26 @@ static inline int64_t timespec_to_msec(const struct timespec *a) { return (int64_t)a->tv_sec * 1000 + a->tv_nsec / 1000000; } +void output_frame_handle_surface(struct sample_state *sample, + struct wlr_output *wlr_output, struct timespec *ts, + struct wl_resource *_res) { + struct wlr_surface *surface = wl_resource_get_user_data(_res); + float matrix[16]; + float transform[16]; + wlr_surface_flush_damage(surface); + if (surface->texture->valid) { + wlr_matrix_translate(&transform, 200, 200, 0); + wlr_surface_get_matrix(surface, &matrix, + &wlr_output->transform_matrix, &transform); + wlr_render_with_matrix(sample->renderer, surface->texture, &matrix); + + struct wlr_frame_callback *cb, *cnext; + wl_list_for_each_safe(cb, cnext, &surface->frame_callback_list, link) { + wl_callback_send_done(cb->resource, timespec_to_msec(ts)); + wl_resource_destroy(cb->resource); + } + } +} void handle_output_frame(struct output_state *output, struct timespec *ts) { struct compositor_state *state = output->compositor; struct sample_state *sample = state->data; @@ -41,24 +61,13 @@ void handle_output_frame(struct output_state *output, struct timespec *ts) { wlr_output_make_current(wlr_output); wlr_renderer_begin(sample->renderer, wlr_output); - struct wl_resource *_res; - float matrix[16]; - float transform[16]; - wl_list_for_each(_res, &sample->compositor.surfaces, link) { - struct wlr_surface *surface = wl_resource_get_user_data(_res); - wlr_surface_flush_damage(surface); - if (surface->texture->valid) { - wlr_matrix_translate(&transform, 200, 200, 0); - wlr_surface_get_matrix(surface, &matrix, - &wlr_output->transform_matrix, &transform); - wlr_render_with_matrix(sample->renderer, surface->texture, &matrix); - - struct wlr_frame_callback *cb, *cnext; - wl_list_for_each_safe(cb, cnext, &surface->frame_callback_list, link) { - wl_callback_send_done(cb->resource, timespec_to_msec(ts)); - wl_resource_destroy(cb->resource); - } - } + struct wlr_wl_shell_surface *wl_shell_surface; + wl_list_for_each(wl_shell_surface, &sample->wl_shell.surfaces, link) { + output_frame_handle_surface(sample, wlr_output, ts, wl_shell_surface->surface); + } + struct wlr_xdg_surface_v6 *xdg_surface; + wl_list_for_each(xdg_surface, &sample->xdg_shell->surfaces, link) { + output_frame_handle_surface(sample, wlr_output, ts, xdg_surface->surface); } wlr_renderer_end(sample->renderer); diff --git a/examples/compositor/wl_compositor.c b/examples/compositor/wl_compositor.c index e25dddac..034a7ff0 100644 --- a/examples/compositor/wl_compositor.c +++ b/examples/compositor/wl_compositor.c @@ -9,11 +9,12 @@ static void destroy_surface_listener(struct wl_listener *listener, void *data) { struct wlr_surface *surface = wl_resource_get_user_data(data); struct wl_compositor_state *state = surface->compositor_data; + assert(data == surface->resource); struct wl_resource *res = NULL; wl_list_for_each(res, &state->surfaces, link) { if (res == surface->resource) { - wl_list_remove(&res->link); + wl_list_remove(wl_resource_get_link(res)); break; } } diff --git a/include/wlr/types/wlr_wl_shell.h b/include/wlr/types/wlr_wl_shell.h index f96cf702..80583ae9 100644 --- a/include/wlr/types/wlr_wl_shell.h +++ b/include/wlr/types/wlr_wl_shell.h @@ -5,12 +5,15 @@ struct wlr_wl_shell { struct wl_global *wl_global; struct wl_list wl_resources; + struct wl_list surfaces; void *data; }; struct wlr_wl_shell_surface { + struct wl_resource *surface; struct wlr_texture *wlr_texture; + struct wl_list link; void *data; }; diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c index a4fd896a..d84775d9 100644 --- a/types/wlr_wl_shell.c +++ b/types/wlr_wl_shell.c @@ -73,7 +73,7 @@ struct wl_shell_surface_interface shell_surface_interface = { static void destroy_shell_surface(struct wl_resource *resource) { struct wlr_wl_shell_surface *state = wl_resource_get_user_data(resource); - wl_list_remove(wl_resource_get_link(resource)); + wl_list_remove(&state->link); free(state); } @@ -81,13 +81,16 @@ static void wl_shell_get_shell_surface(struct wl_client *client, struct wl_resource *resource, uint32_t id, struct wl_resource *surface) { struct wlr_texture *wlr_texture = wl_resource_get_user_data(surface); + struct wlr_wl_shell *wlr_wl_shell = wl_resource_get_user_data(resource); struct wlr_wl_shell_surface *state = calloc(1, sizeof(struct wlr_wl_shell_surface)); state->wlr_texture = wlr_texture; + state->surface = surface; struct wl_resource *shell_surface_resource = wl_resource_create(client, &wl_shell_surface_interface, wl_resource_get_version(resource), id); wl_resource_set_implementation(shell_surface_resource, &shell_surface_interface, state, destroy_shell_surface); + wl_list_insert(&wlr_wl_shell->surfaces, &state->link); } static struct wl_shell_interface wl_shell_impl = { @@ -126,8 +129,13 @@ void wlr_wl_shell_init(struct wlr_wl_shell *wlr_wl_shell, struct wl_display *display) { struct wl_global *wl_global = wl_global_create(display, &wl_shell_interface, 1, wlr_wl_shell, wl_shell_bind); + if (!wl_global) { + // TODO: return failure somehow + return; + } wlr_wl_shell->wl_global = wl_global; wl_list_init(&wlr_wl_shell->wl_resources); + wl_list_init(&wlr_wl_shell->surfaces); } void wlr_wl_shell_destroy(struct wlr_wl_shell *wlr_wl_shell) { diff --git a/types/wlr_xdg_shell_v6.c b/types/wlr_xdg_shell_v6.c index 46f1c98e..465e55d7 100644 --- a/types/wlr_xdg_shell_v6.c +++ b/types/wlr_xdg_shell_v6.c @@ -93,6 +93,7 @@ static const struct zxdg_toplevel_v6_interface zxdg_toplevel_v6_implementation = static void xdg_surface_destroy(struct wl_resource *resource) { struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource); + wl_list_remove(&surface->link); free(surface); } -- cgit v1.2.3 From d49edc8243c9ccba7a4a5dc210f87e9fba03a444 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Tue, 15 Aug 2017 15:27:28 +0200 Subject: wl_shell/compositor surface: do not check if it's in list before removing --- examples/compositor/wl_compositor.c | 12 +----------- types/wlr_wl_shell.c | 10 +--------- 2 files changed, 2 insertions(+), 20 deletions(-) (limited to 'examples/compositor') diff --git a/examples/compositor/wl_compositor.c b/examples/compositor/wl_compositor.c index 034a7ff0..0bab345d 100644 --- a/examples/compositor/wl_compositor.c +++ b/examples/compositor/wl_compositor.c @@ -7,17 +7,7 @@ #include "compositor.h" static void destroy_surface_listener(struct wl_listener *listener, void *data) { - struct wlr_surface *surface = wl_resource_get_user_data(data); - struct wl_compositor_state *state = surface->compositor_data; - assert(data == surface->resource); - - struct wl_resource *res = NULL; - wl_list_for_each(res, &state->surfaces, link) { - if (res == surface->resource) { - wl_list_remove(wl_resource_get_link(res)); - break; - } - } + wl_list_remove(wl_resource_get_link(data)); } static void wl_compositor_create_surface(struct wl_client *client, diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c index d84775d9..154e54f9 100644 --- a/types/wlr_wl_shell.c +++ b/types/wlr_wl_shell.c @@ -98,15 +98,7 @@ static struct wl_shell_interface wl_shell_impl = { }; static void wl_shell_destroy(struct wl_resource *resource) { - struct wlr_wl_shell *wl_shell = wl_resource_get_user_data(resource); - struct wl_resource *_resource = NULL; - wl_resource_for_each(_resource, &wl_shell->wl_resources) { - if (_resource == resource) { - struct wl_list *link = wl_resource_get_link(_resource); - wl_list_remove(link); - break; - } - } + wl_list_remove(wl_resource_get_link(resource)); } static void wl_shell_bind(struct wl_client *wl_client, void *_wl_shell, -- cgit v1.2.3 From f9b55dfa952f3e405399cabf2963b2df376f044d Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Tue, 15 Aug 2017 15:33:54 +0200 Subject: Make wlr_wl_shell_create work like xdg Also: - rename wlr_xdg_shell_v6_init to create as that is what it does - free wlr_xdg_shell on failure to create wl_global, the struct is not initialized enough to call destroy at that point --- examples/compositor/main.c | 11 +++++++---- include/wlr/types/wlr_wl_shell.h | 3 +-- include/wlr/types/wlr_xdg_shell_v6.h | 2 +- types/wlr_wl_shell.c | 14 ++++++++++---- types/wlr_xdg_shell_v6.c | 4 ++-- 5 files changed, 21 insertions(+), 13 deletions(-) (limited to 'examples/compositor') diff --git a/examples/compositor/main.c b/examples/compositor/main.c index 2db4199c..243b1837 100644 --- a/examples/compositor/main.c +++ b/examples/compositor/main.c @@ -22,7 +22,7 @@ struct sample_state { struct wlr_renderer *renderer; struct wl_compositor_state compositor; - struct wlr_wl_shell wl_shell; + struct wlr_wl_shell *wl_shell; struct wlr_xdg_shell_v6 *xdg_shell; }; @@ -62,7 +62,7 @@ void handle_output_frame(struct output_state *output, struct timespec *ts) { wlr_renderer_begin(sample->renderer, wlr_output); struct wlr_wl_shell_surface *wl_shell_surface; - wl_list_for_each(wl_shell_surface, &sample->wl_shell.surfaces, link) { + wl_list_for_each(wl_shell_surface, &sample->wl_shell->surfaces, link) { output_frame_handle_surface(sample, wlr_output, ts, wl_shell_surface->surface); } struct wlr_xdg_surface_v6 *xdg_surface; @@ -85,8 +85,11 @@ int main() { state.renderer = wlr_gles2_renderer_init(compositor.backend); wl_display_init_shm(compositor.display); wl_compositor_init(compositor.display, &state.compositor, state.renderer); - wlr_wl_shell_init(&state.wl_shell, compositor.display); - state.xdg_shell = wlr_xdg_shell_v6_init(compositor.display); + state.wl_shell = wlr_wl_shell_create(compositor.display); + state.xdg_shell = wlr_xdg_shell_v6_create(compositor.display); compositor_run(&compositor); + + wlr_wl_shell_destroy(state.wl_shell); + wlr_xdg_shell_v6_destroy(state.xdg_shell); } diff --git a/include/wlr/types/wlr_wl_shell.h b/include/wlr/types/wlr_wl_shell.h index 80583ae9..a085711b 100644 --- a/include/wlr/types/wlr_wl_shell.h +++ b/include/wlr/types/wlr_wl_shell.h @@ -19,8 +19,7 @@ struct wlr_wl_shell_surface { }; -void wlr_wl_shell_init(struct wlr_wl_shell *wlr_wl_shell, - struct wl_display *display); +struct wlr_wl_shell *wlr_wl_shell_create(struct wl_display *display); void wlr_wl_shell_destroy(struct wlr_wl_shell *wlr_wl_shell); #endif diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h index 07380a96..41cf483a 100644 --- a/include/wlr/types/wlr_xdg_shell_v6.h +++ b/include/wlr/types/wlr_xdg_shell_v6.h @@ -18,7 +18,7 @@ struct wlr_xdg_surface_v6 { void *data; }; -struct wlr_xdg_shell_v6 *wlr_xdg_shell_v6_init(struct wl_display *display); +struct wlr_xdg_shell_v6 *wlr_xdg_shell_v6_create(struct wl_display *display); void wlr_xdg_shell_v6_destroy(struct wlr_xdg_shell_v6 *xdg_shell); #endif diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c index 154e54f9..c95845e8 100644 --- a/types/wlr_wl_shell.c +++ b/types/wlr_wl_shell.c @@ -117,17 +117,22 @@ static void wl_shell_bind(struct wl_client *wl_client, void *_wl_shell, wl_list_insert(&wl_shell->wl_resources, wl_resource_get_link(wl_resource)); } -void wlr_wl_shell_init(struct wlr_wl_shell *wlr_wl_shell, - struct wl_display *display) { +struct wlr_wl_shell *wlr_wl_shell_create(struct wl_display *display) { + struct wlr_wl_shell *wlr_wl_shell = + calloc(1, sizeof(struct wlr_wl_shell)); + if (!wlr_wl_shell) { + return NULL; + } struct wl_global *wl_global = wl_global_create(display, &wl_shell_interface, 1, wlr_wl_shell, wl_shell_bind); if (!wl_global) { - // TODO: return failure somehow - return; + free(wlr_wl_shell); + return NULL; } wlr_wl_shell->wl_global = wl_global; wl_list_init(&wlr_wl_shell->wl_resources); wl_list_init(&wlr_wl_shell->surfaces); + return wlr_wl_shell; } void wlr_wl_shell_destroy(struct wlr_wl_shell *wlr_wl_shell) { @@ -141,4 +146,5 @@ void wlr_wl_shell_destroy(struct wlr_wl_shell *wlr_wl_shell) { } // TODO: destroy surfaces wl_global_destroy(wlr_wl_shell->wl_global); + free(wlr_wl_shell); } diff --git a/types/wlr_xdg_shell_v6.c b/types/wlr_xdg_shell_v6.c index 465e55d7..da3c05df 100644 --- a/types/wlr_xdg_shell_v6.c +++ b/types/wlr_xdg_shell_v6.c @@ -179,7 +179,7 @@ static void xdg_shell_bind(struct wl_client *wl_client, void *_xdg_shell, wl_list_insert(&xdg_shell->wl_resources, wl_resource_get_link(wl_resource)); } -struct wlr_xdg_shell_v6 *wlr_xdg_shell_v6_init(struct wl_display *display) { +struct wlr_xdg_shell_v6 *wlr_xdg_shell_v6_create(struct wl_display *display) { struct wlr_xdg_shell_v6 *xdg_shell = calloc(1, sizeof(struct wlr_xdg_shell_v6)); if (!xdg_shell) { @@ -188,7 +188,7 @@ struct wlr_xdg_shell_v6 *wlr_xdg_shell_v6_init(struct wl_display *display) { struct wl_global *wl_global = wl_global_create(display, &zxdg_shell_v6_interface, 1, xdg_shell, xdg_shell_bind); if (!wl_global) { - wlr_xdg_shell_v6_destroy(xdg_shell); + free(xdg_shell); return NULL; } xdg_shell->wl_global = wl_global; -- cgit v1.2.3