toggle show emojis to update text entry field

d99kris · Jan 27, 2024 · afdb3ec · afdb3ec
1 parent d0c9e2d
commit afdb3ec
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 4 deletions.
diff --git a/lib/common/src/version.h b/lib/common/src/version.h
@@ -7,4 +7,4 @@
 
 #pragma once
 
-#define NCHAT_VERSION "4.34"
+#define NCHAT_VERSION "4.35"
diff --git a/src/nchat.1 b/src/nchat.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH NCHAT "1" "January 2024" "nchat v4.34" "User Commands"
+.TH NCHAT "1" "January 2024" "nchat v4.35" "User Commands"
 .SH NAME
 nchat \- ncurses chat
 .SH SYNOPSIS

diff --git a/src/uimodel.cpp b/src/uimodel.cpp
@@ -1,6 +1,6 @@
 // uimodel.cpp
 //
-// Copyright (c) 2019-2023 Kristofer Berggren
+// Copyright (c) 2019-2024 Kristofer Berggren
 // All rights reserved.
 //
 // nchat is distributed under the MIT license, see LICENSE for details.
@@ -143,6 +143,7 @@ void UiModel::KeyHandler(wint_t p_Key)
   else if (p_Key == keyToggleEmoji)
   {
     m_View->SetEmojiEnabled(!m_View->GetEmojiEnabled());
+    EntryConvertEmojiEnabled();
     UpdateList();
     UpdateStatus();
     UpdateHistory();
@@ -3203,3 +3204,28 @@ void UiModel::Quit()
 
   m_Running = false;
 }
+
+void UiModel::EntryConvertEmojiEnabled()
+{
+  const bool emojiEnabled = GetEmojiEnabled();
+  std::string profileId = m_CurrentChat.first;
+  std::string chatId = m_CurrentChat.second;
+  int& entryPos = m_EntryPos[profileId][chatId];
+  std::wstring& entryStr = m_EntryStr[profileId][chatId];
+
+  if (!entryStr.empty())
+  {
+    if (!emojiEnabled)
+    {
+      std::wstring wstr = entryStr;
+      wstr.erase(std::remove(wstr.begin(), wstr.end(), EMOJI_PAD), wstr.end());
+      entryStr = StrUtil::ToWString(StrUtil::Textize(StrUtil::ToString(wstr)));
+    }
+    else
+    {
+      entryStr = StrUtil::ToWString(StrUtil::Emojize(StrUtil::ToString(entryStr), true));
+    }
+
+    entryPos = entryStr.size();
+  }
+}
diff --git a/src/uimodel.h b/src/uimodel.h
@@ -1,6 +1,6 @@
 // uimodel.h
 //
-// Copyright (c) 2019-2023 Kristofer Berggren
+// Copyright (c) 2019-2024 Kristofer Berggren
 // All rights reserved.
 //
 // nchat is distributed under the MIT license, see LICENSE for details.
@@ -156,6 +156,7 @@ class UiModel
   void SendProtocolRequest(const std::string& p_ProfileId, std::shared_ptr<RequestMessage> p_Request);
   bool HasProtocolFeature(const std::string& p_ProfileId, ProtocolFeature p_ProtocolFeature);
   void Quit();
+  void EntryConvertEmojiEnabled();
 
 private:
   bool m_Running = true;