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

Added KDE server side window decoration interface as fallback.

Browse Source
This commit is contained in:
Armin Novak 2019-01-22 16:13:08 +01:00
parent afd4baf4dd
commit 5c422b7c93
5 changed files with 121 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
uwac/libuwac/CMakeLists.txt
View File

@ -38,6 +38,7 @@ endmacro()
generate_protocol_file(xdg-shell) generate_protocol_file(xdg-shell)
generate_protocol_file(xdg-decoration-unstable-v1) generate_protocol_file(xdg-decoration-unstable-v1)
generate_protocol_file(server-decoration)
generate_protocol_file(ivi-application) generate_protocol_file(ivi-application)
generate_protocol_file(fullscreen-shell-unstable-v1) generate_protocol_file(fullscreen-shell-unstable-v1)
generate_protocol_file(keyboard-shortcuts-inhibit-unstable-v1) generate_protocol_file(keyboard-shortcuts-inhibit-unstable-v1)

7
uwac/libuwac/uwac-display.c
View File

@ -224,6 +224,10 @@ static void registry_handle_global(void* data, struct wl_registry* registry, uin
{ {
d->deco_manager = wl_registry_bind(registry, id, &zxdg_decoration_manager_v1_interface, 1); d->deco_manager = wl_registry_bind(registry, id, &zxdg_decoration_manager_v1_interface, 1);
} }
else if (strcmp(interface, "org_kde_kwin_server_decoration_manager") == 0)
{
d->kde_deco_manager = wl_registry_bind(registry, id, &org_kde_kwin_server_decoration_manager_interface, 1);
}
#if BUILD_IVI #if BUILD_IVI
else if (strcmp(interface, "ivi_application") == 0) else if (strcmp(interface, "ivi_application") == 0)
{ {
@ -525,6 +529,9 @@ UwacReturnCode UwacCloseDisplay(UwacDisplay** pdisplay)
if (display->deco_manager) if (display->deco_manager)
zxdg_decoration_manager_v1_destroy(display->deco_manager); zxdg_decoration_manager_v1_destroy(display->deco_manager);
if (display->kde_deco_manager)
org_kde_kwin_server_decoration_manager_destroy(display->kde_deco_manager);
#ifdef BUILD_FULLSCREEN_SHELL #ifdef BUILD_FULLSCREEN_SHELL
if (display->fullscreen_shell) if (display->fullscreen_shell)

3
uwac/libuwac/uwac-priv.h
View File

@ -30,6 +30,7 @@
#include "xdg-shell-client-protocol.h" #include "xdg-shell-client-protocol.h"
#include "keyboard-shortcuts-inhibit-unstable-v1-client-protocol.h" #include "keyboard-shortcuts-inhibit-unstable-v1-client-protocol.h"
#include "xdg-decoration-unstable-v1-client-protocol.h" #include "xdg-decoration-unstable-v1-client-protocol.h"
#include "server-decoration-client-protocol.h"
#ifdef BUILD_IVI #ifdef BUILD_IVI
#include "ivi-application-client-protocol.h" #include "ivi-application-client-protocol.h"
@ -91,6 +92,7 @@ struct uwac_display {
struct xdg_wm_base *xdg_base; struct xdg_wm_base *xdg_base;
struct zwp_keyboard_shortcuts_inhibit_manager_v1 *keyboard_inhibit_manager; struct zwp_keyboard_shortcuts_inhibit_manager_v1 *keyboard_inhibit_manager;
struct zxdg_decoration_manager_v1 *deco_manager; struct zxdg_decoration_manager_v1 *deco_manager;
struct org_kde_kwin_server_decoration_manager *kde_deco_manager;
#ifdef BUILD_IVI #ifdef BUILD_IVI
struct ivi_application *ivi_application; struct ivi_application *ivi_application;
#endif #endif
@ -219,6 +221,7 @@ struct uwac_window {
struct xdg_surface *xdg_surface; struct xdg_surface *xdg_surface;
struct xdg_toplevel *xdg_toplevel; struct xdg_toplevel *xdg_toplevel;
struct zxdg_toplevel_decoration_v1 *deco; struct zxdg_toplevel_decoration_v1 *deco;
struct org_kde_kwin_server_decoration *kde_deco;
#ifdef BUILD_IVI #ifdef BUILD_IVI
struct ivi_surface *ivi_surface; struct ivi_surface *ivi_surface;
#endif #endif

14
uwac/libuwac/uwac-window.c
View File

@ -453,7 +453,18 @@ UwacWindow* UwacCreateWindowShm(UwacDisplay* display, uint32_t width, uint32_t h
if (!w->deco) { if (!w->deco) {
uwacErrorHandler(w->display, UWAC_NOT_FOUND, "Current window manager does not allow decorating with SSD"); uwacErrorHandler(w->display, UWAC_NOT_FOUND, "Current window manager does not allow decorating with SSD");
} }
else
zxdg_toplevel_decoration_v1_set_mode(w->deco, ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE);
} }
else if (w->display->kde_deco_manager) {
w->kde_deco = org_kde_kwin_server_decoration_manager_create(w->display->kde_deco_manager, w->surface);
if (!w->kde_deco) {
uwacErrorHandler(w->display, UWAC_NOT_FOUND, "Current window manager does not allow decorating with SSD");
}
else
org_kde_kwin_server_decoration_request_mode(w->kde_deco, ORG_KDE_KWIN_SERVER_DECORATION_MODE_SERVER);
}
assert(w->xdg_surface); assert(w->xdg_surface);
xdg_toplevel_add_listener(w->xdg_toplevel, &xdg_toplevel_listener, w); xdg_toplevel_add_listener(w->xdg_toplevel, &xdg_toplevel_listener, w);
} }
@ -506,6 +517,9 @@ UwacReturnCode UwacDestroyWindow(UwacWindow** pwindow)
if (w->deco) if (w->deco)
zxdg_toplevel_decoration_v1_destroy(w->deco); zxdg_toplevel_decoration_v1_destroy(w->deco);
if (w->kde_deco)
org_kde_kwin_server_decoration_destroy(w->kde_deco);
if (w->xdg_surface) if (w->xdg_surface)
xdg_surface_destroy(w->xdg_surface); xdg_surface_destroy(w->xdg_surface);

96
uwac/protocols/server-decoration.xml Normal file
View File

@ -0,0 +1,96 @@
<?xml version="1.0" encoding="UTF-8"?>
<protocol name="server_decoration">
<copyright><![CDATA[
Copyright (C) 2015 Martin Gräßlin
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
]]></copyright>
<interface name="org_kde_kwin_server_decoration_manager" version="1">
<description summary="Server side window decoration manager">
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.
Use in conjunction with zxdg_decoration_manager_v1 is undefined.
</description>
<request name="create">
<description summary="Create a server-side decoration object for a given surface">
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.
</description>
<arg name="id" type="new_id" interface="org_kde_kwin_server_decoration"/>
<arg name="surface" type="object" interface="wl_surface"/>
</request>
<enum name="mode">
<description summary="Possible values to use in request_mode and the event mode."/>
<entry name="None" value="0" summary="Undecorated: The surface is not decorated at all, neither server nor client-side. An example is a popup surface which should not be decorated."/>
<entry name="Client" value="1" summary="Client-side decoration: The decoration is part of the surface and the client."/>
<entry name="Server" value="2" summary="Server-side decoration: The server embeds the surface into a decoration frame."/>
</enum>
<event name="default_mode">
<description summary="The default mode used on the server">
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.
</description>
<arg name="mode" type="uint" summary="The default decoration mode applied to newly created server decorations."/>
</event>
</interface>
<interface name="org_kde_kwin_server_decoration" version="1">
<request name="release" type="destructor">
<description summary="release the server decoration object"/>
</request>
<enum name="mode">
<description summary="Possible values to use in request_mode and the event mode."/>
<entry name="None" value="0" summary="Undecorated: The surface is not decorated at all, neither server nor client-side. An example is a popup surface which should not be decorated."/>
<entry name="Client" value="1" summary="Client-side decoration: The decoration is part of the surface and the client."/>
<entry name="Server" value="2" summary="Server-side decoration: The server embeds the surface into a decoration frame."/>
</enum>
<request name="request_mode">
<description summary="The decoration mode the surface wants to use."/>
<arg name="mode" type="uint" summary="The mode this surface wants to use."/>
</request>
<event name="mode">
<description summary="The new decoration mode applied by the server">
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.
</description>
<arg name="mode" type="uint" summary="The decoration mode applied to the surface by the server."/>
</event>
</interface>
</protocol>