diff options
author | Jan Arne Petersen <jan.petersen@kdab.com> | 2013-07-24 15:05:45 +0200 |
---|---|---|
committer | Andy Nichols <andy.nichols@digia.com> | 2013-08-06 13:02:20 +0200 |
commit | dc8c23bceb9ffabdc95b8e0a2ceec62cb51ced0a (patch) | |
tree | 3131d18bae402b76b54bb771e60daf006784e219 /src/compositor/compositor_api/qwaylandinput.cpp | |
parent | 7f1bf1cdfaaba6ff5b7f9673273b2b1b63a44cda (diff) |
Add an own input and focus implementation
Do not use the shared wayland-server input and focus implementation any
longer. It just makes the code complicate and ugly using C-style APIs
without much benefit and it is much nicer to implement them ourselves
with a Qt API. The shared input and focus code got removed from Wayland
1.2 because of that.
Change-Id: Iab7181e743e7fa26004b0dd93a827dc8f86ca676
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandinput.cpp')
-rw-r--r-- | src/compositor/compositor_api/qwaylandinput.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylandinput.cpp b/src/compositor/compositor_api/qwaylandinput.cpp index c73784ebf..76e83030b 100644 --- a/src/compositor/compositor_api/qwaylandinput.cpp +++ b/src/compositor/compositor_api/qwaylandinput.cpp @@ -41,6 +41,7 @@ #include "qwaylandinput.h" #include "qwlinputdevice_p.h" +#include "qwlkeyboard_p.h" #include "qwaylandcompositor.h" #include "qwlsurface_p.h" #include "qwlcompositor_p.h" @@ -88,12 +89,12 @@ void QWaylandInputDevice::sendMouseWheelEvent(Qt::Orientation orientation, int d void QWaylandInputDevice::sendKeyPressEvent(uint code) { - d->sendKeyPressEvent(code); + d->keyboardDevice()->sendKeyPressEvent(code); } void QWaylandInputDevice::sendKeyReleaseEvent(uint code) { - d->sendKeyReleaseEvent(code); + d->keyboardDevice()->sendKeyReleaseEvent(code); } void QWaylandInputDevice::sendTouchPointEvent(int id, double x, double y, Qt::TouchPointState state) |