X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7dd40b6f4b31e6bc9c7f626f1461aff8adf7714c..85855db1c4812817e4e493f41550b3be06cde8ea:/src/mac/carbon/app.cpp?ds=sidebyside diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index e7eb2d80ea..2527374184 100644 --- a/src/mac/carbon/app.cpp +++ b/src/mac/carbon/app.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: app.cpp +// Name: src/mac/carbon/app.cpp // Purpose: wxApp // Author: Stefan Csomor // Modified by: @@ -11,22 +11,26 @@ #include "wx/wxprec.h" -#include "wx/window.h" -#include "wx/frame.h" -#include "wx/button.h" #include "wx/app.h" -#include "wx/utils.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/utils.h" + #include "wx/window.h" + #include "wx/frame.h" + #include "wx/dc.h" + #include "wx/button.h" +#endif + #include "wx/gdicmn.h" #include "wx/pen.h" #include "wx/brush.h" #include "wx/cursor.h" -#include "wx/intl.h" #include "wx/icon.h" #include "wx/palette.h" -#include "wx/dc.h" #include "wx/dialog.h" #include "wx/msgdlg.h" -#include "wx/log.h" #include "wx/module.h" #include "wx/memory.h" #include "wx/tooltip.h" @@ -65,16 +69,6 @@ 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 @@ -369,7 +363,7 @@ struct IdPair int wxId ; } ; -IdPair gCommandIds [] = +IdPair gCommandIds [] = { { kHICommandCut , wxID_CUT } , { kHICommandCopy , wxID_COPY } , @@ -380,10 +374,10 @@ IdPair gCommandIds [] = { kHICommandRedo , wxID_REDO } , } ; -int wxMacCommandToId( UInt32 macCommandId ) +int wxMacCommandToId( UInt32 macCommandId ) { int wxid = 0 ; - + switch ( macCommandId ) { case kHICommandPreferences : @@ -418,10 +412,10 @@ int wxMacCommandToId( UInt32 macCommandId ) return wxid ; } -UInt32 wxIdToMacCommand( int wxId ) +UInt32 wxIdToMacCommand( int wxId ) { UInt32 macId = 0 ; - + if ( wxId == wxApp::s_macPreferencesMenuItemId ) macId = kHICommandPreferences ; else if (wxId == wxApp::s_macExitMenuItemId) @@ -446,7 +440,7 @@ UInt32 wxIdToMacCommand( int wxId ) return macId ; } -wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item ) +wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item ) { wxMenu* itemMenu = NULL ; int id = 0 ; @@ -591,7 +585,7 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler if ( item ) { wxASSERT( itemMenu != NULL ) ; - + switch ( cEvent.GetKind() ) { case kEventProcessCommand : @@ -608,16 +602,16 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler { wxUpdateUIEvent event(id); event.SetEventObject( itemMenu ); - + bool processed = false; - + // Try the menu's event handler { wxEvtHandler *handler = itemMenu->GetEventHandler(); if ( handler ) processed = handler->ProcessEvent(event); } - + // Try the window the menu was popped up from // (and up through the hierarchy) if ( !processed ) @@ -631,11 +625,11 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler processed = win->GetEventHandler()->ProcessEvent(event); break; } - + menu = menu->GetParent(); } } - + if ( processed ) { // if anything changed, update the changed attribute @@ -737,11 +731,6 @@ pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef eve DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacAppEventHandler ) -#if defined(WXMAKINGDLL_CORE) && !defined(__DARWIN__) -// we know it's there ;-) -WXIMPORT char std::__throws_bad_alloc ; -#endif - #ifdef __WXDEBUG__ pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 options, @@ -1108,50 +1097,6 @@ wxApp::wxApp() #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); @@ -1177,12 +1122,6 @@ void wxApp::WakeUpIdle() wxMacWakeUp() ; } -void wxApp::Exit() -{ - wxApp::CleanUp(); - ::ExitToShell() ; -} - void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event)) { if (GetTopWindow()) @@ -1267,14 +1206,14 @@ void wxApp::MacDoOneEvent() 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; @@ -1314,7 +1253,6 @@ void wxApp::MacHandleOneEvent( WXEVENTREF evr ) #endif // wxUSE_THREADS } -long wxMacTranslateKey(unsigned char key, unsigned char code) ; long wxMacTranslateKey(unsigned char key, unsigned char code) { long retval = key ; @@ -1507,11 +1445,17 @@ wxMouseState wxGetMouseState() ms.SetX(pt.x); ms.SetY(pt.y); +#if TARGET_API_MAC_OSX UInt32 buttons = GetCurrentButtonState(); ms.SetLeftDown( (buttons & 0x01) != 0 ); ms.SetMiddleDown( (buttons & 0x04) != 0 ); ms.SetRightDown( (buttons & 0x02) != 0 ); - +#else + ms.SetLeftDown( Button() ); + ms.SetMiddleDown( 0 ); + ms.SetRightDown( 0 ); +#endif + UInt32 modifiers = GetCurrentKeyModifiers(); ms.SetControlDown(modifiers & controlKey); ms.SetShiftDown(modifiers & shiftKey); @@ -1521,95 +1465,17 @@ wxMouseState wxGetMouseState() return ms; } +// TODO : once the new key/char handling is tested, move all the code to wxWindow bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) { 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; - - case 69: - keyval = WXK_NUMPAD_ADD; - break; - - case 65: - keyval = WXK_NUMPAD_DECIMAL; - break; - - default: - break; - } // end switch - } - - 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 ; - -#if wxUSE_UNICODE - event.m_uniChar = uniChar ; -#endif + bool handled; + wxKeyEvent event(wxEVT_KEY_DOWN) ; + MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ; - event.m_rawCode = keymessage; - event.m_rawFlags = modifiers; - event.m_x = wherex; - event.m_y = wherey; - event.SetTimestamp(when); - event.SetEventObject(focus); handled = focus->GetEventHandler()->ProcessEvent( event ) ; if ( handled && event.GetSkipped() ) handled = false ; @@ -1636,34 +1502,48 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi } #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 ; + + bool handled; + wxKeyEvent event( wxEVT_KEY_UP ) ; + MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ; + handled = focus->GetEventHandler()->ProcessEvent( event ) ; + + return handled ; +} + +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 ; + + 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 ) ; - event.SetEventType( wxEVT_CHAR ) ; - - // raw value again - event.m_keyCode = realkeyval ; - handled = focus->GetEventHandler()->ProcessEvent( event ) ; - if ( handled && event.GetSkipped() ) - handled = false ; } if ( !handled && (keyval == WXK_TAB) ) @@ -1717,20 +1597,17 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi } } } - 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 @@ -1740,7 +1617,7 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier } 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 @@ -1785,9 +1662,6 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier } // 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; @@ -1803,7 +1677,4 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier event.m_y = wherey; event.SetTimestamp(when); event.SetEventObject(focus); - handled = focus->GetEventHandler()->ProcessEvent( event ) ; - - return handled ; }