Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit cae0636

Browse files
jgehrigjgehrig
committedMar 24, 2022
FIXME
1 parent b34b76c commit cae0636

6 files changed

+87
-57
lines changed
 

‎src/gui/input.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
#include <QMap>
44
#include <QVariant>
55

6+
#include <QDebug>
7+
68
namespace NeovimQt { namespace Input {
79

810
const QMap<int, QString>& GetSpecialKeysMap() noexcept
@@ -252,6 +254,7 @@ QString convertKey(const QKeyEvent& ev) noexcept
252254
}
253255

254256
if (text == "\\") {
257+
qDebug() << "Bail EARLY BACKSLASH!";
255258
return ToKeyString(GetModifierPrefix(mod), "Bslash");
256259
}
257260

‎src/gui/input_mac.cpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "input.h"
2+
#include <QDebug>
23

34
namespace NeovimQt { namespace Input {
45

@@ -56,13 +57,14 @@ static bool IsAsciiCharRequiringAlt(int key, Qt::KeyboardModifiers mod, QChar c)
5657
}
5758

5859
// These low-ascii characters may require AltModifier on MacOS
59-
if ((c == '[' && key != Qt::Key_BracketLeft)
60+
if ((c == '[' /*&& key != Qt::Key_BracketLeft*/) // FIXME
6061
|| (c == ']' && key != Qt::Key_BracketRight)
61-
|| (c == '{' && key != Qt::Key_BraceLeft)
62+
|| (c == '{' /*&& key != Qt::Key_BraceLeft*/) // FIXME
6263
|| (c == '}' && key != Qt::Key_BraceRight)
6364
|| (c == '|' && key != Qt::Key_Bar)
6465
|| (c == '~' && key != Qt::Key_AsciiTilde)
65-
|| (c == '@' && key != Qt::Key_At)) {
66+
|| (c == '@' && key != Qt::Key_At)
67+
|| (c == '#' && key != Qt::Key_NumberSign)) {
6668
return true;
6769
}
6870

‎test/tst_input_common.cpp

-54
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ private slots:
1717
void AltGrKeyEventWellFormed() noexcept;
1818
void ShiftSpaceWellFormed() noexcept;
1919
void ShiftBackSpaceWellFormed() noexcept;
20-
void SpanishKeyboardLayout() noexcept;
2120

2221
// Mouse Input
2322
void MouseLeftClick() noexcept;
@@ -266,58 +265,5 @@ void TestInputCommon::MouseMiddleClick() noexcept
266265
QCOMPARE(middleClickRelease, QString{ "<MiddleRelease><1,2>" });
267266
}
268267

269-
void TestInputCommon::SpanishKeyboardLayout() noexcept
270-
{
271-
// Issue 720: Spanish layout ignores Left Square Bracket [
272-
// NOTE: The "`" referenced below is "[" on a US layout keyboard for Windows/Linux and literal for MacOS.
273-
274-
// Windows ` + Space. Prints: `
275-
QKeyEvent evAccentSpace{ QKeyEvent::KeyPress, Qt::Key_Space, Qt::NoModifier, QStringLiteral("`") };
276-
QCOMPARE(NeovimQt::Input::convertKey(evAccentSpace), QStringLiteral("`"));
277-
278-
// Windows ``: two events are sent on the second key event. Prints: ``
279-
// NOTE: Linux/MacOS do not send QKeyEvents for this scenario.
280-
QKeyEvent evAccentFirst{ QKeyEvent::KeyPress, Qt::Key_QuoteLeft, Qt::NoModifier, QStringLiteral("`") };
281-
QKeyEvent evAccentSecond{ QKeyEvent::KeyPress, 0, Qt::NoModifier, QStringLiteral("`") };
282-
283-
// Windows AltGr (Right Alt) + `. Prints: [
284-
QKeyEvent evAltGrSquareBracketWindows{ QKeyEvent::KeyPress, Qt::Key_AsciiCircum, Qt::AltModifier, QStringLiteral("[") };
285-
QCOMPARE(NeovimQt::Input::convertKey(evAltGrSquareBracketWindows), QStringLiteral("["));
286-
287-
// Linux AltGr (Right Alt) + `. Prints: [
288-
QKeyEvent evAltGrSquareBracketLinux{ QKeyEvent::KeyPress, Qt::Key_BracketLeft, Qt::GroupSwitchModifier, QStringLiteral("[") };
289-
QCOMPARE(NeovimQt::Input::convertKey(evAltGrSquareBracketLinux), QStringLiteral("["));
290-
291-
// // MacOS Alt + `: Prints [
292-
// QKeyEvent evAltLeftSquareBracketMacOS{ QKeyEvent::KeyPress, Qt::Key_Less, Qt::AltModifier, QStringLiteral("[") };
293-
// QCOMPARE(NeovimQt::Input::convertKey(evAltLeftSquareBracketMacOS), QStringLiteral("["));
294-
//
295-
// // MacOS Alt + \: Prints [
296-
// QKeyEvent evAltRightSquareBracketMacOS{ QKeyEvent::KeyPress, Qt::Key_Apostrophe, Qt::AltModifier, QStringLiteral("]") };
297-
// QCOMPARE(NeovimQt::Input::convertKey(evAltRightSquareBracketMacOS), QStringLiteral("["));
298-
299-
// Windows Shift + ` then Space. Prints ^
300-
// NOTE: Linux does not send QKeyEvents for this scenario.
301-
QKeyEvent evShiftAccentSpace{ QKeyEvent::KeyPress, Qt::Key_Space, Qt::NoModifier, QStringLiteral("^") };
302-
QCOMPARE(NeovimQt::Input::convertKey(evShiftAccentSpace), QStringLiteral("^"));
303-
304-
// Windows Shift + ``. Prints ^^ (Windows) and ^ (Linux)
305-
// NOTE: Linux/MacOS do not send QKeyEvents for this scenario.
306-
QKeyEvent evShiftAccentAccent1{ QKeyEvent::KeyPress, Qt::Key_AsciiCircum, Qt::ShiftModifier, QStringLiteral("^") };
307-
QKeyEvent evShiftAccentAccent2{ QKeyEvent::KeyPress, 0, Qt::ShiftModifier, QStringLiteral("^") };
308-
QCOMPARE(NeovimQt::Input::convertKey(evShiftAccentAccent1), QStringLiteral("^"));
309-
QCOMPARE(NeovimQt::Input::convertKey(evShiftAccentAccent2), QStringLiteral("^"));
310-
311-
// Windows ` then e. Prints: è
312-
// NOTE: Linux/MacOS do not send QKeyEvents for this scenario.
313-
QKeyEvent evAccentE{ QKeyEvent::KeyPress, Qt::Key_E, Qt::NoModifier, QStringLiteral("ê") };
314-
QCOMPARE(NeovimQt::Input::convertKey(evAccentE), QStringLiteral("ê"));
315-
316-
// Windows Shift + ^ then e. Prints: ê
317-
// NOTE: Linux/MacOS do not send QKeyEvents for this scenario.
318-
QKeyEvent evShiftAccentE{ QKeyEvent::KeyPress, Qt::Key_E, Qt::NoModifier, QStringLiteral("ê") };
319-
QCOMPARE(NeovimQt::Input::convertKey(evShiftAccentE), QStringLiteral("ê"));
320-
}
321-
322268
#include "tst_input_common.moc"
323269
QTEST_MAIN(TestInputCommon)

‎test/tst_input_mac.cpp

+32
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ private slots:
1515
void CtrlCaretWellFormed() noexcept;
1616
void ShiftModifierLetter() noexcept;
1717
void GermanKeyboardLayout() noexcept;
18+
void SpanishKeyboardLayout() noexcept;
1819
};
1920

2021
void TestInputMac::AltSpecialCharacters() noexcept
@@ -136,5 +137,36 @@ void TestInputMac::GermanKeyboardLayout() noexcept
136137
QCOMPARE(NeovimQt::Input::convertKey(evOptionAtSign), QString{ "@" });
137138
}
138139

