X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/366e8ae67583e44f719d1c2fabb3a24eb3bda5b3..b9e3bdc5399e8152eab9cfd05b62c8ea0031fc0b:/src/mac/app.cpp diff --git a/src/mac/app.cpp b/src/mac/app.cpp index baa5f6485e..cb46018f47 100644 --- a/src/mac/app.cpp +++ b/src/mac/app.cpp @@ -36,6 +36,8 @@ #include "wx/tooltip.h" #include "wx/textctrl.h" #include "wx/menu.h" +#include "wx/docview.h" + #if wxUSE_WX_RESOURCES # include "wx/resource.h" #endif @@ -73,6 +75,8 @@ extern wxList wxPendingDelete; extern wxList *wxWinMacWindowList; extern wxList *wxWinMacControlList; +static bool s_inYield = FALSE; + wxApp *wxTheApp = NULL; #if !USE_SHARED_LIBRARY @@ -101,12 +105,15 @@ long wxApp::s_lastModifiers = 0 ; bool wxApp::s_macDefaultEncodingIsPC = true ; bool wxApp::s_macSupportPCMenuShortcuts = true ; long wxApp::s_macAboutMenuItemId = wxID_ABOUT ; +long wxApp::s_macPreferencesMenuItemId = 0 ; +long wxApp::s_macExitMenuItemId = wxID_EXIT ; wxString wxApp::s_macHelpMenuTitleName = "&Help" ; 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 AEHandlePreferences( const AppleEvent *event , AppleEvent *reply , long refcon ) ; pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) @@ -133,23 +140,131 @@ pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long WX return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ; } -short wxApp::MacHandleAEODoc(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply)) +pascal OSErr AEHandlePreferences( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) +{ + // GD: UNUSED wxApp* app = (wxApp*) refcon ; + + wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ; + wxMenu* menu = NULL ; + wxMenuItem* item = NULL ; + if ( mbar ) + { + item = mbar->FindItem( wxApp::s_macPreferencesMenuItemId , &menu ) ; + } + if ( item != NULL && menu != NULL && mbar != NULL ) + menu->SendEvent( wxApp::s_macPreferencesMenuItemId , -1 ) ; + return noErr ; +} + +// new virtual public method in wxApp +void wxApp::MacOpenFile(const wxString & fileName ) +{ + wxDocManager* dm = wxDocManager::GetDocumentManager() ; + if ( dm ) + dm->CreateDocument(fileName , wxDOC_SILENT ) ; +} + +void wxApp::MacPrintFile(const wxString & fileName ) +{ + wxDocManager* dm = wxDocManager::GetDocumentManager() ; + if ( dm ) + { + wxDocument *doc = dm->CreateDocument(fileName , wxDOC_SILENT ) ; + if ( doc ) + { + wxView* view = doc->GetFirstView() ; + if( view ) + { + wxPrintout *printout = view->OnCreatePrintout(); + if (printout) + { + wxPrinter printer; + printer.Print(view->GetFrame(), printout, TRUE); + delete printout; + } + } + if (doc->Close()) + { + doc->DeleteAllViews(); + dm->RemoveDocument(doc) ; + } + } + } +} + +void wxApp::MacNewFile() +{ +} + +// new implementation, which parses the event and calls +// MacOpenFile on each of the files it's passed +short wxApp::MacHandleAEODoc(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply)) { - SysBeep(40) ; + AEDescList docList; + AEKeyword keywd; + DescType returnedType; + Size actualSize; + long itemsInList; + FSSpec theSpec; + 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 ; -} - -short wxApp::MacHandleAEPDoc(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply)) -{ - return noErr ; + + for (i = 1; i <= itemsInList; i++) { + AEGetNthPtr(&docList, i, typeFSS, &keywd, &returnedType, + (Ptr) & theSpec, sizeof(theSpec), &actualSize); + wxString fName = wxMacFSSpec2MacFilename(&theSpec); + MacOpenFile(fName); + } + return noErr; +} + +short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF WXUNUSED(reply)) +{ + AEDescList docList; + AEKeyword keywd; + DescType returnedType; + Size actualSize; + long itemsInList; + FSSpec theSpec; + 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++) { + AEGetNthPtr(&docList, i, typeFSS, &keywd, &returnedType, + (Ptr) & theSpec, sizeof(theSpec), &actualSize); + wxString fName = wxMacFSSpec2MacFilename(&theSpec); + MacPrintFile(fName); + } + return noErr; } short wxApp::MacHandleAEOApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply)) { + MacNewFile() ; return noErr ; } @@ -723,6 +838,9 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock) theModule = NSModuleForSymbol(theSymbol); theLibPath = NSLibraryNameForModule(theModule); + wxLogDebug( wxT("wxMac library installation name is '%s'"), + theLibPath ); + // allocate copy to replace .dylib.* extension with .rsrc theResPath = strdup(theLibPath); if (theResPath != NULL) { @@ -736,7 +854,8 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock) // overwrite extension with ".rsrc" strcpy(theExt, ".rsrc"); - wxLogDebug( theResPath ); + wxLogDebug( wxT("wxMac resources file name is '%s'"), + theResPath ); theErr = FSPathMakeRef((UInt8 *) theResPath, &theResRef, false); if (theErr != noErr) { @@ -744,14 +863,18 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock) 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); } + if (theErr != noErr) { + wxLogDebug( wxT("unable to open wxMac resource file '%s'"), + theResPath ); + } + + // free duplicated resource file path + free(theResPath); } } #endif /* __DARWIN__ */ @@ -858,10 +981,7 @@ int wxEntry( int argc, char *argv[] , bool enterLoop ) // application (otherwise applications would need to handle it) if (argc > 1) { - char theArg[6] = ""; - strncpy(theArg, argv[1], 5); - - if (strcmp(theArg, "-psn_") == 0) { + if (strncmp(argv[1], "-psn_", 5) == 0) { // assume the argument is always the only one and remove it --argc; } @@ -1080,14 +1200,26 @@ bool wxApp::Initialized() int wxApp::MainLoop() { - m_keepGoing = TRUE; + m_keepGoing = TRUE; - while (m_keepGoing) - { - MacDoOneEvent() ; - } +#if TARGET_CARBON + if ( UMAGetSystemVersion() >= 0x1000 ) + { + if ( s_macPreferencesMenuItemId ) + { + EnableMenuCommand( NULL , kHICommandPreferences ) ; + AEInstallEventHandler( kCoreEventClass , kAEShowPreferences , + NewAEEventHandlerUPP(AEHandlePreferences) , + (long) wxTheApp , FALSE ) ; + } + } +#endif + while (m_keepGoing) + { + MacDoOneEvent() ; + } - return 0; + return 0; } // Returns TRUE if more time is needed. @@ -1250,8 +1382,6 @@ void wxCYield() bool wxApp::Yield(bool onlyIfNeeded) { - static bool s_inYield = FALSE; - if (s_inYield) { if ( !onlyIfNeeded ) @@ -1378,13 +1508,19 @@ void wxApp::MacHandleModifierEvents( 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 ) + ev->what == keyDown || ev->what == autoKey || ev->what == keyUp || ev->what == kHighLevelEvent || + ev->what == nullEvent + ) { // in these cases the modifiers are already correctly setup by carbon } else { - ev->modifiers = GetCurrentKeyModifiers() ; + EventRecord nev ; + WaitNextEvent( 0 , &nev , 0 , NULL ) ; + ev->modifiers = nev.modifiers ; + // KeyModifiers unfortunately don't include btnState... +// ev->modifiers = GetCurrentKeyModifiers() ; } #endif if ( ev->modifiers != s_lastModifiers && wxWindow::FindFocus() != NULL ) @@ -1482,8 +1618,12 @@ void wxApp::MacHandleOneEvent( WXEVENTREF evr ) void wxApp::MacHandleHighLevelEvent( WXEVENTREF evr ) { + // we must avoid reentrancy problems when processing high level events eg printing + bool former = s_inYield ; + s_inYield = TRUE ; EventRecord* ev = (EventRecord*) evr ; ::AEProcessAppleEvent( ev ) ; + s_inYield = former ; } bool s_macIsInModalLoop = false ; @@ -1559,23 +1699,28 @@ void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr ) break; case inGrow: { - int growResult = GrowWindow(window , ev->where, &screenBits.bounds); - if (growResult != 0) + Rect newContentRect ; + Rect constraintRect ; + constraintRect.top = win->GetMinHeight() ; + if ( constraintRect.top == -1 ) + constraintRect.top = 0 ; + constraintRect.left = win->GetMinWidth() ; + if ( constraintRect.left == -1 ) + constraintRect.left = 0 ; + constraintRect.right = win->GetMaxWidth() ; + if ( constraintRect.right == -1 ) + constraintRect.right = 32000 ; + constraintRect.bottom = win->GetMaxHeight() ; + if ( constraintRect.bottom == -1 ) + constraintRect.bottom = 32000 ; + + Boolean growResult = ResizeWindow( window , ev->where , + &constraintRect , &newContentRect ) ; + if ( growResult ) { - 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); - } + win->SetSize( newContentRect.left , newContentRect.top , + newContentRect.right - newContentRect.left , + newContentRect.bottom - newContentRect.top, wxSIZE_USE_EXISTING); } s_lastMouseDown = 0; } @@ -1683,34 +1828,34 @@ long wxMacTranslateKey(unsigned char key, unsigned char code) long retval = key ; switch (key) { - case 0x01 : + case kHomeCharCode : retval = WXK_HOME; break; - case 0x03 : + case kEnterCharCode : retval = WXK_RETURN; break; - case 0x04 : + case kEndCharCode : retval = WXK_END; break; - case 0x05 : + case kHelpCharCode : retval = WXK_HELP; break; - case 0x08 : + case kBackspaceCharCode : retval = WXK_BACK; break; - case 0x09 : + case kTabCharCode : retval = WXK_TAB; break; - case 0x0b : + case kPageUpCharCode : retval = WXK_PAGEUP; break; - case 0x0c : + case kPageDownCharCode : retval = WXK_PAGEDOWN; break; - case 0x0d : + case kReturnCharCode : retval = WXK_RETURN; break; - case 0x10 : + case kFunctionKeyCharCode : { switch( code ) { @@ -1762,22 +1907,22 @@ long wxMacTranslateKey(unsigned char key, unsigned char code) } } break ; - case 0x1b : + case kEscapeCharCode : retval = WXK_ESCAPE ; break ; - case 0x1c : + case kLeftArrowCharCode : retval = WXK_LEFT ; break ; - case 0x1d : + case kRightArrowCharCode : retval = WXK_RIGHT ; break ; - case 0x1e : + case kUpArrowCharCode : retval = WXK_UP ; break ; - case 0x1f : + case kDownArrowCharCode : retval = WXK_DOWN ; break ; - case 0x7F : + case kDeleteCharCode : retval = WXK_DELETE ; default: break ; @@ -1799,39 +1944,59 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr ) } else { - 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) ; - - if ( MacSendKeyDownEvent( focus , keyval , ev->modifiers , ev->when , ev->where.h , ev->where.v ) == false ) + wxWindow* focus = wxWindow::FindFocus() ; + + if ( MacSendKeyDownEvent( focus , ev->message , ev->modifiers , ev->when , ev->where.h , ev->where.v ) == false ) { // has not been handled -> perform default wxControl* control = wxDynamicCast( focus , wxControl ) ; if ( control && control->GetMacControl() != NULL ) { + short keycode ; + short keychar ; + keychar = short(ev->message & charCodeMask); + keycode = short(ev->message & keyCodeMask) >> 8 ; ::HandleControlKey( (ControlHandle) control->GetMacControl() , keycode , keychar , ev->modifiers ) ; } } } } -bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey ) +bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey ) { + if ( !focus ) + return false ; + + short keycode ; + short keychar ; + keychar = short(keymessage & charCodeMask); + keycode = short(keymessage & keyCodeMask) >> 8 ; + + if ( modifiers & ( controlKey|shiftKey|optionKey ) ) + { + // control interferes with some built-in keys like pgdown, return etc. therefore we remove the controlKey modifier + // and look at the character after + UInt32 state = 0; + UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey|shiftKey|optionKey))) | keycode, &state); + keychar = short(keyInfo & charCodeMask); + keycode = short(keyInfo & keyCodeMask) >> 8 ; + } + long keyval = wxMacTranslateKey(keychar, keycode) ; + long realkeyval = keyval ; + if ( keyval == keychar ) + { + // we are not on a special character combo -> pass the real os event-value to EVT_CHAR, but not to EVT_KEY (make upper first) + realkeyval = short(keymessage & charCodeMask) ; + keyval = wxToupper( keyval ) ; + } + 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 ; event.m_x = wherex; event.m_y = wherey; @@ -1866,7 +2031,8 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers { 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() ) @@ -1938,41 +2104,49 @@ void wxApp::MacHandleKeyUpEvent( WXEVENTREF evr ) } else { - 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 + MacSendKeyUpEvent( wxWindow::FindFocus() , ev->message , ev->modifiers , ev->when , ev->where.h , ev->where.v ) ; } } -bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey ) +bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey ) { - bool handled = false ; - if ( focus ) - { - 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 ) ; + if ( !focus ) + return false ; + + short keycode ; + short keychar ; + keychar = short(keymessage & charCodeMask); + keycode = short(keymessage & keyCodeMask) >> 8 ; + if ( modifiers & ( controlKey|shiftKey|optionKey ) ) + { + // control interferes with some built-in keys like pgdown, return etc. therefore we remove the controlKey modifier + // and look at the character after + UInt32 state = 0; + UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey|shiftKey|optionKey))) | keycode, &state); + keychar = short(keyInfo & charCodeMask); + keycode = short(keyInfo & keyCodeMask) >> 8 ; } + long keyval = wxMacTranslateKey(keychar, keycode) ; + + if ( keyval == keychar ) + { + keyval = wxToupper( keyval ) ; + } + bool handled = 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 ; + + 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 ) @@ -2098,8 +2272,16 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr ) wxWindow* currentMouseWindow = NULL ; - wxWindow::MacGetWindowFromPoint( wxPoint( ev->where.h , ev->where.v ) , - ¤tMouseWindow ) ; + if (s_captureWindow ) + { + currentMouseWindow = s_captureWindow ; + } + else + { + wxWindow::MacGetWindowFromPoint( wxPoint( ev->where.h , ev->where.v ) , + ¤tMouseWindow ) ; + } + if ( currentMouseWindow != wxWindow::s_lastMouseWindow ) { wxMouseEvent event ; @@ -2139,27 +2321,44 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr ) wxWindow::s_lastMouseWindow = currentMouseWindow ; } - short windowPart = ::FindWindow(ev->where, &window); - + short windowPart = inNoWindow ; + + if ( s_captureWindow ) + { + window = (WindowRef) s_captureWindow->MacGetRootWindow() ; + windowPart = inContent ; + } + else + { + 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: + case inContent : { wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ; if ( win ) win->MacMouseMoved( ev , windowPart ) ; else - UMAShowArrowCursor(); - + { + if ( wxIsBusy() ) + { + } + else + UMAShowArrowCursor(); + } } break; + default : + { + if ( wxIsBusy() ) + { + } + else + UMAShowArrowCursor(); + } + break ; } } break ; @@ -2186,35 +2385,31 @@ void wxApp::MacHandleMenuSelect( int macMenuId , int macMenuItemNum ) } else { + MenuCommand id ; + GetMenuItemCommandID( GetMenuHandle(macMenuId) , macMenuItemNum , &id ) ; + wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ; + wxMenu* menu = NULL ; + wxMenuItem* item = NULL ; + if ( mbar ) + { + item = mbar->FindItem( id , &menu ) ; + } + wxCHECK_RET( item != NULL && menu != NULL && mbar != NULL, wxT("error in menu item callback") ); + + if (item->IsCheckable()) + { + item->Check( !item->IsChecked() ) ; + } + + menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ; + /* wxWindow* frontwindow = wxFindWinFromMacWindow( ::FrontWindow() ) ; - if ( frontwindow && wxMenuBar::MacGetInstalledMenuBar() ) - wxMenuBar::MacGetInstalledMenuBar()->MacMenuSelect( frontwindow->GetEventHandler() , 0 , macMenuId , macMenuItemNum ) ; + wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, id ); + event.m_timeStamp = ((EventRecord*) MacGetCurrentEvent())->when ; + event.SetEventObject(menu); + event.SetInt(item->IsCheckable() ? item->IsChecked() : -1); + frontwindow->GetEventHandler()->ProcessEvent(event); + */ } HiliteMenu(0); } - -/* -long wxApp::MacTranslateKey(char key, int mods) -{ -} - -void wxApp::MacAdjustCursor() -{ -} - -*/ -/* -void -wxApp::macAdjustCursor() -{ - if (ev->what != kHighLevelEvent) - { - wxWindow* theMacWxFrame = wxFrame::MacFindFrameOrDialog(::FrontWindow()); - if (theMacWxFrame) - { - if (!theMacWxFrame->MacAdjustCursor(ev->where)) - ::SetCursor(&(qd.arrow)); - } - } -} -*/