GuestHost

Timestamp:

May 22, 2024 1:59:29 PM (9 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

163324

Message:

Shared Clipboard: Attempt to prevent extra new lines when copying text from Linux to Windows, bugref:10694.

File:

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp

-              r102815
+              r104759
         if (pcwszSrc[i] == VBOX_SHCL_LINEFEED)
+        {
+            pu16Dst[j] = VBOX_SHCL_CARRIAGERETURN;
+            ++j;
+            /* Insert '\r' in front of '\n', but avoid '\r\r\n' situations
+               because it will result in extra empty lines on the other side. */
+            if (   i > 1
+                && pcwszSrc[i - 1] != VBOX_SHCL_CARRIAGERETURN)
+            {
+                pu16Dst[j] = VBOX_SHCL_CARRIAGERETURN;
+                ++j;
+            }
             /* Not enough space in destination? */
 …
         else if (pcwszSrc[i] == VBOX_SHCL_CARRIAGERETURN)
+        {
+            /* Set CR.r */
+            pu16Dst[j] = VBOX_SHCL_CARRIAGERETURN;
+            ++j;
+            /* Set CR.r, but avoid '\r\r'. */
+            if (   i > 1
+                && pcwszSrc[i - 1] != VBOX_SHCL_CARRIAGERETURN)
+            {
+                pu16Dst[j] = VBOX_SHCL_CARRIAGERETURN;
+                ++j;
+            }
             /* Not enough space in destination? */

Note: See TracChangeset for help on using the changeset viewer.