WIP (7)

Author: sdottaka

src/WinWebDiff/Resource.h

@@ -38,9 +38,10 @@
 #define IDM_COMPARE_LASTDIFFERENCE 149
 #define IDM_COMPARE_NEXTCONFLICT 150
 #define IDM_COMPARE_PREVIOUSCONFLICT 151
-#define IDM_SYNC_SCROLL         160
-#define IDM_SYNC_CLICK          161
-#define IDM_SYNC_INPUT          162
+#define IDM_SYNC_ENABLED        160
+#define IDM_SYNC_SCROLL         161
+#define IDM_SYNC_CLICK          162
+#define IDM_SYNC_INPUT          163
 #define IDM_CLEAR_DISK_CACHE    171
 #define IDM_CLEAR_COOKIES       172
 #define IDM_CLEAR_BROWSING_HISTORY 173

src/WinWebDiff/WinWebDiff.cpp

@@ -367,6 +367,7 @@ void UpdateMenuState(HWND hWnd)
 	CheckMenuItem(hMenu, IDM_VIEW_SPLITHORIZONTALLY,  m_pWebDiffWindow->GetHorizontalSplit() ? MF_CHECKED : MF_UNCHECKED);
 	CheckMenuRadioItem(hMenu, IDM_VIEW_DIFF_ALGORITHM_MYERS, IDM_VIEW_DIFF_ALGORITHM_NONE,
 		m_pWebDiffWindow->GetDiffOptions().diffAlgorithm + IDM_VIEW_DIFF_ALGORITHM_MYERS, MF_BYCOMMAND);
+	CheckMenuItem(hMenu, IDM_SYNC_ENABLED, m_pWebDiffWindow->GetSyncEvents() ? MF_CHECKED : MF_UNCHECKED);
 	CheckMenuItem(hMenu, IDM_SYNC_SCROLL,    m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_SCROLL) ? MF_CHECKED : MF_UNCHECKED);
 	CheckMenuItem(hMenu, IDM_SYNC_CLICK,  m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_CLICK) ? MF_CHECKED : MF_UNCHECKED);
 	CheckMenuItem(hMenu, IDM_SYNC_INPUT,  m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_INPUT) ? MF_CHECKED : MF_UNCHECKED);
@@ -586,6 +587,10 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 		case IDM_COMPARE_PREVIOUSCONFLICT:
 			m_pWebDiffWindow->PrevConflict();
 			break;
+		case IDM_SYNC_ENABLED:
+			m_pWebDiffWindow->SetSyncEvents(!m_pWebDiffWindow->GetSyncEvents());
+			UpdateMenuState(m_hWnd);
+			break;
 		case IDM_SYNC_SCROLL:
 			m_pWebDiffWindow->SetSyncEventFlag(IWebDiffWindow::EVENT_SCROLL,
 				!m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_SCROLL));

src/WinWebDiff/WinWebDiff.rc

@@ -286,7 +286,7 @@ class CWebDiffWindow : public IWebDiffWindow
 									}
 									else if (event == L"click")
 									{
-										if (GetSyncEventFlag(EVENT_CLICK))
+										if (m_bSynchronizeEvents && GetSyncEventFlag(EVENT_CLICK))
 										{
 											const std::wstring& window = doc[L"window"].GetString();
 											const std::wstring& selector = doc[L"selector"].GetString();
@@ -295,7 +295,7 @@ class CWebDiffWindow : public IWebDiffWindow
 									}
 									else if (event == L"input")
 									{
-										if (GetSyncEventFlag(EVENT_INPUT))
+										if (m_bSynchronizeEvents && GetSyncEventFlag(EVENT_INPUT))
 										{
 											const std::wstring& window = doc[L"window"].GetString();
 											const std::wstring& selector = doc[L"selector"].GetString();
@@ -305,7 +305,7 @@ class CWebDiffWindow : public IWebDiffWindow
 									}
 									else if (event == L"scroll")
 									{
-										if (GetSyncEventFlag(EVENT_SCROLL))
+										if (m_bSynchronizeEvents && GetSyncEventFlag(EVENT_SCROLL))
 										{
 											const double left = doc[L"left"].GetDouble();
 											const double top = doc[L"top"].GetDouble();
@@ -630,6 +630,26 @@ class CWebDiffWindow : public IWebDiffWindow
 		Recompare(nullptr);
 	}
 
+	bool GetSyncEvents() const
+	{
+		return m_bSynchronizeEvents;
+	}
+
+	void SetSyncEvents(bool syncEvents)
+	{
+		m_bSynchronizeEvents = syncEvents;
+	}
+
+	unsigned GetSyncEventFlags() const
+	{
+		return m_eventSyncFlags;
+	}
+
+	void SetSyncEventFlags(unsigned flags)
+	{
+		m_eventSyncFlags = flags;
+	}
+
 	bool GetSyncEventFlag(EventType event) const
 	{
 		return (m_eventSyncFlags & event) != 0;
@@ -1556,6 +1576,7 @@ class CWebDiffWindow : public IWebDiffWindow
 	DiffOptions m_diffOptions{};
 	bool m_bShowDifferences = true;
 	bool m_bShowWordDifferences = true;
+	bool m_bSynchronizeEvents = true;
 	unsigned m_eventSyncFlags = EVENT_SCROLL | EVENT_CLICK | EVENT_INPUT;
 	struct LastEvent {
 		std::wstring type;

src/WinWebDiffLib/WebDiffWindow.hpp

@@ -177,6 +177,10 @@ struct IWebDiffWindow
 	virtual bool CanRedo() = 0;
 	virtual const DiffOptions& GetDiffOptions() const = 0;
 	virtual void SetDiffOptions(const DiffOptions& diffOptions) = 0;
+	virtual bool GetSyncEvents() const = 0;
+	virtual void SetSyncEvents(bool syncEvents) = 0;
+	virtual unsigned GetSyncEventFlags() const = 0;
+	virtual void SetSyncEventFlags(unsigned flags) = 0;
 	virtual bool GetSyncEventFlag(EventType event) const = 0;
 	virtual void SetSyncEventFlag(EventType event, bool flag) = 0;
 };