X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b21409b36057d8281675973a7c3a1d77d9c0ddb..0e05227246cc99b2f8133ae639f38c508351afa0:/src/mac/carbon/app.cpp?ds=sidebyside diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index d662578090..b128991ff0 100644 --- a/src/mac/carbon/app.cpp +++ b/src/mac/carbon/app.cpp @@ -1,19 +1,15 @@ ///////////////////////////////////////////////////////////////////////////// // Name: app.cpp // Purpose: wxApp -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR +// Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "app.h" -#endif - -#include "wx/defs.h" +#include "wx/wxprec.h" #include "wx/window.h" #include "wx/frame.h" @@ -36,9 +32,8 @@ #include "wx/tooltip.h" #include "wx/textctrl.h" #include "wx/menu.h" -#if wxUSE_WX_RESOURCES -# include "wx/resource.h" -#endif +#include "wx/docview.h" +#include "wx/filename.h" #include @@ -50,13 +45,16 @@ #endif #endif -#include "apprsrc.h" +// #include "apprsrc.h" #include "wx/mac/uma.h" #include "wx/mac/macnotfy.h" #ifdef __DARWIN__ # include +# if defined(WXMAKINGDLL_CORE) +# include +# endif #else # include # include @@ -65,929 +63,1070 @@ # include #endif -extern char *wxBuffer; extern wxList wxPendingDelete; -extern wxList *wxWinMacWindowList; -extern wxList *wxWinMacControlList; -wxApp *wxTheApp = NULL; +#if wxUSE_THREADS +extern size_t g_numberOfThreads; +#endif + +// statics for implementation +static bool s_inYield = false; +static bool s_inReceiveEvent = false ; +static EventTime sleepTime = kEventDurationNoWait ; + -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) EVT_IDLE(wxApp::OnIdle) - EVT_END_SESSION(wxApp::OnEndSession) - EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession) + EVT_END_SESSION(wxApp::OnEndSession) + EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession) END_EVENT_TABLE() -#endif -const short kMacMinHeap = (29 * 1024) ; // platform specific static variables - +const short kMacMinHeap = (29 * 1024) ; const short kwxMacMenuBarResource = 1 ; const short kwxMacAppleMenuId = 1 ; -WXHRGN wxApp::s_macCursorRgn = NULL; -wxWindow* wxApp::s_captureWindow = NULL ; -int wxApp::s_lastMouseDown = 0 ; -long wxApp::sm_lastMessageTime = 0; +WXHRGN wxApp::s_macCursorRgn = NULL; +wxWindow* wxApp::s_captureWindow = NULL ; +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") ; -bool wxApp::s_macDefaultEncodingIsPC = true ; -bool wxApp::s_macSupportPCMenuShortcuts = true ; -long wxApp::s_macAboutMenuItemId = wxID_ABOUT ; -wxString wxApp::s_macHelpMenuTitleName = "&Help" ; +bool wxApp::sm_isEmbedded = false; // Normally we're not a plugin + +//---------------------------------------------------------------------- +// Core Apple Event Support +//---------------------------------------------------------------------- pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long refcon ) ; pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long refcon ) ; pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long refcon ) ; pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long refcon ) ; +pascal OSErr AEHandleRApp( const AppleEvent *event , AppleEvent *reply , long refcon ) ; - -pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long refcon ) +pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) { - wxApp* app = (wxApp*) refcon ; return wxTheApp->MacHandleAEODoc( (AppleEvent*) event , reply) ; } -pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long refcon ) +pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) { - wxApp* app = (wxApp*) refcon ; return wxTheApp->MacHandleAEOApp( (AppleEvent*) event , reply ) ; } -pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long refcon ) +pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) { - wxApp* app = (wxApp*) refcon ; return wxTheApp->MacHandleAEPDoc( (AppleEvent*) event , reply ) ; } -pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long refcon ) +pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) { - wxApp* app = (wxApp*) refcon ; return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ; } -short wxApp::MacHandleAEODoc(const WXEVENTREF event , WXEVENTREF reply) +pascal OSErr AEHandleRApp( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) +{ + return wxTheApp->MacHandleAERApp( (AppleEvent*) event , reply) ; +} + +// AEODoc Calls MacOpenFile on each of the files passed + +short wxApp::MacHandleAEODoc(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply)) { - SysBeep(40) ; + AEDescList docList; + AEKeyword keywd; + DescType returnedType; + Size actualSize; + long itemsInList; + OSErr err; + short i; + + err = AEGetParamDesc((AppleEvent *)event, keyDirectObject, typeAEList,&docList); + if (err != noErr) + return err; + + err = AECountItems(&docList, &itemsInList); + if (err != noErr) + return err; + ProcessSerialNumber PSN ; PSN.highLongOfPSN = 0 ; PSN.lowLongOfPSN = kCurrentProcess ; SetFrontProcess( &PSN ) ; - return noErr ; + + wxString fName ; + FSRef theRef ; + + for (i = 1; i <= itemsInList; i++) + { + AEGetNthPtr( + &docList, i, typeFSRef, &keywd, &returnedType, + (Ptr)&theRef, sizeof(theRef), &actualSize); + fName = wxMacFSRefToPath( &theRef ) ; + + MacOpenFile(fName); + } + + return noErr; } -short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF reply) +// AEPDoc Calls MacPrintFile on each of the files passed + +short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF WXUNUSED(reply)) { - return noErr ; + AEDescList docList; + AEKeyword keywd; + DescType returnedType; + Size actualSize; + long itemsInList; + OSErr err; + short i; + + err = AEGetParamDesc((AppleEvent *)event, keyDirectObject, typeAEList,&docList); + if (err != noErr) + return err; + + err = AECountItems(&docList, &itemsInList); + if (err != noErr) + return err; + + ProcessSerialNumber PSN ; + PSN.highLongOfPSN = 0 ; + PSN.lowLongOfPSN = kCurrentProcess ; + SetFrontProcess( &PSN ) ; + + wxString fName ; + FSRef theRef ; + + for (i = 1; i <= itemsInList; i++) + { + AEGetNthPtr( + &docList, i, typeFSRef, &keywd, &returnedType, + (Ptr)&theRef, sizeof(theRef), &actualSize); + fName = wxMacFSRefToPath( &theRef ) ; + + MacPrintFile(fName); + } + + return noErr; } -short wxApp::MacHandleAEOApp(const WXEVENTREF event , WXEVENTREF reply) +// AEOApp calls MacNewFile + +short wxApp::MacHandleAEOApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply)) { + MacNewFile() ; return noErr ; } -short wxApp::MacHandleAEQuit(const WXEVENTREF event , WXEVENTREF reply) +// AEQuit attempts to quit the application + +short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply)) { wxWindow* win = GetTopWindow() ; if ( win ) { - win->Close(TRUE ) ; + wxCommandEvent exitEvent(wxEVT_COMMAND_MENU_SELECTED, s_macExitMenuItemId); + if (!win->ProcessEvent(exitEvent)) + win->Close(true) ; } else { ExitMainLoop() ; } + + return noErr ; +} + +// AEROApp calls MacReopenApp + +short wxApp::MacHandleAERApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply)) +{ + MacReopenApp() ; + return noErr ; } -char StringMac[] = "\x0d\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f" - "\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f" - "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xae\xaf" - "\xb1\xb4\xb5\xb6\xbb\xbc\xbe\xbf" - "\xc0\xc1\xc2\xc4\xc7\xc8\xc9\xcb\xcc\xcd\xce\xcf" - "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd8\xca\xdb" ; - -char StringANSI[] = "\x0a\xC4\xC5\xC7\xC9\xD1\xD6\xDC\xE1\xE0\xE2\xE4\xE3\xE5\xE7\xE9\xE8" - "\xEA\xEB\xED\xEC\xEE\xEF\xF1\xF3\xF2\xF4\xF6\xF5\xFA\xF9\xFB\xFC" - "\x86\xBA\xA2\xA3\xA7\x95\xB6\xDF\xAE\xA9\x99\xB4\xA8\xC6\xD8" - "\xB1\xA5\xB5\xF0\xAA\xBA\xE6\xF8" - "\xBF\xA1\xAC\x83\xAB\xBB\x85\xC0\xC3\xD5\x8C\x9C" - "\x96\x97\x93\x94\x91\x92\xF7\xFF\xA0\x80" ; - -void wxMacConvertFromPC( const char *from , char *to , int len ) +//---------------------------------------------------------------------- +// Support Routines linking the Mac...File Calls to the Document Manager +//---------------------------------------------------------------------- + +void wxApp::MacOpenFile(const wxString & fileName ) +{ +#if wxUSE_DOC_VIEW_ARCHITECTURE + wxDocManager* dm = wxDocManager::GetDocumentManager() ; + if ( dm ) + dm->CreateDocument(fileName , wxDOC_SILENT ) ; +#endif +} + + +void wxApp::MacPrintFile(const wxString & fileName ) { - char *c ; - if ( from == to ) +#if wxUSE_DOC_VIEW_ARCHITECTURE + +#if wxUSE_PRINTING_ARCHITECTURE + wxDocManager* dm = wxDocManager::GetDocumentManager() ; + if ( dm ) { - for( int i = 0 ; i < len ; ++ i ) + wxDocument *doc = dm->CreateDocument(fileName , wxDOC_SILENT ) ; + if ( doc ) { - c = strchr( StringANSI , *from ) ; - if ( c != NULL ) + wxView* view = doc->GetFirstView() ; + if ( view ) + { + wxPrintout *printout = view->OnCreatePrintout(); + if (printout) + { + wxPrinter printer; + printer.Print(view->GetFrame(), printout, true); + delete printout; + } + } + + if (doc->Close()) { - *to = StringMac[ c - StringANSI] ; + doc->DeleteAllViews(); + dm->RemoveDocument(doc) ; } - ++to ; - ++from ; } } +#endif //print + +#endif //docview +} + + + +void wxApp::MacNewFile() +{ +} + +void wxApp::MacReopenApp() +{ + // HIG says : + // if there is no open window -> create a new one + // if all windows are hidden -> show the first + // if some windows are not hidden -> do nothing + + wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst(); + if ( node == NULL ) + { + MacNewFile() ; + } else { - for( int i = 0 ; i < len ; ++ i ) + wxTopLevelWindow* firstIconized = NULL ; + while (node) { - c = strchr( StringANSI , *from ) ; - if ( c != NULL ) + wxTopLevelWindow* win = (wxTopLevelWindow*) node->GetData(); + if ( !win->IsIconized() ) { - *to = StringMac[ c - StringANSI] ; + firstIconized = NULL ; + break ; } else { - *to = *from ; + if ( firstIconized == NULL ) + firstIconized = win ; } - ++to ; - ++from ; + + node = node->GetNext(); } + + if ( firstIconized ) + firstIconized->Iconize( false ) ; } } -void wxMacConvertToPC( const char *from , char *to , int len ) +//---------------------------------------------------------------------- +// 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 ) { - char *c ; - if ( from == to ) + int wxid = 0 ; + + switch ( macCommandId ) { - for( int i = 0 ; i < len ; ++ i ) - { - c = strchr( StringMac , *from ) ; - if ( c != NULL ) + case kHICommandPreferences : + wxid = wxApp::s_macPreferencesMenuItemId ; + break ; + + case kHICommandQuit : + wxid = wxApp::s_macExitMenuItemId ; + break ; + + case kHICommandAbout : + wxid = wxApp::s_macAboutMenuItemId ; + break ; + + default : { - *to = StringANSI[ c - StringMac] ; + for ( size_t i = 0 ; i < WXSIZEOF(gCommandIds) ; ++i ) + { + if ( gCommandIds[i].macId == macCommandId ) + { + wxid = gCommandIds[i].wxId ; + break ; + } + } } - ++to ; - ++from ; - } + 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( int i = 0 ; i < len ; ++ i ) + for ( size_t i = 0 ; i < WXSIZEOF(gCommandIds) ; ++i ) { - c = strchr( StringMac , *from ) ; - if ( c != NULL ) - { - *to = StringANSI[ c - StringMac] ; - } - else + if ( gCommandIds[i].wxId == wxId ) { - *to = *from ; + macId = gCommandIds[i].macId ; + break ; } - ++to ; - ++from ; } } -} -void wxMacConvertFromPC( char * p ) -{ - char *ptr = p ; - int len = strlen ( p ) ; + if ( macId == 0 ) + macId = (int) wxId ; - wxMacConvertFromPC( ptr , ptr , len ) ; + return macId ; } -void wxMacConvertFromPCForControls( char * p ) +wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item ) { - char *ptr = p ; - int len = strlen ( p ) ; + wxMenu* itemMenu = NULL ; + int id = 0 ; - wxMacConvertFromPC( ptr , ptr , len ) ; - for ( int i = 0 ; i < strlen ( ptr ) ; i++ ) + // for 'standard' commands which don't have a wx-menu + if ( command.commandID == kHICommandPreferences || command.commandID == kHICommandQuit || command.commandID == kHICommandAbout ) { - if ( ptr[i] == '&' && ptr[i]+1 != ' ' ) + 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 { - memmove( &ptr[i] , &ptr[i+1] , strlen( &ptr[i+1] ) + 1) ; + UInt32 refCon ; + + GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , &refCon ) ; + itemMenu = wxFindMenuFromMacMenu( command.menu.menuRef ) ; + if ( itemMenu != NULL ) + item = (wxMenuItem*) refCon ; } } + + return itemMenu ; } -void wxMacConvertFromPC( unsigned char *p ) +//---------------------------------------------------------------------- +// Carbon Event Handler +//---------------------------------------------------------------------- + +static const EventTypeSpec eventList[] = { - char *ptr = (char*) p + 1 ; - int len = p[0] ; + { kEventClassCommand, kEventProcessCommand } , + { kEventClassCommand, kEventCommandUpdateStatus } , - wxMacConvertFromPC( ptr , ptr , len ) ; -} + { kEventClassMenu, kEventMenuOpening }, + { kEventClassMenu, kEventMenuClosed }, + { kEventClassMenu, kEventMenuTargetItem }, + + { kEventClassApplication , kEventAppActivated } , + { kEventClassApplication , kEventAppDeactivated } , + // handling the quit event is not recommended by apple + // rather using the quit apple event - which we do -extern char *wxBuffer ; + { kEventClassAppleEvent , kEventAppleEvent } , -wxString wxMacMakeMacStringFromPC( const char * p ) + { kEventClassMouse , kEventMouseDown } , + { kEventClassMouse , kEventMouseMoved } , + { kEventClassMouse , kEventMouseUp } , + { kEventClassMouse , kEventMouseDragged } , + { 'WXMC' , 'WXMC' } +} ; + +static pascal OSStatus +wxMacAppMenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { - const char *ptr = p ; - int len = strlen ( p ) ; - char *buf = wxBuffer ; + wxMacCarbonEvent cEvent( event ) ; + MenuRef menuRef = cEvent.GetParameter(kEventParamDirectObject) ; + wxMenu* menu = wxFindMenuFromMacMenu( menuRef ) ; - if ( len >= BUFSIZ + 512 ) + if ( menu ) { - buf = new char [len+1] ; - } - - wxMacConvertFromPC( ptr , buf , len ) ; - buf[len] = 0 ; - wxString result( buf ) ; - if ( buf != wxBuffer ) - delete buf ; - return result ; -} + wxEventType type=0; + MenuCommand cmd=0; + switch (GetEventKind(event)) + { + 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; + } + if ( type ) + { + wxMenuEvent wxevent(type, cmd, menu); + wxevent.SetEventObject(menu); -void wxMacConvertToPC( char * p ) -{ - char *ptr = p ; - int len = strlen ( p ) ; + wxEvtHandler* handler = menu->GetEventHandler(); + if (handler && handler->ProcessEvent(wxevent)) + { + // handled + } + else + { + wxWindow *win = menu->GetInvokingWindow(); + if (win) + win->GetEventHandler()->ProcessEvent(wxevent); + } + } + } - wxMacConvertToPC( ptr , ptr , len ) ; + return eventNotHandledErr; } -void wxMacConvertToPC( unsigned char *p ) +static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { - char *ptr = (char*) p + 1 ; - int len = p[0] ; + OSStatus result = eventNotHandledErr ; - wxMacConvertToPC( ptr , ptr , len ) ; -} + HICommand command ; -wxString wxMacMakePCStringFromMac( const char * p ) -{ - const char *ptr = p ; - int len = strlen ( p ) ; - char *buf = wxBuffer ; + wxMacCarbonEvent cEvent( event ) ; + cEvent.GetParameter(kEventParamDirectObject,typeHICommand,&command) ; + + wxMenuItem* item = NULL ; + wxMenu* itemMenu = wxFindMenuFromMacCommand( command , item ) ; + int id = wxMacCommandToId( command.commandID ) ; - if ( len >= BUFSIZ + 512 ) + if ( item ) { - buf = new char [len+1] ; - } + wxASSERT( itemMenu != NULL ) ; + + switch ( cEvent.GetKind() ) + { + case kEventProcessCommand : + { + if (item->IsCheckable()) + item->Check( !item->IsChecked() ) ; - wxMacConvertToPC( ptr , buf , len ) ; - buf[len] = 0 ; + if ( itemMenu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ) + result = noErr ; + } + break ; - wxString result( buf ) ; - if ( buf != wxBuffer ) - delete buf ; - return result ; -} + case kEventCommandUpdateStatus: + { + 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 ; -wxString wxMacMakeStringFromMacString( const char* from , bool mac2pcEncoding ) -{ - if (mac2pcEncoding) - { - return wxMacMakePCStringFromMac( from ) ; - } - else - { - return wxString( from ) ; + default : + break ; + } } + return result ; } -wxString wxMacMakeStringFromPascal( StringPtr from , bool mac2pcEncoding ) +static pascal OSStatus wxMacAppApplicationEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { - // this is safe since a pascal string can never be larger than 256 bytes - char s[256] ; - CopyPascalStringToC( from , s ) ; - if (mac2pcEncoding) + OSStatus result = eventNotHandledErr ; + switch ( GetEventKind( event ) ) { - return wxMacMakePCStringFromMac( s ) ; - } - else - { - return wxString( s ) ; - } -} + case kEventAppActivated : + if ( wxTheApp ) + wxTheApp->SetActive( true , NULL ) ; + result = noErr ; + break ; -void wxMacStringToPascal( const char * from , StringPtr to , bool pc2macEncoding ) -{ - if (pc2macEncoding) - { - CopyCStringToPascal( wxMacMakeMacStringFromPC( from ) , to ) ; - } - else - { - CopyCStringToPascal( from , to ) ; + case kEventAppDeactivated : + if ( wxTheApp ) + wxTheApp->SetActive( false , NULL ) ; + result = noErr ; + break ; + + default : + break ; } + + return result ; } -#ifdef WXMAKINGDLL -#ifndef __DARWIN__ -// we know it's there ;-) -WXIMPORT char std::__throws_bad_alloc ; -#endif -#endif -bool wxApp::Initialize() +pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { - int error = 0 ; + EventRef formerEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ; + EventHandlerCallRef formerEventHandlerCallRef = (EventHandlerCallRef) wxTheApp->MacGetCurrentEventHandlerCallRef() ; + wxTheApp->MacSetCurrentEvent( event , handler ) ; - // Mac-specific + OSStatus result = eventNotHandledErr ; + switch ( GetEventClass( event ) ) + { + case kEventClassCommand : + result = wxMacAppCommandEventHandler( handler , event , data ) ; + break ; - UMAInitToolbox( 4 ) ; - SetEventMask( everyEvent ) ; - UMAShowWatchCursor() ; + case kEventClassApplication : + result = wxMacAppApplicationEventHandler( handler , event , data ) ; + break ; -#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340) - AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments , NewAEEventHandlerUPP(AEHandleODoc) , - (long) wxTheApp , FALSE ) ; - AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , NewAEEventHandlerUPP(AEHandleOApp) , - (long) wxTheApp , FALSE ) ; - AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments , NewAEEventHandlerUPP(AEHandlePDoc) , - (long) wxTheApp , FALSE ) ; - AEInstallEventHandler( kCoreEventClass , kAEQuitApplication , NewAEEventHandlerUPP(AEHandleQuit) , - (long) wxTheApp , FALSE ) ; -#else - AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments , NewAEEventHandlerProc(AEHandleODoc) , - (long) wxTheApp , FALSE ) ; - AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , NewAEEventHandlerProc(AEHandleOApp) , - (long) wxTheApp , FALSE ) ; - AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments , NewAEEventHandlerProc(AEHandlePDoc) , - (long) wxTheApp , FALSE ) ; - AEInstallEventHandler( kCoreEventClass , kAEQuitApplication , NewAEEventHandlerProc(AEHandleQuit) , - (long) wxTheApp , FALSE ) ; -#endif + case kEventClassMenu : + result = wxMacAppMenuEventHandler( handler , event , data ) ; + break ; + case kEventClassMouse : + { + wxMacCarbonEvent cEvent( event ) ; + + WindowRef window ; + Point screenMouseLocation = cEvent.GetParameter(kEventParamMouseLocation) ; + ::FindWindow(screenMouseLocation, &window); + // only send this event in case it had not already been sent to a tlw, as we get + // double events otherwise (in case event.skip) was called + if ( window == NULL ) + result = wxMacTopLevelMouseEventHandler( handler , event , NULL ) ; + } + break ; -#ifndef __DARWIN__ - // test the minimal configuration necessary + case kEventClassAppleEvent : + { + EventRecord rec ; - #if !TARGET_CARBON - long theSystem ; - long theMachine; + wxMacConvertEventToRecord( event , &rec ) ; + result = AEProcessAppleEvent( &rec ) ; + } + break ; - if (Gestalt(gestaltMachineType, &theMachine) != noErr) - { - error = kMacSTRWrongMachine; - } - else if (theMachine < gestaltMacPlus) - { - error = kMacSTRWrongMachine; - } - else if (Gestalt(gestaltSystemVersion, &theSystem) != noErr ) - { - error = kMacSTROldSystem ; - } - else if ( theSystem < 0x0860 ) - { - error = kMacSTROldSystem ; - } - else if ((long)GetApplLimit() - (long)ApplicationZone() < kMacMinHeap) - { - error = kMacSTRSmallSize; - } - #endif - /* - else - { - if ( !UMAHasAppearance() ) - { - error = kMacSTRNoPre8Yet ; - } + default : + break ; } - */ -#endif - // if we encountered any problems so far, give the error code and exit immediately + wxTheApp->MacSetCurrentEvent( formerEvent, formerEventHandlerCallRef ) ; - if ( error ) - { - wxStAppResource resload ; - short itemHit; - Str255 message; + return result ; +} - GetIndString(message, 128, error); - UMAShowArrowCursor() ; - ParamText("\pFatal Error", message, (ConstStr255Param)"\p", (ConstStr255Param)"\p"); - itemHit = Alert(128, nil); - return FALSE ; - } +DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacAppEventHandler ) -#ifndef __DARWIN__ - #if __option(profile) - ProfilerInit( collectDetailed, bestTimeBase , 20000 , 40 ) ; - #endif +#if defined(WXMAKINGDLL_CORE) && !defined(__DARWIN__) +// we know it's there ;-) +WXIMPORT char std::__throws_bad_alloc ; #endif - // now avoid exceptions thrown for new (bad_alloc) +#ifdef __WXDEBUG__ -#ifndef __DARWIN__ - std::__throws_bad_alloc = FALSE ; +pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 options, + const char *assertionString, const char *exceptionLabelString, + const char *errorString, const char *fileName, long lineNumber, void *value, ConstStr255Param outputMsg) +{ + // flow into assert handling + wxString fileNameStr ; + wxString assertionStr ; + wxString exceptionStr ; + wxString errorStr ; + +#if wxUSE_UNICODE + fileNameStr = wxString(fileName, wxConvLocal); + assertionStr = wxString(assertionString, wxConvLocal); + exceptionStr = wxString((exceptionLabelString!=0) ? exceptionLabelString : "", wxConvLocal) ; + errorStr = wxString((errorString!=0) ? errorString : "", wxConvLocal) ; +#else + fileNameStr = fileName; + assertionStr = assertionString; + exceptionStr = (exceptionLabelString!=0) ? exceptionLabelString : "" ; + errorStr = (errorString!=0) ? errorString : "" ; #endif - s_macCursorRgn = ::NewRgn() ; - -#ifdef __WXMSW__ - wxBuffer = new char[1500]; +#if 1 + // flow into log + wxLogDebug( wxT("AssertMacros: %s %s %s file: %s, line: %ld (value %p)\n"), + assertionStr.c_str() , + exceptionStr.c_str() , + errorStr.c_str(), + fileNameStr.c_str(), lineNumber , + value ) ; #else - wxBuffer = new char[BUFSIZ + 512]; + + wxOnAssert(fileNameStr, lineNumber , assertionStr , + wxString::Format( wxT("%s %s value (%p)") , exceptionStr, errorStr , value ) ) ; #endif +} - wxClassInfo::InitializeClasses(); +#endif //__WXDEBUG__ -#if wxUSE_RESOURCES -// wxGetResource(wxT("wxWindows"), wxT("OsVersion"), &wxOsVersion); -#endif +#ifdef __WXMAC_OSX__ +extern "C" +{ + // m_macEventPosted run loop source callback: + void macPostedEventCallback(void *unused); +} -#if wxUSE_THREADS - wxPendingEventsLocker = new wxCriticalSection; +void macPostedEventCallback(void *unused) +{ + wxTheApp->ProcessPendingEvents(); +} #endif - wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); - wxTheColourDatabase->Initialize(); + +bool wxApp::Initialize(int& argc, wxChar **argv) +{ + // Mac-specific #ifdef __WXDEBUG__ -#if wxUSE_LOG - // flush the logged messages if any and install a 'safer' log target: the - // default one (wxLogGui) can't be used after the resources are freed just - // below and the user suppliedo ne might be even more unsafe (using any - // wxWindows GUI function is unsafe starting from now) - wxLog::DontCreateOnDemand(); - - // this will flush the old messages if any - delete wxLog::SetActiveTarget(new wxLogStderr); -#endif // wxUSE_LOG + InstallDebugAssertOutputHandler( NewDebugAssertOutputHandlerUPP( wxMacAssertOutputHandler ) ); #endif - wxWinMacWindowList = new wxList(wxKEY_INTEGER); - wxWinMacControlList = new wxList(wxKEY_INTEGER); - - wxInitializeStockLists(); - wxInitializeStockObjects(); + UMAInitToolbox( 4, sm_isEmbedded ) ; + SetEventMask( everyEvent ) ; + UMAShowWatchCursor() ; -#if wxUSE_WX_RESOURCES - wxInitializeResourceSystem(); +#ifndef __DARWIN__ +# if __option(profile) + ProfilerInit( collectDetailed, bestTimeBase , 40000 , 50 ) ; +# endif #endif - wxBitmap::InitStandardHandlers(); - - wxModule::RegisterModules(); - if (!wxModule::InitializeModules()) { - return FALSE; - } +#ifndef __DARWIN__ + // now avoid exceptions thrown for new (bad_alloc) + // FIXME CS for some changes outside wxMac does not compile anymore +#if 0 + std::__throws_bad_alloc = 0 ; +#endif - wxMacCreateNotifierTable() ; +#endif - UMAShowArrowCursor() ; + s_macCursorRgn = ::NewRgn() ; - return TRUE; -} + // Mac OS X passes a process serial number command line argument when + // the application is launched from the Finder. This argument must be + // removed from the command line arguments before being handled by the + // application (otherwise applications would need to handle it) + if ( argc > 1 ) + { + static const wxChar *ARG_PSN = _T("-psn_"); + if ( wxStrncmp(argv[1], ARG_PSN, wxStrlen(ARG_PSN)) == 0 ) + { + // remove this argument + --argc; + memmove(argv + 1, argv + 2, argc * sizeof(char *)); + } + } -void wxApp::CleanUp() -{ - wxToolTip::RemoveToolTips() ; -#if wxUSE_LOG - // flush the logged messages if any and install a 'safer' log target: the - // default one (wxLogGui) can't be used after the resources are freed just - // below and the user suppliedo ne might be even more unsafe (using any - // wxWindows GUI function is unsafe starting from now) - wxLog::DontCreateOnDemand(); + if ( !wxAppBase::Initialize(argc, argv) ) + return false; - // this will flush the old messages if any - delete wxLog::SetActiveTarget(new wxLogStderr); -#endif // wxUSE_LOG +#if wxUSE_INTL + wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); +#endif - // One last chance for pending objects to be cleaned up - wxTheApp->DeletePendingObjects(); +#if TARGET_API_MAC_OSX + // these might be the startup dirs, set them to the 'usual' dir containing the app bundle + wxString startupCwd = wxGetCwd() ; + if ( startupCwd == wxT("/") || startupCwd.Right(15) == wxT("/Contents/MacOS") ) + { + CFURLRef url = CFBundleCopyBundleURL(CFBundleGetMainBundle() ) ; + CFURLRef urlParent = CFURLCreateCopyDeletingLastPathComponent( kCFAllocatorDefault , url ) ; + CFRelease( url ) ; + CFStringRef path = CFURLCopyFileSystemPath ( urlParent , kCFURLPOSIXPathStyle ) ; + CFRelease( urlParent ) ; + wxString cwd = wxMacCFStringHolder(path).AsString(wxLocale::GetSystemEncoding()); + wxSetWorkingDirectory( cwd ) ; + } +#endif - wxModule::CleanUpModules(); + wxMacCreateNotifierTable() ; -#if wxUSE_WX_RESOURCES - wxCleanUpResourceSystem(); +#ifdef __WXMAC_OSX__ + /* connect posted events to common-mode run loop so that wxPostEvent events + are handled even while we're in the menu or on a scrollbar */ + CFRunLoopSourceContext event_posted_context = {0}; + event_posted_context.perform = macPostedEventCallback; + m_macEventPosted = CFRunLoopSourceCreate(NULL,0,&event_posted_context); + CFRunLoopAddSource(CFRunLoopGetCurrent(), m_macEventPosted, kCFRunLoopCommonModes); #endif - wxDeleteStockObjects() ; + UMAShowArrowCursor() ; + + return true; +} - // Destroy all GDI lists, etc. - wxDeleteStockLists(); +AEEventHandlerUPP sODocHandler = NULL ; +AEEventHandlerUPP sOAppHandler = NULL ; +AEEventHandlerUPP sPDocHandler = NULL ; +AEEventHandlerUPP sRAppHandler = NULL ; +AEEventHandlerUPP sQuitHandler = NULL ; - delete wxTheColourDatabase; - wxTheColourDatabase = NULL; +bool wxApp::OnInitGui() +{ + if ( !wxAppBase::OnInitGui() ) + return false ; - wxBitmap::CleanUpHandlers(); + InstallStandardEventHandler( GetApplicationEventTarget() ) ; - delete[] wxBuffer; - wxBuffer = NULL; + if (!sm_isEmbedded) + { + InstallApplicationEventHandler( + GetwxMacAppEventHandlerUPP(), + GetEventTypeCount(eventList), eventList, wxTheApp, (EventHandlerRef *)&(wxTheApp->m_macEventHandler)); + } - wxMacDestroyNotifierTable() ; - if (wxWinMacWindowList) - delete wxWinMacWindowList ; + if (!sm_isEmbedded) + { + sODocHandler = NewAEEventHandlerUPP(AEHandleODoc) ; + sOAppHandler = NewAEEventHandlerUPP(AEHandleOApp) ; + sPDocHandler = NewAEEventHandlerUPP(AEHandlePDoc) ; + sRAppHandler = NewAEEventHandlerUPP(AEHandleRApp) ; + sQuitHandler = NewAEEventHandlerUPP(AEHandleQuit) ; + + AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments , + sODocHandler , 0 , FALSE ) ; + AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , + sOAppHandler , 0 , FALSE ) ; + AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments , + sPDocHandler , 0 , FALSE ) ; + AEInstallEventHandler( kCoreEventClass , kAEReopenApplication , + sRAppHandler , 0 , FALSE ) ; + AEInstallEventHandler( kCoreEventClass , kAEQuitApplication , + sQuitHandler , 0 , FALSE ) ; + } - if (wxWinMacControlList) - delete wxWinMacControlList ; + return true ; +} - delete wxPendingEvents; -#if wxUSE_THREADS - delete wxPendingEventsLocker; - // If we don't do the following, we get an apparent memory leak. - ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker(); +void wxApp::CleanUp() +{ +#if wxUSE_TOOLTIPS + wxToolTip::RemoveToolTips() ; #endif - wxClassInfo::CleanUpClasses(); - -#ifndef __DARWIN__ - #if __option(profile) - ProfilerDump( "\papp.prof" ) ; - ProfilerTerm() ; - #endif +#ifdef __WXMAC_OSX__ + if (m_macEventPosted) + CFRelease(m_macEventPosted); + m_macEventPosted = NULL; #endif - delete wxTheApp; - wxTheApp = NULL; + // One last chance for pending objects to be cleaned up + wxTheApp->DeletePendingObjects(); -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - // At this point we want to check if there are any memory - // blocks that aren't part of the wxDebugContext itself, - // as a special case. Then when dumping we need to ignore - // wxDebugContext, too. - if (wxDebugContext::CountObjectsLeft(TRUE) > 0) - { - wxLogDebug(wxT("There were memory leaks.")); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); - } - // wxDebugContext::SetStream(NULL, NULL); -#endif + wxMacDestroyNotifierTable() ; -#if wxUSE_LOG - // do it as the very last thing because everything else can log messages - delete wxLog::SetActiveTarget(NULL); -#endif // wxUSE_LOG +#ifndef __DARWIN__ +# if __option(profile) + ProfilerDump( (StringPtr)"\papp.prof" ) ; + ProfilerTerm() ; +# endif +#endif UMACleanupToolbox() ; if (s_macCursorRgn) ::DisposeRgn((RgnHandle)s_macCursorRgn); - #if 0 - TerminateAE() ; - #endif -} - -//---------------------------------------------------------------------- -// wxEntry -//---------------------------------------------------------------------- + if (!sm_isEmbedded) + RemoveEventHandler( (EventHandlerRef)(wxTheApp->m_macEventHandler) ); -short gCurrentResource = -1 ; - -wxStAppResource::wxStAppResource() -{ - m_currentRefNum = CurResFile() ; - if ( gCurrentResource != -1 ) + if (!sm_isEmbedded) { - UseResFile( gCurrentResource ) ; + AERemoveEventHandler( kCoreEventClass , kAEOpenDocuments , + sODocHandler , FALSE ) ; + AERemoveEventHandler( kCoreEventClass , kAEOpenApplication , + sOAppHandler , FALSE ) ; + AERemoveEventHandler( kCoreEventClass , kAEPrintDocuments , + sPDocHandler , FALSE ) ; + AERemoveEventHandler( kCoreEventClass , kAEReopenApplication , + sRAppHandler , FALSE ) ; + AERemoveEventHandler( kCoreEventClass , kAEQuitApplication , + sQuitHandler , FALSE ) ; + + DisposeAEEventHandlerUPP( sODocHandler ) ; + DisposeAEEventHandlerUPP( sOAppHandler ) ; + DisposeAEEventHandlerUPP( sPDocHandler ) ; + DisposeAEEventHandlerUPP( sRAppHandler ) ; + DisposeAEEventHandlerUPP( sQuitHandler ) ; } -} -wxStAppResource::~wxStAppResource() -{ - if ( m_currentRefNum != -1 ) - { - UseResFile( m_currentRefNum ) ; - } + wxAppBase::CleanUp(); } -#ifdef WXMAKINGDLL - -// for shared libraries we have to manually get the correct resource ref num upon -// initializing and releasing when terminating, therefore the __wxinitialize and __wxterminate -// must be used +//---------------------------------------------------------------------- +// misc initialization stuff +//---------------------------------------------------------------------- -#ifdef __cplusplus -extern "C" { -#endif +#if defined(WXMAKINGDLL_CORE) && !defined(__DARWIN__) -void __sinit(void); /* (generated by linker) */ -pascal OSErr __initialize(const CFragInitBlock *theInitBlock); -pascal void __terminate(void); +// for shared libraries we have to manually get the correct resource +// ref num upon initializing and releasing when terminating, therefore +// the __wxinitialize and __wxterminate must be used -#ifdef __cplusplus +extern "C" +{ + void __sinit(void); // (generated by linker) + pascal OSErr __initialize(const CFragInitBlock *theInitBlock); + pascal void __terminate(void); } -#endif pascal OSErr __wxinitialize(const CFragInitBlock *theInitBlock) { - gCurrentResource = -1; - - if (theInitBlock->fragLocator.where == kDataForkCFragLocator) { - gCurrentResource = - FSpOpenResFile(theInitBlock->fragLocator.u.onDisk.fileSpec, - fsRdPerm); - } - return __initialize( theInitBlock ) ; + return __initialize( theInitBlock ) ; } pascal void __wxterminate(void) { - if (gCurrentResource != -1) - CloseResFile(gCurrentResource); __terminate() ; } -#endif - -int WXDLLEXPORT wxEntryStart( int argc, char *argv[] ) -{ - return wxApp::Initialize(); -} - - -int WXDLLEXPORT wxEntryInitGui() -{ - return wxTheApp->OnInitGui(); -} +#endif /* WXMAKINGDLL_CORE && !__DARWIN__ */ -void WXDLLEXPORT wxEntryCleanup() +bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) { - wxApp::CleanUp(); -} + OSStatus err = noErr ; + bool converted = ConvertEventRefToEventRecord( event, rec) ; - -int wxEntry( int argc, char *argv[] , bool enterLoop ) -{ - gCurrentResource = CurResFile() ; -#ifdef __MWERKS__ -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - // This seems to be necessary since there are 'rogue' - // objects present at this point (perhaps global objects?) - // Setting a checkpoint will ignore them as far as the - // memory checking facility is concerned. - // Of course you may argue that memory allocated in globals should be - // checked, but this is a reasonable compromise. - wxDebugContext::SetCheckpoint(); -#endif -#endif - if (!wxEntryStart(argc, argv)) { - return 0; - } - // create the application object or ensure that one already exists - if (!wxTheApp) + if ( !converted ) { - // The app may have declared a global application object, but we recommend - // the IMPLEMENT_APP macro is used instead, which sets an initializer - // function for delayed, dynamic app object construction. - wxCHECK_MSG( wxApp::GetInitializerFunction(), 0, - wxT("No initializer - use IMPLEMENT_APP macro.") ); - - wxTheApp = (wxApp*) (*wxApp::GetInitializerFunction()) (); - } - - wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") ); - -#ifndef __DARWIN__ - argc = 0 ; // currently we don't support files as parameters -#endif - // we could try to get the open apple events here to adjust argc and argv better + switch ( GetEventClass( event ) ) + { + case kEventClassKeyboard : + { + converted = true ; + switch ( GetEventKind(event) ) + { + case kEventRawKeyDown : + rec->what = keyDown ; + break ; - wxTheApp->argc = argc; - wxTheApp->argv = argv; + case kEventRawKeyRepeat : + rec->what = autoKey ; + break ; - // GUI-specific initialization, such as creating an app context. - wxEntryInitGui(); + case kEventRawKeyUp : + rec->what = keyUp ; + break ; + case kEventRawKeyModifiersChanged : + rec->what = nullEvent ; + break ; - // Here frames insert themselves automatically - // into wxTopLevelWindows by getting created - // in OnInit(). + default : + converted = false ; + break ; + } - int retValue = 0; + if ( converted ) + { + UInt32 keyCode ; + unsigned char charCode ; + UInt32 modifiers ; + GetMouse( &rec->where) ; + + err = GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, 4, NULL, &modifiers); + err = GetEventParameter(event, kEventParamKeyCode, typeUInt32, NULL, 4, NULL, &keyCode); + err = GetEventParameter(event, kEventParamKeyMacCharCodes, typeChar, NULL, 1, NULL, &charCode); + rec->modifiers = modifiers ; + rec->message = (keyCode << 8 ) + charCode ; + } + } + break ; - if ( wxTheApp->OnInit() ) - { - if ( enterLoop ) - { - retValue = wxTheApp->OnRun(); - } - else - // We want to initialize, but not run or exit immediately. - return 1; - } - //else: app initialization failed, so we skipped OnRun() + case kEventClassTextInput : + { + switch ( GetEventKind( event ) ) + { + case kEventTextInputUnicodeForKeyEvent : + { + EventRef rawEvent ; + err = GetEventParameter( + event, kEventParamTextInputSendKeyboardEvent, typeEventRef, NULL, + sizeof(rawEvent), NULL, &rawEvent ) ; + converted = true ; + + { + UInt32 keyCode, modifiers; + unsigned char charCode ; + + GetMouse( &rec->where) ; + rec->what = keyDown ; + err = GetEventParameter(rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, 4, NULL, &modifiers); + err = GetEventParameter(rawEvent, kEventParamKeyCode, typeUInt32, NULL, 4, NULL, &keyCode); + err = GetEventParameter(rawEvent, kEventParamKeyMacCharCodes, typeChar, NULL, 1, NULL, &charCode); + rec->modifiers = modifiers ; + rec->message = (keyCode << 8 ) + charCode ; + } + } + break ; + + default : + break ; + } + } + break ; - wxWindow *topWindow = wxTheApp->GetTopWindow(); - if ( topWindow ) - { - // Forcibly delete the window. - if ( topWindow->IsKindOf(CLASSINFO(wxFrame)) || - topWindow->IsKindOf(CLASSINFO(wxDialog)) ) - { - topWindow->Close(TRUE); - wxTheApp->DeletePendingObjects(); - } - else - { - delete topWindow; - wxTheApp->SetTopWindow(NULL); + default : + break ; } } - wxTheApp->OnExit(); - - wxEntryCleanup(); - - return retValue; + return converted ; } -// Static member initialization -wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL; - wxApp::wxApp() { - m_topWindow = NULL; - wxTheApp = this; - -#if WXWIN_COMPATIBILITY_2_2 - m_wantDebugOutput = TRUE; -#endif - - argc = 0; - argv = NULL; + m_printMode = wxPRINT_WINDOWS; - m_printMode = wxPRINT_WINDOWS; - m_exitOnFrameDelete = TRUE; - m_auto3D = TRUE; -} - -bool wxApp::Initialized() -{ - if (GetTopWindow()) - return TRUE; - else - return FALSE; -} - -int wxApp::MainLoop() -{ - m_keepGoing = TRUE; - - while (m_keepGoing) - { - MacDoOneEvent() ; - } - - return 0; -} - -// Returns TRUE if more time is needed. -bool wxApp::ProcessIdle() -{ - wxIdleEvent event; - event.SetEventObject(this); - ProcessEvent(event); + m_macCurrentEvent = NULL ; + m_macCurrentEventHandlerCallRef = NULL ; - return event.MoreRequested(); -} - -void wxApp::ExitMainLoop() -{ - m_keepGoing = FALSE; -} - -// Is a message/event pending? -bool wxApp::Pending() -{ - EventRecord event ; - - return EventAvail( everyEvent , &event ) ; -} - -// Dispatch a message. -void wxApp::Dispatch() -{ - MacDoOneEvent() ; +#ifdef __WXMAC_OSX__ + m_macEventPosted = NULL ; +#endif } void wxApp::OnIdle(wxIdleEvent& event) { - static bool s_inOnIdle = FALSE; - - // Avoid recursion (via ProcessEvent default case) - if ( s_inOnIdle ) - return; - - - s_inOnIdle = TRUE; - - // 'Garbage' collection of windows deleted with Close(). - DeletePendingObjects(); - - // flush the logged messages if any - wxLog *pLog = wxLog::GetActiveTarget(); - if ( pLog != NULL && pLog->HasPendingMessages() ) - pLog->Flush(); - - // Send OnIdle events to all windows - bool needMore = SendIdleEvents(); - - if (needMore) - event.RequestMore(TRUE); + wxAppBase::OnIdle(event); // If they are pending events, we must process them: pending events are // either events to the threads other than main or events posted with // wxPostEvent() functions wxMacProcessNotifierAndPendingEvents(); - s_inOnIdle = FALSE; -} - -void wxWakeUpIdle() -{ - wxMacWakeUp() ; -} - -// Send idle event to all top-level windows -bool wxApp::SendIdleEvents() -{ - bool needMore = FALSE; - wxNode* node = wxTopLevelWindows.First(); - while (node) - { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) - needMore = TRUE; - - node = node->Next(); - } - return needMore; + if (!wxMenuBar::MacGetInstalledMenuBar() && wxMenuBar::MacGetCommonMenuBar()) + wxMenuBar::MacGetCommonMenuBar()->MacInstallMenuBar(); } -// Send idle event to window and all subwindows -bool wxApp::SendIdleEvents(wxWindow* win) +void wxApp::WakeUpIdle() { - bool needMore = FALSE; - - wxIdleEvent event; - event.SetEventObject(win); - win->ProcessEvent(event); - - if (event.MoreRequested()) - needMore = TRUE; - - wxNode* node = win->GetChildren().First(); - while (node) +#ifdef __WXMAC_OSX__ + if (m_macEventPosted) { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) - needMore = TRUE; - - node = node->Next(); + CFRunLoopSourceSignal(m_macEventPosted); } - return needMore ; -} - -void wxApp::DeletePendingObjects() -{ - wxNode *node = wxPendingDelete.First(); - while (node) - { - wxObject *obj = (wxObject *)node->Data(); - - delete obj; - - if (wxPendingDelete.Member(obj)) - delete node; - - // Deleting one object may have deleted other pending - // objects, so start from beginning of list again. - node = wxPendingDelete.First(); - } -} - -wxIcon -wxApp::GetStdIcon(int which) const -{ - switch(which) - { - case wxICON_INFORMATION: - return wxIcon("wxICON_INFO"); - - case wxICON_QUESTION: - return wxIcon("wxICON_QUESTION"); - - case wxICON_EXCLAMATION: - return wxIcon("wxICON_WARNING"); - - default: - wxFAIL_MSG(wxT("requested non existent standard icon")); - // still fall through - - case wxICON_HAND: - return wxIcon("wxICON_ERROR"); - } -} - -void wxExit() -{ - wxLogError(_("Fatal error: exiting")); +#endif - wxApp::CleanUp(); - ::ExitToShell() ; + wxMacWakeUp() ; } void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event)) { if (GetTopWindow()) - GetTopWindow()->Close(TRUE); + GetTopWindow()->Close(true); } // Default behaviour: close the application with prompts. The @@ -997,7 +1136,7 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event) if (GetTopWindow()) { if (!GetTopWindow()->Close(!event.CanVeto())) - event.Veto(TRUE); + event.Veto(true); } } @@ -1011,8 +1150,6 @@ void wxCYield() bool wxApp::Yield(bool onlyIfNeeded) { - static bool s_inYield = FALSE; - if (s_inYield) { if ( !onlyIfNeeded ) @@ -1020,536 +1157,402 @@ bool wxApp::Yield(bool onlyIfNeeded) wxFAIL_MSG( wxT("wxYield called recursively" ) ); } - return FALSE; + return false; } - s_inYield = TRUE; + s_inYield = true; -#if wxUSE_THREADS - YieldToAnyThread() ; -#endif - EventRecord event ; + // by definition yield should handle all non-processed events - long sleepTime = 1 ; //::GetCaretTime(); + EventRef theEvent; - while ( !wxTheApp->IsExiting() && WaitNextEvent(everyEvent, &event,sleepTime, (RgnHandle) wxApp::s_macCursorRgn)) - { - wxTheApp->MacHandleOneEvent( &event ); - if ( event.what != kHighLevelEvent ) - SetRectRgn( (RgnHandle) wxApp::s_macCursorRgn , event.where.h , event.where.v , event.where.h + 1 , event.where.v + 1 ) ; - } - - wxMacProcessNotifierAndPendingEvents() ; - - s_inYield = FALSE; - - return TRUE; -} + OSStatus status = noErr ; -// platform specifics - -void wxApp::MacSuspend( bool convertClipboard ) -{ - // we have to deactive the top level windows manually - - wxNode* node = wxTopLevelWindows.First(); - while (node) + while ( status == noErr ) { - wxTopLevelWindow* win = (wxTopLevelWindow*) node->Data(); - win->MacActivate( MacGetCurrentEvent() , false ) ; - - node = node->Next(); - } - - s_lastMouseDown = 0 ; - if( convertClipboard ) - { - MacConvertPrivateToPublicScrap() ; - } - - ::HideFloatingWindows() ; -} + s_inReceiveEvent = true ; + status = ReceiveNextEvent(0, NULL,kEventDurationNoWait,true,&theEvent) ; + s_inReceiveEvent = false ; -void wxApp::MacResume( bool convertClipboard ) -{ - s_lastMouseDown = 0 ; - if( convertClipboard ) + if ( status == eventLoopTimedOutErr ) { - MacConvertPublicToPrivateScrap() ; + // make sure next time the event loop will trigger idle events + sleepTime = kEventDurationNoWait ; } + else if ( status == eventLoopQuitErr ) + { + // according to QA1061 this may also occur when a WakeUp Process + // is executed + } + else + { + MacHandleOneEvent( theEvent ) ; + ReleaseEvent(theEvent); + } + } - ::ShowFloatingWindows() ; -} - -void wxApp::MacConvertPrivateToPublicScrap() -{ -} + wxMacProcessNotifierAndPendingEvents() ; + s_inYield = false; -void wxApp::MacConvertPublicToPrivateScrap() -{ + return true; } void wxApp::MacDoOneEvent() { - EventRecord event ; + EventRef theEvent; - long sleepTime = 1; // GetCaretTime() / 4 ; + s_inReceiveEvent = true ; + OSStatus status = ReceiveNextEvent(0, NULL, sleepTime, true, &theEvent) ; + s_inReceiveEvent = false ; - if (WaitNextEvent(everyEvent, &event, sleepTime, (RgnHandle) s_macCursorRgn)) - { - MacHandleOneEvent( &event ); - } - else + switch (status) { - // idlers - WindowPtr window = ::FrontWindow() ; - if ( window ) - ::IdleControls( window ) ; + case eventLoopTimedOutErr : + if ( wxTheApp->ProcessIdle() ) + sleepTime = kEventDurationNoWait ; + else + sleepTime = kEventDurationSecond; + break; - wxTheApp->ProcessIdle() ; - } - if ( event.what != kHighLevelEvent ) - SetRectRgn( (RgnHandle) s_macCursorRgn , event.where.h , event.where.v , event.where.h + 1 , event.where.v + 1 ) ; + case eventLoopQuitErr : + // according to QA1061 this may also occur + // when a WakeUp Process is executed + break; + default: + MacHandleOneEvent( theEvent ) ; + ReleaseEvent( theEvent ); + sleepTime = kEventDurationNoWait ; + break; + } // repeaters DeletePendingObjects() ; wxMacProcessNotifierAndPendingEvents() ; } +// virtual +void wxApp::MacHandleUnhandledEvent( WXEVENTREF evr ) +{ + // Override to process unhandled events as you please +} + void wxApp::MacHandleOneEvent( WXEVENTREF evr ) { - EventRecord* ev = (EventRecord*) evr ; - m_macCurrentEvent = ev ; + EventTargetRef theTarget; + theTarget = GetEventDispatcherTarget(); + m_macCurrentEvent = evr ; + + OSStatus status = SendEventToEventTarget((EventRef) evr , theTarget); + if (status == eventNotHandledErr) + MacHandleUnhandledEvent(evr); - wxApp::sm_lastMessageTime = ev->when ; + wxMacProcessNotifierAndPendingEvents() ; + +#if wxUSE_THREADS + wxMutexGuiLeaveOrEnter(); +#endif // wxUSE_THREADS +} - switch (ev->what) +long wxMacTranslateKey(unsigned char key, unsigned char code) +{ + long retval = key ; + switch (key) { - case mouseDown: - MacHandleMouseDownEvent( ev ) ; - if ( ev->modifiers & controlKey ) - s_lastMouseDown = 2; - else - s_lastMouseDown = 1; + case kHomeCharCode : + retval = WXK_HOME; break; - case mouseUp: - if ( s_lastMouseDown == 2 ) - { - ev->modifiers |= controlKey ; - } - else - { - ev->modifiers &= ~controlKey ; - } - MacHandleMouseUpEvent( ev ) ; - s_lastMouseDown = 0; - break; - case activateEvt: - MacHandleActivateEvent( ev ) ; + + case kEnterCharCode : + retval = WXK_RETURN; break; - case updateEvt: - MacHandleUpdateEvent( ev ) ; + case kEndCharCode : + retval = WXK_END; break; - case keyDown: - case autoKey: - MacHandleKeyDownEvent( ev ) ; + + case kHelpCharCode : + retval = WXK_HELP; break; - case keyUp: - MacHandleKeyUpEvent( ev ) ; + + case kBackspaceCharCode : + retval = WXK_BACK; break; - case diskEvt: - MacHandleDiskEvent( ev ) ; + + case kTabCharCode : + retval = WXK_TAB; break; - case osEvt: - MacHandleOSEvent( ev ) ; + + case kPageUpCharCode : + retval = WXK_PAGEUP; break; - case kHighLevelEvent: - MacHandleHighLevelEvent( ev ) ; + + case kPageDownCharCode : + retval = WXK_PAGEDOWN; break; - default: + + case kReturnCharCode : + retval = WXK_RETURN; break; - } - wxMacProcessNotifierAndPendingEvents() ; -} -void wxApp::MacHandleHighLevelEvent( WXEVENTREF evr ) -{ - EventRecord* ev = (EventRecord*) evr ; - ::AEProcessAppleEvent( ev ) ; -} + case kFunctionKeyCharCode : + { + switch ( code ) + { + case 0x7a : + retval = WXK_F1 ; + break; -bool s_macIsInModalLoop = false ; + case 0x78 : + retval = WXK_F2 ; + break; -void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr ) -{ - EventRecord* ev = (EventRecord*) evr ; - wxToolTip::RemoveToolTips() ; + case 0x63 : + retval = WXK_F3 ; + break; - WindowRef window; - WindowRef frontWindow = ::FrontNonFloatingWindow() ; - WindowAttributes frontWindowAttributes = NULL ; - if ( frontWindow ) - ::GetWindowAttributes( frontWindow , &frontWindowAttributes ) ; + case 0x76 : + retval = WXK_F4 ; + break; - short windowPart = ::FindWindow(ev->where, &window); - wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ; - if ( wxPendingDelete.Member(win) ) - return ; + case 0x60 : + retval = WXK_F5 ; + break; - BitMap screenBits; - GetQDGlobalsScreenBits( &screenBits ); + case 0x61 : + retval = WXK_F6 ; + break; - switch (windowPart) - { - case inMenuBar : - if ( s_macIsInModalLoop ) - { - SysBeep ( 30 ) ; - } - else - { - UInt32 menuresult = MenuSelect(ev->where) ; - MacHandleMenuSelect( HiWord( menuresult ) , LoWord( menuresult ) ); - s_lastMouseDown = 0; + 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 ; + + case kEscapeCharCode : + retval = WXK_ESCAPE ; break ; -#if !TARGET_CARBON - case inSysWindow : - SystemClick( ev , window ) ; - s_lastMouseDown = 0; - break ; -#endif - case inDrag : - if ( window != frontWindow && s_macIsInModalLoop && !(ev->modifiers & cmdKey ) ) - { - SysBeep ( 30 ) ; - } - else - { - DragWindow(window, ev->where, &screenBits.bounds); - if (win) - { - GrafPtr port ; - GetPort( &port ) ; - Point pt = { 0, 0 } ; - SetPortWindowPort(window) ; - LocalToGlobal( &pt ) ; - SetPort( port ) ; - win->SetSize( pt.h , pt.v , -1 , - -1 , wxSIZE_USE_EXISTING); - } - s_lastMouseDown = 0; - } + + case kLeftArrowCharCode : + retval = WXK_LEFT ; break ; - case inGoAway: - if (TrackGoAway(window, ev->where)) - { - if ( win ) - win->Close() ; - } - s_lastMouseDown = 0; - break; - case inGrow: - { - int growResult = GrowWindow(window , ev->where, &screenBits.bounds); - if (growResult != 0) - { - int newWidth = LoWord(growResult); - int newHeight = HiWord(growResult); - int oldWidth, oldHeight; + case kRightArrowCharCode : + retval = WXK_RIGHT ; + break ; - if (win) - { - win->GetSize(&oldWidth, &oldHeight); - if (newWidth == 0) - newWidth = oldWidth; - if (newHeight == 0) - newHeight = oldHeight; - win->SetSize( -1, -1, newWidth, newHeight, wxSIZE_USE_EXISTING); - } - } - s_lastMouseDown = 0; - } - break; - case inZoomIn: - case inZoomOut: - if (TrackBox(window, ev->where, windowPart)) - { - // TODO setup size event - ZoomWindow( window , windowPart , false ) ; - if (win) - { - Rect tempRect ; + case kUpArrowCharCode : + retval = WXK_UP ; + break ; - GetWindowPortBounds(window, &tempRect ) ; - win->SetSize( -1, -1, tempRect.right-tempRect.left , - tempRect.bottom-tempRect.top, wxSIZE_USE_EXISTING); - } - } - s_lastMouseDown = 0; - break; - case inCollapseBox : - // TODO setup size event - s_lastMouseDown = 0; + case kDownArrowCharCode : + retval = WXK_DOWN ; break ; - case inContent : - { - GrafPtr port ; - GetPort( &port ) ; - SetPortWindowPort(window) ; - SetPort( port ) ; - } - if ( window != frontWindow && wxTheApp->s_captureWindow == NULL ) - { - if ( s_macIsInModalLoop ) - { - SysBeep ( 30 ) ; - } - else if ( UMAIsWindowFloating( window ) ) - { - if ( win ) - win->MacMouseDown( ev , windowPart ) ; - } - else - { - if ( win ) - win->MacMouseDown( ev , windowPart ) ; - ::SelectWindow( window ) ; - } - } - else - { - if ( win ) - win->MacMouseDown( ev , windowPart ) ; - } + case kDeleteCharCode : + retval = WXK_DELETE ; break ; default: - break; - } + break ; + } // end switch + + return retval; } -void wxApp::MacHandleMouseUpEvent( WXEVENTREF evr ) +int wxMacKeyCodeToModifier(wxKeyCode key) { - EventRecord* ev = (EventRecord*) evr ; - WindowRef window; - - short windowPart = inNoWindow ; - if ( wxTheApp->s_captureWindow ) - { - window = (WindowRef) s_captureWindow->MacGetRootWindow() ; - windowPart = inContent ; - } - else - { - windowPart = ::FindWindow(ev->where, &window) ; - } - - switch (windowPart) + switch (key) { - case inMenuBar : - break ; - case inSysWindow : - break ; - default: - { - wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ; - if ( win ) - win->MacMouseUp( ev , windowPart ) ; - } - break; + case WXK_START: + case WXK_MENU: + return cmdKey; + + case WXK_SHIFT: + return shiftKey; + + case WXK_CAPITAL: + return alphaLock; + + case WXK_ALT: + return optionKey; + + case WXK_CONTROL: + return controlKey; + + default: + return 0; } } -long wxMacTranslateKey(unsigned char key, unsigned char code) ; -long wxMacTranslateKey(unsigned char key, unsigned char code) +#ifndef __DARWIN__ +bool wxGetKeyState(wxKeyCode key) //virtual key code if < 10.2.x, else see below { - long retval = key ; - switch (key) + wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key != + WXK_MBUTTON, wxT("can't use wxGetKeyState() for mouse buttons")); + +//if OS X > 10.2 (i.e. 10.2.x) +//a known apple bug prevents the system from determining led +//states with GetKeys... can only determine caps lock led + return !!(GetCurrentKeyModifiers() & wxMacKeyCodeToModifier(key)); +//else +// KeyMapByteArray keymap; +// GetKeys((BigEndianLong*)keymap); +// return !!(BitTst(keymap, (sizeof(KeyMapByteArray)*8) - iKey)); +} +#endif + + +wxMouseState wxGetMouseState() +{ + wxMouseState ms; + + wxPoint pt = wxGetMousePosition(); + 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); + 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 ) ; + + handled = focus->GetEventHandler()->ProcessEvent( event ) ; + if ( handled && event.GetSkipped() ) + handled = false ; + +#if wxUSE_ACCEL + if ( !handled ) { - case 0x01 : - retval = WXK_HOME; - break; - case 0x03 : - retval = WXK_RETURN; - break; - case 0x04 : - retval = WXK_END; - break; - case 0x05 : - retval = WXK_HELP; - break; - case 0x08 : - retval = WXK_BACK; - break; - case 0x09 : - retval = WXK_TAB; - break; - case 0x0b : - retval = WXK_PAGEUP; - break; - case 0x0c : - retval = WXK_PAGEDOWN; - break; - case 0x0d : - retval = WXK_RETURN; - break; - case 0x10 : + wxWindow *ancestor = focus; + while (ancestor) + { + int command = ancestor->GetAcceleratorTable()->GetCommand( event ); + if (command != -1) { - 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; - } + wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command ); + handled = ancestor->GetEventHandler()->ProcessEvent( command_event ); + break; } - break ; - case 0x1b : - retval = WXK_ESCAPE ; - break ; - case 0x1c : - retval = WXK_LEFT ; - break ; - case 0x1d : - retval = WXK_RIGHT ; - break ; - case 0x1e : - retval = WXK_UP ; - break ; - case 0x1f : - retval = WXK_DOWN ; - break ; - case 0x7F : - retval = WXK_DELETE ; - default: - break ; - } // end switch - return retval; + if (ancestor->IsTopLevel()) + break; + + ancestor = ancestor->GetParent(); + } + } +#endif // wxUSE_ACCEL + + return handled ; } -void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr ) +bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) { - EventRecord* ev = (EventRecord*) evr ; - wxToolTip::RemoveToolTips() ; + 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 ; +} - UInt32 menuresult = UMAMenuEvent(ev) ; - if ( HiWord( menuresult ) ) +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) { - if ( !s_macIsInModalLoop ) - MacHandleMenuSelect( HiWord( menuresult ) , LoWord( menuresult ) ) ; + event.SetEventType( wxEVT_CHAR_HOOK ); + handled = tlw->GetEventHandler()->ProcessEvent( event ); + if ( handled && event.GetSkipped() ) + handled = false ; } - else + + if ( !handled ) { - short keycode ; - short keychar ; - keychar = short(ev->message & charCodeMask); - keycode = short(ev->message & keyCodeMask) >> 8 ; - long keyval = wxMacTranslateKey(keychar, keycode) ; - bool handled = false ; - wxWindow* focus = wxWindow::FindFocus() ; - if ( focus ) + event.SetEventType( wxEVT_CHAR ); + event.Skip( false ) ; + handled = focus->GetEventHandler()->ProcessEvent( event ) ; + } + + if ( !handled && (keyval == WXK_TAB) ) + { + wxWindow* iter = focus->GetParent() ; + while ( iter && !handled ) { - - wxKeyEvent event(wxEVT_KEY_DOWN); - event.m_shiftDown = ev->modifiers & shiftKey; - event.m_controlDown = ev->modifiers & controlKey; - event.m_altDown = ev->modifiers & optionKey; - event.m_metaDown = ev->modifiers & cmdKey; - event.m_keyCode = keyval; - event.m_x = ev->where.h; - event.m_y = ev->where.v; - event.m_timeStamp = ev->when; - event.SetEventObject(focus); - handled = focus->GetEventHandler()->ProcessEvent( event ) ; - if ( !handled ) - { - #if wxUSE_ACCEL - if (!handled) - { - wxWindow *ancestor = focus; - /* - while (ancestor) - { - int command = ancestor->GetAcceleratorTable()->GetCommand( event ); - if (command != -1) - { - wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command ); - handled = ancestor->GetEventHandler()->ProcessEvent( command_event ); - break; - } - if (ancestor->m_isFrame) - break; - ancestor = ancestor->GetParent(); - } - */ - } - #endif // wxUSE_ACCEL - } - if (!handled) - { - wxKeyEvent event(wxEVT_CHAR); - event.m_shiftDown = ev->modifiers & shiftKey; - event.m_controlDown = ev->modifiers & controlKey; - event.m_altDown = ev->modifiers & optionKey; - event.m_metaDown = ev->modifiers & cmdKey; - event.m_keyCode = keyval; - event.m_x = ev->where.h; - event.m_y = ev->where.v; - event.m_timeStamp = ev->when; - event.SetEventObject(focus); - handled = focus->GetEventHandler()->ProcessEvent( event ) ; - } - if ( !handled && - (keyval == WXK_TAB) && - (!focus->HasFlag(wxTE_PROCESS_TAB)) && - (focus->GetParent()) && - (focus->GetParent()->HasFlag( wxTAB_TRAVERSAL)) ) + if ( iter->HasFlag( wxTAB_TRAVERSAL ) ) { wxNavigationKeyEvent new_event; new_event.SetEventObject( focus ); @@ -1557,329 +1560,122 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr ) /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */ new_event.SetWindowChange( event.ControlDown() ); new_event.SetCurrentFocus( focus ); - handled = focus->GetEventHandler()->ProcessEvent( new_event ); + handled = focus->GetParent()->GetEventHandler()->ProcessEvent( new_event ); + if ( handled && new_event.GetSkipped() ) + handled = false ; } + + iter = iter->GetParent() ; } - if ( !handled ) + } + + // 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 - 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 ; + 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 == '.' && ev->modifiers & cmdKey ) ) + 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 ; } -void wxApp::MacHandleKeyUpEvent( WXEVENTREF evr ) +// 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 ) { - EventRecord* ev = (EventRecord*) evr ; - wxToolTip::RemoveToolTips() ; + short keycode, keychar ; - UInt32 menuresult = UMAMenuEvent(ev) ; - if ( HiWord( menuresult ) ) + keychar = short(keymessage & charCodeMask); + keycode = short(keymessage & keyCodeMask) >> 8 ; + 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); + keychar = short(keyInfo & charCodeMask); } - else - { - short keycode ; - short keychar ; - keychar = short(ev->message & charCodeMask); - keycode = short(ev->message & keyCodeMask) >> 8 ; - wxWindow* focus = wxWindow::FindFocus() ; - if ( focus ) - { - long keyval = wxMacTranslateKey(keychar, keycode) ; - - wxKeyEvent event(wxEVT_KEY_UP); - event.m_shiftDown = ev->modifiers & shiftKey; - event.m_controlDown = ev->modifiers & controlKey; - event.m_altDown = ev->modifiers & optionKey; - event.m_metaDown = ev->modifiers & cmdKey; - event.m_keyCode = keyval; - event.m_x = ev->where.h; - event.m_y = ev->where.v; - event.m_timeStamp = ev->when; - event.SetEventObject(focus); - bool handled = focus->GetEventHandler()->ProcessEvent( event ) ; - } - } -} - -void wxApp::MacHandleActivateEvent( WXEVENTREF evr ) -{ - EventRecord* ev = (EventRecord*) evr ; - WindowRef window = (WindowRef) ev->message ; - if ( window ) - { - bool activate = (ev->modifiers & activeFlag ) ; - WindowClass wclass ; - ::GetWindowClass ( window , &wclass ) ; - if ( wclass == kFloatingWindowClass ) - { - // if it is a floater we activate/deactivate the front non-floating window instead - window = ::FrontNonFloatingWindow() ; - } - wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ; - if ( win ) - win->MacActivate( ev , activate ) ; - } -} + long keyval = wxMacTranslateKey(keychar, keycode) ; + if ( keyval == keychar && ( event.GetEventType() == wxEVT_KEY_UP || event.GetEventType() == wxEVT_KEY_DOWN ) ) + keyval = wxToupper( keyval ) ; -void wxApp::MacHandleUpdateEvent( WXEVENTREF evr ) -{ - EventRecord* ev = (EventRecord*) evr ; - WindowRef window = (WindowRef) ev->message ; - wxTopLevelWindowMac * win = wxFindWinFromMacWindow( window ) ; - if ( win ) + // Check for NUMPAD keys + if (keyval >= '0' && keyval <= '9' && keycode >= 82 && keycode <= 92) { - if ( !wxPendingDelete.Member(win) ) - win->MacUpdate( ev->when ) ; + keyval = (keyval - '0') + WXK_NUMPAD0; } - else + else if (keycode >= 67 && keycode <= 81) { - // since there is no way of telling this foreign window to update itself - // we have to invalidate the update region otherwise we keep getting the same - // event over and over again - BeginUpdate( window ) ; - EndUpdate( window ) ; - } -} - -void wxApp::MacHandleDiskEvent( WXEVENTREF evr ) -{ - EventRecord* ev = (EventRecord*) evr ; - if ( HiWord( ev->message ) != noErr ) - { - #if !TARGET_CARBON - OSErr err ; - Point point ; - SetPt( &point , 100 , 100 ) ; - - err = DIBadMount( point , ev->message ) ; - wxASSERT( err == noErr ) ; -#endif - } -} - -void wxApp::MacHandleOSEvent( WXEVENTREF evr ) -{ - EventRecord* ev = (EventRecord*) evr ; - switch( ( ev->message & osEvtMessageMask ) >> 24 ) - { - case suspendResumeMessage : - { - bool isResuming = ev->message & resumeFlag ; -#if !TARGET_CARBON - bool convertClipboard = ev->message & convertClipboardFlag ; -#else - bool convertClipboard = false; -#endif - bool doesActivate = UMAGetProcessModeDoesActivateOnFGSwitch() ; - if ( isResuming ) - { - WindowRef oldFrontWindow = NULL ; - WindowRef newFrontWindow = NULL ; - - // in case we don't take care of activating ourselves, we have to synchronize - // our idea of the active window with the process manager's - which it already activated - - if ( !doesActivate ) - oldFrontWindow = ::FrontNonFloatingWindow() ; - - MacResume( convertClipboard ) ; - - newFrontWindow = ::FrontNonFloatingWindow() ; - - if ( oldFrontWindow ) - { - wxTopLevelWindowMac* win = wxFindWinFromMacWindow( oldFrontWindow ) ; - if ( win ) - win->MacActivate( ev , false ) ; - } - if ( newFrontWindow ) - { - wxTopLevelWindowMac* win = wxFindWinFromMacWindow( newFrontWindow ) ; - if ( win ) - win->MacActivate( ev , true ) ; - } - } - else - { - MacSuspend( convertClipboard ) ; - - // in case this suspending did close an active window, another one might - // have surfaced -> lets deactivate that one - -/* TODO : find out what to do on systems < 10 , perhaps FrontNonFloatingWindow - WindowRef newActiveWindow = ::ActiveNonFloatingWindow() ; - if ( newActiveWindow ) - { - wxWindow* win = wxFindWinFromMacWindow( newActiveWindow ) ; - if ( win ) - win->MacActivate( ev , false ) ; - } -*/ - } - } - break ; - case mouseMovedMessage : - { - WindowRef window; - - wxWindow* currentMouseWindow = NULL ; + switch (keycode) + { + case 76 : + keyval = WXK_NUMPAD_ENTER; + break; - wxWindow::MacGetWindowFromPoint( wxPoint( ev->where.h , ev->where.v ) , - ¤tMouseWindow ) ; - if ( currentMouseWindow != wxWindow::s_lastMouseWindow ) - { - wxMouseEvent event ; - - bool isDown = !(ev->modifiers & btnState) ; // 1 is for up - bool controlDown = ev->modifiers & controlKey ; // for simulating right mouse - - event.m_leftDown = isDown && !controlDown; - event.m_middleDown = FALSE; - event.m_rightDown = isDown && controlDown; - event.m_shiftDown = ev->modifiers & shiftKey; - event.m_controlDown = ev->modifiers & controlKey; - event.m_altDown = ev->modifiers & optionKey; - event.m_metaDown = ev->modifiers & cmdKey; - event.m_x = ev->where.h; - event.m_y = ev->where.v; - event.m_timeStamp = ev->when; - event.SetEventObject(this); - - if ( wxWindow::s_lastMouseWindow ) - { - wxMouseEvent eventleave(event); - eventleave.SetEventType( wxEVT_LEAVE_WINDOW ); - wxWindow::s_lastMouseWindow->ScreenToClient( &eventleave.m_x, &eventleave.m_y ); - - wxWindow::s_lastMouseWindow->GetEventHandler()->ProcessEvent(eventleave); - } - if ( currentMouseWindow ) - { - wxMouseEvent evententer(event); - evententer.SetEventType( wxEVT_ENTER_WINDOW ); - currentMouseWindow->ScreenToClient( &evententer.m_x, &evententer.m_y ); - - currentMouseWindow->GetEventHandler()->ProcessEvent(evententer); - } - wxWindow::s_lastMouseWindow = currentMouseWindow ; - } + case 81: + keyval = WXK_NUMPAD_EQUAL; + break; - short windowPart = ::FindWindow(ev->where, &window); + case 67: + keyval = WXK_NUMPAD_MULTIPLY; + break; - switch (windowPart) - { - // fixes for setting the cursor back from dominic mazzoni - case inMenuBar : - UMAShowArrowCursor(); - break ; - case inSysWindow : - UMAShowArrowCursor(); - break ; - default: - { - // if ( s_lastMouseDown == 0 ) - // ev->modifiers |= btnState ; - - // Calling GetNextEvent with a zero event mask will always - // pass back a null event. However, it fills the EventRecord - // with the state of the modifier keys. This is needed since - // the modifier state returned by WaitForNextEvent often is - // wrong mouse move events. The attempt above to correct this - // didn't always work (under OS X at least). - - EventRecord tmp; - ::GetNextEvent(0, &tmp); - ev->modifiers = tmp.modifiers; - - wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ; - if ( win ) - win->MacMouseMoved( ev , windowPart ) ; - else - UMAShowArrowCursor(); + case 75: + keyval = WXK_NUMPAD_DIVIDE; + break; - } - break; - } - } - break ; + case 78: + keyval = WXK_NUMPAD_SUBTRACT; + break; - } -} + case 69: + keyval = WXK_NUMPAD_ADD; + break; -void wxApp::MacHandleMenuSelect( int macMenuId , int macMenuItemNum ) -{ - if (macMenuId == 0) - return; // no menu item selected + case 65: + keyval = WXK_NUMPAD_DECIMAL; + break; - if (macMenuId == kwxMacAppleMenuId && macMenuItemNum > 1) - { - #if ! TARGET_CARBON - Str255 deskAccessoryName ; - GrafPtr savedPort ; - - GetMenuItemText(GetMenuHandle(kwxMacAppleMenuId), macMenuItemNum, deskAccessoryName); - GetPort(&savedPort); - OpenDeskAcc(deskAccessoryName); - SetPort(savedPort); - #endif - } - else - { - wxWindow* frontwindow = wxFindWinFromMacWindow( ::FrontWindow() ) ; - if ( frontwindow && wxMenuBar::MacGetInstalledMenuBar() ) - wxMenuBar::MacGetInstalledMenuBar()->MacMenuSelect( frontwindow->GetEventHandler() , 0 , macMenuId , macMenuItemNum ) ; + default: + break; + } // end switch } - HiliteMenu(0); -} -/* -long wxApp::MacTranslateKey(char key, int mods) -{ -} - -void wxApp::MacAdjustCursor() -{ -} + 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 -*/ -/* -void -wxApp::macAdjustCursor() -{ - if (ev->what != kHighLevelEvent) - { - wxWindow* theMacWxFrame = wxFrame::MacFindFrameOrDialog(::FrontWindow()); - if (theMacWxFrame) - { - if (!theMacWxFrame->MacAdjustCursor(ev->where)) - ::SetCursor(&(qd.arrow)); - } - } + event.m_rawCode = keymessage; + event.m_rawFlags = modifiers; + event.m_x = wherex; + event.m_y = wherey; + event.SetTimestamp(when); + event.SetEventObject(focus); } -*/