From ea0c8a40952db38bbdc4041913b97e06d9bc4fc5 Mon Sep 17 00:00:00 2001 From: Romain Goyet Date: Mon, 1 May 2017 18:36:17 +0200 Subject: [PATCH] [ion] More accurate event map Change-Id: I06723e69e07c9a0ca5817f66f939e64aae975f36 --- ion/src/shared/events.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ion/src/shared/events.cpp b/ion/src/shared/events.cpp index a29b822b8..d6a148a03 100644 --- a/ion/src/shared/events.cpp +++ b/ion/src/shared/events.cpp @@ -49,10 +49,10 @@ static constexpr EventData s_dataForEvent[4*Event::PageSize] = { U(), U(), TL(), TL(), TL(), TL(), T("["), T("]"), T("{"), T("}"), T("_"), T(k_sto), T("asin()"), T("acos()"), T("atan()"), T("="), T("<"), T(">"), - U(), U(), TL(), TL(), TL(), TL(), - U(), U(), TL(), TL(), TL(), TL(), - U(), U(), TL(), TL(), TL(), TL(), - U(), U(), TL(), TL(), TL(), TL(), + U(), U(), U(), U(), U(), U(), + U(), U(), U(), U(), U(), U(), + U(), U(), U(), U(), U(), U(), + U(), U(), U(), U(), U(), U(), // Alpha U(), U(), U(), U(), U(), U(), U(), U(), U(), U(), U(), U(), @@ -71,7 +71,7 @@ static constexpr EventData s_dataForEvent[4*Event::PageSize] = { T("G"), T("H"), T("I"), T("J"), T("K"), T("L"), T("M"), T("N"), T("O"), T("P"), T("Q"), U(), T("R"), T("S"), T("T"), T("U"), T("V"), U(), - T("W"), T("X"), T("Y"), T("Z"), T(" "), U(), + T("W"), T("X"), T("Y"), T("Z"), U(), U(), U(), U(), U(), U(), U(), U(), }; @@ -126,7 +126,7 @@ bool Event::isValid() const { if (isKeyboardEvent()) { return s_dataForEvent[m_id].isDefined(); } else { - return (*this == None); + return (*this == None || *this == Termination); } }