LocalToGlobal/GlobalToLocal Conversions with Carbon API, cleanup, hittesting correcte...

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

diff --git a/src/mac/carbon/dnd.cpp b/src/mac/carbon/dnd.cpp
index b9df2ac0049fdbb811a6fcb96d3642ab1b8b3076..53b046c2fb80f24fa9c2ade6054aff8264336c9a 100644 (file)
--- a/src/mac/carbon/dnd.cpp
+++ b/src/mac/carbon/dnd.cpp
@@ -24,6 +24,10 @@
 #include "wx/gdicmn.h"
 #include "wx/mac/private.h"
 
 #include "wx/gdicmn.h"
 #include "wx/mac/private.h"
 

+#ifndef __DARWIN__
+    #include <Scrap.h>
+#endif
+

 // ----------------------------------------------------------------------------
 // global
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // global
 // ----------------------------------------------------------------------------


@@ -195,34 +199,45 @@ bool wxDropTarget::GetData()
                         Size dataSize ;
                         Ptr theData ;
                         GetFlavorDataSize((DragReference)m_currentDrag, theItem, theType, &dataSize);
                         Size dataSize ;
                         Ptr theData ;
                         GetFlavorDataSize((DragReference)m_currentDrag, theItem, theType, &dataSize);

-                        if ( theType == 'TEXT' )
+                        if ( theType == kScrapFlavorTypeText )

                         {
                             // this increment is only valid for allocating, on the next GetFlavorData
                             // call it is reset again to the original value
                             dataSize++ ;
                         }
                         {
                             // this increment is only valid for allocating, on the next GetFlavorData
                             // call it is reset again to the original value
                             dataSize++ ;
                         }

+                        else if ( theType == kScrapFlavorTypeUnicode )
+                        {
+                            // this increment is only valid for allocating, on the next GetFlavorData
+                            // call it is reset again to the original value
+                            dataSize++ ;
+                            dataSize++ ;
+                        }

                         theData = new char[dataSize];
                         GetFlavorData((DragReference)m_currentDrag, theItem, theType, (void*) theData, &dataSize, 0L); 
                         theData = new char[dataSize];
                         GetFlavorData((DragReference)m_currentDrag, theItem, theType, (void*) theData, &dataSize, 0L); 

-                        if( theType == 'TEXT' )
+                        if( theType == kScrapFlavorTypeText )

                         {
                         {

-                            theData[dataSize]=0 ;       
-                            if ( wxApp::s_macDefaultEncodingIsPC )
-                            {
-                                wxMacConvertToPC((char*)theData,(char*)theData,dataSize) ;
-                            }
-                            m_dataObject->SetData( format, dataSize, theData );
+                            theData[dataSize]=0 ; 
+                            m_dataObject->SetData( wxDataFormat(wxDF_TEXT), dataSize , theData );
+                        }
+ #if wxUSE_UNICODE
+                        else if ( theType == kScrapFlavorTypeUnicode )
+                        {
+                            theData[dataSize]=0 ; 
+                            theData[dataSize+1]=0 ; 
+                            m_dataObject->SetData( wxDataFormat(wxDF_UNICODETEXT), dataSize , theData );

                         }
                         }

