CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-17 21:03:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_LongPath

Browse Source
This commit is contained in:
METANEOCORTEX\Kotti 2021-09-24 10:40:29 +02:00
commit ffe434dbb1
9 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Build/Changes.txt
View File

@ -33,7 +33,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library
========================================================
Current BETA/RC Version 5.21.916.(build_#) (2021-09-16)
Current BETA/RC Version 5.21.923.(build_#) (2021-09-23)
========================================================
--------------------------------------------------------
@ -46,16 +46,18 @@ NEW:
CHANGES:
--------------------------------------------------------
[.###.#]- .
[.916.1]- Use "round nearest displayed digit" method for estimated file size display
[.923.2]- Enable context menu for Statusbar.
[.923.1]- Enable context menu for Menubar.
[.916.1]- Use "round nearest displayed digit" method for estimated file size display.
[.915.1]- Limit file size: 2GB (Until WideCharToMultiByte() / MultiByteToWideChar() INT32_MAX issues are clarified).
--------------------------------------------------------
CHANGES Versions in Tools or Libraries:
--------------------------------------------------------
[.726.1]- Update grepWinNP3 (GRE) version 2.1.8.39 (2021-07-26).
[.702.5]- Update Oniguruma Regex (ONI) engine version 7.0.0 (2021-06-23).
[.802.1]- Update Lexilla Library (LEX) version 5.1.2 (2021-07-26).
[.726.1]- Update Scintilla Library (SCI) version 5.1.1 (2021-07-26).
[.726.1]- Update grepWinNP3 (GRE) version 2.1.8.39 (2021-07-26).
[.702.5]- Update Oniguruma Regex (ONI) engine version 7.0.0 (2021-06-23).
--------------------------------------------------------
FIXES:
@ -215,10 +217,10 @@ CHANGES:
--------------------------------------------------------
CHANGES Versions in Tools or Libraries:
--------------------------------------------------------
[.726.1]- Update grepWinNP3 (GRE) version 2.1.8.39 (2021-07-26).
[.702.5]- Update Oniguruma Regex (ONI) engine version 7.0.0 (2021-06-23).
[.802.1]- Update Lexilla Library (LEX) version 5.1.2 (2021-07-26).
[.726.1]- Update Scintilla Library (SCI) version 5.1.1 (2021-07-26).
[.726.1]- Update grepWinNP3 (GRE) version 2.1.8.39 (2021-07-26).
[.702.5]- Update Oniguruma Regex (ONI) engine version 7.0.0 (2021-06-23).
--------------------------------------------------------
FIXES:

3
Build/Notepad3.ini
View File

@ -5,7 +5,6 @@
SettingsVersion=5
[Settings2]
;IMEInteraction=0
;AutoReloadTimeout=2000
;DateTimeFormat= (-> <Locale dependent short format>)
;DateTimeLongFormat= (-> <Locale dependent long format>)
;TimeStampRegEx= (-> \$Date:[^\$]+\$ ) (Find-Pattern to Update Stamps)
@ -16,7 +15,7 @@ SettingsVersion=5
;DenyVirtualSpaceAccess=0
;filebrowser.exe=minipath.exe
;grepWin.exe=grepWinNP3.exe
;FileCheckInverval=2000
;FileCheckInverval=0
;FileChangedIndicator=[@]
;FileDeletedIndicator=[X]
;FileDlgFilters=

2
Versions/build.txt
View File

@ -1 +1 @@
1
2

2
Versions/day.txt
View File

@ -1 +1 @@
916
923

2
res/Notepad3.exe.manifest.conf
View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Rizonesoft.Notepad3"
processorArchitecture="*"
version="5.21.916.1"
version="5.21.923.2"
type="win32"
/>
<description>Notepad3 beta</description>

15
src/Config/Config.cpp
View File

@ -1176,10 +1176,16 @@ void LoadSettings()
IniSectionGetStringNoQuotes(IniSecSettings2, L"FileDlgFilters", L"",
Settings2.FileDlgFilters, COUNTOF(Settings2.FileDlgFilters) - 2);
Settings2.FileCheckInverval = clampul(IniSectionGetInt(IniSecSettings2, L"FileCheckInverval", 2000UL), 250UL, 300000UL);
Settings2.AutoReloadTimeout = clampul(IniSectionGetInt(IniSecSettings2, L"AutoReloadTimeout", 2000UL), 250UL, 300000UL);
FileWatching.AutoReloadTimeout = Settings2.AutoReloadTimeout;
Settings2.FileCheckInverval = clampul(IniSectionGetInt(IniSecSettings2, L"FileCheckInverval", 0), 0, 86400000<<2); // max: 48h
// handle deprecated old "AutoReloadTimeout"
int const autoReload = IniSectionGetInt(IniSecSettings2, L"AutoReloadTimeout", -1); // deprecated
unsigned int const fci = max_u(250, (autoReload > 0) ? max_u(autoReload, Settings2.FileCheckInverval) : Settings2.FileCheckInverval);
if ((Settings2.FileCheckInverval > 0) && (fci != Settings2.FileCheckInverval)) {
Settings2.FileCheckInverval = fci;
IniSectionSetInt(IniSecSettings2, L"FileCheckInverval", Settings2.FileCheckInverval);
bDirtyFlag = true;
}
FileWatching.FileCheckInverval = Settings2.FileCheckInverval;
IniSectionGetString(IniSecSettings2, L"FileChangedIndicator", L"[@]", Settings2.FileChangedIndicator, COUNTOF(Settings2.FileChangedIndicator));
@ -2034,6 +2040,7 @@ static bool _SaveSettings(bool bForceSaveSettings)
// --- remove deprecated ---
IniSectionDelete(IniSecSettings2, L"MarkOccurrencesMaxCount", false);
IniSectionDelete(IniSecSettings2, L"AutoReloadTimeout", false);
// --------------------------------------------------------------------------

32
src/Notepad3.c
View File

@ -5757,12 +5757,12 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
SendWMCommand(hwnd, IDM_FILE_REVERT);
_saveChgNotify = FileWatching.FileWatchingMode;
FileWatching.FileWatchingMode = FWM_AUTORELOAD;
FileWatching.AutoReloadTimeout = 250UL;
FileWatching.FileCheckInverval = 250UL;
UndoRedoRecordingStop();
SciCall_SetEndAtLastLine(false);
} else {
FileWatching.FileWatchingMode = _saveChgNotify;
FileWatching.AutoReloadTimeout = Settings2.AutoReloadTimeout;
FileWatching.FileCheckInverval = Settings2.FileCheckInverval;
UndoRedoRecordingStart();
SciCall_SetEndAtLastLine(!Settings.ScrollPastEOF);
}
@ -11513,7 +11513,8 @@ static inline void NotifyIfFileHasChanged(const bool forcedNotify) {
}
// ----------------------------------------------------------------------------
// FWM_MSGBOX (polling: FileWatching.FileCheckInverval)
// FWM_AUTORELOAD (also FileWatching.MonitoringLog)
static void CALLBACK WatchTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) {
UNREFERENCED_PARAMETER(dwTime);
@ -11523,23 +11524,9 @@ static void CALLBACK WatchTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWOR
DWORD const diff = GetTickCount() - s_dwFileChangeNotifyTime;
//if (HasDirChanged()) {
// ResetEventDirChanged();
// NotifyIfFileHasChanged(false);
//} else
// Directory-Observer is not notified for continously updated (log-)files
if (diff > Settings2.FileCheckInverval) {
// FWM_MSGBOX (polling: FileWatching.FileCheckInverval)
// Directory-Observer is not notified for continously updated (log-)files
NotifyIfFileHasChanged(false);
} else if (diff > FileWatching.AutoReloadTimeout) {
// FWM_AUTORELOAD (also FileWatching.MonitoringLog)
if (FileWatching.MonitoringLog) {
// monitoring: reload only on change
NotifyIfFileHasChanged(false);
} else {
// unconditional reload
NotifyIfFileHasChanged(false);
}
NotifyIfFileHasChanged(/*FileWatching.MonitoringLog*/ false);
}
}
// ----------------------------------------------------------------------------
@ -11676,7 +11663,12 @@ void InstallFileWatching(const bool bInstall) {
}
s_dwFileChangeNotifyTime = (FileWatching.FileWatchingMode == FWM_AUTORELOAD) ? GetTickCount() : 0UL;
SetTimer(Globals.hwndMain, ID_WATCHTIMER, min_dw(Settings2.FileCheckInverval, FileWatching.AutoReloadTimeout), WatchTimerProc);
if (FileWatching.FileCheckInverval > 0) {
SetTimer(Globals.hwndMain, ID_WATCHTIMER, FileWatching.FileCheckInverval, WatchTimerProc);
}
else {
KillTimer(Globals.hwndMain, ID_WATCHTIMER);
}
} else if (bExclusiveLock) {

5
src/TypeDefs.h
View File

@ -630,7 +630,6 @@ typedef struct _settings2_t
int OpacityLevel;
int FindReplaceOpacityLevel;
DWORD FileCheckInverval;
DWORD AutoReloadTimeout;
DWORD UndoTransactionTimeout;
int IMEInteraction;
int SciFontQuality;
@ -717,8 +716,8 @@ typedef struct _filewatching_t
{
FILE_WATCHING_MODE flagChangeNotify; // <-> s_flagChangeNotify;
FILE_WATCHING_MODE FileWatchingMode; // <-> Settings.FileWatchingMode;
DWORD AutoReloadTimeout; // <-> Settings2.AutoReloadTimeout;
bool MonitoringLog;
DWORD FileCheckInverval; // <-> Settings2.FileCheckInverval;
bool MonitoringLog;
} FILEWATCHING_T, *PFILEWATCHING_T;

4
src/VersionEx.h
View File

@ -8,8 +8,8 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 21
#define VERSION_REV 916
#define VERSION_BUILD 1
#define VERSION_REV 923
#define VERSION_BUILD 2
#define SCINTILLA_VER 511
#define LEXILLA_VER 511
#define ONIGURUMA_REGEX_VER 7.0.0