From 2446cca04cd0dc196b354ee8a5e3691629cd710b Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Tue, 2 Oct 2018 01:27:47 +0200
Subject: [PATCH] + fix: reading/ writing of changed Style settings

---
 src/Styles.c | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/Styles.c b/src/Styles.c
index 46b872365..006443755 100644
--- a/src/Styles.c
+++ b/src/Styles.c
@@ -287,17 +287,29 @@ void Style_Load()
 
 
     for (int iLexer = 0; iLexer < COUNTOF(g_pLexArray); iLexer++) {
+
+      LexFunctionPtr_t const pLexFunction = g_pLexArray[iLexer]->pFctPtr;
+
       LoadIniSection(g_pLexArray[iLexer]->pszName, pIniSection, cchIniSection);
-      IniSectionGetString(pIniSection, L"FileNameExtensions", g_pLexArray[iLexer]->pszDefExt,
-                          g_pLexArray[iLexer]->szExtensions, COUNTOF(g_pLexArray[iLexer]->szExtensions));
+      if (IniSectionGetString(pIniSection, L"FileNameExtensions", g_pLexArray[iLexer]->pszDefExt,
+        g_pLexArray[iLexer]->szExtensions, COUNTOF(g_pLexArray[iLexer]->szExtensions)) > 0) {
+
+        if (StringCchCompareXIW(g_pLexArray[iLexer]->szExtensions, g_pLexArray[iLexer]->pszDefExt) != 0) {
+          (*pLexFunction)(FCT_SETTING_CHANGE, 1);
+        }
+      }
       int i = 0;
       while (g_pLexArray[iLexer]->Styles[i].iStyle != -1) 
       {
-        IniSectionGetString(pIniSection, g_pLexArray[iLexer]->Styles[i].pszName,
-                            g_pLexArray[iLexer]->Styles[i].pszDefault,
-                            g_pLexArray[iLexer]->Styles[i].szValue,
-                            COUNTOF(g_pLexArray[iLexer]->Styles[i].szValue));
+        if (IniSectionGetString(pIniSection, g_pLexArray[iLexer]->Styles[i].pszName,
+          g_pLexArray[iLexer]->Styles[i].pszDefault,
+          g_pLexArray[iLexer]->Styles[i].szValue,
+          COUNTOF(g_pLexArray[iLexer]->Styles[i].szValue)) > 0) {
 
+          if (StringCchCompareXIW(g_pLexArray[iLexer]->Styles[i].szValue, g_pLexArray[iLexer]->Styles[i].pszDefault) != 0) {
+            (*pLexFunction)(FCT_SETTING_CHANGE, (i + 2));
+          }
+        }
         ++i;
       }
     }
@@ -3042,8 +3054,7 @@ static bool  _ApplyDialogItemText(HWND hwnd,
   WCHAR szBuf[max(BUFSIZE_STYLE_VALUE, BUFZIZE_STYLE_EXTENTIONS)];
 
   LexFunctionPtr_t const pLexFunction = pCurrentLexer->pFctPtr;
-  int const bit = (!bIsStyleSelected ? 1 : (iStyleID + 2));
-  __int64 const mask = (((__int64)1) << bit);
+  __int64 const mask = (((__int64)1) << (iStyleID + 2)) | (__int64)(!bIsStyleSelected ? 1 : 0);
 
   bool bChgNfy = (((*pLexFunction)(FCT_SETTING_CHANGE, 0) & mask) != 0);
 
@@ -3053,6 +3064,7 @@ static bool  _ApplyDialogItemText(HWND hwnd,
     pCurrentStyle->szValue[0] = L'\0';
     Style_CopyStyles_IfNotDefined(szBuf, pCurrentStyle->szValue, 
       COUNTOF(pCurrentStyle->szValue), true, true);
+    (*pLexFunction)(FCT_SETTING_CHANGE, (iStyleID + 2));
     bChgNfy = true;
   }
   if (!bIsStyleSelected)
@@ -3064,6 +3076,7 @@ static bool  _ApplyDialogItemText(HWND hwnd,
     if (StringCchCompareXIW(szBuf, pCurrentLexer->szExtensions) != 0) 
     {
       StringCchCopyW(pCurrentLexer->szExtensions, COUNTOF(pCurrentLexer->szExtensions), szBuf);
+      (*pLexFunction)(FCT_SETTING_CHANGE, 1);
       bChgNfy = true;
     }
   }
@@ -3071,9 +3084,6 @@ static bool  _ApplyDialogItemText(HWND hwnd,
   {
     Style_ResetCurrentLexer(Globals.hwndEdit);
   }
-  if (bChgNfy) {
-    (*pLexFunction)(FCT_SETTING_CHANGE, bit);
-  }
   return bChgNfy;
 }
 
@@ -3543,9 +3553,8 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
             _ApplyDialogItemText(hwnd, pCurrentLexer, pCurrentStyle, iCurStyleIdx, bIsStyleSelected);
 
             LexFunctionPtr_t const pLexFunction = pCurrentLexer->pFctPtr;
-            int const bit = (!bIsStyleSelected ? 1 : (iCurStyleIdx + 2));
-            (*pLexFunction)(FCT_SETTING_CHANGE, -bit); // reset
-
+            (*pLexFunction)(FCT_SETTING_CHANGE, -(iCurStyleIdx + 2)); // reset
+            if (!bIsStyleSelected) { (*pLexFunction)(FCT_SETTING_CHANGE, -1); } // reset
             PostMessage(hwnd, WM_NEXTDLGCTL, (WPARAM)(GetDlgItem(hwnd, IDC_STYLEEDIT)), 1);
           }
           break;