Changeset 136:04e357b8343d

Timestamp:

02/13/08 08:24:54 (10 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

DragSource?

Files:

• dwt/dnd/DragSource.d (modified) (20 diffs)
• dwt/dnd/DropTarget.d (modified) (21 diffs)
• dwt/dnd/TableDragSourceEffect.d (modified) (4 diffs)
• dwt/dnd/Transfer.d (modified) (1 diff)
• dwt/dnd/TreeDragSourceEffect.d (modified) (4 diffs)
• dwt/internal/win32/OS.d (modified) (1 diff)
• dwt/internal/win32/WINAPI.d (modified) (1 diff)

dwt/dnd/DragSource.d

@@ -21 +21 @@
-import dwt.internal.ImageList;
-import dwt.internal.ole.win32.COM;
+import dwt.internal.ole.win32.OLEIDL;
+import dwt.internal.ole.win32.OBJIDL;
+import dwt.internal.ole.win32.ifs;
+import dwt.internal.ole.win32.extras;
-import dwt.internal.win32.OS;
-import dwt.widgets.Composite;
@@ -30 +34 @@
-import dwt.widgets.Tree;
-import dwt.widgets.Widget;
+
+import dwt.dnd.DragSourceEffect;
+import dwt.dnd.DragSourceListener;
+import dwt.dnd.Transfer;
+import dwt.dnd.TransferData;
+import dwt.dnd.DND;
+import dwt.dnd.DNDListener;
+import dwt.dnd.DNDEvent;
+import dwt.dnd.TreeDragSourceEffect;
+import dwt.dnd.TableDragSourceEffect;
+import dwt.dnd.OleEnumFORMATETC;
+
+import dwt.dwthelper.utils;
-
-/**
@@ -112 +129 @@
-    Control control;
-    Listener controlListener;
- = new Transfer[0]
+
-    DragSourceEffect dragEffect;
-    Composite topControl;
-
-    // ole interfaces
-COMObject
-COMObject
+_IDropSourceImpl
+_IDataObjectImpl
-    int refCount;
-
@@ -124 +141 @@
-    int dataEffect = DND.DROP_NONE;
-
-
-
-
-
+
+
+
+
+
+
-/**
- * Creates a new <code>DragSource</code> to handle dragging from the specified <code>Control</code>.
@@ -167 +186 @@
-    this.AddRef();
-
-Listener()
+class() Listener
-        public void handleEvent(Event event) {
-            if (event.type is DWT.Dispose) {
-DragSource.this
-DragSource.this
+this.outer
+this.outer
-                }
-            }
-            if (event.type is DWT.DragDetect) {
-DragSource.this
-DragSource.this
+this.outer
+this.outer
-                }
-            }
@@ -184 +203 @@
-    control.addListener(DWT.DragDetect, controlListener);
-
-Listener()
+class() Listener
-        public void handleEvent(Event e) {
-DragSource.this
+this.outer
-        }
-    });
-
-    Object effect = control.getData(DEFAULT_DRAG_SOURCE_EFFECT);
-effect instanceof DragSourceEffect
-(DragSourceEffect) effect
-control instanceof Tree
-(Tree) control
-control instanceof Table
-(Table) control
+ auto dse = cast(DragSourceEffect)effect 
+dse
+ auto tree = cast(Tree)control 
+tree
+ auto table = cast(Table)control 
+table
-    }
-}
@@ -250 +269 @@
-private void createCOMInterfaces() {
-    // register each of the interfaces that this object implements
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-}
-
-protected void checkSubclass() {
-String name = getClass().getName()
-String validName = DragSource.class.getName()
-!validName.equals(name)
+char[] name = this.classinfo.name
+char[] validName = DragSource.classinfo.name
+validName!=/*eq*/name
-        DND.error(DWT.ERROR_INVALID_SUBCLASS);
-    }
@@ -283 +282 @@
-
-private void disposeCOMInterfaces() {
-    if (iDropSource !is null)
-        iDropSource.dispose();
-    iDropSource = null;
-
-    if (iDataObject !is null)
-        iDataObject.dispose();
-    iDataObject = null;
-}
@@ -302 +296 @@
-    if (!event.doit || transferAgents is null || transferAgents.length is 0 ) return;
-
-int[] pdwEffect = new int[1]
+uint[1] pdwEffect
-    int operations = opToOs(getStyle());
-    Display display = control.getDisplay();
-String
+char[]
-    Object oldValue = display.getData(key);
-b
+ValueWrapperB
-    ImageList imagelist = null;
-    Image image = event.image;
@@ -328 +322 @@
-        } else {
-            int flags = OS.RDW_UPDATENOW | OS.RDW_ALLCHILDREN;
-0
+null
-        }
-        OS.ImageList_DragEnter(topControl.handle, dragEvent.x - location.x, dragEvent.y - location.y);
-    }
-.getAddress(), iDropSource.getAddress(), operations, pdwEffect
+, iDropSource, operations, pdwEffect.ptr
-    if (imagelist !is null) {
-        OS.ImageList_DragLeave(topControl.handle);
@@ -361 +355 @@
- * must be incremented before returning.  Caller is responsible for releasing ppenumFormatetc.
- */
-int
+IEnumFORMATETC*
-    // only allow getting of data - SetData is not currently supported
-    if (dwDirection is COM.DATADIR_SET) return COM.E_NOTIMPL;
@@ -381 +375 @@
-    enumFORMATETC.AddRef();
-
-[] formats = new FORMATETC
+*[] formats = new FORMATETC*
-    for (int i = 0; i < formats.length; i++){
-        formats[i] = allowedDataTypes[i].formatetc;
@@ -387 +381 @@
-    enumFORMATETC.setFormats(formats);
-
-OS.MoveMemory(ppenumFormatetc, new int[] {enumFORMATETC.getAddress()}, 4
+*ppenumFormatetc = enumFORMATETC.getAddress(
-    return COM.S_OK;
-}
@@ -400 +394 @@
-}
-
-private int GetData(int pFormatetc, int 
+.LRESULT GetData(FORMATETC *pFormatetc, STGMEDIUM *
-    /* Called by a data consumer to obtain data from a source data object.
-       The GetData method renders the data described in the specified FORMATETC
@@ -406 +400 @@
-       The caller then assumes responsibility for releasing the STGMEDIUM structure.
-    */
-0 || pmedium is 0
+null || pmedium is null
-
-    if (QueryGetData(pFormatetc) !is COM.S_OK) return COM.DV_E_FORMATETC;
@@ -461 +455 @@
-}
-
-rivate int GiveFeedback(int
+ackage .LRESULT GiveFeedback(DWORD
-    return COM.DRAGDROP_S_USEDEFAULTCURSORS;
-}
-
-rivate int QueryContinueDrag(int fEscapePressed, int
+ackage .LRESULT QueryContinueDrag(int fEscapePressed, DWORD
-    if (fEscapePressed !is 0){
-        if (topControl !is null) OS.ImageList_DragLeave(topControl.handle);
@@ -533 +527 @@
-}
-
-int QueryGetData(int
+.LRESULT QueryGetData(FORMATETC*
-    if (transferAgents is null) return COM.E_FAIL;
-    TransferData transferData = new TransferData();
@@ -554 +548 @@
- * must be incremented before returning.  Caller is responsible for releasing ppvObject.
- */
-int QueryInterface(int riid, int
-0 || ppvObject is 0
+HRESULT QueryInterface(REFIID riid, void**
+null || ppvObject is null
-        return COM.E_INVALIDARG;
-
-
-
-
-
+
+
+
-        AddRef();
-        return COM.S_OK;
-    }
-
-guid, 
-OS.MoveMemory(ppvObject, new int[] {iDataObject.getAddress()}, 4)
+riid, &
+*ppvObject = cast(void*)cast(IDataObject) iDataObject
-        AddRef();
-        return COM.S_OK;
-    }
-
-OS.MoveMemory(ppvObject, new int[] {0}, 4)
+*ppvObject = null
-    return COM.E_NOINTERFACE;
-}
-
-int
+ULONG
-    refCount--;
-    if (refCount is 0) {
@@ -609 +601 @@
-}
-
-private int SetData(int pFormatetc, int
-0 || pmedium is 0
-
+.LRESULT SetData(FORMATETC* pFormatetc, STGMEDIUM*
+null || pmedium is null
+*
-    COM.MoveMemory(formatetc, pFormatetc, FORMATETC.sizeof);
-    if (formatetc.cfFormat is CFSTR_PERFORMEDDROPEFFECT && formatetc.tymed is COM.TYMED_HGLOBAL) {
-
+*
-        COM.MoveMemory(stgmedium, pmedium,STGMEDIUM.sizeof);
-] ptrEffect = new int[1]
-
-] effect = new int[1]
-
+1] ptrEffect
+.ptr
+1] effect
+.ptr
-        dataEffect = osToOp(effect[0]);
-    }
@@ -653 +645 @@
-
-}
+
+
+private class _IDropSourceImpl : IDropSource {
+
+    DragSource  parent;
+    this(DragSource p) { parent = p; }
+extern (Windows):
+    // interface of IUnknown
+    HRESULT QueryInterface(REFIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
+    ULONG AddRef()  { return parent.AddRef(); }
+    ULONG Release() { return parent.Release(); }
+
+    // interface of IDropSource
+    HRESULT QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState) { return parent.QueryContinueDrag(fEscapePressed, grfKeyState); }
+    HRESULT GiveFeedback(DWORD dwEffect) { return parent.GiveFeedback(dwEffect);}
+}
+
+private class _IDataObjectImpl : IDataObject {
+
+    DragSource  parent;
+    this(DragSource p) { parent = p; }
+extern (Windows):
+    // interface of IUnknown
+    HRESULT QueryInterface(REFIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
+    ULONG AddRef()  { return parent.AddRef(); }
+    ULONG Release() { return parent.Release(); }
+
+
+    // interface IDataObject
+    LRESULT GetData( FORMATETC *pFormatetc, STGMEDIUM *pmedium) { return parent.GetData(pFormatetc, pmedium); }
+    LRESULT GetDataHere(FORMATETC * pFormatetc, STGMEDIUM * pmedium) { return COM.E_NOTIMPL; }
+    LRESULT QueryGetData(FORMATETC* pFormatetc) { return parent.QueryGetData(pFormatetc); }
+    LRESULT GetCanonicalFormatEtc(FORMATETC* pFormatetcIn, FORMATETC* pFormatetcOut) { return COM.E_NOTIMPL; }
+    LRESULT SetData(FORMATETC* pFormatetc, STGMEDIUM * pmedium, BOOL fRelease) { return parent.SetData(pFormatetc, pmedium, fRelease); }
+    LRESULT EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC * ppenumFormatetc) { return parent.EnumFormatEtc(dwDirection, ppenumFormatetc); }
+    LRESULT DAdvise(FORMATETC* pFormatetc, DWORD advf, IAdviseSink pAdvSink, DWORD* pdwConnection) { return COM.E_NOTIMPL; }
+    LRESULT DUnadvise(DWORD dwConnection) { return COM.E_NOTIMPL; }
+    LRESULT EnumDAdvise(IEnumSTATDATA * ppenumAdvise) { return COM.E_NOTIMPL; }
+}

dwt/dnd/DropTarget.d

@@ -17 +17 @@
-import dwt.DWTException;
-import dwt.internal.ole.win32.COM;
+import dwt.internal.ole.win32.extras;
+import dwt.internal.ole.win32.OBJIDL;
+import dwt.internal.ole.win32.OLEIDL;
+import dwt.internal.ole.win32.ifs;
-import dwt.internal.win32.OS;
-import dwt.widgets.Control;
@@ -24 +28 @@
-import dwt.widgets.Tree;
-import dwt.widgets.Widget;
+
+import dwt.dnd.Transfer;
+import dwt.dnd.DropTargetEffect;
+import dwt.dnd.TransferData;
+import dwt.dnd.DropTargetListener;
+import dwt.dnd.DNDListener;
+import dwt.dnd.DNDEvent;
+import dwt.dnd.DND;
-
-/**
@@ -80 +92 @@
-    Control control;
-    Listener controlListener;
- = new Transfer[0]
+
-    DropTargetEffect dropEffect;
-
@@ -96 +108 @@
-
-    // interfaces
-COMObject
+_IDropTargetImpl
-    int refCount;
-
-String
-String
+char[]
+char[]
-
-/**
@@ -148 +160 @@
-        DND.error(DND.ERROR_CANNOT_INIT_DROP);
-
-Listener ()
+class() Listener
-        public void handleEvent (Event event) {
-DropTarget.this
-DropTarget.this
+this.outer
+this.outer
-            }
-        }
@@ -157 +169 @@
-    control.addListener (DWT.Dispose, controlListener);
-
-Listener ()
+class() Listener
-        public void handleEvent (Event event) {
-            onDispose();
@@ -164 +176 @@
-
-    Object effect = control.getData(DEFAULT_DROP_TARGET_EFFECT);
-effect instanceof DropTargetEffect
-(DropTargetEffect) effect
-control instanceof Table
-(Table) control
-control instanceof Tree
-(Tree) control
+ auto dte = cast(DropTargetEffect) effect 
+dte
+ auto table = cast(Table)control 
+table
+ auto tree = cast(Tree)control 
+tree
-    }
-}
@@ -228 +240 @@
-
-protected void checkSubclass () {
-String name = getClass().getName ()
-String validName = DropTarget.class.getName()
-!validName.equals(name)
+char[] name = this.classinfo.name
+char[] validName = DropTarget.classinfo.name
+validName!=/*eq*/name
-        DND.error (DWT.ERROR_INVALID_SUBCLASS);
-    }
@@ -237 +249 @@
-void createCOMInterfaces() {
-    // register each of the interfaces that this object implements
-
-
-
-
-
-
-
-
-
-
+
-}
-
-void disposeCOMInterfaces() {
-    if (iDropTarget !is null)
-        iDropTarget.dispose();
-    iDropTarget = null;
-}
@@ -263 +264 @@
-    DNDEvent event = new DNDEvent();
-    if (!setEventData(event, pDataObject, grfKeyState, pt_x, pt_y, pdwEffect)) {
-OS.MoveMemory(pdwEffect, new int[] {COM.DROPEFFECT_NONE}, 4)
+*pdwEffect = COM.DROPEFFECT_NONE
-        return COM.S_FALSE;
-    }
@@ -293 +294 @@
-    }
-
-OS.MoveMemory(pdwEffect, new int[] {opToOs(selectedOperation)}, 4
+*pdwEffect = opToOs(selectedOperation
-    return COM.S_OK;
-}
@@ -321 +322 @@
-    if (!setEventData(event, iDataObject.getAddress(), grfKeyState, pt_x, pt_y, pdwEffect)) {
-        keyOperation = -1;
-OS.MoveMemory(pdwEffect, new int[] {COM.DROPEFFECT_NONE}, 4)
+*pdwEffect = COM.DROPEFFECT_NONE
-        return COM.S_FALSE;
-    }
@@ -356 +357 @@
-    }
-
-OS.MoveMemory(pdwEffect, new int[] {opToOs(selectedOperation)}, 4
+*pdwEffect = opToOs(selectedOperation
-    return COM.S_OK;
-}
@@ -374 +375 @@
-    if (!setEventData(event, pDataObject, grfKeyState, pt_x, pt_y, pdwEffect)) {
-        keyOperation = -1;
-OS.MoveMemory(pdwEffect, new int[] {COM.DROPEFFECT_NONE}, 4)
+*pdwEffect = COM.DROPEFFECT_NONE
-        return COM.S_FALSE;
-    }
@@ -399 +400 @@
-
-    if (selectedOperation is DND.DROP_NONE){
-OS.MoveMemory(pdwEffect, new int[] {COM.DROPEFFECT_NONE}, 4)
+*pdwEffect = COM.DROPEFFECT_NONE
-        return COM.S_OK;
-    }
@@ -431 +432 @@
-    }
-    //notify source of action taken
-OS.MoveMemory(pdwEffect, new int[] {opToOs(selectedOperation)}, 4
+*pdwEffect = opToOs(selectedOperation
-    return COM.S_OK;
-}
@@ -534 +535 @@
-int QueryInterface(int riid, int ppvObject) {
-
-0 || ppvObject is 0
+null || ppvObject is null
-        return COM.E_INVALIDARG;
-
-
-
-
+
+
-        AddRef();
-        return COM.S_OK;
-    }
-
-OS.MoveMemory(ppvObject, new int[] {0}, 4)
+*ppvObject = null
-    return COM.E_NOINTERFACE;
-}
@@ -562 +561 @@
-    if (control is null || control.isDisposed()) return;
-    int handle = control.handle;
- = new RECT()
-
+
+&
-        OS.ImageList_DragShowNolock(false);
-
+*
-        OS.ImageList_DragShowNolock(true);
-    }
@@ -615 +614 @@
-    // get allowed operations
-    int style = getStyle();
-] operations = new int[1]
-
+1] operations
+.ptr
-    operations[0] = osToOp(operations[0]) & style;
-    if (operations[0] is DND.DROP_NONE) return false;
@@ -636 +635 @@
-    dataObject.AddRef();
-    try {
-] address = new int[1]
-
+1] address
+.ptr
-            return false;
-        }
@@ -708 +707 @@
-}
-}
+
+class _IDropTargetImpl : IDropTarget {
+
+    DropTarget  parent;
+    this(DropTarget p) { parent = p; }
+extern (Windows):
+    // interface of IUnknown
+    HRESULT QueryInterface(REFIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
+    ULONG AddRef()  { return parent.AddRef(); }
+    ULONG Release() { return parent.Release(); }
+
+    HRESULT DragEnter( IDataObject pDataObj, DWORD grfKeyState, POINT pt, DWORD *pdwEffect ) {
+        return parent.DragEnter(pDataObj, grfKeyState, pt, pdwEffect);
+    }
+    HRESULT DragOver( DWORD grfKeyState, POINT pt, DWORD *pdwEffect ) {
+        return parent.DragOver(grfKeyState, pt, pdwEffect);
+    }
+    HRESULT DragLeave(){ return parent.DragLeave(); }
+    HRESULT Drop(IDataObject pDataObj,DWORD grfKeyState,POINT pt,DWORD *pdwEffect){
+        return parent.Drop(pDataObj, grfKeyState, pt, pdwEffect);
+    }
+}
+
+

dwt/dnd/TableDragSourceEffect.d

@@ -20 +20 @@
-import dwt.widgets.Table;
-import dwt.widgets.TableItem;
+
+import dwt.dnd.DragSourceEffect;
+import dwt.dnd.DragSourceEvent;
-
-/**
@@ -83 +86 @@
-        if (dragSourceImage !is null) dragSourceImage.dispose();
-        dragSourceImage = null;
-
+cast
-        TableItem[] selection = table.getSelection();
-        if (selection.length is 0) return null;
@@ -91 +94 @@
-            Rectangle bounds = selection[0].getBounds(0);
-            for (int i = 1; i < count; i++) {
-
+_
-            }
-int hDC = OS.GetDC(0
-int
-int
-int
+auto hDC = OS.GetDC(null
+auto
+auto
+auto
-            RECT rect = new RECT();
-            rect.right = bounds.width;
@@ -112 +115 @@
-            OS.SelectObject(hDC1, hOldBitmap);
-            OS.DeleteDC (hDC1);
-0
+null
-            Display display = table.getDisplay();
-            dragSourceImage = Image.win32_new(display, DWT.BITMAP, bitmap);

dwt/dnd/Transfer.d

@@ -138 +138 @@
-    // If name is not in registry, add it and return assigned value.
-    // If name already exists in registry, return its assigned value
- chFormatName = new TCHAR(0, formatName, tru
+* chFormatName = StrToTCHARz(0, formatNam
-    return OS.RegisterClipboardFormat(chFormatName);
-}

dwt/dnd/TreeDragSourceEffect.d

@@ -20 +20 @@
-import dwt.widgets.Tree;
-import dwt.widgets.TreeItem;
+
+import dwt.dnd.DragSourceEffect;
+import dwt.dnd.DragSourceEvent;
-
-/**
@@ -82 +85 @@
-        if (dragSourceImage !is null) dragSourceImage.dispose();
-        dragSourceImage = null;
-
+cast
-        TreeItem[] selection = tree.getSelection();
-        if (selection.length is 0) return null;
@@ -90 +93 @@
-            Rectangle bounds = selection[0].getBounds(0);
-            for (int i = 1; i < count; i++) {
-
+_
-            }
-            int hDC = OS.GetDC(0);
@@ -96 +99 @@
-            int bitmap = OS.CreateCompatibleBitmap(hDC, bounds.width, bounds.height);
-            int hOldBitmap = OS.SelectObject(hDC1, bitmap);
- = new RECT()
+
-            rect.right = bounds.width;
-            rect.bottom = bounds.height;
-            int hBrush = OS.GetStockObject(OS.WHITE_BRUSH);
-
+&
-            for (int i = 0; i < count; i++) {
-                TreeItem selected = selection[i];

dwt/internal/win32/OS.d

@@ -4654 +4654 @@
-alias WINAPI.ImageList_Add ImageList_Add;
-alias WINAPI.ImageList_AddMasked ImageList_AddMasked;
+alias WINAPI.ImageList_BeginDrag ImageList_BeginDrag;
-alias WINAPI.ImageList_Create ImageList_Create;
-alias WINAPI.ImageList_Destroy ImageList_Destroy;
+alias WINAPI.ImageList_DragEnter ImageList_DragEnter;
+alias WINAPI.ImageList_DragLeave ImageList_DragLeave;
+alias WINAPI.ImageList_DragMove ImageList_DragMove;
+alias WINAPI.ImageList_EndDrag ImageList_EndDrag;
-alias WINAPI.ImageList_GetIcon ImageList_GetIcon;
-alias WINAPI.ImageList_GetIconSize ImageList_GetIconSize;

dwt/internal/win32/WINAPI.d

@@ -1600 +1600 @@
-//     WINBOOL ImageList_Remove(HIMAGELIST, int);
-//     HICON ImageList_GetIcon(HIMAGELIST, int, UINT);
-// 
-// 
-// 
-// 
-// 
+
+
+
+
+
-//     WINBOOL ImageList_SetDragCursorImage(HIMAGELIST, int, int, int);
-//     WINBOOL ImageList_DragShowNolock(WINBOOL);