diff options
| author | Andrew den Exter <andrew.den.exter@qinetic.com.au> | 2013-12-10 13:41:32 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-16 11:37:23 +0100 |
| commit | 9e511660ee6d79b68177041ab9dceeef501a2442 (patch) | |
| tree | 461e65e2b67bde293aeabbbbf743992f1e4a3e5d /src/plugins/platforms | |
| parent | 1850061bc1b3cb49f50318706a15b76590e61a06 (diff) | |
QtCompositor: Allow key events to be delivered to unfocused windows
Adds an overload to QWaylandInput::sendFullKeyEvent which allows
specifying the surface to deliver the event to. This also extends
the Qt keyboard extension to allow sending keys to specific windows.
Change-Id: I1b7abdc4d8a30392ef2e7ee5e9af5b3036b23577
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/wayland_common/qwaylandqtkey.cpp | 25 | ||||
| -rw-r--r-- | src/plugins/platforms/wayland_common/qwaylandqtkey.h | 22 |
2 files changed, 25 insertions, 22 deletions
diff --git a/src/plugins/platforms/wayland_common/qwaylandqtkey.cpp b/src/plugins/platforms/wayland_common/qwaylandqtkey.cpp index e723078cd..6cc4597d9 100644 --- a/src/plugins/platforms/wayland_common/qwaylandqtkey.cpp +++ b/src/plugins/platforms/wayland_common/qwaylandqtkey.cpp @@ -50,25 +50,26 @@ QWaylandQtKeyExtension::QWaylandQtKeyExtension(QWaylandDisplay *display, uint32_ { } -void QWaylandQtKeyExtension::key_extension_qtkey(uint32_t time, - uint32_t type, - uint32_t key, - uint32_t modifiers, - uint32_t nativeScanCode, - uint32_t nativeVirtualKey, - uint32_t nativeModifiers, - const QString &text, - uint32_t autorep, - uint32_t count) +void QWaylandQtKeyExtension::key_extension_qtkey(struct wl_surface *surface, + uint32_t time, + uint32_t type, + uint32_t key, + uint32_t modifiers, + uint32_t nativeScanCode, + uint32_t nativeVirtualKey, + uint32_t nativeModifiers, + const QString &text, + uint32_t autorep, + uint32_t count) { QList<QWaylandInputDevice *> inputDevices = m_display->inputDevices(); - if (inputDevices.isEmpty()) { + if (!surface && inputDevices.isEmpty()) { qWarning("qt_key_extension: handle_qtkey: No input device"); return; } QWaylandInputDevice *dev = inputDevices.first(); - QWaylandWindow *win = dev->mKeyboardFocus; + QWaylandWindow *win = surface ? QWaylandWindow::fromWlSurface(surface) : dev->mKeyboardFocus; if (!win || !win->window()) { qWarning("qt_key_extension: handle_qtkey: No keyboard focus"); diff --git a/src/plugins/platforms/wayland_common/qwaylandqtkey.h b/src/plugins/platforms/wayland_common/qwaylandqtkey.h index 17b758cf9..c02831304 100644 --- a/src/plugins/platforms/wayland_common/qwaylandqtkey.h +++ b/src/plugins/platforms/wayland_common/qwaylandqtkey.h @@ -57,16 +57,18 @@ public: private: QWaylandDisplay *m_display; - void key_extension_qtkey(uint32_t time, - uint32_t type, - uint32_t key, - uint32_t modifiers, - uint32_t nativeScanCode, - uint32_t nativeVirtualKey, - uint32_t nativeModifiers, - const QString &text, - uint32_t autorep, - uint32_t count) Q_DECL_OVERRIDE; + void key_extension_qtkey(struct wl_surface *surface, + uint32_t time, + uint32_t type, + uint32_t key, + uint32_t modifiers, + uint32_t nativeScanCode, + uint32_t nativeVirtualKey, + uint32_t nativeModifiers, + const QString &text, + uint32_t autorep, + uint32_t count) Q_DECL_OVERRIDE; + }; QT_END_NAMESPACE |