X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/35a8698b656ec574b267c1ebfacc2e6dfd434194..cd5082468fc4dd397d7eea951fa4e905ea3f9368:/src/mac/app.cpp

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index 7e83eb254a..f19403201a 100644
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -540,6 +540,7 @@ bool wxApp::Initialize()
 
   wxMacCreateNotifierTable() ;
 
+
   UMAShowArrowCursor() ;
 
   return TRUE;
@@ -916,6 +917,136 @@ int wxEntry( int argc, char *argv[] , bool enterLoop )
     return retValue;
 }
 
+#if TARGET_CARBON
+
+bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec)
+{
+    bool converted = ConvertEventRefToEventRecord( event,rec) ;
+    OSStatus err = noErr ;
+    if ( !converted )
+    {
+        switch( GetEventClass( event ) )
+        {
+            case kEventClassKeyboard :
+            {
+                converted = true ;
+                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 ;
+                    unsigned char charCode ;
+                    UInt32 modifiers ;
+                    GetMouse( &rec->where) ;
+
+                    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);
+                    rec->modifiers = modifiers ;
+                    rec->message = (keyCode << 8 ) + charCode ;
+                }
+            }
+            break ;
+            case kEventClassTextInput :
+            {
+                switch( GetEventKind( event ) )
+                {
+                    case kEventTextInputUnicodeForKeyEvent :
+                        {
+                            EventRef rawEvent ;
+                            err = GetEventParameter( event , kEventParamTextInputSendKeyboardEvent ,typeEventRef,NULL,sizeof(rawEvent),NULL,&rawEvent ) ;
+                            converted = true ;
+                            {
+                                UInt32 keyCode ;
+                                unsigned char charCode ;
+                                UInt32 modifiers ;
+                                GetMouse( &rec->where) ;
+                                rec->what = keyDown ;
+                                err = GetEventParameter(rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, 4, NULL, &modifiers);
+                                err = GetEventParameter(rawEvent, kEventParamKeyCode, typeUInt32, NULL, 4, NULL, &keyCode);
+                                err = GetEventParameter(rawEvent, kEventParamKeyMacCharCodes, typeChar, NULL, 1, NULL, &charCode);
+                                rec->modifiers = modifiers ;
+                                rec->message = (keyCode << 8 ) + charCode ;
+                            }
+                       }
+                        break ;
+                    default :
+                        break ;
+                }
+            }
+            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->MacHandleOneEvent( &rec ) ;
+                result = noErr ;
+            }
+            break ;
+        case kEventClassTextInput :
+            if ( wxMacConvertEventToRecord( event , &rec ) )
+            {
+                wxTheApp->MacHandleOneEvent( &rec ) ;
+                result = noErr ;
+            }
+            break ;
+        default :
+            break ;
+    }
+    return result ;
+}
+
+#endif
+
+bool wxApp::OnInit()
+{
+    if ( ! wxAppBase::OnInit() )
+        return FALSE ;
+    
+#if 0 // TARGET_CARBON
+	static const EventTypeSpec eventList[] = 
+	{
+	    { kEventClassKeyboard, kEventRawKeyDown } ,
+	    { kEventClassKeyboard, kEventRawKeyRepeat } ,
+	    { kEventClassKeyboard, kEventRawKeyUp } ,
+	    { kEventClassKeyboard, kEventRawKeyModifiersChanged } ,
+	    
+	    { kEventClassTextInput , kEventTextInputUnicodeForKeyEvent } ,
+	} ;
+	
+	InstallApplicationEventHandler(NewEventHandlerUPP(wxMacApplicationEventHandler)
+	    , WXSIZEOF(eventList), eventList, this, NULL);    
+#endif
+    return TRUE ;
+}
 // Static member initialization
 wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
 
@@ -1587,7 +1718,7 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr )
     if ( HiWord( menuresult ) )
     {
         if ( !s_macIsInModalLoop )
-        MacHandleMenuSelect( HiWord( menuresult ) , LoWord( menuresult ) ) ;
+            MacHandleMenuSelect( HiWord( menuresult ) , LoWord( menuresult ) ) ;
     }
     else
     {
@@ -1595,96 +1726,102 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr )
         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) ;
-        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 )
+        if ( MacSendKeyDownEvent( focus , keyval , 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 )
             {
+                ::HandleControlKey( (ControlHandle) control->GetMacControl() , keycode , keychar , ev->modifiers ) ;
+            }
+        }
+    }
+}
+
+bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey )
+{
+    bool handled = false ;
+    // it is wxWindows Convention to have Ctrl Key Combinations at ASCII char value
+    if ( modifiers & controlKey && keyval >= 0 && keyval < 0x20 )
+    {
+        keyval += 0x40 ;
+    }
+    wxKeyEvent event(wxEVT_KEY_DOWN);
+    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 ) ;
+    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 (!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 (ancestor->IsTopLevel())
+                    break;
+                ancestor = ancestor->GetParent();
             }
-            if ( !handled &&
-                 (keyval == WXK_TAB) &&
+        }
+#endif // wxUSE_ACCEL
+    }
+    if (!handled)
+    {
+        event.Skip( FALSE ) ;
+        event.SetEventType( wxEVT_CHAR ) ;
+
+        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 )
@@ -1696,21 +1833,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 <esc> 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 ;
@@ -1726,27 +1864,39 @@ void wxApp::MacHandleKeyUpEvent( WXEVENTREF evr )
         short keychar ;
         keychar = short(ev->message & charCodeMask);
         keycode = short(ev->message & keyCodeMask) >> 8 ;
+        long keyval = wxMacTranslateKey(keychar, keycode) ;
 
         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 ) ;
-        }
+        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
     }
 }
 
+bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey )
+{
+    bool handled = false ;
+    // it is wxWindows Convention to have Ctrl Key Combinations at ASCII char value
+    if ( modifiers & controlKey && keyval >= 0 && keyval < 0x20 )
+    {
+        keyval += 0x40 ;
+    }
+    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 = 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 ;