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

+ fix: minor fixes and default value adjustments

Browse Source
This commit is contained in:
Rainer Kottenhoff 2018-05-03 01:56:34 +02:00
parent 03fc0cfe62
commit 56e63a17a1
7 changed files with 252 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Build/Notepad3.ini
View File

Binary file not shown.

26
src/Dialogs.c
View File

@ -66,8 +66,8 @@ extern bool bNoEncodingTags;
extern bool bFixLineEndings;
extern bool bAutoStripBlanks;
extern int flagNoFileVariables;
extern int flagUseSystemMRU;
extern int g_flagNoFileVariables;
extern int g_flagUseSystemMRU;
@ -690,7 +690,7 @@ void RunDlg(HWND hwnd,LPCWSTR lpstrDefault)
// OpenWithDlgProc()
//
extern WCHAR g_tchOpenWithDir[MAX_PATH];
extern int flagNoFadeHidden;
extern int g_flagNoFadeHidden;
extern int cxOpenWithDlg;
extern int cyOpenWithDlg;
@ -713,7 +713,7 @@ INT_PTR CALLBACK OpenWithDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam
ListView_SetExtendedListViewStyle(GetDlgItem(hwnd,IDC_OPENWITHDIR),/*LVS_EX_FULLROWSELECT|*/LVS_EX_DOUBLEBUFFER|LVS_EX_LABELTIP);
ListView_InsertColumn(GetDlgItem(hwnd,IDC_OPENWITHDIR),0,&lvc);
DirList_Init(GetDlgItem(hwnd,IDC_OPENWITHDIR),NULL);
DirList_Fill(GetDlgItem(hwnd,IDC_OPENWITHDIR),g_tchOpenWithDir,DL_ALLOBJECTS,NULL,false,flagNoFadeHidden,DS_NAME,false);
DirList_Fill(GetDlgItem(hwnd,IDC_OPENWITHDIR),g_tchOpenWithDir,DL_ALLOBJECTS,NULL,false,g_flagNoFadeHidden,DS_NAME,false);
DirList_StartIconThread(GetDlgItem(hwnd,IDC_OPENWITHDIR));
ListView_SetItemState(GetDlgItem(hwnd,IDC_OPENWITHDIR),0,LVIS_FOCUSED,LVIS_FOCUSED);
@ -768,7 +768,7 @@ INT_PTR CALLBACK OpenWithDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam
switch(pnmh->code)
{
case LVN_GETDISPINFO:
DirList_GetDispInfo(GetDlgItem(hwnd,IDC_OPENWITHDIR),lParam,flagNoFadeHidden);
DirList_GetDispInfo(GetDlgItem(hwnd,IDC_OPENWITHDIR),lParam,g_flagNoFadeHidden);
break;
case LVN_DELETEITEM:
@ -800,7 +800,7 @@ INT_PTR CALLBACK OpenWithDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam
{
if (GetDirectory(hwnd,IDS_OPENWITH,g_tchOpenWithDir,g_tchOpenWithDir,true))
{
DirList_Fill(GetDlgItem(hwnd,IDC_OPENWITHDIR),g_tchOpenWithDir,DL_ALLOBJECTS,NULL,false,flagNoFadeHidden,DS_NAME,false);
DirList_Fill(GetDlgItem(hwnd,IDC_OPENWITHDIR),g_tchOpenWithDir,DL_ALLOBJECTS,NULL,false,g_flagNoFadeHidden,DS_NAME,false);
DirList_StartIconThread(GetDlgItem(hwnd,IDC_OPENWITHDIR));
ListView_EnsureVisible(GetDlgItem(hwnd,IDC_OPENWITHDIR),0,false);
ListView_SetItemState(GetDlgItem(hwnd,IDC_OPENWITHDIR),0,LVIS_FOCUSED,LVIS_FOCUSED);
@ -911,7 +911,7 @@ INT_PTR CALLBACK FavoritesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lPara
ListView_SetExtendedListViewStyle(GetDlgItem(hwnd,IDC_FAVORITESDIR),/*LVS_EX_FULLROWSELECT|*/LVS_EX_DOUBLEBUFFER|LVS_EX_LABELTIP);
ListView_InsertColumn(GetDlgItem(hwnd,IDC_FAVORITESDIR),0,&lvc);
DirList_Init(GetDlgItem(hwnd,IDC_FAVORITESDIR),NULL);
DirList_Fill(GetDlgItem(hwnd,IDC_FAVORITESDIR),g_tchFavoritesDir,DL_ALLOBJECTS,NULL,false,flagNoFadeHidden,DS_NAME,false);
DirList_Fill(GetDlgItem(hwnd,IDC_FAVORITESDIR),g_tchFavoritesDir,DL_ALLOBJECTS,NULL,false,g_flagNoFadeHidden,DS_NAME,false);
DirList_StartIconThread(GetDlgItem(hwnd,IDC_FAVORITESDIR));
ListView_SetItemState(GetDlgItem(hwnd,IDC_FAVORITESDIR),0,LVIS_FOCUSED,LVIS_FOCUSED);
@ -965,7 +965,7 @@ INT_PTR CALLBACK FavoritesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lPara
switch(pnmh->code)
{
case LVN_GETDISPINFO:
DirList_GetDispInfo(GetDlgItem(hwnd,IDC_OPENWITHDIR),lParam,flagNoFadeHidden);
DirList_GetDispInfo(GetDlgItem(hwnd,IDC_OPENWITHDIR),lParam,g_flagNoFadeHidden);
break;
case LVN_DELETEITEM:
@ -997,7 +997,7 @@ INT_PTR CALLBACK FavoritesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lPara
{
if (GetDirectory(hwnd,IDS_FAVORITES,g_tchFavoritesDir,g_tchFavoritesDir,true))
{
DirList_Fill(GetDlgItem(hwnd,IDC_FAVORITESDIR),g_tchFavoritesDir,DL_ALLOBJECTS,NULL,false,flagNoFadeHidden,DS_NAME,false);
DirList_Fill(GetDlgItem(hwnd,IDC_FAVORITESDIR),g_tchFavoritesDir,DL_ALLOBJECTS,NULL,false,g_flagNoFadeHidden,DS_NAME,false);
DirList_StartIconThread(GetDlgItem(hwnd,IDC_FAVORITESDIR));
ListView_EnsureVisible(GetDlgItem(hwnd,IDC_FAVORITESDIR),0,false);
ListView_SetItemState(GetDlgItem(hwnd,IDC_FAVORITESDIR),0,LVIS_FOCUSED,LVIS_FOCUSED);
@ -1163,7 +1163,7 @@ extern bool bPreserveCaretPos;
extern bool bSaveFindReplace;
extern int cxFileMRUDlg;
extern int cyFileMRUDlg;
extern int flagNoFadeHidden;
extern int g_flagNoFadeHidden;
typedef struct tagIconThreadInfo
{
@ -1238,7 +1238,7 @@ DWORD WINAPI FileMRUIconThread(LPVOID lpParam) {
else
dwAttr = GetFileAttributes(tch);
if (!flagNoFadeHidden &&
if (!g_flagNoFadeHidden &&
dwAttr != INVALID_FILE_ATTRIBUTES &&
dwAttr & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) {
lvi.mask |= LVIF_STATE;
@ -1431,7 +1431,7 @@ INT_PTR CALLBACK FileMRUDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam)
dwAttr = GetFileAttributes(tch);
if (!flagNoFadeHidden &&
if (!g_flagNoFadeHidden &&
dwAttr != INVALID_FILE_ATTRIBUTES &&
dwAttr & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) {
lpdi->item.mask |= LVIF_STATE;
@ -2623,7 +2623,7 @@ void DialogNewWindow(HWND hwnd, bool bSaveOnRunTools, bool bSetCurFile)
StringCchPrintf(tch, COUNTOF(tch), L"\"-appid=%s\"", g_wchAppUserModelID);
StringCchCopy(szParameters, COUNTOF(szParameters), tch);
StringCchPrintf(tch, COUNTOF(tch), L" \"-sysmru=%i\"", (flagUseSystemMRU == 2) ? 1 : 0);
StringCchPrintf(tch, COUNTOF(tch), L" \"-sysmru=%i\"", (g_flagUseSystemMRU == 2) ? 1 : 0);
StringCchCat(szParameters, COUNTOF(szParameters), tch);
StringCchCat(szParameters, COUNTOF(szParameters), L" -f");

8
src/Edit.c
View File

@ -7672,14 +7672,14 @@ void EditSetBookmarkList(HWND hwnd, LPCWSTR pszBookMarks)
// _SetFileVars()
//
extern bool bNoEncodingTags;
extern int flagNoFileVariables;
extern int g_flagNoFileVariables;
static void __fastcall _SetFileVars(char* lpData, char* tch, LPFILEVARS lpfv)
{
int i;
bool bDisableFileVar = false;
if (!flagNoFileVariables) {
if (!g_flagNoFileVariables) {
if (FileVars_ParseInt(tch, "enable-local-variables", &i) && (!i))
bDisableFileVar = true;
@ -7728,7 +7728,7 @@ static void __fastcall _SetFileVars(char* lpData, char* tch, LPFILEVARS lpfv)
lpfv->mask |= FV_ENCODING;
}
if (!flagNoFileVariables && !bDisableFileVar) {
if (!g_flagNoFileVariables && !bDisableFileVar) {
if (FileVars_ParseStr(tch, "mode", lpfv->tchMode, COUNTOF(lpfv->tchMode)))
lpfv->mask |= FV_MODE;
}
@ -7744,7 +7744,7 @@ bool FileVars_Init(char *lpData, DWORD cbData, LPFILEVARS lpfv) {
char tch[LARGE_BUFFER];
ZeroMemory(lpfv,sizeof(FILEVARS));
if ((flagNoFileVariables && bNoEncodingTags) || !lpData || !cbData)
if ((g_flagNoFileVariables && bNoEncodingTags) || !lpData || !cbData)
return true;
StringCchCopyNA(tch,COUNTOF(tch),lpData,min(cbData + 1,COUNTOF(tch)));

441
src/Notepad3.c
View File

File diff suppressed because it is too large Load Diff

4
src/Print.cpp
View File

@ -51,7 +51,7 @@ extern "C" int iPrintFooter;
extern "C" int iPrintColor;
extern "C" int iPrintZoom;
extern "C" RECT pagesetupMargin;
extern "C" int flagPrintFileAndLeave;
extern "C" int g_flagPrintFileAndLeave;
// Stored objects...
@ -151,7 +151,7 @@ extern "C" bool EditPrint(HWND hwnd,LPCWSTR pszDocTitle,LPCWSTR pszPageFormat)
}
// |= 0 - Don't display dialog box, just use the default printer and options
pdlg.Flags |= (flagPrintFileAndLeave == 1) ? PD_RETURNDEFAULT : 0;
pdlg.Flags |= (g_flagPrintFileAndLeave == 1) ? PD_RETURNDEFAULT : 0;
if (!PrintDlg(&pdlg)) {
return true; // False means error...

24
src/Styles.c
View File

@ -2261,11 +2261,11 @@ EDITLEXER lexLATEX = { SCLEX_LATEX, 63036, L"LaTeX Files", L"tex; latex; sty", L
EDITLEXER lexANSI = { SCLEX_NULL, 63025, L"ANSI Art", L"nfo; diz", L"", &KeyWords_NULL, {
{ STYLE_DEFAULT, 63126, L"Default", L"font:Lucida Console; none; size:10", L"" },
{ STYLE_DEFAULT, 63126, L"Default", L"font:Lucida Console; none; size:10.5", L"" },
{ STYLE_LINENUMBER, 63101, L"Margins and Line Numbers", L"font:Lucida Console; size:-2", L"" },
{ STYLE_BRACELIGHT, 63102, L"Matching Braces", L"size:+0", L"" },
{ STYLE_BRACEBAD, 63103, L"Matching Braces Error", L"size:+0", L"" },
{ SCI_MARKERSETBACK + SCI_MARKERSETALPHA, 63111, L"Extra Line Spacing (Size)", L"size:-2", L"" },
{ SCI_MARKERSETBACK + SCI_MARKERSETALPHA, 63111, L"Extra Line Spacing (Size)", L"size:0", L"" },
{ -1, 00000, L"", L"", L"" } } };
@ -4266,8 +4266,8 @@ bool Style_HasLexerForExt(LPCWSTR lpszExt)
//
// Style_SetLexerFromFile()
//
extern int flagNoHTMLGuess;
extern int flagNoCGIGuess;
extern int g_flagNoHTMLGuess;
extern int g_flagNoCGIGuess;
extern FILEVARS fvCurFile;
void Style_SetLexerFromFile(HWND hwnd,LPCWSTR lpszFile)
@ -4284,7 +4284,7 @@ void Style_SetLexerFromFile(HWND hwnd,LPCWSTR lpszFile)
MultiByteToWideCharStrg(Encoding_SciCP, fvCurFile.tchMode, wchMode);
if (!flagNoCGIGuess && (StringCchCompareIN(wchMode,COUNTOF(wchMode),L"cgi",-1) == 0 ||
if (!g_flagNoCGIGuess && (StringCchCompareIN(wchMode,COUNTOF(wchMode),L"cgi",-1) == 0 ||
StringCchCompareIN(wchMode,COUNTOF(wchMode),L"fcgi",-1) == 0)) {
char tchText[256] = { L'\0' };
SendMessage(hwnd,SCI_GETTEXT,(WPARAM)COUNTOF(tchText)-1,(LPARAM)tchText);
@ -4322,7 +4322,7 @@ void Style_SetLexerFromFile(HWND hwnd,LPCWSTR lpszFile)
if (*lpszExt == L'.') ++lpszExt;
if (!flagNoCGIGuess && (StringCchCompareIX(lpszExt,L"cgi") == 0 || StringCchCompareIX(lpszExt,L"fcgi") == 0)) {
if (!g_flagNoCGIGuess && (StringCchCompareIX(lpszExt,L"cgi") == 0 || StringCchCompareIX(lpszExt,L"fcgi") == 0)) {
char tchText[256] = { L'\0' };
SendMessage(hwnd,SCI_GETTEXT,(WPARAM)COUNTOF(tchText)-1,(LPARAM)tchText);
StrTrimA(tchText," \t\n\r");
@ -4366,11 +4366,11 @@ void Style_SetLexerFromFile(HWND hwnd,LPCWSTR lpszFile)
bFound = true;
}
if (!bFound && g_bAutoSelect && (!flagNoHTMLGuess || !flagNoCGIGuess)) {
if (!bFound && g_bAutoSelect && (!g_flagNoHTMLGuess || !g_flagNoCGIGuess)) {
char tchText[512];
SendMessage(hwnd,SCI_GETTEXT,(WPARAM)COUNTOF(tchText)-1,(LPARAM)tchText);
StrTrimA(tchText," \t\n\r");
if (!flagNoCGIGuess) {
if (!g_flagNoCGIGuess) {
if (tchText[0] == '<') {
if (StrStrIA(tchText, "<html"))
pLexNew = &lexHTML;
@ -4533,7 +4533,7 @@ float Style_SetBaseFontSize(HWND hwnd, float fSize)
static float fBaseFontSize = (float)INITIAL_BASE_FONT_SIZE;
if (fSize >= 0.0) {
fBaseFontSize = (float)(((int)(fSize * 102)) / 100.0); // bias 2%
fBaseFontSize = (float)(((int)(fSize * 100.0 + 50.0)) / 100.0);
//SendMessage(hwnd, SCI_STYLESETSIZE, STYLE_DEFAULT, (LPARAM)iBaseFontSize);
SendMessage(hwnd, SCI_STYLESETSIZEFRACTIONAL, STYLE_DEFAULT, (LPARAM)((int)(fBaseFontSize * SC_FONT_SIZE_MULTIPLIER + 0.5)));
@ -4557,7 +4557,7 @@ float Style_SetCurrentFontSize(HWND hwnd, float fSize)
static float fCurrentFontSize = (float)INITIAL_BASE_FONT_SIZE;
if (fSize >= 0.0) {
fCurrentFontSize = (float)(((int)(fSize * 102)) / 100.0); // bias 2%
fCurrentFontSize = (float)(((int)(fSize * 100.0 + 50.0)) / 100.0); // bias 2%
//SendMessage(hwnd, SCI_STYLESETSIZE, STYLE_DEFAULT, (LPARAM)iCurrentFontSize);
SendMessage(hwnd, SCI_STYLESETSIZEFRACTIONAL, STYLE_DEFAULT, (LPARAM)((int)(fCurrentFontSize * SC_FONT_SIZE_MULTIPLIER + 0.5)));
@ -4577,13 +4577,13 @@ float Style_GetCurrentFontSize(HWND hwnd)
//
// Style_SetIndentGuides()
//
extern int flagSimpleIndentGuides;
extern int g_flagSimpleIndentGuides;
void Style_SetIndentGuides(HWND hwnd,bool bShow)
{
int iIndentView = SC_IV_NONE;
if (bShow) {
if (!flagSimpleIndentGuides) {
if (!g_flagSimpleIndentGuides) {
switch (SendMessage(hwnd, SCI_GETLEXER, 0, 0)) {
case SCLEX_PYTHON:
case SCLEX_NIMROD:

2
src/TypeDefs.h
View File

@ -95,7 +95,7 @@ typedef enum {
#define STATUSBAR_EXTION_PREFIXES L"Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,"
#define STATUSBAR_DEFAULT_IDS L"0 1 2 4 5 6 7 8 9 10 11"
#define STATUSBAR_SECTION_WIDTH_SPECS L"20 20 20 15 15 15 0 0 0 0 0 0"
#define STATUSBAR_SECTION_WIDTH_SPECS L"30 20 20 20 20 20 0 0 0 0 0 0"
#define STAUSBAR_RIGHT_MARGIN 20
// --------------------------------------------------------------------------