WIP

Externals/crystaledit/editlib/ccrystaltextview.cpp

@@ -427,6 +427,7 @@ CCrystalTextView::CCrystalTextView ()
 , m_pCrystalRendererSaved(nullptr)
 , m_nColumnResizing(-1)
 , m_nLineNumberUsedAsHeaders(-1)
+, m_nRevMarkWidth(MARGIN_REV_WIDTH)
 {
 #ifdef _WIN64
   if (m_nRenderingMode == RENDERING_MODE::GDI)
@@ -2569,8 +2570,11 @@ DrawMargin (const CRect & rect, int nLineIndex, int nLineNumber)
     }
 
   // draw line revision marks
-  CRect rc(rect.right - MARGIN_REV_WIDTH, rect.top, rect.right, rect.bottom);
-  m_pCrystalRenderer->FillSolidRectangle (rc, clrRevisionMark);
+  if (m_nRevMarkWidth > 0)
+    {
+      CRect rc(rect.right - m_nRevMarkWidth, rect.top, rect.right, rect.bottom);
+      m_pCrystalRenderer->FillSolidRectangle (rc, clrRevisionMark);
+    }
 
   if (!m_bSelMargin)
     return;
@@ -6211,7 +6215,7 @@ GetMarginWidth (CDC *pdc /*= nullptr*/)
   else
     {
       if (pdc == nullptr || !pdc->IsPrinting ())
-        nMarginWidth += MARGIN_REV_WIDTH; // Space for revision marks
+        nMarginWidth += m_nRevMarkWidth; // Space for revision marks
     }
 
   return nMarginWidth;
@@ -6980,7 +6984,8 @@ CString CCrystalTextView::GetTextBufferEol(int nLine) const
 
 void CCrystalTextView::SetMarkersContext(CCrystalTextMarkers * pMarkers)
 {
-  pMarkers->AddView(this);
+  if (pMarkers)
+    pMarkers->AddView(this);
   m_pMarkers = pMarkers;
 }
 
@@ -7042,8 +7047,20 @@ void CCrystalTextView::EnsureVisible (CEPoint ptStart, CEPoint ptEnd)
   //BEGIN SW
   int nSubLineCount = GetSubLineCount();
   int nNewTopSubLine = m_nTopSubLine;
-  CEPoint subLinePos;
 
+  if (ptStart != ptEnd)
+    {
+      CEPoint subLinePosEnd;
+      CharPosToPoint(ptEnd.y, ptEnd.x, subLinePosEnd);
+      subLinePosEnd.y += GetSubLineIndex(ptEnd.y);
+
+      if (subLinePosEnd.y >= nNewTopSubLine + GetScreenLines())
+          nNewTopSubLine = subLinePosEnd.y - GetScreenLines() + 1;
+      if (subLinePosEnd.y < nNewTopSubLine)
+          nNewTopSubLine = subLinePosEnd.y;
+    }
+
+  CEPoint subLinePos;
   CharPosToPoint( ptStart.y, ptStart.x, subLinePos );
   subLinePos.y += GetSubLineIndex( ptStart.y );
 

Externals/crystaledit/editlib/ccrystaltextview.h

@@ -231,6 +231,8 @@ protected :
     HACCEL m_hAccel;
     bool m_bVertScrollBarLocked, m_bHorzScrollBarLocked;
     CEPoint m_ptDraggedTextBegin, m_ptDraggedTextEnd;
+    int m_nRevMarkWidth;
+
     void UpdateCaret ();
     void SetAnchor (const CEPoint & ptNewAnchor);
     int GetTopMarginHeight ();
@@ -708,6 +710,8 @@ public :
     void SetTopMargin (bool bTopMargin);
     bool GetSelectionMargin () const { return m_bSelMargin; }
     void SetSelectionMargin (bool bSelMargin);
+    int GetRevisionMarkWidth() const { return m_nRevMarkWidth; }
+    void SetRevisionMarkWidth(int width) { m_nRevMarkWidth = width; };
     bool GetViewLineNumbers() const { return m_bViewLineNumbers; }
     void SetViewLineNumbers(bool bViewLineNumbers);
     int  GetLineUsedAsHeaders () const { return m_nLineNumberUsedAsHeaders; }

Externals/crystaledit/editlib/utils/ctchar.h

@@ -5,6 +5,7 @@
 #include <cstring>
 #include <cstdlib>
 #include <cstdarg>
+#include <ctime>
 
 #if defined(_WIN32)
 #define STRSAFE_NO_DEPRECATE
@@ -85,6 +86,7 @@ namespace tc
 	constexpr auto tcscmplogical = ::wcscmplogical;
 	constexpr auto tcsspn = ::wcsspn;
 	constexpr auto tcsdup = ::wcsdup;
