fix compose editor cursor position for long urls/text without space

d99kris · d99kris · commit 99d237a01528 · 2020-10-13T20:31:41.000+08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Project
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-project(nmail VERSION "1.96" LANGUAGES CXX)
+project(nmail VERSION "1.97" LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD 11)
 
 # Ccache
diff --git a/src/nmail.1 b/src/nmail.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH NMAIL "1" "October 2020" "nmail v1.96" "User Commands"
+.TH NMAIL "1" "October 2020" "nmail v1.97" "User Commands"
 .SH NAME
 nmail \- ncurses mail
 .SH SYNOPSIS
diff --git a/src/ui.cpp b/src/ui.cpp
@@ -162,7 +162,7 @@ void Ui::Cleanup()
 void Ui::InitWindows()
 {
   getmaxyx(stdscr, m_ScreenHeight, m_ScreenWidth);
-  m_MaxLineLength = m_ScreenWidth - 1;
+  m_MaxLineLength = m_ScreenWidth;
   wclear(stdscr);
   wrefresh(stdscr);
   const int topHeight = 1;
@@ -1260,25 +1260,17 @@ void Ui::DrawComposeMessage()
   
   for (int i = 0; i < (int)headerLines.size(); ++i)
   {
-    if (i != m_ComposeHeaderLine)
+    if (m_IsComposeHeader && (i == m_ComposeHeaderLine) && (cursX >= m_ScreenWidth))
     {
-      std::wstring line = headerLines.at(i) + m_ComposeHeaderStr.at(i);
+      std::wstring line = headerLines.at(i) +
+        m_ComposeHeaderStr.at(i).substr(cursX - m_ScreenWidth + 1);
       composeLines.push_back(line.substr(0, m_ScreenWidth));
+      cursX = m_ScreenWidth - 1;
     }
     else
     {
-      if (cursX >= m_ScreenWidth)
-      {
-        std::wstring line = headerLines.at(i) +
-          m_ComposeHeaderStr.at(i).substr(cursX - m_ScreenWidth + 1);
-        composeLines.push_back(line.substr(0, m_ScreenWidth));
-        cursX = m_ScreenWidth - 1;
-      }
-      else
-      {
-        std::wstring line = headerLines.at(i) + m_ComposeHeaderStr.at(i);
-        composeLines.push_back(line.substr(0, m_ScreenWidth));
-      }
+      std::wstring line = headerLines.at(i) + m_ComposeHeaderStr.at(i);
+      composeLines.push_back(line.substr(0, m_ScreenWidth));
     }
   }
 
@@ -3178,7 +3170,7 @@ void Ui::ResponseHandler(const ImapManager::Request& p_Request, const ImapManage
         }
       }
 
