1 files changed, 105 insertions, 95 deletions

diff --git a/src/KeyMap.cxx b/src/KeyMap.cxx
index dbd7d923e..ae189db55 100644
--- a/src/KeyMap.cxx
+++ b/src/KeyMap.cxx
@@ -14,16 +14,18 @@
 #include <optional>
 #include <memory>
 
-#include "Debugging.h"
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
 
-#include "Scintilla.h"
+#include "Debugging.h"
 
 #include "KeyMap.h"
 
 using namespace Scintilla;
+using namespace Scintilla::Internal;
 
 KeyMap::KeyMap() {
-	for (int i = 0; MapDefault[i].key; i++) {
+	for (int i = 0; static_cast<int>(MapDefault[i].key); i++) {
 		AssignCmdKey(MapDefault[i].key,
 			MapDefault[i].modifiers,
 			MapDefault[i].msg);
@@ -38,16 +40,16 @@ void KeyMap::Clear() noexcept {
 	kmap.clear();
 }
 
-void KeyMap::AssignCmdKey(int key, int modifiers, unsigned int msg) {
+void KeyMap::AssignCmdKey(Keys key, KeyMod modifiers, Message msg) {
 	kmap[KeyModifiers(key, modifiers)] = msg;
 }
 
-unsigned int KeyMap::Find(int key, int modifiers) const {
-	std::map<KeyModifiers, unsigned int>::const_iterator it = kmap.find(KeyModifiers(key, modifiers));
-	return (it == kmap.end()) ? 0 : it->second;
+Message KeyMap::Find(Keys key, KeyMod modifiers) const {
+	std::map<KeyModifiers, Message>::const_iterator it = kmap.find(KeyModifiers(key, modifiers));
+	return (it == kmap.end()) ? static_cast<Message>(0) : it->second;
 }
 
-const std::map<KeyModifiers, unsigned int> &KeyMap::GetKeyMap() const noexcept {
+const std::map<KeyModifiers, Message> &KeyMap::GetKeyMap() const noexcept {
 	return kmap;
 }
 
@@ -67,100 +69,108 @@ const std::map<KeyModifiers, unsigned int> &KeyMap::GetKeyMap() const noexcept {
 #define SCI_SCTRL_META (SCI_CTRL | SCI_SHIFT)
 #endif
 
+namespace {
+
+constexpr Keys Key(char ch) {
+    return static_cast<Keys>(ch);
+}
+
+}
+
 const KeyToCommand KeyMap::MapDefault[] = {
 
 #if OS_X_KEYS
-    {SCK_DOWN,		SCI_CTRL,	SCI_DOCUMENTEND},
-    {SCK_DOWN,		SCI_CSHIFT,	SCI_DOCUMENTENDEXTEND},
-    {SCK_UP,		SCI_CTRL,	SCI_DOCUMENTSTART},
-    {SCK_UP,		SCI_CSHIFT,	SCI_DOCUMENTSTARTEXTEND},
-    {SCK_LEFT,		SCI_CTRL,	SCI_VCHOME},
-    {SCK_LEFT,		SCI_CSHIFT,	SCI_VCHOMEEXTEND},
-    {SCK_RIGHT,		SCI_CTRL,	SCI_LINEEND},
-    {SCK_RIGHT,		SCI_CSHIFT,	SCI_LINEENDEXTEND},
+    {Keys::Down,		SCI_CTRL,	Message::DocumentEnd},
+    {Keys::Down,		SCI_CSHIFT,	Message::DocumentEndExtend},
+    {Keys::Up,		    SCI_CTRL,	Message::DocumentStart},
+    {Keys::Up,		    SCI_CSHIFT,	Message::DocumentStartExtend},
+    {Keys::Left,		SCI_CTRL,	Message::VCHome},
+    {Keys::Left,		SCI_CSHIFT,	Message::VCHomeExtend},
+    {Keys::Right,		SCI_CTRL,	Message::LineEnd},
+    {Keys::Right,		SCI_CSHIFT,	Message::LineEndExtend},
 #endif
 
-    {SCK_DOWN,		SCI_NORM,	SCI_LINEDOWN},
-    {SCK_DOWN,		SCI_SHIFT,	SCI_LINEDOWNEXTEND},
-    {SCK_DOWN,		SCI_CTRL_META,	SCI_LINESCROLLDOWN},
-    {SCK_DOWN,		SCI_ASHIFT,	SCI_LINEDOWNRECTEXTEND},
-    {SCK_UP,		SCI_NORM,	SCI_LINEUP},
-    {SCK_UP,			SCI_SHIFT,	SCI_LINEUPEXTEND},
-    {SCK_UP,			SCI_CTRL_META,	SCI_LINESCROLLUP},
-    {SCK_UP,		SCI_ASHIFT,	SCI_LINEUPRECTEXTEND},
-    {'[',			SCI_CTRL,		SCI_PARAUP},
-    {'[',			SCI_CSHIFT,	SCI_PARAUPEXTEND},
-    {']',			SCI_CTRL,		SCI_PARADOWN},
-    {']',			SCI_CSHIFT,	SCI_PARADOWNEXTEND},
-    {SCK_LEFT,		SCI_NORM,	SCI_CHARLEFT},
-    {SCK_LEFT,		SCI_SHIFT,	SCI_CHARLEFTEXTEND},
-    {SCK_LEFT,		SCI_CTRL_META,	SCI_WORDLEFT},
-    {SCK_LEFT,		SCI_SCTRL_META,	SCI_WORDLEFTEXTEND},
-    {SCK_LEFT,		SCI_ASHIFT,	SCI_CHARLEFTRECTEXTEND},
-    {SCK_RIGHT,		SCI_NORM,	SCI_CHARRIGHT},
-    {SCK_RIGHT,		SCI_SHIFT,	SCI_CHARRIGHTEXTEND},
-    {SCK_RIGHT,		SCI_CTRL_META,	SCI_WORDRIGHT},
-    {SCK_RIGHT,		SCI_SCTRL_META,	SCI_WORDRIGHTEXTEND},
-    {SCK_RIGHT,		SCI_ASHIFT,	SCI_CHARRIGHTRECTEXTEND},
-    {'/',		SCI_CTRL,		SCI_WORDPARTLEFT},
-    {'/',		SCI_CSHIFT,	SCI_WORDPARTLEFTEXTEND},
-    {'\\',		SCI_CTRL,		SCI_WORDPARTRIGHT},
-    {'\\',		SCI_CSHIFT,	SCI_WORDPARTRIGHTEXTEND},
-    {SCK_HOME,		SCI_NORM,	SCI_VCHOME},
-    {SCK_HOME, 		SCI_SHIFT, 	SCI_VCHOMEEXTEND},
-    {SCK_HOME, 		SCI_CTRL, 	SCI_DOCUMENTSTART},
-    {SCK_HOME, 		SCI_CSHIFT, 	SCI_DOCUMENTSTARTEXTEND},
-    {SCK_HOME, 		SCI_ALT, 	SCI_HOMEDISPLAY},
-    {SCK_HOME,		SCI_ASHIFT,	SCI_VCHOMERECTEXTEND},
-    {SCK_END,	 	SCI_NORM,	SCI_LINEEND},
-    {SCK_END,	 	SCI_SHIFT, 	SCI_LINEENDEXTEND},
-    {SCK_END, 		SCI_CTRL, 	SCI_DOCUMENTEND},
-    {SCK_END, 		SCI_CSHIFT, 	SCI_DOCUMENTENDEXTEND},
-    {SCK_END, 		SCI_ALT, 	SCI_LINEENDDISPLAY},
-    {SCK_END,		SCI_ASHIFT,	SCI_LINEENDRECTEXTEND},
-    {SCK_PRIOR,		SCI_NORM,	SCI_PAGEUP},
-    {SCK_PRIOR,		SCI_SHIFT, 	SCI_PAGEUPEXTEND},
-    {SCK_PRIOR,		SCI_ASHIFT,	SCI_PAGEUPRECTEXTEND},
-    {SCK_NEXT, 		SCI_NORM, 	SCI_PAGEDOWN},
-    {SCK_NEXT, 		SCI_SHIFT, 	SCI_PAGEDOWNEXTEND},
-    {SCK_NEXT,		SCI_ASHIFT,	SCI_PAGEDOWNRECTEXTEND},
-    {SCK_DELETE, 	SCI_NORM,	SCI_CLEAR},
-    {SCK_DELETE, 	SCI_SHIFT,	SCI_CUT},
-    {SCK_DELETE, 	SCI_CTRL,	SCI_DELWORDRIGHT},
-    {SCK_DELETE,	SCI_CSHIFT,	SCI_DELLINERIGHT},
-    {SCK_INSERT, 		SCI_NORM,	SCI_EDITTOGGLEOVERTYPE},
-    {SCK_INSERT, 		SCI_SHIFT,	SCI_PASTE},
-    {SCK_INSERT, 		SCI_CTRL,	SCI_COPY},
-    {SCK_ESCAPE,  	SCI_NORM,	SCI_CANCEL},
-    {SCK_BACK,		SCI_NORM, 	SCI_DELETEBACK},
-    {SCK_BACK,		SCI_SHIFT, 	SCI_DELETEBACK},
-    {SCK_BACK,		SCI_CTRL, 	SCI_DELWORDLEFT},
-    {SCK_BACK, 		SCI_ALT,	SCI_UNDO},
-    {SCK_BACK,		SCI_CSHIFT,	SCI_DELLINELEFT},
-    {'Z', 			SCI_CTRL,	SCI_UNDO},
+    {Keys::Down,		SCI_NORM,	Message::LineDown},
+    {Keys::Down,		SCI_SHIFT,	Message::LineDownExtend},
+    {Keys::Down,		SCI_CTRL_META,	Message::LineScrollDown},
+    {Keys::Down,		SCI_ASHIFT,	Message::LineDownRectExtend},
+    {Keys::Up,		    SCI_NORM,	Message::LineUp},
+    {Keys::Up,			SCI_SHIFT,	Message::LineUpExtend},
+    {Keys::Up,			SCI_CTRL_META,	Message::LineScrollUp},
+    {Keys::Up,		    SCI_ASHIFT,	Message::LineUpRectExtend},
+    {Key('['),			SCI_CTRL,	Message::ParaUp},
+    {Key('['),			SCI_CSHIFT,	Message::ParaUpExtend},
+    {Key(']'),			SCI_CTRL,	Message::ParaDown},
+    {Key(']'),			SCI_CSHIFT,	Message::ParaDownExtend},
+    {Keys::Left,		SCI_NORM,	Message::CharLeft},
+    {Keys::Left,		SCI_SHIFT,	Message::CharLeftExtend},
+    {Keys::Left,		SCI_CTRL_META,	Message::WordLeft},
+    {Keys::Left,		SCI_SCTRL_META,	Message::WordLeftExtend},
+    {Keys::Left,		SCI_ASHIFT,	Message::CharLeftRectExtend},
+    {Keys::Right,		SCI_NORM,	Message::CharRight},
+    {Keys::Right,		SCI_SHIFT,	Message::CharRightExtend},
+    {Keys::Right,		SCI_CTRL_META,	Message::WordRight},
+    {Keys::Right,		SCI_SCTRL_META,	Message::WordRightExtend},
+    {Keys::Right,		SCI_ASHIFT,	Message::CharRightRectExtend},
+    {Key('/'),		    SCI_CTRL,	Message::WordPartLeft},
+    {Key('/'),		    SCI_CSHIFT,	Message::WordPartLeftExtend},
+    {Key('\\'),		    SCI_CTRL,	Message::WordPartRight},
+    {Key('\\'),		    SCI_CSHIFT,	Message::WordPartRightExtend},
+    {Keys::Home,		SCI_NORM,	Message::VCHome},
+    {Keys::Home, 		SCI_SHIFT, 	Message::VCHomeExtend},
+    {Keys::Home, 		SCI_CTRL, 	Message::DocumentStart},
+    {Keys::Home, 		SCI_CSHIFT, Message::DocumentStartExtend},
+    {Keys::Home, 		SCI_ALT, 	Message::HomeDisplay},
+    {Keys::Home,		SCI_ASHIFT,	Message::VCHomeRectExtend},
+    {Keys::End,	 	    SCI_NORM,	Message::LineEnd},
+    {Keys::End,	 	    SCI_SHIFT, 	Message::LineEndExtend},
+    {Keys::End, 		SCI_CTRL, 	Message::DocumentEnd},
+    {Keys::End, 		SCI_CSHIFT, Message::DocumentEndExtend},
+    {Keys::End, 		SCI_ALT, 	Message::LineEndDisplay},
+    {Keys::End,		    SCI_ASHIFT,	Message::LineEndRectExtend},
+    {Keys::Prior,		SCI_NORM,	Message::PageUp},
+    {Keys::Prior,		SCI_SHIFT, 	Message::PageUpExtend},
+    {Keys::Prior,		SCI_ASHIFT,	Message::PageUpRectExtend},
+    {Keys::Next, 		SCI_NORM, 	Message::PageDown},
+    {Keys::Next, 		SCI_SHIFT, 	Message::PageDownExtend},
+    {Keys::Next,		SCI_ASHIFT,	Message::PageDownRectExtend},
+    {Keys::Delete,      SCI_NORM,	Message::Clear},
+    {Keys::Delete, 	    SCI_SHIFT,	Message::Cut},
+    {Keys::Delete, 	    SCI_CTRL,	Message::DelWordRight},
+    {Keys::Delete,	    SCI_CSHIFT,	Message::DelLineRight},
+    {Keys::Insert, 		SCI_NORM,	Message::EditToggleOvertype},
+    {Keys::Insert, 		SCI_SHIFT,	Message::Paste},
+    {Keys::Insert, 		SCI_CTRL,	Message::Copy},
+    {Keys::Escape,  	SCI_NORM,	Message::Cancel},
+    {Keys::Back,		SCI_NORM, 	Message::DeleteBack},
+    {Keys::Back,		SCI_SHIFT, 	Message::DeleteBack},
+    {Keys::Back,		SCI_CTRL, 	Message::DelWordLeft},
+    {Keys::Back, 		SCI_ALT,	Message::Undo},
+    {Keys::Back,		SCI_CSHIFT,	Message::DelLineLeft},
+    {Key('Z'), 			SCI_CTRL,	Message::Undo},
 #if OS_X_KEYS
-    {'Z', 			SCI_CSHIFT,	SCI_REDO},
+    {Key('Z'), 			SCI_CSHIFT,	Message::Redo},
 #else
-    {'Y', 			SCI_CTRL,	SCI_REDO},
+    {Key('Y'), 			SCI_CTRL,	Message::Redo},
 #endif
-    {'X', 			SCI_CTRL,	SCI_CUT},
-    {'C', 			SCI_CTRL,	SCI_COPY},
-    {'V', 			SCI_CTRL,	SCI_PASTE},
-    {'A', 			SCI_CTRL,	SCI_SELECTALL},
-    {SCK_TAB,		SCI_NORM,	SCI_TAB},
-    {SCK_TAB,		SCI_SHIFT,	SCI_BACKTAB},
-    {SCK_RETURN, 	SCI_NORM,	SCI_NEWLINE},
-    {SCK_RETURN, 	SCI_SHIFT,	SCI_NEWLINE},
-    {SCK_ADD, 		SCI_CTRL,	SCI_ZOOMIN},
-    {SCK_SUBTRACT,	SCI_CTRL,	SCI_ZOOMOUT},
-    {SCK_DIVIDE,	SCI_CTRL,	SCI_SETZOOM},
-    {'L', 			SCI_CTRL,	SCI_LINECUT},
-    {'L', 			SCI_CSHIFT,	SCI_LINEDELETE},
-    {'T', 			SCI_CSHIFT,	SCI_LINECOPY},
-    {'T', 			SCI_CTRL,	SCI_LINETRANSPOSE},
-    {'D', 			SCI_CTRL,	SCI_SELECTIONDUPLICATE},
-    {'U', 			SCI_CTRL,	SCI_LOWERCASE},
-    {'U', 			SCI_CSHIFT,	SCI_UPPERCASE},
-    {0,0,0},
+    {Key('X'), 			SCI_CTRL,	Message::Cut},
+    {Key('C'), 			SCI_CTRL,	Message::Copy},
+    {Key('V'), 			SCI_CTRL,	Message::Paste},
+    {Key('A'), 			SCI_CTRL,	Message::SelectAll},
+    {Keys::Tab,		    SCI_NORM,	Message::Tab},
+    {Keys::Tab,		    SCI_SHIFT,	Message::BackTab},
+    {Keys::Return, 	    SCI_NORM,	Message::NewLine},
+    {Keys::Return, 	    SCI_SHIFT,	Message::NewLine},
+    {Keys::Add, 		SCI_CTRL,	Message::ZoomIn},
+    {Keys::Subtract,	SCI_CTRL,	Message::ZoomOut},
+    {Keys::Divide,	    SCI_CTRL,	Message::SetZoom},
+    {Key('L'), 			SCI_CTRL,	Message::LineCut},
+    {Key('L'), 			SCI_CSHIFT,	Message::LineDelete},
+    {Key('T'), 			SCI_CSHIFT,	Message::LineCopy},
+    {Key('T'), 			SCI_CTRL,	Message::LineTranspose},
+    {Key('D'), 			SCI_CTRL,	Message::SelectionDuplicate},
+    {Key('U'), 			SCI_CTRL,	Message::LowerCase},
+    {Key('U'), 			SCI_CSHIFT,	Message::UpperCase},
+    {Key(0),SCI_NORM,static_cast<Message>(0)},
 };