Changeset 96

Timestamp:

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

Author:

dmik

Message:

QTextDrag: decode() gives mime types in Unicode encodings a higher priprity (to guarantee loseless decoding); "text/whatever" w/o any charset is reported as the first mime format (for better integration with native drop targets).

Location:

trunk/src/kernel

Files:

• qclipboard_pm.cpp (modified) (3 diffs)
• qdragobject.cpp (modified) (4 diffs)

trunk/src/kernel/qclipboard_pm.cpp

@@ -156 +156 @@
     }
 
-    // Not efficient to iterate over this (so we provide provides() above).
-
-    // In order to be able to use UniCode characters, we have to give
-    // it a higher priority than single-byte characters.  To do this, we
-    // treat CF_TEXT as a special case and postpone its processing until
-    // we're sure we do not have CF_TextUnicode ("text/unicode" atom)
     const char* format( int n ) const
     {
         const char* mime = 0;
-        bool sawText = false;
 
         if ( n >= 0 ) {
@@ -171 +164 @@
                 ulong cf = 0;
                 while ( (cf = WinEnumClipbrdFmts( 0, cf )) ) {
-                    if ( cf == CF_TEXT ) {
-                        sawText = true;
-                    } else {
-                        mime = QPMMime::cfToMime( cf );
-                        if ( mime ) {
-                            if ( !n )
-                                break; // COME FROM HERE
-                            n--;
-                            mime = 0;
-                        }
-                    }
-                }
-                // COME FROM BREAK
-
-                // If we did not find a suitable mime type, yet skipped
-                // CF_TEXT due to the priorities above, give it a shot
-                if ( !mime && sawText && !n ) {
-                    mime = QPMMime::cfToMime( CF_TEXT );
+                    mime = QPMMime::cfToMime( cf );
+                    if ( mime ) {
+                        if ( !n )
+                            break;
+                        n--;
+                        mime = 0;
+                    }
                 }
                 WinCloseClipbrd( 0 );
@@ -617 +599 @@
                     }
                 }
+                // Don't search for other formats for the same mime type --
+                // we've already represented it in the clipboard and adding a
+                // new format would just introduce mime type duplicates on the
+                // clipboard reader's side (where the first encountered format
+                // would be used for actual data transfer anyway).
+                // See also QDragManager::drag().
+                break;
             }
         }

trunk/src/kernel/qdragobject.cpp

@@ -607 +607 @@
 
     switch ( i ) {
+#if defined(Q_WS_PM)
+      // We want "text/whatever" w/o any charset to be the first (the "default")
+      // mime type of the QTextDrag object, so that a rendering mechanism/format
+      // pair for it will be the first in the RMF list, wchich is essential for
+      // some native drop targets (i.e. WPS) to render text correctly. Note that
+      // it won't hide unicode data from Qt apps because QTextDrag::decode()
+      // for Q_WS_PM prefers unicode mime types (see the implementation below). 
+      case 0:
+        return "";
+      case 1:
+        if ( localcharset.isNull() ) {
+            QTextCodec *localCodec = QTextCodec::codecForLocale();
+            if ( localCodec ) {
+                localcharset = localCodec->name();
+                localcharset = localcharset.lower();
+                stripws(localcharset);
+            } else {
+                localcharset = "";
+            }
+        }
+        return localcharset;
+      case 2:
+        return "UTF-8";
+      case 3:
+        return "ISO-10646-UCS-2";
+#else
       case 0:
         return "UTF-8";
@@ -625 +651 @@
         }
         return localcharset;
+#endif        
     }
     return 0;
@@ -898 +925 @@
     }
 
+#if defined(Q_WS_PM)
+    // We give Unicode formats a higher priority, so that if there are several
+    // encodings of the same subtype present in the given mime source, a
+    // Unicode one will be used for decoding. Otherwise, the first recognized
+    // format will be choosen.
+    int fallbackMime = -1;
+    bool secondPass = FALSE;
+
+    const char *mime;
+    for( int i = 0; /* FOREVER */; ++i ) {
+        mime = e->format( i );
+        if ( !mime ) {
+            // We went through all mimes but didn't find Unicode. If there is
+            // a fall-back mime, iterate again starting directly from it.
+            if ( !secondPass && fallbackMime >= 0 ) {
+                i = fallbackMime - 1; // will do ++i on continue
+                secondPass = TRUE;
+                continue;
+            }
+            break;
+        }
+#else        
     const char* mime;
     for (int i=0; (mime = e->format(i)); i++) {
+#endif    
         if ( 0==qstrnicmp(mime,"text/",5) ) {
             QCString m(mime);
@@ -916 +966 @@
                     codec = qt_findcharset(m);
                 if ( codec ) {
+#if defined(Q_WS_PM)
+                    if ( codec->mibEnum() == 1000 /* ISO-10646-UCS-2 */ ||
+                         codec->mibEnum() == 106 /* UTF-8 */ ) {
+                        // no need to try it again on the second pass
+                        if ( secondPass )
+                            continue;
+                    } else if ( !secondPass ) {
+                        // memorize the fall-back mime on the first pass
+                        if ( fallbackMime < 0 )
+                            fallbackMime = i;
+                        continue;
+                    }
+#endif
                     QByteArray payload;
-
                     payload = e->encodedData(mime);
                     if ( payload.size() ) {