MoNTE48
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OSX: redo `postKeyEvent` in the right way

master
MoNTE48 2021-12-30 19:49:26 +01:00
parent a3dd0c1399
commit c7e50ced5c
1 changed files with 22 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
source/Irrlicht/CIrrDeviceOSX.mm
View File

@ -1135,66 +1135,32 @@ bool CIrrDeviceMacOSX::isWindowMinimized() const
void CIrrDeviceMacOSX::postKeyEvent(void *event,irr::SEvent &ievent,bool pressed)
{
NSString *str;
int mkey;
u32 c, mchar;
const unsigned char *cStr;
BOOL skipCommand;
EKEY_CODE mkey = KEY_UNKNOWN;
wchar_t mchar = 0;
str = [(NSEvent *)event characters];
auto iter = KeyCodes.find([(NSEvent *)event keyCode]);
if (iter != KeyCodes.end())
mkey = (EKEY_CODE) (*iter).second;
NSString *str = [(NSEvent *) event characters];
if ((str != nil) && ([str length] > 0))
mchar = [str characterAtIndex:0];
// Hope it's not the worst patch you've ever seen...
if (mkey == KEY_UP || mkey == KEY_DOWN || mkey == KEY_LEFT || mkey == KEY_RIGHT
|| mkey == KEY_CONTROL || mkey == KEY_RCONTROL)
{
mkey = mchar = 0;
skipCommand = false;
c = [str characterAtIndex:0];
mchar = c;
auto iter = KeyCodes.find([(NSEvent *)event keyCode]);
if (iter != KeyCodes.end())
mkey = (*iter).second;
else if ((iter = KeyCodes.find(c)) != KeyCodes.end())
mkey = (*iter).second;
else
{
// workaround for period character
if (c == 0x2E)
{
mkey = irr::KEY_PERIOD;
mchar = '.';
}
else
{
cStr = (unsigned char *)[str cStringUsingEncoding:NSWindowsCP1252StringEncoding];
if (cStr != NULL && strlen((char*)cStr) > 0)
{
mchar = cStr[0];
mkey = toupper(mchar);
if ([(NSEvent *)event modifierFlags] & NSCommandKeyMask)
{
if (mkey == 'C' || mkey == 'V' || mkey == 'X')
{
mchar = 0;
skipCommand = true;
}
}
}
}
}
ievent.EventType = irr::EET_KEY_INPUT_EVENT;
ievent.KeyInput.Key = (irr::EKEY_CODE)mkey;
ievent.KeyInput.PressedDown = pressed;
ievent.KeyInput.Shift = ([(NSEvent *)event modifierFlags] & NSShiftKeyMask) != 0;
ievent.KeyInput.Control = ([(NSEvent *)event modifierFlags] & NSCommandKeyMask) != 0;
ievent.KeyInput.Char = mchar;
if (skipCommand)
ievent.KeyInput.Control = true;
else if ([(NSEvent *)event modifierFlags] & NSCommandKeyMask)
[NSApp sendEvent:(NSEvent *)event];
postEventFromUser(ievent);
mchar = 0;
}
ievent.EventType = irr::EET_KEY_INPUT_EVENT;
ievent.KeyInput.Key = mkey;
ievent.KeyInput.PressedDown = pressed;
ievent.KeyInput.Shift = ([(NSEvent *)event modifierFlags] & NSShiftKeyMask) != 0;
ievent.KeyInput.Control = (([(NSEvent *)event modifierFlags] & NSCommandKeyMask)) != 0;
ievent.KeyInput.Char = mchar;
postEventFromUser(ievent);
}