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

[platforms/drm] Fix software cursors with drm backend

Browse source 
Summary:
If hardware cursor support is not available when using the drm backend for
Wayland compositing, the software cursor texture will not be updated when the
cursor image changes, and it will still be drawn when no cursor image is set
(such as when running a full-screen game). Furthermore, the drmModeSetCursor
and drmModeMoveCursor functions will still be unnecessarily called when the
cursor is moved or hidden.

To correct this, SceneOpenGL should connect Platform::cursorChanged as opposed
to Cursor::cursorChanged to its texture update function, as only the former
will be emitted when the cursor is updated and the compositor should check if
the cursor is hidden and the software cursor image is not null before rendering
it. DrmBackend::moveCursor and DrmBackend::hideCursor should also return
immediately if using a software cursor.

Reviewers: #kwin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D18376
This commit is contained in:
Erik Kurzinger 2019-03-19 12:46:16 -07:00
parent c5a3b47050
commit d9c79e3627
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/platforms/drm/drm_backend.cpp
View file

@ -702,7 +702,7 @@ void DrmBackend::doShowCursor()
void DrmBackend::doHideCursor()
{
if (!m_cursorEnabled) {
if (!m_cursorEnabled || usesSoftwareCursor()) {
return;
}
for (auto it = m_outputs.constBegin(); it != m_outputs.constEnd(); ++it) {
@ -712,7 +712,7 @@ void DrmBackend::doHideCursor()
void DrmBackend::moveCursor()
{
if (!m_cursorEnabled || isCursorHidden()) {
if (!m_cursorEnabled || isCursorHidden() || usesSoftwareCursor()) {
return;
}
for (auto it = m_outputs.constBegin(); it != m_outputs.constEnd(); ++it) {

8
plugins/scenes/opengl/scene_opengl.cpp
View file

@ -596,8 +596,10 @@ void SceneOpenGL::insertWait()
**/
void SceneOpenGL2::paintCursor()
{
// don't paint if we use hardware cursor
if (!kwinApp()->platform()->usesSoftwareCursor()) {
// don't paint if we use hardware cursor or the cursor is hidden
if (!kwinApp()->platform()->usesSoftwareCursor() ||
kwinApp()->platform()->isCursorHidden() ||
kwinApp()->platform()->softwareCursor().isNull()) {
return;
}
@ -616,7 +618,7 @@ void SceneOpenGL2::paintCursor()
updateCursorTexture();
// handle shape update on case cursor image changed
connect(Cursor::self(), &Cursor::cursorChanged, this, updateCursorTexture);
connect(kwinApp()->platform(), &Platform::cursorChanged, this, updateCursorTexture);
}
// get cursor position in projection coordinates