+	constexpr auto tcsftime = wcsftime;
 	inline tchar_t* tcschr(const tchar_t* str, tchar_t ch) { return const_cast<tchar_t*>(::wcschr(str, ch)); }
 	inline tchar_t* tcsrchr(const tchar_t* str, tchar_t ch) { return const_cast<tchar_t*>(::wcsrchr(str, ch)); }
 	inline tchar_t* tcsstr(const tchar_t* str, const tchar_t* substr) { return const_cast<tchar_t*>(::wcsstr(str, substr)); }
@@ -119,6 +121,7 @@ namespace tc
 	constexpr auto tcscmplogical = ::strcmplogical;
 	constexpr auto tcsspn = ::strspn;
 	constexpr auto tcsdup = ::strdup;
+	constexpr auto tcsftime = strftime;
 	inline tchar_t* tcschr(const tchar_t* str, tchar_t ch) { return const_cast<tchar_t*>(::strchr(str, ch)); }
 	inline tchar_t* tcsrchr(const tchar_t* str, tchar_t ch) { return const_cast<tchar_t*>(::strrchr(str, ch)); }
 	inline tchar_t* tcsstr(const tchar_t* str, const tchar_t* substr) { return const_cast<tchar_t*>(::strstr(str, substr)); }

Src/7zCommon.cpp

@@ -95,6 +95,7 @@ DATE:		BY:					DESCRIPTION:
 #include "paths.h"
 #include "Environment.h"
 #include "Merge7zFormatRegister.h"
+#include "Logger.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -635,7 +636,7 @@ DecompressResult DecompressArchive(HWND hWnd, const PathContext& files)
 				}
 				if (res.files[0].find(path) == 0)
 				{
-					VERIFY(::DeleteFile(res.files[0].c_str()) || (LogErrorString(strutils::format(_T("DeleteFile(%s) failed"), res.files[0])), false));
+					VERIFY(::DeleteFile(res.files[0].c_str()) || (RootLogger::Error(strutils::format(_T("DeleteFile(%s) failed"), res.files[0])), false));
 				}
 				BSTR pTmp = piHandler->GetDefaultName(hWnd, res.files[0].c_str());
 				res.files[0] = ucr::toTString(pTmp);
@@ -667,7 +668,7 @@ DecompressResult DecompressArchive(HWND hWnd, const PathContext& files)
 				}
 				if (res.files[1].find(path) == 0)
 				{
-					VERIFY(::DeleteFile(res.files[1].c_str()) || (LogErrorString(strutils::format(_T("DeleteFile(%s) failed"), res.files[1])), false));
+					VERIFY(::DeleteFile(res.files[1].c_str()) || (RootLogger::Error(strutils::format(_T("DeleteFile(%s) failed"), res.files[1])), false));
 				}
 				BSTR pTmp = piHandler->GetDefaultName(hWnd, res.files[1].c_str());
 				res.files[1] = OLE2T(pTmp);
@@ -698,7 +699,7 @@ DecompressResult DecompressArchive(HWND hWnd, const PathContext& files)
 				}
 				if (res.files[2].find(path) == 0)
 				{
-					VERIFY(::DeleteFile(res.files[2].c_str()) || (LogErrorString(strutils::format(_T("DeleteFile(%s) failed"), res.files[2])), false));
+					VERIFY(::DeleteFile(res.files[2].c_str()) || (RootLogger::Error(strutils::format(_T("DeleteFile(%s) failed"), res.files[2])), false));
 				}
 				BSTR pTmp = piHandler->GetDefaultName(hWnd, res.files[2].c_str());
 				res.files[2] = OLE2T(pTmp);

Src/Common/MDITabBar.cpp

@@ -655,7 +655,7 @@ BOOL CMDITabBar::Create(CMDIFrameWnd* pMainFrame)
 
 	m_titleBar.Init(this);
 
-	CWnd::Create(nullptr, nullptr, WS_CHILD | WS_VISIBLE, CRect(0, 0, 0, 0), pMainFrame, AFX_IDW_CONTROLBAR_FIRST + 30);
+	CWnd::Create(nullptr, nullptr, WS_CHILD | WS_VISIBLE, CRect(0, 0, 0, 0), pMainFrame, AFX_IDW_CONTROLBAR_LAST - 1);
 
 	if (!m_tabCtrl.Create(pMainFrame, this))
 		return FALSE;

Src/Common/multiformatText.cpp

@@ -31,7 +31,7 @@
 #include "codepage_detect.h"
 #include "Environment.h"
 #include "TFile.h"
