From a2459e0abebd49a1e84d55dc5ff01186ff7e85c2 Mon Sep 17 00:00:00 2001
From: Arvid Ephraim Picciani <arvid.picciani@nokia.com>
Date: Tue, 2 Nov 2010 12:37:36 +0100
Subject: [PATCH] fakevim: Fix cursor movement in insert mode on Mac.
Reviewed-by: hjk
(cherry picked from commit 51c8491158f3c7b880c169cd6602643c5dc0c153)
---
src/plugins/fakevim/fakevimhandler.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index cd327bb7b31..45e22a3c071 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -353,6 +353,9 @@ inline QString msgMarkNotSet(const QString &text)
class Input
{
public:
+ // Remove some extra "information" on Mac.
+ static int cleanModifier(int m) { return m & ~Qt::KeypadModifier; }
+
Input()
: m_key(0), m_xkey(0), m_modifiers(0) {}
@@ -360,7 +363,7 @@ public:
: m_key(x.unicode()), m_xkey(x.unicode()), m_modifiers(0), m_text(x) {}
Input(int k, int m, const QString &t)
- : m_key(k), m_modifiers(m), m_text(t)
+ : m_key(k), m_modifiers(cleanModifier(m)), m_text(t)
{
// On Mac, QKeyEvent::text() returns non-empty strings for
// cursor keys. This breaks some of the logic later on
--
GitLab