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

xdg-shell: role-committed func

This commit is contained in:
Tony Crisci 2017-12-27 06:15:25 -05:00
parent 5a18f62fee
commit d5ffa26564
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,10 +122,8 @@ struct wlr_xdg_surface_v6 {
struct wlr_box *geometry; struct wlr_box *geometry;
struct wl_listener surface_destroy_listener; struct wl_listener surface_destroy_listener;
struct wl_listener surface_commit_listener;
struct { struct {
struct wl_signal commit;
struct wl_signal destroy; struct wl_signal destroy;
struct wl_signal ping_timeout; struct wl_signal ping_timeout;

2
rootston/xdg_shell_v6.c
View File

@ -253,7 +253,7 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
return; return;
} }
roots_surface->commit.notify = handle_commit; roots_surface->commit.notify = handle_commit;
wl_signal_add(&surface->events.commit, &roots_surface->commit); wl_signal_add(&surface->surface->events.commit, &roots_surface->commit);
roots_surface->destroy.notify = handle_destroy; roots_surface->destroy.notify = handle_destroy;
wl_signal_add(&surface->events.destroy, &roots_surface->destroy); wl_signal_add(&surface->events.destroy, &roots_surface->destroy);
roots_surface->request_move.notify = handle_request_move; roots_surface->request_move.notify = handle_request_move;

17
types/wlr_xdg_shell_v6.c
View File

@ -209,7 +209,7 @@ static void xdg_surface_destroy(struct wlr_xdg_surface_v6 *surface) {
wl_resource_set_user_data(surface->resource, NULL); wl_resource_set_user_data(surface->resource, NULL);
wl_list_remove(&surface->link); wl_list_remove(&surface->link);
wl_list_remove(&surface->surface_destroy_listener.link); wl_list_remove(&surface->surface_destroy_listener.link);
wl_list_remove(&surface->surface_commit_listener.link); wlr_surface_set_role_committed(surface->surface, NULL, NULL);
free(surface->geometry); free(surface->geometry);
free(surface->next_geometry); free(surface->next_geometry);
free(surface->title); free(surface->title);
@ -1047,10 +1047,9 @@ static void wlr_xdg_surface_v6_popup_committed(
} }
} }
static void handle_wlr_surface_committed(struct wl_listener *listener, static void handle_wlr_surface_committed(struct wlr_surface *wlr_surface,
void *data) { void *role_data) {
struct wlr_xdg_surface_v6 *surface = struct wlr_xdg_surface_v6 *surface = role_data;
wl_container_of(listener, surface, surface_commit_listener);
if (wlr_surface_has_buffer(surface->surface) && !surface->configured) { if (wlr_surface_has_buffer(surface->surface) && !surface->configured) {
wl_resource_post_error(surface->resource, wl_resource_post_error(surface->resource,
@ -1085,8 +1084,6 @@ static void handle_wlr_surface_committed(struct wl_listener *listener,
surface->added = true; surface->added = true;
wl_signal_emit(&surface->client->shell->events.new_surface, surface); wl_signal_emit(&surface->client->shell->events.new_surface, surface);
} }
wl_signal_emit(&surface->events.commit, surface);
} }
static void xdg_shell_get_xdg_surface(struct wl_client *wl_client, static void xdg_shell_get_xdg_surface(struct wl_client *wl_client,
@ -1148,7 +1145,6 @@ static void xdg_shell_get_xdg_surface(struct wl_client *wl_client,
wl_signal_init(&surface->events.request_move); wl_signal_init(&surface->events.request_move);
wl_signal_init(&surface->events.request_resize); wl_signal_init(&surface->events.request_resize);
wl_signal_init(&surface->events.request_show_window_menu); wl_signal_init(&surface->events.request_show_window_menu);
wl_signal_init(&surface->events.commit);
wl_signal_init(&surface->events.destroy); wl_signal_init(&surface->events.destroy);
wl_signal_init(&surface->events.ping_timeout); wl_signal_init(&surface->events.ping_timeout);
@ -1156,9 +1152,8 @@ static void xdg_shell_get_xdg_surface(struct wl_client *wl_client,
&surface->surface_destroy_listener); &surface->surface_destroy_listener);
surface->surface_destroy_listener.notify = handle_wlr_surface_destroyed; surface->surface_destroy_listener.notify = handle_wlr_surface_destroyed;
wl_signal_add(&surface->surface->events.commit, wlr_surface_set_role_committed(surface->surface,
&surface->surface_commit_listener); handle_wlr_surface_committed, surface);
surface->surface_commit_listener.notify = handle_wlr_surface_committed;
wlr_log(L_DEBUG, "new xdg_surface %p (res %p)", surface, surface->resource); wlr_log(L_DEBUG, "new xdg_surface %p (res %p)", surface, surface->resource);
wl_resource_set_implementation(surface->resource, wl_resource_set_implementation(surface->resource,