support undo patch applied

[wxWidgets.git] / src / mac / carbon / toplevel.cpp

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index f4e54270cd15fe982cc9e2d485e5cf355e0b25e6..d79e546eb825427c2a8bb5a81d5f843cb896d536 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -63,7 +63,9 @@ static   Point     gs_lastWhere;
 static   long      gs_lastWhen = 0;
 
 
 static   long      gs_lastWhen = 0;
 
 

+#if TARGET_CARBON

 static pascal long wxShapedMacWindowDef(short varCode, WindowRef window, SInt16 message, SInt32 param);
 static pascal long wxShapedMacWindowDef(short varCode, WindowRef window, SInt16 message, SInt32 param);

+#endif

 
 // ============================================================================
 // wxTopLevelWindowMac implementation
 
 // ============================================================================
 // wxTopLevelWindowMac implementation


@@ -109,7 +111,6 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even
     UInt32 keyCode ;
     UInt32 modifiers ;
     Point point ;
     UInt32 keyCode ;
     UInt32 modifiers ;
     Point point ;

-    UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;

 
     EventRef rawEvent ;
 
 
     EventRef rawEvent ;
 


@@ -121,16 +122,32 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even
     GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL,
         sizeof( Point ), NULL, &point );
 
     GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL,
         sizeof( Point ), NULL, &point );
 

-    UInt32 message = (keyCode << 8) + charCode;
-

     switch ( GetEventKind( event ) )
     {
         case kEventTextInputUnicodeForKeyEvent :
     switch ( GetEventKind( event ) )
     {
         case kEventTextInputUnicodeForKeyEvent :

+            // this is only called when no default handler has jumped in, eg a wxControl on a floater window does not
+            // get its own kEventTextInputUnicodeForKeyEvent, so we route back the 
+            wxControl* control = wxDynamicCast( focus , wxControl ) ;
+            if ( control )
+            {
+                ControlHandle macControl = (ControlHandle) control->GetMacControl() ;
+                if ( macControl )
+                {
+                    ::HandleControlKey( macControl , keyCode , charCode , modifiers ) ;
+                    result = noErr ;
+                }
+            }
+            /*
+            // this may lead to double events sent to a window in case all handlers have skipped the key down event
+            UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
+            UInt32 message = (keyCode << 8) + charCode;
+

             if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent(
                 focus , message , modifiers , when , point.h , point.v ) )
             {
                 result = noErr ;
             }
             if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent(
                 focus , message , modifiers , when , point.h , point.v ) )
             {
                 result = noErr ;
             }

+            */

             break ;
     }
 
             break ;
     }
 


@@ -347,6 +364,64 @@ pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler )
 
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler )
 

