diff options
author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-03 12:18:51 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-04 16:12:47 +0200 |
commit | 81b320503251cb79e5500fbf7906586e0da01803 (patch) | |
tree | d7c5ea957111b4f27d9d1c879a2d94c72eeb5e21 /src/compositor/compositor_api/qwaylandpointer.cpp | |
parent | c4f2c0479fd992183ce04347111c5968dfd961bc (diff) |
Move the curser surface signal to QWaylandInputDevice
Change-Id: Ib2b1ee81a5216e348e6014927c1cc818f848384b
Diffstat (limited to 'src/compositor/compositor_api/qwaylandpointer.cpp')
-rw-r--r-- | src/compositor/compositor_api/qwaylandpointer.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/compositor/compositor_api/qwaylandpointer.cpp b/src/compositor/compositor_api/qwaylandpointer.cpp index e64dbc995..f1a82ff88 100644 --- a/src/compositor/compositor_api/qwaylandpointer.cpp +++ b/src/compositor/compositor_api/qwaylandpointer.cpp @@ -68,24 +68,19 @@ void QWaylandPointerPrivate::pointer_release(wl_pointer::Resource *resource) wl_resource_destroy(resource->handle); } -static void requestCursorSurface(QWaylandCompositor *compositor, QWaylandSurface *surface, int32_t hotspot_x, int hotspot_y) -{ - compositor->currentCurserSurfaceRequest(surface, hotspot_x, hotspot_y); -} - void QWaylandPointerPrivate::pointer_set_cursor(wl_pointer::Resource *resource, uint32_t serial, wl_resource *surface, int32_t hotspot_x, int32_t hotspot_y) { Q_UNUSED(resource); Q_UNUSED(serial); if (!surface) { - requestCursorSurface(compositor(), Q_NULLPTR, 0, 0); + seat->cursorSurfaceRequest(Q_NULLPTR, 0, 0); return; } QWaylandSurface *s = QWaylandSurface::fromResource(surface); s->markAsCursorSurface(true); - requestCursorSurface(compositor(), s, hotspot_x, hotspot_y); + seat->cursorSurfaceRequest(s, hotspot_x, hotspot_y); } QWaylandPointerGrabber::~QWaylandPointerGrabber() |