WIP (10)

Author: sdottaka

src/WinWebDiff/Resource.h

@@ -42,6 +42,7 @@
 #define IDM_SYNC_SCROLL         161
 #define IDM_SYNC_CLICK          162
 #define IDM_SYNC_INPUT          163
+#define IDM_SYNC_GOBACKFORWARD  164
 #define IDM_CLEAR_DISK_CACHE    171
 #define IDM_CLEAR_COOKIES       172
 #define IDM_CLEAR_BROWSING_HISTORY 173

src/WinWebDiff/WinWebDiff.cpp

@@ -371,6 +371,7 @@ void UpdateMenuState(HWND hWnd)
 	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);
+	CheckMenuItem(hMenu, IDM_SYNC_GOBACKFORWARD,  m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_GOBACKFORWARD) ? MF_CHECKED : MF_UNCHECKED);
 }
 
 LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)

src/WinWebDiff/WinWebDiff.rc

@@ -323,6 +323,24 @@ class CWebDiffWindow : public IWebDiffWindow
 								{
 									addEventListener(sender,ev.pane, nullptr);
 								}
+								else if (event == WebDiffEvent::GoBacked)
+								{
+									for (int pane = 0; pane < m_nPanes; ++pane)
+									{
+										if (ev.pane == pane)
+											continue;
+										m_webWindow[pane].GoBack();
+									}
+								}
+								else if (event == WebDiffEvent::GoForwarded)
+								{
+									for (int pane = 0; pane < m_nPanes; ++pane)
+									{
+										if (ev.pane == pane)
+											continue;
+										m_webWindow[pane].GoForward();
+									}
+								}
 								else if (event == WebDiffEvent::WebMessageReceived || event == WebDiffEvent::FrameWebMessageReceived)
 								{
 									std::wstring msg = m_webWindow[i].GetWebMessage();
@@ -1615,7 +1633,7 @@ class CWebDiffWindow : public IWebDiffWindow
 	bool m_bShowWordDifferences = true;
 	bool m_bSynchronizeEvents = true;
 	bool m_bCompareCompleted = false;
-	unsigned m_eventSyncFlags = EVENT_SCROLL | EVENT_CLICK | EVENT_INPUT;
+	unsigned m_eventSyncFlags = EVENT_SCROLL | EVENT_CLICK | EVENT_INPUT | EVENT_GOBACKFORWARD;
 	CompareState m_compareState = NOT_COMPARED;
 	IWebDiffWindow::ColorSettings m_colorSettings = {
 		RGB(239, 203,   5), RGB(192, 192, 192), RGB(0, 0, 0),

src/WinWebDiffLib/WebDiffWindow.hpp

@@ -394,6 +394,20 @@ class CWebWindow
 		return hr;
 	}
 
+	HRESULT GoBack()
+	{
+		if (!GetActiveWebView())
+			return E_FAIL;
+		return GetActiveWebView()->GoBack();
+	}
+
+	HRESULT GoForward()
+	{
+		if (!GetActiveWebView())
+			return E_FAIL;
+		return GetActiveWebView()->GoForward();
+	}
+
 	HRESULT Reload()
 	{
 		if (!GetActiveWebView())
@@ -1872,11 +1886,17 @@ class CWebWindow
 			{
 			case ID_GOBACK:
 				if (GetActiveWebView())
+				{
 					GetActiveWebView()->GoBack();
+					m_eventHandler(WebDiffEvent::GoBacked, nullptr, nullptr);
+				}
 				break;
 			case ID_GOFORWARD:
 				if (GetActiveWebView())
+				{
 					GetActiveWebView()->GoForward();
+					m_eventHandler(WebDiffEvent::GoForwarded, nullptr, nullptr);
+				}
 				break;
 			case ID_RELOAD:
 				if (GetActiveWebView())

src/WinWebDiffLib/WebWindow.hpp

@@ -6,7 +6,7 @@
 
 struct WebDiffEvent
 {
-	enum EVENT_TYPE { ZoomFactorChanged, NewWindowRequested, WindowCloseRequested, NavigationStarting, FrameNavigationStarting, HistoryChanged, SourceChanged, DocumentTitleChanged, NavigationCompleted, FrameNavigationCompleted, WebMessageReceived, FrameWebMessageReceived, TabChanged, HSCROLL, VSCROLL, CompareStateChanged };
+	enum EVENT_TYPE { ZoomFactorChanged, NewWindowRequested, WindowCloseRequested, NavigationStarting, FrameNavigationStarting, HistoryChanged, SourceChanged, DocumentTitleChanged, NavigationCompleted, FrameNavigationCompleted, WebMessageReceived, FrameWebMessageReceived, GoBacked, GoForwarded, TabChanged, HSCROLL, VSCROLL, CompareStateChanged };
 	EVENT_TYPE type;
 	int pane;
 };
@@ -61,6 +61,7 @@ struct IWebDiffWindow
 		EVENT_SCROLL        = ( 1 << 0 ),
 		EVENT_CLICK         = ( 1 << 1 ),
 		EVENT_INPUT         = ( 1 << 2 ),
+		EVENT_GOBACKFORWARD = ( 1 << 3 ),
 	};
 	enum CompareState
 	{