+// Patch 531199 defined a window event handler, as follows.
+// TODO: merge the moving/sizing event handling with the event
+// handler above.
+#if 0
+static pascal OSStatus
+WindowHandler( EventHandlerCallRef inHandler, EventRef inEvent, void* userData )
+{
+    Rect               bounds;
+    SInt16             height, width;
+    UInt32             attributes;
+    OSStatus   result = eventNotHandledErr;
+    
+    GetEventParameter( inEvent, kEventParamAttributes, typeUInt32, NULL, sizeof( UInt32 ), NULL, &attributes );
+    
+    if ((attributes & (kWindowBoundsChangeSizeChanged | kWindowBoundsChangeOriginChanged)) != 0)
+    {
+        // Extract the current bounds. This is the paramter you get to modify to
+        // alter the window position or size during a window resizing.
+        GetEventParameter( inEvent, kEventParamCurrentBounds, typeQDRectangle, NULL, sizeof( bounds ), NULL, &bounds );
+        
+        wxRect rect;
+        rect.SetLeft(bounds.left);
+        rect.SetTop(bounds.top);
+        rect.SetRight(bounds.right);
+        rect.SetBottom(bounds.bottom);
+        
+        bool rc;
+        wxWindowMac *pWindow = (wxWindowMac*)userData;
+        if ((attributes & kWindowBoundsChangeSizeChanged) != 0) {
+            wxSizeEvent event(rect, pWindow->GetId());
+            event.SetEventObject(pWindow);
+            rc = pWindow->GetEventHandler()->ProcessEvent(event);
+            rect = event.GetRect();
+        }
+        else {
+            wxMoveEvent event(rect, pWindow->GetId());
+            event.SetEventObject(pWindow);
+            rc = pWindow->GetEventHandler()->ProcessEvent(event);
+            rect = event.GetRect();
+        }
+        
+        if (rc) {
+            bounds.left = rect.GetLeft();
+            bounds.top = rect.GetTop();
+            bounds.right = rect.GetRight();
+            bounds.bottom = rect.GetBottom();
+        }
+        
+        // Set the current bounds parameter to our adjusted bounds. Return
+        // noErr to indicate we handled this event.
+        SetEventParameter( inEvent, kEventParamCurrentBounds, typeQDRectangle, sizeof( bounds ), &bounds );
+        result = noErr;
+    }
+    return result;
+}
+#endif
+    // WindowHandler
+

 #endif
 
 // ---------------------------------------------------------------------------
 #endif
 
 // ---------------------------------------------------------------------------


@@ -596,9 +671,14 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
         attr |= kWindowCloseBoxAttribute ;
     }
 
         attr |= kWindowCloseBoxAttribute ;
     }
 

+#if TARGET_CARBON
+#if 0 //  having problems right now with that

     if (HasFlag(wxSTAY_ON_TOP))
        wclass = kUtilityWindowClass;
     if (HasFlag(wxSTAY_ON_TOP))
        wclass = kUtilityWindowClass;

+#endif
+#endif

 
 

+#if TARGET_CARBON

     if ( HasFlag(wxFRAME_SHAPED) )
     {
         WindowDefSpec customWindowDefSpec;
     if ( HasFlag(wxFRAME_SHAPED) )
     {
         WindowDefSpec customWindowDefSpec;


@@ -610,6 +690,7 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
                               (WindowRef*) &m_macWindow);
     }
     else
                               (WindowRef*) &m_macWindow);
     }
     else

+#endif

     {
         ::CreateNewWindow( wclass , attr , &theBoundsRect , (WindowRef*)&m_macWindow ) ;
     }
     {
         ::CreateNewWindow( wclass , attr , &theBoundsRect , (WindowRef*)&m_macWindow ) ;
     }


@@ -621,16 +702,29 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
     InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
     InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacWindowEventHandlerUPP(),
         GetEventTypeCount(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler));
     InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
     InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacWindowEventHandlerUPP(),
         GetEventTypeCount(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler));

+
+    // Patch 531199 also defined a window event handler, as follows:
+#if 0
+    // install a window event handler to send wxEVT_MOVING and wxEVT_SIZING events
+    EventTypeSpec events[] = { { kEventClassWindow, kEventWindowBoundsChanging } };
+    EventHandlerUPP    handlerProc = NewEventHandlerUPP( WindowHandler );
+    EventHandlerRef eventHandlerRef;
+    InstallWindowEventHandler( m_macWindowData->m_macWindow, handlerProc, GetEventTypeCount(events),
+        events, (void*)this, &eventHandlerRef);
+#endif
+

 #endif
     m_macFocus = NULL ;
 
 
 #endif
     m_macFocus = NULL ;
 
 

+#if TARGET_CARBON

     if ( HasFlag(wxFRAME_SHAPED) )
     {
         // default shape matches the window size
         wxRegion rgn(0, 0, m_width, m_height);
         SetShape(rgn);
     }
     if ( HasFlag(wxFRAME_SHAPED) )
     {
         // default shape matches the window size
         wxRegion rgn(0, 0, m_width, m_height);
         SetShape(rgn);
     }

