From 35e19128f169e4b4981c95390f8e2b9d26daf837 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Fri, 6 Feb 2026 22:35:48 -0700
Subject: [PATCH] EditorWindow: sync special symbol settings across open
 windows

Fixes #171
---
 src/editor/EditorWindow.cpp | 45 ++++++++++++++++++++-----------------
 src/editor/EditorWindow.h   |  2 ++
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/editor/EditorWindow.cpp b/src/editor/EditorWindow.cpp
index ea1f2a2..9808530 100644
--- a/src/editor/EditorWindow.cpp
+++ b/src/editor/EditorWindow.cpp
@@ -274,6 +274,8 @@ EditorWindow::EditorWindow(bool stagger)
 
 	_SyncWithPreferences();
 
+	be_app->StartWatching(this, VIEW_SPECIAL_CHANGED);
+
 	fEditor->SendMessage(SCI_SETSCROLLWIDTH, fEditor->Bounds().Width());
 	fEditor->SendMessage(SCI_SETSCROLLWIDTHTRACKING, true, 0);
 	fEditor->SendMessage(SCI_SETSAVEPOINT, 0, 0);
@@ -295,6 +297,8 @@ EditorWindow::EditorWindow(bool stagger)
 
 EditorWindow::~EditorWindow()
 {
+	be_app->StopWatching(this, VIEW_SPECIAL_CHANGED);
+
 	RemoveCommonFilter(fFindReplaceHandler->IncrementalSearchFilter());
 
 	delete fFindReplaceHandler;
@@ -713,17 +717,11 @@ EditorWindow::MessageReceived(BMessage* message)
 		} break;
 		case MAINMENU_VIEW_SPECIAL_WHITESPACE: {
 			fPreferences->fWhiteSpaceVisible = !fPreferences->fWhiteSpaceVisible;
-			fMainMenu->FindItem(message->what)->SetMarked(fPreferences->fWhiteSpaceVisible);
-			fEditor->SendMessage(SCI_SETVIEWWS, fPreferences->fWhiteSpaceVisible, 0);
-			bool pressed = fPreferences->fWhiteSpaceVisible && fPreferences->fEOLVisible;
-			fToolbar->SetActionPressed(TOOLBAR_SPECIAL_SYMBOLS, pressed);
+			be_app->SendNotices(VIEW_SPECIAL_CHANGED);
 		} break;
 		case MAINMENU_VIEW_SPECIAL_EOL: {
 			fPreferences->fEOLVisible = !fPreferences->fEOLVisible;
-			fMainMenu->FindItem(message->what)->SetMarked(fPreferences->fEOLVisible);
-			fEditor->SendMessage(SCI_SETVIEWEOL, fPreferences->fEOLVisible, 0);
-			bool pressed = fPreferences->fWhiteSpaceVisible && fPreferences->fEOLVisible;
-			fToolbar->SetActionPressed(TOOLBAR_SPECIAL_SYMBOLS, pressed);
+			be_app->SendNotices(VIEW_SPECIAL_CHANGED);
 		} break;
 		case MAINMENU_VIEW_TOOLBAR: {
 			fPreferences->fToolbar = !fPreferences->fToolbar;
@@ -797,19 +795,14 @@ EditorWindow::MessageReceived(BMessage* message)
 			_ShowToolbarPopUp(menu, button);
 		} break;
 		case TOOLBAR_SPECIAL_SYMBOLS: {
-			bool pressed = fPreferences->fWhiteSpaceVisible && fPreferences->fEOLVisible;
-			if(pressed == true) {
+			if(fPreferences->fWhiteSpaceVisible == true && fPreferences->fEOLVisible == true) {
 				fPreferences->fWhiteSpaceVisible = false;
 				fPreferences->fEOLVisible = false;
 			} else {
 				fPreferences->fWhiteSpaceVisible = true;
 				fPreferences->fEOLVisible = true;
 			}
-			fMainMenu->FindItem(MAINMENU_VIEW_SPECIAL_WHITESPACE)->SetMarked(fPreferences->fWhiteSpaceVisible);
-			fMainMenu->FindItem(MAINMENU_VIEW_SPECIAL_EOL)->SetMarked(fPreferences->fEOLVisible);
-			fEditor->SendMessage(SCI_SETVIEWWS, fPreferences->fWhiteSpaceVisible, 0);
-			fEditor->SendMessage(SCI_SETVIEWEOL, fPreferences->fEOLVisible, 0);
-			fToolbar->SetActionPressed(TOOLBAR_SPECIAL_SYMBOLS, !pressed);
+			be_app->SendNotices(VIEW_SPECIAL_CHANGED);
 		} break;
 		case B_SAVE_REQUESTED: {
 			entry_ref ref;
@@ -920,6 +913,8 @@ EditorWindow::MessageReceived(BMessage* message)
 			int32 what = message->GetInt32("be:observe_change_what", 0);
 			if(what == APP_PREFERENCES_CHANGED) {
 				_SyncWithPreferences();
+			} else if(what == VIEW_SPECIAL_CHANGED) {
+				_SyncSpecialSymbols();
 			}
 		} break;
 		case GTLW_GO: {
@@ -1320,18 +1315,14 @@ EditorWindow::_SyncWithPreferences()
 			fFilePreferences.fEOLMode.reset();
 		}
 
-		bool pressed = fPreferences->fWhiteSpaceVisible && fPreferences->fEOLVisible;
-		fToolbar->SetActionPressed(TOOLBAR_SPECIAL_SYMBOLS, pressed);
-		fMainMenu->FindItem(MAINMENU_VIEW_SPECIAL_WHITESPACE)->SetMarked(fPreferences->fWhiteSpaceVisible);
-		fMainMenu->FindItem(MAINMENU_VIEW_SPECIAL_EOL)->SetMarked(fPreferences->fEOLVisible);
 		fMainMenu->FindItem(MAINMENU_VIEW_TOOLBAR)->SetMarked(fPreferences->fToolbar);
 		fMainMenu->FindItem(MAINMENU_VIEW_WRAPLINES)->SetMarked(fPreferences->fWrapLines);
 
 		// reapply styles
 		_SetLanguage(fCurrentLanguage);
 
-		fEditor->SendMessage(SCI_SETVIEWEOL, fPreferences->fEOLVisible, 0);
-		fEditor->SendMessage(SCI_SETVIEWWS, fPreferences->fWhiteSpaceVisible, 0);
+		_SyncSpecialSymbols();
+
 		fEditor->SendMessage(SCI_SETTABWIDTH,
 			fFilePreferences.fTabWidth.value_or(fPreferences->fTabWidth), 0);
 		fEditor->SendMessage(SCI_SETUSETABS,
@@ -1397,6 +1388,18 @@ EditorWindow::_SyncWithPreferences()
 }
 
 
+void
+EditorWindow::_SyncSpecialSymbols()
+{
+	bool pressed = fPreferences->fWhiteSpaceVisible && fPreferences->fEOLVisible;
+	fToolbar->SetActionPressed(TOOLBAR_SPECIAL_SYMBOLS, pressed);
+	fMainMenu->FindItem(MAINMENU_VIEW_SPECIAL_WHITESPACE)->SetMarked(fPreferences->fWhiteSpaceVisible);
+	fMainMenu->FindItem(MAINMENU_VIEW_SPECIAL_EOL)->SetMarked(fPreferences->fEOLVisible);
+	fEditor->SendMessage(SCI_SETVIEWEOL, fPreferences->fEOLVisible, 0);
+	fEditor->SendMessage(SCI_SETVIEWWS, fPreferences->fWhiteSpaceVisible, 0);
+}
+
+
 void
 EditorWindow::_SyncEditMenus()
 {
diff --git a/src/editor/EditorWindow.h b/src/editor/EditorWindow.h
index 19e2cbd..cab8b1c 100644
--- a/src/editor/EditorWindow.h
+++ b/src/editor/EditorWindow.h
@@ -41,6 +41,7 @@ const BString gAppName = B_TRANSLATE_SYSTEM_NAME("Koder");
 
 const uint32 ACTIVE_WINDOW_CHANGED	= 'AWCH';
 const uint32 SAVE_FILE				= 'SVFL';
+const uint32 VIEW_SPECIAL_CHANGED	= 'vsch';
 
 
 enum {
@@ -185,6 +186,7 @@ class EditorWindow : public BWindow {
 			void			_OpenCorrespondingFile(const BPath &file, const std::string lang);
 			void			_LoadEditorconfig();
 			void			_SyncWithPreferences();
+			void			_SyncSpecialSymbols();
 			void			_SyncEditMenus();
 			int32			_ShowModifiedAlert();
 			void			_ShowToolbarPopUp(BPopUpMenu* menu, BButton* button);