X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/84c1ffa9cc2aa25b459cb33eaf8b60cd5d8948a9..3c393c0a564ec9197b8441d9c106f46509c99729:/src/mac/carbon/app.cpp?ds=sidebyside diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index eda13dd85a..7f666b955e 100644 --- a/src/mac/carbon/app.cpp +++ b/src/mac/carbon/app.cpp @@ -1,19 +1,19 @@ ///////////////////////////////////////////////////////////////////////////// // 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__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "app.h" #endif -#include "wx/defs.h" +#include "wx/wxprec.h" #include "wx/window.h" #include "wx/frame.h" @@ -36,9 +36,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,14 +49,14 @@ #endif #endif -#include "apprsrc.h" +// #include "apprsrc.h" #include "wx/mac/uma.h" #include "wx/mac/macnotfy.h" #ifdef __DARWIN__ # include -# if defined(WXMAKINGDLL) +# if defined(WXMAKINGDLL_CORE) # include # endif #else @@ -68,21 +67,35 @@ # include #endif -extern char *wxBuffer; extern wxList wxPendingDelete; -extern wxList *wxWinMacWindowList; -extern wxList *wxWinMacControlList; -wxApp *wxTheApp = NULL; +// 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 + +// 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) ; @@ -98,67 +111,142 @@ long wxApp::sm_lastMessageTime = 0; long wxApp::s_lastModifiers = 0 ; -bool wxApp::s_macDefaultEncodingIsPC = true ; bool wxApp::s_macSupportPCMenuShortcuts = true ; long wxApp::s_macAboutMenuItemId = wxID_ABOUT ; -wxString wxApp::s_macHelpMenuTitleName = "&Help" ; +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; +//---------------------------------------------------------------------- +// 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 WXUNUSED(refcon) ) { - // GD: UNUSED wxApp* app = (wxApp*) refcon ; return wxTheApp->MacHandleAEODoc( (AppleEvent*) event , reply) ; } pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) { - // GD: UNUSED wxApp* app = (wxApp*) refcon ; return wxTheApp->MacHandleAEOApp( (AppleEvent*) event , reply ) ; } pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) { - // GD: UNUSED wxApp* app = (wxApp*) refcon ; return wxTheApp->MacHandleAEPDoc( (AppleEvent*) event , reply ) ; } pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) { - // GD: UNUSED wxApp* app = (wxApp*) refcon ; return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ; } -short wxApp::MacHandleAEODoc(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(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 ; + + for (i = 1; i <= itemsInList; i++) + { + wxString fName ; + + FSRef theRef ; + AEGetNthPtr(&docList, i, typeFSRef, &keywd, &returnedType, + (Ptr) & theRef, sizeof(theRef), &actualSize); + fName = wxMacFSRefToPath( &theRef ) ; + + MacOpenFile(fName); + } + return noErr; } -short wxApp::MacHandleAEPDoc(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(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 ) ; + + for (i = 1; i <= itemsInList; i++) { + wxString fName ; + + FSRef theRef ; + AEGetNthPtr(&docList, i, typeFSRef, &keywd, &returnedType, + (Ptr) & theRef, sizeof(theRef), &actualSize); + fName = wxMacFSRefToPath( &theRef ) ; + + MacPrintFile(fName); + } + return noErr; } +// AEOApp calls MacNewFile + short wxApp::MacHandleAEOApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply)) { + MacNewFile() ; return noErr ; } +// 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 { @@ -167,759 +255,576 @@ short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNU 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 ) +// AEROApp calls MacReopenApp + +short wxApp::MacHandleAERApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply)) { - char *c ; - if ( from == to ) - { - for( int i = 0 ; i < len ; ++ i ) - { - c = strchr( StringANSI , *from ) ; - if ( c != NULL ) - { - *to = StringMac[ c - StringANSI] ; - } - ++to ; - ++from ; - } - } - else + MacReopenApp() ; + return noErr ; +} + + + +//---------------------------------------------------------------------- +// 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 ) +{ +#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 ) { - *to = StringMac[ c - StringANSI] ; + wxPrintout *printout = view->OnCreatePrintout(); + if (printout) + { + wxPrinter printer; + printer.Print(view->GetFrame(), printout, true); + delete printout; + } } - else + if (doc->Close()) { - *to = *from ; + doc->DeleteAllViews(); + dm->RemoveDocument(doc) ; } - ++to ; - ++from ; } } +#endif //print + +#endif //docview +} + + + +void wxApp::MacNewFile() +{ } -void wxMacConvertToPC( const char *from , char *to , int len ) +void wxApp::MacReopenApp() { - char *c ; - if ( from == to ) + // 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 ) { - for( int i = 0 ; i < len ; ++ i ) - { - c = strchr( StringMac , *from ) ; - if ( c != NULL ) - { - *to = StringANSI[ c - StringMac] ; - } - ++to ; - ++from ; - } + MacNewFile() ; } else { - for( int i = 0 ; i < len ; ++ i ) + wxTopLevelWindow* firstIconized = NULL ; + while (node) { - c = strchr( StringMac , *from ) ; - if ( c != NULL ) + wxTopLevelWindow* win = (wxTopLevelWindow*) node->GetData(); + if ( win->IsIconized() == false ) { - *to = StringANSI[ c - StringMac] ; + firstIconized = NULL ; + break ; } else { - *to = *from ; + if ( firstIconized == NULL ) + firstIconized = win ; } - ++to ; - ++from ; + node = node->GetNext(); } + if ( firstIconized ) + firstIconized->Iconize( false ) ; } } -void wxMacConvertFromPC( char * p ) -{ - char *ptr = p ; - int len = strlen ( p ) ; - - wxMacConvertFromPC( ptr , ptr , len ) ; -} +//---------------------------------------------------------------------- +// Carbon Event Handler +//---------------------------------------------------------------------- -void wxMacConvertFromPCForControls( char * p ) +static const EventTypeSpec eventList[] = { - char *ptr = p ; - int len = strlen ( p ) ; + { kEventClassCommand, kEventProcessCommand } , + { kEventClassCommand, kEventCommandUpdateStatus } , - wxMacConvertFromPC( ptr , ptr , len ) ; - for ( unsigned int i = 0 ; i < strlen ( ptr ) ; i++ ) - { - if ( ptr[i] == '&' && ptr[i]+1 != ' ' ) - { - memmove( &ptr[i] , &ptr[i+1] , strlen( &ptr[i+1] ) + 1) ; - } - } -} + { kEventClassMenu, kEventMenuOpening }, + { kEventClassMenu, kEventMenuClosed }, + { kEventClassMenu, kEventMenuTargetItem }, -void wxMacConvertFromPC( unsigned char *p ) -{ - char *ptr = (char*) p + 1 ; - int len = p[0] ; + { kEventClassApplication , kEventAppActivated } , + { kEventClassApplication , kEventAppDeactivated } , + // handling the quit event is not recommended by apple + // rather using the quit apple event - which we do - wxMacConvertFromPC( ptr , ptr , len ) ; -} + { kEventClassAppleEvent , kEventAppleEvent } , -extern char *wxBuffer ; + { kEventClassMouse , kEventMouseDown } , + { kEventClassMouse , kEventMouseMoved } , + { kEventClassMouse , kEventMouseUp } , + { kEventClassMouse , kEventMouseDragged } , + { 'WXMC' , 'WXMC' } +} ; -wxString wxMacMakeMacStringFromPC( const char * p ) +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) ; - if ( len >= BUFSIZ + 512 ) + wxMenuItem* item = NULL ; + MenuCommand id = command.commandID ; + // for items we don't really control + if ( id == kHICommandPreferences ) { - buf = new char [len+1] ; - } - - wxMacConvertToPC( ptr , buf , len ) ; - buf[len] = 0 ; + id = wxApp::s_macPreferencesMenuItemId ; - wxString result( buf ) ; - if ( buf != wxBuffer ) - delete buf ; - return result ; -} - -wxString wxMacMakeStringFromMacString( const char* from , bool mac2pcEncoding ) -{ - if (mac2pcEncoding) + 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 ) { - return wxMacMakePCStringFromMac( from ) ; + GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , (UInt32*) &item ) ; } - else + + if ( item ) { - return wxString( from ) ; + switch( cEvent.GetKind() ) + { + case kEventProcessCommand : + { + if (item->IsCheckable()) + { + item->Check( !item->IsChecked() ) ; + } + + item->GetMenu()->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ; + result = noErr ; + } + break ; + case kEventCommandUpdateStatus: + // eventually trigger an updateui round + result = noErr ; + break ; + 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) - { - return wxMacMakePCStringFromMac( s ) ; - } - else + OSStatus result = eventNotHandledErr ; + switch ( GetEventKind( event ) ) { - return wxString( s ) ; + case kEventAppActivated : + { + if ( wxTheApp ) + wxTheApp->SetActive( true , NULL ) ; + result = noErr ; + } + break ; + case kEventAppDeactivated : + { + if ( wxTheApp ) + wxTheApp->SetActive( false , NULL ) ; + result = noErr ; + } + break ; + default : + break ; } + return result ; } -void wxMacStringToPascal( const char * from , StringPtr to , bool pc2macEncoding ) +pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { - if (pc2macEncoding) - { - CopyCStringToPascal( wxMacMakeMacStringFromPC( from ) , to ) ; - } - else + EventRef formerEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ; + EventHandlerCallRef formerEventHandlerCallRef = (EventHandlerCallRef) wxTheApp->MacGetCurrentEventHandlerCallRef() ; + wxTheApp->MacSetCurrentEvent( event , handler ) ; + + OSStatus result = eventNotHandledErr ; + switch( GetEventClass( event ) ) { - CopyCStringToPascal( from , to ) ; + 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 ) ; + + 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 ; + case kEventClassAppleEvent : + { + EventRecord rec ; + wxMacConvertEventToRecord( event , &rec ) ; + result = AEProcessAppleEvent( &rec ) ; + } + break ; + default : + break ; } + + wxTheApp->MacSetCurrentEvent( formerEvent, formerEventHandlerCallRef ) ; + + return result ; } -#if defined(WXMAKINGDLL) && !defined(__DARWIN__) +DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacAppEventHandler ) + +#if defined(WXMAKINGDLL_CORE) && !defined(__DARWIN__) // we know it's there ;-) WXIMPORT char std::__throws_bad_alloc ; #endif -bool wxApp::Initialize() -{ - int error = 0 ; - - // Mac-specific - - UMAInitToolbox( 4 ) ; - SetEventMask( everyEvent ) ; - UMAShowWatchCursor() ; - -#if defined(WXMAKINGDLL) && defined(__DARWIN__) - // open shared library resources from here since we don't have - // __wxinitialize in Mach-O shared libraries - wxStAppResource::OpenSharedLibraryResource(NULL); +#if __WXDEBUG__ + +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 -#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 ) ; +#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 - 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 ) ; + + wxOnAssert(fileNameStr, lineNumber , assertionStr , + wxString::Format( wxT("%s %s value (%p)") ,exceptionStr, errorStr , value ) ) ; #endif +} -#ifndef __DARWIN__ - // test the minimal configuration necessary +#endif //__WXDEBUG__ -# if !TARGET_CARBON - long theSystem ; - long theMachine; +#ifdef __WXMAC_OSX__ +extern "C" { + /* m_macEventPosted run loop source callback: */ + void macPostedEventCallback(void *unused); +} - 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 ; - } - } - */ +void macPostedEventCallback(void *unused) { + wxTheApp->ProcessPendingEvents(); } #endif - // if we encountered any problems so far, give the error code and exit immediately - - if ( error ) - { - wxStAppResource resload ; - short itemHit; - Str255 message; +bool wxApp::Initialize(int& argc, wxChar **argv) +{ + // Mac-specific - GetIndString(message, 128, error); - UMAShowArrowCursor() ; - ParamText("\pFatal Error", message, (ConstStr255Param)"\p", (ConstStr255Param)"\p"); - itemHit = Alert(128, nil); - return FALSE ; - } +#if __WXDEBUG__ + InstallDebugAssertOutputHandler ( NewDebugAssertOutputHandlerUPP( wxMacAssertOutputHandler ) ); +#endif + UMAInitToolbox( 4, sm_isEmbedded ) ; + SetEventMask( everyEvent ) ; + UMAShowWatchCursor() ; #ifndef __DARWIN__ # if __option(profile) - ProfilerInit( collectDetailed, bestTimeBase , 20000 , 40 ) ; + ProfilerInit( collectDetailed, bestTimeBase , 40000 , 50 ) ; # endif #endif #ifndef __DARWIN__ // now avoid exceptions thrown for new (bad_alloc) - std::__throws_bad_alloc = FALSE ; + // FIXME CS for some changes outside wxMac does not compile anymore +#if 0 + std::__throws_bad_alloc = 0 ; +#endif + #endif s_macCursorRgn = ::NewRgn() ; - wxBuffer = new char[BUFSIZ + 512]; + // 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 *)); + } + } - wxClassInfo::InitializeClasses(); + if ( !wxAppBase::Initialize(argc, argv) ) + return false; -#if wxUSE_RESOURCES -// wxGetResource(wxT("wxWindows"), wxT("OsVersion"), &wxOsVersion); +#if wxUSE_INTL + wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); #endif -#if wxUSE_THREADS - wxPendingEventsLocker = new wxCriticalSection; +#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 - wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); - wxTheColourDatabase->Initialize(); - -#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(); + wxMacCreateNotifierTable() ; - // this will flush the old messages if any - delete wxLog::SetActiveTarget(new wxLogStderr); -#endif // wxUSE_LOG +#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 - wxWinMacWindowList = new wxList(wxKEY_INTEGER); - wxWinMacControlList = new wxList(wxKEY_INTEGER); + UMAShowArrowCursor() ; - wxInitializeStockLists(); - wxInitializeStockObjects(); + return true; +} -#if wxUSE_WX_RESOURCES - wxInitializeResourceSystem(); -#endif +AEEventHandlerUPP sODocHandler = NULL ; +AEEventHandlerUPP sOAppHandler = NULL ; +AEEventHandlerUPP sPDocHandler = NULL ; +AEEventHandlerUPP sRAppHandler = NULL ; +AEEventHandlerUPP sQuitHandler = NULL ; - wxBitmap::InitStandardHandlers(); +bool wxApp::OnInitGui() +{ + if( !wxAppBase::OnInitGui() ) + return false ; - wxModule::RegisterModules(); - if (!wxModule::InitializeModules()) { - return FALSE; - } + InstallStandardEventHandler( GetApplicationEventTarget() ) ; - wxMacCreateNotifierTable() ; + if (!sm_isEmbedded) + { + InstallApplicationEventHandler( + GetwxMacAppEventHandlerUPP(), + GetEventTypeCount(eventList), eventList, wxTheApp, (EventHandlerRef *)&(wxTheApp->m_macEventHandler)); + } + if (!sm_isEmbedded) + { + sODocHandler = NewAEEventHandlerUPP(AEHandleODoc) ; + sOAppHandler = NewAEEventHandlerUPP(AEHandleOApp) ; + sPDocHandler = NewAEEventHandlerUPP(AEHandlePDoc) ; + sRAppHandler = NewAEEventHandlerUPP(AEHandleRApp) ; + sQuitHandler = NewAEEventHandlerUPP(AEHandleQuit) ; - UMAShowArrowCursor() ; + 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 ) ; + } - return TRUE; + return true ; } void wxApp::CleanUp() { +#if wxUSE_TOOLTIPS 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(); +#endif - // this will flush the old messages if any - delete wxLog::SetActiveTarget(new wxLogStderr); -#endif // wxUSE_LOG +#ifdef __WXMAC_OSX__ + if (m_macEventPosted) + { + CFRelease(m_macEventPosted); + } + m_macEventPosted = NULL; +#endif // One last chance for pending objects to be cleaned up wxTheApp->DeletePendingObjects(); - wxModule::CleanUpModules(); - -#if wxUSE_WX_RESOURCES - wxCleanUpResourceSystem(); -#endif - - wxDeleteStockObjects() ; - - // Destroy all GDI lists, etc. - wxDeleteStockLists(); - - delete wxTheColourDatabase; - wxTheColourDatabase = NULL; - - wxBitmap::CleanUpHandlers(); - - delete[] wxBuffer; - wxBuffer = NULL; - wxMacDestroyNotifierTable() ; - if (wxWinMacWindowList) { - delete wxWinMacWindowList ; - } - if (wxWinMacControlList) { - delete wxWinMacControlList ; - } - delete wxPendingEvents; - -#if wxUSE_THREADS - delete wxPendingEventsLocker; - // If we don't do the following, we get an apparent memory leak. - ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker(); -#endif - - wxClassInfo::CleanUpClasses(); #ifndef __DARWIN__ # if __option(profile) - ProfilerDump( "\papp.prof" ) ; + ProfilerDump( (StringPtr)"\papp.prof" ) ; ProfilerTerm() ; # endif #endif - delete wxTheApp; - wxTheApp = NULL; + UMACleanupToolbox() ; + if (s_macCursorRgn) { + ::DisposeRgn((RgnHandle)s_macCursorRgn); + } -#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) + if (!sm_isEmbedded) { - wxLogDebug(wxT("There were memory leaks.")); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); + RemoveEventHandler( (EventHandlerRef)(wxTheApp->m_macEventHandler) ); } - // wxDebugContext::SetStream(NULL, NULL); -#endif -#if wxUSE_LOG - // do it as the very last thing because everything else can log messages - delete wxLog::SetActiveTarget(NULL); -#endif // wxUSE_LOG - -#if defined(WXMAKINGDLL) && defined(__DARWIN__) - // close shared library resources from here since we don't have - // __wxterminate in Mach-O shared libraries - wxStAppResource::CloseSharedLibraryResource(); -#endif + if (!sm_isEmbedded) + { + 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 ) ; - UMACleanupToolbox() ; - if (s_macCursorRgn) { - ::DisposeRgn((RgnHandle)s_macCursorRgn); + DisposeAEEventHandlerUPP( sODocHandler ) ; + DisposeAEEventHandlerUPP( sOAppHandler ) ; + DisposeAEEventHandlerUPP( sPDocHandler ) ; + DisposeAEEventHandlerUPP( sRAppHandler ) ; + DisposeAEEventHandlerUPP( sQuitHandler ) ; } - #if 0 - TerminateAE() ; - #endif + wxAppBase::CleanUp(); } //---------------------------------------------------------------------- -// wxEntry +// misc initialization stuff //---------------------------------------------------------------------- -// extern variable for shared library resource id -// need to be able to find it with NSLookupAndBindSymbol -short gSharedLibraryResource = kResFileNotOpened ; +#if defined(WXMAKINGDLL_CORE) && !defined(__DARWIN__) -#if defined(WXMAKINGDLL) && defined(__DARWIN__) -CFBundleRef gSharedLibraryBundle = NULL; -#endif /* WXMAKINGDLL && __DARWIN__ */ - -wxStAppResource::wxStAppResource() -{ - m_currentRefNum = CurResFile() ; - if ( gSharedLibraryResource != kResFileNotOpened ) - { - UseResFile( gSharedLibraryResource ) ; - } -} - -wxStAppResource::~wxStAppResource() -{ - if ( m_currentRefNum != kResFileNotOpened ) - { - UseResFile( m_currentRefNum ) ; - } -} - -void wxStAppResource::OpenSharedLibraryResource(const void *initBlock) -{ - gSharedLibraryResource = kResFileNotOpened; - -#ifdef WXMAKINGDLL - if ( initBlock != NULL ) { - const CFragInitBlock *theInitBlock = (const CFragInitBlock *)initBlock; - FSSpec *fileSpec = NULL; - - if (theInitBlock->fragLocator.where == kDataForkCFragLocator) { - fileSpec = theInitBlock->fragLocator.u.onDisk.fileSpec; - } - else if (theInitBlock->fragLocator.where == kResourceCFragLocator) { - fileSpec = theInitBlock->fragLocator.u.inSegs.fileSpec; - } - - if (fileSpec != NULL) { - gSharedLibraryResource = FSpOpenResFile(fileSpec, fsRdPerm); - } - } - else { -#ifdef __DARWIN__ - // Open the shared library resource file if it is not yet open - NSSymbol theSymbol; - NSModule theModule; - const char *theLibPath; - - gSharedLibraryBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.wxwindows.wxWindows")); - if (gSharedLibraryBundle != NULL) { - // wxWindows has been bundled into a framework - // load the framework resources - - gSharedLibraryResource = CFBundleOpenBundleResourceMap(gSharedLibraryBundle); - } - else { - // wxWindows is a simple dynamic shared library - // load the resources from the data fork of a separate resource file - char *theResPath; - char *theName; - char *theExt; - FSRef theResRef; - OSErr theErr = noErr; - - // get the library path - theSymbol = NSLookupAndBindSymbol("_gSharedLibraryResource"); - theModule = NSModuleForSymbol(theSymbol); - theLibPath = NSLibraryNameForModule(theModule); - - // allocate copy to replace .dylib.* extension with .rsrc - theResPath = strdup(theLibPath); - if (theResPath != NULL) { - theName = strrchr(theResPath, '/'); - if (theName == NULL) { - // no directory elements in path - theName = theResPath; - } - // find ".dylib" shared library extension - theExt = strstr(theName, ".dylib"); - // overwrite extension with ".rsrc" - strcpy(theExt, ".rsrc"); - - wxLogDebug( theResPath ); - - theErr = FSPathMakeRef((UInt8 *) theResPath, &theResRef, false); - if (theErr != noErr) { - // try in current directory (using name only) - theErr = FSPathMakeRef((UInt8 *) theName, &theResRef, false); - } - - // free duplicated resource file path - free(theResPath); - - // open the resource file - if (theErr == noErr) { - theErr = FSOpenResourceFile( &theResRef, 0, NULL, fsRdPerm, - &gSharedLibraryResource); - } - } - } -#endif /* __DARWIN__ */ - } -#endif /* WXMAKINGDLL */ -} - -void wxStAppResource::CloseSharedLibraryResource() -{ -#ifdef WXMAKINGDLL - // Close the shared library resource file - if (gSharedLibraryResource != kResFileNotOpened) { -#ifdef __DARWIN__ - if (gSharedLibraryBundle != NULL) { - CFBundleCloseBundleResourceMap(gSharedLibraryBundle, - gSharedLibraryResource); - gSharedLibraryBundle = NULL; - } - else -#endif /* __DARWIN__ */ - { - CloseResFile(gSharedLibraryResource); - } - gSharedLibraryResource = kResFileNotOpened; - } -#endif /* WXMAKINGDLL */ -} - -#if defined(WXMAKINGDLL) && !defined(__DARWIN__) - -// 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 +// 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 extern "C" { - void __sinit(void); /* (generated by linker) */ + void __sinit(void); /* (generated by linker) */ pascal OSErr __initialize(const CFragInitBlock *theInitBlock); pascal void __terminate(void); } pascal OSErr __wxinitialize(const CFragInitBlock *theInitBlock) { - wxStAppResource::OpenSharedLibraryResource( theInitBlock ) ; return __initialize( theInitBlock ) ; } pascal void __wxterminate(void) { - wxStAppResource::CloseSharedLibraryResource() ; __terminate() ; } -#endif /* WXMAKINGDLL && !__DARWIN__ */ - -int WXDLLEXPORT wxEntryStart( int WXUNUSED(argc), char *WXUNUSED(argv)[] ) -{ - return wxApp::Initialize(); -} - -int WXDLLEXPORT wxEntryInitGui() -{ - return wxTheApp->OnInitGui(); -} - -void WXDLLEXPORT wxEntryCleanup() -{ - wxApp::CleanUp(); -} - -int wxEntry( int argc, char *argv[] , bool enterLoop ) -{ -#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) - { - // 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!") ); - -#ifdef __DARWIN__ - // 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) { - char theArg[6] = ""; - strncpy(theArg, argv[1], 5); - - if (strcmp(theArg, "-psn_") == 0) { - // assume the argument is always the only one and remove it - --argc; - } - } -#else - 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 - - wxTheApp->argc = argc; - wxTheApp->argv = argv; - - // GUI-specific initialization, such as creating an app context. - wxEntryInitGui(); - - // Here frames insert themselves automatically - // into wxTopLevelWindows by getting created - // in OnInit(). - - int retValue = 0; - - 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() - - 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); - } - } - - wxTheApp->OnExit(); - - wxEntryCleanup(); - - return retValue; -} - -#if TARGET_CARBON +#endif /* WXMAKINGDLL_CORE && !__DARWIN__ */ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) { @@ -999,227 +904,82 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) return converted ; } -pascal OSStatus wxMacApplicationEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) -{ - OSStatus result = eventNotHandledErr ; - - EventRecord rec ; - switch ( GetEventClass( event ) ) - { - case kEventClassKeyboard : - if ( wxMacConvertEventToRecord( event , &rec ) ) - { - wxTheApp->MacHandleModifierEvents( &rec ) ; - wxTheApp->MacHandleOneEvent( &rec ) ; - result = noErr ; - } - break ; - case kEventClassTextInput : - if ( wxMacConvertEventToRecord( event , &rec ) ) - { - wxTheApp->MacHandleModifierEvents( &rec ) ; - wxTheApp->MacHandleOneEvent( &rec ) ; - result = noErr ; - } - break ; - default : - break ; - } - return result ; -} - -#endif - -bool wxApp::OnInit() -{ - if ( ! wxAppBase::OnInit() ) - return FALSE ; - -#if 0 // TARGET_CARBON - static const EventTypeSpec eventList[] = - { - { kEventClassKeyboard, kEventRawKeyDown } , - { kEventClassKeyboard, kEventRawKeyRepeat } , - { kEventClassKeyboard, kEventRawKeyUp } , - { kEventClassKeyboard, kEventRawKeyModifiersChanged } , - - { kEventClassTextInput , kEventTextInputUnicodeForKeyEvent } , - } ; - - InstallApplicationEventHandler(NewEventHandlerUPP(wxMacApplicationEventHandler) - , WXSIZEOF(eventList), eventList, this, NULL); -#endif - return TRUE ; -} -// Static member initialization -wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL; - wxApp::wxApp() { - m_topWindow = NULL; - wxTheApp = this; + m_printMode = wxPRINT_WINDOWS; -#if WXWIN_COMPATIBILITY_2_2 - m_wantDebugOutput = TRUE; + m_macCurrentEvent = NULL ; + m_macCurrentEventHandlerCallRef = NULL ; +#ifdef __WXMAC_OSX__ + m_macEventPosted = NULL ; #endif - - argc = 0; - argv = NULL; - - m_printMode = wxPRINT_WINDOWS; - SetExitOnFrameDelete(TRUE); - m_auto3D = TRUE; -} - -bool wxApp::Initialized() -{ - if (GetTopWindow()) - return TRUE; - else - return FALSE; } int wxApp::MainLoop() { - m_keepGoing = TRUE; - - while (m_keepGoing) - { + m_keepGoing = true; +#if wxMAC_USE_RAEL + RunApplicationEventLoop() ; +#else + while (m_keepGoing) + { MacDoOneEvent() ; - } - - return 0; -} - -// Returns TRUE if more time is needed. -bool wxApp::ProcessIdle() -{ - wxIdleEvent event; - event.SetEventObject(this); - ProcessEvent(event); - - return event.MoreRequested(); + } +#endif + return 0; } void wxApp::ExitMainLoop() { - m_keepGoing = FALSE; + m_keepGoing = false; +#if wxMAC_USE_RAEL + QuitApplicationEventLoop() ; +#endif } // Is a message/event pending? bool wxApp::Pending() { - EventRecord event ; - - return EventAvail( everyEvent , &event ) ; + // 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. -void wxApp::Dispatch() +bool wxApp::Dispatch() { MacDoOneEvent() ; + + return true; } 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(); - } +#endif + wxMacWakeUp() ; } -void wxExit() +void wxApp::Exit() { - wxLogError(_("Fatal error: exiting")); - wxApp::CleanUp(); ::ExitToShell() ; } @@ -1227,7 +987,7 @@ void wxExit() void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event)) { if (GetTopWindow()) - GetTopWindow()->Close(TRUE); + GetTopWindow()->Close(true); } // Default behaviour: close the application with prompts. The @@ -1237,7 +997,7 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event) if (GetTopWindow()) { if (!GetTopWindow()->Close(!event.CanVeto())) - event.Veto(TRUE); + event.Veto(true); } } @@ -1251,8 +1011,6 @@ void wxCYield() bool wxApp::Yield(bool onlyIfNeeded) { - static bool s_inYield = FALSE; - if (s_inYield) { if ( !onlyIfNeeded ) @@ -1260,640 +1018,412 @@ bool wxApp::Yield(bool onlyIfNeeded) wxFAIL_MSG( wxT("wxYield called recursively" ) ); } - return FALSE; - } - - s_inYield = TRUE; - -#if wxUSE_THREADS - YieldToAnyThread() ; -#endif - EventRecord event ; - - long sleepTime = 1 ; //::GetCaretTime(); - - while ( !wxTheApp->IsExiting() && WaitNextEvent(everyEvent, &event,sleepTime, (RgnHandle) wxApp::s_macCursorRgn)) - { - wxTheApp->MacHandleModifierEvents( &event ) ; - 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 ) ; + return false; } - wxTheApp->MacHandleModifierEvents( &event ) ; - - wxMacProcessNotifierAndPendingEvents() ; - - s_inYield = FALSE; - return TRUE; -} + s_inYield = true; -// platform specifics + // by definition yield should handle all non-processed events -void wxApp::MacSuspend( bool convertClipboard ) -{ - // we have to deactive the top level windows manually + EventRef theEvent; - wxNode* node = wxTopLevelWindows.First(); - while (node) + OSStatus status = noErr ; + do { - wxTopLevelWindow* win = (wxTopLevelWindow*) node->Data(); - win->MacActivate( MacGetCurrentEvent() , false ) ; + s_inReceiveEvent = true ; + status = ReceiveNextEvent(0, NULL,kEventDurationNoWait,true,&theEvent) ; + s_inReceiveEvent = false ; - node = node->Next(); - } + if ( status == eventLoopTimedOutErr ) + { + // 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); + } + } while( status == noErr ) ; - s_lastMouseDown = 0 ; - if( convertClipboard ) - { - MacConvertPrivateToPublicScrap() ; - } + wxMacProcessNotifierAndPendingEvents() ; + s_inYield = false; - ::HideFloatingWindows() ; + return true; } -extern wxList wxModalDialogs; - -void wxApp::MacResume( bool convertClipboard ) +void wxApp::MacDoOneEvent() { - s_lastMouseDown = 0 ; - if( convertClipboard ) - { - MacConvertPublicToPrivateScrap() ; - } - - ::ShowFloatingWindows() ; + EventRef theEvent; - // raise modal dialogs in case a non modal window was selected to activate the app - - wxNode* node = wxModalDialogs.First(); - while (node) + s_inReceiveEvent = true ; + OSStatus status = ReceiveNextEvent(0, NULL,sleepTime,true,&theEvent) ; + s_inReceiveEvent = false ; + if ( status == eventLoopTimedOutErr ) { - wxDialog* dialog = (wxDialog *) node->Data(); - dialog->Raise(); - - node = node->Next(); + if ( wxTheApp->ProcessIdle() ) + sleepTime = kEventDurationNoWait ; + else + sleepTime = kEventDurationSecond; } -} - -void wxApp::MacConvertPrivateToPublicScrap() -{ -} - -void wxApp::MacConvertPublicToPrivateScrap() -{ -} - -void wxApp::MacDoOneEvent() -{ - EventRecord event ; - - long sleepTime = 1; // GetCaretTime() / 4 ; - - if (WaitNextEvent(everyEvent, &event, sleepTime, (RgnHandle) s_macCursorRgn)) + else if ( status == eventLoopQuitErr ) { - MacHandleModifierEvents( &event ) ; - MacHandleOneEvent( &event ); + // according to QA1061 this may also occur when a WakeUp Process + // is executed } else { - MacHandleModifierEvents( &event ) ; - // idlers - WindowPtr window = ::FrontWindow() ; - if ( window ) - ::IdleControls( window ) ; - - wxTheApp->ProcessIdle() ; + MacHandleOneEvent( theEvent ) ; + ReleaseEvent(theEvent); + sleepTime = kEventDurationNoWait ; } - if ( event.what != kHighLevelEvent ) - SetRectRgn( (RgnHandle) s_macCursorRgn , event.where.h , event.where.v , event.where.h + 1 , event.where.v + 1 ) ; - // repeaters DeletePendingObjects() ; wxMacProcessNotifierAndPendingEvents() ; } -void wxApp::MacHandleModifierEvents( WXEVENTREF evr ) +/*virtual*/ void wxApp::MacHandleUnhandledEvent( WXEVENTREF evr ) { - EventRecord* ev = (EventRecord*) evr ; -#if TARGET_CARBON - if ( ev->what == mouseDown || ev->what == mouseUp || ev->what == activateEvt || - ev->what == keyDown || ev->what == autoKey || ev->what == keyUp || ev->what == nullEvent ) - { - // in these cases the modifiers are already correctly setup by carbon - } - else - { - ev->modifiers = GetCurrentKeyModifiers() ; - } -#endif - if ( ev->modifiers != s_lastModifiers && wxWindow::FindFocus() != NULL ) - { - 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_x = ev->where.h; - event.m_y = ev->where.v; - event.m_timeStamp = ev->when; - wxWindow* focus = wxWindow::FindFocus() ; - event.SetEventObject(focus); - - if ( (ev->modifiers ^ s_lastModifiers ) & controlKey ) - { - event.m_keyCode = WXK_CONTROL ; - event.SetEventType( ( ev->modifiers & controlKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ; - focus->GetEventHandler()->ProcessEvent( event ) ; - } - if ( (ev->modifiers ^ s_lastModifiers ) & shiftKey ) - { - event.m_keyCode = WXK_SHIFT ; - event.SetEventType( ( ev->modifiers & shiftKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ; - focus->GetEventHandler()->ProcessEvent( event ) ; - } - if ( (ev->modifiers ^ s_lastModifiers ) & optionKey ) - { - event.m_keyCode = WXK_ALT ; - event.SetEventType( ( ev->modifiers & optionKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ; - focus->GetEventHandler()->ProcessEvent( event ) ; - } - s_lastModifiers = ev->modifiers ; - } + // Override to process unhandled events as you please } void wxApp::MacHandleOneEvent( WXEVENTREF evr ) { - EventRecord* ev = (EventRecord*) evr ; - m_macCurrentEvent = ev ; - - wxApp::sm_lastMessageTime = ev->when ; - - switch (ev->what) + EventTargetRef theTarget; + theTarget = GetEventDispatcherTarget(); + m_macCurrentEvent = evr ; + OSStatus status = SendEventToEventTarget ((EventRef) evr , theTarget); + if(status == eventNotHandledErr) { - case mouseDown: - MacHandleMouseDownEvent( ev ) ; - if ( ev->modifiers & controlKey ) - s_lastMouseDown = 2; - else - s_lastMouseDown = 1; - break; - case mouseUp: - if ( s_lastMouseDown == 2 ) - { - ev->modifiers |= controlKey ; - } - else - { - ev->modifiers &= ~controlKey ; - } - MacHandleMouseUpEvent( ev ) ; - s_lastMouseDown = 0; - break; - case activateEvt: - MacHandleActivateEvent( ev ) ; - break; - case updateEvt: - MacHandleUpdateEvent( ev ) ; - break; - case keyDown: - case autoKey: - MacHandleKeyDownEvent( ev ) ; - break; - case keyUp: - MacHandleKeyUpEvent( ev ) ; - break; - case diskEvt: - MacHandleDiskEvent( ev ) ; - break; - case osEvt: - MacHandleOSEvent( ev ) ; - break; - case kHighLevelEvent: - MacHandleHighLevelEvent( ev ) ; - break; - default: - break; + MacHandleUnhandledEvent(evr); } wxMacProcessNotifierAndPendingEvents() ; +#if wxUSE_THREADS + wxMutexGuiLeaveOrEnter(); +#endif // wxUSE_THREADS } -void wxApp::MacHandleHighLevelEvent( WXEVENTREF evr ) +long wxMacTranslateKey(unsigned char key, unsigned char code) ; +long wxMacTranslateKey(unsigned char key, unsigned char code) { - EventRecord* ev = (EventRecord*) evr ; - ::AEProcessAppleEvent( ev ) ; -} + long retval = key ; + switch (key) + { + case kHomeCharCode : + retval = WXK_HOME; + break; + + case kEnterCharCode : + retval = WXK_RETURN; + break; + case kEndCharCode : + retval = WXK_END; + break; -bool s_macIsInModalLoop = false ; + case kHelpCharCode : + retval = WXK_HELP; + break; -void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr ) -{ - EventRecord* ev = (EventRecord*) evr ; - wxToolTip::RemoveToolTips() ; + case kBackspaceCharCode : + retval = WXK_BACK; + break; - WindowRef window; - WindowRef frontWindow = ::FrontNonFloatingWindow() ; - WindowAttributes frontWindowAttributes = NULL ; - if ( frontWindow ) - ::GetWindowAttributes( frontWindow , &frontWindowAttributes ) ; + case kTabCharCode : + retval = WXK_TAB; + break; - short windowPart = ::FindWindow(ev->where, &window); - wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ; - if ( wxPendingDelete.Member(win) ) - return ; + case kPageUpCharCode : + retval = WXK_PAGEUP; + break; - BitMap screenBits; - GetQDGlobalsScreenBits( &screenBits ); + case kPageDownCharCode : + retval = WXK_PAGEDOWN; + break; - switch (windowPart) - { - case inMenuBar : - if ( s_macIsInModalLoop ) - { - SysBeep ( 30 ) ; - } - else + case kReturnCharCode : + retval = WXK_RETURN; + break; + + case kFunctionKeyCharCode : + { + switch( code ) { - UInt32 menuresult = MenuSelect(ev->where) ; - MacHandleMenuSelect( HiWord( menuresult ) , LoWord( menuresult ) ); - s_lastMouseDown = 0; + 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; } + } + break ; + + case kEscapeCharCode : + retval = WXK_ESCAPE ; break ; -#if !TARGET_CARBON - case inSysWindow : - SystemClick( ev , window ) ; - s_lastMouseDown = 0; + + case kLeftArrowCharCode : + retval = WXK_LEFT ; 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 kRightArrowCharCode : + retval = WXK_RIGHT ; 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; - - - 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 ; - GrafPtr port ; - GetPort( &port ) ; - Point pt = { 0, 0 } ; - SetPortWindowPort(window) ; - LocalToGlobal( &pt ) ; - SetPort( port ) ; - - GetWindowPortBounds(window, &tempRect ) ; - win->SetSize( pt.h , pt.v , 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 kUpArrowCharCode : + retval = WXK_UP ; 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 kDownArrowCharCode : + retval = WXK_DOWN ; + break ; + + 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) - { - 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 : - { - 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; - } - } - 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 + wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key != + WXK_MBUTTON, wxT("can't use wxGetKeyState() for mouse buttons")); - return retval; +//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 -void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr ) + +bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) { - EventRecord* ev = (EventRecord*) evr ; - wxToolTip::RemoveToolTips() ; + if ( !focus ) + return false ; - UInt32 menuresult = UMAMenuEvent(ev) ; - if ( HiWord( menuresult ) ) + short keycode ; + short keychar ; + keychar = short(keymessage & charCodeMask); + keycode = short(keymessage & keyCodeMask) >> 8 ; + + if ( modifiers & ( controlKey|shiftKey|optionKey ) ) { - if ( !s_macIsInModalLoop ) - MacHandleMenuSelect( HiWord( menuresult ) , LoWord( menuresult ) ) ; - } - else + // 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 ) { - short keycode ; - short keychar ; - keychar = short(ev->message & charCodeMask); - keycode = short(ev->message & keyCodeMask) >> 8 ; - wxWindow* focus = wxWindow::FindFocus() ; - // it is wxWindows Convention to have Ctrl Key Combinations at ASCII char value - if ( (ev->modifiers & controlKey) && keychar >= 0 && keychar < 0x20 ) - { - keychar += 0x40 ; - } - long keyval = wxMacTranslateKey(keychar, keycode) ; + // 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 ( MacSendKeyDownEvent( focus , keyval , ev->modifiers , ev->when , ev->where.h , ev->where.v ) == false ) + // 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) { - // has not been handled -> perform default - wxControl* control = wxDynamicCast( focus , wxControl ) ; - if ( control && control->GetMacControl() != NULL ) - { - ::HandleControlKey( (ControlHandle) control->GetMacControl() , keycode , keychar , ev->modifiers ) ; - } - } + 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 } -} -bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey ) -{ 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 = wxToupper(keyval ); - + 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.m_timeStamp = when; + event.SetTimestamp(when); event.SetEventObject(focus); handled = focus->GetEventHandler()->ProcessEvent( event ) ; if ( handled && event.GetSkipped() ) handled = false ; + +#if wxUSE_ACCEL if ( !handled ) { -#if wxUSE_ACCEL - if (!handled) + wxWindow *ancestor = focus; + while (ancestor) { - wxWindow *ancestor = focus; - while (ancestor) + int command = ancestor->GetAcceleratorTable()->GetCommand( event ); + if (command != -1) { - 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->IsTopLevel()) - break; - ancestor = ancestor->GetParent(); + wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command ); + handled = ancestor->GetEventHandler()->ProcessEvent( command_event ); + break; } + if (ancestor->IsTopLevel()) + break; + ancestor = ancestor->GetParent(); } -#endif // wxUSE_ACCEL } +#endif // wxUSE_ACCEL + if (!handled) { - event.Skip( FALSE ) ; + wxTopLevelWindowMac *tlw = focus->MacGetTopLevelWindow() ; + + 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 ; + } + } + + if ( !handled ) + { + event.Skip( false ) ; event.SetEventType( wxEVT_CHAR ) ; - event.m_keyCode = keyval ; + // raw value again + event.m_keyCode = realkeyval ; handled = focus->GetEventHandler()->ProcessEvent( event ) ; if ( handled && event.GetSkipped() ) handled = false ; } - if ( !handled && - (keyval == WXK_TAB) && -// CS: copied the change below from wxGTK -// VZ: testing for wxTE_PROCESS_TAB shouldn't be done here the control may -// have this style, yet choose not to process this particular TAB in which -// case TAB must still work as a navigational character -#if 0 - (!focus->HasFlag(wxTE_PROCESS_TAB)) && -#endif - (focus->GetParent()) && - (focus->GetParent()->HasFlag( wxTAB_TRAVERSAL)) ) + if ( !handled && (keyval == WXK_TAB) ) { - wxNavigationKeyEvent new_event; - new_event.SetEventObject( focus ); - new_event.SetDirection( !event.ShiftDown() ); - /* 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 ); - if ( handled && new_event.GetSkipped() ) - handled = false ; + wxWindow* iter = focus->GetParent() ; + while( iter && !handled ) + { + if ( iter->HasFlag( wxTAB_TRAVERSAL ) ) + { + wxNavigationKeyEvent new_event; + new_event.SetEventObject( focus ); + new_event.SetDirection( !event.ShiftDown() ); + /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */ + new_event.SetWindowChange( event.ControlDown() ); + new_event.SetCurrentFocus( focus ); + handled = focus->GetParent()->GetEventHandler()->ProcessEvent( new_event ); + 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() ) ) @@ -1913,7 +1443,7 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers 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 ) ) @@ -1927,295 +1457,82 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers return handled ; } - -void wxApp::MacHandleKeyUpEvent( 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 ; - UInt32 menuresult = UMAMenuEvent(ev) ; - if ( HiWord( menuresult ) ) - { - } - else + short keycode ; + short keychar ; + keychar = short(keymessage & charCodeMask); + keycode = short(keymessage & keyCodeMask) >> 8 ; + if ( modifiers & ( controlKey|shiftKey|optionKey ) ) { - short keycode ; - short keychar ; - keychar = short(ev->message & charCodeMask); - keycode = short(ev->message & keyCodeMask) >> 8 ; - // it is wxWindows Convention to have Ctrl Key Combinations at ASCII char value - if ( (ev->modifiers & controlKey) && keychar >= 0 && keychar < 0x20 ) - { - keychar += 0x40 ; - } - long keyval = wxMacTranslateKey(keychar, keycode) ; - - wxWindow* focus = wxWindow::FindFocus() ; - bool handled = MacSendKeyUpEvent( focus , keyval , ev->modifiers , ev->when , ev->where.h , ev->where.v ) ; - // we don't have to do anything under classic here + // 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) ; -bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey ) -{ - bool handled = false ; - if ( focus ) + if ( keyval == keychar ) { - wxKeyEvent event(wxEVT_KEY_UP); - event.m_shiftDown = modifiers & shiftKey; - event.m_controlDown = modifiers & controlKey; - event.m_altDown = modifiers & optionKey; - event.m_metaDown = modifiers & cmdKey; - event.m_keyCode = wxToupper(keyval ); - - event.m_x = wherex; - event.m_y = wherey; - event.m_timeStamp = when; - event.SetEventObject(focus); - handled = focus->GetEventHandler()->ProcessEvent( event ) ; - } - return handled ; -} -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 ) ; + 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 ) ; + 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 } -} -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 - } -} + bool handled = false ; -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; + wxKeyEvent event(wxEVT_KEY_UP); + event.m_shiftDown = modifiers & shiftKey; + event.m_controlDown = modifiers & controlKey; + event.m_altDown = modifiers & optionKey; + event.m_metaDown = modifiers & cmdKey; + event.m_keyCode = keyval ; +#if wxUSE_UNICODE + event.m_uniChar = uniChar ; #endif - bool 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 ; - - 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 ); - eventleave.SetEventObject( wxWindow::s_lastMouseWindow ) ; - - wxWindow::s_lastMouseWindow->GetEventHandler()->ProcessEvent(eventleave); - } - if ( currentMouseWindow ) - { - wxMouseEvent evententer(event); - evententer.SetEventType( wxEVT_ENTER_WINDOW ); - currentMouseWindow->ScreenToClient( &evententer.m_x, &evententer.m_y ); - evententer.SetEventObject( currentMouseWindow ) ; - currentMouseWindow->GetEventHandler()->ProcessEvent(evententer); - } - wxWindow::s_lastMouseWindow = currentMouseWindow ; - } - short windowPart = ::FindWindow(ev->where, &window); - - switch (windowPart) - { - // fixes for setting the cursor back from dominic mazzoni - case inMenuBar : - UMAShowArrowCursor(); - break ; - case inSysWindow : - UMAShowArrowCursor(); - break ; - default: - { - wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ; - if ( win ) - win->MacMouseMoved( ev , windowPart ) ; - else - UMAShowArrowCursor(); - - } - break; - } - } - break ; - - } -} - -void wxApp::MacHandleMenuSelect( int macMenuId , int macMenuItemNum ) -{ - if (macMenuId == 0) - return; // no menu item selected - - 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 ) ; - } - HiliteMenu(0); -} - -/* -long wxApp::MacTranslateKey(char key, int mods) -{ -} - -void wxApp::MacAdjustCursor() -{ -} + 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 ) ; -*/ -/* -void -wxApp::macAdjustCursor() -{ - if (ev->what != kHighLevelEvent) - { - wxWindow* theMacWxFrame = wxFrame::MacFindFrameOrDialog(::FrontWindow()); - if (theMacWxFrame) - { - if (!theMacWxFrame->MacAdjustCursor(ev->where)) - ::SetCursor(&(qd.arrow)); - } - } + return handled ; } -*/