140+
// FIXME Issue 720: Spanish layout ignores Left Square Bracket [
141+
void TestInputMac::SpanishKeyboardLayout() noexcept
142+
{
143+
QKeyEvent evBracketRight{ QKeyEvent::KeyPress, Qt::Key_Plus, Qt::AltModifier, QStringLiteral("]") };
144+
QCOMPARE(NeovimQt::Input::convertKey(evBracketRight), QStringLiteral("]"));
145+
146+
QKeyEvent evBracketLeft{ QKeyEvent::KeyPress, Qt::Key_BracketLeft, Qt::AltModifier, QStringLiteral("[") };
147+
QCOMPARE(NeovimQt::Input::convertKey(evBracketLeft), QStringLiteral("["));
148+
149+
QKeyEvent evBraceRight{ QKeyEvent::KeyPress, Qt::Key_Ccedilla, Qt::AltModifier, QStringLiteral("}") };
150+
QCOMPARE(NeovimQt::Input::convertKey(evBraceRight), QStringLiteral("}"));
151+
152+
QKeyEvent evBraceLeft{ QKeyEvent::KeyPress, Qt::Key_BraceLeft, Qt::AltModifier, QStringLiteral("{") };
153+
QCOMPARE(NeovimQt::Input::convertKey(evBraceLeft), QStringLiteral("{"));
154+
155+
QKeyEvent evPipe{ QKeyEvent::KeyPress, Qt::Key_1, Qt::AltModifier, QStringLiteral("|") };
156+
QCOMPARE(NeovimQt::Input::convertKey(evPipe), QStringLiteral("|"));
157+
158+
QKeyEvent evAt{ QKeyEvent::KeyPress, Qt::Key_2, Qt::AltModifier, QStringLiteral("@") };
159+
QCOMPARE(NeovimQt::Input::convertKey(evAt), QStringLiteral("@"));
160+
161+
QKeyEvent evNegation{ QKeyEvent::KeyPress, Qt::Key_6, Qt::AltModifier, QStringLiteral("¬") };
162+
QCOMPARE(NeovimQt::Input::convertKey(evNegation), QStringLiteral("¬"));
163+
164+
QKeyEvent evPound{ QKeyEvent::KeyPress, Qt::Key_3, Qt::AltModifier, QStringLiteral("#") };
165+
QCOMPARE(NeovimQt::Input::convertKey(evPound), QStringLiteral("#"));
166+
167+
// QKeyEvent evBackslash{ QKeyEvent::KeyPress, Qt::Key_masculine, Qt::AltModifier, QStringLiteral("\\") };
168+
// QCOMPARE(NeovimQt::Input::convertKey(evBackslash), QStringLiteral("\\"));
169+
}
170+
139171
#include "tst_input_mac.moc"
140172
QTEST_MAIN(TestInputMac)

