1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wl_surface.set_buffer_transform to signal surface rotation

Browse Source 
Drop the custom request in the surface extension, and use the
wayland core mechanism.

Change-Id: I580f56c90bcd3b2c5a6da08d1a033b10790ac330
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
This commit is contained in:
Giulio Camuffo 2014-06-09 22:52:29 +03:00 committed by Pier Luigi Fiorini
parent 755eefab6a
commit 1cb65e556c
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/3rdparty/wayland/extensions/surface-extension.xml vendored
View File

@ -71,9 +71,6 @@
<entry name="InvertedLandscapeOrientation" value="8"/> <entry name="InvertedLandscapeOrientation" value="8"/>
</enum> </enum>
<request name="set_content_orientation">
<arg name="orientation" type="int"/>
</request>
<request name="set_content_orientation_mask"> <request name="set_content_orientation_mask">
<arg name="orientation" type="int"/> <arg name="orientation" type="int"/>
</request> </request>

16
src/plugins/platforms/wayland/qwaylandextendedsurface.cpp
View File

@ -78,22 +78,6 @@ void QWaylandExtendedSurface::updateGenericProperty(const QString &name, const Q
nativeInterface->emitWindowPropertyChanged(m_window, name); nativeInterface->emitWindowPropertyChanged(m_window, name);
} }
static int32_t waylandRotationFromScreenOrientation(Qt::ScreenOrientation orientation)
{
switch (orientation) {
case Qt::PortraitOrientation: return QT_EXTENDED_SURFACE_ORIENTATION_PORTRAITORIENTATION;
case Qt::InvertedPortraitOrientation: return QT_EXTENDED_SURFACE_ORIENTATION_INVERTEDPORTRAITORIENTATION;
case Qt::LandscapeOrientation: return QT_EXTENDED_SURFACE_ORIENTATION_LANDSCAPEORIENTATION;
case Qt::InvertedLandscapeOrientation: return QT_EXTENDED_SURFACE_ORIENTATION_INVERTEDLANDSCAPEORIENTATION;
default: return QT_EXTENDED_SURFACE_ORIENTATION_PRIMARYORIENTATION;
}
}
void QWaylandExtendedSurface::setContentOrientation(Qt::ScreenOrientation orientation)
{
set_content_orientation(waylandRotationFromScreenOrientation(orientation));
}
void QWaylandExtendedSurface::setContentOrientationMask(Qt::ScreenOrientations mask) void QWaylandExtendedSurface::setContentOrientationMask(Qt::ScreenOrientations mask)
{ {
int32_t wlmask = 0; int32_t wlmask = 0;

1
src/plugins/platforms/wayland/qwaylandextendedsurface_p.h
View File

@ -61,7 +61,6 @@ public:
QWaylandExtendedSurface(QWaylandWindow *window, struct ::qt_extended_surface *extended_surface); QWaylandExtendedSurface(QWaylandWindow *window, struct ::qt_extended_surface *extended_surface);
~QWaylandExtendedSurface(); ~QWaylandExtendedSurface();
void setContentOrientation(Qt::ScreenOrientation orientation);
void setContentOrientationMask(Qt::ScreenOrientations mask); void setContentOrientationMask(Qt::ScreenOrientations mask);
void updateGenericProperty(const QString &name, const QVariant &value); void updateGenericProperty(const QString &name, const QVariant &value);

24
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -435,8 +435,28 @@ QWaylandSubSurface *QWaylandWindow::subSurfaceWindow() const
void QWaylandWindow::handleContentOrientationChange(Qt::ScreenOrientation orientation) void QWaylandWindow::handleContentOrientationChange(Qt::ScreenOrientation orientation)
{ {
if (mExtendedWindow) wl_output_transform transform;
mExtendedWindow->setContentOrientation(orientation); bool isPortrait = window()->screen() && window()->screen()->primaryOrientation() == Qt::PortraitOrientation;
switch (orientation) {
case Qt::PrimaryOrientation:
transform = WL_OUTPUT_TRANSFORM_NORMAL;
break;
case Qt::LandscapeOrientation:
transform = isPortrait ? WL_OUTPUT_TRANSFORM_270 : WL_OUTPUT_TRANSFORM_NORMAL;
break;
case Qt::PortraitOrientation:
transform = isPortrait ? WL_OUTPUT_TRANSFORM_NORMAL : WL_OUTPUT_TRANSFORM_90;
break;
case Qt::InvertedLandscapeOrientation:
transform = isPortrait ? WL_OUTPUT_TRANSFORM_90 : WL_OUTPUT_TRANSFORM_180;
break;
case Qt::InvertedPortraitOrientation:
transform = isPortrait ? WL_OUTPUT_TRANSFORM_180 : WL_OUTPUT_TRANSFORM_270;
break;
}
set_buffer_transform(transform);
// set_buffer_transform is double buffered, we need to commit.
commit();
} }
void QWaylandWindow::setOrientationMask(Qt::ScreenOrientations mask) void QWaylandWindow::setOrientationMask(Qt::ScreenOrientations mask)