summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2011-12-19 10:51:12 +0100
committerLaszlo Agocs <laszlo.p.agocs@nokia.com>2011-12-20 13:58:55 +0100
commit317d72460806e86cacdb46ebe9c0b034b06a1cf4 (patch)
treef2aea2381a46c30276acaf67f358f5969f26f52c /extensions
parenta318254dfb7c15ed92d38c5d5cf94d9de893dfb4 (diff)
Added surface_extension and output_extension
This is an atempt on removing WindowManagerIntegration and create more specialised extensions. Hopefully it will reduce tha "map lookups" we have all because of the windowmanagerintegration is way to generic, and hopefully it will make it easier to ready and understand the code Change-Id: I126c430e87909e4520f6d241c0a6023214cb509a Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Diffstat (limited to 'extensions')
-rw-r--r--extensions/output-extension/output-extension.xml71
-rw-r--r--extensions/surface-extension/surface-extension.xml75
-rw-r--r--extensions/windowmanager/windowmanager.xml26
3 files changed, 146 insertions, 26 deletions
diff --git a/extensions/output-extension/output-extension.xml b/extensions/output-extension/output-extension.xml
new file mode 100644
index 000000000..32996ea1e
--- /dev/null
+++ b/extensions/output-extension/output-extension.xml
@@ -0,0 +1,71 @@
+<!--
+# /****************************************************************************
+# **
+# ** 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="output_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_output_extension" version="1">
+ <request name="get_extended_output">
+ <arg name="id" type="new_id" interface="wl_extended_output"/>
+ <arg name="output" type="object" interface="wl_output"/>
+ </request>
+ </interface>
+
+ <interface name="wl_extended_output" version="1">
+ <enum name="rotation">
+ <entry name="PortraitOrientation" value="1"/>
+ <entry name="LandscapeOrientation" value="2"/>
+ <entry name="InvertedPortraitOrientation" value="4"/>
+ <entry name="InvertedLandscapeOrientation" value="8"/>
+ </enum>
+
+ <event name="set_screen_rotation">
+ <arg name="rotation" type="int"/>
+ </event>
+ </interface>
+</protocol>
diff --git a/extensions/surface-extension/surface-extension.xml b/extensions/surface-extension/surface-extension.xml
new file mode 100644
index 000000000..db150aee4
--- /dev/null
+++ b/extensions/surface-extension/surface-extension.xml
@@ -0,0 +1,75 @@
+<!--
+# /****************************************************************************
+# **
+# ** 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="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_surface_extension" version="1">
+ <request name="get_extended_surface">
+ <arg name="id" type="new_id" interface="wl_extended_surface"/>
+ <arg name="surface" type="object" interface="wl_surface"/>
+ </request>
+ </interface>
+
+ <interface name="wl_extended_surface" version="1">
+ <event name="onscreen_visibility">
+ <arg name="visible" type="int"/>
+ </event>
+
+ <event name="set_generic_property">
+ <arg name="name" type="string"/>
+ <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"/>
+ </request>
+ </interface>
+</protocol>
diff --git a/extensions/windowmanager/windowmanager.xml b/extensions/windowmanager/windowmanager.xml
index 6f0db5b6f..d9d5b3925 100644
--- a/extensions/windowmanager/windowmanager.xml
+++ b/extensions/windowmanager/windowmanager.xml
@@ -57,31 +57,5 @@
<arg name="processid" type="string" />
</request>
- <!-- informs the client that it is visible/not visible on screen and can therfore stop / need to start rendering.
- The client need to implement the handling of this by itself. This means, we cannot enforce the client to obey,
- but we can encourage it to do so. -->
- <event name="client_onscreen_visibility">
- <arg name="visible" type="int"/>
- </event>
-
- <!-- Sets screen rotation, typically based on accelerometer/orientation sensor reading data -->
- <event name="set_screen_rotation">
- <arg name="output" type="object" interface="wl_output"/>
- <arg name="rotation" type="int"/>
- </event>
-
- <!--sends a generic property to the client -->
- <event name="set_generic_property">
- <arg name="surface" type="object" interface="wl_surface"/>
- <arg name="name" type="string"/>
- <arg name="value" type="array"/>
- </event>
-
- <!-- update generic property from client to server -->
- <request name="update_generic_property">
- <arg name="surface" type="object" interface="wl_surface"/>
- <arg name="name" type="string"/>
- <arg name="value" type="array"/>
- </request>
</interface>
</protocol>