Thread: [Winmerge-svn] SF.net SVN: winmerge:[5800] trunk/Src/editlib/ccrystaltextview.cpp
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2008-08-14 15:38:10
|
Revision: 5800 http://winmerge.svn.sourceforge.net/winmerge/?rev=5800&view=rev Author: kimmov Date: 2008-08-14 15:38:05 +0000 (Thu, 14 Aug 2008) Log Message: ----------- PATCH: [ 1991259 ] Convert editor find/replace to use PCRE regexps Bugfix to non-ascii chars in unicode build from Takashi Modified Paths: -------------- trunk/Src/editlib/ccrystaltextview.cpp Modified: trunk/Src/editlib/ccrystaltextview.cpp =================================================================== --- trunk/Src/editlib/ccrystaltextview.cpp 2008-08-14 14:51:57 UTC (rev 5799) +++ trunk/Src/editlib/ccrystaltextview.cpp 2008-08-14 15:38:05 UTC (rev 5800) @@ -104,6 +104,7 @@ #include "ViewableWhitespace.h" #include "SyntaxColors.h" #include "Ucs2Utf8.h" +#include "unicoder.h" #include "pcre.h" // Escaped character constants in range 0x80-0xFF are interpreted in current codepage @@ -4551,9 +4552,14 @@ if (result >= 0) { +#ifdef UNICODE + pos = ucr::stringlen_of_utf8(compString, ovector[0]); + nLen = ucr::stringlen_of_utf8(compString, ovector[1]) - pos; +#else pos = ovector[0]; nLen = ovector[1] - ovector[0]; - } +#endif + } else pos = -1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2009-06-29 16:07:59
|
Revision: 6881 http://winmerge.svn.sourceforge.net/winmerge/?rev=6881&view=rev Author: kimmov Date: 2009-06-29 16:07:57 +0000 (Mon, 29 Jun 2009) Log Message: ----------- Optimize editor's parse cookie array access. Modified Paths: -------------- trunk/Src/editlib/ccrystaltextview.cpp Modified: trunk/Src/editlib/ccrystaltextview.cpp =================================================================== --- trunk/Src/editlib/ccrystaltextview.cpp 2009-06-29 15:41:00 UTC (rev 6880) +++ trunk/Src/editlib/ccrystaltextview.cpp 2009-06-29 16:07:57 UTC (rev 6881) @@ -1211,13 +1211,11 @@ DWORD CCrystalTextView:: GetParseCookie (int nLineIndex) { - int nLineCount = GetLineCount (); - if (!m_ParseCookies->size()) + const int nLineCount = GetLineCount (); + if (m_ParseCookies->size() == 0) { - m_ParseCookies->resize(nLineCount); // must be initialized to invalid value (DWORD) -1 - for (int i=0; i<nLineCount; ++i) - (*m_ParseCookies)[i] = -1; + m_ParseCookies->assign(nLineCount, -1); } if (nLineIndex < 0) @@ -4071,11 +4069,12 @@ { ASSERT (nLineIndex != -1); // All text below this line should be reparsed - if (m_ParseCookies->size()) + const int cookiesSize = m_ParseCookies->size(); + if (cookiesSize > 0) { - ASSERT (m_ParseCookies->size() == nLineCount); + ASSERT (cookiesSize == nLineCount); // must be reinitialized to invalid value (DWORD) - 1 - for (int i = nLineIndex; i < m_ParseCookies->size(); ++i) + for (int i = nLineIndex; i < cookiesSize; ++i) (*m_ParseCookies)[i] = -1; } // This line'th actual length must be recalculated @@ -4103,15 +4102,17 @@ // All text below this line should be reparsed if (m_ParseCookies->size()) { - if (m_ParseCookies->size() != nLineCount) + int arrSize = m_ParseCookies->size(); + if (arrSize != nLineCount) { - int oldsize = m_ParseCookies->size(); + int oldsize = arrSize; m_ParseCookies->resize(nLineCount); + arrSize = nLineCount; // must be initialized to invalid value (DWORD) - 1 - for (int i = oldsize; i < m_ParseCookies->size(); ++i) + for (int i = oldsize; i < arrSize; ++i) (*m_ParseCookies)[i] = -1; } - for (int i = nLineIndex; i < m_ParseCookies->size(); ++i) + for (int i = nLineIndex; i < arrSize; ++i) (*m_ParseCookies)[i] = -1; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2009-06-30 14:08:07
|
Revision: 6889 http://winmerge.svn.sourceforge.net/winmerge/?rev=6889&view=rev Author: kimmov Date: 2009-06-30 13:30:36 +0000 (Tue, 30 Jun 2009) Log Message: ----------- Optimize editors line length array handling. Modified Paths: -------------- trunk/Src/editlib/ccrystaltextview.cpp Modified: trunk/Src/editlib/ccrystaltextview.cpp =================================================================== --- trunk/Src/editlib/ccrystaltextview.cpp 2009-06-30 10:36:28 UTC (rev 6888) +++ trunk/Src/editlib/ccrystaltextview.cpp 2009-06-30 13:30:36 UTC (rev 6889) @@ -664,10 +664,7 @@ ASSERT (nLineIndex >= 0 && nLineIndex < nLineCount); if (!m_pnActualLineLength->size()) { - m_pnActualLineLength->resize(nLineCount); - // must be initialized to invalid code -1 - for (int i=0; i<nLineCount; ++i) - (*m_pnActualLineLength)[i] = -1; + m_pnActualLineLength->assign(nLineCount, -1); } if ((*m_pnActualLineLength)[nLineIndex] != - 1) @@ -4102,33 +4099,35 @@ // All text below this line should be reparsed if (m_ParseCookies->size()) { - int arrSize = m_ParseCookies->size(); + size_t arrSize = m_ParseCookies->size(); if (arrSize != nLineCount) { - int oldsize = arrSize; + size_t oldsize = arrSize; m_ParseCookies->resize(nLineCount); arrSize = nLineCount; // must be initialized to invalid value (DWORD) - 1 - for (int i = oldsize; i < arrSize; ++i) + for (size_t i = oldsize; i < arrSize; ++i) (*m_ParseCookies)[i] = -1; } - for (int i = nLineIndex; i < arrSize; ++i) + for (size_t i = nLineIndex; i < arrSize; ++i) (*m_ParseCookies)[i] = -1; } // Recalculate actual length for all lines below this if (m_pnActualLineLength->size()) { - if (m_pnActualLineLength->size() != nLineCount) + size_t arrsize = m_pnActualLineLength->size(); + if (arrsize != nLineCount) { // Reallocate actual length array - int oldsize = m_pnActualLineLength->size(); + size_t oldsize = arrsize; m_pnActualLineLength->resize(nLineCount); + arrsize = nLineCount; // must be initialized to invalid code -1 - for (int i = oldsize; i < m_pnActualLineLength->size(); ++i) + for (size_t i = oldsize; i < arrsize; ++i) (*m_pnActualLineLength)[i] = -1; } - for (int i = nLineIndex; i < m_pnActualLineLength->size(); ++i) + for (size_t i = nLineIndex; i < arrsize; ++i) (*m_pnActualLineLength)[i] = -1; } //BEGIN SW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdo...@us...> - 2010-02-01 14:25:03
|
Revision: 7117 http://winmerge.svn.sourceforge.net/winmerge/?rev=7117&view=rev Author: sdottaka Date: 2010-02-01 14:24:51 +0000 (Mon, 01 Feb 2010) Log Message: ----------- PATCH: [ 2669526 ] ViewColor Bug fix in HTML report Modified Paths: -------------- trunk/Src/editlib/ccrystaltextview.cpp Modified: trunk/Src/editlib/ccrystaltextview.cpp =================================================================== --- trunk/Src/editlib/ccrystaltextview.cpp 2010-01-30 08:41:09 UTC (rev 7116) +++ trunk/Src/editlib/ccrystaltextview.cpp 2010-02-01 14:24:51 UTC (rev 7117) @@ -1709,6 +1709,8 @@ COLORINDEX_SELBKGND, COLORINDEX_HIGHLIGHTBKGND1, COLORINDEX_HIGHLIGHTBKGND2, + COLORINDEX_HIGHLIGHTBKGND3, + COLORINDEX_HIGHLIGHTBKGND4, }; CString strStyles; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |