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

Merge pull request #233 from RaiKoHoff/Bugfixes_1215

Browse Source 
Bugfixes 1215 I
This commit is contained in:
Derick Payne 2017-12-15 12:20:09 +02:00 committed by GitHub
commit b60ff90f74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 68 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Version.ps1
View File

@ -43,6 +43,8 @@ try
if (!$Build) { $Build = 0 }
$SciVer = [int](Get-Content "scintilla\version.txt")
if (!$SciVer) { $SciVer = 0 }
$OnigmoVer = [string](Get-Content "onigmo\version.txt")
if (!$OnigmoVer) { $OnigmoVer = "0.0.0" }
$CompleteVer = "$Major.$Minor.$Revis.$Build"
DebugOutput("Version number: '$CompleteVer'")
@ -53,6 +55,7 @@ try
(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$MAINT\$', "$Revis" } | Set-Content "src\VersionEx.h"
(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$BUILD\$', "$Build" } | Set-Content "src\VersionEx.h"
(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$SCIVER\$', "$SciVer" } | Set-Content "src\VersionEx.h"
(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$ONIGMOVER\$', "$OnigmoVer" } | Set-Content "src\VersionEx.h"
Copy-Item -LiteralPath "Versions\Notepad3.exe.manifest.tpl" -Destination "res\Notepad3.exe.manifest.conf" -Force
(Get-Content "res\Notepad3.exe.manifest.conf") | ForEach-Object { $_ -replace '\$VERSION\$', $CompleteVer } | Set-Content "res\Notepad3.exe.manifest.conf"
if ($AppVeyorEnv) {

BIN
Versions/VersionEx.h.tpl
View File

Binary file not shown.

2
Versions/build.txt
View File

@ -1 +1 @@
729
747

BIN
np3portableapp/Notepad3Portable/App/DefaultData/settings/Notepad3.ini
View File

Binary file not shown.

4
np3portableapp/build_np3portableapp.cmd
View File

@ -34,7 +34,7 @@ set PORTAPP_ROOT_DIR=D:\PortableApps
set PORTAPP_LAUNCHER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comLauncher\PortableApps.comLauncherGenerator.exe
set PORTAPP_INSTALLER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comInstaller\PortableApps.comInstaller.exe
set NP3_DISTRIB_DIR=%SCRIPT_DIR%..\distrib
set NP3_DISTRIB_DIR=%SCRIPT_DIR%..\Build
set NP3_WIN32_DIR=%SCRIPT_DIR%..\Bin\Release_x86_v141
set NP3_X64_DIR=%SCRIPT_DIR%..\Bin\Release_x64_v141
@ -53,7 +53,7 @@ set BUILD=0
call :GETBUILD
:: VERSION fallback from build date
set VERSION=2.%YY%.%MM%%DD%.%BUILD%
set VERSION=3.%YY%.%MM%%DD%.%BUILD%
set FILEVER=
call :GETFILEVER "%NP3_WIN32_DIR%\Notepad3.exe"

1
onigmo/version.txt Normal file
View File

@ -0,0 +1 @@
6.1.3

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

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="3.17.1210.729"
version="3.17.1215.747"
type="win32"
/>
<description>Notepad3</description>

6
src/Edit.c
View File

@ -5696,6 +5696,10 @@ void EditUpdateUrlHotspots(HWND hwnd, int startPos, int endPos, BOOL bActiveHots
int tmp = startPos; startPos = endPos; endPos = tmp; // swap
}
// 1st apply current lexer style
SciCall_StartStyling(startPos);
SendMessage(hwnd, SCI_COLOURISE, 0, (LPARAM)-1);
const char* pszUrlRegEx = "\\b(?:(?:https?|ftp|file)://|www\\.|ftp\\.)"
"(?:\\([-A-Z0-9+&@#/%=~_|$?!:,.]*\\)|[-A-Z0-9+&@#/%=~_|$?!:,.])*"
"(?:\\([-A-Z0-9+&@#/%=~_|$?!:,.]*\\)|[A-Z0-9+&@#/%=~_|$])";
@ -5734,7 +5738,7 @@ void EditUpdateUrlHotspots(HWND hwnd, int startPos, int endPos, BOOL bActiveHots
if (bActiveHotspot)
{
SciCall_StartStyling(endPos);
UpdateEditWndUI();
UpdateEditWndUI(); // does not apply lexer style
}
else {
SciCall_StartStyling(startPos);

16
src/Helpers.c
View File

@ -2453,17 +2453,19 @@ int CheckRegExReplTarget(char* pszInput)
void TransformBackslashes(char* pszInput, BOOL bRegEx, UINT cpEdit, int* iReplaceMsg)
{
int replTarget = SCI_REPLACETARGET;
if (bRegEx) {
if (bRegEx && iReplaceMsg) {
UnSlashLowOctal(pszInput);
replTarget = CheckRegExReplTarget(pszInput);
*iReplaceMsg = CheckRegExReplTarget(pszInput);
}
if (SCI_REPLACETARGET == replTarget) {
else if (iReplaceMsg) {
*iReplaceMsg = SCI_REPLACETARGET; // uses SCI std replacement
}
// regex handles backslashes itself
// except: replacement is not delegated to regex engine
if (!bRegEx || (iReplaceMsg && (SCI_REPLACETARGET == *iReplaceMsg))) {
UnSlash(pszInput, cpEdit);
}
if (iReplaceMsg)
*iReplaceMsg = replTarget;
}

9
src/Notepad3.c
View File

@ -5670,11 +5670,11 @@ LRESULT MsgNotify(HWND hwnd,WPARAM wParam,LPARAM lParam)
}
}
else if (scn->modificationType & SC_MOD_CHANGESTYLE) {
//EditUpdateUrlHotspots(hwndEdit, (int)scn->position, (int)(scn->position + scn->length), bHyperlinkHotspot);
EditUpdateUrlHotspots(hwndEdit, (int)scn->position, (int)(scn->position + scn->length), bHyperlinkHotspot);
}
if (scn->linesAdded != 0) {
EditUpdateUrlHotspots(hwndEdit, 0, SciCall_GetTextLength(), bHyperlinkHotspot);
UpdateLineNumberWidth();
//~EditUpdateUrlHotspots(hwndEdit, 0, SciCall_GetTextLength(), bHyperlinkHotspot);
}
bModified = TRUE;
break;
@ -7000,7 +7000,6 @@ int CreateIniFileEx(LPCWSTR lpszIniFile) {
}
//=============================================================================
//
// UpdateEditWndUI()
@ -7014,10 +7013,12 @@ void UpdateEditWndUI()
scn.updated = SC_UPDATE_CONTENT;
//SendMessage(hwndMain, WM_NOTIFY, IDC_EDIT, (LPARAM)&scn);
PostMessage(hwndMain, WM_NOTIFY, IDC_EDIT, (LPARAM)&scn);
// --------------------------------------------------------------
//~ don't SendMessage(hwnd, SCI_COLOURISE, 0, (LPARAM)-1); here !
// --------------------------------------------------------------
}
//=============================================================================
//
// UpdateToolbar()

BIN
src/Notepad3.rc
View File

Binary file not shown.

15
src/Notepad3.vcxproj
View File

@ -324,6 +324,7 @@
<ClInclude Include="Styles.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="Version.h" />
<ClInclude Include="VersionEx.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\res\Copy.cur" />
@ -335,6 +336,8 @@
<None Include="..\res\Run.ico" />
<None Include="..\res\Styles.ico" />
<None Include="..\res\Toolbar.bmp" />
<None Include="..\Versions\Notepad3.exe.manifest.tpl" />
<None Include="..\Versions\VersionEx.h.tpl" />
<None Include="Notepad3.ver" />
</ItemGroup>
<ItemGroup>
@ -354,6 +357,18 @@
<Image Include="..\res\Notepad3.ico" />
<Image Include="..\res\Toolbar2.bmp" />
</ItemGroup>
<ItemGroup>
<Text Include="..\Versions\build.txt">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</ExcludedFromBuild>
</Text>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

17
src/Notepad3.vcxproj.filters
View File

@ -16,6 +16,9 @@
<Filter Include="Crypto">
<UniqueIdentifier>{aad339da-f291-4358-9ab1-a0fdee012ac6}</UniqueIdentifier>
</Filter>
<Filter Include="templates">
<UniqueIdentifier>{e817f780-f742-48b4-bc9c-2ab762ced6bc}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Dialogs.c">
@ -92,6 +95,9 @@
<ClInclude Include="..\crypto\sha-256.h">
<Filter>Crypto</Filter>
</ClInclude>
<ClInclude Include="VersionEx.h">
<Filter>Resource Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\res\Copy.cur">
@ -124,6 +130,12 @@
<None Include="Notepad3.ver">
<Filter>Resource Files</Filter>
</None>
<None Include="..\Versions\Notepad3.exe.manifest.tpl">
<Filter>templates</Filter>
</None>
<None Include="..\Versions\VersionEx.h.tpl">
<Filter>templates</Filter>
</None>
</ItemGroup>
<ItemGroup>
<Image Include="..\res\Notepad3.ico">
@ -143,4 +155,9 @@
<Filter>Resource Files</Filter>
</Manifest>
</ItemGroup>
<ItemGroup>
<Text Include="..\Versions\build.txt">
<Filter>templates</Filter>
</Text>
</ItemGroup>
</Project>

2
src/Version.h
View File

@ -41,7 +41,7 @@
#define VERSION_COMPANYNAME L"© Rizonesoft"
#define VERSION_MODPAGEDISPLAY L"https://xhmikosr.github.io/notepad2-mod/"
#define VERSION_WEBPAGE2DISPLAY L"http://www.flos-freeware.ch"
#define VERSION_SCIVERSION L"Scintilla Library (RegEx:Onigmo v.6.1.3) Version: " STRINGIFY(SCINTILLA_VER)
#define VERSION_SCIVERSION L"Scintilla Library Ver: " STRINGIFY(SCINTILLA_VER) L" (RegEx:Onigmo v." STRINGIFY(ONIGMO_REGEX_VER) L")"
#if defined(_WIN64)
// #define VERSION_FILEVERSION_LONG L"Notepad3 (64-bit) " STRINGIFY(VERSION_MAJOR) L" Build " \

10
src/VersionEx.h
View File

@ -1,5 +1,11 @@
// //////////////////////////////////////////////////////////
// //
// this file is generated - use template to apply changes //
// //
// //////////////////////////////////////////////////////////
#define VERSION_MAJOR 3
#define VERSION_MINOR 17
#define VERSION_REV 1210
#define VERSION_BUILD 729
#define VERSION_REV 1215
#define VERSION_BUILD 747
#define SCINTILLA_VER 402
#define ONIGMO_REGEX_VER 6.1.3