X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58ddb76c39b7c204181f28d9ef14e71466968b1f..f139ea01b8ac0e2048f8b86e7dfe48733934fe64:/src/mac/carbon/app.cpp diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index bee3132deb..49c9ce4655 100644 --- a/src/mac/carbon/app.cpp +++ b/src/mac/carbon/app.cpp @@ -9,11 +9,7 @@ // 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" @@ -49,7 +45,7 @@ #endif #endif -#include "apprsrc.h" +// #include "apprsrc.h" #include "wx/mac/uma.h" #include "wx/mac/macnotfy.h" @@ -71,28 +67,24 @@ extern wxList wxPendingDelete; #if wxUSE_THREADS extern size_t g_numberOfThreads; -#endif // wxUSE_THREADS +#endif // statics for implementation - -static bool s_inYield = FALSE; - -static bool s_inReceiveEvent = FALSE ; +static 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) 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 ; @@ -102,15 +94,14 @@ int wxApp::s_lastMouseDown = 0 ; long wxApp::sm_lastMessageTime = 0; long wxApp::s_lastModifiers = 0 ; - bool wxApp::s_macSupportPCMenuShortcuts = true ; long wxApp::s_macAboutMenuItemId = wxID_ABOUT ; long wxApp::s_macPreferencesMenuItemId = wxID_PREFERENCES ; long wxApp::s_macExitMenuItemId = wxID_EXIT ; wxString wxApp::s_macHelpMenuTitleName = wxT("&Help") ; -// Normally we're not a plugin -bool wxApp::sm_isEmbedded = false; +bool wxApp::sm_isEmbedded = false; // Normally we're not a plugin + //---------------------------------------------------------------------- // Core Apple Event Support //---------------------------------------------------------------------- @@ -155,9 +146,9 @@ short wxApp::MacHandleAEODoc(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply)) DescType returnedType; Size actualSize; long itemsInList; - FSSpec theSpec; OSErr err; short i; + err = AEGetParamDesc((AppleEvent *)event, keyDirectObject, typeAEList,&docList); if (err != noErr) return err; @@ -171,12 +162,19 @@ short wxApp::MacHandleAEODoc(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply)) PSN.lowLongOfPSN = kCurrentProcess ; SetFrontProcess( &PSN ) ; - for (i = 1; i <= itemsInList; i++) { - AEGetNthPtr(&docList, i, typeFSS, &keywd, &returnedType, - (Ptr) & theSpec, sizeof(theSpec), &actualSize); - wxString fName = wxMacFSSpec2MacFilename(&theSpec); + 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; } @@ -189,9 +187,9 @@ short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF WXUNUSED(reply) DescType returnedType; Size actualSize; long itemsInList; - FSSpec theSpec; OSErr err; short i; + err = AEGetParamDesc((AppleEvent *)event, keyDirectObject, typeAEList,&docList); if (err != noErr) return err; @@ -205,12 +203,19 @@ short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF WXUNUSED(reply) PSN.lowLongOfPSN = kCurrentProcess ; SetFrontProcess( &PSN ) ; - for (i = 1; i <= itemsInList; i++) { - AEGetNthPtr(&docList, i, typeFSS, &keywd, &returnedType, - (Ptr) & theSpec, sizeof(theSpec), &actualSize); - wxString fName = wxMacFSSpec2MacFilename(&theSpec); + 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; } @@ -231,12 +236,13 @@ short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNU { wxCommandEvent exitEvent(wxEVT_COMMAND_MENU_SELECTED, s_macExitMenuItemId); if (!win->ProcessEvent(exitEvent)) - win->Close(TRUE ) ; + win->Close(true) ; } else { ExitMainLoop() ; } + return noErr ; } @@ -245,23 +251,29 @@ short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNU short wxApp::MacHandleAERApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply)) { MacReopenApp() ; + return noErr ; } - //---------------------------------------------------------------------- // Support Routines linking the Mac...File Calls to the Document Manager //---------------------------------------------------------------------- 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 ) { @@ -269,16 +281,17 @@ void wxApp::MacPrintFile(const wxString & fileName ) if ( doc ) { wxView* view = doc->GetFirstView() ; - if( view ) + if ( view ) { wxPrintout *printout = view->OnCreatePrintout(); if (printout) { wxPrinter printer; - printer.Print(view->GetFrame(), printout, TRUE); + printer.Print(view->GetFrame(), printout, true); delete printout; } } + if (doc->Close()) { doc->DeleteAllViews(); @@ -286,15 +299,189 @@ void wxApp::MacPrintFile(const wxString & fileName ) } } } +#endif //print + +#endif //docview } + + void wxApp::MacNewFile() { } void wxApp::MacReopenApp() { - // eventually check for open docs, if none, call MacNewFile + // 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 + { + wxTopLevelWindow* firstIconized = NULL ; + while (node) + { + wxTopLevelWindow* win = (wxTopLevelWindow*) node->GetData(); + if ( !win->IsIconized() ) + { + firstIconized = NULL ; + break ; + } + else + { + if ( firstIconized == NULL ) + firstIconized = win ; + } + + node = node->GetNext(); + } + + if ( firstIconized ) + firstIconized->Iconize( false ) ; + } +} + +//---------------------------------------------------------------------- +// Macintosh CommandID support - converting between native and wx IDs +//---------------------------------------------------------------------- + +// if no native match they just return the passed-in id + +struct IdPair +{ + UInt32 macId ; + int wxId ; +} ; + +IdPair gCommandIds [] = +{ + { kHICommandCut , wxID_CUT } , + { kHICommandCopy , wxID_COPY } , + { kHICommandPaste , wxID_PASTE } , + { kHICommandSelectAll , wxID_SELECTALL } , + { kHICommandClear , wxID_CLEAR } , + { kHICommandUndo , wxID_UNDO } , + { kHICommandRedo , wxID_REDO } , +} ; + +int wxMacCommandToId( UInt32 macCommandId ) +{ + int wxid = 0 ; + + switch ( macCommandId ) + { + case kHICommandPreferences : + wxid = wxApp::s_macPreferencesMenuItemId ; + break ; + + case kHICommandQuit : + wxid = wxApp::s_macExitMenuItemId ; + break ; + + case kHICommandAbout : + wxid = wxApp::s_macAboutMenuItemId ; + break ; + + default : + { + for ( size_t i = 0 ; i < WXSIZEOF(gCommandIds) ; ++i ) + { + if ( gCommandIds[i].macId == macCommandId ) + { + wxid = gCommandIds[i].wxId ; + break ; + } + } + } + break ; + } + + if ( wxid == 0 ) + wxid = (int) macCommandId ; + + return wxid ; +} + +UInt32 wxIdToMacCommand( int wxId ) +{ + UInt32 macId = 0 ; + + if ( wxId == wxApp::s_macPreferencesMenuItemId ) + macId = kHICommandPreferences ; + else if (wxId == wxApp::s_macExitMenuItemId) + macId = kHICommandQuit ; + else if (wxId == wxApp::s_macAboutMenuItemId) + macId = kHICommandAbout ; + else + { + for ( size_t i = 0 ; i < WXSIZEOF(gCommandIds) ; ++i ) + { + if ( gCommandIds[i].wxId == wxId ) + { + macId = gCommandIds[i].macId ; + break ; + } + } + } + + if ( macId == 0 ) + macId = (int) wxId ; + + return macId ; +} + +wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item ) +{ + wxMenu* itemMenu = NULL ; + int id = 0 ; + + // for 'standard' commands which don't have a wx-menu + if ( command.commandID == kHICommandPreferences || command.commandID == kHICommandQuit || command.commandID == kHICommandAbout ) + { + id = wxMacCommandToId( command.commandID ) ; + + wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ; + if ( mbar ) + item = mbar->FindItem( id , &itemMenu ) ; + } + else if ( command.commandID != 0 && command.menu.menuRef != 0 && command.menu.menuItemIndex != 0 ) + { + id = wxMacCommandToId( command.commandID ) ; + // make sure it is one of our own menus, or of the 'synthetic' apple and help menus , otherwise don't touch + MenuItemIndex firstUserHelpMenuItem ; + static MenuHandle mh = NULL ; + if ( mh == NULL ) + { + if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) != noErr ) + mh = NULL ; + } + + // is it part of the application or the Help menu, then look for the id directly + if ( ( GetMenuHandle( kwxMacAppleMenuId ) != NULL && command.menu.menuRef == GetMenuHandle( kwxMacAppleMenuId ) ) || + ( mh != NULL && command.menu.menuRef == mh ) ) + { + wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ; + if ( mbar ) + item = mbar->FindItem( id , &itemMenu ) ; + } + else + { + UInt32 refCon ; + + GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , &refCon ) ; + itemMenu = wxFindMenuFromMacMenu( command.menu.menuRef ) ; + if ( itemMenu != NULL ) + item = (wxMenuItem*) refCon ; + } + } + + return itemMenu ; } //---------------------------------------------------------------------- @@ -327,54 +514,52 @@ static const EventTypeSpec eventList[] = static pascal OSStatus wxMacAppMenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { - wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar(); - - if ( mbar ) + wxMacCarbonEvent cEvent( event ) ; + MenuRef menuRef = cEvent.GetParameter(kEventParamDirectObject) ; + wxMenu* menu = wxFindMenuFromMacMenu( menuRef ) ; + + if ( menu ) { - wxFrame* win = mbar->GetFrame(); - if ( win ) + wxEventType type=0; + MenuCommand cmd=0; + switch (GetEventKind(event)) { - - // VZ: we could find the menu from its handle here by examining all - // the menus in the menu bar recursively but knowing that neither - // wxMSW nor wxGTK do it why bother... - #if 0 - MenuRef menuRef; - - GetEventParameter(event, - kEventParamDirectObject, - typeMenuRef, NULL, - sizeof(menuRef), NULL, - &menuRef); - #endif // 0 - - 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: - type = wxEVT_MENU_HIGHLIGHT; - GetEventParameter(event, kEventParamMenuCommand, - typeMenuCommand, NULL, - sizeof(cmd), NULL, &cmd); - if (cmd == 0) return eventNotHandledErr; - break; - default: - wxFAIL_MSG(wxT("Unexpected menu event kind")); - break; - } + case kEventMenuOpening: + type = wxEVT_MENU_OPEN; + break; + + case kEventMenuClosed: + type = wxEVT_MENU_CLOSE; + break; - wxMenuEvent wxevent(type, cmd); - wxevent.SetEventObject(win); + case kEventMenuTargetItem: + cmd = cEvent.GetParameter(kEventParamMenuCommand,typeMenuCommand) ; + if (cmd != 0) + type = wxEVT_MENU_HIGHLIGHT; + break; - (void)win->GetEventHandler()->ProcessEvent(wxevent); + default: + wxFAIL_MSG(wxT("Unexpected menu event kind")); + break; } + + if ( type ) + { + wxMenuEvent wxevent(type, cmd, menu); + wxevent.SetEventObject(menu); + + wxEvtHandler* handler = menu->GetEventHandler(); + if (handler && handler->ProcessEvent(wxevent)) + { + // handled + } + else + { + wxWindow *win = menu->GetInvokingWindow(); + if (win) + win->GetEventHandler()->ProcessEvent(wxevent); + } + } } return eventNotHandledErr; @@ -386,52 +571,80 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler HICommand command ; - GetEventParameter( event, kEventParamDirectObject, typeHICommand, NULL, - sizeof( HICommand ), NULL, &command ); + wxMacCarbonEvent cEvent( event ) ; + cEvent.GetParameter(kEventParamDirectObject,typeHICommand,&command) ; - MenuCommand id = command.commandID ; - if ( id == kHICommandPreferences ) - id = wxApp::s_macPreferencesMenuItemId ; - - wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ; - wxMenu* menu = NULL ; wxMenuItem* item = NULL ; + wxMenu* itemMenu = wxFindMenuFromMacCommand( command , item ) ; + int id = wxMacCommandToId( command.commandID ) ; - if ( mbar ) + if ( item ) { - item = mbar->FindItem( id , &menu ) ; - // it is not 100 % sure that an menu of id 0 is really ours, safety check - if ( id == 0 && menu != NULL && menu->GetHMenu() != command.menu.menuRef ) + wxASSERT( itemMenu != NULL ) ; + + switch ( cEvent.GetKind() ) { - item = NULL ; - menu = NULL ; - } - } - - if ( item == NULL || menu == NULL || mbar == NULL ) - return result ; - - switch( GetEventKind( event ) ) - { - case kEventProcessCommand : - { + case kEventProcessCommand : + { if (item->IsCheckable()) - { item->Check( !item->IsChecked() ) ; - } - menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ; - result = noErr ; + if ( itemMenu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ) + result = noErr ; } - break ; + break ; + case kEventCommandUpdateStatus: - // eventually trigger an updateui round - result = noErr ; + { + wxUpdateUIEvent event(id); + event.SetEventObject( itemMenu ); + + bool processed = false; + + // Try the menu's event handler + { + wxEvtHandler *handler = itemMenu->GetEventHandler(); + if ( handler ) + processed = handler->ProcessEvent(event); + } + + // Try the window the menu was popped up from + // (and up through the hierarchy) + if ( !processed ) + { + const wxMenuBase *menu = itemMenu; + while ( menu ) + { + wxWindow *win = menu->GetInvokingWindow(); + if ( win ) + { + processed = win->GetEventHandler()->ProcessEvent(event); + break; + } + + menu = menu->GetParent(); + } + } + + if ( processed ) + { + // if anything changed, update the changed attribute + if (event.GetSetText()) + itemMenu->SetLabel(id, event.GetText()); + if (event.GetSetChecked()) + itemMenu->Check(id, event.GetChecked()); + if (event.GetSetEnabled()) + itemMenu->Enable(id, event.GetEnabled()); + + result = noErr ; + } + } break ; - default : - break ; - } + default : + break ; + } + } return result ; } @@ -441,53 +654,74 @@ static pascal OSStatus wxMacAppApplicationEventHandler( EventHandlerCallRef hand switch ( GetEventKind( event ) ) { case kEventAppActivated : - { - if ( wxTheApp ) - wxTheApp->SetActive( true , NULL ) ; - result = noErr ; - } + if ( wxTheApp ) + wxTheApp->SetActive( true , NULL ) ; + result = noErr ; break ; + case kEventAppDeactivated : - { - if ( wxTheApp ) - wxTheApp->SetActive( false , NULL ) ; - result = noErr ; - } + if ( wxTheApp ) + wxTheApp->SetActive( false , NULL ) ; + result = noErr ; break ; + default : break ; } + return result ; } pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { + EventRef formerEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ; + EventHandlerCallRef formerEventHandlerCallRef = (EventHandlerCallRef) wxTheApp->MacGetCurrentEventHandlerCallRef() ; + wxTheApp->MacSetCurrentEvent( event , handler ) ; + OSStatus result = eventNotHandledErr ; - switch( GetEventClass( event ) ) + switch ( GetEventClass( event ) ) { case kEventClassCommand : result = wxMacAppCommandEventHandler( handler , event , data ) ; break ; + case kEventClassApplication : result = wxMacAppApplicationEventHandler( handler , event , data ) ; break ; + case kEventClassMenu : result = wxMacAppMenuEventHandler( handler , event , data ) ; break ; + case kEventClassMouse : - result = wxMacTopLevelMouseEventHandler( handler , event , NULL ) ; + { + 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 ; } @@ -498,8 +732,10 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacAppEventHandler ) WXIMPORT char std::__throws_bad_alloc ; #endif -pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 options, - const char *assertionString, const char *exceptionLabelString, +#ifdef __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 @@ -507,6 +743,7 @@ pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 op wxString assertionStr ; wxString exceptionStr ; wxString errorStr ; + #if wxUSE_UNICODE fileNameStr = wxString(fileName, wxConvLocal); assertionStr = wxString(assertionString, wxConvLocal); @@ -521,36 +758,46 @@ pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 op #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(), + 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 wxOnAssert(fileNameStr, lineNumber , assertionStr , - wxString::Format( wxT("%s %s value (%p)") ,exceptionStr, errorStr , value ) ) ; + wxString::Format( wxT("%s %s value (%p)") , exceptionStr, errorStr , value ) ) ; #endif } +#endif //__WXDEBUG__ + +#ifdef __WXMAC_OSX__ +extern "C" +{ + // m_macEventPosted run loop source callback: + void macPostedEventCallback(void *unused); +} + +void macPostedEventCallback(void *unused) +{ + wxTheApp->ProcessPendingEvents(); +} +#endif + bool wxApp::Initialize(int& argc, wxChar **argv) { // Mac-specific -#if __WXDEBUG__ - InstallDebugAssertOutputHandler ( NewDebugAssertOutputHandlerUPP( wxMacAssertOutputHandler ) ); +#ifdef __WXDEBUG__ + InstallDebugAssertOutputHandler( NewDebugAssertOutputHandlerUPP( wxMacAssertOutputHandler ) ); #endif + UMAInitToolbox( 4, sm_isEmbedded ) ; SetEventMask( everyEvent ) ; UMAShowWatchCursor() ; -#if defined(WXMAKINGDLL_CORE) && defined(__DARWIN__) - // open shared library resources from here since we don't have - // __wxinitialize in Mach-O shared libraries - wxStAppResource::OpenSharedLibraryResource(NULL); -#endif - #ifndef __DARWIN__ # if __option(profile) ProfilerInit( collectDetailed, bestTimeBase , 40000 , 50 ) ; @@ -590,17 +837,46 @@ bool wxApp::Initialize(int& argc, wxChar **argv) wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); #endif +#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 wxMacCreateNotifierTable() ; +#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 + UMAShowArrowCursor() ; return true; } +AEEventHandlerUPP sODocHandler = NULL ; +AEEventHandlerUPP sOAppHandler = NULL ; +AEEventHandlerUPP sPDocHandler = NULL ; +AEEventHandlerUPP sRAppHandler = NULL ; +AEEventHandlerUPP sQuitHandler = NULL ; + bool wxApp::OnInitGui() { - if( !wxAppBase::OnInitGui() ) + if ( !wxAppBase::OnInitGui() ) return false ; InstallStandardEventHandler( GetApplicationEventTarget() ) ; @@ -614,29 +890,38 @@ bool wxApp::OnInitGui() if (!sm_isEmbedded) { + sODocHandler = NewAEEventHandlerUPP(AEHandleODoc) ; + sOAppHandler = NewAEEventHandlerUPP(AEHandleOApp) ; + sPDocHandler = NewAEEventHandlerUPP(AEHandlePDoc) ; + sRAppHandler = NewAEEventHandlerUPP(AEHandleRApp) ; + sQuitHandler = NewAEEventHandlerUPP(AEHandleQuit) ; + AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments , - NewAEEventHandlerUPP(AEHandleODoc) , - 0 , FALSE ) ; + sODocHandler , 0 , FALSE ) ; AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , - NewAEEventHandlerUPP(AEHandleOApp) , - 0 , FALSE ) ; + sOAppHandler , 0 , FALSE ) ; AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments , - NewAEEventHandlerUPP(AEHandlePDoc) , - 0 , FALSE ) ; + sPDocHandler , 0 , FALSE ) ; AEInstallEventHandler( kCoreEventClass , kAEReopenApplication , - NewAEEventHandlerUPP(AEHandleRApp) , - 0 , FALSE ) ; + sRAppHandler , 0 , FALSE ) ; AEInstallEventHandler( kCoreEventClass , kAEQuitApplication , - NewAEEventHandlerUPP(AEHandleQuit) , - 0 , FALSE ) ; + sQuitHandler , 0 , FALSE ) ; } - return TRUE ; + return true ; } void wxApp::CleanUp() { +#if wxUSE_TOOLTIPS wxToolTip::RemoveToolTips() ; +#endif + +#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(); @@ -650,20 +935,32 @@ void wxApp::CleanUp() # endif #endif -#if defined(WXMAKINGDLL_CORE) && defined(__DARWIN__) - // close shared library resources from here since we don't have - // __wxterminate in Mach-O shared libraries - wxStAppResource::CloseSharedLibraryResource(); -#endif - UMACleanupToolbox() ; - if (s_macCursorRgn) { + if (s_macCursorRgn) ::DisposeRgn((RgnHandle)s_macCursorRgn); - } - #if 0 - TerminateAE() ; - #endif + if (!sm_isEmbedded) + RemoveEventHandler( (EventHandlerRef)(wxTheApp->m_macEventHandler) ); + + 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 ) ; + + DisposeAEEventHandlerUPP( sODocHandler ) ; + DisposeAEEventHandlerUPP( sOAppHandler ) ; + DisposeAEEventHandlerUPP( sPDocHandler ) ; + DisposeAEEventHandlerUPP( sRAppHandler ) ; + DisposeAEEventHandlerUPP( sQuitHandler ) ; + } wxAppBase::CleanUp(); } @@ -672,174 +969,26 @@ void wxApp::CleanUp() // 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__) -CFBundleRef gSharedLibraryBundle = NULL; -#endif /* WXMAKINGDLL_CORE && __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_CORE - 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 - wxString theResPath; - wxString theName; - FSRef theResRef; - OSErr theErr = noErr; - - // get the library path - theSymbol = NSLookupAndBindSymbol("_gSharedLibraryResource"); - theModule = NSModuleForSymbol(theSymbol); - theLibPath = NSLibraryNameForModule(theModule); - - // if we call wxLogDebug from here then, as wxTheApp hasn't been - // created yet when we're called from wxApp::Initialize(), wxLog - // is going to create a default stderr-based log target instead of - // the expected normal GUI one -- don't do it, if we really want - // to see this message just use fprintf() here -#if 0 - wxLogDebug( wxT("wxMac library installation name is '%s'"), - theLibPath ); -#endif - - // allocate copy to replace .dylib.* extension with .rsrc - if (theLibPath != NULL) { -#if wxUSE_UNICODE - theResPath = wxString(theLibPath, wxConvLocal); -#else - theResPath = wxString(theLibPath); -#endif - // replace '_core' with '' in case of multi-lib build - theResPath.Replace(wxT("_core"), wxEmptyString); - // replace ".dylib" shared library extension with ".rsrc" - theResPath.Replace(wxT(".dylib"), wxT(".rsrc")); - // Find the begining of the filename - theName = theResPath.AfterLast('/'); - -#if 0 - wxLogDebug( wxT("wxMac resources file name is '%s'"), - theResPath.mb_str() ); -#endif - - theErr = FSPathMakeRef((UInt8 *) theResPath.mb_str(), &theResRef, false); - if (theErr != noErr) { - // try in current directory (using name only) - theErr = FSPathMakeRef((UInt8 *) theName.mb_str(), &theResRef, false); - } - - // open the resource file - if (theErr == noErr) { - theErr = FSOpenResourceFile( &theResRef, 0, NULL, fsRdPerm, - &gSharedLibraryResource); - } - if (theErr != noErr) { -#ifdef __WXDEBUG__ - wxLogDebug( wxT("unable to open wxMac resource file '%s'\n"), - theResPath.mb_str() ); -#endif // __WXDEBUG__ - } - - } - } -#endif /* __DARWIN__ */ - } -#endif /* WXMAKINGDLL_CORE */ -} - -void wxStAppResource::CloseSharedLibraryResource() -{ -#ifdef WXMAKINGDLL_CORE - // 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_CORE */ -} - #if defined(WXMAKINGDLL_CORE) && !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 -extern "C" { - void __sinit(void); /* (generated by linker) */ +extern "C" +{ + void __sinit(void); // (generated by linker) pascal OSErr __initialize(const CFragInitBlock *theInitBlock); pascal void __terminate(void); } pascal OSErr __wxinitialize(const CFragInitBlock *theInitBlock) { - wxStAppResource::OpenSharedLibraryResource( theInitBlock ) ; return __initialize( theInitBlock ) ; } pascal void __wxterminate(void) { - wxStAppResource::CloseSharedLibraryResource() ; __terminate() ; } @@ -847,33 +996,39 @@ pascal void __wxterminate(void) bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) { - bool converted = ConvertEventRefToEventRecord( event,rec) ; OSStatus err = noErr ; + bool converted = ConvertEventRefToEventRecord( event, rec) ; + if ( !converted ) { - switch( GetEventClass( event ) ) + switch ( GetEventClass( event ) ) { case kEventClassKeyboard : { converted = true ; - switch( GetEventKind(event) ) + switch ( GetEventKind(event) ) { case kEventRawKeyDown : rec->what = keyDown ; break ; + case kEventRawKeyRepeat : rec->what = autoKey ; break ; + case kEventRawKeyUp : rec->what = keyUp ; break ; + case kEventRawKeyModifiersChanged : rec->what = nullEvent ; break ; + default : converted = false ; break ; } + if ( converted ) { UInt32 keyCode ; @@ -889,19 +1044,23 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) } } break ; + case kEventClassTextInput : { - switch( GetEventKind( event ) ) + switch ( GetEventKind( event ) ) { case kEventTextInputUnicodeForKeyEvent : { EventRef rawEvent ; - err = GetEventParameter( event , kEventParamTextInputSendKeyboardEvent ,typeEventRef,NULL,sizeof(rawEvent),NULL,&rawEvent ) ; + err = GetEventParameter( + event, kEventParamTextInputSendKeyboardEvent, typeEventRef, NULL, + sizeof(rawEvent), NULL, &rawEvent ) ; converted = true ; + { - UInt32 keyCode ; + UInt32 keyCode, modifiers; unsigned char charCode ; - UInt32 modifiers ; + GetMouse( &rec->where) ; rec->what = keyDown ; err = GetEventParameter(rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, 4, NULL, &modifiers); @@ -911,12 +1070,16 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) rec->message = (keyCode << 8 ) + charCode ; } } - break ; + break ; + default : break ; } } break ; + + default : + break ; } } @@ -925,44 +1088,14 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) wxApp::wxApp() { - m_printMode = wxPRINT_WINDOWS; + m_printMode = wxPRINT_WINDOWS; - m_macCurrentEvent = NULL ; - m_macCurrentEventHandlerCallRef = NULL ; -} - -int wxApp::MainLoop() -{ - m_keepGoing = TRUE; + m_macCurrentEvent = NULL ; + m_macCurrentEventHandlerCallRef = NULL ; - while (m_keepGoing) - { - MacDoOneEvent() ; - } - - return 0; -} - -void wxApp::ExitMainLoop() -{ - m_keepGoing = FALSE; -} - -// Is a message/event pending? -bool wxApp::Pending() -{ - // without the receive event (with pull param = false ) nothing is ever reported - EventRef theEvent; - ReceiveNextEvent (0, NULL, kEventDurationNoWait, false, &theEvent); - return GetNumEventsInQueue( GetMainEventQueue() ) > 0 ; -} - -// Dispatch a message. -bool wxApp::Dispatch() -{ - MacDoOneEvent() ; - - return true; +#ifdef __WXMAC_OSX__ + m_macEventPosted = NULL ; +#endif } void wxApp::OnIdle(wxIdleEvent& event) @@ -974,25 +1107,26 @@ void wxApp::OnIdle(wxIdleEvent& event) // wxPostEvent() functions wxMacProcessNotifierAndPendingEvents(); - if(!wxMenuBar::MacGetInstalledMenuBar() && wxMenuBar::MacGetCommonMenuBar()) + if (!wxMenuBar::MacGetInstalledMenuBar() && wxMenuBar::MacGetCommonMenuBar()) wxMenuBar::MacGetCommonMenuBar()->MacInstallMenuBar(); } void wxApp::WakeUpIdle() { - wxMacWakeUp() ; -} +#ifdef __WXMAC_OSX__ + if (m_macEventPosted) + { + CFRunLoopSourceSignal(m_macEventPosted); + } +#endif -void wxApp::Exit() -{ - 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 @@ -1002,7 +1136,7 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event) if (GetTopWindow()) { if (!GetTopWindow()->Close(!event.CanVeto())) - event.Veto(TRUE); + event.Veto(true); } } @@ -1023,20 +1157,18 @@ 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 // by definition yield should handle all non-processed events EventRef theEvent; OSStatus status = noErr ; - do + + while ( status == noErr ) { s_inReceiveEvent = true ; status = ReceiveNextEvent(0, NULL,kEventDurationNoWait,true,&theEvent) ; @@ -1057,12 +1189,12 @@ bool wxApp::Yield(bool onlyIfNeeded) MacHandleOneEvent( theEvent ) ; ReleaseEvent(theEvent); } - } while( status == noErr ) ; + } wxMacProcessNotifierAndPendingEvents() ; - s_inYield = FALSE; + s_inYield = false; - return TRUE; + return true; } void wxApp::MacDoOneEvent() @@ -1070,36 +1202,28 @@ void wxApp::MacDoOneEvent() EventRef theEvent; s_inReceiveEvent = true ; - OSStatus status = ReceiveNextEvent(0, NULL,sleepTime,true,&theEvent) ; + OSStatus status = ReceiveNextEvent(0, NULL, sleepTime, true, &theEvent) ; s_inReceiveEvent = false ; - if ( status == eventLoopTimedOutErr ) + + switch (status) { - if ( wxTheApp->ProcessIdle() ) - sleepTime = kEventDurationNoWait ; - else - { -#if wxUSE_THREADS - if (g_numberOfThreads) - { - sleepTime = kEventDurationNoWait; - } + case eventLoopTimedOutErr : + if ( wxTheApp->ProcessIdle() ) + sleepTime = kEventDurationNoWait ; else -#endif // wxUSE_THREADS - { sleepTime = kEventDurationSecond; - } - } - } - else if ( status == eventLoopQuitErr ) - { - // according to QA1061 this may also occur when a WakeUp Process - // is executed - } - else - { - MacHandleOneEvent( theEvent ) ; - ReleaseEvent(theEvent); - sleepTime = kEventDurationNoWait ; + break; + + 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 @@ -1107,9 +1231,10 @@ void wxApp::MacDoOneEvent() wxMacProcessNotifierAndPendingEvents() ; } -/*virtual*/ void wxApp::MacHandleUnhandledEvent( WXEVENTREF evr ) +// virtual +void wxApp::MacHandleUnhandledEvent( WXEVENTREF evr ) { - // Override to process unhandled events as you please + // Override to process unhandled events as you please } void wxApp::MacHandleOneEvent( WXEVENTREF evr ) @@ -1117,12 +1242,16 @@ void wxApp::MacHandleOneEvent( WXEVENTREF evr ) EventTargetRef theTarget; theTarget = GetEventDispatcherTarget(); m_macCurrentEvent = evr ; - OSStatus status = SendEventToEventTarget ((EventRef) evr , theTarget); - if(status == eventNotHandledErr) - { + + OSStatus status = SendEventToEventTarget((EventRef) evr , theTarget); + if (status == eventNotHandledErr) MacHandleUnhandledEvent(evr); - } + wxMacProcessNotifierAndPendingEvents() ; + +#if wxUSE_THREADS + wxMutexGuiLeaveOrEnter(); +#endif // wxUSE_THREADS } long wxMacTranslateKey(unsigned char key, unsigned char code) ; @@ -1132,102 +1261,135 @@ long wxMacTranslateKey(unsigned char key, unsigned char code) switch (key) { case kHomeCharCode : - retval = WXK_HOME; - break; + retval = WXK_HOME; + break; + case kEnterCharCode : - retval = WXK_RETURN; - break; + retval = WXK_RETURN; + break; case kEndCharCode : - retval = WXK_END; - break; + retval = WXK_END; + break; + case kHelpCharCode : - retval = WXK_HELP; - break; + retval = WXK_HELP; + break; + case kBackspaceCharCode : - retval = WXK_BACK; - break; + retval = WXK_BACK; + break; + case kTabCharCode : - retval = WXK_TAB; - break; + retval = WXK_TAB; + break; + case kPageUpCharCode : - retval = WXK_PAGEUP; - break; + retval = WXK_PAGEUP; + break; + case kPageDownCharCode : - retval = WXK_PAGEDOWN; - break; + retval = WXK_PAGEDOWN; + break; + case kReturnCharCode : - retval = WXK_RETURN; - break; - case kFunctionKeyCharCode : + retval = WXK_RETURN; + break; + + case kFunctionKeyCharCode : + { + switch ( code ) { - switch( code ) - { - case 0x7a : - retval = WXK_F1 ; - break; - case 0x78 : - retval = WXK_F2 ; - break; - case 0x63 : - retval = WXK_F3 ; - break; - case 0x76 : - retval = WXK_F4 ; - break; - case 0x60 : - retval = WXK_F5 ; - break; - case 0x61 : - retval = WXK_F6 ; - break; - case 0x62: - retval = WXK_F7 ; - break; - case 0x64 : - retval = WXK_F8 ; - break; - case 0x65 : - retval = WXK_F9 ; - break; - case 0x6D : - retval = WXK_F10 ; - break; - case 0x67 : - retval = WXK_F11 ; - break; - case 0x6F : - retval = WXK_F12 ; - break; - case 0x69 : - retval = WXK_F13 ; - break; - case 0x6B : - retval = WXK_F14 ; - break; - case 0x71 : - retval = WXK_F15 ; - break; - } + case 0x7a : + retval = WXK_F1 ; + break; + + case 0x78 : + retval = WXK_F2 ; + break; + + case 0x63 : + retval = WXK_F3 ; + break; + + case 0x76 : + retval = WXK_F4 ; + break; + + case 0x60 : + retval = WXK_F5 ; + break; + + case 0x61 : + retval = WXK_F6 ; + break; + + case 0x62: + retval = WXK_F7 ; + break; + + case 0x64 : + retval = WXK_F8 ; + break; + + case 0x65 : + retval = WXK_F9 ; + break; + + case 0x6D : + retval = WXK_F10 ; + break; + + case 0x67 : + retval = WXK_F11 ; + break; + + case 0x6F : + retval = WXK_F12 ; + break; + + case 0x69 : + retval = WXK_F13 ; + break; + + case 0x6B : + retval = WXK_F14 ; + break; + + case 0x71 : + retval = WXK_F15 ; + break; + + default: + break; } + } + break ; + + case kEscapeCharCode : + retval = WXK_ESCAPE ; break ; - case kEscapeCharCode : - retval = WXK_ESCAPE ; + + case kLeftArrowCharCode : + retval = WXK_LEFT ; break ; - case kLeftArrowCharCode : - retval = WXK_LEFT ; + + case kRightArrowCharCode : + retval = WXK_RIGHT ; break ; - case kRightArrowCharCode : - retval = WXK_RIGHT ; + + case kUpArrowCharCode : + retval = WXK_UP ; break ; - case kUpArrowCharCode : - retval = WXK_UP ; + + case kDownArrowCharCode : + retval = WXK_DOWN ; break ; - case kDownArrowCharCode : - retval = WXK_DOWN ; + + case kDeleteCharCode : + retval = WXK_DELETE ; break ; - case kDeleteCharCode : - retval = WXK_DELETE ; - default: + + default: break ; } // end switch @@ -1259,26 +1421,48 @@ int wxMacKeyCodeToModifier(wxKeyCode key) } } +#ifndef __DARWIN__ bool wxGetKeyState(wxKeyCode key) //virtual key code if < 10.2.x, else see below { -//#ifdef __DARWIN__ -// wxHIDKeyboard keyboard; -// return keyboard.IsActive(key); -//#else -// TODO: Have it use HID Manager on OSX... + 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)); + return !!(GetCurrentKeyModifiers() & wxMacKeyCodeToModifier(key)); //else -// KeyMapByteArray keymap; +// KeyMapByteArray keymap; // GetKeys((BigEndianLong*)keymap); // return !!(BitTst(keymap, (sizeof(KeyMapByteArray)*8) - iKey)); -//#endif } +#endif -bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey ) +wxMouseState wxGetMouseState() +{ + wxMouseState ms; + + wxPoint pt = wxGetMousePosition(); + ms.SetX(pt.x); + ms.SetY(pt.y); + + UInt32 buttons = GetCurrentButtonState(); + ms.SetLeftDown( (buttons & 0x01) != 0 ); + ms.SetMiddleDown( (buttons & 0x04) != 0 ); + ms.SetRightDown( (buttons & 0x02) != 0 ); + + UInt32 modifiers = GetCurrentKeyModifiers(); + ms.SetControlDown(modifiers & controlKey); + ms.SetShiftDown(modifiers & shiftKey); + ms.SetAltDown(modifiers & optionKey); + ms.SetMetaDown(modifiers & cmdKey); + + return ms; +} + + +bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) { if ( !focus ) return false ; @@ -1295,8 +1479,8 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi UInt32 state = 0; UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey|shiftKey|optionKey))) | keycode, &state); keychar = short(keyInfo & charCodeMask); - keycode = short(keyInfo & keyCodeMask) >> 8 ; } + long keyval = wxMacTranslateKey(keychar, keycode) ; long realkeyval = keyval ; if ( keyval == keychar ) @@ -1306,6 +1490,48 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi keyval = wxToupper( keyval ) ; } + // Check for NUMPAD keys + if (keyval >= '0' && keyval <= '9' && keycode >= 82 && keycode <= 92) + { + keyval = keyval - '0' + WXK_NUMPAD0; + } + else if (keycode >= 67 && keycode <= 81) + { + switch (keycode) + { + case 76 : + keyval = WXK_NUMPAD_ENTER; + break; + + case 81: + keyval = WXK_NUMPAD_EQUAL; + break; + + case 67: + keyval = WXK_NUMPAD_MULTIPLY; + break; + + case 75: + keyval = WXK_NUMPAD_DIVIDE; + break; + + case 78: + keyval = WXK_NUMPAD_SUBTRACT; + break; + + case 69: + keyval = WXK_NUMPAD_ADD; + break; + + case 65: + keyval = WXK_NUMPAD_DECIMAL; + break; + + default: + break; + } // end switch + } + wxKeyEvent event(wxEVT_KEY_DOWN); bool handled = false ; event.m_shiftDown = modifiers & shiftKey; @@ -1314,39 +1540,64 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi event.m_metaDown = modifiers & cmdKey; event.m_keyCode = keyval ; +#if wxUSE_UNICODE + event.m_uniChar = uniChar ; +#endif + + event.m_rawCode = keymessage; + event.m_rawFlags = modifiers; event.m_x = wherex; event.m_y = wherey; - event.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 ) ; + // raw value again event.m_keyCode = realkeyval ; @@ -1354,84 +1605,126 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi 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() ) ) { - // if window is not having a focus still testing for default enter or cancel - // TODO add the UMA version for ActiveNonFloatingWindow - wxWindow* focus = wxFindWinFromMacWindow( FrontWindow() ) ; - if ( focus ) - { + // if window is not having a focus still testing for default enter or cancel + // TODO: add the UMA version for ActiveNonFloatingWindow + wxWindow* focus = wxFindWinFromMacWindow( FrontWindow() ) ; + if ( focus ) + { if ( keyval == WXK_RETURN ) { - wxButton *def = wxDynamicCast(focus->GetDefaultItem(), - wxButton); - if ( def && def->IsEnabled() ) - { - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); - event.SetEventObject(def); - def->Command(event); - return true ; + wxButton *def = wxDynamicCast(focus->GetDefaultItem(), wxButton); + if ( def && def->IsEnabled() ) + { + wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); + event.SetEventObject(def); + def->Command(event); + + return true ; } } - /* generate wxID_CANCEL if command-. or has been pressed (typically in dialogs) */ else if (keyval == WXK_ESCAPE || (keyval == '.' && modifiers & cmdKey ) ) { - wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL); - new_event.SetEventObject( focus ); - handled = focus->GetEventHandler()->ProcessEvent( new_event ); + // generate wxID_CANCEL if command-. or has been pressed (typically in dialogs) + wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL); + new_event.SetEventObject( focus ); + handled = focus->GetEventHandler()->ProcessEvent( new_event ); } - } + } } + return handled ; } -bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey ) +bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) { if ( !focus ) return false ; - short keycode ; - short keychar ; + short keycode, keychar ; + keychar = short(keymessage & charCodeMask); keycode = short(keymessage & keyCodeMask) >> 8 ; - if ( modifiers & ( controlKey|shiftKey|optionKey ) ) + if ( modifiers & (controlKey | shiftKey | optionKey) ) { // control interferes with some built-in keys like pgdown, return etc. therefore we remove the controlKey modifier // and look at the character after UInt32 state = 0; - UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey|shiftKey|optionKey))) | keycode, &state); + UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey | shiftKey | optionKey))) | keycode, &state); keychar = short(keyInfo & charCodeMask); - keycode = short(keyInfo & keyCodeMask) >> 8 ; } - long keyval = wxMacTranslateKey(keychar, keycode) ; + long keyval = wxMacTranslateKey(keychar, keycode) ; if ( keyval == keychar ) - { keyval = wxToupper( keyval ) ; + + // Check for NUMPAD keys + if (keyval >= '0' && keyval <= '9' && keycode >= 82 && keycode <= 92) + { + keyval = (keyval - '0') + WXK_NUMPAD0; + } + else if (keycode >= 67 && keycode <= 81) + { + switch (keycode) + { + case 76 : + keyval = WXK_NUMPAD_ENTER; + break; + + case 81: + keyval = WXK_NUMPAD_EQUAL; + break; + + case 67: + keyval = WXK_NUMPAD_MULTIPLY; + break; + + case 75: + keyval = WXK_NUMPAD_DIVIDE; + break; + + case 78: + keyval = WXK_NUMPAD_SUBTRACT; + break; + + case 69: + keyval = WXK_NUMPAD_ADD; + break; + + case 65: + keyval = WXK_NUMPAD_DECIMAL; + break; + + default: + break; + } // end switch } + bool handled = false ; wxKeyEvent event(wxEVT_KEY_UP); @@ -1440,10 +1733,15 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier event.m_altDown = modifiers & optionKey; event.m_metaDown = modifiers & cmdKey; event.m_keyCode = keyval ; +#if wxUSE_UNICODE + event.m_uniChar = uniChar ; +#endif + event.m_rawCode = keymessage; + event.m_rawFlags = modifiers; event.m_x = wherex; event.m_y = wherey; - event.m_timeStamp = when; + event.SetTimestamp(when); event.SetEventObject(focus); handled = focus->GetEventHandler()->ProcessEvent( event ) ;