From 42b2771fab341485972a3084bba49d1f91137d34 Mon Sep 17 00:00:00 2001 From: nyamatongwe Date: Wed, 15 Jun 2011 23:07:00 +1000 Subject: Added SCMOD_META key modifier for the Control key on OS X. New version of KeyDown, KeyDownWithModifiers uses a mask of modifiers. --- src/Editor.cxx | 10 +++++++--- src/Editor.h | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/Editor.cxx b/src/Editor.cxx index 587aa8050..648dd8034 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -5516,10 +5516,8 @@ int Editor::KeyDefault(int, int) { return 0; } -int Editor::KeyDown(int key, bool shift, bool ctrl, bool alt, bool *consumed) { +int Editor::KeyDownWithModifiers(int key, int modifiers, bool *consumed) { DwellEnd(false); - int modifiers = (shift ? SCI_SHIFT : 0) | (ctrl ? SCI_CTRL : 0) | - (alt ? SCI_ALT : 0); int msg = kmap.Find(key, modifiers); if (msg) { if (consumed) @@ -5532,6 +5530,12 @@ int Editor::KeyDown(int key, bool shift, bool ctrl, bool alt, bool *consumed) { } } +int Editor::KeyDown(int key, bool shift, bool ctrl, bool alt, bool *consumed) { + int modifiers = (shift ? SCI_SHIFT : 0) | (ctrl ? SCI_CTRL : 0) | + (alt ? SCI_ALT : 0); + return KeyDownWithModifiers(key, modifiers, consumed); +} + void Editor::SetWhitespaceVisible(int view) { vs.viewWhitespace = static_cast(view); } diff --git a/src/Editor.h b/src/Editor.h index eccdb717f..74f0eff86 100644 --- a/src/Editor.h +++ b/src/Editor.h @@ -465,6 +465,7 @@ protected: // ScintillaBase subclass needs access to much of Editor int StartEndDisplayLine(int pos, bool start); virtual int KeyCommand(unsigned int iMessage); virtual int KeyDefault(int /* key */, int /*modifiers*/); + int KeyDownWithModifiers(int key, int modifiers, bool *consumed); int KeyDown(int key, bool shift, bool ctrl, bool alt, bool *consumed=0); int GetWhitespaceVisible(); -- cgit v1.2.3