X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2FFGEventHandler.cxx;h=d6be62054e365fd9704147a01678a43ba014d6e4;hb=7b95bb5aa382d0e573e4597213a2e0f1c3d53601;hp=16babdeada1ff98ce6949fc2ccfef12292708c39;hpb=4e047d456f1a20199da2d86d98af69913c75780a;p=flightgear.git diff --git a/src/Main/FGEventHandler.cxx b/src/Main/FGEventHandler.cxx index 16babdead..d6be62054 100644 --- a/src/Main/FGEventHandler.cxx +++ b/src/Main/FGEventHandler.cxx @@ -147,10 +147,6 @@ bool FGEventHandler::handle(const osgGA::GUIEventAdapter& ea, switch (ea.getEventType()) { case osgGA::GUIEventAdapter::FRAME: - if (idleHandler) - (*idleHandler)(); - if (drawHandler) - (*drawHandler)(); mouseWarped = false; handleStats(us); return true; @@ -275,9 +271,14 @@ void FGEventHandler::handleKey(const osgGA::GUIEventAdapter& ea, int& key, std::map::iterator numPadIter = numlockKeyMap.find(key); if (numPadIter != numlockKeyMap.end()) { +#ifdef __APPLE__ + // Num Lock is always true on Mac + key = numPadIter->second; +#else if (ea.getModKeyMask() & osgGA::GUIEventAdapter::MODKEY_NUM_LOCK) { key = numPadIter->second; } +#endif } modifiers = osgToFGModifiers(ea.getModKeyMask());