From 347707c9629334278cd85922a407d73629210c7b Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Sat, 5 Aug 2017 12:57:34 -0400 Subject: Add shell surface stubs Add stubs for the wl_shell_surface interface. Implement wl_shell_get_shell_surface by creating the shell surface and settings its implementation to these stubs. --- examples/compositor/wl_shell.c | 85 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 1 deletion(-) (limited to 'examples/compositor/wl_shell.c') diff --git a/examples/compositor/wl_shell.c b/examples/compositor/wl_shell.c index f2ec3c56..b8cf126c 100644 --- a/examples/compositor/wl_shell.c +++ b/examples/compositor/wl_shell.c @@ -1,12 +1,95 @@ #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_surface *wlr_surface; +}; + +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) { - wlr_log(L_DEBUG, "TODO: implement get_shell_surface"); + struct wlr_surface *wlr_surface = wl_resource_get_user_data(surface); + struct shell_surface_state *state = malloc(sizeof(struct shell_surface_state)); + state->wlr_surface = wlr_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); } static struct wl_shell_interface wl_shell_impl = { -- cgit v1.2.3 From 5add87cac602b4fb8a484f42707165d1e2ad8d89 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Wed, 9 Aug 2017 07:12:26 -0400 Subject: rename wlr_surface to wlr_texture --- examples/compositor/wl_shell.c | 6 +++--- examples/compositor/xdg_shell.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'examples/compositor/wl_shell.c') diff --git a/examples/compositor/wl_shell.c b/examples/compositor/wl_shell.c index b8cf126c..dcff3f91 100644 --- a/examples/compositor/wl_shell.c +++ b/examples/compositor/wl_shell.c @@ -72,7 +72,7 @@ struct wl_shell_surface_interface shell_surface_interface = { }; struct shell_surface_state { - struct wlr_surface *wlr_surface; + struct wlr_texture *wlr_texture; }; static void destroy_shell_surface(struct wl_resource *resource) { @@ -83,9 +83,9 @@ static void destroy_shell_surface(struct wl_resource *resource) { void wl_shell_get_shell_surface(struct wl_client *client, struct wl_resource *resource, uint32_t id, struct wl_resource *surface) { - struct wlr_surface *wlr_surface = wl_resource_get_user_data(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_surface = wlr_surface; + 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, diff --git a/examples/compositor/xdg_shell.c b/examples/compositor/xdg_shell.c index 82ac6838..5d0d9e8d 100644 --- a/examples/compositor/xdg_shell.c +++ b/examples/compositor/xdg_shell.c @@ -135,7 +135,7 @@ static const struct zxdg_surface_v6_interface zxdg_surface_v6_implementation = { }; struct xdg_surface_state { - struct wlr_surface *wlr_surface; + struct wlr_texture *wlr_texture; }; static void xdg_shell_destroy(struct wl_client *client, @@ -151,9 +151,9 @@ static void xdg_shell_create_positioner(struct wl_client *client, static void xdg_shell_get_xdg_surface(struct wl_client *client, struct wl_resource *resource, uint32_t id, struct wl_resource *surface_resource) { - struct wlr_surface *wlr_surface = wl_resource_get_user_data(surface_resource); + struct wlr_texture *wlr_texture = wl_resource_get_user_data(surface_resource); struct xdg_surface_state *state = malloc(sizeof(struct xdg_surface_state)); - state->wlr_surface = wlr_surface; + state->wlr_texture = wlr_texture; struct wl_resource *shell_surface_resource = wl_resource_create(client, &zxdg_surface_v6_interface, wl_resource_get_version(resource), id); wl_resource_set_implementation(shell_surface_resource, -- cgit v1.2.3 From bd2e9a7168dc530c03b7b45ecfdd5ce0aff0ddb8 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Wed, 9 Aug 2017 17:30:22 -0400 Subject: Style cleanup --- examples/compositor/wl_shell.c | 4 ++-- examples/compositor/xdg_shell.c | 8 ++++---- render/matrix.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'examples/compositor/wl_shell.c') diff --git a/examples/compositor/wl_shell.c b/examples/compositor/wl_shell.c index dcff3f91..e56f5c9e 100644 --- a/examples/compositor/wl_shell.c +++ b/examples/compositor/wl_shell.c @@ -81,8 +81,8 @@ static void destroy_shell_surface(struct wl_resource *resource) { } void wl_shell_get_shell_surface(struct wl_client *client, - struct wl_resource *resource, uint32_t id, - struct wl_resource *surface) { + 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; diff --git a/examples/compositor/xdg_shell.c b/examples/compositor/xdg_shell.c index 5130bce6..2efeecfa 100644 --- a/examples/compositor/xdg_shell.c +++ b/examples/compositor/xdg_shell.c @@ -162,10 +162,10 @@ static void xdg_shell_pong(struct wl_client *client, struct wl_resource *resourc } static struct zxdg_shell_v6_interface xdg_shell_impl = { - .destroy = resource_destructor, - .create_positioner = xdg_shell_create_positioner, - .get_xdg_surface = xdg_shell_get_xdg_surface, - .pong = xdg_shell_pong, + .destroy = resource_destructor, + .create_positioner = xdg_shell_create_positioner, + .get_xdg_surface = xdg_shell_get_xdg_surface, + .pong = xdg_shell_pong, }; static void xdg_shell_bind(struct wl_client *wl_client, void *_state, diff --git a/render/matrix.c b/render/matrix.c index a927ed74..e49d365e 100644 --- a/render/matrix.c +++ b/render/matrix.c @@ -10,7 +10,7 @@ static inline int mind(int row, int col) { void wlr_matrix_identity(float (*output)[16]) { static const float identity[16] = { - 1.0f, 0.0f, 0.0f, 0.0f, + 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f -- cgit v1.2.3