X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e644ef2d35230f9d4a5c0bb89b98edd3e4d6c69..2cf3a6d7bef6f20bea35062dd3d4dbf0aec9efb5:/src/mac/carbon/app.cpp?ds=sidebyside diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index deef92ad8a..3a350c9502 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,27 +11,31 @@ #include "wx/wxprec.h" -#include "wx/window.h" -#include "wx/frame.h" -#include "wx/button.h" #include "wx/app.h" -#include "wx/utils.h" -#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" + +#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" + #include "wx/menu.h" + #include "wx/pen.h" + #include "wx/brush.h" + #include "wx/palette.h" + #include "wx/icon.h" + #include "wx/cursor.h" + #include "wx/dialog.h" + #include "wx/msgdlg.h" + #include "wx/textctrl.h" + #include "wx/memory.h" + #include "wx/gdicmn.h" +#endif + #include "wx/module.h" -#include "wx/memory.h" #include "wx/tooltip.h" -#include "wx/textctrl.h" -#include "wx/menu.h" #include "wx/docview.h" #include "wx/filename.h" @@ -63,29 +67,16 @@ # include #endif -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 // wxUSE_THREADS +#endif // statics for implementation - static bool s_inYield = false; - static bool s_inReceiveEvent = false ; static EventTime sleepTime = kEventDurationNoWait ; + IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) EVT_IDLE(wxApp::OnIdle) @@ -94,9 +85,8 @@ BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) END_EVENT_TABLE() -const short kMacMinHeap = (29 * 1024) ; // platform specific static variables - +const short kMacMinHeap = (29 * 1024) ; const short kwxMacMenuBarResource = 1 ; const short kwxMacAppleMenuId = 1 ; @@ -106,15 +96,14 @@ int wxApp::s_lastMouseDown = 0 ; long wxApp::sm_lastMessageTime = 0; long wxApp::s_lastModifiers = 0 ; - bool wxApp::s_macSupportPCMenuShortcuts = true ; long wxApp::s_macAboutMenuItemId = wxID_ABOUT ; long wxApp::s_macPreferencesMenuItemId = wxID_PREFERENCES ; long wxApp::s_macExitMenuItemId = wxID_EXIT ; wxString wxApp::s_macHelpMenuTitleName = wxT("&Help") ; -// Normally we're not a plugin -bool wxApp::sm_isEmbedded = false; +bool wxApp::sm_isEmbedded = false; // Normally we're not a plugin + //---------------------------------------------------------------------- // Core Apple Event Support //---------------------------------------------------------------------- @@ -161,6 +150,7 @@ short wxApp::MacHandleAEODoc(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply)) long itemsInList; OSErr err; short i; + err = AEGetParamDesc((AppleEvent *)event, keyDirectObject, typeAEList,&docList); if (err != noErr) return err; @@ -174,17 +164,19 @@ short wxApp::MacHandleAEODoc(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply)) PSN.lowLongOfPSN = kCurrentProcess ; SetFrontProcess( &PSN ) ; + wxString fName ; + FSRef theRef ; + for (i = 1; i <= itemsInList; i++) { - wxString fName ; - - FSRef theRef ; - AEGetNthPtr(&docList, i, typeFSRef, &keywd, &returnedType, - (Ptr) & theRef, sizeof(theRef), &actualSize); + AEGetNthPtr( + &docList, i, typeFSRef, &keywd, &returnedType, + (Ptr)&theRef, sizeof(theRef), &actualSize); fName = wxMacFSRefToPath( &theRef ) ; MacOpenFile(fName); } + return noErr; } @@ -199,6 +191,7 @@ short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF WXUNUSED(reply) long itemsInList; OSErr err; short i; + err = AEGetParamDesc((AppleEvent *)event, keyDirectObject, typeAEList,&docList); if (err != noErr) return err; @@ -212,16 +205,19 @@ short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF WXUNUSED(reply) PSN.lowLongOfPSN = kCurrentProcess ; SetFrontProcess( &PSN ) ; - for (i = 1; i <= itemsInList; i++) { - wxString fName ; + wxString fName ; + FSRef theRef ; - FSRef theRef ; - AEGetNthPtr(&docList, i, typeFSRef, &keywd, &returnedType, - (Ptr) & theRef, sizeof(theRef), &actualSize); + for (i = 1; i <= itemsInList; i++) + { + AEGetNthPtr( + &docList, i, typeFSRef, &keywd, &returnedType, + (Ptr)&theRef, sizeof(theRef), &actualSize); fName = wxMacFSRefToPath( &theRef ) ; MacPrintFile(fName); } + return noErr; } @@ -248,6 +244,7 @@ short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNU { ExitMainLoop() ; } + return noErr ; } @@ -256,11 +253,10 @@ short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNU short wxApp::MacHandleAERApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply)) { MacReopenApp() ; + return noErr ; } - - //---------------------------------------------------------------------- // Support Routines linking the Mac...File Calls to the Document Manager //---------------------------------------------------------------------- @@ -287,7 +283,7 @@ void wxApp::MacPrintFile(const wxString & fileName ) if ( doc ) { wxView* view = doc->GetFirstView() ; - if( view ) + if ( view ) { wxPrintout *printout = view->OnCreatePrintout(); if (printout) @@ -297,6 +293,7 @@ void wxApp::MacPrintFile(const wxString & fileName ) delete printout; } } + if (doc->Close()) { doc->DeleteAllViews(); @@ -333,7 +330,7 @@ void wxApp::MacReopenApp() while (node) { wxTopLevelWindow* win = (wxTopLevelWindow*) node->GetData(); - if ( win->IsIconized() == false ) + if ( !win->IsIconized() ) { firstIconized = NULL ; break ; @@ -343,13 +340,152 @@ void wxApp::MacReopenApp() if ( firstIconized == NULL ) firstIconized = win ; } + node = node->GetNext(); } + if ( firstIconized ) firstIconized->Iconize( false ) ; } } +//---------------------------------------------------------------------- +// Macintosh CommandID support - converting between native and wx IDs +//---------------------------------------------------------------------- + +// if no native match they just return the passed-in id + +struct IdPair +{ + UInt32 macId ; + int wxId ; +} ; + +IdPair gCommandIds [] = +{ + { kHICommandCut , wxID_CUT } , + { kHICommandCopy , wxID_COPY } , + { kHICommandPaste , wxID_PASTE } , + { kHICommandSelectAll , wxID_SELECTALL } , + { kHICommandClear , wxID_CLEAR } , + { kHICommandUndo , wxID_UNDO } , + { kHICommandRedo , wxID_REDO } , +} ; + +int wxMacCommandToId( UInt32 macCommandId ) +{ + int wxid = 0 ; + + switch ( macCommandId ) + { + case kHICommandPreferences : + wxid = wxApp::s_macPreferencesMenuItemId ; + break ; + + case kHICommandQuit : + wxid = wxApp::s_macExitMenuItemId ; + break ; + + case kHICommandAbout : + wxid = wxApp::s_macAboutMenuItemId ; + break ; + + default : + { + for ( size_t i = 0 ; i < WXSIZEOF(gCommandIds) ; ++i ) + { + if ( gCommandIds[i].macId == macCommandId ) + { + wxid = gCommandIds[i].wxId ; + break ; + } + } + } + break ; + } + + if ( wxid == 0 ) + wxid = (int) macCommandId ; + + return wxid ; +} + +UInt32 wxIdToMacCommand( int wxId ) +{ + UInt32 macId = 0 ; + + if ( wxId == wxApp::s_macPreferencesMenuItemId ) + macId = kHICommandPreferences ; + else if (wxId == wxApp::s_macExitMenuItemId) + macId = kHICommandQuit ; + else if (wxId == wxApp::s_macAboutMenuItemId) + macId = kHICommandAbout ; + else + { + for ( size_t i = 0 ; i < WXSIZEOF(gCommandIds) ; ++i ) + { + if ( gCommandIds[i].wxId == wxId ) + { + macId = gCommandIds[i].macId ; + break ; + } + } + } + + if ( macId == 0 ) + macId = (int) wxId ; + + return macId ; +} + +wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item ) +{ + wxMenu* itemMenu = NULL ; + int id = 0 ; + + // for 'standard' commands which don't have a wx-menu + if ( command.commandID == kHICommandPreferences || command.commandID == kHICommandQuit || command.commandID == kHICommandAbout ) + { + id = wxMacCommandToId( command.commandID ) ; + + wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ; + if ( mbar ) + item = mbar->FindItem( id , &itemMenu ) ; + } + else if ( command.commandID != 0 && command.menu.menuRef != 0 && command.menu.menuItemIndex != 0 ) + { + id = wxMacCommandToId( command.commandID ) ; + // make sure it is one of our own menus, or of the 'synthetic' apple and help menus , otherwise don't touch + MenuItemIndex firstUserHelpMenuItem ; + static MenuHandle mh = NULL ; + if ( mh == NULL ) + { + if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) != noErr ) + mh = NULL ; + } + + // is it part of the application or the Help menu, then look for the id directly + if ( ( GetMenuHandle( kwxMacAppleMenuId ) != NULL && command.menu.menuRef == GetMenuHandle( kwxMacAppleMenuId ) ) || + ( mh != NULL && command.menu.menuRef == mh ) ) + { + wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ; + if ( mbar ) + item = mbar->FindItem( id , &itemMenu ) ; + } + else + { + UInt32 refCon ; + + GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , &refCon ) ; + itemMenu = wxFindMenuFromMacMenu( command.menu.menuRef ) ; + if ( itemMenu != NULL ) + item = (wxMenuItem*) refCon ; + } + } + + return itemMenu ; +} + //---------------------------------------------------------------------- // Carbon Event Handler //---------------------------------------------------------------------- @@ -393,14 +529,17 @@ wxMacAppMenuEventHandler( EventHandlerCallRef handler , EventRef event , void *d case kEventMenuOpening: type = wxEVT_MENU_OPEN; break; + case kEventMenuClosed: type = wxEVT_MENU_CLOSE; break; + case kEventMenuTargetItem: cmd = cEvent.GetParameter(kEventParamMenuCommand,typeMenuCommand) ; if (cmd != 0) type = wxEVT_MENU_HIGHLIGHT; break; + default: wxFAIL_MSG(wxT("Unexpected menu event kind")); break; @@ -438,51 +577,72 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler cEvent.GetParameter(kEventParamDirectObject,typeHICommand,&command) ; wxMenuItem* item = NULL ; - MenuCommand id = command.commandID ; - // for items we don't really control - if ( id == kHICommandPreferences ) - { - id = wxApp::s_macPreferencesMenuItemId ; - - wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ; - if ( mbar ) - { - wxMenu* menu = NULL ; - item = mbar->FindItem( id , &menu ) ; - } - } - else if ( id != 0 && command.menu.menuRef != 0 && command.menu.menuItemIndex != 0 ) - { - wxMenu* itsMenu = NULL ; - UInt32 refCon ; - GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , &refCon ) ; - // make sure it is one of our own menus, otherwise don't touch - itsMenu = wxFindMenuFromMacMenu( command.menu.menuRef ) ; - if ( itsMenu != NULL ) - { - item = (wxMenuItem*) refCon ; - } - } + wxMenu* itemMenu = wxFindMenuFromMacCommand( command , item ) ; + int id = wxMacCommandToId( command.commandID ) ; if ( item ) { - switch( cEvent.GetKind() ) - { - case kEventProcessCommand : - { + wxASSERT( itemMenu != NULL ) ; + + switch ( cEvent.GetKind() ) + { + case kEventProcessCommand : + { if (item->IsCheckable()) - { item->Check( !item->IsChecked() ) ; - } - item->GetMenu()->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ; - result = noErr ; + if ( itemMenu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ) + result = noErr ; } break ; + case kEventCommandUpdateStatus: - // eventually trigger an updateui round - result = noErr ; + { + 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 ) + { + const wxMenuBase *menu = itemMenu; + while ( menu ) + { + wxWindow *win = menu->GetInvokingWindow(); + if ( win ) + { + processed = win->GetEventHandler()->ProcessEvent(event); + break; + } + + menu = menu->GetParent(); + } + } + + if ( processed ) + { + // if anything changed, update the changed attribute + if (event.GetSetText()) + itemMenu->SetLabel(id, event.GetText()); + if (event.GetSetChecked()) + itemMenu->Check(id, event.GetChecked()); + if (event.GetSetEnabled()) + itemMenu->Enable(id, event.GetEnabled()); + + result = noErr ; + } + } break ; + default : break ; } @@ -496,22 +656,21 @@ static pascal OSStatus wxMacAppApplicationEventHandler( EventHandlerCallRef hand switch ( GetEventKind( event ) ) { case kEventAppActivated : - { - if ( wxTheApp ) - wxTheApp->SetActive( true , NULL ) ; - result = noErr ; - } + if ( wxTheApp ) + wxTheApp->SetActive( true , NULL ) ; + result = noErr ; break ; + case kEventAppDeactivated : - { - if ( wxTheApp ) - wxTheApp->SetActive( false , NULL ) ; - result = noErr ; - } + if ( wxTheApp ) + wxTheApp->SetActive( false , NULL ) ; + result = noErr ; break ; + default : break ; } + return result ; } @@ -522,17 +681,20 @@ pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef eve wxTheApp->MacSetCurrentEvent( event , handler ) ; OSStatus result = eventNotHandledErr ; - switch( GetEventClass( event ) ) + switch ( GetEventClass( event ) ) { case kEventClassCommand : result = wxMacAppCommandEventHandler( handler , event , data ) ; break ; + case kEventClassApplication : result = wxMacAppApplicationEventHandler( handler , event , data ) ; break ; + case kEventClassMenu : result = wxMacAppMenuEventHandler( handler , event , data ) ; break ; + case kEventClassMouse : { wxMacCarbonEvent cEvent( event ) ; @@ -546,13 +708,16 @@ pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef eve result = wxMacTopLevelMouseEventHandler( handler , event , NULL ) ; } break ; + case kEventClassAppleEvent : { EventRecord rec ; + wxMacConvertEventToRecord( event , &rec ) ; result = AEProcessAppleEvent( &rec ) ; } break ; + default : break ; } @@ -564,11 +729,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, @@ -580,6 +740,7 @@ pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 op wxString assertionStr ; wxString exceptionStr ; wxString errorStr ; + #if wxUSE_UNICODE fileNameStr = wxString(fileName, wxConvLocal); assertionStr = wxString(assertionString, wxConvLocal); @@ -603,20 +764,23 @@ pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 op #else wxOnAssert(fileNameStr, lineNumber , assertionStr , - wxString::Format( wxT("%s %s value (%p)") ,exceptionStr, errorStr , value ) ) ; + wxString::Format( wxT("%s %s value (%p)") , exceptionStr, errorStr , value ) ) ; #endif } #endif //__WXDEBUG__ #ifdef __WXMAC_OSX__ -extern "C" { - /* m_macEventPosted run loop source callback: */ +extern "C" +{ + // m_macEventPosted run loop source callback: void macPostedEventCallback(void *unused); } -void macPostedEventCallback(void *unused) { - wxTheApp->ProcessPendingEvents(); } +void macPostedEventCallback(void *unused) +{ + wxTheApp->ProcessPendingEvents(); +} #endif bool wxApp::Initialize(int& argc, wxChar **argv) @@ -624,8 +788,9 @@ bool wxApp::Initialize(int& argc, wxChar **argv) // Mac-specific #ifdef __WXDEBUG__ - InstallDebugAssertOutputHandler ( NewDebugAssertOutputHandlerUPP( wxMacAssertOutputHandler ) ); + InstallDebugAssertOutputHandler( NewDebugAssertOutputHandlerUPP( wxMacAssertOutputHandler ) ); #endif + UMAInitToolbox( 4, sm_isEmbedded ) ; SetEventMask( everyEvent ) ; UMAShowWatchCursor() ; @@ -708,7 +873,7 @@ AEEventHandlerUPP sQuitHandler = NULL ; bool wxApp::OnInitGui() { - if( !wxAppBase::OnInitGui() ) + if ( !wxAppBase::OnInitGui() ) return false ; InstallStandardEventHandler( GetApplicationEventTarget() ) ; @@ -751,9 +916,7 @@ void wxApp::CleanUp() #ifdef __WXMAC_OSX__ if (m_macEventPosted) - { CFRelease(m_macEventPosted); - } m_macEventPosted = NULL; #endif @@ -770,14 +933,11 @@ void wxApp::CleanUp() #endif UMACleanupToolbox() ; - if (s_macCursorRgn) { + if (s_macCursorRgn) ::DisposeRgn((RgnHandle)s_macCursorRgn); - } if (!sm_isEmbedded) - { RemoveEventHandler( (EventHandlerRef)(wxTheApp->m_macEventHandler) ); - } if (!sm_isEmbedded) { @@ -812,8 +972,9 @@ void wxApp::CleanUp() // ref num upon initializing and releasing when terminating, therefore // the __wxinitialize and __wxterminate must be used -extern "C" { - void __sinit(void); /* (generated by linker) */ +extern "C" +{ + void __sinit(void); // (generated by linker) pascal OSErr __initialize(const CFragInitBlock *theInitBlock); pascal void __terminate(void); } @@ -832,33 +993,39 @@ pascal void __wxterminate(void) bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) { - bool converted = ConvertEventRefToEventRecord( event,rec) ; OSStatus err = noErr ; + bool converted = ConvertEventRefToEventRecord( event, rec) ; + if ( !converted ) { - switch( GetEventClass( event ) ) + switch ( GetEventClass( event ) ) { case kEventClassKeyboard : { converted = true ; - switch( GetEventKind(event) ) + switch ( GetEventKind(event) ) { case kEventRawKeyDown : rec->what = keyDown ; break ; + case kEventRawKeyRepeat : rec->what = autoKey ; break ; + case kEventRawKeyUp : rec->what = keyUp ; break ; + case kEventRawKeyModifiersChanged : rec->what = nullEvent ; break ; + default : converted = false ; break ; } + if ( converted ) { UInt32 keyCode ; @@ -874,19 +1041,23 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) } } break ; + case kEventClassTextInput : { - switch( GetEventKind( event ) ) + switch ( GetEventKind( event ) ) { case kEventTextInputUnicodeForKeyEvent : { EventRef rawEvent ; - err = GetEventParameter( event , kEventParamTextInputSendKeyboardEvent ,typeEventRef,NULL,sizeof(rawEvent),NULL,&rawEvent ) ; + err = GetEventParameter( + event, kEventParamTextInputSendKeyboardEvent, typeEventRef, NULL, + sizeof(rawEvent), NULL, &rawEvent ) ; converted = true ; + { - UInt32 keyCode ; + UInt32 keyCode, modifiers; unsigned char charCode ; - UInt32 modifiers ; + GetMouse( &rec->where) ; rec->what = keyDown ; err = GetEventParameter(rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, 4, NULL, &modifiers); @@ -896,12 +1067,16 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) rec->message = (keyCode << 8 ) + charCode ; } } - break ; + break ; + default : break ; } } break ; + + default : + break ; } } @@ -914,50 +1089,12 @@ wxApp::wxApp() m_macCurrentEvent = NULL ; m_macCurrentEventHandlerCallRef = NULL ; + #ifdef __WXMAC_OSX__ m_macEventPosted = NULL ; #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); @@ -967,7 +1104,7 @@ void wxApp::OnIdle(wxIdleEvent& event) // wxPostEvent() functions wxMacProcessNotifierAndPendingEvents(); - if(!wxMenuBar::MacGetInstalledMenuBar() && wxMenuBar::MacGetCommonMenuBar()) + if (!wxMenuBar::MacGetInstalledMenuBar() && wxMenuBar::MacGetCommonMenuBar()) wxMenuBar::MacGetCommonMenuBar()->MacInstallMenuBar(); } @@ -979,13 +1116,8 @@ void wxApp::WakeUpIdle() CFRunLoopSourceSignal(m_macEventPosted); } #endif - wxMacWakeUp() ; -} -void wxApp::Exit() -{ - wxApp::CleanUp(); - ::ExitToShell() ; + wxMacWakeUp() ; } void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event)) @@ -1032,7 +1164,8 @@ bool wxApp::Yield(bool onlyIfNeeded) EventRef theEvent; OSStatus status = noErr ; - do + + while ( status == noErr ) { s_inReceiveEvent = true ; status = ReceiveNextEvent(0, NULL,kEventDurationNoWait,true,&theEvent) ; @@ -1053,7 +1186,7 @@ bool wxApp::Yield(bool onlyIfNeeded) MacHandleOneEvent( theEvent ) ; ReleaseEvent(theEvent); } - } while( status == noErr ) ; + } wxMacProcessNotifierAndPendingEvents() ; s_inYield = false; @@ -1066,25 +1199,28 @@ void wxApp::MacDoOneEvent() EventRef theEvent; s_inReceiveEvent = true ; - OSStatus status = ReceiveNextEvent(0, NULL,sleepTime,true,&theEvent) ; + OSStatus status = ReceiveNextEvent(0, NULL, sleepTime, true, &theEvent) ; s_inReceiveEvent = false ; - if ( status == eventLoopTimedOutErr ) + + switch (status) { - if ( wxTheApp->ProcessIdle() ) + case eventLoopTimedOutErr : + if ( wxTheApp->ProcessIdle() ) + sleepTime = kEventDurationNoWait ; + else + sleepTime = kEventDurationSecond; + break; + + case eventLoopQuitErr : + // according to QA1061 this may also occur + // when a WakeUp Process is executed + break; + + default: + MacHandleOneEvent( theEvent ) ; + ReleaseEvent( theEvent ); sleepTime = kEventDurationNoWait ; - else - sleepTime = kEventDurationSecond; - } - else if ( status == eventLoopQuitErr ) - { - // according to QA1061 this may also occur when a WakeUp Process - // is executed - } - else - { - MacHandleOneEvent( theEvent ) ; - ReleaseEvent(theEvent); - sleepTime = kEventDurationNoWait ; + break; } // repeaters @@ -1092,7 +1228,8 @@ void wxApp::MacDoOneEvent() wxMacProcessNotifierAndPendingEvents() ; } -/*virtual*/ void wxApp::MacHandleUnhandledEvent( WXEVENTREF evr ) +// virtual +void wxApp::MacHandleUnhandledEvent( WXEVENTREF evr ) { // Override to process unhandled events as you please } @@ -1102,18 +1239,18 @@ void wxApp::MacHandleOneEvent( WXEVENTREF evr ) EventTargetRef theTarget; theTarget = GetEventDispatcherTarget(); m_macCurrentEvent = evr ; - OSStatus status = SendEventToEventTarget ((EventRef) evr , theTarget); - if(status == eventNotHandledErr) - { + + OSStatus status = SendEventToEventTarget((EventRef) evr , theTarget); + if (status == eventNotHandledErr) MacHandleUnhandledEvent(evr); - } + wxMacProcessNotifierAndPendingEvents() ; + #if wxUSE_THREADS wxMutexGuiLeaveOrEnter(); #endif // wxUSE_THREADS } -long wxMacTranslateKey(unsigned char key, unsigned char code) ; long wxMacTranslateKey(unsigned char key, unsigned char code) { long retval = key ; @@ -1156,53 +1293,70 @@ long wxMacTranslateKey(unsigned char key, unsigned char code) case kFunctionKeyCharCode : { - switch( code ) + switch ( code ) { case 0x7a : retval = WXK_F1 ; break; + case 0x78 : retval = WXK_F2 ; break; + case 0x63 : retval = WXK_F3 ; break; + case 0x76 : retval = WXK_F4 ; break; + case 0x60 : retval = WXK_F5 ; break; + case 0x61 : retval = WXK_F6 ; break; + case 0x62: retval = WXK_F7 ; break; + case 0x64 : retval = WXK_F8 ; break; + case 0x65 : retval = WXK_F9 ; break; + case 0x6D : retval = WXK_F10 ; break; + case 0x67 : retval = WXK_F11 ; break; + case 0x6F : retval = WXK_F12 ; break; + case 0x69 : retval = WXK_F13 ; break; + case 0x6B : retval = WXK_F14 ; break; + case 0x71 : retval = WXK_F15 ; break; + + default: + break; } } break ; @@ -1281,82 +1435,45 @@ bool wxGetKeyState(wxKeyCode key) //virtual key code if < 10.2.x, else see below #endif -bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) +wxMouseState wxGetMouseState() { - if ( !focus ) - return false ; + wxMouseState ms; - short keycode ; - short keychar ; - keychar = short(keymessage & charCodeMask); - keycode = short(keymessage & keyCodeMask) >> 8 ; + wxPoint pt = wxGetMousePosition(); + ms.SetX(pt.x); + ms.SetY(pt.y); - 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 ) ; - } +#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 - // 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; - } // end switch - } + UInt32 modifiers = GetCurrentKeyModifiers(); + ms.SetControlDown(modifiers & controlKey); + ms.SetShiftDown(modifiers & shiftKey); + ms.SetAltDown(modifiers & optionKey); + ms.SetMetaDown(modifiers & cmdKey); + + 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 ; + + bool handled; + wxKeyEvent event(wxEVT_KEY_DOWN) ; + MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ; - 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 - 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 ; @@ -1374,45 +1491,63 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi handled = ancestor->GetEventHandler()->ProcessEvent( command_event ); break; } + if (ancestor->IsTopLevel()) break; + ancestor = ancestor->GetParent(); } } #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) ) { wxWindow* iter = focus->GetParent() ; - while( iter && !handled ) + while ( iter && !handled ) { if ( iter->HasFlag( wxTAB_TRAVERSAL ) ) { @@ -1426,69 +1561,67 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi if ( handled && new_event.GetSkipped() ) handled = false ; } + iter = iter->GetParent() ; } } + // backdoor handler for default return and command escape if ( !handled && (!focus->IsKindOf(CLASSINFO(wxControl) ) || !focus->MacCanFocus() ) ) { - // if window is not having a focus still testing for default enter or cancel - // TODO add the UMA version for ActiveNonFloatingWindow - wxWindow* focus = wxFindWinFromMacWindow( FrontWindow() ) ; - if ( focus ) - { + // if window is not having a focus still testing for default enter or cancel + // TODO: add the UMA version for ActiveNonFloatingWindow + wxWindow* focus = wxFindWinFromMacWindow( FrontWindow() ) ; + if ( focus ) + { if ( keyval == WXK_RETURN ) { - wxButton *def = wxDynamicCast(focus->GetDefaultItem(), - wxButton); - if ( def && def->IsEnabled() ) - { - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); - event.SetEventObject(def); - def->Command(event); - return true ; - } + wxButton *def = wxDynamicCast(focus->GetDefaultItem(), wxButton); + if ( def && def->IsEnabled() ) + { + wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); + event.SetEventObject(def); + def->Command(event); + + return true ; + } } - /* generate wxID_CANCEL if command-. or has been pressed (typically in dialogs) */ else if (keyval == WXK_ESCAPE || (keyval == '.' && modifiers & cmdKey ) ) { - wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL); - new_event.SetEventObject( focus ); - handled = focus->GetEventHandler()->ProcessEvent( new_event ); + // generate wxID_CANCEL if command-. or has been pressed (typically in dialogs) + wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL); + new_event.SetEventObject( focus ); + handled = focus->GetEventHandler()->ProcessEvent( new_event ); } - } + } } 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 ; - short keycode ; - short 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 UInt32 state = 0; - UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey|shiftKey|optionKey))) | keycode, &state); + UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey | shiftKey | optionKey))) | keycode, &state); keychar = short(keyInfo & charCodeMask); } - long keyval = wxMacTranslateKey(keychar, keycode) ; - if ( keyval == keychar ) - { + long keyval = wxMacTranslateKey(keychar, keycode) ; + if ( keyval == keychar && ( event.GetEventType() == wxEVT_KEY_UP || event.GetEventType() == wxEVT_KEY_DOWN ) ) keyval = wxToupper( keyval ) ; - } // Check for NUMPAD keys if (keyval >= '0' && keyval <= '9' && keycode >= 82 && keycode <= 92) { - keyval = keyval - '0' + WXK_NUMPAD0; + keyval = (keyval - '0') + WXK_NUMPAD0; } else if (keycode >= 67 && keycode <= 81) { @@ -1497,30 +1630,36 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier 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 } - bool handled = false ; - - wxKeyEvent event(wxEVT_KEY_UP); event.m_shiftDown = modifiers & shiftKey; event.m_controlDown = modifiers & controlKey; event.m_altDown = modifiers & optionKey; @@ -1536,7 +1675,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 ; }