diff options
author | Jørgen Lind <jorgen.lind@nokia.com> | 2012-01-04 08:33:28 +0100 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@nokia.com> | 2012-01-04 10:34:40 +0100 |
commit | d5ea033df8cf0a2dec49fce639d84e7dd0a2fced (patch) | |
tree | 15d92a4990b612e73450d110a6cc820df8cdee2e /extensions | |
parent | 62bba49c83849ca5904357de45c888f9fab3106a (diff) |
Implement subsurfaces extension
This allows you to have subwindows in the compositor.
We tried to experiment with composing subsurfaces client side, but the
architecture did not feel very lean. This however, requires the
compositor to compose each surface before drawing the surface. The
example compositors render the subsurfaces into the wl_surfaces texture.
This might not be a good idea.
Change-Id: I6e186b62d7b490de7f4e6c6f22fcf6c1e0a70df3
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/sub-surface-extension.xml | 80 | ||||
-rw-r--r-- | extensions/surface-extension.xml | 1 |
2 files changed, 80 insertions, 1 deletions
diff --git a/extensions/sub-surface-extension.xml b/extensions/sub-surface-extension.xml new file mode 100644 index 000000000..6f9ca07d9 --- /dev/null +++ b/extensions/sub-surface-extension.xml @@ -0,0 +1,80 @@ +<!-- +# /**************************************************************************** +# ** +# ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +# ** Contact: Nokia Corporation (qt-info@nokia.com) +# ** +# ** This file is part of qt-compositor. +# ** +# ****************************************************************************/ +--> +<protocol name="sub_surface_extension"> + + <copyright> + Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). + All rights reserved. + Contact: Nokia Corporation (qt-info@nokia.com) + + This file is part of the plugins of the Qt Toolkit. + + $QT_BEGIN_LICENSE:LGPL$ + GNU Lesser General Public License Usage + This file may be used under the terms of the GNU Lesser General Public + License version 2.1 as published by the Free Software Foundation and + appearing in the file LICENSE.LGPL included in the packaging of this + file. Please review the following information to ensure the GNU Lesser + General Public License version 2.1 requirements will be met: + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + + In addition, as a special exception, Nokia gives you certain additional + rights. These rights are described in the Nokia Qt LGPL Exception + version 1.1, included in the file LGPL_EXCEPTION.txt in this package. + + GNU General Public License Usage + Alternatively, this file may be used under the terms of the GNU General + Public License version 3.0 as published by the Free Software Foundation + and appearing in the file LICENSE.GPL included in the packaging of this + file. Please review the following information to ensure the GNU General + Public License version 3.0 requirements will be met: + http://www.gnu.org/copyleft/gpl.html. + + Other Usage + Alternatively, this file may be used in accordance with the terms and + conditions contained in a signed written agreement between you and Nokia. + + + + + + $QT_END_LICENSE$ + </copyright> + + <interface name="wl_sub_surface_extension" version="1"> + <request name="get_sub_surface_aware_surface"> + <arg name="id" type="new_id" interface="wl_sub_surface"/> + <arg name="surface" type="object" interface="wl_surface"/> + </request> + </interface> + + <interface name="wl_sub_surface" version="1"> + <request name="attach_sub_surface"> + <arg name="sub_surface" type="object" interface="wl_sub_surface"/> + <arg name="x" type="int"/> + <arg name="y" type="int"/> + </request> + + <request name="move_sub_surface"> + <arg name="sub_surface" type="object" interface="wl_sub_surface"/> + <arg name="x" type="int"/> + <arg name="y" type="int"/> + </request> + + <request name="raise"> + <arg name="sub_surface" type="object" interface="wl_sub_surface"/> + </request> + + <request name="lower"> + <arg name="sub_surface" type="object" interface="wl_sub_surface"/> + </request> + </interface> +</protocol> diff --git a/extensions/surface-extension.xml b/extensions/surface-extension.xml index db150aee4..51850f8bf 100644 --- a/extensions/surface-extension.xml +++ b/extensions/surface-extension.xml @@ -66,7 +66,6 @@ <arg name="value" type="array"/> </event> - <!-- update generic property from client to server --> <request name="update_generic_property"> <arg name="name" type="string"/> <arg name="value" type="array"/> |