‎test/tst_input_unix.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ private slots:
1414
void ShiftModifierLetter() noexcept;
1515
void GermanKeyboardLayout() noexcept;
1616
void ControlSpace() noexcept;
17+
void SpanishKeyboardLayout() noexcept;
1718
};
1819

1920
void TestInputUnix::LessThanModifierKeys() noexcept
@@ -110,5 +111,12 @@ void TestInputUnix::ControlSpace() noexcept
110111
QCOMPARE(NeovimQt::Input::convertKey(evControlSpace), QString{ "<C-Space>" });
111112
}
112113

114+
void TestInputUnix::SpanishKeyboardLayout() noexcept
115+
{
116+
// Linux AltGr (Right Alt) + `. Prints: [
117+
QKeyEvent evAltGrSquareBracketLinux{ QKeyEvent::KeyPress, Qt::Key_BracketLeft, Qt::GroupSwitchModifier, QStringLiteral("[") };
118+
QCOMPARE(NeovimQt::Input::convertKey(evAltGrSquareBracketLinux), QStringLiteral("["));
119+
}
120+
113121
#include "tst_input_unix.moc"
114122
QTEST_MAIN(TestInputUnix)

‎test/tst_input_win32.cpp

+39
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ private slots:
1414
void ShiftModifierLetter() noexcept;
1515
void GermanKeyboardLayout() noexcept;
1616
void FrenchBepoKeyboardLayout() noexcept;
17+
void SpanishKeyboardLayout() noexcept;
1718
};
1819

