X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cdccdfabb29bd51aded9aac141e1f7bbd6c85443..328f0df87c7c315602ed0a8b39ace1ff8f88eb89:/src/mac/carbon/dnd.cpp diff --git a/src/mac/carbon/dnd.cpp b/src/mac/carbon/dnd.cpp index ab82e4c481..11709e12ce 100644 --- a/src/mac/carbon/dnd.cpp +++ b/src/mac/carbon/dnd.cpp @@ -17,18 +17,12 @@ #ifndef WX_PRECOMP #include "wx/app.h" - #include "wx/window.h" + #include "wx/toplevel.h" + #include "wx/gdicmn.h" #endif // WX_PRECOMP -#include "wx/toplevel.h" -#include "wx/gdicmn.h" #include "wx/mac/private.h" -#ifndef __DARWIN__ - #include -#endif - - // ---------------------------------------------------------------------------- // globals // ---------------------------------------------------------------------------- @@ -38,8 +32,9 @@ typedef struct wxWindow *m_currentTargetWindow; wxDropTarget *m_currentTarget; wxDropSource *m_currentSource; -} -MacTrackingGlobals; + wxDragResult m_result; + int m_flags; +} MacTrackingGlobals; MacTrackingGlobals gTrackingGlobals; @@ -86,6 +81,8 @@ wxDragResult wxDropTarget::OnData( bool wxDropTarget::CurrentDragHasSupportedFormat() { bool supported = false; + if (m_dataObject == NULL) + return false; if ( gTrackingGlobals.m_currentSource != NULL ) { @@ -112,28 +109,11 @@ bool wxDropTarget::CurrentDragHasSupportedFormat() if ( !supported ) { - UInt16 items; - OSErr result; - ItemReference theItem; - FlavorType theType; - UInt16 flavors = 0; - - CountDragItems( (DragReference)m_currentDrag, &items ); - for (UInt16 index = 1; index <= items && !supported; ++index) - { - flavors = 0; - GetDragItemReferenceNumber( (DragReference)m_currentDrag, index, &theItem ); - CountDragItemFlavors( (DragReference)m_currentDrag, theItem, &flavors ); + PasteboardRef pasteboard; - for ( UInt16 flavor = 1; flavor <= flavors; ++flavor ) - { - result = GetFlavorType( (DragReference)m_currentDrag, theItem, flavor, &theType ); - if ( m_dataObject->IsSupportedFormat( wxDataFormat( theType ) ) ) - { - supported = true; - break; - } - } + if ( GetDragPasteboard( (DragReference)m_currentDrag, &pasteboard ) == noErr ) + { + supported = m_dataObject->HasDataInPasteboard( pasteboard ); } } @@ -186,114 +166,15 @@ bool wxDropTarget::GetData() if ( !transferred ) { - UInt16 items; - OSErr result; - ItemReference theItem; - FlavorType theType; - FlavorFlags theFlags; - UInt16 flavors; - wxString filenamesPassed; - - CountDragItems( (DragReference)m_currentDrag, &items ); - for (UInt16 index = 1; index <= items; ++index) - { - 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 (preferredFormat == format) - { - 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 == kScrapFlavorTypeText) - { - // 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++; - } - - if (dataSize > 0) - theData = new char[dataSize]; - else - theData = NULL; - - GetFlavorData( (DragReference)m_currentDrag, theItem, theType, (void*)theData, &dataSize, 0L ); - switch (theType) - { - 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) - { - HFSFlavor* theFile = (HFSFlavor*)theData; - wxString name = wxMacFSSpec2MacFilename( &theFile->fileSpec ); - - if (!name.empty()) - filenamesPassed += name + wxT("\n"); - } - break; - - default: - m_dataObject->SetData( format, dataSize, theData ); - break; - } - - delete [] theData; - } - break; - } - } - } + PasteboardRef pasteboard; - if (filenamesPassed.Len() > 0) + if ( GetDragPasteboard( (DragReference)m_currentDrag, &pasteboard ) == noErr ) { - wxCharBuffer buf = filenamesPassed.fn_str(); - m_dataObject->SetData( wxDataFormat(wxDF_FILENAME), strlen( buf ), (const char*)buf ); + transferred = m_dataObject->GetFromPasteboard( pasteboard ); } } - return true; + return transferred; } //------------------------------------------------------------------------- @@ -331,6 +212,18 @@ wxDropSource::~wxDropSource() { } +OSStatus wxMacPromiseKeeper(PasteboardRef WXUNUSED(inPasteboard), + PasteboardItemID WXUNUSED(inItem), + CFStringRef WXUNUSED(inFlavorType), + void * WXUNUSED(inContext)) +{ + OSStatus err = noErr; + + // we might add promises here later, inContext is the wxDropSource* + + return err; +} + wxDragResult wxDropSource::DoDragDrop(int flags) { wxASSERT_MSG( m_data, wxT("Drop source: no data") ); @@ -338,114 +231,63 @@ wxDragResult wxDropSource::DoDragDrop(int flags) if ((m_data == NULL) || (m_data->GetFormatCount() == 0)) return (wxDragResult)wxDragNone; - OSStatus result; DragReference theDrag; RgnHandle dragRegion; - - if ((result = NewDrag( &theDrag )) != noErr) - return wxDragNone; + OSStatus err = noErr; + PasteboardRef pasteboard; // 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 ) + err = PasteboardCreate( kPasteboardUniqueName, &pasteboard ); + if ( err != noErr ) + return wxDragNone; + + // we add a dummy promise keeper because of strange messages when linking against carbon debug + err = PasteboardSetPromiseKeeper( pasteboard, wxMacPromiseKeeper, this ); + if ( err != noErr ) { - 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' ) - { - if ( dataSize > 0 ) - dataSize--; - dataPtr[ dataSize ] = 0; - if ( type == 'utxt' ) - { - if ( dataSize > 0 ) - dataSize--; - dataPtr[ dataSize ] = 0; - } + CFRelease( pasteboard ); + return wxDragNone; + } - AddDragItemFlavor( theDrag, theItem, type, dataPtr, dataSize, 0 ); - } - else if (type == kDragFlavorTypeHFS ) - { - HFSFlavor theFlavor; - OSErr err = noErr; - CInfoPBRec cat; - - 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) - { - theFlavor.fdFlags = cat.hFileInfo.ioFlFndrInfo.fdFlags; - if (theFlavor.fileSpec.parID == fsRtParID) - { - theFlavor.fileCreator = 'MACS'; - theFlavor.fileType = 'disk'; - } - else if ((cat.hFileInfo.ioFlAttrib & ioDirMask) != 0) - { - theFlavor.fileCreator = 'MACS'; - theFlavor.fileType = 'fold'; - } - else - { - theFlavor.fileCreator = cat.hFileInfo.ioFlFndrInfo.fdCreator; - theFlavor.fileType = cat.hFileInfo.ioFlFndrInfo.fdType; - } + err = PasteboardClear( pasteboard ); + if ( err != noErr ) + { + CFRelease( pasteboard ); + return wxDragNone; + } + PasteboardSynchronize( pasteboard ); - AddDragItemFlavor( theDrag, theItem, type, &theFlavor, sizeof(theFlavor), 0 ); - } - } - else - { - AddDragItemFlavor( theDrag, theItem, type, dataPtr, dataSize, 0 ); - } + m_data->AddToPasteboard( pasteboard, 1 ); - delete [] dataPtr; + if (NewDragWithPasteboard( pasteboard , &theDrag) != noErr) + { + CFRelease( pasteboard ); + return wxDragNone; } - delete [] formats; - dragRegion = NewRgn(); RgnHandle tempRgn = NewRgn(); - EventRecord* ev = NULL; - -#if !TARGET_CARBON // TODO - ev = (EventRecord*) wxTheApp->MacGetCurrentEvent(); -#else EventRecord rec; - ev = &rec; - wxMacConvertEventToRecord( (EventRef) wxTheApp->MacGetCurrentEvent(), &rec ); -#endif + ConvertEventRefToEventRecord( (EventRef) wxTheApp->MacGetCurrentEvent(), &rec ); 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 ); + rec.where.h - dragRegionOuterBoundary, + rec.where.v - dragRegionOuterBoundary, + rec.where.h + dragRegionOuterBoundary, + rec.where.v + dragRegionOuterBoundary ); SetRectRgn( tempRgn, - ev->where.h - dragRegionInnerBoundary, - ev->where.v - dragRegionInnerBoundary, - ev->where.h + dragRegionInnerBoundary, - ev->where.v + dragRegionInnerBoundary ); + rec.where.h - dragRegionInnerBoundary, + rec.where.v - dragRegionInnerBoundary, + rec.where.h + dragRegionInnerBoundary, + rec.where.v + dragRegionInnerBoundary ); DiffRgn( dragRegion, tempRgn, dragRegion ); DisposeRgn( tempRgn ); @@ -454,18 +296,17 @@ wxDragResult wxDropSource::DoDragDrop(int flags) // only when drag was successfully completed gTrackingGlobals.m_currentSource = this; - result = TrackDrag( theDrag, ev, dragRegion ); + gTrackingGlobals.m_result = wxDragNone; + gTrackingGlobals.m_flags = flags; + + err = TrackDrag( theDrag, &rec, dragRegion ); + DisposeRgn( dragRegion ); DisposeDrag( theDrag ); + CFRelease( pasteboard ); gTrackingGlobals.m_currentSource = NULL; - bool optionDown = GetCurrentKeyModifiers() & optionKey; - wxDragResult dndresult = wxDragCopy; - if ( flags != wxDrag_CopyOnly ) - // on mac the option key is always the indication for copy - dndresult = optionDown ? wxDragCopy : wxDragMove; - - return dndresult; + return gTrackingGlobals.m_result; } bool wxDropSource::MacInstallDefaultCursor(wxDragResult effect) @@ -518,7 +359,7 @@ pascal OSErr wxMacWindowDragTrackingHandler( GetDragAttributes( theDrag, &attributes ); - wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ); + wxNonOwnedWindow* toplevel = wxFindWinFromMacWindow( theWindow ); bool optionDown = GetCurrentKeyModifiers() & optionKey; wxDragResult result = optionDown ? wxDragCopy : wxDragMove; @@ -545,13 +386,12 @@ pascal OSErr wxMacWindowDragTrackingHandler( GetDragMouse( theDrag, &mouse, 0L ); localMouse = mouse; - GlobalToLocal( &localMouse ); + wxMacGlobalToLocal( theWindow, &localMouse ); { wxWindow *win = NULL; ControlPartCode controlPart; - ControlRef control = wxMacFindControlUnderMouse( - toplevel, localMouse, theWindow, &controlPart ); + ControlRef control = FindControlUnderMouse( localMouse, theWindow, &controlPart ); if ( control ) win = wxFindControlFromMacControl( control ); else @@ -570,7 +410,9 @@ pascal OSErr wxMacWindowDragTrackingHandler( // this window is left if ( trackingGlobals->m_currentTarget ) { +#ifndef __LP64__ HideDragHilite( theDrag ); +#endif trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ); trackingGlobals->m_currentTarget->OnLeave(); trackingGlobals->m_currentTarget = NULL; @@ -599,7 +441,9 @@ pascal OSErr wxMacWindowDragTrackingHandler( 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 ); } } @@ -610,7 +454,7 @@ pascal OSErr wxMacWindowDragTrackingHandler( if ( trackingGlobals->m_currentTarget ) { trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ); - trackingGlobals->m_currentTarget->OnDragOver( localx, localy, result ); + result = trackingGlobals->m_currentTarget->OnDragOver( localx, localy, result ); } } @@ -661,7 +505,9 @@ pascal OSErr wxMacWindowDragTrackingHandler( { trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ); trackingGlobals->m_currentTarget->OnLeave(); +#ifndef __LP64__ HideDragHilite( theDrag ); +#endif trackingGlobals->m_currentTarget = NULL; } trackingGlobals->m_currentTargetWindow = NULL; @@ -688,7 +534,7 @@ pascal OSErr wxMacWindowDragReceiveHandler( trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ); GetDragMouse( theDrag, &mouse, 0L ); localMouse = mouse; - GlobalToLocal( &localMouse ); + wxMacGlobalToLocal( theWindow, &localMouse ); localx = localMouse.h; localy = localMouse.v; @@ -697,13 +543,20 @@ pascal OSErr wxMacWindowDragReceiveHandler( trackingGlobals->m_currentTargetWindow->MacRootWindowToWindow( &localx, &localy ); if ( trackingGlobals->m_currentTarget->OnDrop( localx, localy ) ) { - bool optionDown = GetCurrentKeyModifiers() & optionKey; - wxDragResult result = optionDown ? wxDragCopy : wxDragMove; - trackingGlobals->m_currentTarget->OnData( localx, localy, result ); + // 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; } -#endif +#endif // wxUSE_DRAG_AND_DROP +