From 00d7933816d37f5e7bb8d61624c4d4ca38bb014f Mon Sep 17 00:00:00 2001
From: Giulio Camuffo <giulio.camuffo@jollamobile.com>
Date: Mon, 3 Mar 2014 17:24:26 +0200
Subject: Use wayland core interfaces to signal output rotation

The wl_output interface has an event for signaling the rotation of
the display, so use that instead of our own thing.

Change-Id: I8a017d575ee456a7a81649e19a015085fb784805
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
---
 src/extensions/output-extension.xml  | 13 -------------
 src/extensions/surface-extension.xml |  3 +++
 2 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'src/extensions')

diff --git a/src/extensions/output-extension.xml b/src/extensions/output-extension.xml
index 07aa1102c..0a7f11a90 100644
--- a/src/extensions/output-extension.xml
+++ b/src/extensions/output-extension.xml
@@ -46,19 +46,6 @@
     </interface>
 
     <interface name="qt_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>
-
-        <request name="set_orientation_update_mask">
-            <arg name="orientation" type="int"/>
-        </request>
     </interface>
 </protocol>
diff --git a/src/extensions/surface-extension.xml b/src/extensions/surface-extension.xml
index 31f286200..d43b8d8b2 100644
--- a/src/extensions/surface-extension.xml
+++ b/src/extensions/surface-extension.xml
@@ -74,6 +74,9 @@
         <request name="set_content_orientation">
             <arg name="orientation" type="int"/>
         </request>
+        <request name="set_content_orientation_mask">
+            <arg name="orientation" type="int"/>
+        </request>
 
         <enum name="windowflag">
             <entry name="OverridesSystemGestures" value="1"/>
-- 
cgit v1.2.3