Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 08:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 673080 - Dropping a link on Firefox from an external program has no effect. r=neil

Browse Source
This commit is contained in:
Brian R. Bondy 2011-09-01 09:48:48 -04:00
parent a025869f6a
commit dc227b2571
2 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
widget/src/windows/nsNativeDragTarget.cpp
View File

@ -61,8 +61,8 @@ static POINTL gDragLastPoint;
* class nsNativeDragTarget
*/
nsNativeDragTarget::nsNativeDragTarget(nsIWidget * aWnd)
: m_cRef(0), mCanMove(PR_TRUE), mTookOwnRef(PR_FALSE), mWindow(aWnd),
mDropTargetHelper(nsnull)
: m_cRef(0), mEffect(DROPEFFECT_MOVE | DROPEFFECT_COPY | DROPEFFECT_LINK),
mTookOwnRef(PR_FALSE), mWindow(aWnd), mDropTargetHelper(nsnull)
{
mHWnd = (HWND)mWindow->GetNativeData(NS_NATIVE_WINDOW);
@ -123,23 +123,25 @@ STDMETHODIMP_(ULONG) nsNativeDragTarget::Release(void)
}
void
nsNativeDragTarget::GetGeckoDragAction(LPDATAOBJECT pData, DWORD grfKeyState,
LPDWORD pdwEffect,
nsNativeDragTarget::GetGeckoDragAction(DWORD grfKeyState, LPDWORD pdwEffect,
PRUint32 * aGeckoAction)
{
// Check if we can link from this data object as well.
PRBool canLink = PR_FALSE;
if (pData)
canLink = (S_OK == ::OleQueryLinkFromData(pData) ? PR_TRUE : PR_FALSE);
{
// Default is move if we can, in fact drop here,
// and if the drop source supports a move operation.
// If move is not preferred (mMovePreferred is false)
// move only when the shift key is down.
if (mCanMove && (mMovePreferred || (grfKeyState & MK_SHIFT))) {
if ((mEffect & DROPEFFECT_MOVE) &&
(mMovePreferred || (grfKeyState & MK_SHIFT))) {
*aGeckoAction = nsIDragService::DRAGDROP_ACTION_MOVE;
*pdwEffect = DROPEFFECT_MOVE;
} else {
}
else if (!(mEffect & DROPEFFECT_MOVE) &&
!(mEffect & DROPEFFECT_COPY) &&
(mEffect & DROPEFFECT_LINK)) {
*aGeckoAction = nsIDragService::DRAGDROP_ACTION_LINK;
*pdwEffect = DROPEFFECT_LINK;
}
else {
*aGeckoAction = nsIDragService::DRAGDROP_ACTION_COPY;
*pdwEffect = DROPEFFECT_COPY;
}
@ -147,7 +149,7 @@ nsNativeDragTarget::GetGeckoDragAction(LPDATAOBJECT pData, DWORD grfKeyState,
// Given the key modifiers figure out what state we are in for both
// the native system and Gecko
if (grfKeyState & MK_CONTROL) {
if (canLink && (grfKeyState & MK_SHIFT)) {
if ((mEffect & DROPEFFECT_LINK) && (grfKeyState & MK_SHIFT)) {
*aGeckoAction = nsIDragService::DRAGDROP_ACTION_LINK;
*pdwEffect = DROPEFFECT_LINK;
} else {
@ -196,15 +198,14 @@ nsNativeDragTarget::DispatchDragDropEvent(PRUint32 aEventType, POINTL aPT)
}
void
nsNativeDragTarget::ProcessDrag(LPDATAOBJECT pData,
PRUint32 aEventType,
nsNativeDragTarget::ProcessDrag(PRUint32 aEventType,
DWORD grfKeyState,
POINTL ptl,
DWORD* pdwEffect)
{
// Before dispatching the event make sure we have the correct drop action set
PRUint32 geckoAction;
GetGeckoDragAction(pData, grfKeyState, pdwEffect, &geckoAction);
GetGeckoDragAction(grfKeyState, pdwEffect, &geckoAction);
// Set the current action into the Gecko specific type
nsCOMPtr<nsIDragSession> currSession;
@ -256,8 +257,14 @@ nsNativeDragTarget::DragEnter(LPDATAOBJECT pIDataSource,
// outside app).
mDragService->StartDragSession();
// Remember if this operation allows a move.
mCanMove = (*pdwEffect) & DROPEFFECT_MOVE;
mEffect = *pdwEffect;
// If we don't have a link effect, but we can generate one, fix the
// drop effect to include it
if (!(mEffect & DROPEFFECT_LINK) && pIDataSource) {
if (S_OK == ::OleQueryLinkFromData(pIDataSource)) {
mEffect |= DROPEFFECT_LINK;
}
}
void* tempOutData = nsnull;
PRUint32 tempDataLen = 0;
@ -271,7 +278,7 @@ nsNativeDragTarget::DragEnter(LPDATAOBJECT pIDataSource,
mMovePreferred = (preferredEffect & DROPEFFECT_MOVE) != 0;
}
else
mMovePreferred = mCanMove;
mMovePreferred = (mEffect & DROPEFFECT_MOVE) != 0;
// Set the native data object into drag service
//
@ -283,7 +290,7 @@ nsNativeDragTarget::DragEnter(LPDATAOBJECT pIDataSource,
winDragService->SetIDataObject(pIDataSource);
// Now process the native drag state and then dispatch the event
ProcessDrag(pIDataSource, NS_DRAGDROP_ENTER, grfKeyState, ptl, pdwEffect);
ProcessDrag(NS_DRAGDROP_ENTER, grfKeyState, ptl, pdwEffect);
return S_OK;
}
@ -314,7 +321,7 @@ nsNativeDragTarget::DragOver(DWORD grfKeyState,
mDragService->FireDragEventAtSource(NS_DRAGDROP_DRAG);
// Now process the native drag state and then dispatch the event
ProcessDrag(nsnull, NS_DRAGDROP_OVER, grfKeyState, ptl, pdwEffect);
ProcessDrag(NS_DRAGDROP_OVER, grfKeyState, ptl, pdwEffect);
this->Release();
@ -408,7 +415,7 @@ nsNativeDragTarget::Drop(LPDATAOBJECT pData,
nsCOMPtr<nsIDragService> serv = mDragService;
// Now process the native drag state and then dispatch the event
ProcessDrag(pData, NS_DRAGDROP_DROP, grfKeyState, aPT, pdwEffect);
ProcessDrag(NS_DRAGDROP_DROP, grfKeyState, aPT, pdwEffect);
nsCOMPtr<nsIDragSession> currentDragSession;
serv->GetCurrentSession(getter_AddRefs(currentDragSession));

8
widget/src/windows/nsNativeDragTarget.h
View File

@ -102,16 +102,16 @@ public:
protected:
void GetGeckoDragAction(LPDATAOBJECT pData, DWORD grfKeyState,
LPDWORD pdwEffect, PRUint32 * aGeckoAction);
void ProcessDrag(LPDATAOBJECT pData, PRUint32 aEventType, DWORD grfKeyState,
void GetGeckoDragAction(DWORD grfKeyState, LPDWORD pdwEffect,
PRUint32 * aGeckoAction);
void ProcessDrag(PRUint32 aEventType, DWORD grfKeyState,
POINTL pt, DWORD* pdwEffect);
void DispatchDragDropEvent(PRUint32 aType, POINTL pt);
// Native Stuff
ULONG m_cRef; // reference count
HWND mHWnd;
PRBool mCanMove;
DWORD mEffect;
PRBool mMovePreferred;
PRBool mTookOwnRef;