X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da804130ba446bd9dcc81a843b8bb1dd1c662e52..52af3158e974b042008474268570f3bdb7ce95ee:/src/mac/carbon/dnd.cpp diff --git a/src/mac/carbon/dnd.cpp b/src/mac/carbon/dnd.cpp index 2ea8ae7c90..6f5a325730 100644 --- a/src/mac/carbon/dnd.cpp +++ b/src/mac/carbon/dnd.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: dnd.cpp -// Purpose: wxDropTarget, wxDropSource, wxDataObject implementation +// Name: src/mac/carbon/dnd.cpp +// Purpose: wxDropTarget, wxDropSource implementations // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 @@ -9,35 +9,41 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "dnd.h" -#endif - -#include "wx/defs.h" +#include "wx/wxprec.h" #if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" -#include "wx/window.h" -#include "wx/toplevel.h" -#include "wx/app.h" -#include "wx/gdicmn.h" + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/toplevel.h" + #include "wx/gdicmn.h" +#endif // WX_PRECOMP + #include "wx/mac/private.h" +#ifndef __DARWIN__ + #include +#endif + + // ---------------------------------------------------------------------------- -// global +// globals // ---------------------------------------------------------------------------- -void wxMacEnsureTrackingHandlersInstalled() ; - -typedef struct +typedef struct { - wxWindow* m_currentTargetWindow ; - wxDropTarget* m_currentTarget ; - wxDropSource* m_currentSource ; -} MacTrackingGlobals ; + wxWindow *m_currentTargetWindow; + wxDropTarget *m_currentTarget; + wxDropSource *m_currentSource; + wxDragResult m_result; + int m_flags; +} MacTrackingGlobals; + +MacTrackingGlobals gTrackingGlobals; -MacTrackingGlobals gTrackingGlobals ; +void wxMacEnsureTrackingHandlersInstalled(); //---------------------------------------------------------------------------- // wxDropTarget @@ -46,29 +52,29 @@ MacTrackingGlobals gTrackingGlobals ; wxDropTarget::wxDropTarget( wxDataObject *data ) : wxDropTargetBase( data ) { - wxMacEnsureTrackingHandlersInstalled() ; + wxMacEnsureTrackingHandlersInstalled(); } -wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x), - wxCoord WXUNUSED(y), - wxDragResult def ) +wxDragResult wxDropTarget::OnDragOver( + wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), + wxDragResult def ) { - return CurrentDragHasSupportedFormat() ? def : wxDragNone; } bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) ) { - if (!m_dataObject) - return FALSE; + if (m_dataObject == NULL) + return false; - return CurrentDragHasSupportedFormat() ; + return CurrentDragHasSupportedFormat(); } -wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), - wxDragResult def ) +wxDragResult wxDropTarget::OnData( + wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), + wxDragResult def ) { - if (!m_dataObject) + if (m_dataObject == NULL) return wxDragNone; if (!CurrentDragHasSupportedFormat()) @@ -77,165 +83,218 @@ wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), return GetData() ? def : wxDragNone; } -bool wxDropTarget::CurrentDragHasSupportedFormat() +bool wxDropTarget::CurrentDragHasSupportedFormat() { - bool supported = false ; + bool supported = false; + if ( gTrackingGlobals.m_currentSource != NULL ) { - wxDataObject* data = gTrackingGlobals.m_currentSource->GetDataObject() ; - + wxDataObject* data = gTrackingGlobals.m_currentSource->GetDataObject(); + if ( data ) { - size_t formatcount = data->GetFormatCount() ; - wxDataFormat *array = new wxDataFormat[ formatcount ]; + size_t formatcount = data->GetFormatCount(); + wxDataFormat *array = new wxDataFormat[formatcount]; data->GetAllFormats( array ); - for (size_t i = 0; !supported && i < formatcount ; i++) + for (size_t i = 0; !supported && i < formatcount; i++) { - wxDataFormat format = array[i] ; - if ( m_dataObject->IsSupported( format ) ) + wxDataFormat format = array[i]; + if ( m_dataObject->IsSupported( format ) ) { - supported = true ; - break ; + supported = true; + break; } } - delete[] array ; + + delete [] array; } } + if ( !supported ) { - UInt16 items ; - OSErr result; - CountDragItems((DragReference)m_currentDrag, &items); - for (UInt16 index = 1; index <= items && supported == false ; ++index) + UInt16 items; + ItemReference theItem; + FlavorType theType; + UInt16 flavors = 0; + + CountDragItems( (DragReference)m_currentDrag, &items ); + for (UInt16 index = 1; index <= items && !supported; ++index) { - ItemReference theItem; - FlavorType theType ; - UInt16 flavors = 0 ; - GetDragItemReferenceNumber((DragReference)m_currentDrag, index, &theItem); - CountDragItemFlavors( (DragReference)m_currentDrag, theItem , &flavors ) ; - for ( UInt16 flavor = 1 ; flavor <= flavors ; ++flavor ) + flavors = 0; + GetDragItemReferenceNumber( (DragReference)m_currentDrag, index, &theItem ); + CountDragItemFlavors( (DragReference)m_currentDrag, theItem, &flavors ); + + for ( UInt16 flavor = 1; flavor <= flavors; ++flavor ) { - result = GetFlavorType((DragReference)m_currentDrag, theItem, flavor , &theType); + GetFlavorType( (DragReference)m_currentDrag, theItem, flavor, &theType ); if ( m_dataObject->IsSupportedFormat( wxDataFormat( theType ) ) ) { - supported = true ; - break ; + supported = true; + break; } } } } - return supported ; + + return supported; } bool wxDropTarget::GetData() { - if (!m_dataObject) - return FALSE; - + if (m_dataObject == NULL) + return false; + if ( !CurrentDragHasSupportedFormat() ) - return FALSE ; - - bool transferred = false ; + return false; + + bool transferred = false; if ( gTrackingGlobals.m_currentSource != NULL ) { - wxDataObject* data = gTrackingGlobals.m_currentSource->GetDataObject() ; - - if ( data ) + wxDataObject* data = gTrackingGlobals.m_currentSource->GetDataObject(); + + if (data != NULL) { - size_t formatcount = data->GetFormatCount() ; - wxDataFormat *array = new wxDataFormat[ formatcount ]; + size_t formatcount = data->GetFormatCount(); + wxDataFormat *array = new wxDataFormat[formatcount]; data->GetAllFormats( array ); - for (size_t i = 0; !transferred && i < formatcount ; i++) + for (size_t i = 0; !transferred && i < formatcount; i++) { - wxDataFormat format = array[i] ; - if ( m_dataObject->IsSupported( format ) ) + wxDataFormat format = array[i]; + if ( m_dataObject->IsSupported( format ) ) { int size = data->GetDataSize( format ); - transferred = true ; - - if (size == 0) + transferred = true; + + if (size == 0) { - m_dataObject->SetData(format , 0 , 0 ) ; + m_dataObject->SetData( format, 0, 0 ); } else { char *d = new char[size]; - data->GetDataHere( format , (void*) d ); - m_dataObject->SetData( format , size , d ) ; - delete[] d ; + data->GetDataHere( format, (void*)d ); + m_dataObject->SetData( format, size, d ); + delete [] d; } } } - delete[] array ; + + delete [] array; } } + if ( !transferred ) { - UInt16 items ; + UInt16 items; OSErr result; - bool firstFileAdded = false ; - CountDragItems((DragReference)m_currentDrag, &items); - for (UInt16 index = 1; index <= items; ++index) + ItemReference theItem; + FlavorType theType; + FlavorFlags theFlags; + UInt16 flavors; + wxString filenamesPassed; + + CountDragItems( (DragReference)m_currentDrag, &items ); + for (UInt16 index = 1; index <= items; ++index) { - ItemReference theItem; - FlavorType theType ; - UInt16 flavors = 0 ; - GetDragItemReferenceNumber((DragReference)m_currentDrag, index, &theItem); - CountDragItemFlavors( (DragReference)m_currentDrag, theItem , &flavors ) ; - for ( UInt16 flavor = 1 ; flavor <= flavors ; ++flavor ) + flavors = 0; + GetDragItemReferenceNumber( (DragReference)m_currentDrag, index, &theItem ); + CountDragItemFlavors( (DragReference)m_currentDrag, theItem, &flavors ); + wxDataFormat preferredFormat = m_dataObject->GetPreferredFormat( wxDataObject::Set ); + bool hasPreferredFormat = false; + + for (UInt16 flavor = 1; flavor <= flavors; ++flavor) { - result = GetFlavorType((DragReference)m_currentDrag, theItem, flavor , &theType); - wxDataFormat format(theType) ; - if ( m_dataObject->IsSupportedFormat( format ) ) + result = GetFlavorType( (DragReference)m_currentDrag, theItem, flavor, &theType ); + wxDataFormat format( theType ); + if (preferredFormat == format) { - FlavorFlags theFlags; - result = GetFlavorFlags((DragReference)m_currentDrag, theItem, theType, &theFlags); - if (result == noErr) + hasPreferredFormat = true; + break; + } + } + + for (UInt16 flavor = 1; flavor <= flavors; ++flavor) + { + result = GetFlavorType( (DragReference)m_currentDrag, theItem, flavor, &theType ); + wxDataFormat format( theType ); + if ((hasPreferredFormat && format == preferredFormat) + || (!hasPreferredFormat && m_dataObject->IsSupportedFormat( format ))) + { + result = GetFlavorFlags( (DragReference)m_currentDrag, theItem, theType, &theFlags ); + if (result == noErr) { - Size dataSize ; - Ptr theData ; - GetFlavorDataSize((DragReference)m_currentDrag, theItem, theType, &dataSize); - if ( theType == 'TEXT' ) + Size dataSize; + Ptr theData; + + GetFlavorDataSize( (DragReference)m_currentDrag, theItem, theType, &dataSize ); + 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++; } - theData = new char[dataSize]; - GetFlavorData((DragReference)m_currentDrag, theItem, theType, (void*) theData, &dataSize, 0L); - if( theType == 'TEXT' ) + else if (theType == kScrapFlavorTypeUnicode) { - theData[dataSize]=0 ; - if ( wxApp::s_macDefaultEncodingIsPC ) - { - wxMacConvertToPC((char*)theData,(char*)theData,dataSize) ; - } - m_dataObject->SetData( format, dataSize, theData ); + // this increment is only valid for allocating: + // on the next GetFlavorData call it is reset again to the original value + dataSize++; + dataSize++; } - else if ( theType == kDragFlavorTypeHFS ) + + if (dataSize > 0) + theData = new char[dataSize]; + else + theData = NULL; + + GetFlavorData( (DragReference)m_currentDrag, theItem, theType, (void*)theData, &dataSize, 0L ); + switch (theType) { - HFSFlavor* theFile = (HFSFlavor*) theData ; - wxString name = wxMacFSSpec2MacFilename( &theFile->fileSpec ) ; - if ( firstFileAdded ) - ((wxFileDataObject*)m_dataObject)->AddFile( name ) ; - else + case kScrapFlavorTypeText: + theData[dataSize] = 0; + m_dataObject->SetData( wxDataFormat(wxDF_TEXT), dataSize, theData ); + break; + +#if wxUSE_UNICODE + case kScrapFlavorTypeUnicode: + theData[dataSize + 0] = + theData[dataSize + 1] = 0; + m_dataObject->SetData( wxDataFormat(wxDF_UNICODETEXT), dataSize, theData ); + break; +#endif + + case kDragFlavorTypeHFS: + if (theData != NULL) { - ((wxFileDataObject*)m_dataObject)->SetData( 0 , name.c_str() ) ; - firstFileAdded = true ; + HFSFlavor* theFile = (HFSFlavor*)theData; +#ifndef __LP64__ + wxString name = wxMacFSSpec2MacFilename( &theFile->fileSpec ); + + if (!name.empty()) + filenamesPassed += name + wxT("\n"); +#endif } - } - else - { + break; + + default: m_dataObject->SetData( format, dataSize, theData ); + break; } - delete[] theData; + + delete [] theData; } - break ; + break; } } } + + if (filenamesPassed.length() > 0) + { + wxCharBuffer buf = filenamesPassed.fn_str(); + m_dataObject->SetData( wxDataFormat(wxDF_FILENAME), strlen( buf ), (const char*)buf ); + } } - return TRUE ; + + return true; } //------------------------------------------------------------------------- @@ -251,7 +310,8 @@ wxDropSource::wxDropSource(wxWindow *win, const wxCursor &cursorStop) : wxDropSourceBase(cursorCopy, cursorMove, cursorStop) { - wxMacEnsureTrackingHandlersInstalled() ; + wxMacEnsureTrackingHandlersInstalled(); + m_window = win; } @@ -262,7 +322,8 @@ wxDropSource::wxDropSource(wxDataObject& data, const wxCursor &cursorStop) : wxDropSourceBase(cursorCopy, cursorMove, cursorStop) { - wxMacEnsureTrackingHandlersInstalled() ; + wxMacEnsureTrackingHandlersInstalled(); + SetData( data ); m_window = win; } @@ -271,197 +332,237 @@ wxDropSource::~wxDropSource() { } - -wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags)) +wxDragResult wxDropSource::DoDragDrop(int flags) { wxASSERT_MSG( m_data, wxT("Drop source: no data") ); - - if (!m_data) - return (wxDragResult) wxDragNone; - - if (m_data->GetFormatCount() == 0) - return (wxDragResult) wxDragNone; - - OSErr result; + + if ((m_data == NULL) || (m_data->GetFormatCount() == 0)) + return (wxDragResult)wxDragNone; + DragReference theDrag; RgnHandle dragRegion; - if ((result = NewDrag(&theDrag))) - { - return wxDragNone ; - } + + if (NewDrag( &theDrag ) != noErr) + return wxDragNone; + // add data to drag - size_t formatCount = m_data->GetFormatCount() ; - wxDataFormat *formats = new wxDataFormat[formatCount] ; - m_data->GetAllFormats( formats ) ; - ItemReference theItem = 1 ; - for ( size_t i = 0 ; i < formatCount ; ++i ) + size_t formatCount = m_data->GetFormatCount(); + wxDataFormat *formats = new wxDataFormat[formatCount]; + m_data->GetAllFormats( formats ); + ItemReference theItem = (ItemReference) 1; + + for ( size_t i = 0; i < formatCount; ++i ) { - size_t dataSize = m_data->GetDataSize( formats[i] ) ; - Ptr dataPtr = new char[dataSize] ; - m_data->GetDataHere( formats[i] , dataPtr ) ; - OSType type = formats[i].GetFormatId() ; - if ( type == 'TEXT' ) + size_t dataSize = m_data->GetDataSize( formats[i] ); + Ptr dataPtr = new char[dataSize]; + m_data->GetDataHere( formats[i], dataPtr ); + OSType type = formats[i].GetFormatId(); + if ( type == 'TEXT' || type == 'utxt' ) { - dataSize-- ; - if ( wxApp::s_macDefaultEncodingIsPC ) + if ( dataSize > 0 ) + dataSize--; + dataPtr[ dataSize ] = 0; + if ( type == 'utxt' ) { - wxMacConvertFromPC((char*)dataPtr,(char*)dataPtr,dataSize) ; + if ( dataSize > 0 ) + dataSize--; + dataPtr[ dataSize ] = 0; } - AddDragItemFlavor(theDrag, theItem, type , dataPtr, dataSize, 0); + + AddDragItemFlavor( theDrag, theItem, type, dataPtr, dataSize, 0 ); } else if (type == kDragFlavorTypeHFS ) { - HFSFlavor theFlavor ; + HFSFlavor theFlavor; OSErr err = noErr; +#ifndef __LP64__ CInfoPBRec cat; - - wxMacFilename2FSSpec( dataPtr , &theFlavor.fileSpec ) ; - + + wxMacFilename2FSSpec( wxString( dataPtr, *wxConvCurrent ), &theFlavor.fileSpec ); + + memset( &cat, 0, sizeof(cat) ); cat.hFileInfo.ioNamePtr = theFlavor.fileSpec.name; cat.hFileInfo.ioVRefNum = theFlavor.fileSpec.vRefNum; cat.hFileInfo.ioDirID = theFlavor.fileSpec.parID; cat.hFileInfo.ioFDirIndex = 0; - err = PBGetCatInfoSync(&cat); - if (err == noErr ) + err = PBGetCatInfoSync( &cat ); +#endif + if (err == noErr) { +#ifndef __LP64__ theFlavor.fdFlags = cat.hFileInfo.ioFlFndrInfo.fdFlags; - if (theFlavor.fileSpec.parID == fsRtParID) { + if (theFlavor.fileSpec.parID == fsRtParID) + { theFlavor.fileCreator = 'MACS'; theFlavor.fileType = 'disk'; - } else if ((cat.hFileInfo.ioFlAttrib & ioDirMask) != 0) { + } + else if ((cat.hFileInfo.ioFlAttrib & ioDirMask) != 0) + { theFlavor.fileCreator = 'MACS'; theFlavor.fileType = 'fold'; - } else { + } + else + { theFlavor.fileCreator = cat.hFileInfo.ioFlFndrInfo.fdCreator; theFlavor.fileType = cat.hFileInfo.ioFlFndrInfo.fdType; } - AddDragItemFlavor(theDrag, theItem, type , &theFlavor, sizeof(theFlavor), 0); - } +#endif + AddDragItemFlavor( theDrag, theItem, type, &theFlavor, sizeof(theFlavor), 0 ); + } } else { - AddDragItemFlavor(theDrag, theItem, type , dataPtr, dataSize, 0); + AddDragItemFlavor( theDrag, theItem, type, dataPtr, dataSize, 0 ); } - delete[] dataPtr ; + + delete [] dataPtr; } - delete[] formats ; - + + delete [] formats; + dragRegion = NewRgn(); - RgnHandle tempRgn = NewRgn() ; - - EventRecord* ev = NULL ; + RgnHandle tempRgn = NewRgn(); + + EventRecord* ev = NULL; + #if !TARGET_CARBON // TODO - ev = (EventRecord*) wxTheApp->MacGetCurrentEvent() ; + ev = (EventRecord*) wxTheApp->MacGetCurrentEvent(); #else - EventRecord rec ; - ev = &rec ; - wxMacConvertEventToRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) ; + EventRecord rec; + ev = &rec; + wxMacConvertEventToRecord( (EventRef) wxTheApp->MacGetCurrentEvent(), &rec ); #endif - const short dragRegionOuterBoundary = 10 ; - const short dragRegionInnerBoundary = 9 ; - - SetRectRgn( dragRegion , ev->where.h - dragRegionOuterBoundary , - ev->where.v - dragRegionOuterBoundary , - ev->where.h + dragRegionOuterBoundary , - ev->where.v + dragRegionOuterBoundary ) ; - - SetRectRgn( tempRgn , ev->where.h - dragRegionInnerBoundary , - ev->where.v - dragRegionInnerBoundary , - ev->where.h + dragRegionInnerBoundary , - ev->where.v + dragRegionInnerBoundary ) ; - - DiffRgn( dragRegion , tempRgn , dragRegion ) ; - DisposeRgn( tempRgn ) ; - - // TODO:work with promises in order to return data only when drag - // was successfully completed - - gTrackingGlobals.m_currentSource = this ; - result = TrackDrag(theDrag, ev , dragRegion); - DisposeRgn(dragRegion); - DisposeDrag(theDrag); - gTrackingGlobals.m_currentSource = NULL ; - - return wxDragCopy ; + + const short dragRegionOuterBoundary = 10; + const short dragRegionInnerBoundary = 9; + + SetRectRgn( + dragRegion, + ev->where.h - dragRegionOuterBoundary, + ev->where.v - dragRegionOuterBoundary, + ev->where.h + dragRegionOuterBoundary, + ev->where.v + dragRegionOuterBoundary ); + + SetRectRgn( + tempRgn, + ev->where.h - dragRegionInnerBoundary, + ev->where.v - dragRegionInnerBoundary, + ev->where.h + dragRegionInnerBoundary, + ev->where.v + dragRegionInnerBoundary ); + + DiffRgn( dragRegion, tempRgn, dragRegion ); + DisposeRgn( tempRgn ); + + // TODO: work with promises in order to return data + // only when drag was successfully completed + + gTrackingGlobals.m_currentSource = this; + gTrackingGlobals.m_result = wxDragNone; + gTrackingGlobals.m_flags = flags; + + TrackDrag( theDrag, ev, dragRegion ); + DisposeRgn( dragRegion ); + DisposeDrag( theDrag ); + gTrackingGlobals.m_currentSource = NULL; + + return gTrackingGlobals.m_result; } bool wxDropSource::MacInstallDefaultCursor(wxDragResult effect) { const wxCursor& cursor = GetCursor(effect); - if ( cursor.Ok() ) - { - cursor.MacInstall() ; + bool result = cursor.Ok(); - return TRUE; - } - else - { - return FALSE; - } + if ( result ) + cursor.MacInstall(); + + return result; } -bool gTrackingGlobalsInstalled = false ; +bool gTrackingGlobalsInstalled = false; // passing the globals via refcon is not needed by the CFM and later architectures anymore // but I'll leave it in there, just in case... -pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, WindowPtr theWindow, - void *handlerRefCon, DragReference theDrag) ; -pascal OSErr wxMacWindowDragReceiveHandler(WindowPtr theWindow, void *handlerRefCon, -DragReference theDrag) ; +pascal OSErr wxMacWindowDragTrackingHandler( + DragTrackingMessage theMessage, WindowPtr theWindow, + void *handlerRefCon, DragReference theDrag ); +pascal OSErr wxMacWindowDragReceiveHandler( + WindowPtr theWindow, void *handlerRefCon, + DragReference theDrag ); void wxMacEnsureTrackingHandlersInstalled() { - if( !gTrackingGlobalsInstalled ) + if ( !gTrackingGlobalsInstalled ) { - OSErr result; + OSStatus err; - result = InstallTrackingHandler(NewDragTrackingHandlerUPP(wxMacWindowDragTrackingHandler), 0L,&gTrackingGlobals); - wxASSERT( result == noErr ) ; - result = InstallReceiveHandler(NewDragReceiveHandlerUPP(wxMacWindowDragReceiveHandler), 0L, &gTrackingGlobals); - wxASSERT( result == noErr ) ; + err = InstallTrackingHandler( NewDragTrackingHandlerUPP(wxMacWindowDragTrackingHandler), 0L, &gTrackingGlobals ); + verify_noerr( err ); - gTrackingGlobalsInstalled = true ; + err = InstallReceiveHandler( NewDragReceiveHandlerUPP(wxMacWindowDragReceiveHandler), 0L, &gTrackingGlobals ); + verify_noerr( err ); + + gTrackingGlobalsInstalled = true; } } -pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, WindowPtr theWindow, - void *handlerRefCon, DragReference theDrag) -{ +pascal OSErr wxMacWindowDragTrackingHandler( + DragTrackingMessage theMessage, WindowPtr theWindow, + void *handlerRefCon, DragReference theDrag ) +{ MacTrackingGlobals* trackingGlobals = (MacTrackingGlobals*) handlerRefCon; + Point mouse, localMouse; DragAttributes attributes; - GetDragAttributes(theDrag, &attributes); - wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ; - switch(theMessage) + + GetDragAttributes( theDrag, &attributes ); + + wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ); + + bool optionDown = GetCurrentKeyModifiers() & optionKey; + wxDragResult result = optionDown ? wxDragCopy : wxDragMove; + + switch (theMessage) { case kDragTrackingEnterHandler: - break; case kDragTrackingLeaveHandler: break; + case kDragTrackingEnterWindow: - trackingGlobals->m_currentTargetWindow = NULL ; - trackingGlobals->m_currentTarget = NULL ; + if (trackingGlobals != NULL) + { + trackingGlobals->m_currentTargetWindow = NULL; + trackingGlobals->m_currentTarget = NULL; + } break; + case kDragTrackingInWindow: + if (trackingGlobals == NULL) + break; if (toplevel == NULL) break; - GetDragMouse(theDrag, &mouse, 0L); + GetDragMouse( theDrag, &mouse, 0L ); localMouse = mouse; - GlobalToLocal(&localMouse); - -// if (attributes & kDragHasLeftSenderWindow) + wxMacGlobalToLocal( theWindow, &localMouse ); + { - wxPoint point(localMouse.h , localMouse.v) ; - wxWindow *win = NULL ; - toplevel->MacGetWindowFromPointSub( point , &win ) ; - int localx , localy ; - localx = localMouse.h ; - localy = localMouse.v ; - //TODO : should we use client coordinates + wxWindow *win = NULL; + ControlPartCode controlPart; + ControlRef control = wxMacFindControlUnderMouse( + toplevel, localMouse, theWindow, &controlPart ); + if ( control ) + win = wxFindControlFromMacControl( control ); + else + win = toplevel; + + int localx, localy; + localx = localMouse.h; + localy = localMouse.v; + if ( win ) - win->MacRootWindowToWindow( &localx , &localy ) ; + win->MacRootWindowToWindow( &localx, &localy ); if ( win != trackingGlobals->m_currentTargetWindow ) { if ( trackingGlobals->m_currentTargetWindow ) @@ -469,119 +570,153 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind // this window is left if ( trackingGlobals->m_currentTarget ) { - HideDragHilite(theDrag); - trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ; - trackingGlobals->m_currentTarget->OnLeave() ; +#ifndef __LP64__ + HideDragHilite( theDrag ); +#endif + trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ); + trackingGlobals->m_currentTarget->OnLeave(); trackingGlobals->m_currentTarget = NULL; - trackingGlobals->m_currentTargetWindow = NULL ; + trackingGlobals->m_currentTargetWindow = NULL; } } + if ( win ) { // this window is entered - trackingGlobals->m_currentTargetWindow = win ; - trackingGlobals->m_currentTarget = win->GetDropTarget() ; + trackingGlobals->m_currentTargetWindow = win; + trackingGlobals->m_currentTarget = win->GetDropTarget(); { - wxDragResult result = wxDragNone ; - if ( trackingGlobals->m_currentTarget ) - { - trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ; - result = trackingGlobals->m_currentTarget->OnEnter( - localx , localy , wxDragCopy ) ; - } - - if ( trackingGlobals->m_currentSource && trackingGlobals->m_currentSource->GiveFeedback( result ) == FALSE ) + if ( trackingGlobals->m_currentTarget ) { - 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 ; - } - } + 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 ); +#ifndef __LP64__ + ShowDragHilite( theDrag, hiliteRgn, true ); +#endif + DisposeRgn( hiliteRgn ); } } } } else { - if( trackingGlobals->m_currentTarget ) + if ( trackingGlobals->m_currentTarget ) { - trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ; - trackingGlobals->m_currentTarget->OnDragOver( - localx , localy , wxDragCopy ) ; + trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ); + trackingGlobals->m_currentTarget->OnDragOver( localx, localy, result ); } } - - } - // MyTrackItemUnderMouse(localMouse, theWindow); + + // set cursor for OnEnter and OnDragOver + if ( trackingGlobals->m_currentSource && !trackingGlobals->m_currentSource->GiveFeedback( result ) ) + { + if ( !trackingGlobals->m_currentSource->MacInstallDefaultCursor( result ) ) + { + int cursorID = wxCURSOR_NONE; + + switch (result) + { + case wxDragCopy: + cursorID = wxCURSOR_COPY_ARROW; + break; + + case wxDragMove: + cursorID = wxCURSOR_ARROW; + break; + + case wxDragNone: + cursorID = wxCURSOR_NO_ENTRY; + break; + + case wxDragError: + case wxDragLink: + case wxDragCancel: + default: + // put these here to make gcc happy + ; + } + + if (cursorID != wxCURSOR_NONE) + { + wxCursor cursor( cursorID ); + cursor.MacInstall(); + } + } + } + } break; + case kDragTrackingLeaveWindow: - if (trackingGlobals->m_currentTarget) + if (trackingGlobals == NULL) + break; + + if (trackingGlobals->m_currentTarget) { - trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ; - trackingGlobals->m_currentTarget->OnLeave() ; - HideDragHilite(theDrag); - trackingGlobals->m_currentTarget = NULL ; + trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ); + trackingGlobals->m_currentTarget->OnLeave(); +#ifndef __LP64__ + HideDragHilite( theDrag ); +#endif + trackingGlobals->m_currentTarget = NULL; } - trackingGlobals->m_currentTargetWindow = NULL ; + trackingGlobals->m_currentTargetWindow = NULL; + break; + + default: break; } - return(noErr); + + return noErr; } -pascal OSErr wxMacWindowDragReceiveHandler(WindowPtr theWindow, - void *handlerRefCon, - DragReference theDrag) -{ - MacTrackingGlobals* trackingGlobals = (MacTrackingGlobals*) handlerRefCon; +pascal OSErr wxMacWindowDragReceiveHandler( + WindowPtr theWindow, + void *handlerRefCon, + DragReference theDrag) +{ + MacTrackingGlobals* trackingGlobals = (MacTrackingGlobals*)handlerRefCon; if ( trackingGlobals->m_currentTarget ) { - Point mouse,localMouse ; - int localx,localy ; - - trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ; - GetDragMouse(theDrag, &mouse, 0L); + Point mouse, localMouse; + int localx, localy; + + trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ); + GetDragMouse( theDrag, &mouse, 0L ); localMouse = mouse; - GlobalToLocal(&localMouse); - localx = localMouse.h ; - localy = localMouse.v ; - //TODO : should we use client coordinates + wxMacGlobalToLocal( theWindow, &localMouse ); + localx = localMouse.h; + localy = localMouse.v; + + // TODO : should we use client coordinates? if ( trackingGlobals->m_currentTargetWindow ) - 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 ) ; + // the option key indicates copy in Mac UI, if it's not pressed do + // move by default if it's allowed at all + wxDragResult + result = !(trackingGlobals->m_flags & wxDrag_AllowMove) || + (GetCurrentKeyModifiers() & optionKey) + ? wxDragCopy + : wxDragMove; + trackingGlobals->m_result = + trackingGlobals->m_currentTarget->OnData( localx, localy, result ); } } - return(noErr); + + return noErr; } -#endif + +#endif // wxUSE_DRAG_AND_DROP +