From e521b0404bb1a50326404a47bdb510f8fc46898e Mon Sep 17 00:00:00 2001 From: emersion Date: Tue, 24 Oct 2017 21:56:18 +0200 Subject: [PATCH] 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); +}