Changeset 324 for trunk/src/gui/kernel

Timestamp:

Nov 18, 2009, 1:49:31 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui/kernel: Improved mime <-> PM clipboard format conversion interfaces.

Location:

trunk/src/gui/kernel

Files:

• qclipboard_pm.cpp (modified) (10 diffs)
• qmime.h (modified) (2 diffs)
• qmime_pm.cpp (modified) (5 diffs)

trunk/src/gui/kernel/qclipboard_pm.cpp

@@ -52 +52 @@
 #include "qevent.h"
 #include "qmime.h"
+
+
 #include "qt_os2.h"
-#include "qdnd_p.h"
+#include "_p.h"
 
 #define QCLIPBOARD_DEBUG
 
+
+
+
+
 QT_BEGIN_NAMESPACE
 
@@ -64 +70 @@
 {
 public:
-    QClipboardWatcher() {}
+    QClipboardWatcher() {}
 
     bool hasFormat_sys(const QString &mimetype) const;
     QStringList formats_sys() const;
     QVariant retrieveData_sys(const QString &mimetype, QVariant::Type preferredType) const;
+
+
+
+
+
+
+
+
 };
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 bool QClipboardWatcher::hasFormat_sys(const QString &mime) const
 {
-    bool ok = false;
-    if (WinOpenClipbrd(NULLHANDLE)) {
-        ULONG cf = 0;
-        while ((cf = WinEnumClipbrdFmts(NULLHANDLE, cf))) {
-            if (QPMMime::converterToMime(mime, cf)) {
-                ok = true;
-                break;
-            }
-        }
-        WinCloseClipbrd(NULLHANDLE);
-    }
-#ifndef QT_NO_DEBUG
-    else
-        qWarning("QClipboardWatcher: WinOpenClipbrd failed with %lX",
-                 WinGetLastError(NULLHANDLE));
-#endif
-    return ok;
+    peekData();
+    if (isDirty)
+        return false; // peekData() failed
+
+    foreach (QPMMime::Match match, matches)
+        if (match.mime == mime)
+            return true;
+
+    return false;
 }
 
@@ -95 +125 @@
 {
     QStringList fmts;
-    if (WinOpenClipbrd(NULLHANDLE)) {
-        QVector<ULONG> cfs;
-        ULONG cf = 0;
-        while ((cf = WinEnumClipbrdFmts(NULLHANDLE, cf)))
-            cfs << cf;
-        fmts = QPMMime::allMimesForFormats(cfs);
-        WinCloseClipbrd(NULLHANDLE);
-    }
-#ifndef QT_NO_DEBUG
-    else
-        qWarning("QClipboardWatcher: WinOpenClipbrd failed with %lX",
-                 WinGetLastError(NULLHANDLE));
-#endif
+
+    peekData();
+    if (isDirty)
+        return fmts; // peekData() failed
+
+    foreach (QPMMime::Match match, matches)
+        fmts << match.mime;
+
     return fmts;
 }
@@ -116 +141 @@
     QVariant result;
 
-    if (WinOpenClipbrd(NULLHANDLE)) {
-        ULONG cf = 0;
-        while ((cf = WinEnumClipbrdFmts(NULLHANDLE, cf))) {
-            QPMMime *converter = QPMMime::converterToMime(mime, cf);
-            if (converter) {
-                ULONG flags;
-                if (WinQueryClipbrdFmtInfo(NULLHANDLE, cf, &flags)) {
-                    ULONG data = WinQueryClipbrdData(NULLHANDLE, cf);
-                    if (data) {
-                        result = converter->convertToMime(mime, type, cf, flags, data);
-                    }
-                }
-                break;
+    peekData();
+    if (isDirty)
+        return result; // peekData() failed
+
+    foreach (QPMMime::Match match, matches) {
+        if (match.mime == mime) {
+            ULONG flags;
+            if (WinQueryClipbrdFmtInfo(NULLHANDLE, match.format, &flags)) {
+                ULONG data = WinQueryClipbrdData(NULLHANDLE, match.format);
+                result = match.converter->convertFromFormat(match.format, flags,
+                                                            data, match.mime, type);
             }
+
         }
-        WinCloseClipbrd(NULLHANDLE);
-    }
-#ifndef QT_NO_DEBUG
-    else
-        qWarning("QClipboardWatcher: WinOpenClipbrd failed with %lX",
-                 WinGetLastError(NULLHANDLE));
-#endif
+    }
+
     return result;
 }
@@ -143 +162 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-class QClipboardData
+class QClipboardData
 {
 public:
@@ -149 +168 @@
     ~QClipboardData();
 
-    // @todo ...
+    void setSource(QMimeData *s)
+    {
+        if (s == src)
+            return;
+        delete src;
+        src = s;
+    }
+
+    QMimeData *source()
+    {
+        return src;
+    }
+
+    bool setClipboard(QPMMime *converter, ULONG format, bool isDelayed);
+
+    MRESULT message(ULONG msg, MPARAM mp1, MPARAM mp2);
 
 private:
+
 };
 
-QClipboardData::QClipboardData()
+QClipboardData::QClipboardData()
 {
 }