X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b4efa0696e9b6fdc6b19441981c5e0341d177a48..0e7fa78358f89bdfd0f4b78099543b4beb2faaf6:/src/mac/app.cpp?ds=sidebyside diff --git a/src/mac/app.cpp b/src/mac/app.cpp index 537bb03e73..6473c26f07 100644 --- a/src/mac/app.cpp +++ b/src/mac/app.cpp @@ -95,6 +95,8 @@ WXHRGN wxApp::s_macCursorRgn = NULL; wxWindow* wxApp::s_captureWindow = NULL ; int wxApp::s_lastMouseDown = 0 ; long wxApp::sm_lastMessageTime = 0; +long wxApp::s_lastModifiers = 0 ; + bool wxApp::s_macDefaultEncodingIsPC = true ; bool wxApp::s_macSupportPCMenuShortcuts = true ; @@ -107,31 +109,31 @@ pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long re pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long refcon ) ; -pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long refcon ) +pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) { // GD: UNUSED wxApp* app = (wxApp*) refcon ; return wxTheApp->MacHandleAEODoc( (AppleEvent*) event , reply) ; } -pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long refcon ) +pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) { // GD: UNUSED wxApp* app = (wxApp*) refcon ; return wxTheApp->MacHandleAEOApp( (AppleEvent*) event , reply ) ; } -pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long refcon ) +pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) { // GD: UNUSED wxApp* app = (wxApp*) refcon ; return wxTheApp->MacHandleAEPDoc( (AppleEvent*) event , reply ) ; } -pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long refcon ) +pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) { // GD: UNUSED wxApp* app = (wxApp*) refcon ; return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ; } -short wxApp::MacHandleAEODoc(const WXEVENTREF event , WXEVENTREF reply) +short wxApp::MacHandleAEODoc(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply)) { SysBeep(40) ; ProcessSerialNumber PSN ; @@ -141,17 +143,17 @@ short wxApp::MacHandleAEODoc(const WXEVENTREF event , WXEVENTREF reply) return noErr ; } -short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF reply) +short wxApp::MacHandleAEPDoc(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply)) { return noErr ; } -short wxApp::MacHandleAEOApp(const WXEVENTREF event , WXEVENTREF reply) +short wxApp::MacHandleAEOApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply)) { return noErr ; } -short wxApp::MacHandleAEQuit(const WXEVENTREF event , WXEVENTREF reply) +short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply)) { wxWindow* win = GetTopWindow() ; if ( win ) @@ -397,7 +399,7 @@ bool wxApp::Initialize() // __wxinitialize in Mach-O shared libraries wxStAppResource::OpenSharedLibraryResource(NULL); #endif - + #if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340) AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments , NewAEEventHandlerUPP(AEHandleODoc) , @@ -494,7 +496,7 @@ bool wxApp::Initialize() s_macCursorRgn = ::NewRgn() ; wxBuffer = new char[BUFSIZ + 512]; - + wxClassInfo::InitializeClasses(); #if wxUSE_RESOURCES @@ -504,7 +506,7 @@ bool wxApp::Initialize() #if wxUSE_THREADS wxPendingEventsLocker = new wxCriticalSection; #endif - + wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); wxTheColourDatabase->Initialize(); @@ -590,7 +592,7 @@ void wxApp::CleanUp() delete wxWinMacControlList ; } delete wxPendingEvents; - + #if wxUSE_THREADS delete wxPendingEventsLocker; // If we don't do the following, we get an apparent memory leak. @@ -633,12 +635,12 @@ void wxApp::CleanUp() // __wxterminate in Mach-O shared libraries wxStAppResource::CloseSharedLibraryResource(); #endif - + UMACleanupToolbox() ; if (s_macCursorRgn) { ::DisposeRgn((RgnHandle)s_macCursorRgn); } - + #if 0 TerminateAE() ; #endif @@ -681,14 +683,14 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock) 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); } @@ -699,12 +701,12 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock) 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 { @@ -715,7 +717,7 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock) char *theExt; FSRef theResRef; OSErr theErr = noErr; - + // get the library path theSymbol = NSLookupAndBindSymbol("_gSharedLibraryResource"); theModule = NSModuleForSymbol(theSymbol); @@ -733,7 +735,7 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock) theExt = strstr(theName, ".dylib"); // overwrite extension with ".rsrc" strcpy(theExt, ".rsrc"); - + wxLogDebug( theResPath ); theErr = FSPathMakeRef((UInt8 *) theResPath, &theResRef, false); @@ -741,7 +743,7 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock) // try in current directory (using name only) theErr = FSPathMakeRef((UInt8 *) theName, &theResRef, false); } - + // free duplicated resource file path free(theResPath); @@ -774,7 +776,7 @@ void wxStAppResource::CloseSharedLibraryResource() CloseResFile(gSharedLibraryResource); } gSharedLibraryResource = kResFileNotOpened; - } + } #endif /* WXMAKINGDLL */ } @@ -804,7 +806,7 @@ pascal void __wxterminate(void) #endif /* WXMAKINGDLL && !__DARWIN__ */ -int WXDLLEXPORT wxEntryStart( int argc, char *argv[] ) +int WXDLLEXPORT wxEntryStart( int WXUNUSED(argc), char *WXUNUSED(argv)[] ) { return wxApp::Initialize(); } @@ -858,12 +860,12 @@ int wxEntry( int argc, char *argv[] , bool enterLoop ) 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 @@ -930,7 +932,7 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) case kEventClassKeyboard : { converted = true ; - switch( GetEventKind(event) ) + switch( GetEventKind(event) ) { case kEventRawKeyDown : rec->what = keyDown ; @@ -993,20 +995,21 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) break ; } } - + 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 ; } @@ -1014,6 +1017,7 @@ pascal OSStatus wxMacApplicationEventHandler( EventHandlerCallRef handler , Even case kEventClassTextInput : if ( wxMacConvertEventToRecord( event , &rec ) ) { + wxTheApp->MacHandleModifierEvents( &rec ) ; wxTheApp->MacHandleOneEvent( &rec ) ; result = noErr ; } @@ -1030,20 +1034,20 @@ bool wxApp::OnInit() { if ( ! wxAppBase::OnInit() ) return FALSE ; - -#if TARGET_CARBON - static const EventTypeSpec eventList[] = + +#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); + , WXSIZEOF(eventList), eventList, this, NULL); #endif return TRUE ; } @@ -1063,7 +1067,6 @@ wxApp::wxApp() argv = NULL; m_printMode = wxPRINT_WINDOWS; - m_exitOnFrameDelete = TRUE; m_auto3D = TRUE; } @@ -1270,10 +1273,12 @@ bool wxApp::Yield(bool onlyIfNeeded) 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 ) ; } + wxTheApp->MacHandleModifierEvents( &event ) ; wxMacProcessNotifierAndPendingEvents() ; @@ -1297,24 +1302,37 @@ void wxApp::MacSuspend( bool convertClipboard ) node = node->Next(); } - s_lastMouseDown = 0 ; - if( convertClipboard ) - { - MacConvertPrivateToPublicScrap() ; - } + s_lastMouseDown = 0 ; + if( convertClipboard ) + { + MacConvertPrivateToPublicScrap() ; + } - ::HideFloatingWindows() ; + ::HideFloatingWindows() ; } +extern wxList wxModalDialogs; + void wxApp::MacResume( bool convertClipboard ) { - s_lastMouseDown = 0 ; - if( convertClipboard ) - { - MacConvertPublicToPrivateScrap() ; - } + s_lastMouseDown = 0 ; + if( convertClipboard ) + { + MacConvertPublicToPrivateScrap() ; + } + + ::ShowFloatingWindows() ; + + // raise modal dialogs in case a non modal window was selected to activate the app - ::ShowFloatingWindows() ; + wxNode* node = wxModalDialogs.First(); + while (node) + { + wxDialog* dialog = (wxDialog *) node->Data(); + dialog->Raise(); + + node = node->Next(); + } } void wxApp::MacConvertPrivateToPublicScrap() @@ -1333,10 +1351,12 @@ void wxApp::MacDoOneEvent() if (WaitNextEvent(everyEvent, &event, sleepTime, (RgnHandle) s_macCursorRgn)) { + MacHandleModifierEvents( &event ) ; MacHandleOneEvent( &event ); } else { + MacHandleModifierEvents( &event ) ; // idlers WindowPtr window = ::FrontWindow() ; if ( window ) @@ -1353,6 +1373,61 @@ void wxApp::MacDoOneEvent() wxMacProcessNotifierAndPendingEvents() ; } +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 ) + { + // in these cases the modifiers are already correctly setup by carbon + } + else + { + 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 ) + { + 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 ; + } +} + void wxApp::MacHandleOneEvent( WXEVENTREF evr ) { EventRecord* ev = (EventRecord*) evr ; @@ -1503,7 +1578,7 @@ void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr ) newWidth = oldWidth; if (newHeight == 0) newHeight = oldHeight; - win->SetSize( -1, -1, newWidth, newHeight, wxSIZE_USE_EXISTING); + win->SetSize( -1, -1 , newWidth, newHeight, wxSIZE_USE_EXISTING); } } s_lastMouseDown = 0; @@ -1518,9 +1593,15 @@ void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr ) if (win) { Rect tempRect ; + GrafPtr port ; + GetPort( &port ) ; + Point pt = { 0, 0 } ; + SetPortWindowPort(window) ; + LocalToGlobal( &pt ) ; + SetPort( port ) ; GetWindowPortBounds(window, &tempRect ) ; - win->SetSize( -1, -1, tempRect.right-tempRect.left , + win->SetSize( pt.h , pt.v , tempRect.right-tempRect.left , tempRect.bottom-tempRect.top, wxSIZE_USE_EXISTING); } } @@ -1578,7 +1659,7 @@ void wxApp::MacHandleMouseUpEvent( WXEVENTREF evr ) { window = (WindowRef) s_captureWindow->MacGetRootWindow() ; windowPart = inContent ; - } + } else { windowPart = ::FindWindow(ev->where, &window) ; @@ -1606,34 +1687,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 ) { @@ -1685,22 +1766,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 ; @@ -1718,104 +1799,125 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr ) if ( HiWord( menuresult ) ) { if ( !s_macIsInModalLoop ) - MacHandleMenuSelect( HiWord( menuresult ) , LoWord( menuresult ) ) ; + MacHandleMenuSelect( HiWord( menuresult ) , LoWord( menuresult ) ) ; } 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 ) + wxWindow* focus = wxWindow::FindFocus() ; + + if ( MacSendKeyDownEvent( focus , ev->message , ev->modifiers , ev->when , ev->where.h , ev->where.v ) == false ) { - keychar += 0x40 ; + // 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 ) ; + } } - long keyval = wxMacTranslateKey(keychar, keycode) ; - bool handled = false ; - wxWindow* focus = wxWindow::FindFocus() ; - if ( focus ) - { + } +} - wxKeyEvent event(wxEVT_KEY_DOWN); - event.m_shiftDown = ev->modifiers & shiftKey; - event.m_controlDown = ev->modifiers & controlKey; - event.m_altDown = ev->modifiers & optionKey; - event.m_metaDown = ev->modifiers & cmdKey; - event.m_keyCode = keyval; - event.m_x = ev->where.h; - event.m_y = ev->where.v; - event.m_timeStamp = ev->when; - event.SetEventObject(focus); - handled = focus->GetEventHandler()->ProcessEvent( event ) ; - if ( handled && event.GetSkipped() ) - handled = false ; - if ( !handled ) - { +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) ) + { + // 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)) | keycode, &state); + keychar = short(keyInfo & charCodeMask); + keycode = short(keyInfo & keyCodeMask) >> 8 ; + } + long keyval = wxMacTranslateKey(keychar, keycode) ; + + 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_x = wherex; + event.m_y = wherey; + event.m_timeStamp = when; + event.SetEventObject(focus); + handled = focus->GetEventHandler()->ProcessEvent( event ) ; + if ( handled && event.GetSkipped() ) + handled = false ; + if ( !handled ) + { #if wxUSE_ACCEL - if (!handled) + if (!handled) + { + wxWindow *ancestor = focus; + while (ancestor) + { + int command = ancestor->GetAcceleratorTable()->GetCommand( event ); + if (command != -1) { - wxWindow *ancestor = focus; - while (ancestor) - { - int command = ancestor->GetAcceleratorTable()->GetCommand( event ); - if (command != -1) - { - wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command ); - handled = ancestor->GetEventHandler()->ProcessEvent( command_event ); - break; - } - if (ancestor->IsTopLevel()) - break; - ancestor = ancestor->GetParent(); - } + wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command ); + handled = ancestor->GetEventHandler()->ProcessEvent( command_event ); + break; } -#endif // wxUSE_ACCEL + if (ancestor->IsTopLevel()) + break; + ancestor = ancestor->GetParent(); } - if (!handled) - { - wxKeyEvent event(wxEVT_CHAR); - event.m_shiftDown = ev->modifiers & shiftKey; - event.m_controlDown = ev->modifiers & controlKey; - event.m_altDown = ev->modifiers & optionKey; - event.m_metaDown = ev->modifiers & cmdKey; - event.m_keyCode = keyval; - event.m_x = ev->where.h; - event.m_y = ev->where.v; - event.m_timeStamp = ev->when; - event.SetEventObject(focus); - handled = focus->GetEventHandler()->ProcessEvent( event ) ; - if ( handled && event.GetSkipped() ) - handled = false ; - } - if ( !handled && - (keyval == WXK_TAB) && + } +#endif // wxUSE_ACCEL + } + if (!handled) + { + event.Skip( FALSE ) ; + event.SetEventType( wxEVT_CHAR ) ; + // raw value again + event.m_keyCode = keyval ; + + 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)) && + (!focus->HasFlag(wxTE_PROCESS_TAB)) && #endif - (focus->GetParent()) && - (focus->GetParent()->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->GetEventHandler()->ProcessEvent( new_event ); - if ( handled && new_event.GetSkipped() ) - handled = false ; - } - } - if ( !handled ) - { - // if window is not having a focus still testing for default enter or cancel - // TODO add the UMA version for ActiveNonFloatingWindow - focus = wxFindWinFromMacWindow( FrontWindow() ) ; + (focus->GetParent()) && + (focus->GetParent()->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->GetEventHandler()->ProcessEvent( new_event ); + if ( handled && new_event.GetSkipped() ) + handled = false ; + } + // 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 ( keyval == WXK_RETURN ) @@ -1827,21 +1929,22 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr ) wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); event.SetEventObject(def); def->Command(event); - return ; + return true ; } } /* generate wxID_CANCEL if command-. or has been pressed (typically in dialogs) */ - else if (keyval == WXK_ESCAPE || (keyval == '.' && ev->modifiers & cmdKey ) ) + else if (keyval == WXK_ESCAPE || (keyval == '.' && modifiers & cmdKey ) ) { wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL); new_event.SetEventObject( focus ); handled = focus->GetEventHandler()->ProcessEvent( new_event ); } } - } } + return handled ; } + void wxApp::MacHandleKeyUpEvent( WXEVENTREF evr ) { EventRecord* ev = (EventRecord*) evr ; @@ -1853,31 +1956,47 @@ void wxApp::MacHandleKeyUpEvent( WXEVENTREF evr ) } else { - short keycode ; - short keychar ; - keychar = short(ev->message & charCodeMask); - keycode = short(ev->message & keyCodeMask) >> 8 ; - - wxWindow* focus = wxWindow::FindFocus() ; - if ( focus ) - { - long keyval = wxMacTranslateKey(keychar, keycode) ; - - wxKeyEvent event(wxEVT_KEY_UP); - event.m_shiftDown = ev->modifiers & shiftKey; - event.m_controlDown = ev->modifiers & controlKey; - event.m_altDown = ev->modifiers & optionKey; - event.m_metaDown = ev->modifiers & cmdKey; - event.m_keyCode = keyval; - event.m_x = ev->where.h; - event.m_y = ev->where.v; - event.m_timeStamp = ev->when; - event.SetEventObject(focus); - bool handled = focus->GetEventHandler()->ProcessEvent( event ) ; - } + MacSendKeyUpEvent( wxWindow::FindFocus() , ev->message , ev->modifiers , ev->when , ev->where.h , ev->where.v ) ; } } +bool wxApp::MacSendKeyUpEvent( 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) ) + { + // 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)) | keycode, &state); + keychar = short(keyInfo & charCodeMask); + keycode = short(keyInfo & keyCodeMask) >> 8 ; + } + long keyval = wxMacTranslateKey(keychar, keycode) ; + + 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 = 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 ; @@ -2001,8 +2120,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 ; @@ -2021,14 +2148,14 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr ) 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 ) @@ -2042,41 +2169,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 : { - // if ( s_lastMouseDown == 0 ) - // ev->modifiers |= btnState ; - - // Calling GetNextEvent with a zero event mask will always - // pass back a null event. However, it fills the EventRecord - // with the state of the modifier keys. This is needed since - // the modifier state returned by WaitForNextEvent often is - // wrong mouse move events. The attempt above to correct this - // didn't always work (under OS X at least). - - EventRecord tmp; - ::GetNextEvent(0, &tmp); - ev->modifiers = tmp.modifiers; - wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ; if ( win ) win->MacMouseMoved( ev , windowPart ) ; else - UMAShowArrowCursor(); - + { + if ( wxIsBusy() ) + { + } + else + UMAShowArrowCursor(); + } } break; + default : + { + if ( wxIsBusy() ) + { + } + else + UMAShowArrowCursor(); + } + break ; } } break ;