extern wxList wxPendingDelete;
-// set wxMAC_USE_RAEL to 1 if RunApplicationEventLoop should be used
-// if 0 the lower level CarbonEventLoop will be used
-// on the long run RAEL should replace the low level event loop
-// we will have to clean up event handling to make sure we don't
-// miss handling of things like pending events etc
-// perhaps we will also have to pipe events through an ueber-event-handler
-// to make sure we have one place to do all these house-keeping functions
-
-#define wxMAC_USE_RAEL 0
-
#if wxUSE_THREADS
extern size_t g_numberOfThreads;
#endif
#endif
}
-int wxApp::MainLoop()
-{
- m_keepGoing = true;
-
-#if wxMAC_USE_RAEL
- RunApplicationEventLoop() ;
-#else
- while (m_keepGoing)
- {
- MacDoOneEvent() ;
- }
-#endif
-
- return 0;
-}
-
-void wxApp::ExitMainLoop()
-{
- m_keepGoing = false;
-
-#if wxMAC_USE_RAEL
- QuitApplicationEventLoop() ;
-#endif
-}
-
-// Is a message/event pending?
-bool wxApp::Pending()
-{
- // without the receive event (with pull param = false ) nothing is ever reported
- EventRef theEvent;
-
- ReceiveNextEvent(0, NULL, kEventDurationNoWait, false, &theEvent);
-
- return GetNumEventsInQueue( GetMainEventQueue() ) > 0 ;
-}
-
-// Dispatch a message.
-bool wxApp::Dispatch()
-{
- MacDoOneEvent() ;
-
- return true;
-}
-
void wxApp::OnIdle(wxIdleEvent& event)
{
wxAppBase::OnIdle(event);
wxMacWakeUp() ;
}
-void wxApp::Exit()
-{
- wxApp::CleanUp();
- ::ExitToShell() ;
-}
-
void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event))
{
if (GetTopWindow())
switch (status)
{
- case eventLoopTimedOutErr :
+ case eventLoopTimedOutErr :
if ( wxTheApp->ProcessIdle() )
sleepTime = kEventDurationNoWait ;
else
sleepTime = kEventDurationSecond;
break;
- case eventLoopQuitErr :
+ case eventLoopQuitErr :
// according to QA1061 this may also occur
// when a WakeUp Process is executed
break;
#endif
-bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
+wxMouseState wxGetMouseState()
{
- if ( !focus )
- return false ;
-
- short keycode ;
- short keychar ;
- keychar = short(keymessage & charCodeMask);
- keycode = short(keymessage & keyCodeMask) >> 8 ;
-
- if ( modifiers & ( controlKey|shiftKey|optionKey ) )
- {
- // control interferes with some built-in keys like pgdown, return etc. therefore we remove the controlKey modifier
- // and look at the character after
- UInt32 state = 0;
- UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey|shiftKey|optionKey))) | keycode, &state);
- keychar = short(keyInfo & charCodeMask);
- }
-
- long keyval = wxMacTranslateKey(keychar, keycode) ;
- long realkeyval = keyval ;
- if ( keyval == keychar )
- {
- // we are not on a special character combo -> pass the real os event-value to EVT_CHAR, but not to EVT_KEY (make upper first)
- realkeyval = short(keymessage & charCodeMask) ;
- keyval = wxToupper( keyval ) ;
- }
-
- // Check for NUMPAD keys
- if (keyval >= '0' && keyval <= '9' && keycode >= 82 && keycode <= 92)
- {
- keyval = keyval - '0' + WXK_NUMPAD0;
- }
- else if (keycode >= 67 && keycode <= 81)
- {
- switch (keycode)
- {
- case 76 :
- keyval = WXK_NUMPAD_ENTER;
- break;
-
- case 81:
- keyval = WXK_NUMPAD_EQUAL;
- break;
-
- case 67:
- keyval = WXK_NUMPAD_MULTIPLY;
- break;
-
- case 75:
- keyval = WXK_NUMPAD_DIVIDE;
- break;
-
- case 78:
- keyval = WXK_NUMPAD_SUBTRACT;
- break;
+ wxMouseState ms;
- case 69:
- keyval = WXK_NUMPAD_ADD;
- break;
+ wxPoint pt = wxGetMousePosition();
+ ms.SetX(pt.x);
+ ms.SetY(pt.y);
- case 65:
- keyval = WXK_NUMPAD_DECIMAL;
- break;
+ UInt32 buttons = GetCurrentButtonState();
+ ms.SetLeftDown( (buttons & 0x01) != 0 );
+ ms.SetMiddleDown( (buttons & 0x04) != 0 );
+ ms.SetRightDown( (buttons & 0x02) != 0 );
+
+ UInt32 modifiers = GetCurrentKeyModifiers();
+ ms.SetControlDown(modifiers & controlKey);
+ ms.SetShiftDown(modifiers & shiftKey);
+ ms.SetAltDown(modifiers & optionKey);
+ ms.SetMetaDown(modifiers & cmdKey);
- default:
- break;
- } // end switch
- }
+ return ms;
+}
- wxKeyEvent event(wxEVT_KEY_DOWN);
- bool handled = false ;
- event.m_shiftDown = modifiers & shiftKey;
- event.m_controlDown = modifiers & controlKey;
- event.m_altDown = modifiers & optionKey;
- event.m_metaDown = modifiers & cmdKey;
- event.m_keyCode = keyval ;
+// TODO : once the new key/char handling is tested, move all the code to wxWindow
-#if wxUSE_UNICODE
- event.m_uniChar = uniChar ;
-#endif
+bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
+{
+ if ( !focus )
+ return false ;
- event.m_rawCode = keymessage;
- event.m_rawFlags = modifiers;
- event.m_x = wherex;
- event.m_y = wherey;
- event.SetTimestamp(when);
- event.SetEventObject(focus);
+ bool handled;
+ wxKeyEvent event(wxEVT_KEY_DOWN) ;
+ MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
+
handled = focus->GetEventHandler()->ProcessEvent( event ) ;
if ( handled && event.GetSkipped() )
handled = false ;
}
#endif // wxUSE_ACCEL
- if (!handled)
- {
- wxTopLevelWindowMac *tlw = focus->MacGetTopLevelWindow() ;
+ return handled ;
+}
- if (tlw)
- {
- event.Skip( false ) ;
- event.SetEventType( wxEVT_CHAR_HOOK );
- // raw value again
- event.m_keyCode = realkeyval ;
-
- handled = tlw->GetEventHandler()->ProcessEvent( event );
- if ( handled && event.GetSkipped() )
- handled = false ;
- }
- }
+bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
+{
+ if ( !focus )
+ return false ;
- if ( !handled )
- {
- event.Skip( false ) ;
- event.SetEventType( wxEVT_CHAR ) ;
+ bool handled;
+ wxKeyEvent event( wxEVT_KEY_UP ) ;
+ MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
+ handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+
+ return handled ;
+}
- // raw value again
- event.m_keyCode = realkeyval ;
+bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
+{
+ if ( !focus )
+ return false ;
+
+ wxKeyEvent event(wxEVT_CHAR) ;
+ MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
+ long keyval = event.m_keyCode ;
- handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+ bool handled = false ;
+
+ wxTopLevelWindowMac *tlw = focus->MacGetTopLevelWindow() ;
+
+ if (tlw)
+ {
+ event.SetEventType( wxEVT_CHAR_HOOK );
+ handled = tlw->GetEventHandler()->ProcessEvent( event );
if ( handled && event.GetSkipped() )
handled = false ;
}
+ if ( !handled )
+ {
+ event.SetEventType( wxEVT_CHAR );
+ event.Skip( false ) ;
+ handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+ }
+
if ( !handled && (keyval == WXK_TAB) )
{
wxWindow* iter = focus->GetParent() ;
}
}
}
-
return handled ;
}
-bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
+// This method handles common code for SendKeyDown, SendKeyUp, and SendChar events.
+void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
{
- if ( !focus )
- return false ;
-
short keycode, keychar ;
keychar = short(keymessage & charCodeMask);
keycode = short(keymessage & keyCodeMask) >> 8 ;
- if ( modifiers & (controlKey | shiftKey | optionKey) )
+ if ( !(event.GetEventType() == wxEVT_CHAR) && (modifiers & (controlKey | shiftKey | optionKey) ) )
{
// control interferes with some built-in keys like pgdown, return etc. therefore we remove the controlKey modifier
// and look at the character after
}
long keyval = wxMacTranslateKey(keychar, keycode) ;
- if ( keyval == keychar )
+ if ( keyval == keychar && ( event.GetEventType() == wxEVT_KEY_UP || event.GetEventType() == wxEVT_KEY_DOWN ) )
keyval = wxToupper( keyval ) ;
// Check for NUMPAD keys
} // end switch
}
- bool handled = false ;
-
- wxKeyEvent event(wxEVT_KEY_UP);
event.m_shiftDown = modifiers & shiftKey;
event.m_controlDown = modifiers & controlKey;
event.m_altDown = modifiers & optionKey;
event.m_keyCode = keyval ;
#if wxUSE_UNICODE
event.m_uniChar = uniChar ;
+ if ( event.GetEventType() == wxEVT_CHAR )
+ event.m_keyCode = uniChar ;
#endif
event.m_rawCode = keymessage;
event.m_y = wherey;
event.SetTimestamp(when);
event.SetEventObject(focus);
- handled = focus->GetEventHandler()->ProcessEvent( event ) ;
-
- return handled ;
}
projects / wxWidgets.git / blobdiff