+#endif

 }
 
 void wxTopLevelWindowMac::MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXHWND *window  , wxWindowMac** rootwin)
 }
 
 void wxTopLevelWindowMac::MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXHWND *window  , wxWindowMac** rootwin)


@@ -660,20 +754,26 @@ void wxTopLevelWindowMac::MacUpdate( long timestamp)
 {
     wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) m_macWindow) ) ;
 
 {
     wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) m_macWindow) ) ;
 

+    RgnHandle       visRgn = NewRgn() ;
+    GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), visRgn );

     BeginUpdate( (WindowRef)m_macWindow ) ;
 
     RgnHandle       updateRgn = NewRgn();
     RgnHandle       diffRgn = NewRgn() ;
     BeginUpdate( (WindowRef)m_macWindow ) ;
 
     RgnHandle       updateRgn = NewRgn();
     RgnHandle       diffRgn = NewRgn() ;

+

     if ( updateRgn && diffRgn )
     {
 #if 1
         // macos internal control redraws clean up areas we'd like to redraw ourselves
         // therefore we pick the boundary rect and make sure we can redraw it
     if ( updateRgn && diffRgn )
     {
 #if 1
         // macos internal control redraws clean up areas we'd like to redraw ourselves
         // therefore we pick the boundary rect and make sure we can redraw it

+        // this has to be intersected by the visRgn in order to avoid drawing over its own
+        // boundaries

         RgnHandle trueUpdateRgn = NewRgn() ;
         Rect trueUpdateRgnBoundary ;
         GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), trueUpdateRgn );
         GetRegionBounds( trueUpdateRgn , &trueUpdateRgnBoundary ) ;
         RgnHandle trueUpdateRgn = NewRgn() ;
         Rect trueUpdateRgnBoundary ;
         GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), trueUpdateRgn );
         GetRegionBounds( trueUpdateRgn , &trueUpdateRgnBoundary ) ;

-        RectRgn( (RgnHandle) updateRgn , &trueUpdateRgnBoundary ) ;
+        RectRgn( updateRgn , &trueUpdateRgnBoundary ) ;
+        SectRgn( updateRgn , visRgn , updateRgn ) ;

         if ( trueUpdateRgn )
             DisposeRgn( trueUpdateRgn ) ;
         SetPortVisibleRegion(  GetWindowPort( (WindowRef)m_macWindow ), updateRgn ) ;
         if ( trueUpdateRgn )
             DisposeRgn( trueUpdateRgn ) ;
         SetPortVisibleRegion(  GetWindowPort( (WindowRef)m_macWindow ), updateRgn ) ;


@@ -690,6 +790,9 @@ void wxTopLevelWindowMac::MacUpdate( long timestamp)
         DisposeRgn( updateRgn );
     if ( diffRgn )
         DisposeRgn( diffRgn );
         DisposeRgn( updateRgn );
     if ( diffRgn )
         DisposeRgn( diffRgn );

+    if ( visRgn )
+        DisposeRgn( visRgn ) ;
+        

     EndUpdate( (WindowRef)m_macWindow ) ;
     SetEmptyRgn( (RgnHandle) m_macNoEraseUpdateRgn ) ;
     m_macNeedsErasing = false ;
     EndUpdate( (WindowRef)m_macWindow ) ;
     SetEmptyRgn( (RgnHandle) m_macNoEraseUpdateRgn ) ;
     m_macNeedsErasing = false ;


