Merge 6e95cb463b into 5133d47502

The specific issue I experienced is that Excel/LibreOffice Calc add a newline when you copy the contents of a single cell. This is bad behavior and they should provide a copy option that does not do that, but alas, it's much harder to get that into those applications. This behavior made it impossible to paste an otherwise-valid hex address into the Project64 fields without first putting it into Notepad, deleting the newline, recopying, and then doing the paste from there. If the field was simply text, you can go into the field edit and shift + home to select all and then do a copy, but that does not work for a formula. When you edit the file, it shows the formula instead. Therefore, you have absolutely no way of working around this except pasting it somewhere else and removing the newline manually.

In principle, there's no reason why you wouldn't trim the ends at least. Whitespace on either end is useless to you. However, content being after the newline should be rejected as it was before.

There were two secondary issues in the pasting code that are fixed here: One is that it only sort of collapsed single spaces. So if you had more than one space, spaces still would have ended up in the result. Actually I think the semantics were slightly more insidious, <space><number> would have turned into <number><same number> effectively. The only thing it did was remove the space by duplicating the number. If you had two spaces, then it would have ended up with e.g. <space><number><same number>. The only case where this wouldn't have happened is a space at the end which would have been preserved in the paste.

Secondly, it mutated the clipboard data directly. This would have lead to confusing results where multiple pastes would have had clipboard data in the clipboard itself move from, for example, two spaces to a single space to no spaces at all. The better solution is to preprocess to figure out how big we ultimately want our space-less result to be and stamp out the copy ourselves skipping anything we don't want. Leave the clipboard alone.

If it's desired to preserve single spaces only in the middle, the code will need to be modified a bit.

Source/Project64/UserInterface/WTLControls/EditNumber32.cpp

@@ -35,9 +35,33 @@ bool CEditNumber32::IsHexConvertableText(LPTSTR _text)
     }
     // Check
     unsigned int i = 0;
-    if (wcslen(_text) >= 2)
+    unsigned int len = wcslen(_text);
+    if (len == 0)
     {
-        if (_text[0] == L'0' && (_text[1] == L'x' || _text[1] == L'X'))
+        return false;
+    }
+
+    wchar_t c;
+    do
+    {
+        c = _text[i];
+        if (c == L'\n' || c == L'\r' || c == L' ')
+        {
+            i++;
+            continue;
+        }
+
+        break;
+    } while (i < len);
+
+    if (i == len)
+    {
+        return false;
+    }
+
+    if ((len - i) >= 2)
+    {
+        if (_text[i] == L'0' && (_text[i + 1] == L'x' || _text[i + 1] == L'X'))
         {
             if ((second == L'x' || second == L'X') && (!(start == 0 && end >= 2)))
             {
@@ -53,14 +77,16 @@ bool CEditNumber32::IsHexConvertableText(LPTSTR _text)
             }
         }
     }
+
     if (!bPaste) return bPaste;
-    if (wcslen(_text) >= 1)
+    if ((len - i) >= 1)
     {
-        if (head == L'0' && (_text[0] == L'x' || _text[0] == L'X'))
+        bool bIsX = _text[i] == L'x' || _text[i] == L'X';
+        if (head == L'0' && bIsX)
         {
             i++;
         }
-        if ((_text[0] == L'x' || _text[0] == L'X'))
+        if (bIsX)
         {
             if (head != L'0' && start == 0)
             {
@@ -73,11 +99,28 @@ bool CEditNumber32::IsHexConvertableText(LPTSTR _text)
         }
     }
     if (!bPaste) return bPaste;
-    for (; i < wcslen(_text); i++)
+
+    for (; i < len; i++)
     {
-        wchar_t c = _text[i];
+        c = _text[i];
         if (!(c >= 48 && c <= 57 || c >= L'A' && c <= L'F' || c >= L'a' && c <= L'f' || c == L' '))
         {
+            if (c == L'\n' || c == L'\r')
+            {
+                i++;
+                while (i < len)
+                {
+                    c = _text[i];
+                    if (c != L'\n' && c != L'\r' && c != L' ')
+                    {
+                        bPaste = false;
+                        break;
+                    }
+                    i++;
+                }
+                // Effectively a trim, if all we have is newline, just ignore them
+                break;
+            }
             bPaste = false;
             break;
         }
@@ -97,29 +140,43 @@ void CEditNumber32::FormatClipboard()
     if (hglb != nullptr)
     {
         lptstr = (LPTSTR)GlobalLock(hglb);
-        for (unsigned int i = 0; i < wcslen(lptstr); i++)
+        unsigned int len = wcslen(lptstr);
+        unsigned int fullCopySize = 1; // Null terminator
+        for (unsigned int i = 0; i < len; i++)
         {
-            if (lptstr[i] != L'X' && lptstr[i] != L'x')
+            wchar_t c = lptstr[i];
+            if (c != L' ' && c != L'\n' && c != L'\r')
             {
-                lptstr[i] = (char)toupper(lptstr[i]);
+                fullCopySize++;
-            }
-            if (lptstr[i] == L'X')
-            {
-                lptstr[i] = L'x';
-            }
-            if (lptstr[i] == ' ' && (i < wcslen(lptstr)))
-            {
-                wcscpy(&lptstr[i], &lptstr[i + 1]);
             }
         }
-        hglb = GlobalAlloc(GMEM_MOVEABLE, (wcslen(lptstr) + 1) * sizeof(TCHAR));
+
+        hglb = GlobalAlloc(GMEM_MOVEABLE, fullCopySize * sizeof(TCHAR));
         if (hglb == nullptr)
         {
             CloseClipboard();
             return;
         }
         lptstrCopy = (LPTSTR)GlobalLock(hglb);
-        memcpy(lptstrCopy, lptstr, (wcslen(lptstr) + 1) * sizeof(TCHAR));
+
+        for (unsigned int src = 0, dst = 0; src < len; src++)
+        {
+            wchar_t c = lptstr[src];
+            if (c == L' ' || c == L'\n' || c == L'\r')
+            {
+                continue;
+            }
+
+            if (c == L'X' || c == L'x')
+            {
+                lptstrCopy[dst++] = L'x';
+            }
+            else
+            {
+                lptstrCopy[dst++] = (wchar_t)toupper(c);
+            }
+        }
+
         GlobalUnlock(lptstr);
         GlobalUnlock(hglb);
         SetClipboardData(CF_UNICODETEXT, hglb);