From e521b0404bb1a50326404a47bdb510f8fc46898e Mon Sep 17 00:00:00 2001 From: emersion Date: Tue, 24 Oct 2017 21:56:18 +0200 Subject: [PATCH 1/3] Add server-decoration skeleton --- include/wlr/types/wlr_server_decoration.h | 29 +++++++ protocol/meson.build | 2 + protocol/server-decoration.xml | 94 +++++++++++++++++++++++ types/meson.build | 1 + types/wlr_server_decoration.c | 64 +++++++++++++++ 5 files changed, 190 insertions(+) create mode 100644 include/wlr/types/wlr_server_decoration.h create mode 100644 protocol/server-decoration.xml create mode 100644 types/wlr_server_decoration.c diff --git a/include/wlr/types/wlr_server_decoration.h b/include/wlr/types/wlr_server_decoration.h new file mode 100644 index 00000000..11c2511c --- /dev/null +++ b/include/wlr/types/wlr_server_decoration.h @@ -0,0 +1,29 @@ +#ifndef WLR_TYPES_WLR_SERVER_DECORATION_H +#define WLR_TYPES_WLR_SERVER_DECORATION_H + +#include + +struct wlr_server_decoration_manager { + struct wl_global *wl_global; + struct wl_list decorations; // wlr_server_decoration::link + + void *data; +}; + +struct wlr_server_decoration { + struct wl_resource *resource; + struct wl_list link; + + struct { + struct wl_signal destroy; + } events; + + void *data; +}; + +struct wlr_server_decoration_manager *wlr_server_decoration_manager_create( + struct wl_display *display); +void wlr_server_decoration_manager_destroy( + struct wlr_server_decoration_manager *manager); + +#endif diff --git a/protocol/meson.build b/protocol/meson.build index 2cbb5b6d..ff54815a 100644 --- a/protocol/meson.build +++ b/protocol/meson.build @@ -24,12 +24,14 @@ protocols = [ [wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml'], 'gamma-control.xml', 'screenshooter.xml', + 'server-decoration.xml', ] client_protocols = [ [wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml'], 'gamma-control.xml', 'screenshooter.xml', + 'server-decoration.xml', ] wl_protos_src = [] diff --git a/protocol/server-decoration.xml b/protocol/server-decoration.xml new file mode 100644 index 00000000..45f11284 --- /dev/null +++ b/protocol/server-decoration.xml @@ -0,0 +1,94 @@ + + + . + ]]> + + + This interface allows to coordinate whether the server should create + a server-side window decoration around a wl_surface representing a + shell surface (wl_shell_surface or similar). By announcing support + for this interface the server indicates that it supports server + side decorations. + + + + When a client creates a server-side decoration object it indicates + that it supports the protocol. The client is supposed to tell the + server whether it wants server-side decorations or will provide + client-side decorations. + + If the client does not create a server-side decoration object for + a surface the server interprets this as lack of support for this + protocol and considers it as client-side decorated. Nevertheless a + client-side decorated surface should use this protocol to indicate + to the server that it does not want a server-side deco. + + + + + + + + + + + + + This event is emitted directly after binding the interface. It contains + the default mode for the decoration. When a new server decoration object + is created this new object will be in the default mode until the first + request_mode is requested. + + The server may change the default mode at any time. + + + + + + + + + + + + + + + + + + + + + This event is emitted directly after the decoration is created and + represents the base decoration policy by the server. E.g. a server + which wants all surfaces to be client-side decorated will send Client, + a server which wants server-side decoration will send Server. + + The client can request a different mode through the decoration request. + The server will acknowledge this by another event with the same mode. So + even if a server prefers server-side decoration it's possible to force a + client-side decoration. + + The server may emit this event at any time. In this case the client can + again request a different mode. It's the responsibility of the server to + prevent a feedback loop. + + + + + diff --git a/types/meson.build b/types/meson.build index cc21f209..2603ecfd 100644 --- a/types/meson.build +++ b/types/meson.build @@ -15,6 +15,7 @@ lib_wlr_types = static_library( 'wlr_region.c', 'wlr_screenshooter.c', 'wlr_seat.c', + 'wlr_server_decoration.c', 'wlr_surface.c', 'wlr_tablet_pad.c', 'wlr_tablet_tool.c', diff --git a/types/wlr_server_decoration.c b/types/wlr_server_decoration.c new file mode 100644 index 00000000..9c34304b --- /dev/null +++ b/types/wlr_server_decoration.c @@ -0,0 +1,64 @@ +#include +#include +#include +#include + +static const struct org_kde_kwin_server_decoration_manager_interface +server_decoration_manager_impl = { + // TODO +}; + +static void server_decoration_manager_bind(struct wl_client *client, + void *_manager, uint32_t version, uint32_t id) { + struct wlr_server_decoration_manager *manager = _manager; + assert(client && manager); + + struct wl_resource *resource = wl_resource_create(client, + &org_kde_kwin_server_decoration_manager_interface, version, id); + if (resource == NULL) { + wl_client_post_no_memory(client); + return; + } + wl_resource_set_implementation(resource, &server_decoration_manager_impl, + manager, NULL); +} + +static void server_decoration_destroy( + struct wlr_server_decoration *decoration) { + wl_signal_emit(&decoration->events.destroy, decoration); + wl_resource_set_user_data(decoration->resource, NULL); + wl_list_remove(&decoration->link); + free(decoration); +} + +struct wlr_server_decoration_manager *wlr_server_decoration_manager_create( + struct wl_display *display) { + struct wlr_server_decoration_manager *manager = + calloc(1, sizeof(struct wlr_server_decoration_manager)); + if (manager == NULL) { + return NULL; + } + manager->wl_global = wl_global_create(display, + &org_kde_kwin_server_decoration_manager_interface, 1, manager, + server_decoration_manager_bind); + if (manager->wl_global == NULL) { + free(manager); + return NULL; + } + wl_list_init(&manager->decorations); + return manager; +} + +void wlr_server_decoration_manager_destroy( + struct wlr_server_decoration_manager *manager) { + if (manager == NULL) { + return; + } + struct wlr_server_decoration *decoration, *tmp; + wl_list_for_each_safe(decoration, tmp, &manager->decorations, + link) { + server_decoration_destroy(decoration); + } + wl_global_destroy(manager->wl_global); + free(manager); +} From e84d573b9127a431671e1f74773aee53830f8d09 Mon Sep 17 00:00:00 2001 From: emersion Date: Tue, 24 Oct 2017 23:22:27 +0200 Subject: [PATCH 2/3] Complete server-decoration implementation --- include/wlr/types/wlr_server_decoration.h | 20 +++ types/wlr_server_decoration.c | 144 ++++++++++++++++++++-- 2 files changed, 153 insertions(+), 11 deletions(-) diff --git a/include/wlr/types/wlr_server_decoration.h b/include/wlr/types/wlr_server_decoration.h index 11c2511c..059aa77f 100644 --- a/include/wlr/types/wlr_server_decoration.h +++ b/include/wlr/types/wlr_server_decoration.h @@ -5,25 +5,45 @@ struct wlr_server_decoration_manager { struct wl_global *wl_global; + struct wl_list wl_resources; struct wl_list decorations; // wlr_server_decoration::link + uint32_t default_mode; // enum org_kde_kwin_server_decoration_manager_mode + + struct { + struct wl_signal new_decoration; + } events; + void *data; }; struct wlr_server_decoration { struct wl_resource *resource; + struct wlr_surface *surface; struct wl_list link; + // enum org_kde_kwin_server_decoration_manager_mode + uint32_t requested_mode; + uint32_t sent_mode; + struct { struct wl_signal destroy; + struct wl_signal request_mode; } events; + struct wl_listener surface_destroy_listener; + void *data; }; struct wlr_server_decoration_manager *wlr_server_decoration_manager_create( struct wl_display *display); +void wlr_server_decoration_manager_set_default_mode( + struct wlr_server_decoration_manager *manager, uint32_t default_mode); void wlr_server_decoration_manager_destroy( struct wlr_server_decoration_manager *manager); +void wlr_server_decoration_send_mode(struct wlr_server_decoration *decoration, + uint32_t mode); + #endif diff --git a/types/wlr_server_decoration.c b/types/wlr_server_decoration.c index 9c34304b..0d276445 100644 --- a/types/wlr_server_decoration.c +++ b/types/wlr_server_decoration.c @@ -1,13 +1,131 @@ #include #include #include +#include #include +#include + +static void server_decoration_handle_release(struct wl_client *client, + struct wl_resource *resource) { + wl_resource_destroy(resource); +} + +static void server_decoration_handle_request_mode(struct wl_client *client, + struct wl_resource *resource, uint32_t mode) { + struct wlr_server_decoration *decoration = + wl_resource_get_user_data(resource); + decoration->requested_mode = mode; + wl_signal_emit(&decoration->events.request_mode, decoration); +} + +void wlr_server_decoration_send_mode(struct wlr_server_decoration *decoration, + uint32_t mode) { + if (decoration->sent_mode == mode) { + return; + } + org_kde_kwin_server_decoration_send_mode(decoration->resource, mode); + decoration->sent_mode = mode; +} + +static void server_decoration_destroy( + struct wlr_server_decoration *decoration) { + wl_signal_emit(&decoration->events.destroy, decoration); + wl_list_remove(&decoration->surface_destroy_listener.link); + wl_resource_set_user_data(decoration->resource, NULL); + wl_list_remove(&decoration->link); + free(decoration); +} + +static void server_decoration_destroy_resource(struct wl_resource *resource) { + struct wlr_server_decoration *decoration = + wl_resource_get_user_data(resource); + if (decoration != NULL) { + server_decoration_destroy(decoration); + } +} + +static void server_decoration_handle_surface_destroy( + struct wl_listener *listener, void *data) { + struct wlr_server_decoration *decoration = + wl_container_of(listener, decoration, surface_destroy_listener); + server_decoration_destroy(decoration); +} + +static const struct org_kde_kwin_server_decoration_interface +server_decoration_impl = { + .release = server_decoration_handle_release, + .request_mode = server_decoration_handle_request_mode, +}; + +static void server_decoration_manager_handle_create(struct wl_client *client, + struct wl_resource *manager_resource, uint32_t id, + struct wl_resource *surface_resource) { + struct wlr_server_decoration_manager *manager = + wl_resource_get_user_data(manager_resource); + struct wlr_surface *surface = wl_resource_get_user_data(surface_resource); + + struct wlr_server_decoration *decoration = + calloc(1, sizeof(struct wlr_server_decoration)); + if (decoration == NULL) { + wl_client_post_no_memory(client); + return; + } + decoration->surface = surface; + decoration->requested_mode = + ORG_KDE_KWIN_SERVER_DECORATION_MANAGER_MODE_NONE; + + int version = wl_resource_get_version(manager_resource); + decoration->resource = wl_resource_create(client, + &org_kde_kwin_server_decoration_interface, version, id); + if (decoration->resource == NULL) { + wl_client_post_no_memory(client); + free(decoration); + return; + } + wl_resource_set_implementation(decoration->resource, + &server_decoration_impl, decoration, + server_decoration_destroy_resource); + + wlr_log(L_DEBUG, "new server_decoration %p (res %p)", decoration, + decoration->resource); + + wl_signal_init(&decoration->events.destroy); + wl_signal_init(&decoration->events.request_mode); + + wl_signal_add(&surface->events.destroy, + &decoration->surface_destroy_listener); + decoration->surface_destroy_listener.notify = + server_decoration_handle_surface_destroy; + + wl_list_insert(&manager->decorations, &decoration->link); + + org_kde_kwin_server_decoration_send_mode(decoration->resource, + manager->default_mode); + decoration->sent_mode = manager->default_mode; + + wl_signal_emit(&manager->events.new_decoration, decoration); +} static const struct org_kde_kwin_server_decoration_manager_interface server_decoration_manager_impl = { - // TODO + .create = server_decoration_manager_handle_create, }; +void wlr_server_decoration_manager_set_default_mode( + struct wlr_server_decoration_manager *manager, uint32_t default_mode) { + manager->default_mode = default_mode; + + struct wl_resource *resource; + wl_resource_for_each(resource, &manager->wl_resources) { + org_kde_kwin_server_decoration_manager_send_default_mode(resource, + manager->default_mode); + } +} + +void server_decoration_manager_destroy_resource(struct wl_resource *resource) { + wl_list_remove(wl_resource_get_link(resource)); +} + static void server_decoration_manager_bind(struct wl_client *client, void *_manager, uint32_t version, uint32_t id) { struct wlr_server_decoration_manager *manager = _manager; @@ -20,15 +138,12 @@ static void server_decoration_manager_bind(struct wl_client *client, return; } wl_resource_set_implementation(resource, &server_decoration_manager_impl, - manager, NULL); -} + manager, server_decoration_manager_destroy_resource); -static void server_decoration_destroy( - struct wlr_server_decoration *decoration) { - wl_signal_emit(&decoration->events.destroy, decoration); - wl_resource_set_user_data(decoration->resource, NULL); - wl_list_remove(&decoration->link); - free(decoration); + wl_list_insert(&manager->wl_resources, wl_resource_get_link(resource)); + + org_kde_kwin_server_decoration_manager_send_default_mode(resource, + manager->default_mode); } struct wlr_server_decoration_manager *wlr_server_decoration_manager_create( @@ -45,7 +160,10 @@ struct wlr_server_decoration_manager *wlr_server_decoration_manager_create( free(manager); return NULL; } + manager->default_mode = ORG_KDE_KWIN_SERVER_DECORATION_MANAGER_MODE_NONE; + wl_list_init(&manager->wl_resources); wl_list_init(&manager->decorations); + wl_signal_init(&manager->events.new_decoration); return manager; } @@ -54,11 +172,15 @@ void wlr_server_decoration_manager_destroy( if (manager == NULL) { return; } - struct wlr_server_decoration *decoration, *tmp; - wl_list_for_each_safe(decoration, tmp, &manager->decorations, + struct wlr_server_decoration *decoration, *tmp_decoration; + wl_list_for_each_safe(decoration, tmp_decoration, &manager->decorations, link) { server_decoration_destroy(decoration); } + struct wl_resource *resource, *tmp_resource; + wl_resource_for_each_safe(resource, tmp_resource, &manager->wl_resources) { + server_decoration_manager_destroy_resource(resource); + } wl_global_destroy(manager->wl_global); free(manager); } From a43acae0005ec4d635f1477376fad2ff5d12d611 Mon Sep 17 00:00:00 2001 From: emersion Date: Fri, 27 Oct 2017 00:02:30 +0200 Subject: [PATCH 3/3] Send server-decoration ack event automatically --- include/rootston/desktop.h | 2 ++ include/wlr/types/wlr_server_decoration.h | 9 ++------- rootston/desktop.c | 9 ++++++++- rootston/meson.build | 2 +- types/wlr_server_decoration.c | 22 ++++++++-------------- 5 files changed, 21 insertions(+), 23 deletions(-) diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h index c3859afb..376412fb 100644 --- a/include/rootston/desktop.h +++ b/include/rootston/desktop.h @@ -37,11 +37,13 @@ struct roots_desktop { struct wlr_xdg_shell_v6 *xdg_shell_v6; struct wlr_gamma_control_manager *gamma_control_manager; struct wlr_screenshooter *screenshooter; + struct wlr_server_decoration_manager *server_decoration_manager; struct wl_listener output_add; struct wl_listener output_remove; struct wl_listener xdg_shell_v6_surface; struct wl_listener wl_shell_surface; + struct wl_listener decoration_new; #ifdef HAS_XWAYLAND struct wlr_xwayland *xwayland; diff --git a/include/wlr/types/wlr_server_decoration.h b/include/wlr/types/wlr_server_decoration.h index 059aa77f..b4cac5b7 100644 --- a/include/wlr/types/wlr_server_decoration.h +++ b/include/wlr/types/wlr_server_decoration.h @@ -22,13 +22,11 @@ struct wlr_server_decoration { struct wlr_surface *surface; struct wl_list link; - // enum org_kde_kwin_server_decoration_manager_mode - uint32_t requested_mode; - uint32_t sent_mode; + uint32_t mode; // enum org_kde_kwin_server_decoration_manager_mode struct { struct wl_signal destroy; - struct wl_signal request_mode; + struct wl_signal mode; } events; struct wl_listener surface_destroy_listener; @@ -43,7 +41,4 @@ void wlr_server_decoration_manager_set_default_mode( void wlr_server_decoration_manager_destroy( struct wlr_server_decoration_manager *manager); -void wlr_server_decoration_send_mode(struct wlr_server_decoration *decoration, - uint32_t mode); - #endif diff --git a/rootston/desktop.c b/rootston/desktop.c index 40d088b8..a9d38353 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -7,11 +7,13 @@ #include #include #include +#include #include #include #include #include -#include "rootston/desktop.h" +#include +#include "rootston/server.h" #include "rootston/server.h" void view_destroy(struct roots_view *view) { @@ -252,6 +254,11 @@ struct roots_desktop *desktop_create(struct roots_server *server, server->wl_display); desktop->screenshooter = wlr_screenshooter_create(server->wl_display, server->renderer); + desktop->server_decoration_manager = + wlr_server_decoration_manager_create(server->wl_display); + wlr_server_decoration_manager_set_default_mode( + desktop->server_decoration_manager, + ORG_KDE_KWIN_SERVER_DECORATION_MANAGER_MODE_CLIENT); return desktop; } diff --git a/rootston/meson.build b/rootston/meson.build index f2621450..53cab62d 100644 --- a/rootston/meson.build +++ b/rootston/meson.build @@ -17,5 +17,5 @@ if get_option('enable_xwayland') sources += ['xwayland.c'] endif executable( - 'rootston', sources, dependencies: wlroots + 'rootston', sources, dependencies: [wlroots, wlr_protos] ) diff --git a/types/wlr_server_decoration.c b/types/wlr_server_decoration.c index 0d276445..0664edfb 100644 --- a/types/wlr_server_decoration.c +++ b/types/wlr_server_decoration.c @@ -14,17 +14,13 @@ static void server_decoration_handle_request_mode(struct wl_client *client, struct wl_resource *resource, uint32_t mode) { struct wlr_server_decoration *decoration = wl_resource_get_user_data(resource); - decoration->requested_mode = mode; - wl_signal_emit(&decoration->events.request_mode, decoration); -} - -void wlr_server_decoration_send_mode(struct wlr_server_decoration *decoration, - uint32_t mode) { - if (decoration->sent_mode == mode) { + if (decoration->mode == mode) { return; } - org_kde_kwin_server_decoration_send_mode(decoration->resource, mode); - decoration->sent_mode = mode; + decoration->mode = mode; + wl_signal_emit(&decoration->events.mode, decoration); + org_kde_kwin_server_decoration_send_mode(decoration->resource, + decoration->mode); } static void server_decoration_destroy( @@ -71,8 +67,7 @@ static void server_decoration_manager_handle_create(struct wl_client *client, return; } decoration->surface = surface; - decoration->requested_mode = - ORG_KDE_KWIN_SERVER_DECORATION_MANAGER_MODE_NONE; + decoration->mode = manager->default_mode; int version = wl_resource_get_version(manager_resource); decoration->resource = wl_resource_create(client, @@ -90,7 +85,7 @@ static void server_decoration_manager_handle_create(struct wl_client *client, decoration->resource); wl_signal_init(&decoration->events.destroy); - wl_signal_init(&decoration->events.request_mode); + wl_signal_init(&decoration->events.mode); wl_signal_add(&surface->events.destroy, &decoration->surface_destroy_listener); @@ -100,8 +95,7 @@ static void server_decoration_manager_handle_create(struct wl_client *client, wl_list_insert(&manager->decorations, &decoration->link); org_kde_kwin_server_decoration_send_mode(decoration->resource, - manager->default_mode); - decoration->sent_mode = manager->default_mode; + decoration->mode); wl_signal_emit(&manager->events.new_decoration, decoration); }