Changeset 334 for trunk/src/gui/kernel/qclipboard_pm.cpp

Timestamp:

Nov 20, 2009, 7:39:03 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui/kernel: mime: Implemented mime<-clipboard interface for "text/plain" (getting from the system clipboard).

File:

• trunk/src/gui/kernel/qclipboard_pm.cpp (modified) (11 diffs)

trunk/src/gui/kernel/qclipboard_pm.cpp

@@ -74 +74 @@
 {
 public:
-    QClipboardWatcher() : isDirty(true) {}
+    QClipboardWatcher() {}
 
     bool hasFormat_sys(const QString &mimetype) const;
@@ -82 +82 @@
 private:
 
-    void peekData() const;
+    bool peekData(bool leaveOpen = false) const;
 
     mutable QList<ULONG> formats;
     mutable QList<QPMMime::Match> matches;
-    mutable bool isDirty;
 };
 
-void QClipboardWatcher::peekData() const
-{
-    if (!isDirty)
-        return;
-
+bool QClipboardWatcher::peekData(bool leaveOpen) const
+{
     if (!WinOpenClipbrd(NULLHANDLE)) {
 #ifndef QT_NO_DEBUG
@@ -99 +95 @@
                  "failed with 0x%lX", WinGetLastError(NULLHANDLE));
 #endif
-        return;
-    }
-
-    formats.clear();
+        return false;
+    }
+
+    QList<ULONG> newFormats;
     ULONG cf = 0;
     while ((cf = WinEnumClipbrdFmts(NULLHANDLE, cf)))
-        formats << cf;
-
-    WinCloseClipbrd(NULLHANDLE);
-
+        newFormats << cf;
+
+    if (!leaveOpen)
+        WinCloseClipbrd(NULLHANDLE);
+
+    // optimization: we don't want to call the potentially expensive
+    // allConvertersFromFormats() unlesss we really got a different set
+    if (newFormats == formats)
+        return true;
+
+    formats = newFormats;
     matches = QPMMime::allConvertersFromFormats(formats);
-    isDirty = false;
+
+#ifdef QCLIPBOARD_DEBUG
+    foreach(QPMMime::Match match, matches)
+        DEBUG(("QClipboardWatcher::peekData: converter %p mime \"%ls\" "
+               "format 0x%lX priority %d", match.converter, match.mime.utf16(),
+               match.format, match.priority));
+#endif
+
+    return true;
 }
 
 bool QClipboardWatcher::hasFormat_sys(const QString &mime) const
 {
-    peekData();
-    if (isDirty)
-        return false; // peekData() failed
+    if (!peekData())
+        return false;
 
     foreach (QPMMime::Match match, matches)
@@ -130 +140 @@
     QStringList fmts;
 
-    peekData();
-    if (isDirty)
-        return fmts; // peekData() failed
+    if (!peekData())
+        return fmts;
 
     foreach (QPMMime::Match match, matches)
@@ -145 +154 @@
     QVariant result;
 
-    peekData();
-    if (isDirty)
-        return result; // peekData() failed
+    if (!peekData(true /*leaveOpen*/))
+        return result;
 
     foreach (QPMMime::Match match, matches) {
@@ -157 +165 @@
                                                             data, match.mime, type);
             }
-            return result;
-        }
-    }
+            break;
+        }
+    }
+
+    WinCloseClipbrd(NULLHANDLE);
 
     return result;
@@ -175 +185 @@
 
     void setAsClipboardViewer();
-    bool ownsClipboard();
+    bool ownsClipboard() const;
     void putAllMimeToClipboard(bool isDelayed);
     void flushClipboard();
+
+    const QMimeData *mimeData() const;
 
     static QClipboardData *instance()
@@ -202 +214 @@
     QList<QPMMime::Match> matches;
     HWND prevClipboardViewer;
+
+    QClipboardWatcher watcher;
 
     bool ignore_WM_DESTROYCLIPBOARD;
@@ -265 +279 @@
 }
 
-bool QClipboardData::ownsClipboard()
+bool QClipboardData::ownsClipboard() const
 {
     return src && hwnd() == WinQueryClipbrdOwner(NULLHANDLE);
@@ -346 +360 @@
         setSource(0);
     }
+}
+
+const QMimeData *QClipboardData::mimeData() const
+{
+    // short cut for local copy / paste
+    if (ownsClipboard() && src)
+        return src;
+    return &watcher;
 }
 
@@ -481 +503 @@
 const QMimeData *QClipboard::mimeData(Mode mode) const
 {
-    // @todo implement
-    return 0;
+    if (mode != Clipboard)
+        return 0;
+
+    return QClipboardData::instance()->mimeData();
 }