-      const int maxBodysFetchRequest = 1; // XXX evaluate
+      const int maxBodysFetchRequest = 1;
       if (!prefetchBodys.empty())
       {
         std::set<uint32_t> subsetPrefetchBodys;
@@ -3918,21 +3910,20 @@ void Ui::ComposeMessagePrevLine()
 {
   if (m_ComposeMessageWrapLine > 0)
   {
+    int stepsBack = 0;
     if ((int)m_ComposeMessageLines[m_ComposeMessageWrapLine - 1].size() >
         m_ComposeMessageWrapPos)
     {
-      int stepsBack = m_ComposeMessageWrapPos + 1 +
-        (m_ComposeMessageLines[m_ComposeMessageWrapLine - 1].size() -
-         m_ComposeMessageWrapPos);
-      m_ComposeMessagePos = Util::Bound(0, m_ComposeMessagePos - stepsBack,
-                                        (int)m_ComposeMessageStr.size());
+      stepsBack = m_ComposeMessageLines[m_ComposeMessageWrapLine - 1].size() + 1;
     }
     else
     {
-      int stepsBack = m_ComposeMessageWrapPos + 1;
-      m_ComposeMessagePos = Util::Bound(0, m_ComposeMessagePos - stepsBack,
-                                        (int)m_ComposeMessageStr.size());
+      stepsBack = m_ComposeMessageWrapPos + 1;
     }
+
+    stepsBack = std::min(stepsBack, m_MaxLineLength);
+    m_ComposeMessagePos = Util::Bound(0, m_ComposeMessagePos - stepsBack,
+                                      (int)m_ComposeMessageStr.size());
   }
   else
   {
@@ -3955,13 +3946,17 @@ void Ui::ComposeMessageNextLine()
     {
       stepsForward += m_ComposeMessageLines[m_ComposeMessageWrapLine + 1].size();
     }
+
+    stepsForward = std::min(stepsForward, m_MaxLineLength);
     m_ComposeMessagePos = Util::Bound(0, m_ComposeMessagePos + stepsForward,
                                       (int)m_ComposeMessageStr.size());
   }
   else if ((int)m_ComposeMessageLines.size() > 0)
   {
     int stepsForward = m_ComposeMessageLines[m_ComposeMessageWrapLine].size() -
       m_ComposeMessageWrapPos;
+
+    stepsForward = std::min(stepsForward, m_MaxLineLength);
     m_ComposeMessagePos = Util::Bound(0, m_ComposeMessagePos + stepsForward,
                                       (int)m_ComposeMessageStr.size());
   }
diff --git a/src/util.cpp b/src/util.cpp
@@ -799,14 +799,17 @@ std::vector<std::wstring> Util::WordWrap(std::wstring p_Text, unsigned p_LineLen
 
 std::vector<std::wstring> Util::WordWrap(std::wstring p_Text, unsigned p_LineLength,
                                          bool p_WrapQuoteLines,
-                                         int p_Pos, int &p_WrapLine, int &p_WrapPos)
+                                         int p_Pos, int& p_WrapLine, int& p_WrapPos)
 {
   std::wostringstream wrapped;
   std::vector<std::wstring> lines;
 
   p_WrapLine = 0;
   p_WrapPos = 0;
 
+  const unsigned wrapLineLength = p_LineLength - 1; // lines with spaces allowed to width - 1
+  const unsigned overflowLineLength = p_LineLength; // overflowing/long lines allowed to full width
+
   {
     std::wstring line;
     std::wistringstream textss(p_Text);
@@ -815,10 +818,10 @@ std::vector<std::wstring> Util::WordWrap(std::wstring p_Text, unsigned p_LineLen
       std::wstring linePart = line;
       while (true)
       {
-        if ((linePart.size() >= p_LineLength) &&
+        if ((linePart.size() >= wrapLineLength) &&
             (p_WrapQuoteLines || (linePart.rfind(L">", 0) != 0)))
         {
-          size_t spacePos = linePart.rfind(L' ', p_LineLength);
+          size_t spacePos = linePart.rfind(L' ', wrapLineLength);
           if (spacePos != std::wstring::npos)
           {
             lines.push_back(linePart.substr(0, spacePos));
@@ -833,10 +836,10 @@ std::vector<std::wstring> Util::WordWrap(std::wstring p_Text, unsigned p_LineLen
           }
           else
           {
-            lines.push_back(linePart.substr(0, p_LineLength));
-            if (linePart.size() > p_LineLength)
+            lines.push_back(linePart.substr(0, overflowLineLength));
+            if (linePart.size() > overflowLineLength)
             {
-              linePart = linePart.substr(p_LineLength);
+              linePart = linePart.substr(overflowLineLength);
             }
             else
             {
@@ -858,7 +861,7 @@ std::vector<std::wstring> Util::WordWrap(std::wstring p_Text, unsigned p_LineLen
   {
     if (p_Pos > 0)
     {
-      int lineLength = line.size() + 1;
+      int lineLength = std::min((unsigned)line.size() + 1, overflowLineLength);
       if (lineLength <= p_Pos)
       {
         p_Pos -= lineLength;

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ void Ui::Cleanup()`
`162`	`162`	`void Ui::InitWindows()`
`163`	`163`	`{`
`164`	`164`	`getmaxyx(stdscr, m_ScreenHeight, m_ScreenWidth);`
`165`		`- m_MaxLineLength = m_ScreenWidth - 1;`
	`165`	`+ m_MaxLineLength = m_ScreenWidth;`
`166`	`166`	`wclear(stdscr);`
`167`	`167`	`wrefresh(stdscr);`
`168`	`168`	`const int topHeight = 1;`
`@@ -1260,25 +1260,17 @@ void Ui::DrawComposeMessage()`
`1260`	`1260`
`1261`	`1261`	`for (int i = 0; i < (int)headerLines.size(); ++i)`
`1262`	`1262`	`{`
`1263`		`- if (i != m_ComposeHeaderLine)`
	`1263`	`+ if (m_IsComposeHeader && (i == m_ComposeHeaderLine) && (cursX >= m_ScreenWidth))`
`1264`	`1264`	`{`
`1265`		`- std::wstring line = headerLines.at(i) + m_ComposeHeaderStr.at(i);`
	`1265`	`+ std::wstring line = headerLines.at(i) +`
	`1266`	`+ m_ComposeHeaderStr.at(i).substr(cursX - m_ScreenWidth + 1);`
`1266`	`1267`	`composeLines.push_back(line.substr(0, m_ScreenWidth));`
	`1268`	`+ cursX = m_ScreenWidth - 1;`
`1267`	`1269`	`}`
`1268`	`1270`	`else`
`1269`	`1271`	`{`
`1270`		`- if (cursX >= m_ScreenWidth)`
`1271`		`- {`
`1272`		`- std::wstring line = headerLines.at(i) +`
`1273`		`- m_ComposeHeaderStr.at(i).substr(cursX - m_ScreenWidth + 1);`
`1274`		`- composeLines.push_back(line.substr(0, m_ScreenWidth));`
`1275`		`- cursX = m_ScreenWidth - 1;`
`1276`		`- }`
`1277`		`- else`
`1278`		`- {`
`1279`		`- std::wstring line = headerLines.at(i) + m_ComposeHeaderStr.at(i);`
`1280`		`- composeLines.push_back(line.substr(0, m_ScreenWidth));`
`1281`		`- }`
	`1272`	`+ std::wstring line = headerLines.at(i) + m_ComposeHeaderStr.at(i);`
	`1273`	`+ composeLines.push_back(line.substr(0, m_ScreenWidth));`
`1282`	`1274`	`}`
`1283`	`1275`	`}`
`1284`	`1276`
`@@ -3178,7 +3170,7 @@ void Ui::ResponseHandler(const ImapManager::Request& p_Request, const ImapManage`
`3178`	`3170`	`}`
`3179`	`3171`	`}`
`3180`	`3172`
`3181`		`- const int maxBodysFetchRequest = 1; // XXX evaluate`
	`3173`	`+ const int maxBodysFetchRequest = 1;`
`3182`	`3174`	`if (!prefetchBodys.empty())`
`3183`	`3175`	`{`
`3184`	`3176`	`std::set<uint32_t> subsetPrefetchBodys;`
`@@ -3918,21 +3910,20 @@ void Ui::ComposeMessagePrevLine()`
`3918`	`3910`	`{`
`3919`	`3911`	`if (m_ComposeMessageWrapLine > 0)`
`3920`	`3912`	`{`
	`3913`	`+ int stepsBack = 0;`
`3921`	`3914`	`if ((int)m_ComposeMessageLines[m_ComposeMessageWrapLine - 1].size() >`
`3922`	`3915`	`m_ComposeMessageWrapPos)`
`3923`	`3916`	`{`
`3924`		`- int stepsBack = m_ComposeMessageWrapPos + 1 +`
`3925`		`- (m_ComposeMessageLines[m_ComposeMessageWrapLine - 1].size() -`
`3926`		`- m_ComposeMessageWrapPos);`
`3927`		`- m_ComposeMessagePos = Util::Bound(0, m_ComposeMessagePos - stepsBack,`
`3928`		`- (int)m_ComposeMessageStr.size());`
	`3917`	`+ stepsBack = m_ComposeMessageLines[m_ComposeMessageWrapLine - 1].size() + 1;`
`3929`	`3918`	`}`
`3930`	`3919`	`else`
`3931`	`3920`	`{`
`3932`		`- int stepsBack = m_ComposeMessageWrapPos + 1;`
`3933`		`- m_ComposeMessagePos = Util::Bound(0, m_ComposeMessagePos - stepsBack,`
`3934`		`- (int)m_ComposeMessageStr.size());`
	`3921`	`+ stepsBack = m_ComposeMessageWrapPos + 1;`
`3935`	`3922`	`}`
	`3923`	`+`
	`3924`	`+ stepsBack = std::min(stepsBack, m_MaxLineLength);`
	`3925`	`+ m_ComposeMessagePos = Util::Bound(0, m_ComposeMessagePos - stepsBack,`
	`3926`	`+ (int)m_ComposeMessageStr.size());`
`3936`	`3927`	`}`
`3937`	`3928`	`else`
`3938`	`3929`	`{`
`@@ -3955,13 +3946,17 @@ void Ui::ComposeMessageNextLine()`
`3955`	`3946`	`{`
`3956`	`3947`	`stepsForward += m_ComposeMessageLines[m_ComposeMessageWrapLine + 1].size();`
`3957`	`3948`	`}`
	`3949`	`+`
	`3950`	`+ stepsForward = std::min(stepsForward, m_MaxLineLength);`
`3958`	`3951`	`m_ComposeMessagePos = Util::Bound(0, m_ComposeMessagePos + stepsForward,`
`3959`	`3952`	`(int)m_ComposeMessageStr.size());`
`3960`	`3953`	`}`
`3961`	`3954`	`else if ((int)m_ComposeMessageLines.size() > 0)`
`3962`	`3955`	`{`
`3963`	`3956`	`int stepsForward = m_ComposeMessageLines[m_ComposeMessageWrapLine].size() -`
`3964`	`3957`	`m_ComposeMessageWrapPos;`
	`3958`	`+`
	`3959`	`+ stepsForward = std::min(stepsForward, m_MaxLineLength);`
`3965`	`3960`	`m_ComposeMessagePos = Util::Bound(0, m_ComposeMessagePos + stepsForward,`
`3966`	`3961`	`(int)m_ComposeMessageStr.size());`
`3967`	`3962`	`}`
Original file line number	Diff line number	Diff line change
`@@ -799,14 +799,17 @@ std::vector<std::wstring> Util::WordWrap(std::wstring p_Text, unsigned p_LineLen`
`799`	`799`
`800`	`800`	`std::vector<std::wstring> Util::WordWrap(std::wstring p_Text, unsigned p_LineLength,`
`801`	`801`	`bool p_WrapQuoteLines,`
`802`		`- int p_Pos, int &p_WrapLine, int &p_WrapPos)`
	`802`	`+ int p_Pos, int& p_WrapLine, int& p_WrapPos)`
`803`	`803`	`{`
`804`	`804`	`std::wostringstream wrapped;`
`805`	`805`	`std::vector<std::wstring> lines;`
`806`	`806`
`807`	`807`	`p_WrapLine = 0;`
`808`	`808`	`p_WrapPos = 0;`
`809`	`809`
	`810`	`+ const unsigned wrapLineLength = p_LineLength - 1; // lines with spaces allowed to width - 1`
	`811`	`+ const unsigned overflowLineLength = p_LineLength; // overflowing/long lines allowed to full width`
	`812`	`+`
`810`	`813`	`{`
`811`	`814`	`std::wstring line;`
`812`	`815`	`std::wistringstream textss(p_Text);`
`@@ -815,10 +818,10 @@ std::vector<std::wstring> Util::WordWrap(std::wstring p_Text, unsigned p_LineLen`
`815`	`818`	`std::wstring linePart = line;`
`816`	`819`	`while (true)`
`817`	`820`	`{`
`818`		`- if ((linePart.size() >= p_LineLength) &&`
	`821`	`+ if ((linePart.size() >= wrapLineLength) &&`
`819`	`822`	`(p_WrapQuoteLines \|\| (linePart.rfind(L">", 0) != 0)))`
`820`	`823`	`{`
`821`		`- size_t spacePos = linePart.rfind(L' ', p_LineLength);`
	`824`	`+ size_t spacePos = linePart.rfind(L' ', wrapLineLength);`
`822`	`825`	`if (spacePos != std::wstring::npos)`
`823`	`826`	`{`
`824`	`827`	`lines.push_back(linePart.substr(0, spacePos));`
`@@ -833,10 +836,10 @@ std::vector<std::wstring> Util::WordWrap(std::wstring p_Text, unsigned p_LineLen`
`833`	`836`	`}`
`834`	`837`	`else`
`835`	`838`	`{`
`836`		`- lines.push_back(linePart.substr(0, p_LineLength));`
`837`		`- if (linePart.size() > p_LineLength)`
	`839`	`+ lines.push_back(linePart.substr(0, overflowLineLength));`
	`840`	`+ if (linePart.size() > overflowLineLength)`
`838`	`841`	`{`
`839`		`- linePart = linePart.substr(p_LineLength);`
	`842`	`+ linePart = linePart.substr(overflowLineLength);`
`840`	`843`	`}`
`841`	`844`	`else`
`842`	`845`	`{`
`@@ -858,7 +861,7 @@ std::vector<std::wstring> Util::WordWrap(std::wstring p_Text, unsigned p_LineLen`
`858`	`861`	`{`
`859`	`862`	`if (p_Pos > 0)`
`860`	`863`	`{`
`861`		`- int lineLength = line.size() + 1;`
	`864`	`+ int lineLength = std::min((unsigned)line.size() + 1, overflowLineLength);`
`862`	`865`	`if (lineLength <= p_Pos)`
`863`	`866`	`{`
`864`	`867`	`p_Pos -= lineLength;`