diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2012-03-28 12:18:14 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2012-03-28 12:36:16 +0200 |
| commit | da82afb33090ba215e34c49dfcbc99d5e24d64c6 (patch) | |
| tree | 93904e0469e8a96cf63c3df46582cdf144f4a5d0 /src/compositor/wayland_wrapper/wlcompositor.cpp | |
| parent | e60c124146da19bd56292a31eae91eac2a175b37 (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/wlcompositor.cpp')
| -rw-r--r-- | src/compositor/wayland_wrapper/wlcompositor.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/compositor/wayland_wrapper/wlcompositor.cpp b/src/compositor/wayland_wrapper/wlcompositor.cpp index 2488fd7a4..23d6c2a66 100644 --- a/src/compositor/wayland_wrapper/wlcompositor.cpp +++ b/src/compositor/wayland_wrapper/wlcompositor.cpp @@ -133,7 +133,6 @@ Compositor::Compositor(WaylandCompositor *qt_compositor) , m_surfaceExtension(0) , m_subSurfaceExtension(0) , m_touchExtension(0) - , m_qtkeyExtension(0) , m_retainNotify(0) { compositor = this; @@ -156,6 +155,7 @@ Compositor::Compositor(WaylandCompositor *qt_compositor) m_outputExtension = new OutputExtensionGlobal(this); m_surfaceExtension = new SurfaceExtensionGlobal(this); + m_qtkeyExtension = new QtKeyExtensionGlobal(this); if (wl_display_add_socket(m_display->handle(), qt_compositor->socketName())) { fprintf(stderr, "Fatal: Failed to open server socket\n"); @@ -418,12 +418,6 @@ void Compositor::enableTouchExtension() } } -void Compositor::enableQtKeyExtension() -{ - if (!m_qtkeyExtension) - m_qtkeyExtension = new QtKeyExtensionGlobal(this); -} - void Compositor::configureTouchExtension(int flags) { if (m_touchExtension) |