Changeset 97 for trunk/include

Timestamp:

Jul 6, 2006, 11:25:56 PM (19 years ago)

Author:

dmik

Message:

kernel: Created the initial implementation of the Drag'n'Drop support for OS/2 (not fully functiona yet: updating widget contents under the drag pointer will cause screen corruption, setting the drag object's pixmap is not possible). See ticket:22 for more info.

Location:

trunk/include

Files:

• qdragobject.h (modified) (1 diff)
• qmime.h (modified) (3 diffs)
• qwindowdefs_pm.h (modified) (1 diff)

trunk/include/qdragobject.h

@@ -219 +219 @@
 
 #ifndef QT_NO_DRAGANDDROP
-//@@TODO (dmik): no QDragManager yet (MOC ignores preprocessor macros) 
+
+// QDragManager is not part of the public API.  It is defined in a
+// header file simply so different .cpp files can implement different
+// member functions.
 //
-//// QDragManager is not part of the public API.  It is defined in a
-//// header file simply so different .cpp files can implement different
-//// member functions.
-////
-//
-//class Q_EXPORT QDragManager: public QObject {
-//    Q_OBJECT
-//
-//private:
-//    QDragManager();
-//    ~QDragManager();
-//    // only friend classes can use QDragManager.
-//    friend class QDragObject;
-//    friend class QDragMoveEvent;
-//    friend class QDropEvent;
-//    friend class QApplication;
-//
-//    bool eventFilter( QObject *, QEvent * );
-//    void timerEvent( QTimerEvent* );
-//
-//    bool drag( QDragObject *, QDragObject::DragMode );
-//
-//    void cancel( bool deleteSource = TRUE );
-//    void move( const QPoint & );
-//    void drop();
-//    void updatePixmap();
-//
-//private:
-//    QDragObject * object;
-//    void updateMode( ButtonState newstate );
-//    void updateCursor();
-//
-//    QWidget * dragSource;
-//    QWidget * dropWidget;
-//    bool beingCancelled;
-//    bool restoreCursor;
-//    bool willDrop;
-//
-//    QPixmap *pm_cursor;
-//    int n_cursor;
-//#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
-//    QDragManager( const QDragManager & );
-//    QDragManager &operator=( const QDragManager & );
-//#endif
-//};
-//
+
+class Q_EXPORT QDragManager: public QObject {
+    Q_OBJECT
+
+private:
+    QDragManager();
+    ~QDragManager();
+    // only friend classes can use QDragManager.
+    friend class QDragObject;
+    friend class QDragMoveEvent;
+    friend class QDropEvent;
+    friend class QApplication;
+
+    bool eventFilter( QObject *, QEvent * );
+    void timerEvent( QTimerEvent* );
+
+    bool drag( QDragObject *, QDragObject::DragMode );
+
+    void cancel( bool deleteSource = TRUE );
+    void move( const QPoint & );
+    void drop();
+    void updatePixmap();
+
+private:
+    QDragObject * object;
+    void updateMode( ButtonState newstate );
+    void updateCursor();
+
+    QWidget * dragSource;
+    QWidget * dropWidget;
+    bool beingCancelled;
+    bool restoreCursor;
+    bool willDrop;
+
+    QPixmap *pm_cursor;
+    int n_cursor;
+#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+    QDragManager( const QDragManager & );
+    QDragManager &operator=( const QDragManager & );
+#endif
+};
+
 #endif
 

trunk/include/qmime.h

@@ -160 +160 @@
 
 #ifndef QT_H
-#include "qptrlist.h" // down here for GCC 2.7.* compatibility
+#include "qptrlist.h"
+#include "qstrlist.h"
 #endif // QT_H
 
 /*
-  Encapsulation of conversion between MIME and OS/2 PM clipboard formats.
-  Not need on X11, as the underlying protocol uses the MIME standard
-  directly.
+  Encapsulation of conversion between MIME and OS/2 PM clipboard formats
+  and between MIME and Direct Manipulation (DND) mechanisms and formats.
 */
 
-class Q_EXPORT QPMMime {
+class Q_EXPORT QPMMime
+{
 public:
+
+#if !defined(QT_NO_DRAGANDDROP)
+
+    class Messenger
+    {
+    public:
+        Messenger();
+        virtual ~Messenger();
+        HWND hwnd() const { return w; }
+        virtual MRESULT message( ULONG msg, MPARAM mp1, MPARAM mp2 ) = 0;
+    private:
+        HWND w;
+        static MRESULT EXPENTRY windowProc( HWND, ULONG, MPARAM, MPARAM );
+    };
+
+    class DragWorker
+    {
+    public:
+        DragWorker() : src( NULL ) {}
+        virtual ~DragWorker() {}
+    
+        const QMimeSource *source() const { return src; }
+        
+        virtual void init() {}
+        // methods always implemented
+        virtual bool cleanup( bool isCancelled ) = 0;
+        virtual bool isExclusive() const = 0;
+        virtual ULONG itemCount() const = 0;
+        virtual HWND hwnd() const = 0;
+        // methods implemented if isExclusive() == TRUE and itemCount() == 0
+        virtual DRAGINFO *createDragInfo( const char *name, USHORT supportedOps )
+                                        { return NULL; }
+        // methods implemented if itemCount() >= 0
+        virtual QCString composeFormatString() { return QCString(); }
+        virtual bool prepare( const char *drm, const char *drf, DRAGITEM *item,
+                              ULONG itemIndex ) { return FALSE; }
+        virtual void defaultFileType( const char *&type, const char *&ext ) {};
+        
+    private:
+        const QMimeSource *src;
+        friend class QPMCoopDragWorker;
+        friend class QDragManager;
+    };
+    
+    class DefaultDragWorker : public DragWorker, public Messenger
+    {
+    private:
+        DefaultDragWorker( bool exclusive ); 
+    public:
+        virtual ~DefaultDragWorker();
+    
+        // DragpWorker interface
+        bool cleanup( bool isCancelled );
+        bool isExclusive() const;
+        ULONG itemCount() const;
+        HWND hwnd() const { return Messenger::hwnd(); }
+        QCString composeFormatString();
+        bool prepare( const char *drm, const char *drf, DRAGITEM *item,
+                      ULONG itemIndex );
+        void defaultFileType( const char *&type, const char *&ext );
+        
+        // Messenger interface
+        MRESULT message( ULONG msg, MPARAM mp1, MPARAM mp2 );
+
+        class Provider
+        {
+        public:
+            virtual const char *format( const char *drf ) const = 0;
+            virtual bool provide( const char *drf, const QByteArray &allData,
+                                  ULONG itemIndex, QByteArray &itemData ) = 0;
+            virtual void fileType( const char *drf, const char *&type,
+                                   const char *&ext ) {};
+        };
+        
+        bool addProvider( const char *drf, Provider *provider,
+                          ULONG itemCount = 1 );
+        
+        static bool canRender( const char *drm );
+        
+    private:
+        struct Data;
+        Data *d;
+        friend class QPMMime;
+    };
+    
+    class DropWorker
+    {
+    public:
+        DropWorker() : nfo( NULL ) {}
+        virtual ~DropWorker() {}
+        
+        DRAGINFO *info() const { return nfo; }
+
+        virtual void init() {}
+        virtual void cleanup( bool isAccepted, bool isActAccepted ) {}
+        virtual bool isExclusive() const = 0;
+        virtual bool provides( const char *format ) const = 0;
+        virtual int formatCount() const = 0;
+        virtual const char *format( int fn ) const = 0;
+        virtual QByteArray encodedData( const char *format ) const = 0;
+        
+    private:
+        DRAGINFO *nfo;
+        friend class QPMDragData;
+    };
+
+    class DefaultDropWorker : public DropWorker, public Messenger
+    {
+    private:
+        DefaultDropWorker(); 
+    public:
+        virtual ~DefaultDropWorker(); 
+    
+        // DropWorker interface
+        void cleanup( bool isAccepted, bool isActAccepted );
+        bool isExclusive() const;
+        bool provides( const char *format ) const;
+        int formatCount() const;
+        const char *format( int fn ) const;
+        QByteArray encodedData( const char *format ) const;
+        
+        // Messenger interface
+        MRESULT message( ULONG msg, MPARAM mp1, MPARAM mp2 );
+    
+        class Provider
+        {
+        public:
+            virtual const char *drf( const char *format ) const = 0;
+            virtual bool provide( const char *format, ULONG itemIndex,
+                                  const QByteArray &itemData,
+                                  QByteArray &allData ) = 0;
+        };
+        
+        bool addProvider( const char *format, Provider *provider );
+        bool addExclusiveProvider( const char *format, Provider *provider );
+        
+        static bool canRender( DRAGITEM *item, const char *drf );
+        static bool getSupportedRMFs( DRAGITEM *item, QPtrList<QStrList> &list );
+        
+    private:
+        struct Data;
+        Data *d;
+        friend class QPMMime;
+    };
+
+#endif // !QT_NO_DRAGANDDROP
+
     enum { CFI_Storage = CFI_POINTER & CFI_HANDLE };
     
@@ -182 +330 @@
     static const char* cfToMime( ulong cf );
 
-    static ulong registerMimeType( const char *mime );
-
+#if !defined(QT_NO_DRAGANDDROP)
+    
+    static QCString queryHSTR( HSTR hstr );
+    static QCString querySourceNameFull( DRAGITEM *item );
+    static bool canTargetRenderAsOS2File( DRAGITEM *item, QCString *fullName = NULL );
+    static bool parseRMFs( HSTR rmfs, QPtrList<QStrList> &list );
+    static bool parseRMF( HSTR rmf, QCString &mechanism, QCString &format );
+    
+    static DefaultDragWorker *defaultCoopDragWorker();
+    static DefaultDragWorker *defaultExclDragWorker();
+    static DefaultDropWorker *defaultDropWorker();
+
+#endif // !QT_NO_DRAGANDDROP
+
+    // Clipboard format convertor interface
+    
     virtual const char* convertorName() = 0;
     virtual int countCf() = 0;
@@ -193 +355 @@
     virtual QByteArray convertToMime( QByteArray data, const char *mime, ulong cf ) = 0;
     virtual QByteArray convertFromMime( QByteArray data, const char *mime, ulong cf ) = 0;
+    
+#if !defined(QT_NO_DRAGANDDROP)
+
+    // Direct Manipulation (DND) convertor interface
+
+    virtual DragWorker *dragWorkerFor( const char *mime, QMimeSource *src ) { return 0; }
+    virtual DropWorker *dropWorkerFor( DRAGINFO *info ) { return 0; }
+    
+#endif // !QT_NO_DRAGANDDROP
 };
 

trunk/include/qwindowdefs_pm.h

@@ -78 +78 @@
 #endif
 
+/*
+ *  Undoc'd DC_PREPAREITEM, see
+ *  http://lxr.mozilla.org/seamonkey/source/widget/src/os2/nsDragService.cpp
+ */
+#if !defined (DC_PREPAREITEM)
+#define DC_PREPAREITEM 0x40
+#endif
+
 typedef HWND WId;