PATCH: [ 1497147 ] Cleanup CCrystalTextView::ClientToText

diff --git a/Src/Changes.txt b/Src/Changes.txt
index a1b6d25..d449f7a 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -7,6 +7,8 @@ Add new items to top.
   Src/editlib: ccrystaltextview.cpp
  PATCH: [ 1497068 ] Initialize cursorpositions in GhostTextView
   Src: GhostTextView.h
+ PATCH: [ 1497147 ] Cleanup CCrystalTextView::ClientToText
+  Src/editlib: ccrystaltextview.cpp
 
 2006-05-25 Kimmo
  BUG: [ 1494610 ] Wrong selection in ccrystalview2.cpp

diff --git a/Src/editlib/ccrystaltextview.cpp b/Src/editlib/ccrystaltextview.cpp
index 46b845c..541e2f2 100644 (file)
--- a/Src/editlib/ccrystaltextview.cpp
+++ b/Src/editlib/ccrystaltextview.cpp
@@ -3358,6 +3358,12 @@ OnSetCursor (CWnd * pWnd, UINT nHitTest, UINT message)
   return CView::OnSetCursor (pWnd, nHitTest, message);
 }
 
+/** 
+ * @brief Converts client area point to text position.
+ * @param [in] point Client area point.
+ * @return Text position (line index, char index in line).
+ * @note For gray selection area char index is 0.
+ */
 CPoint CCrystalTextView::
 ClientToText (const CPoint & point)
 {
@@ -3381,9 +3387,9 @@ ClientToText (const CPoint & point)
   pt.y = nLine;
 
   LPCTSTR pszLine = NULL;
-  int  nLength = 0;
+  int nLength = 0;
   int *anBreaks = NULL;
-  int  nBreaks = 0;
+  int nBreaks = 0;
 
   if (pt.y >= 0 && pt.y < nLineCount)
     {
@@ -3392,34 +3398,35 @@ ClientToText (const CPoint & point)
       pszLine = GetLineChars(pt.y);
       WrapLineCached( pt.y, GetScreenChars(), anBreaks, nBreaks );
 
-      if( nSubLineOffset > 0 )
+      if (nSubLineOffset > 0)
         nOffsetChar = anBreaks[nSubLineOffset - 1];
-      if( nBreaks > nSubLineOffset )
+      if (nBreaks > nSubLineOffset)
         nLength = anBreaks[nSubLineOffset] - 1;
     }
 
-  int nPos = nOffsetChar + (point.x - GetMarginWidth()) / GetCharWidth();
+  int nPos = 0;
+  // Char index for margin area is 0
+  if (point.x > GetMarginWidth())
+    nPos = nOffsetChar + (point.x - GetMarginWidth()) / GetCharWidth();
   if (nPos < 0)
     nPos = 0;
 
-  int nIndex = 0, nCurPos = 0, n = 0, i = 0;
+  int nIndex = 0;
+  int nCurPos = 0;
+  int n = 0;
+  int i = 0;
   const int nTabSize = GetTabSize();
 
-  /*
-  if( m_bWordWrap )
-    nCurPos = nIndex = nOffsetChar;
-  */
-
   BOOL bDBCSLeadPrev = FALSE;  //DBCS support (yuyunyi)
   while (nIndex < nLength)
     {
-      if( nBreaks && nIndex == anBreaks[i] )
+      if (nBreaks && nIndex == anBreaks[i])
         {
           n = nIndex;
           i++;
         }
 
-      if (pszLine[nIndex] == _T('\t'))
+      if (pszLine[nIndex] == '\t')
         {
           const int nOffset = nTabSize - nCurPos % nTabSize;
           n += nOffset;
@@ -3438,8 +3445,8 @@ ClientToText (const CPoint & point)
         break;
         }
 
-      if(bDBCSLeadPrev)
-        bDBCSLeadPrev=FALSE;
+      if (bDBCSLeadPrev)
+        bDBCSLeadPrev = FALSE;
       else
         bDBCSLeadPrev = IsLeadByte(pszLine[nIndex]);
 
@@ -3448,53 +3455,12 @@ ClientToText (const CPoint & point)
 
   delete[] anBreaks;
 
-  if (pszLine && m_pTextBuffer->IsMBSTrail(pt.y, nIndex)) nIndex--;
-
-  ASSERT(nIndex >= 0 && nIndex <= nLength);
-  pt.x = nIndex;
-  return pt;
-
-  /*ORIGINAL
-  int nLineCount = GetLineCount();
-
-  CPoint pt;
-  pt.y = m_nTopLine + point.y / GetLineHeight();
-  if (pt.y >= nLineCount)
-    pt.y = nLineCount - 1;
-  if (pt.y < 0)
-    pt.y = 0;
-
-  int nLength = 0;
-  LPCTSTR pszLine = NULL;
-  if (pt.y >= 0 && pt.y < nLineCount)
-  {
-    nLength = GetLineLength(pt.y);
-    pszLine = GetLineChars(pt.y);
-  }
-
-  int nPos = m_nOffsetChar + (point.x - GetMarginWidth()) / GetCharWidth();
-  if (nPos < 0)
-    nPos = 0;
-
-  int nIndex = 0, nCurPos = 0;
-  int nTabSize = GetTabSize();
-  while (nIndex < nLength)
-  {
-    if (pszLine[nIndex] == _T('\t'))
-      nCurPos += (nTabSize - nCurPos % nTabSize);
-    else
-      nCurPos ++;
-
-    if (nCurPos > nPos)
-      break;
-
-    nIndex ++;
-  }
+  if (pszLine && m_pTextBuffer->IsMBSTrail(pt.y, nIndex))
+    nIndex--;
 
   ASSERT(nIndex >= 0 && nIndex <= nLength);
   pt.x = nIndex;
   return pt;
-  *///END SW
 }
 
 #ifdef _DEBUG