mirror of
https://github.com/rizonesoft/Notepad3.git
synced 2026-06-20 21:13:25 +08:00
+ cln: some code cleanup
This commit is contained in:
Rainer Kottenhoff
parent
8f3e8ba17e
commit
4844477de8
@ -344,9 +344,9 @@
|
||||
#define CMD_CTRLDOWN 20004
|
||||
#define CMD_CTRLLEFT 20005
|
||||
#define CMD_CTRLRIGHT 20006
|
||||
#define CMD_DELETEBACK 20007
|
||||
//#define CMD_DELETEBACK 20007
|
||||
#define CMD_CTRLBACK 20008
|
||||
#define CMD_DEL 20009
|
||||
//#define CMD_CLEAR 20009
|
||||
#define CMD_CTRLDEL 20010
|
||||
#define CMD_CTRLTAB 20011
|
||||
#define CMD_RECODEDEFAULT 20012
|
||||
|
||||
@ -4123,13 +4123,11 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
|
||||
}
|
||||
break;
|
||||
|
||||
case CMD_DELETEBACK:
|
||||
{
|
||||
///~_BEGIN_UNDO_ACTION_
|
||||
SendMessage(Globals.hwndEdit, SCI_DELETEBACK, 0, 0);
|
||||
///~_END_UNDO_ACTION_
|
||||
}
|
||||
break;
|
||||
//case CMD_DELETEBACK:
|
||||
// ///~_BEGIN_UNDO_ACTION_
|
||||
// SciCall_DeleteBack();
|
||||
// ///~_END_UNDO_ACTION_
|
||||
// break;
|
||||
|
||||
case CMD_VK_INSERT:
|
||||
SendMessage(Globals.hwndEdit, SCI_EDITTOGGLEOVERTYPE, 0, 0);
|
||||
@ -5722,7 +5720,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
|
||||
|
||||
|
||||
case IDM_EDIT_CLEAR:
|
||||
case CMD_DEL:
|
||||
//case CMD_CLEAR:
|
||||
///~_BEGIN_UNDO_ACTION_
|
||||
SciCall_Clear();
|
||||
///~_END_UNDO_ACTION_
|
||||
@ -5732,10 +5730,10 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
|
||||
case CMD_CTRLUP:
|
||||
if (Sci_IsMultiSelection())
|
||||
{
|
||||
Sci_SendMsgV0(LINEUPEXTEND);
|
||||
SciCall_LineUpExtend();
|
||||
}
|
||||
else {
|
||||
Sci_SendMsgV0(LINESCROLLUP);
|
||||
SciCall_LineScrollUp();
|
||||
}
|
||||
break;
|
||||
|
||||
@ -5743,10 +5741,10 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
|
||||
case CMD_CTRLDOWN:
|
||||
if (Sci_IsMultiSelection())
|
||||
{
|
||||
Sci_SendMsgV0(LINEDOWNEXTEND);
|
||||
SciCall_LineDownExtend();
|
||||
}
|
||||
else {
|
||||
Sci_SendMsgV0(LINESCROLLDOWN);
|
||||
SciCall_LineScrollDown();
|
||||
}
|
||||
break;
|
||||
|
||||
@ -5754,10 +5752,10 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
|
||||
case CMD_CTRLLEFT:
|
||||
if (Sci_IsMultiSelection())
|
||||
{
|
||||
Sci_SendMsgV0(CHARLEFTEXTEND);
|
||||
SciCall_CharLeftExtend();
|
||||
}
|
||||
else {
|
||||
Sci_SendMsgV0(WORDLEFT);
|
||||
SciCall_WordLeft();
|
||||
}
|
||||
break;
|
||||
|
||||
@ -5765,21 +5763,21 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
|
||||
case CMD_CTRLRIGHT:
|
||||
if (Sci_IsMultiSelection())
|
||||
{
|
||||
Sci_SendMsgV0(CHARRIGHTEXTEND);
|
||||
SciCall_CharRightExtend();
|
||||
}
|
||||
else {
|
||||
Sci_SendMsgV0(WORDRIGHT);
|
||||
SciCall_WordRight();
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
case CMD_CTRLBACK:
|
||||
{
|
||||
const DocPos iPos = SciCall_GetCurrentPos();
|
||||
const DocPos iAnchor = SciCall_GetAnchor();
|
||||
const DocLn iLine = SciCall_LineFromPosition(iPos);
|
||||
const DocPos iStartPos = SciCall_PositionFromLine(iLine);
|
||||
const DocPos iIndentPos = SciCall_GetLineIndentPosition(iLine);
|
||||
DocPos const iPos = SciCall_GetCurrentPos();
|
||||
DocPos const iAnchor = SciCall_GetAnchor();
|
||||
DocLn const iLine = SciCall_LineFromPosition(iPos);
|
||||
DocPos const iStartPos = SciCall_PositionFromLine(iLine);
|
||||
DocPos const iIndentPos = SciCall_GetLineIndentPosition(iLine);
|
||||
|
||||
if (iPos != iAnchor) {
|
||||
_BEGIN_UNDO_ACTION_
|
||||
@ -5788,11 +5786,11 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
|
||||
}
|
||||
else {
|
||||
if (iPos == iStartPos)
|
||||
Sci_SendMsgV0(DELETEBACK);
|
||||
SciCall_DeleteBack();
|
||||
else if (iPos <= iIndentPos)
|
||||
Sci_SendMsgV0(DELLINELEFT);
|
||||
SciCall_DelLineLeft();
|
||||
else
|
||||
Sci_SendMsgV0(DELWORDLEFT);
|
||||
SciCall_DelWordLeft();
|
||||
}
|
||||
}
|
||||
break;
|
||||
@ -5813,9 +5811,9 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
|
||||
}
|
||||
else {
|
||||
if (iStartPos != iEndPos)
|
||||
Sci_SendMsgV0(DELWORDRIGHT);
|
||||
SciCall_DelWordRight();
|
||||
else // iStartPos == iEndPos
|
||||
Sci_SendMsgV0(LINEDELETE);
|
||||
SciCall_LineDelete();
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
@ -197,20 +197,20 @@ BEGIN
|
||||
"Z", IDM_EDIT_UNDO, VIRTKEY, CONTROL, NOINVERT
|
||||
"Z", IDM_EDIT_STRIP1STCHAR, VIRTKEY, ALT, NOINVERT /// NO Menu
|
||||
"Z", IDM_EDIT_REDO, VIRTKEY, SHIFT, CONTROL, NOINVERT
|
||||
//VK_LEFT, CMD_LEFT, VIRTKEY, NOINVERT
|
||||
//~VK_LEFT, CMD_LEFT, VIRTKEY, NOINVERT
|
||||
VK_LEFT, CMD_CTRLLEFT, VIRTKEY, CONTROL, NOINVERT
|
||||
VK_LEFT, CMD_ALTLEFT, VIRTKEY, ALT, NOINVERT
|
||||
//VK_RIGHT, CMD_RIGHT, VIRTKEY, NOINVERT
|
||||
//~VK_RIGHT, CMD_RIGHT, VIRTKEY, NOINVERT
|
||||
VK_RIGHT, CMD_CTRLRIGHT, VIRTKEY, CONTROL, NOINVERT
|
||||
VK_RIGHT, CMD_ALTRIGHT, VIRTKEY, ALT, NOINVERT
|
||||
VK_ADD, IDM_VIEW_ZOOMIN, VIRTKEY, CONTROL, NOINVERT
|
||||
//~VK_ADD, CMD_INCLINELIMIT, VIRTKEY, ALT, NOINVERT /// ALT+[+] is used for universal Unicode input
|
||||
VK_ADD, CMD_INCREASENUM, VIRTKEY, CONTROL, ALT, NOINVERT
|
||||
VK_BACK, CMD_DELETEBACK, VIRTKEY, NOINVERT
|
||||
//~VK_BACK, CMD_DELETEBACK, VIRTKEY, NOINVERT
|
||||
VK_BACK, CMD_CTRLBACK, VIRTKEY, CONTROL, NOINVERT
|
||||
VK_BACK, IDM_EDIT_UNDO, VIRTKEY, ALT, NOINVERT
|
||||
VK_BACK, IDM_EDIT_DELETELINELEFT, VIRTKEY, SHIFT, CONTROL, NOINVERT
|
||||
VK_DELETE, CMD_DEL, VIRTKEY, NOINVERT
|
||||
//~VK_DELETE, CMD_CLEAR, VIRTKEY, NOINVERT
|
||||
VK_DELETE, CMD_CTRLDEL, VIRTKEY, CONTROL, NOINVERT
|
||||
VK_DELETE, IDM_EDIT_CUT, VIRTKEY, SHIFT, NOINVERT
|
||||
VK_DELETE, IDM_EDIT_DELETELINERIGHT, VIRTKEY, SHIFT, CONTROL, NOINVERT
|
||||
@ -224,7 +224,7 @@ BEGIN
|
||||
VK_F10, CMD_RECODEGB18030, VIRTKEY, SHIFT, CONTROL, NOINVERT
|
||||
VK_F11, CMD_FULLSCRWINPOS, VIRTKEY, NOINVERT
|
||||
VK_F11, CMD_INITIALWINPOS, VIRTKEY, CONTROL, NOINVERT
|
||||
//VK_F11, CMD_LEXHTML, VIRTKEY, CONTROL, NOINVERT
|
||||
//~VK_F11, CMD_LEXHTML, VIRTKEY, CONTROL, NOINVERT
|
||||
VK_F11, CMD_LEXDEFAULT, VIRTKEY, SHIFT, NOINVERT
|
||||
VK_F12, IDM_VIEW_SCHEME, VIRTKEY, NOINVERT
|
||||
VK_F12, IDM_VIEW_SCHEMECONFIG, VIRTKEY, CONTROL, NOINVERT
|
||||
|
||||
@ -56,18 +56,6 @@
|
||||
#include "Scintilla.h"
|
||||
#include "TypeDefs.h"
|
||||
|
||||
//=============================================================================
|
||||
//
|
||||
// Sci_SendMessage() short version
|
||||
//
|
||||
#define Sci_SendMsgV0(CMD) SendMessage(Globals.hwndEdit, SCI_##CMD, (WPARAM)0, (LPARAM)0)
|
||||
#define Sci_SendMsgV1(CMD,WP) SendMessage(Globals.hwndEdit, SCI_##CMD, (WPARAM)(WP), (LPARAM)0)
|
||||
#define Sci_SendMsgV2(CMD,WP,LP) SendMessage(Globals.hwndEdit, SCI_##CMD, (WPARAM)(WP), (LPARAM)(LP))
|
||||
|
||||
#define Sci_PostMsgV0(CMD) PostMessage(Globals.hwndEdit, SCI_##CMD, (WPARAM)0, (LPARAM)0)
|
||||
#define Sci_PostMsgV1(CMD,WP) PostMessage(Globals.hwndEdit, SCI_##CMD, (WPARAM)(WP), (LPARAM)0)
|
||||
#define Sci_PostMsgV2(CMD,WP,LP) PostMessage(Globals.hwndEdit, SCI_##CMD, (WPARAM)(WP), (LPARAM)(LP))
|
||||
|
||||
//=============================================================================
|
||||
//
|
||||
// SciCall()
|
||||
@ -132,10 +120,8 @@ __forceinline LRESULT SciCall_##fn(type1 var1, type2 var2) { \
|
||||
|
||||
|
||||
//=============================================================================
|
||||
//
|
||||
// Selection, positions and information
|
||||
//
|
||||
|
||||
// Selection, positions and information
|
||||
DeclareSciCallR0(GetReadOnly, GETREADONLY, bool)
|
||||
DeclareSciCallV1(SetReadOnly, SETREADONLY, bool, flag)
|
||||
DeclareSciCallV0(Undo, UNDO)
|
||||
@ -205,6 +191,32 @@ DeclareSciCallV1(SetZoom, SETZOOM, int, zoom)
|
||||
DeclareSciCallV0(ZoomIn, ZOOMIN)
|
||||
DeclareSciCallV0(ZoomOut, ZOOMOUT)
|
||||
|
||||
// Keyboard Commands
|
||||
DeclareSciCallV0(NewLine, NEWLINE)
|
||||
DeclareSciCallV0(LineUpExtend, LINEUPEXTEND)
|
||||
DeclareSciCallV0(LineScrollUp, LINESCROLLUP)
|
||||
DeclareSciCallV0(LineDownExtend, LINEDOWNEXTEND)
|
||||
DeclareSciCallV0(LineScrollDown, LINESCROLLDOWN)
|
||||
DeclareSciCallV0(CharLeftExtend, CHARLEFTEXTEND)
|
||||
DeclareSciCallV0(CharRightExtend, CHARRIGHTEXTEND)
|
||||
DeclareSciCallV0(WordLeft, WORDLEFT)
|
||||
DeclareSciCallV0(WordRight, WORDRIGHT)
|
||||
DeclareSciCallV0(DeleteBack, DELETEBACK)
|
||||
DeclareSciCallV0(DelWordLeft, DELWORDLEFT)
|
||||
DeclareSciCallV0(DelWordRight, DELWORDRIGHT)
|
||||
DeclareSciCallV0(DelLineLeft, DELLINELEFT)
|
||||
DeclareSciCallV0(DelLineRight, DELLINERIGHT)
|
||||
DeclareSciCallV0(LineDelete, LINEDELETE)
|
||||
|
||||
// Commands
|
||||
DeclareSciCallV0(LineDuplicate, LINEDUPLICATE)
|
||||
DeclareSciCallV0(SelectionDuplicate, SELECTIONDUPLICATE)
|
||||
DeclareSciCallV0(LineTranspose, LINETRANSPOSE)
|
||||
DeclareSciCallV0(MoveSelectedLinesUp, MOVESELECTEDLINESUP)
|
||||
DeclareSciCallV0(MoveSelectedLinesDown, MOVESELECTEDLINESDOWN)
|
||||
DeclareSciCallR0(GetLexer, GETLEXER, int)
|
||||
DeclareSciCallR2(FindText, FINDTEXT, DocPos, int, flags, struct Sci_TextToFind*, text)
|
||||
|
||||
// Operations
|
||||
DeclareSciCallV0(Cut, CUT)
|
||||
DeclareSciCallV0(Copy, COPY)
|
||||
@ -308,23 +320,6 @@ DeclareSciCallV1(AutoCSetOrder, AUTOCSETORDER, int, options)
|
||||
DeclareSciCallV2(AutoCShow, AUTOCSHOW, DocPos, len, const char*, list)
|
||||
|
||||
|
||||
//=============================================================================
|
||||
//
|
||||
// Commands
|
||||
//
|
||||
DeclareSciCallV0(NewLine, NEWLINE)
|
||||
DeclareSciCallV0(LineDuplicate, LINEDUPLICATE)
|
||||
DeclareSciCallV0(SelectionDuplicate, SELECTIONDUPLICATE)
|
||||
DeclareSciCallV0(LineTranspose, LINETRANSPOSE)
|
||||
DeclareSciCallV0(MoveSelectedLinesUp, MOVESELECTEDLINESUP)
|
||||
DeclareSciCallV0(MoveSelectedLinesDown, MOVESELECTEDLINESDOWN)
|
||||
DeclareSciCallV0(LineDelete, LINEDELETE)
|
||||
DeclareSciCallV0(DelLineLeft, DELLINELEFT)
|
||||
DeclareSciCallV0(DelLineRight, DELLINERIGHT)
|
||||
DeclareSciCallR0(GetLexer, GETLEXER, int)
|
||||
DeclareSciCallR2(FindText, FINDTEXT, DocPos, int, flags, struct Sci_TextToFind*, text)
|
||||
|
||||
|
||||
//=============================================================================
|
||||
//
|
||||
// Scrolling and automatic scrolling
|
||||
|
||||
Loading…
Reference in New Issue
Block a user