Changeset 339 for trunk/src

Timestamp:

Nov 22, 2009, 11:25:06 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui/kernel: mime: Added support for the "text/html" clipboard format used by Mozilla.

File:

• trunk/src/gui/kernel/qmime_pm.cpp (modified) (7 diffs)

trunk/src/gui/kernel/qmime_pm.cpp

@@ -108 +108 @@
     \row \o \c CF_TEXT          \o \c text/plain (system codepage,
                                    zero-terminated string)
-    \row \o \c "text/unicode"   \o \c text/plain (16-bit Unicode, Mozilla-compatible,
-                                   zero-terminated string)
+    \row \o \c "text/unicode"   \o \c text/plain (16-bit Unicode,
+                                   zero-terminated string, Mozilla-compatible)
+    \row \o \c "text/html"      \o \c text/html (16-bit Unicode,
+                                   zero-terminated string, Mozilla-compatible)
     \row \o \c CF_BITMAP        \o \c{image/xyz}, where \c xyz is
-                                    a \l{QImageWriter::supportedImageFormats()}{Qt image format}
+                                   a \l{QImageWriter::supportedImageFormats()}{Qt image format}
     \row \o \c "x-mime:<mime>"  \o data in the format corresponding to the given
                                    MIME type \c <mime>
@@ -377 +379 @@
 
     const ULONG CF_TextUnicode;
+    const ULONG CF_TextHtml;
 };
 
 QPMMimeText::QPMMimeText()
-    // "text/unicode" is what Mozilla uses to for unicode, so Qt apps will
-    // be able to interchange unicode text with Mozilla apps
+    // "text/unicode" is what Mozilla uses to for unicode
     : CF_TextUnicode (registerMimeType(QLatin1String("text/unicode")))
+    // "text/html" is what Mozilla uses to for HTML
+    , CF_TextHtml (registerMimeType(QLatin1String("text/html")))
 {
 }
@@ -389 +393 @@
 {
     QList<MimeCFPair> fmts;
+    // prefer HTML as it's reacher
+    if (mimeData->hasHtml())
+        fmts << MimeCFPair(QLatin1String("text/html"), CF_TextHtml);
+    // prefer unicode over local8Bit
     if (mimeData->hasText())
-        fmts << MimeCFPair(QLatin1String("text/plain"), CF_TEXT)
-             << MimeCFPair(QLatin1String("text/plain"), CF_TextUnicode);
+        fmts << MimeCFPair(QLatin1String("text/plain"), CF_TextUnicode)
+             << MimeCFPair(QLatin1String("text/plain"), CF_TEXT);
     return fmts;
 }
@@ -441 +449 @@
         if (j < r.size())
             o[j] = '\0';
-    } else if (format == CF_TextUnicode) {
+    } else if (format == CF_TextUnicode || CF_TextHtml) {
         QString str = mimeData->text();
         const QChar *u = str.unicode();
@@ -486 +494 @@
 {
     QList<MimeCFPair> mimes;
-    foreach(ULONG cf, formats) {
-        // prefer unicode over local8Bit
-        if (cf == CF_TextUnicode)
-            mimes.prepend(MimeCFPair(QLatin1String("text/plain"), cf));
-        if (cf == CF_TEXT)
-            mimes.append(MimeCFPair(QLatin1String("text/plain"), cf));
-    }
+    // prefer HTML as it's reacher
+    if (formats.contains(CF_TextHtml))
+        mimes << MimeCFPair(QLatin1String("text/html"), CF_TextHtml);
+    // prefer unicode over local8Bit
+    if (formats.contains(CF_TextUnicode))
+        mimes << MimeCFPair(QLatin1String("text/plain"), CF_TextUnicode);
+    if (formats.contains(CF_TEXT))
+        mimes << MimeCFPair(QLatin1String("text/plain"), CF_TEXT);
     return mimes;
 }
@@ -502 +511 @@
     QVariant ret;
 
-    // @todo why is it startsWith? the rest of the mime specification (encoding,
-    // etc) isn't taken into account... Anyway, copied the logic from Windows.
-    if (!mimeType.startsWith("text/plain"))
+    if (!mimeType.startsWith("text/plain") &&
+        !mimeType.startsWith("text/html"))
         return ret;
     if (!(flags & CFI_POINTER) || !data)
@@ -526 +534 @@
         }
         str = QString::fromLocal8Bit(r);
-    } else if (format == CF_TextUnicode) {
+    } else if (format == CF_TextUnicode || CF_TextHtml) {
         str = QString::fromUtf16((const unsigned short *)data);
         str.replace(QLatin1String("\r\n"), QLatin1String("\n"));