summaryrefslogtreecommitdiffstats
path: root/src/compositor/wayland_wrapper/wlqtkey.cpp
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2012-03-28 12:18:14 +0200
committerSamuel Rødal <samuel.rodal@nokia.com>2012-03-28 12:36:16 +0200
commitda82afb33090ba215e34c49dfcbc99d5e24d64c6 (patch)
tree93904e0469e8a96cf63c3df46582cdf144f4a5d0 /src/compositor/wayland_wrapper/wlqtkey.cpp
parente60c124146da19bd56292a31eae91eac2a175b37 (diff)
Enable the qtkey extension regardless.
Now the clients get qtkey events if they register themselves against that interface, otherwise they get regular key events. This handles both qt clients and pure wayland clients being connected at the same time, sending qtkey events to the former and regular key events to the latter. Change-Id: Iebd9d78b57758b45098b99a94414ee428e41636b Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Diffstat (limited to 'src/compositor/wayland_wrapper/wlqtkey.cpp')
-rw-r--r--src/compositor/wayland_wrapper/wlqtkey.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/compositor/wayland_wrapper/wlqtkey.cpp b/src/compositor/wayland_wrapper/wlqtkey.cpp
index b8381a2a9..ce881b36c 100644
--- a/src/compositor/wayland_wrapper/wlqtkey.cpp
+++ b/src/compositor/wayland_wrapper/wlqtkey.cpp
@@ -82,7 +82,7 @@ void QtKeyExtensionGlobal::bind_func(wl_client *client, void *data, uint32_t ver
self->m_resources.append(resource);
}
-void QtKeyExtensionGlobal::postQtKeyEvent(QKeyEvent *event, Surface *surface)
+bool QtKeyExtensionGlobal::postQtKeyEvent(QKeyEvent *event, Surface *surface)
{
wl_client *surfaceClient = surface->base()->resource.client;
uint32_t time = m_compositor->currentTimeMsecs();
@@ -103,7 +103,11 @@ void QtKeyExtensionGlobal::postQtKeyEvent(QKeyEvent *event, Surface *surface)
textUtf8.constData(),
event->isAutoRepeat(),
event->count());
+
+ return true;
}
+
+ return false;
}
}