mirror of
https://github.com/reactos/reactos.git
synced 2024-12-27 09:34:43 +00:00
[NOTEPAD] Delete main.h (#5133)
Reduce files to improve readability. Move the codes in main.h into notepad.h. Make the size of Globals.szFilter 512. CORE-18837
This commit is contained in:
Katayama Hirofumi MZ
GitHub
parent
9ac20a7fe2
commit
f91b92c3f9
3 changed files with 86 additions and 111 deletions
|
|
@ -69,3 +69,4 @@ BOOL DoCloseFile(VOID);
|
|||
VOID DoOpenFile(LPCTSTR szFileName);
|
||||
VOID DoShowHideStatusBar(VOID);
|
||||
VOID DoCreateEditWindow(VOID);
|
||||
void UpdateWindowCaption(BOOL clearModifyAlert);
|
||||
|
|
|
|||
|
|
@ -1,103 +0,0 @@
|
|||
/*
|
||||
* Notepad (notepad.h)
|
||||
*
|
||||
* Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
|
||||
* Copyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0]))
|
||||
|
||||
#include "notepad_res.h"
|
||||
|
||||
#define EDIT_STYLE_WRAP (WS_CHILD | WS_VSCROLL \
|
||||
| ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL)
|
||||
#define EDIT_STYLE (EDIT_STYLE_WRAP | WS_HSCROLL | ES_AUTOHSCROLL)
|
||||
|
||||
#define EDIT_CLASS _T("EDIT")
|
||||
|
||||
#define MAX_STRING_LEN 255
|
||||
|
||||
/* Values are indexes of the items in the Encoding combobox. */
|
||||
typedef enum
|
||||
{
|
||||
ENCODING_AUTO = -1,
|
||||
ENCODING_ANSI = 0,
|
||||
ENCODING_UTF16LE = 1,
|
||||
ENCODING_UTF16BE = 2,
|
||||
ENCODING_UTF8 = 3,
|
||||
ENCODING_UTF8BOM = 4
|
||||
} ENCODING;
|
||||
|
||||
#define ENCODING_DEFAULT ENCODING_UTF8 // ENCODING_ANSI
|
||||
|
||||
typedef enum
|
||||
{
|
||||
EOLN_CRLF = 0, /* "\r\n" */
|
||||
EOLN_LF = 1, /* "\n" */
|
||||
EOLN_CR = 2 /* "\r" */
|
||||
} EOLN; /* End of line (NewLine) type */
|
||||
|
||||
typedef struct
|
||||
{
|
||||
HINSTANCE hInstance;
|
||||
HWND hMainWnd;
|
||||
HWND hFindReplaceDlg;
|
||||
HWND hEdit;
|
||||
HWND hStatusBar;
|
||||
HFONT hFont; /* Font used by the edit control */
|
||||
HMENU hMenu;
|
||||
HGLOBAL hDevMode;
|
||||
HGLOBAL hDevNames;
|
||||
LOGFONT lfFont;
|
||||
BOOL bWrapLongLines;
|
||||
BOOL bShowStatusBar;
|
||||
TCHAR szFindText[MAX_PATH];
|
||||
TCHAR szReplaceText[MAX_PATH];
|
||||
TCHAR szFileName[MAX_PATH];
|
||||
TCHAR szFileTitle[MAX_PATH];
|
||||
TCHAR szFilter[2 * MAX_STRING_LEN + 100];
|
||||
RECT lMargins;
|
||||
TCHAR szHeader[MAX_PATH];
|
||||
TCHAR szFooter[MAX_PATH];
|
||||
TCHAR szStatusBarLineCol[MAX_PATH];
|
||||
|
||||
ENCODING encFile;
|
||||
EOLN iEoln;
|
||||
|
||||
FINDREPLACE find;
|
||||
WNDPROC EditProc;
|
||||
RECT main_rect;
|
||||
BOOL bWasModified;
|
||||
} NOTEPAD_GLOBALS;
|
||||
|
||||
extern NOTEPAD_GLOBALS Globals;
|
||||
|
||||
VOID SetFileName(LPCTSTR szFileName);
|
||||
|
||||
/* from text.c */
|
||||
BOOL ReadText(HANDLE hFile, HLOCAL *phLocal, ENCODING *pencFile, EOLN *piEoln);
|
||||
BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, ENCODING encFile, EOLN iEoln);
|
||||
|
||||
/* from settings.c */
|
||||
void NOTEPAD_LoadSettingsFromRegistry(void);
|
||||
void NOTEPAD_SaveSettingsToRegistry(void);
|
||||
|
||||
/* from main.c */
|
||||
BOOL NOTEPAD_FindNext(FINDREPLACE *pFindReplace, BOOL bReplace, BOOL bShowAlert);
|
||||
VOID NOTEPAD_EnableSearchMenu(VOID);
|
||||
|
|
@ -1,12 +1,20 @@
|
|||
#ifndef _NOTEPAD_H
|
||||
#define _NOTEPAD_H
|
||||
/*
|
||||
* PROJECT: ReactOS Notepad
|
||||
* LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
|
||||
* PURPOSE: Providing a Windows-compatible simple text editor for ReactOS
|
||||
* COPYRIGHT: Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
|
||||
* Copyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>
|
||||
* Copyright 2002 Andriy Palamarchuk
|
||||
* Copyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>
|
||||
* Copyright 2020-2023 Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#ifndef STRSAFE_NO_DEPRECATE
|
||||
#define STRSAFE_NO_DEPRECATE
|
||||
#define STRSAFE_NO_DEPRECATE
|
||||
#endif
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
#include <winuser.h>
|
||||
|
|
@ -17,9 +25,78 @@
|
|||
#include <tchar.h>
|
||||
#include <malloc.h>
|
||||
|
||||
#include "main.h"
|
||||
#include "dialog.h"
|
||||
#include "notepad_res.h"
|
||||
|
||||
void UpdateWindowCaption(BOOL clearModifyAlert);
|
||||
#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
|
||||
|
||||
#endif /* _NOTEPAD_H */
|
||||
#define EDIT_STYLE_WRAP (WS_CHILD | WS_VSCROLL | ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL)
|
||||
#define EDIT_STYLE (EDIT_STYLE_WRAP | WS_HSCROLL | ES_AUTOHSCROLL)
|
||||
#define EDIT_CLASS _T("EDIT")
|
||||
|
||||
#define MAX_STRING_LEN 255
|
||||
|
||||
/* Values are indexes of the items in the Encoding combobox. */
|
||||
typedef enum
|
||||
{
|
||||
ENCODING_AUTO = -1,
|
||||
ENCODING_ANSI = 0,
|
||||
ENCODING_UTF16LE = 1,
|
||||
ENCODING_UTF16BE = 2,
|
||||
ENCODING_UTF8 = 3,
|
||||
ENCODING_UTF8BOM = 4
|
||||
} ENCODING;
|
||||
|
||||
#define ENCODING_DEFAULT ENCODING_UTF8 // ENCODING_ANSI
|
||||
|
||||
typedef enum
|
||||
{
|
||||
EOLN_CRLF = 0, /* "\r\n" */
|
||||
EOLN_LF = 1, /* "\n" */
|
||||
EOLN_CR = 2 /* "\r" */
|
||||
} EOLN; /* End of line (NewLine) type */
|
||||
|
||||
typedef struct
|
||||
{
|
||||
HINSTANCE hInstance;
|
||||
HWND hMainWnd;
|
||||
HWND hFindReplaceDlg;
|
||||
HWND hEdit;
|
||||
HWND hStatusBar;
|
||||
HFONT hFont; /* Font used by the edit control */
|
||||
HMENU hMenu;
|
||||
HGLOBAL hDevMode;
|
||||
HGLOBAL hDevNames;
|
||||
LOGFONT lfFont;
|
||||
BOOL bWrapLongLines;
|
||||
BOOL bShowStatusBar;
|
||||
TCHAR szFindText[MAX_PATH];
|
||||
TCHAR szReplaceText[MAX_PATH];
|
||||
TCHAR szFileName[MAX_PATH];
|
||||
TCHAR szFileTitle[MAX_PATH];
|
||||
TCHAR szFilter[512];
|
||||
RECT lMargins; /* The margin values in 100th millimeters */
|
||||
TCHAR szHeader[MAX_PATH];
|
||||
TCHAR szFooter[MAX_PATH];
|
||||
TCHAR szStatusBarLineCol[MAX_PATH];
|
||||
|
||||
ENCODING encFile;
|
||||
EOLN iEoln;
|
||||
|
||||
FINDREPLACE find;
|
||||
WNDPROC EditProc;
|
||||
RECT main_rect;
|
||||
BOOL bWasModified;
|
||||
} NOTEPAD_GLOBALS;
|
||||
|
||||
extern NOTEPAD_GLOBALS Globals;
|
||||
|
||||
BOOL ReadText(HANDLE hFile, HLOCAL *phLocal, ENCODING *pencFile, EOLN *piEoln);
|
||||
BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, ENCODING encFile, EOLN iEoln);
|
||||
|
||||
void NOTEPAD_LoadSettingsFromRegistry(void);
|
||||
void NOTEPAD_SaveSettingsToRegistry(void);
|
||||
|
||||
BOOL NOTEPAD_FindNext(FINDREPLACE *pFindReplace, BOOL bReplace, BOOL bShowAlert);
|
||||
VOID NOTEPAD_EnableSearchMenu(VOID);
|
||||
VOID SetFileName(LPCTSTR szFileName);
|
||||
|
|
|
|||
Loading…
Reference in a new issue