From 27ca8eaced73ee6478c42c2b4083c5fe81fc8ff8 Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 28 Sep 2017 12:38:41 +0200 Subject: Fix typo: s/transcient/transient/ --- include/wlr/types/wlr_wl_shell.h | 2 +- types/wlr_wl_shell.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/wlr/types/wlr_wl_shell.h b/include/wlr/types/wlr_wl_shell.h index 11d30d95..60398629 100644 --- a/include/wlr/types/wlr_wl_shell.h +++ b/include/wlr/types/wlr_wl_shell.h @@ -32,7 +32,7 @@ struct wlr_wl_shell_surface_popup_state { enum wlr_wl_shell_surface_role { WLR_WL_SHELL_SURFACE_ROLE_NONE, WLR_WL_SHELL_SURFACE_ROLE_TOPLEVEL, - WLR_WL_SHELL_SURFACE_ROLE_TRANSCIENT, + WLR_WL_SHELL_SURFACE_ROLE_TRANSIENT, WLR_WL_SHELL_SURFACE_ROLE_POPUP, }; diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c index 99371fb4..5c78deff 100644 --- a/types/wlr_wl_shell.c +++ b/types/wlr_wl_shell.c @@ -114,7 +114,7 @@ static void shell_surface_set_transient(struct wl_client *client, free(surface->transient_state); surface->transient_state = state; - surface->role = WLR_WL_SHELL_SURFACE_ROLE_TRANSCIENT; + surface->role = WLR_WL_SHELL_SURFACE_ROLE_TRANSIENT; wl_signal_emit(&surface->events.set_role, surface); } @@ -167,17 +167,17 @@ static void shell_surface_set_popup(struct wl_client *client, return; } - struct wlr_wl_shell_surface_transient_state *transcient_state = + struct wlr_wl_shell_surface_transient_state *transient_state = calloc(1, sizeof(struct wlr_wl_shell_surface_transient_state)); - if (transcient_state == NULL) { + if (transient_state == NULL) { wl_client_post_no_memory(client); return; } - transcient_state->parent = parent; - transcient_state->x = x; - transcient_state->y = y; - transcient_state->flags = flags; + transient_state->parent = parent; + transient_state->x = x; + transient_state->y = y; + transient_state->flags = flags; struct wlr_wl_shell_surface_popup_state *popup_state = calloc(1, sizeof(struct wlr_wl_shell_surface_transient_state)); @@ -190,7 +190,7 @@ static void shell_surface_set_popup(struct wl_client *client, popup_state->serial = serial; free(surface->transient_state); - surface->transient_state = transcient_state; + surface->transient_state = transient_state; free(surface->popup_state); surface->popup_state = popup_state; -- cgit v1.2.3 From 3d03ef2d024add0cb663ab69946da310cd2338ab Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 28 Sep 2017 12:45:47 +0200 Subject: role -> state --- include/wlr/types/wlr_wl_shell.h | 14 +++++++------- types/wlr_wl_shell.c | 24 ++++++++++++------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/wlr/types/wlr_wl_shell.h b/include/wlr/types/wlr_wl_shell.h index 60398629..d6791247 100644 --- a/include/wlr/types/wlr_wl_shell.h +++ b/include/wlr/types/wlr_wl_shell.h @@ -29,11 +29,11 @@ struct wlr_wl_shell_surface_popup_state { uint32_t serial; }; -enum wlr_wl_shell_surface_role { - WLR_WL_SHELL_SURFACE_ROLE_NONE, - WLR_WL_SHELL_SURFACE_ROLE_TOPLEVEL, - WLR_WL_SHELL_SURFACE_ROLE_TRANSIENT, - WLR_WL_SHELL_SURFACE_ROLE_POPUP, +enum wlr_wl_shell_surface_state { + WLR_WL_SHELL_SURFACE_STATE_NONE, + WLR_WL_SHELL_SURFACE_STATE_TOPLEVEL, + WLR_WL_SHELL_SURFACE_STATE_TRANSIENT, + WLR_WL_SHELL_SURFACE_STATE_POPUP, }; struct wlr_wl_shell_surface { @@ -46,7 +46,7 @@ struct wlr_wl_shell_surface { uint32_t ping_serial; struct wl_event_source *ping_timer; - enum wlr_wl_shell_surface_role role; + enum wlr_wl_shell_surface_state state; struct wlr_wl_shell_surface_transient_state *transient_state; struct wlr_wl_shell_surface_popup_state *popup_state; @@ -64,7 +64,7 @@ struct wlr_wl_shell_surface { struct wl_signal request_set_fullscreen; struct wl_signal request_set_maximized; - struct wl_signal set_role; + struct wl_signal set_state; struct wl_signal set_title; struct wl_signal set_class; } events; diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c index 5c78deff..4abec95e 100644 --- a/types/wlr_wl_shell.c +++ b/types/wlr_wl_shell.c @@ -77,13 +77,13 @@ static void shell_surface_set_toplevel(struct wl_client *client, wlr_log(L_DEBUG, "got shell surface toplevel"); struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource); - if (surface->role != WLR_WL_SHELL_SURFACE_ROLE_NONE) { + if (surface->state != WLR_WL_SHELL_SURFACE_STATE_NONE) { return; } - surface->role = WLR_WL_SHELL_SURFACE_ROLE_TOPLEVEL; + surface->state = WLR_WL_SHELL_SURFACE_STATE_TOPLEVEL; - wl_signal_emit(&surface->events.set_role, surface); + wl_signal_emit(&surface->events.set_state, surface); } static void shell_surface_set_transient(struct wl_client *client, @@ -95,7 +95,7 @@ static void shell_surface_set_transient(struct wl_client *client, wl_resource_get_user_data(parent_resource); // TODO: check if parent_resource == NULL? - if (surface->role != WLR_WL_SHELL_SURFACE_ROLE_NONE) { + if (surface->state != WLR_WL_SHELL_SURFACE_STATE_NONE) { return; } @@ -114,9 +114,9 @@ static void shell_surface_set_transient(struct wl_client *client, free(surface->transient_state); surface->transient_state = state; - surface->role = WLR_WL_SHELL_SURFACE_ROLE_TRANSIENT; + surface->state = WLR_WL_SHELL_SURFACE_STATE_TRANSIENT; - wl_signal_emit(&surface->events.set_role, surface); + wl_signal_emit(&surface->events.set_state, surface); } static void shell_surface_set_fullscreen(struct wl_client *client, @@ -129,7 +129,7 @@ static void shell_surface_set_fullscreen(struct wl_client *client, output = wl_resource_get_user_data(output_resource); } - if (surface->role == WLR_WL_SHELL_SURFACE_ROLE_TOPLEVEL) { + if (surface->state == WLR_WL_SHELL_SURFACE_STATE_TOPLEVEL) { return; } @@ -163,7 +163,7 @@ static void shell_surface_set_popup(struct wl_client *client, wl_resource_get_user_data(parent_resource); // TODO: check if parent_resource == NULL? - if (surface->role != WLR_WL_SHELL_SURFACE_ROLE_NONE) { + if (surface->state != WLR_WL_SHELL_SURFACE_STATE_NONE) { return; } @@ -195,9 +195,9 @@ static void shell_surface_set_popup(struct wl_client *client, free(surface->popup_state); surface->popup_state = popup_state; - surface->role = WLR_WL_SHELL_SURFACE_ROLE_POPUP; + surface->state = WLR_WL_SHELL_SURFACE_STATE_POPUP; - wl_signal_emit(&surface->events.set_role, surface); + wl_signal_emit(&surface->events.set_state, surface); } static void shell_surface_set_maximized(struct wl_client *client, @@ -209,7 +209,7 @@ static void shell_surface_set_maximized(struct wl_client *client, output = wl_resource_get_user_data(output_resource); } - if (surface->role == WLR_WL_SHELL_SURFACE_ROLE_TOPLEVEL) { + if (surface->state == WLR_WL_SHELL_SURFACE_STATE_TOPLEVEL) { return; } @@ -336,7 +336,7 @@ static void wl_shell_get_shell_surface(struct wl_client *client, wl_signal_init(&wl_surface->events.request_resize); wl_signal_init(&wl_surface->events.request_set_fullscreen); wl_signal_init(&wl_surface->events.request_set_maximized); - wl_signal_init(&wl_surface->events.set_role); + wl_signal_init(&wl_surface->events.set_state); wl_signal_init(&wl_surface->events.set_title); wl_signal_init(&wl_surface->events.set_class); -- cgit v1.2.3 From dbdfc464487c0c564e4af7eace62bf1bdbed4751 Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 28 Sep 2017 13:06:59 +0200 Subject: Add helper shell_surface_set_state --- types/wlr_wl_shell.c | 70 +++++++++++++++++++--------------------------------- 1 file changed, 26 insertions(+), 44 deletions(-) diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c index 4abec95e..5bf1ec80 100644 --- a/types/wlr_wl_shell.c +++ b/types/wlr_wl_shell.c @@ -35,7 +35,6 @@ static void shell_surface_move(struct wl_client *client, wl_client_post_no_memory(client); return; } - event->client = client; event->surface = surface; event->seat_handle = seat_handle; @@ -60,7 +59,6 @@ static void shell_surface_resize(struct wl_client *client, wl_client_post_no_memory(client); return; } - event->client = client; event->surface = surface; event->seat_handle = seat_handle; @@ -72,18 +70,25 @@ static void shell_surface_resize(struct wl_client *client, free(event); } +static void shell_surface_set_state(struct wlr_wl_shell_surface *surface, + enum wlr_wl_shell_surface_state state, + struct wlr_wl_shell_surface_transient_state *transient_state, + struct wlr_wl_shell_surface_popup_state *popup_state) { + surface->state = state; + free(surface->transient_state); + surface->transient_state = transient_state; + free(surface->popup_state); + surface->popup_state = popup_state; + + wl_signal_emit(&surface->events.set_state, surface); +} + static void shell_surface_set_toplevel(struct wl_client *client, struct wl_resource *resource) { wlr_log(L_DEBUG, "got shell surface toplevel"); struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource); - - if (surface->state != WLR_WL_SHELL_SURFACE_STATE_NONE) { - return; - } - - surface->state = WLR_WL_SHELL_SURFACE_STATE_TOPLEVEL; - - wl_signal_emit(&surface->events.set_state, surface); + shell_surface_set_state(surface, WLR_WL_SHELL_SURFACE_STATE_TOPLEVEL, NULL, + NULL); } static void shell_surface_set_transient(struct wl_client *client, @@ -95,28 +100,19 @@ static void shell_surface_set_transient(struct wl_client *client, wl_resource_get_user_data(parent_resource); // TODO: check if parent_resource == NULL? - if (surface->state != WLR_WL_SHELL_SURFACE_STATE_NONE) { - return; - } - - struct wlr_wl_shell_surface_transient_state *state = + struct wlr_wl_shell_surface_transient_state *transient_state = calloc(1, sizeof(struct wlr_wl_shell_surface_transient_state)); - if (state == NULL) { + if (transient_state == NULL) { wl_client_post_no_memory(client); return; } + transient_state->parent = parent; + transient_state->x = x; + transient_state->y = y; + transient_state->flags = flags; - state->parent = parent; - state->x = x; - state->y = y; - state->flags = flags; - - free(surface->transient_state); - surface->transient_state = state; - - surface->state = WLR_WL_SHELL_SURFACE_STATE_TRANSIENT; - - wl_signal_emit(&surface->events.set_state, surface); + shell_surface_set_state(surface, WLR_WL_SHELL_SURFACE_STATE_TRANSIENT, + transient_state, NULL); } static void shell_surface_set_fullscreen(struct wl_client *client, @@ -139,7 +135,6 @@ static void shell_surface_set_fullscreen(struct wl_client *client, wl_client_post_no_memory(client); return; } - event->client = client; event->surface = surface; event->method = method; @@ -163,17 +158,12 @@ static void shell_surface_set_popup(struct wl_client *client, wl_resource_get_user_data(parent_resource); // TODO: check if parent_resource == NULL? - if (surface->state != WLR_WL_SHELL_SURFACE_STATE_NONE) { - return; - } - struct wlr_wl_shell_surface_transient_state *transient_state = calloc(1, sizeof(struct wlr_wl_shell_surface_transient_state)); if (transient_state == NULL) { wl_client_post_no_memory(client); return; } - transient_state->parent = parent; transient_state->x = x; transient_state->y = y; @@ -182,22 +172,15 @@ static void shell_surface_set_popup(struct wl_client *client, struct wlr_wl_shell_surface_popup_state *popup_state = calloc(1, sizeof(struct wlr_wl_shell_surface_transient_state)); if (popup_state == NULL) { + free(transient_state); wl_client_post_no_memory(client); return; } - popup_state->seat_handle = seat_handle; popup_state->serial = serial; - free(surface->transient_state); - surface->transient_state = transient_state; - - free(surface->popup_state); - surface->popup_state = popup_state; - - surface->state = WLR_WL_SHELL_SURFACE_STATE_POPUP; - - wl_signal_emit(&surface->events.set_state, surface); + shell_surface_set_state(surface, WLR_WL_SHELL_SURFACE_STATE_POPUP, + transient_state, popup_state); } static void shell_surface_set_maximized(struct wl_client *client, @@ -219,7 +202,6 @@ static void shell_surface_set_maximized(struct wl_client *client, wl_client_post_no_memory(client); return; } - event->client = client; event->surface = surface; event->output = output; -- cgit v1.2.3 From 9d405cffa79d8de6378eca84fcd3881a5f68107c Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 28 Sep 2017 13:12:01 +0200 Subject: Use enums instead of uint32_t where applicable --- include/wlr/types/wlr_wl_shell.h | 6 +++--- types/wlr_wl_shell.c | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/include/wlr/types/wlr_wl_shell.h b/include/wlr/types/wlr_wl_shell.h index d6791247..0b18a131 100644 --- a/include/wlr/types/wlr_wl_shell.h +++ b/include/wlr/types/wlr_wl_shell.h @@ -21,7 +21,7 @@ struct wlr_wl_shell_surface_transient_state { struct wlr_wl_shell_surface *parent; int32_t x; int32_t y; - uint32_t flags; + enum wl_shell_surface_transient flags; }; struct wlr_wl_shell_surface_popup_state { @@ -84,13 +84,13 @@ struct wlr_wl_shell_surface_resize_event { struct wlr_wl_shell_surface *surface; struct wlr_seat_handle *seat_handle; uint32_t serial; - uint32_t edges; + enum wl_shell_surface_resize edges; }; struct wlr_wl_shell_surface_set_fullscreen_event { struct wl_client *client; struct wlr_wl_shell_surface *surface; - uint32_t method; + enum wl_shell_surface_fullscreen_method method; uint32_t framerate; struct wlr_output *output; }; diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c index 5bf1ec80..9283a635 100644 --- a/types/wlr_wl_shell.c +++ b/types/wlr_wl_shell.c @@ -47,7 +47,7 @@ static void shell_surface_move(struct wl_client *client, static void shell_surface_resize(struct wl_client *client, struct wl_resource *resource, struct wl_resource *seat_resource, - uint32_t serial, uint32_t edges) { + uint32_t serial, enum wl_shell_surface_resize edges) { wlr_log(L_DEBUG, "got shell surface resize"); struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource); struct wlr_seat_handle *seat_handle = @@ -93,7 +93,7 @@ static void shell_surface_set_toplevel(struct wl_client *client, static void shell_surface_set_transient(struct wl_client *client, struct wl_resource *resource, struct wl_resource *parent_resource, - int32_t x, int32_t y, uint32_t flags) { + int32_t x, int32_t y, enum wl_shell_surface_transient flags) { wlr_log(L_DEBUG, "got shell surface transient"); struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource); struct wlr_wl_shell_surface *parent = @@ -116,7 +116,8 @@ static void shell_surface_set_transient(struct wl_client *client, } static void shell_surface_set_fullscreen(struct wl_client *client, - struct wl_resource *resource, uint32_t method, uint32_t framerate, + struct wl_resource *resource, + enum wl_shell_surface_fullscreen_method method, uint32_t framerate, struct wl_resource *output_resource) { wlr_log(L_DEBUG, "got shell surface fullscreen"); struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource); @@ -149,7 +150,7 @@ static void shell_surface_set_fullscreen(struct wl_client *client, static void shell_surface_set_popup(struct wl_client *client, struct wl_resource *resource, struct wl_resource *seat_resource, uint32_t serial, struct wl_resource *parent_resource, int32_t x, int32_t y, - uint32_t flags) { + enum wl_shell_surface_transient flags) { wlr_log(L_DEBUG, "got shell surface popup"); struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource); struct wlr_seat_handle *seat_handle = -- cgit v1.2.3 From 55d246218013afb8a0c75be852fbc22bca3bbcbd Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 28 Sep 2017 13:34:22 +0200 Subject: Remove ping_timer when destroying wlr_wl_shell_surface --- rootston/wl_shell.c | 2 +- types/wlr_wl_shell.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/rootston/wl_shell.c b/rootston/wl_shell.c index 2b850d09..72725c7f 100644 --- a/rootston/wl_shell.c +++ b/rootston/wl_shell.c @@ -56,7 +56,7 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) { struct wlr_wl_shell_surface *surface = data; wlr_log(L_DEBUG, "new shell surface: title=%s, class=%s", surface->title, surface->class); - wlr_wl_shell_surface_ping(surface); // TODO: segfaults + wlr_wl_shell_surface_ping(surface); struct roots_wl_shell_surface *roots_surface = calloc(1, sizeof(struct roots_wl_shell_surface)); diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c index 9283a635..23b14ad0 100644 --- a/types/wlr_wl_shell.c +++ b/types/wlr_wl_shell.c @@ -262,6 +262,7 @@ static void wl_shell_surface_destroy(struct wlr_wl_shell_surface *surface) { wl_resource_set_user_data(surface->resource, NULL); wl_list_remove(&surface->link); wl_list_remove(&surface->surface_destroy_listener.link); + wl_event_source_remove(surface->ping_timer); free(surface->transient_state); free(surface->popup_state); free(surface->title); -- cgit v1.2.3 From 643a69f0b230f5847487f8e8140699a1d2987263 Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 28 Sep 2017 13:41:17 +0200 Subject: Call wlr_surface_set_role in wl_shell_get_shell_surface --- types/wlr_wl_shell.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c index 23b14ad0..3f0bbf4e 100644 --- a/types/wlr_wl_shell.c +++ b/types/wlr_wl_shell.c @@ -9,6 +9,8 @@ #include #include +static const char *wlr_wl_shell_surface_role = "wl_shell_surface"; + static void shell_surface_pong(struct wl_client *client, struct wl_resource *resource, uint32_t serial) { wlr_log(L_DEBUG, "got shell surface pong"); @@ -296,6 +298,11 @@ static void wl_shell_get_shell_surface(struct wl_client *client, struct wl_resource *resource, uint32_t id, struct wl_resource *surface_resource) { struct wlr_surface *surface = wl_resource_get_user_data(surface_resource); + if (wlr_surface_set_role(surface, wlr_wl_shell_surface_role, + resource, WL_SHELL_ERROR_ROLE)) { + return; + } + struct wlr_wl_shell *wl_shell = wl_resource_get_user_data(resource); struct wlr_wl_shell_surface *wl_surface = calloc(1, sizeof(struct wlr_wl_shell_surface)); -- cgit v1.2.3 From baed05b55ec1b4400e52766a9e8b07c2e37f371a Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 28 Sep 2017 13:46:30 +0200 Subject: Add TODO for pointer grab in set_popup --- types/wlr_wl_shell.c | 1 + 1 file changed, 1 insertion(+) diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c index 3f0bbf4e..5381cc1c 100644 --- a/types/wlr_wl_shell.c +++ b/types/wlr_wl_shell.c @@ -153,6 +153,7 @@ static void shell_surface_set_popup(struct wl_client *client, struct wl_resource *resource, struct wl_resource *seat_resource, uint32_t serial, struct wl_resource *parent_resource, int32_t x, int32_t y, enum wl_shell_surface_transient flags) { + // TODO: do a pointer grab wlr_log(L_DEBUG, "got shell surface popup"); struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource); struct wlr_seat_handle *seat_handle = -- cgit v1.2.3 From 8146d60a877ea4e0f1e8f98e48f9859cf7378b4b Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 28 Sep 2017 19:24:33 +0200 Subject: Fix 80 char limit with 4 width tabs --- types/wlr_wl_shell.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c index 5381cc1c..80b8567b 100644 --- a/types/wlr_wl_shell.c +++ b/types/wlr_wl_shell.c @@ -151,8 +151,8 @@ static void shell_surface_set_fullscreen(struct wl_client *client, static void shell_surface_set_popup(struct wl_client *client, struct wl_resource *resource, struct wl_resource *seat_resource, - uint32_t serial, struct wl_resource *parent_resource, int32_t x, int32_t y, - enum wl_shell_surface_transient flags) { + uint32_t serial, struct wl_resource *parent_resource, int32_t x, + int32_t y, enum wl_shell_surface_transient flags) { // TODO: do a pointer grab wlr_log(L_DEBUG, "got shell surface popup"); struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource); @@ -316,11 +316,13 @@ static void wl_shell_get_shell_surface(struct wl_client *client, wl_surface->client = client; wl_surface->surface = surface; - wl_surface->resource = wl_resource_create(client, &wl_shell_surface_interface, - wl_resource_get_version(resource), id); - wlr_log(L_DEBUG, "new wl_shell %p (res %p)", wl_surface, wl_surface->resource); + wl_surface->resource = wl_resource_create(client, + &wl_shell_surface_interface, wl_resource_get_version(resource), id); + wlr_log(L_DEBUG, "new wl_shell %p (res %p)", wl_surface, + wl_surface->resource); wl_resource_set_implementation(wl_surface->resource, - &shell_surface_interface, wl_surface, wl_shell_surface_resource_destroy); + &shell_surface_interface, wl_surface, + wl_shell_surface_resource_destroy); wl_signal_init(&wl_surface->events.destroy); wl_signal_init(&wl_surface->events.ping_timeout); @@ -361,14 +363,15 @@ static void wl_shell_bind(struct wl_client *wl_client, void *_wl_shell, struct wlr_wl_shell *wl_shell = _wl_shell; assert(wl_client && wl_shell); if (version > 1) { - wlr_log(L_ERROR, "Client requested unsupported wl_shell version, disconnecting"); + 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, - wl_shell, wl_shell_destroy); + struct wl_resource *wl_resource = wl_resource_create(wl_client, + &wl_shell_interface, version, id); + wl_resource_set_implementation(wl_resource, &wl_shell_impl, wl_shell, + wl_shell_destroy); wl_list_insert(&wl_shell->wl_resources, wl_resource_get_link(wl_resource)); } @@ -378,8 +381,8 @@ struct wlr_wl_shell *wlr_wl_shell_create(struct wl_display *display) { return NULL; } wl_shell->ping_timeout = 10000; - struct wl_global *wl_global = wl_global_create(display, - &wl_shell_interface, 1, wl_shell, wl_shell_bind); + struct wl_global *wl_global = wl_global_create(display, &wl_shell_interface, + 1, wl_shell, wl_shell_bind); if (!wl_global) { free(wl_shell); return NULL; -- cgit v1.2.3