mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-12-27 12:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add get_unicodechar_from_nsevent() to she/osx/view.mm

Browse Source
This commit is contained in:
David Capello 2016-04-11 14:49:26 -03:00
parent 8e06d61f74
commit ed4b26b2c8
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/she/osx/view.mm
View File

@ -59,6 +59,19 @@ inline KeyModifiers get_modifiers_from_nsevent(NSEvent* event)
return (KeyModifiers)modifiers; return (KeyModifiers)modifiers;
} }
inline int get_unicodechar_from_nsevent(NSEvent* event)
{
int chr = 0;
// TODO we should use "event.characters" for a new kind of event (Event::Char or something like that)
NSString* chars = event.charactersIgnoringModifiers;
if (chars && chars.length >= 1) {
chr = [chars characterAtIndex:0];
if (chr < 32)
chr = 0;
}
return chr;
}
} // anonymous namespace } // anonymous namespace
namespace she { namespace she {
@ -142,11 +155,7 @@ bool is_key_pressed(KeyScancode scancode)
ev.setScancode(scancode); ev.setScancode(scancode);
ev.setModifiers(get_modifiers_from_nsevent(event)); ev.setModifiers(get_modifiers_from_nsevent(event));
ev.setRepeat(event.ARepeat ? 1: 0); ev.setRepeat(event.ARepeat ? 1: 0);
ev.setUnicodeChar(get_unicodechar_from_nsevent(event));
// TODO we should use event.characters
NSString* chars = event.charactersIgnoringModifiers;
if (chars && chars.length >= 1)
ev.setUnicodeChar([chars characterAtIndex:0]);
queue_event(ev); queue_event(ev);
} }
@ -164,11 +173,7 @@ bool is_key_pressed(KeyScancode scancode)
ev.setScancode(scancode); ev.setScancode(scancode);
ev.setModifiers(get_modifiers_from_nsevent(event)); ev.setModifiers(get_modifiers_from_nsevent(event));
ev.setRepeat(event.ARepeat ? 1: 0); ev.setRepeat(event.ARepeat ? 1: 0);
ev.setUnicodeChar(get_unicodechar_from_nsevent(event));
// TODO we should use event.characters
NSString* chars = event.charactersIgnoringModifiers;
if (chars && chars.length >= 1)
ev.setUnicodeChar([chars characterAtIndex:0]);
queue_event(ev); queue_event(ev);
} }