@@ -756,7 +859,7 @@ void wxTopLevelWindowMac::MacFireMouseEvent(
 
     if ( kind == mouseDown )
     {
 
     if ( kind == mouseDown )
     {

-        if ( timestamp - gs_lastWhen <= GetDblTime() )
+        if ( timestamp - gs_lastWhen <= (long) GetDblTime() )

         {
             if ( abs( localwhere.h - gs_lastWhere.h ) < 3 && abs( localwhere.v - gs_lastWhere.v ) < 3 )
             {
         {
             if ( abs( localwhere.h - gs_lastWhere.h ) < 3 && abs( localwhere.v - gs_lastWhere.v ) < 3 )
             {


@@ -858,7 +961,7 @@ void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating )
     // Early versions of MacOS X don't refresh backgrounds properly,
     // so refresh the whole window on activation and deactivation.
     long osVersion = UMAGetSystemVersion();
     // Early versions of MacOS X don't refresh backgrounds properly,
     // so refresh the whole window on activation and deactivation.
     long osVersion = UMAGetSystemVersion();

-    if (osVersion >= 0x1000 && osVersion < 0x1020)
+    if (osVersion >= 0x1000 && osVersion < 0x1020 )

     {
         Refresh(TRUE);
     }
     {
         Refresh(TRUE);
     }


@@ -891,9 +994,7 @@ bool wxTopLevelWindowMac::Show(bool show)
 
     if (show)
     {
 
     if (show)
     {

-      // this is leading to incorrect window layering in some situations
-      // ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil);
-      ::ShowWindow( (WindowRef)m_macWindow ) ;
+      ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil);

       ::SelectWindow( (WindowRef)m_macWindow ) ;
       // no need to generate events here, they will get them triggered by macos
       // actually they should be , but apparently they are not
       ::SelectWindow( (WindowRef)m_macWindow ) ;
       // no need to generate events here, they will get them triggered by macos
       // actually they should be , but apparently they are not


@@ -904,9 +1005,7 @@ bool wxTopLevelWindowMac::Show(bool show)
     }
     else
     {
     }
     else
     {

-      // this is leading to incorrect window layering in some situations
-      // ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowHideTransitionAction,nil);
-      ::HideWindow( (WindowRef)m_macWindow ) ;
+      ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowHideTransitionAction,nil);

     }
 
     if ( !show )
     }
 
     if ( !show )


@@ -1072,6 +1171,7 @@ bool wxTopLevelWindowMac::SetShape(const wxRegion& region)
     wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), FALSE,
                  _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
 
     wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), FALSE,
                  _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
 

+#if TARGET_CARBON

     // The empty region signifies that the shape should be removed from the
     // window.
     if ( region.IsEmpty() )
     // The empty region signifies that the shape should be removed from the
     // window.
     if ( region.IsEmpty() )


@@ -1096,15 +1196,17 @@ bool wxTopLevelWindowMac::SetShape(const wxRegion& region)
     // Tell the window manager that the window has changed shape
     ReshapeCustomWindow((WindowRef)MacGetWindowRef());
     return TRUE;
     // Tell the window manager that the window has changed shape
     ReshapeCustomWindow((WindowRef)MacGetWindowRef());
     return TRUE;

+#else
+    return FALSE;
+#endif

 }
 
 }
 

-
-

 // ---------------------------------------------------------------------------
 // Support functions for shaped windows, based on Apple's CustomWindow sample at
 // http://developer.apple.com/samplecode/Sample_Code/Human_Interface_Toolbox/Mac_OS_High_Level_Toolbox/CustomWindow.htm
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // Support functions for shaped windows, based on Apple's CustomWindow sample at
 // http://developer.apple.com/samplecode/Sample_Code/Human_Interface_Toolbox/Mac_OS_High_Level_Toolbox/CustomWindow.htm
 // ---------------------------------------------------------------------------
 

+#if TARGET_CARBON

 
 static void wxShapedMacWindowGetPos(WindowRef window, Rect* inRect)
 {
 
 static void wxShapedMacWindowGetPos(WindowRef window, Rect* inRect)
 {


@@ -1231,4 +1333,6 @@ static pascal long wxShapedMacWindowDef(short varCode, WindowRef window, SInt16
     return 0;
 }
 
     return 0;
 }
 

+#endif

 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------

+