github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-01-22 21:27:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Strip the numeric keypad flag for key events

Browse Source 
This means pressing e.g. ⌘/ (using the slash on the numeric keypad) will still work to toggle comments.

It also means that we can no longer bind specifically to the numeric keypad keys, but I don’t think anyone actually does that (given that few have numeric keypads).

The ideal solution would be to first do a literal check and then, if there was no match and the key event had the numeric keypad flag set, do a test with this flag removed, but that would change the simple string compare we presently use plus the easy caching and binary search of finding the item that matches a key event, i.e. it would add complexity to the code with no known argument in favor of this flexibility.
This commit is contained in:
Allan Odgaard
2012-08-19 21:01:36 +02:00
parent 4ca897816d
commit 783514fcff
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Frameworks/ns/src/ns.h
View File

@@ -7,7 +7,7 @@
PUBLIC std::string to_s (NSString* aString);
PUBLIC std::string to_s (NSData* aString);
PUBLIC std::string to_s (NSEvent* anEvent);
PUBLIC std::string to_s (NSEvent* anEvent, bool preserveNumPadFlag = false);
namespace ns
{

4
Frameworks/ns/src/ns.mm
View File

@@ -66,7 +66,7 @@ static bool is_ascii (std::string const& str)
end if
*/
std::string to_s (NSEvent* anEvent)
std::string to_s (NSEvent* anEvent, bool preserveNumPadFlag)
{
CGEventRef cgEvent = [anEvent CGEvent];
CGKeyCode key = (CGKeyCode)[anEvent keyCode];
@@ -81,7 +81,7 @@ std::string to_s (NSEvent* anEvent)
if(flags & kCGEventFlagMaskNumericPad)
{
static std::string const numPadKeys = "0123456789=/*-+.,";
if(numPadKeys.find(keyStringNoFlags) != std::string::npos)
if(preserveNumPadFlag && numPadKeys.find(keyStringNoFlags) != std::string::npos)
newFlags |= kCGEventFlagMaskNumericPad;
flags &= ~kCGEventFlagMaskControl;
}