diff --git a/Build/Themes/Dark.ini b/Build/Themes/Dark.ini index 110b6d145..d94ea8e34 100644 --- a/Build/Themes/Dark.ini +++ b/Build/Themes/Dark.ini @@ -16,7 +16,7 @@ 14=#C80000 15=#B000B0 16=#92FB53 -[Default Text] +[Common Base] FileNameExtensions=txt; text; tmp; log; asc; doc; wtx Default Style=font:Default; size:+0; fore:#FFFFE2; back:#252526 Margins and Line Numbers=font:Default; size:-1; bold; fore:#009D9D; back:#252526 @@ -34,7 +34,7 @@ Bookmarks and Folding (Colors, Size)=size:+2; fore:#888888; back:#0095DD; alpha: Mark Occurrences (Indicator)=fore:#00FF80; back:#B0FFB0; alpha:100; alpha2:100; indic_roundbox Hyperlink Hotspots=bold; italic; fore:#009F9F; back:#0053B7; indic_roundbox Inline-IME Color=fore:#00FF00; back:#252526 -[2nd Default Text] +[2nd Common Base] FileNameExtensions=txt; text; tmp; log; asc; doc; wtx 2nd Default Style=font:Courier New; size:+0; fore:#FFFFE2; back:#252526 2nd Margins and Line Numbers=font:Courier New; size:-1; bold; fore:#009D9D; back:#252526 diff --git a/Build/Themes/Obsidian.ini b/Build/Themes/Obsidian.ini index f71cc4cb5..9e61cb419 100644 --- a/Build/Themes/Obsidian.ini +++ b/Build/Themes/Obsidian.ini @@ -16,7 +16,7 @@ 14=#C80000 15=#B000B0 16=#B28B40 -[Default Text] +[Common Base] FileNameExtensions=txt; text; tmp; log; asc; doc; wtx Default Style=font:Calibri; size:11; fore:#EAEAEA; back:#000000 Margins and Line Numbers=size:-2; fore:#8F8F8F; back:#161616 @@ -34,7 +34,7 @@ Bookmarks and Folding (Colors, Size)=size:+2; fore:#000000; back:#808080; alpha: Mark Occurrences (Indicator)=fore:#FF0000; alpha:100; alpha2:100; indic_roundbox Hyperlink Hotspots=fore:#3080E0; indic_roundbox Inline-IME Color=fore:#00AA00 -[2nd Default Text] +[2nd Common Base] FileNameExtensions=txt; text; tmp; log; asc; doc; wtx 2nd Default Style=font:Courier New; fore:#EAEAEA; back:#000000 2nd Margins and Line Numbers=font:Courier New; size:-2; fore:#8F8F8F; back:#161616 diff --git a/language/common_res.h b/language/common_res.h index 93fbbcc09..31aa600df 100644 --- a/language/common_res.h +++ b/language/common_res.h @@ -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 diff --git a/src/Notepad3.c b/src/Notepad3.c index 53a8e1026..489ba29af 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -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; diff --git a/src/Notepad3.rc b/src/Notepad3.rc index ceba27ed0..53798e3d3 100644 --- a/src/Notepad3.rc +++ b/src/Notepad3.rc @@ -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 diff --git a/src/SciCall.h b/src/SciCall.h index b22948bc0..9684c9b30 100644 --- a/src/SciCall.h +++ b/src/SciCall.h @@ -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