yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve behavior of rotated displays

Browse source 
Reviewers: #kwin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: zzag, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D20255
This commit is contained in:
Aleix Pol 2019-04-24 22:25:57 +02:00
parent 6a53658d49
commit 559c2e68d3
2 changed files with 45 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
plugins/platforms/drm/drm_output.cpp
View file

@ -127,23 +127,38 @@ bool DrmOutput::showCursor()
return ret;
}
qreal orientationToRotation(Qt::ScreenOrientation orientation)
int orientationToRotation(Qt::ScreenOrientation orientation)
{
switch (orientation) {
case Qt::PrimaryOrientation:
case Qt::LandscapeOrientation:
return 0.;
case Qt::InvertedPortraitOrientation:
return 90.;
case Qt::InvertedLandscapeOrientation:
return 180.;
case Qt::PortraitOrientation:
return 270.;
case Qt::PrimaryOrientation:
case Qt::LandscapeOrientation:
return 0;
case Qt::InvertedPortraitOrientation:
return 90;
case Qt::InvertedLandscapeOrientation:
return 180;
case Qt::PortraitOrientation:
return 270;
}
Q_UNREACHABLE();
return 0;
}
QMatrix4x4 &&DrmOutput::matrixDisplay(const QSize &s) const
{
QMatrix4x4 matrix;
const int angle = orientationToRotation(orientation());
if (angle) {
const QSize center = s / 2;
matrix.translate(center.width(), center.height());
matrix.rotate(angle, 0, 0, 1);
matrix.translate(-center.width(), -center.height());
}
matrix.scale(scale());
return std::move(matrix);
}
void DrmOutput::updateCursor()
{
QImage cursorImage = m_backend->softwareCursor();
@ -153,40 +168,35 @@ void DrmOutput::updateCursor()
m_hasNewCursor = true;
QImage *c = m_cursor[m_cursorIndex]->image();
c->fill(Qt::transparent);
c->setDevicePixelRatio(scale());
QPainter p;
p.begin(c);
if (orientation() != Qt::LandscapeOrientation) {
QMatrix4x4 matrix;
matrix.translate(cursorImage.width() / 2.0, cursorImage.height() / 2.0);
matrix.rotate(orientationToRotation(orientation()), 0.0f, 0.0f, 1.0f);
matrix.translate(-cursorImage.width() / 2.0, -cursorImage.height() / 2.0);
p.setWorldTransform(matrix.toTransform());
}
p.setWorldTransform(matrixDisplay(QSize(cursorImage.width(), cursorImage.height())).toTransform());
p.drawImage(QPoint(0, 0), cursorImage);
p.end();
}
void DrmOutput::moveCursor(const QPoint &globalPos)
{
QMatrix4x4 matrix;
QMatrix4x4 hotspotMatrix;
if (orientation() != Qt::LandscapeOrientation) {
auto rotation = orientationToRotation(orientation());
matrix.translate(pixelSize().width() /2.0, pixelSize().height() / 2.0);
matrix.rotate(rotation, 0.0f, 0.0f, 1.0f);
matrix.translate(-pixelSize().width() /2.0, -pixelSize().height() / 2.0);
const auto cursorSize = m_backend->softwareCursor().size();
hotspotMatrix.translate(cursorSize.width()/2.0, cursorSize.height()/2.0);
hotspotMatrix.rotate(rotation, 0.0f, 0.0f, 1.0f);
hotspotMatrix.translate(-cursorSize.width()/2.0, -cursorSize.height()/2.0);
const QMatrix4x4 hotspotMatrix = matrixDisplay(m_backend->softwareCursor().size());
QPoint p = globalPos-AbstractOutput::globalPos();
switch (orientation()) {
case Qt::PrimaryOrientation:
case Qt::LandscapeOrientation:
break;
case Qt::PortraitOrientation:
p = QPoint(p.y(), pixelSize().height() - p.x());
break;
case Qt::InvertedPortraitOrientation:
p = QPoint(pixelSize().width() - p.y(), p.x());
break;
case Qt::InvertedLandscapeOrientation:
p = QPoint(pixelSize().width() - p.x(), pixelSize().height() - p.y());
break;
}
hotspotMatrix.scale(scale());
matrix.scale(scale());
const auto outputGlobalPos = AbstractOutput::globalPos();
matrix.translate(-outputGlobalPos.x(), -outputGlobalPos.y());
const QPoint p = matrix.map(globalPos) - hotspotMatrix.map(m_backend->softwareCursorHotspot());
p *= scale();
p -= hotspotMatrix.map(m_backend->softwareCursorHotspot());
drmModeMoveCursor(m_backend->fd(), m_crtc->id(), p.x(), p.y());
}

1
plugins/platforms/drm/drm_output.h
View file

@ -135,6 +135,7 @@ private:
int getGammaRampSize() const override;
bool setGammaRamp(const ColorCorrect::GammaRamp &gamma) override;
QMatrix4x4 &&matrixDisplay(const QSize &s) const;
DrmBackend *m_backend;
DrmConnector *m_conn = nullptr;