X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7816e624f3cc9041de71b4acfe183976624ff833..409521e45d44fc57df39efcb965701d378edcb20:/src/mac/carbon/app.cpp diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index 4f1c473465..f17bc48c4a 100644 --- a/src/mac/carbon/app.cpp +++ b/src/mac/carbon/app.cpp @@ -44,28 +44,13 @@ // mac -#ifndef __DARWIN__ - #if __option(profile) - #include - #endif -#endif - -// #include "apprsrc.h" - #include "wx/mac/uma.h" -#include "wx/mac/macnotfy.h" #ifdef __DARWIN__ # include # if defined(WXMAKINGDLL_CORE) # include # endif -#else -# include -# include -# include -# include -# include #endif // Keep linker from discarding wxStockGDIMac @@ -133,7 +118,7 @@ pascal OSErr AEHandleRApp( const AppleEvent *event , AppleEvent *reply , SRefCon return wxTheApp->MacHandleAERApp( (AppleEvent*) event , reply) ; } -pascal OSErr AEHandleGURL( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) +pascal OSErr AEHandleGURL( const AppleEvent *event , AppleEvent *reply , SRefCon WXUNUSED(refcon) ) { return wxTheApp->MacHandleAEGURL((WXEVENTREF *)event , reply) ; } @@ -295,7 +280,7 @@ void wxApp::MacOpenFile(const wxString & fileName ) #endif } -void wxApp::MacOpenURL(const wxString & url ) +void wxApp::MacOpenURL(const wxString & WXUNUSED(url) ) { } @@ -355,18 +340,25 @@ void wxApp::MacReopenApp() else { wxTopLevelWindow* firstIconized = NULL ; + wxTopLevelWindow* firstHidden = NULL ; while (node) { wxTopLevelWindow* win = (wxTopLevelWindow*) node->GetData(); - if ( !win->IsIconized() ) + if ( !win->IsShown() ) { - firstIconized = NULL ; - break ; + // make sure we don't show 'virtual toplevel windows' like wxTaskBarIconWindow + if ( firstHidden == NULL && ( wxDynamicCast( win, wxFrame ) || wxDynamicCast( win, wxDialog ) ) ) + firstHidden = win ; + } + else if ( win->IsIconized() ) + { + if ( firstIconized == NULL ) + firstIconized = win ; } else { - if ( firstIconized == NULL ) - firstIconized = win ; + // we do have a visible, non-iconized toplevelwindow -> do nothing + return; } node = node->GetNext(); @@ -374,6 +366,8 @@ void wxApp::MacReopenApp() if ( firstIconized ) firstIconized->Iconize( false ) ; + else if ( firstHidden ) + firstHidden->Show( true ); } } @@ -469,6 +463,7 @@ UInt32 wxIdToMacCommand( int wxId ) wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item ) { wxMenu* itemMenu = NULL ; +#ifndef __WXUNIVERSAL__ int id = 0 ; // for 'standard' commands which don't have a wx-menu @@ -494,7 +489,8 @@ wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item ) // 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 ) ) || - ( helpMenuHandle != NULL && command.menu.menuRef == helpMenuHandle ) ) + ( helpMenuHandle != NULL && command.menu.menuRef == helpMenuHandle ) || + wxMenuBar::MacGetWindowMenuHMenu() != NULL && command.menu.menuRef == wxMenuBar::MacGetWindowMenuHMenu() ) { wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ; if ( mbar ) @@ -510,7 +506,7 @@ wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item ) item = (wxMenuItem*) refCon ; } } - +#endif return itemMenu ; } @@ -542,10 +538,13 @@ static const EventTypeSpec eventList[] = } ; static pascal OSStatus -wxMacAppMenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +wxMacAppMenuEventHandler( EventHandlerCallRef WXUNUSED(handler), + EventRef event, + void *WXUNUSED(data) ) { wxMacCarbonEvent cEvent( event ) ; MenuRef menuRef = cEvent.GetParameter(kEventParamDirectObject) ; +#ifndef __WXUNIVERSAL__ wxMenu* menu = wxFindMenuFromMacMenu( menuRef ) ; if ( menu ) @@ -591,11 +590,15 @@ wxMacAppMenuEventHandler( EventHandlerCallRef handler , EventRef event , void *d } } } - +#endif return eventNotHandledErr; } -static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +#ifndef __LP64__ +static pascal OSStatus +wxMacAppCommandEventHandler( EventHandlerCallRef WXUNUSED(handler) , + EventRef event , + void *WXUNUSED(data) ) { OSStatus result = eventNotHandledErr ; @@ -615,60 +618,11 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler switch ( cEvent.GetKind() ) { case kEventProcessCommand : - { - if (item->IsCheckable()) - item->Check( !item->IsChecked() ) ; - - if ( itemMenu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ) - result = noErr ; - } + result = itemMenu->MacHandleCommandProcess( item, id ); break ; case kEventCommandUpdateStatus: - { - wxUpdateUIEvent event(id); - event.SetEventObject( itemMenu ); - - bool processed = false; - - // Try the menu's event handler - { - wxEvtHandler *handler = itemMenu->GetEventHandler(); - if ( handler ) - processed = handler->ProcessEvent(event); - } - - // Try the window the menu was popped up from - // (and up through the hierarchy) - if ( !processed ) - { - const wxMenuBase *menu = itemMenu; - while ( menu ) - { - wxWindow *win = menu->GetInvokingWindow(); - if ( win ) - { - processed = win->GetEventHandler()->ProcessEvent(event); - break; - } - - menu = menu->GetParent(); - } - } - - if ( processed ) - { - // if anything changed, update the changed attribute - if (event.GetSetText()) - itemMenu->SetLabel(id, event.GetText()); - if (event.GetSetChecked()) - itemMenu->Check(id, event.GetChecked()); - if (event.GetSetEnabled()) - itemMenu->Enable(id, event.GetEnabled()); - - result = noErr ; - } - } + result = itemMenu->MacHandleCommandUpdateStatus( item, id ); break ; default : @@ -677,8 +631,12 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler } return result ; } +#endif -static pascal OSStatus wxMacAppApplicationEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +static pascal OSStatus +wxMacAppApplicationEventHandler( EventHandlerCallRef WXUNUSED(handler) , + EventRef event , + void *WXUNUSED(data) ) { OSStatus result = eventNotHandledErr ; switch ( GetEventKind( event ) ) @@ -711,14 +669,15 @@ pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef eve OSStatus result = eventNotHandledErr ; switch ( GetEventClass( event ) ) { +#ifndef __LP64__ case kEventClassCommand : result = wxMacAppCommandEventHandler( handler , event , data ) ; break ; - +#endif case kEventClassApplication : result = wxMacAppApplicationEventHandler( handler , event , data ) ; break ; - +#ifndef __LP64__ case kEventClassMenu : result = wxMacAppMenuEventHandler( handler , event , data ) ; break ; @@ -736,13 +695,23 @@ pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef eve result = wxMacTopLevelMouseEventHandler( handler , event , NULL ) ; } break ; - +#endif case kEventClassAppleEvent : { - EventRecord rec ; +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + if ( AEProcessEvent != NULL ) + { + result = AEProcessEvent(event); + } +#endif +#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 + { + EventRecord rec ; - wxMacConvertEventToRecord( event , &rec ) ; - result = AEProcessAppleEvent( &rec ) ; + wxMacConvertEventToRecord( event , &rec ) ; + result = AEProcessAppleEvent( &rec ) ; + } +#endif } break ; @@ -759,9 +728,16 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacAppEventHandler ) #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) +pascal static void +wxMacAssertOutputHandler(OSType WXUNUSED(componentSignature), + UInt32 WXUNUSED(options), + const char *assertionString, + const char *exceptionLabelString, + const char *errorString, + const char *fileName, + long lineNumber, + void *value, + ConstStr255Param WXUNUSED(outputMsg)) { // flow into assert handling wxString fileNameStr ; @@ -798,18 +774,12 @@ pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 op #endif //__WXDEBUG__ -#ifdef __WXMAC_OSX__ -extern "C" -{ - // m_macEventPosted run loop source callback: - void macPostedEventCallback(void *unused); -} - -void macPostedEventCallback(void *unused) +extern "C" void macPostedEventCallback(void *WXUNUSED(unused)) { wxTheApp->ProcessPendingEvents(); } -#endif + +ProcessSerialNumber gAppProcess ; bool wxApp::Initialize(int& argc, wxChar **argv) { @@ -820,24 +790,9 @@ bool wxApp::Initialize(int& argc, wxChar **argv) #endif UMAInitToolbox( 4, sm_isEmbedded ) ; - SetEventMask( everyEvent ) ; +// TODO CHECK Can Be Removed SetEventMask( everyEvent ) ; UMAShowWatchCursor() ; -#ifndef __DARWIN__ -# if __option(profile) - ProfilerInit( collectDetailed, bestTimeBase , 40000 , 50 ) ; -# endif -#endif - -#ifndef __DARWIN__ - // now avoid exceptions thrown for new (bad_alloc) - // FIXME CS for some changes outside wxMac does not compile anymore -#if 0 - std::__throws_bad_alloc = 0 ; -#endif - -#endif - // 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 @@ -856,11 +811,12 @@ bool wxApp::Initialize(int& argc, wxChar **argv) if ( !wxAppBase::Initialize(argc, argv) ) return false; + GetCurrentProcess(&gAppProcess); + #if wxUSE_INTL 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") ) @@ -873,11 +829,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv) 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}; @@ -886,7 +838,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv) CFRunLoopAddSource(CFRunLoopGetCurrent(), m_macEventPosted, kCFRunLoopCommonModes); // run loop takes ownership CFRelease(m_macEventPosted); -#endif UMAShowArrowCursor() ; @@ -904,15 +855,15 @@ bool wxApp::OnInitGui() { if ( !wxAppBase::OnInitGui() ) return false ; - +#ifndef __LP64__ InstallStandardEventHandler( GetApplicationEventTarget() ) ; - if (!sm_isEmbedded) { InstallApplicationEventHandler( GetwxMacAppEventHandlerUPP(), GetEventTypeCount(eventList), eventList, wxTheApp, (EventHandlerRef *)&(wxTheApp->m_macEventHandler)); } +#endif if (!sm_isEmbedded) { @@ -937,6 +888,9 @@ bool wxApp::OnInitGui() sQuitHandler , 0 , FALSE ) ; } + if ( !wxMacInitCocoa() ) + return false; + return true ; } @@ -946,26 +900,15 @@ void wxApp::CleanUp() wxToolTip::RemoveToolTips() ; #endif -#ifdef __WXMAC_OSX__ if (m_macEventPosted) { CFRunLoopRemoveSource(CFRunLoopGetCurrent(), m_macEventPosted, kCFRunLoopCommonModes); m_macEventPosted = NULL; } -#endif // One last chance for pending objects to be cleaned up wxTheApp->DeletePendingObjects(); - wxMacDestroyNotifierTable() ; - -#ifndef __DARWIN__ -# if __option(profile) - ProfilerDump( (StringPtr)"\papp.prof" ) ; - ProfilerTerm() ; -# endif -#endif - UMACleanupToolbox() ; if (!sm_isEmbedded) @@ -1001,31 +944,7 @@ void wxApp::CleanUp() // misc initialization stuff //---------------------------------------------------------------------- -#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) - pascal OSErr __initialize(const CFragInitBlock *theInitBlock); - pascal void __terminate(void); -} - -pascal OSErr __wxinitialize(const CFragInitBlock *theInitBlock) -{ - return __initialize( theInitBlock ) ; -} - -pascal void __wxterminate(void) -{ - __terminate() ; -} - -#endif /* WXMAKINGDLL_CORE && !__DARWIN__ */ - +#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) { OSStatus err = noErr ; @@ -1066,9 +985,7 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) UInt32 keyCode ; unsigned char charCode ; UInt32 modifiers ; -#ifndef __LP64__ GetMouse( &rec->where) ; -#endif err = GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, 4, NULL, &modifiers); err = GetEventParameter(event, kEventParamKeyCode, typeUInt32, NULL, 4, NULL, &keyCode); err = GetEventParameter(event, kEventParamKeyMacCharCodes, typeChar, NULL, 1, NULL, &charCode); @@ -1093,10 +1010,7 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) { UInt32 keyCode, modifiers; unsigned char charCode ; -#ifndef __LP64__ - GetMouse( &rec->where) ; -#endif rec->what = keyDown ; err = GetEventParameter(rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, 4, NULL, &modifiers); err = GetEventParameter(rawEvent, kEventParamKeyCode, typeUInt32, NULL, 4, NULL, &keyCode); @@ -1120,6 +1034,7 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) return converted ; } +#endif wxApp::wxApp() { @@ -1127,33 +1042,26 @@ wxApp::wxApp() m_macCurrentEvent = NULL ; m_macCurrentEventHandlerCallRef = NULL ; - -#ifdef __WXMAC_OSX__ m_macEventPosted = NULL ; -#endif } -void wxApp::OnIdle(wxIdleEvent& event) +void wxApp::OnIdle(wxIdleEvent& WXUNUSED(event)) { - 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(); - +#ifndef __WXUNIVERSAL__ if (!wxMenuBar::MacGetInstalledMenuBar() && wxMenuBar::MacGetCommonMenuBar()) wxMenuBar::MacGetCommonMenuBar()->MacInstallMenuBar(); +#endif } void wxApp::WakeUpIdle() { -#ifdef __WXMAC_OSX__ if (m_macEventPosted) { CFRunLoopSourceSignal(m_macEventPosted); } -#endif wxMacWakeUp() ; } @@ -1195,6 +1103,15 @@ bool wxApp::Yield(bool onlyIfNeeded) return false; } +#if wxUSE_THREADS + // Yielding from a non-gui thread needs to bail out, otherwise we end up + // possibly sending events in the thread too. + if ( !wxThread::IsMain() ) + { + return true; + } +#endif // wxUSE_THREADS + s_inYield = true; // by definition yield should handle all non-processed events @@ -1226,7 +1143,6 @@ bool wxApp::Yield(bool onlyIfNeeded) } } - wxMacProcessNotifierAndPendingEvents() ; s_inYield = false; return true; @@ -1234,6 +1150,7 @@ bool wxApp::Yield(bool onlyIfNeeded) void wxApp::MacDoOneEvent() { + wxMacAutoreleasePool autoreleasepool; EventRef theEvent; s_inReceiveEvent = true ; @@ -1263,11 +1180,10 @@ void wxApp::MacDoOneEvent() // repeaters DeletePendingObjects() ; - wxMacProcessNotifierAndPendingEvents() ; } // virtual -void wxApp::MacHandleUnhandledEvent( WXEVENTREF evr ) +void wxApp::MacHandleUnhandledEvent( WXEVENTREF WXUNUSED(evr) ) { // Override to process unhandled events as you please } @@ -1290,8 +1206,6 @@ void wxApp::MacHandleOneEvent( WXEVENTREF evr ) if (status == eventNotHandledErr) MacHandleUnhandledEvent(evr); - wxMacProcessNotifierAndPendingEvents() ; - #if wxUSE_THREADS wxMutexGuiLeaveOrEnter(); #endif // wxUSE_THREADS @@ -1470,24 +1384,6 @@ int wxMacKeyCodeToModifier(wxKeyCode key) } } -#ifndef __DARWIN__ -bool wxGetKeyState(wxKeyCode key) //virtual key code if < 10.2.x, else see below -{ - wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key != - WXK_MBUTTON, wxT("can't use wxGetKeyState() for mouse buttons")); - -//if OS X > 10.2 (i.e. 10.2.x) -//a known apple bug prevents the system from determining led -//states with GetKeys... can only determine caps lock led - return !!(GetCurrentKeyModifiers() & wxMacKeyCodeToModifier(key)); -//else -// KeyMapByteArray keymap; -// GetKeys((BigEndianLong*)keymap); -// return !!(BitTst(keymap, (sizeof(KeyMapByteArray)*8) - iKey)); -} -#endif - - wxMouseState wxGetMouseState() { wxMouseState ms; @@ -1496,16 +1392,10 @@ wxMouseState wxGetMouseState() ms.SetX(pt.x); ms.SetY(pt.y); -#if TARGET_API_MAC_OSX UInt32 buttons = GetCurrentButtonState(); ms.SetLeftDown( (buttons & 0x01) != 0 ); ms.SetMiddleDown( (buttons & 0x04) != 0 ); ms.SetRightDown( (buttons & 0x02) != 0 ); -#else - ms.SetLeftDown( Button() ); - ms.SetMiddleDown( 0 ); - ms.SetRightDown( 0 ); -#endif UInt32 modifiers = GetCurrentKeyModifiers(); ms.SetControlDown(modifiers & controlKey); @@ -1634,6 +1524,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers { // if window is not having a focus still testing for default enter or cancel // TODO: add the UMA version for ActiveNonFloatingWindow +#ifndef __LP64__ wxWindow* focus = wxFindWinFromMacWindow( FrontWindow() ) ; if ( focus ) { @@ -1661,6 +1552,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers handled = focus->GetEventHandler()->ProcessEvent( new_event ); } } +#endif } return handled ; } @@ -1676,57 +1568,65 @@ void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymess { // control interferes with some built-in keys like pgdown, return etc. therefore we remove the controlKey modifier // and look at the character after +#ifdef __LP64__ + // TODO new implementation using TextInputSources +#else UInt32 state = 0; UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey | shiftKey | optionKey))) | keycode, &state); keychar = short(keyInfo & charCodeMask); +#endif } long keyval = wxMacTranslateKey(keychar, keycode) ; if ( keyval == keychar && ( event.GetEventType() == wxEVT_KEY_UP || event.GetEventType() == wxEVT_KEY_DOWN ) ) keyval = wxToupper( keyval ) ; - // Check for NUMPAD keys - if (keyval >= '0' && keyval <= '9' && keycode >= 82 && keycode <= 92) - { - keyval = (keyval - '0') + WXK_NUMPAD0; - } - else if (keycode >= 67 && keycode <= 81) + // Check for NUMPAD keys. For KEY_UP/DOWN events we need to use the + // WXK_NUMPAD constants, but for the CHAR event we want to use the + // standard ascii values + if ( event.GetEventType() != wxEVT_CHAR ) { - switch (keycode) + if (keyval >= '0' && keyval <= '9' && keycode >= 82 && keycode <= 92) { - 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 + keyval = (keyval - '0') + WXK_NUMPAD0; + } + else if (keycode >= 65 && 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; + } + } } - + event.m_shiftDown = modifiers & shiftKey; event.m_controlDown = modifiers & controlKey; event.m_altDown = modifiers & optionKey;