-#include "MergeApp.h"
+#include "Logger.h"
 
 using Poco::SharedMemory;
 using Poco::FileOutputStream;
@@ -103,7 +103,7 @@ const tchar_t *storageForPlugins::GetDestFileName()
 			}
 			catch (Exception& e)
 			{
-				LogErrorStringUTF8(e.displayText());
+				RootLogger::Error(e.displayText());
 			}
 		}
 	}
@@ -125,7 +125,7 @@ void storageForPlugins::ValidateNewFile()
 		}
 		catch (Exception& e)
 		{
-			LogErrorStringUTF8(e.displayText());
+			RootLogger::Error(e.displayText());
 		}
 		// we may reuse the temp filename
 		// tempFilenameDst.Empty();
@@ -142,7 +142,7 @@ void storageForPlugins::ValidateNewFile()
 			}
 			catch (Exception& e)
 			{
-				LogErrorStringUTF8(e.displayText());
+				RootLogger::Error(e.displayText());
 			}
 		}
 		else

Src/Common/unicoder.cpp

@@ -873,6 +873,18 @@ String toTString(const std::string& str)
 #endif
 }
 
+String toTStringFromACP(const std::string& str)
+{
+#ifndef UNICODE
+	return str;
+#else
+	String retval;
+	bool lossy = false;
+	maketstring(retval, str.c_str(), str.length(), GetACP(), &lossy);
+	return retval;
+#endif
+}
+
 void toUTF16(const String& tstr, std::wstring& wstr)
 {
 #ifdef UNICODE

Src/Common/unicoder.h

@@ -97,6 +97,7 @@ void dealloc(void *ptr);
 
 String toTString(const std::wstring& str);
 String toTString(const std::string& str);
+String toTStringFromACP(const std::string& str);
 void toUTF16(const String& tstr, std::wstring& wstr);
 inline std::wstring toUTF16(const String& tstr)
 {

Src/DiffTextBuffer.cpp

@@ -10,6 +10,7 @@
 #include "ccrystaltextview.h"
 #include "UniFile.h"
 #include "FileLoadResult.h"
+#include "Logger.h"
 #include "locality.h"
 #include "paths.h"
 #include "OptionsDef.h"
@@ -366,7 +367,7 @@ int CDiffTextBuffer::LoadFromFile(const tchar_t* pszFileNameInit,
 		}
 		catch (Exception& e)
 		{
-			LogErrorStringUTF8(e.displayText());
+			RootLogger::Error(e.displayText());
 		}
 	}
 	return nRetVal;
@@ -436,10 +437,10 @@ int CDiffTextBuffer::SaveToFile (const String& pszFileName,
 		{
 			sError = uniErr.GetError();
 			if (bTempFile)
-				LogErrorString(strutils::format(_T("Opening file %s failed: %s"),
+				RootLogger::Error(strutils::format(_T("Opening file %s failed: %s"),
 					pszFileName, sError));
 			else
-				LogErrorString(strutils::format(_T("Opening file %s failed: %s"),
+				RootLogger::Error(strutils::format(_T("Opening file %s failed: %s"),
 					sIntermediateFilename, sError));
 		}
 		return SAVE_FAILED;
@@ -525,7 +526,7 @@ int CDiffTextBuffer::SaveToFile (const String& pszFileName,
 		}
 		catch (Exception& e)
 		{
-			LogErrorStringUTF8(e.displayText());
+			RootLogger::Error(e.displayText());
 		}
 		if (!bSaveSuccess)
 		{

Src/DiffWrapper.cpp

@@ -34,6 +34,7 @@
 #include "Exceptions.h"
 #include "parsers/crystallineparser.h"
 #include "SyntaxColors.h"
+#include "Logger.h"
 #include "MergeApp.h"
 #include "SubstitutionList.h"
 #include "codepage_detect.h"
@@ -953,7 +954,7 @@ bool CDiffWrapper::RunFileDiff()
 				}
 				catch (Exception& e)
 				{
-					LogErrorStringUTF8(e.displayText());
+					RootLogger::Error(e.displayText());
 				}
 				strFileTemp[file].erase();
 			}
@@ -982,7 +983,7 @@ void CDiffWrapper::AddDiffRange(DiffList *pDiffList, unsigned begin0, unsigned e
 	}
 	catch (std::exception& e)
 	{
-		AppErrorMessageBox(ucr::toTString(e.what()));
+		RootLogger::Error(e.what());
 	}
 }
 
@@ -994,7 +995,7 @@ void CDiffWrapper::AddDiffRange(DiffList *pDiffList, DIFFRANGE &dr)
 	}
 	catch (std::exception& e)
 	{
-		AppErrorMessageBox(ucr::toTString(e.what()));
+		RootLogger::Error(e.what());
 	}
 }
 

Src/DirActions.cpp

@@ -14,6 +14,7 @@
 #include "DirActions.h"
 #include "MergeApp.h"
 #include "UnicodeString.h"
+#include "Logger.h"
 #include "7zCommon.h"
 #include "ShellFileOperations.h"
 #include "DiffItem.h"
@@ -228,7 +229,7 @@ void ConfirmActionList(const CDiffContext& ctxt, const FileActionScript & action
 
 	// Invalid operation
 	default: 
-		LogErrorString(_T("Unknown fileoperation in CDirView::ConfirmActionList()"));
+		RootLogger::Error(_T("Unknown fileoperation in CDirView::ConfirmActionList()"));
 		throw "Unknown fileoperation in ConfirmActionList()";
 		break;
 	}
@@ -1221,7 +1222,7 @@ int UpdateCompareFlagsAfterSync(DIFFITEM& di, bool bRecursive)
 /**
  * @brief Update the paths of the diff items recursively.
  * @param[in] nDirs Number of directories to compare.
- * @param[in,out] di@Item to update the path.
+ * @param[in,out] di Item to update the path.
  */
 void UpdatePaths(int nDirs, DIFFITEM& di)
 {

Src/DirDoc.cpp

@@ -176,6 +176,8 @@ void CDirDoc::InitCompare(const PathContext & paths, bool bRecursive, CTempPathC
 		for (nIndex = 0; nIndex < m_nDirs; nIndex++)
 			m_pTempPathContext->m_strRoot[nIndex] = m_pCtxt->GetNormalizedPath(nIndex);
 	}
+
+	CMergeFrameCommon::LogComparisonStart(paths, m_strDesc, nullptr, nullptr);
 }
 
 

Src/DirItem.cpp

@@ -10,6 +10,7 @@
 #include "UnicodeString.h"
 #include "paths.h"
 #include "TFile.h"
+#include "Logger.h"
 #include "DebugNew.h"
 #include <filesystem>
 
@@ -72,8 +73,9 @@ bool DirItem::Update(const String &sFilePath)
 
 			retVal = true;
 		}
-		catch (...)
+		catch (Poco::Exception& e)
 		{
+			RootLogger::Error(e.displayText());
 		}
 	}
 	return retVal;