+ #endif

                         else if ( theType == kDragFlavorTypeHFS )
                         {
                             HFSFlavor* theFile = (HFSFlavor*) theData ;
                             wxString name = wxMacFSSpec2MacFilename( &theFile->fileSpec ) ;
                         else if ( theType == kDragFlavorTypeHFS )
                         {
                             HFSFlavor* theFile = (HFSFlavor*) theData ;
                             wxString name = wxMacFSSpec2MacFilename( &theFile->fileSpec ) ;

-                            if (  firstFileAdded )
-                                ((wxFileDataObject*)m_dataObject)->AddFile( name ) ;
-                            else
+                            if ( !firstFileAdded )

                             {
                             {

-                                ((wxFileDataObject*)m_dataObject)->SetData( 0 , name.c_str() ) ;
+                                // reset file list
+                                ((wxFileDataObject*)m_dataObject)->SetData( 0 , "" ) ;

                                 firstFileAdded = true ;    
                             }
                                 firstFileAdded = true ;    
                             }

+                            ((wxFileDataObject*)m_dataObject)->AddFile( name ) ;

                         }
                         else
                         {
                         }
                         else
                         {


@@ -246,9 +261,10 @@ bool wxDropTarget::GetData()
 // drag request
 
 wxDropSource::wxDropSource(wxWindow *win,
 // drag request
 
 wxDropSource::wxDropSource(wxWindow *win,

-                           const wxIcon &iconCopy,
-                           const wxIcon &iconMove,
-                           const wxIcon &iconNone)
+                           const wxCursor &cursorCopy,
+                           const wxCursor &cursorMove,
+                           const wxCursor &cursorStop)
+            : wxDropSourceBase(cursorCopy, cursorMove, cursorStop)

 {
     wxMacEnsureTrackingHandlersInstalled() ;
     m_window = win;
 {
     wxMacEnsureTrackingHandlersInstalled() ;
     m_window = win;


@@ -256,9 +272,10 @@ wxDropSource::wxDropSource(wxWindow *win,
 
 wxDropSource::wxDropSource(wxDataObject& data,
                            wxWindow *win,
 
 wxDropSource::wxDropSource(wxDataObject& data,
                            wxWindow *win,

-                           const wxIcon &iconCopy,
-                           const wxIcon &iconMove,
-                           const wxIcon &iconNone)
+                           const wxCursor &cursorCopy,
+                           const wxCursor &cursorMove,
+                           const wxCursor &cursorStop)
+            : wxDropSourceBase(cursorCopy, cursorMove, cursorStop)

 {
     wxMacEnsureTrackingHandlersInstalled() ;
     SetData( data );
 {
     wxMacEnsureTrackingHandlersInstalled() ;
     SetData( data );


@@ -301,11 +318,10 @@ wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags))
         if ( type == 'TEXT' )
         {
             dataSize-- ;
         if ( type == 'TEXT' )
         {
             dataSize-- ;

-            if ( wxApp::s_macDefaultEncodingIsPC )
-            {
-                wxMacConvertFromPC((char*)dataPtr,(char*)dataPtr,dataSize) ;
-            }
-            AddDragItemFlavor(theDrag, theItem, type , dataPtr, dataSize, 0);
+            dataPtr[ dataSize ] = 0 ;
+            wxString st( (wxChar*) dataPtr ) ;
+            wxCharBuffer buf = st.mb_str( wxConvLocal) ;
+            AddDragItemFlavor(theDrag, theItem, type , buf.data(), strlen(buf), 0);

         }
         else if (type == kDragFlavorTypeHFS )
         {
         }
         else if (type == kDragFlavorTypeHFS )
         {


@@ -380,7 +396,26 @@ wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags))
     DisposeDrag(theDrag);
     gTrackingGlobals.m_currentSource = NULL ;
     
     DisposeDrag(theDrag);
     gTrackingGlobals.m_currentSource = NULL ;
     

-    return wxDragCopy ;
+    KeyMap keymap;
+    GetKeys(keymap);
+    bool optionDown = keymap[1] & 4;
+    wxDragResult dndresult = optionDown ? wxDragCopy : wxDragMove;
+    return dndresult;
+}
+
+bool wxDropSource::MacInstallDefaultCursor(wxDragResult effect)
+{
+    const wxCursor& cursor = GetCursor(effect);
+    if ( cursor.Ok() )
+    {
+        cursor.MacInstall() ;
+
+        return TRUE;
+    }
+    else
+    {
+        return FALSE;
+    }

 }
 
 bool gTrackingGlobalsInstalled = false ;
 }
 
 bool gTrackingGlobalsInstalled = false ;


@@ -416,6 +451,12 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
     DragAttributes attributes;
     GetDragAttributes(theDrag, &attributes);
     wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ; 
     DragAttributes attributes;
     GetDragAttributes(theDrag, &attributes);
     wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ; 

+
+    KeyMap keymap;
+    GetKeys(keymap);
+    bool optionDown = keymap[1] & 4;
+    wxDragResult result = optionDown ? wxDragCopy : wxDragMove;
+

     switch(theMessage) 
     {
         case kDragTrackingEnterHandler:
     switch(theMessage) 
     {
         case kDragTrackingEnterHandler:


@@ -433,12 +474,19 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
             GetDragMouse(theDrag, &mouse, 0L);
             localMouse = mouse;
             GlobalToLocal(&localMouse);
             GetDragMouse(theDrag, &mouse, 0L);
             localMouse = mouse;
             GlobalToLocal(&localMouse);

+
+

             
 //            if (attributes & kDragHasLeftSenderWindow) 
             {
                 wxPoint point(localMouse.h , localMouse.v) ;
                 wxWindow *win = NULL ;
             
 //            if (attributes & kDragHasLeftSenderWindow) 
             {
                 wxPoint point(localMouse.h , localMouse.v) ;
                 wxWindow *win = NULL ;

-                toplevel->MacGetWindowFromPointSub( point , &win ) ;
+                ControlPartCode controlPart ;
+                ControlRef control = wxMacFindControlUnderMouse( localMouse ,
+                    theWindow , &controlPart ) ;
+                if ( control )
+                    win = wxFindControlFromMacControl( control ) ;
+                // TODO toplevel->MacGetWindowFromPointSub( point , &win ) ;

                 int localx , localy ;
                 localx = localMouse.h ;
                 localy = localMouse.v ;
                 int localx , localy ;
                 localx = localMouse.h ;
                 localy = localMouse.v ;


@@ -464,19 +512,26 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
                         // this window is entered
                         trackingGlobals->m_currentTargetWindow = win ;
                         trackingGlobals->m_currentTarget = win->GetDropTarget() ;
                         // this window is entered
                         trackingGlobals->m_currentTargetWindow = win ;
                         trackingGlobals->m_currentTarget = win->GetDropTarget() ;

-                        if ( trackingGlobals->m_currentTarget )

                         {
                         {

-                          trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ;
-                           if ( trackingGlobals->m_currentTarget->OnEnter(
-                                localx , localy , wxDragCopy ) != wxDragNone )
+
+                               if ( trackingGlobals->m_currentTarget )
+                               {
+                               trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ;
+                               result = trackingGlobals->m_currentTarget->OnEnter(
+                                       localx , localy , result ) ;
+                            }
+                                
+                           
+                            if ( result != wxDragNone )

                             {
                             {

-                              int x , y ;
-                              x = y = 0 ;
-                              win->MacWindowToRootWindow( &x , &y ) ;
-                              RgnHandle hiliteRgn = NewRgn() ;
-                              SetRectRgn( hiliteRgn , x , y , x+win->GetSize().x ,y+win->GetSize().y) ;
-                              ShowDragHilite(theDrag, hiliteRgn, true);
-                              DisposeRgn( hiliteRgn ) ;
+                                int x , y ;
+                                x = y = 0 ;
+                                win->MacWindowToRootWindow( &x , &y ) ;
+                                RgnHandle hiliteRgn = NewRgn() ;
+                                Rect r = { y , x , y+win->GetSize().y , x+win->GetSize().x } ;
+                                RectRgn( hiliteRgn , &r ) ;
+                                ShowDragHilite(theDrag, hiliteRgn, true);
+                                DisposeRgn( hiliteRgn ) ;

                             }
                         }
                     }
                             }
                         }
                     }


@@ -487,9 +542,44 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
                     {
                         trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ;
                         trackingGlobals->m_currentTarget->OnDragOver(
                     {
                         trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ;
                         trackingGlobals->m_currentTarget->OnDragOver(

-                            localx , localy , wxDragCopy ) ;
+                            localx , localy , result ) ;

                     }
                 }
                     }
                 }

+
+                // set cursor for OnEnter and OnDragOver
+                if ( trackingGlobals->m_currentSource && trackingGlobals->m_currentSource->GiveFeedback( result ) == FALSE )
+                {
+                  if ( trackingGlobals->m_currentSource->MacInstallDefaultCursor( result ) == FALSE )
+                  {
+                      switch( result )
+                      {
+                          case wxDragCopy :
+                              {
+                                  wxCursor cursor(wxCURSOR_COPY_ARROW) ;
+                                  cursor.MacInstall() ;
+                              }
+                              break ;
+                          case wxDragMove :
+                              {
+                                  wxCursor cursor(wxCURSOR_ARROW) ;
+                                  cursor.MacInstall() ;
+                              }
+                              break ;
+                          case wxDragNone :
+                              {
+                                  wxCursor cursor(wxCURSOR_NO_ENTRY) ;
+                                  cursor.MacInstall() ;
+                              }
+                              break ;
+
+                          case wxDragError:
+                          case wxDragLink:
+                          case wxDragCancel:
+                              // put these here to make gcc happy
+                              ;
+                      }
+                  }
+                }

                 
           }
             // MyTrackItemUnderMouse(localMouse, theWindow);
                 
           }
             // MyTrackItemUnderMouse(localMouse, theWindow);


@@ -529,7 +619,11 @@ pascal OSErr wxMacWindowDragReceiveHandler(WindowPtr theWindow,
             trackingGlobals->m_currentTargetWindow->MacRootWindowToWindow( &localx , &localy ) ;
         if ( trackingGlobals->m_currentTarget->OnDrop( localx , localy ) )
         {
             trackingGlobals->m_currentTargetWindow->MacRootWindowToWindow( &localx , &localy ) ;
         if ( trackingGlobals->m_currentTarget->OnDrop( localx , localy ) )
         {

-            trackingGlobals->m_currentTarget->OnData( localx , localy , wxDragCopy ) ;
+            KeyMap keymap;
+            GetKeys(keymap);
+            bool optionDown = keymap[1] & 4;
+            wxDragResult result = optionDown ? wxDragCopy : wxDragMove;
+            trackingGlobals->m_currentTarget->OnData( localx , localy , result ) ;

         }
     }
     return(noErr);
         }
     }
     return(noErr);