1920
void TestInputWin32::LessThanModifierKeys() noexcept
@@ -117,5 +118,43 @@ void TestInputWin32::FrenchBepoKeyboardLayout() noexcept
117118
QCOMPARE(NeovimQt::Input::convertKey(evSpace), QString{ "<Space>" });
118119
}
119120

121+
void TestInputWin32::SpanishKeyboardLayout() noexcept
122+
{
123+
// Windows ` + Space. Prints: `
124+
QKeyEvent evAccentSpace{ QKeyEvent::KeyPress, Qt::Key_Space, Qt::NoModifier, QStringLiteral("`") };
125+
QCOMPARE(NeovimQt::Input::convertKey(evAccentSpace), QStringLiteral("`"));
126+
127+
// Windows ``: two events are sent on the second key event. Prints: ``
128+
// NOTE: Linux/MacOS do not send QKeyEvents for this scenario.
129+
QKeyEvent evAccentFirst{ QKeyEvent::KeyPress, Qt::Key_QuoteLeft, Qt::NoModifier, QStringLiteral("`") };
130+
QKeyEvent evAccentSecond{ QKeyEvent::KeyPress, 0, Qt::NoModifier, QStringLiteral("`") };
131+
132+
// Windows AltGr (Right Alt) + `. Prints: [
133+
QKeyEvent evAltGrSquareBracketWindows{ QKeyEvent::KeyPress, Qt::Key_AsciiCircum, Qt::AltModifier, QStringLiteral("[") };
134+
QCOMPARE(NeovimQt::Input::convertKey(evAltGrSquareBracketWindows), QStringLiteral("["));
135+
136+
// Windows Shift + ` then Space. Prints ^
137+
// NOTE: Linux does not send QKeyEvents for this scenario.
138+
QKeyEvent evShiftAccentSpace{ QKeyEvent::KeyPress, Qt::Key_Space, Qt::NoModifier, QStringLiteral("^") };
139+
QCOMPARE(NeovimQt::Input::convertKey(evShiftAccentSpace), QStringLiteral("^"));
140+
141+
// Windows Shift + ``. Prints ^^ (Windows) and ^ (Linux)
142+
// NOTE: Linux/MacOS do not send QKeyEvents for this scenario.
143+
QKeyEvent evShiftAccentAccent1{ QKeyEvent::KeyPress, Qt::Key_AsciiCircum, Qt::ShiftModifier, QStringLiteral("^") };
144+
QKeyEvent evShiftAccentAccent2{ QKeyEvent::KeyPress, 0, Qt::ShiftModifier, QStringLiteral("^") };
145+
QCOMPARE(NeovimQt::Input::convertKey(evShiftAccentAccent1), QStringLiteral("^"));
146+
QCOMPARE(NeovimQt::Input::convertKey(evShiftAccentAccent2), QStringLiteral("^"));
147+
148+
// Windows ` then e. Prints: è
149+
// NOTE: Linux/MacOS do not send QKeyEvents for this scenario.
150+
QKeyEvent evAccentE{ QKeyEvent::KeyPress, Qt::Key_E, Qt::NoModifier, QStringLiteral("ê") };
151+
QCOMPARE(NeovimQt::Input::convertKey(evAccentE), QStringLiteral("ê"));
152+
153+
// Windows Shift + ^ then e. Prints: ê
154+
// NOTE: Linux/MacOS do not send QKeyEvents for this scenario.
155+
QKeyEvent evShiftAccentE{ QKeyEvent::KeyPress, Qt::Key_E, Qt::NoModifier, QStringLiteral("ê") };
156+
QCOMPARE(NeovimQt::Input::convertKey(evShiftAccentE), QStringLiteral("ê"));
157+
}
158+
120159
#include "tst_input_win32.moc"
121160
QTEST_MAIN(TestInputWin32)

0 commit comments

Comments
 (0)
Please sign in to comment.