Src/DirView.cpp

@@ -426,7 +426,7 @@ void CDirView::OnInitialUpdate()
 	// Load user-selected font
 	if (GetOptionsMgr()->GetBool(OPT_FONT_DIRCMP + OPT_FONT_USECUSTOM))
 	{
-		m_font.CreateFontIndirect(&GetMainFrame()->m_lfDir);
+		m_font.CreateFontIndirect(&theApp.m_lfDir);
 		CWnd::SetFont(&m_font, TRUE);
 	}
 
@@ -2549,6 +2549,8 @@ LRESULT CDirView::OnUpdateUIMessage(WPARAM wParam, LPARAM lParam)
 		if (m_elapsed > TimeToSignalCompare * CLOCKS_PER_SEC)
 			MessageBeep(IDOK);
 		GetMainFrame()->StartFlashing();
+		CMergeFrameCommon::LogComparisonCompleted(*pDoc->GetDiffContext().m_pCompareStats);
+
 	}
 	else if (wParam == CDiffThread::EVENT_COMPARE_PROGRESSED)
 	{

Src/FileTransform.cpp

@@ -20,6 +20,7 @@
 #include "Environment.h"
 #include "TFile.h"
 #include "paths.h"
+#include "Logger.h"
 #include "MergeApp.h"
 
 using Poco::Exception;
@@ -537,7 +538,7 @@ bool PackingInfo::Packing(int target, const String& srcFilepath, const String& d
 	catch (Poco::Exception& e)
 	{
 		DWORD dwErrCode = GetLastError();
-		LogErrorStringUTF8(e.displayText());
+		RootLogger::Error(e.displayText());
 		SetLastError(dwErrCode);
 		return false;
 	}
@@ -954,7 +955,7 @@ bool AnyCodepageToUTF8(int codepage, String & filepath, bool bMayOverwrite)
 			}
 			catch (Exception& e)
 			{
-				LogErrorStringUTF8(e.displayText());
+				RootLogger::Error(e.displayText());
 			}
 		}
 		// and change the filepath if everything works
@@ -968,7 +969,7 @@ bool AnyCodepageToUTF8(int codepage, String & filepath, bool bMayOverwrite)
 		}
 		catch (Exception& e)
 		{
-			LogErrorStringUTF8(e.displayText());
+			RootLogger::Error(e.displayText());
 		}
 	}