Fix building on macOS Sonoma, make control chars visible

Author: Slackadays

src/cb/src/actions/history.cpp

@@ -207,7 +207,7 @@ void history() {
             if (auto MIMEtype = inferMIMEType(content); MIMEtype.has_value())
                 content = "\033[7m\033[1m " + std::string(MIMEtype.value()) + ", " + formatBytes(content.length()) + " \033[22m\033[27m";
             else
-                std::erase(content, '\n');
+                content = makeControlCharactersVisible(content, available.columns);
             batchedMessage += content.substr(0, widthRemaining);
             continue;
         }

src/cb/src/actions/search.cpp

@@ -53,7 +53,7 @@ void displaySearchResults(const std::vector<Result>& results) {
                 "",
                 result.entry);
         std::string preview = result.preview;
-        std::erase(preview, '\n');
+        preview = makeControlCharactersVisible(preview, available.columns);
         auto widthRemaining = available.columns - (longestClipboardLength + longestEntryLength + 7);
         if (preview.length() > widthRemaining) {
             preview = preview.substr(0, widthRemaining - (preview.length() - columnLength(preview)));

src/cb/src/actions/show.cpp

@@ -24,9 +24,11 @@ void show() {
 
     stopIndicator();
 
+    auto available = thisTerminalSize();
+
     if (path.holdsRawDataInCurrentEntry()) {
         std::string content(fileContents(path.data.raw).value());
-        std::erase(content, '\n');
+        content = makeControlCharactersVisible(content, available.columns);
         fprintf(stderr, clipboard_text_contents_message().data(), std::min(static_cast<size_t>(250), content.size()), clipboard_name.data());
         fprintf(stderr, formatColors("[bold][info]%s\n[blank]").data(), content.substr(0, 250).data());
         if (content.size() > 250) {
@@ -35,7 +37,6 @@ void show() {
         return;
     }
 
-    auto available = thisTerminalSize();
     fprintf(stderr, "%s", formatColors("[info]┏━━").data());
     fprintf(stderr, clipboard_item_many_contents_message().data(), clipboard_name.data());
     fprintf(stderr, "%s", formatColors("[info]━").data());

src/cb/src/actions/status.cpp

@@ -58,7 +58,7 @@ void status() {
             if (auto type = inferMIMEType(content); type.has_value())
                 content = "\033[7m\033[1m " + std::string(type.value()) + ", " + formatBytes(content.length()) + " \033[22m\033[27m";
             else
-                std::erase(content, '\n');
+                content = makeControlCharactersVisible(content, available.columns);
             fprintf(stderr, formatColors("[help]%s[blank]\n").data(), content.substr(0, widthRemaining).data());
             clipboard.releaseLock();
             continue;

src/cb/src/clipboard.hpp

@@ -13,6 +13,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 #pragma once
+#include <algorithm>
 #include <array>
 #include <atomic>
 #include <chrono>
@@ -348,6 +349,7 @@ bool envVarIsTrue(const std::string_view& name);
 size_t columnLength(const std::string_view& message);
 std::string generatedEndbar();
 std::string repeatString(const std::string_view& character, const size_t& length);
+std::string makeControlCharactersVisible(const std::string_view& oldStr, size_t len = 0);
 unsigned long levenshteinDistance(const std::string_view& one, const std::string_view& two);
 void setLanguagePT();
 void setLanguageTR();

src/cb/src/utils.cpp

@@ -200,6 +200,31 @@ std::string formatColors(const std::string_view& oldStr, bool colorful) {
     return newStr;
 }
 
+std::string makeControlCharactersVisible(const std::string_view& oldStr, size_t len) {
+    std::string newStr;
+    newStr.reserve(oldStr.size());
+
+    if (len == 0) len = oldStr.size();
+
+    // format characters such as \n and \r such that they appear as \n and \r surrounded by lightening terminal colors
+    const std::array<std::pair<char, std::string_view>, 8> replacementCharacters {
+            {{'\n', "\\n"}, {'\r', "\\r"}, {'\a', "\\a"}, {'\b', "\\b"}, {'\f', "\\f"}, {'\t', "\\t"}, {'\v', "\\v"}, {'\0', "\\0"}}};
+
+    for (size_t i = 0; i < len - 1 && i < oldStr.size(); i++) {
+        bool matched = false;
+        for (const auto& [character, replacement] : replacementCharacters) {
+            if (oldStr[i] == character) {
+                newStr += "\033[2m" + std::string(replacement) + "\033[22m";
+                matched = true;
+                break;
+            }
+        }
+        if (!matched) newStr += oldStr[i];
+    }
+
+    return newStr;
+}
+
 std::string JSONescape(const std::string_view& input) {
     std::string temp(input);