[wayland] Use Surface::setCursor and ::hideCursor in WaylandBackend
Replaces the low level wayland calls and also means that we no longer need the Wayland client library. Everything wrapped in KWayland.
This commit is contained in:
parent
f600e2f6f4
commit
371bd4c24f
2 changed files with 2 additions and 4 deletions
|
@ -497,7 +497,6 @@ set(kwin_XCB_LIBS
|
|||
)
|
||||
|
||||
set(kwin_WAYLAND_LIBS
|
||||
Wayland::Client
|
||||
Wayland::Cursor
|
||||
XKB::XKB
|
||||
KF5::WaylandClient
|
||||
|
|
|
@ -51,7 +51,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#include <QMetaMethod>
|
||||
#include <QThread>
|
||||
// Wayland
|
||||
#include <wayland-client-protocol.h>
|
||||
#include <wayland-cursor.h>
|
||||
|
||||
namespace KWin
|
||||
|
@ -115,7 +114,7 @@ WaylandSeat::WaylandSeat(wl_seat *seat, WaylandBackend *backend)
|
|||
m_enteredSerial = serial;
|
||||
if (!m_installCursor) {
|
||||
// explicitly hide cursor
|
||||
wl_pointer_set_cursor(*m_pointer, m_enteredSerial, nullptr, 0, 0);
|
||||
m_pointer->hideCursor();
|
||||
}
|
||||
}
|
||||
);
|
||||
|
@ -201,7 +200,7 @@ void WaylandSeat::installCursorImage(wl_buffer *image, const QSize &size, const
|
|||
if (!m_cursor || !m_cursor->isValid()) {
|
||||
return;
|
||||
}
|
||||
wl_pointer_set_cursor(*m_pointer, m_enteredSerial, *m_cursor, hotSpot.x(), hotSpot.y());
|
||||
m_pointer->setCursor(m_cursor, hotSpot);
|
||||
m_cursor->attachBuffer(image);
|
||||
m_cursor->damage(QRect(QPoint(0,0), size));
|
||||
m_cursor->commit(Surface::CommitFlag::None);
|
||||
|
|
Loading…
Reference in a new issue