summaryrefslogtreecommitdiffstats
path: root/src/compositor
diff options
context:
space:
mode:
authorGiulio Camuffo <giulio.camuffo@kdab.com>2016-06-27 11:17:57 +0200
committerGiulio Camuffo <giulio.camuffo@kdab.com>2016-07-04 08:34:00 +0000
commit25df38cad562c458538037b9e50552b6885e5d05 (patch)
tree7e4e5eaff0bc12474584a216001c5b3d7bb1ab35 /src/compositor
parent9134c1bd5bf464d00127103557a2289243dadd40 (diff)
Fix the key code of key events when control is pressed
Change-Id: I51a57a32d8263e663a48dac15881d685359bc91d Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@hawaiios.org>
Diffstat (limited to 'src/compositor')
-rw-r--r--src/compositor/compositor_api/qwaylandcompositor.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp
index c7273f000..6e463e384 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandcompositor.cpp
@@ -107,10 +107,8 @@ public:
Qt::KeyboardModifiers modifiers = QWaylandXkb::modifiers(keyb->xkbState());
const xkb_keysym_t sym = xkb_state_key_get_one_sym(keyb->xkbState(), code);
- uint utf32 = xkb_keysym_to_utf32(sym);
- if (utf32)
- text = QString::fromUcs4(&utf32, 1);
- int qtkey = QWaylandXkb::keysymToQtKey(sym, modifiers, text);
+ int qtkey;
+ std::tie(qtkey, text) = QWaylandXkb::keysymToQtKey(sym, modifiers);
ke->key = qtkey;
ke->modifiers = modifiers;