mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xdg-shell: Add a simple destructor request

Browse Source 
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Jasper St. Pierre 2015-02-13 14:02:00 +08:00 committed by Pekka Paalanen
parent 24185e2561
commit 084aa0b6f6
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
desktop-shell/shell.c
View File

@ -3984,6 +3984,13 @@ static const struct weston_shell_client xdg_client = {
xdg_send_configure xdg_send_configure
}; };
static void
xdg_shell_destroy(struct wl_client *client,
struct wl_resource *resource)
{
wl_resource_destroy(resource);
}
static void static void
xdg_use_unstable_version(struct wl_client *client, xdg_use_unstable_version(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *resource,
@ -4194,6 +4201,7 @@ shell_surface_is_xdg_popup(struct shell_surface *shsurf)
} }
static const struct xdg_shell_interface xdg_implementation = { static const struct xdg_shell_interface xdg_implementation = {
xdg_shell_destroy,
xdg_use_unstable_version, xdg_use_unstable_version,
xdg_get_xdg_surface, xdg_get_xdg_surface,
xdg_get_xdg_popup, xdg_get_xdg_popup,
@ -4209,7 +4217,7 @@ xdg_shell_unversioned_dispatch(const void *implementation,
struct wl_resource *resource = _target; struct wl_resource *resource = _target;
struct shell_client *sc = wl_resource_get_user_data(resource); struct shell_client *sc = wl_resource_get_user_data(resource);
if (opcode != 0) { if (opcode != 1 /* XDG_SHELL_USE_UNSTABLE_VERSION */) {
wl_resource_post_error(resource, wl_resource_post_error(resource,
WL_DISPLAY_ERROR_INVALID_OBJECT, WL_DISPLAY_ERROR_INVALID_OBJECT,
"must call use_unstable_version first"); "must call use_unstable_version first");

5
protocol/xdg-shell.xml
View File

@ -52,6 +52,11 @@
<entry name="role" value="0" summary="given wl_surface has another role"/> <entry name="role" value="0" summary="given wl_surface has another role"/>
</enum> </enum>
<request name="destroy" type="destructor">
<description summary="destroy xdg_shell">
</description>
</request>
<request name="use_unstable_version"> <request name="use_unstable_version">
<description summary="enable use of this unstable version"> <description summary="enable use of this unstable version">
Negotiate the unstable version of the interface. This Negotiate the unstable version of the interface. This