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

+ fix: tab-key and indentation handling

Browse Source 
+ fix: pasting into rectangular selections
This commit is contained in:
Rainer Kottenhoff 2018-02-07 19:04:09 +01:00
parent b749a79ff4
commit 844febb005
6 changed files with 226 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

294
src/Edit.c
View File

@ -92,6 +92,11 @@ extern int iMarkOccurrencesMaxCount;
extern BOOL bMarkOccurrencesMatchVisible;
extern BOOL bShowCodeFolding;
extern BOOL bTabsAsSpaces;
extern BOOL bTabsAsSpacesG;
extern BOOL bTabIndents;
extern BOOL bTabIndentsG;
extern NP2ENCODING g_Encodings[];
@ -626,11 +631,104 @@ char* EditGetClipboardText(HWND hwnd,BOOL bCheckEncoding,int* pLineCount,int* pL
return (pmch);
}
//=============================================================================
//
// EditPaste()
// EditPaste2RectSel()
//
BOOL EditPaste(HWND hwnd, BOOL bSwapClipBoard)
void EditPaste2RectSel(HWND hwnd, char* pText)
{
if (!SciCall_IsSelectionRectangle()) { return; }
const DocPos length = lstrlenA(pText); // '\0' terminated
IgnoreNotifyChangeEvent();
EditEnterTargetTransaction();
const int selCount = (int)SendMessage(hwnd, SCI_GETSELECTIONS, 0, 0);
char* pTextLine = pText;
// remove line-break from last line
if (*pTextLine != '\0') { StrTrimA(pTextLine, "\r\n"); }
for (int s = 0; s < selCount; ++s) {
// get lines from clip
char *ln = pTextLine;
int lnLen = 0;
while (*ln != '\0') {
if (s < (selCount - 1)) {
if (*ln == '\n' || *ln == '\r') {
if ((*ln == '\r') && (*(ln + 1) == '\n')) { ++ln; }
++ln; // next line
break;
}
else { ++ln; ++lnLen; }
}
else { ++ln; ++lnLen; } // last line
}
const DocPos selCaretPos = (int)SendMessage(hwnd, SCI_GETSELECTIONNCARET, (WPARAM)s, 0);
const DocPos selAnchorPos = (int)SendMessage(hwnd, SCI_GETSELECTIONNANCHOR, (WPARAM)s, 0);
DocPos virtualSpaceLen = 0;
DocPos selTargetStart = 0;
DocPos selTargetEnd = 0;
if (selCaretPos < selAnchorPos) {
selTargetStart = selCaretPos;
selTargetEnd = selAnchorPos;
virtualSpaceLen = (DocPos)SendMessage(hwnd, SCI_GETSELECTIONNCARETVIRTUALSPACE, (WPARAM)s, 0);
}
else {
selTargetStart = selAnchorPos;
selTargetEnd = selCaretPos;
virtualSpaceLen = (DocPos)SendMessage(hwnd, SCI_GETSELECTIONNANCHORVIRTUALSPACE, (WPARAM)s, 0);
}
if (virtualSpaceLen > 0) {
char* pPadStr = LocalAlloc(LPTR, (virtualSpaceLen + length + 1) * sizeof(char));
if (pPadStr) {
SIZE_T size = LocalSize(pPadStr) - sizeof(char);
FillMemory(pPadStr, virtualSpaceLen, ' ');
pPadStr[virtualSpaceLen] = '\0';
StringCchCatNA(pPadStr, size, pTextLine, lnLen);
SciCall_SetTargetRange(selTargetStart, selTargetEnd);
SciCall_ReplaceTarget(lstrlenA(pPadStr), pPadStr);
LocalFree(pPadStr);
}
else {
SciCall_SetTargetRange(selTargetStart, selTargetEnd);
SciCall_ReplaceTarget(lnLen, pTextLine);
}
}
else // no virtual space to pad
{
SciCall_SetTargetRange(selTargetStart, selTargetEnd);
SciCall_ReplaceTarget(lnLen, pTextLine);
}
SendMessage(hwnd, SCI_SETSELECTIONNCARET, (WPARAM)s, (LPARAM)selTargetStart);
SendMessage(hwnd, SCI_SETSELECTIONNANCHOR, (WPARAM)s, (LPARAM)selTargetStart);
if (virtualSpaceLen > 0) {
SendMessage(hwnd, SCI_SETSELECTIONNCARETVIRTUALSPACE, (WPARAM)s, (LPARAM)virtualSpaceLen);
SendMessage(hwnd, SCI_SETSELECTIONNANCHORVIRTUALSPACE, (WPARAM)s, (LPARAM)virtualSpaceLen);
}
if (*ln != '\0') {
pTextLine = ln; // next clip line
}
//else: rest of rect single selections are filled with last line
}
EditLeaveTargetTransaction();
ObserveNotifyChangeEvent();
}
//=============================================================================
//
// EditPasteClipboard()
//
BOOL EditPasteClipboard(HWND hwnd, BOOL bSwapClipBoard)
{
int lineCount = 0;
int lenLastLine = 0;
@ -641,122 +739,37 @@ BOOL EditPaste(HWND hwnd, BOOL bSwapClipBoard)
}
const DocPos clipLen = lstrlenA(pClip);
int token = BeginUndoAction();
if (bSwapClipBoard) { SciCall_Copy(); }
if (SciCall_IsSelectionRectangle())
if ((lineCount <= 1) || SciCall_IsSelectionEmpty())
{
IgnoreNotifyChangeEvent();
EditEnterTargetTransaction();
if (lineCount <= 1) {
SciCall_SetMultiPaste(SC_MULTIPASTE_EACH);
SciCall_Paste();
SciCall_SetMultiPaste(SC_MULTIPASTE_ONCE);
}
else {
const int selCount = (int)SendMessage(hwnd, SCI_GETSELECTIONS, 0, 0);
char* pClipLine = pClip;
// remove line-break from last line
if (*pClipLine != '\0') { StrTrimA(pClipLine, "\r\n"); }
for (int s = 0; s < selCount; ++s) {
// get lines from clip
char *ln = pClipLine;
int lnLen = 0;
while (*ln != '\0') {
if (s < (selCount - 1)) {
if (*ln == '\n' || *ln == '\r') {
if ((*ln == '\r') && (*(ln + 1) == '\n')) { ++ln; }
++ln; // next line
break;
}
else { ++ln; ++lnLen; }
}
else { ++ln; ++lnLen; } // last line
}
const DocPos selCaretPos = (int)SendMessage(hwnd, SCI_GETSELECTIONNCARET, (WPARAM)s, 0);
const DocPos selAnchorPos = (int)SendMessage(hwnd, SCI_GETSELECTIONNANCHOR, (WPARAM)s, 0);
DocPos virtualSpaceLen = 0;
DocPos selTargetStart = 0;
DocPos selTargetEnd = 0;
if (selCaretPos < selAnchorPos) {
selTargetStart = selCaretPos;
selTargetEnd = selAnchorPos;
virtualSpaceLen = (DocPos)SendMessage(hwnd, SCI_GETSELECTIONNCARETVIRTUALSPACE, (WPARAM)s, 0);
}
else {
selTargetStart = selAnchorPos;
selTargetEnd = selCaretPos;
virtualSpaceLen = (DocPos)SendMessage(hwnd, SCI_GETSELECTIONNANCHORVIRTUALSPACE, (WPARAM)s, 0);
}
if (virtualSpaceLen > 0) {
char* pPadStr = LocalAlloc(LPTR, (virtualSpaceLen + clipLen + 1) * sizeof(char));
if (pPadStr) {
SIZE_T size = LocalSize(pPadStr) - sizeof(char);
FillMemory(pPadStr, virtualSpaceLen, ' ');
pPadStr[virtualSpaceLen] = '\0';
StringCchCatNA(pPadStr, size, pClipLine, lnLen);
SciCall_SetTargetRange(selTargetStart, selTargetEnd);
SciCall_ReplaceTarget(lstrlenA(pPadStr), pPadStr);
LocalFree(pPadStr);
}
else {
SciCall_SetTargetRange(selTargetStart, selTargetEnd);
SciCall_ReplaceTarget(lnLen, pClipLine);
}
}
else // no virtual space to pad
{
SciCall_SetTargetRange(selTargetStart, selTargetEnd);
SciCall_ReplaceTarget(lnLen, pClipLine);
}
SendMessage(hwnd, SCI_SETSELECTIONNCARET, (WPARAM)s, (LPARAM)selTargetStart);
SendMessage(hwnd, SCI_SETSELECTIONNANCHOR, (WPARAM)s, (LPARAM)selTargetStart);
if (virtualSpaceLen > 0) {
SendMessage(hwnd, SCI_SETSELECTIONNCARETVIRTUALSPACE, (WPARAM)s, (LPARAM)virtualSpaceLen);
SendMessage(hwnd, SCI_SETSELECTIONNANCHORVIRTUALSPACE, (WPARAM)s, (LPARAM)virtualSpaceLen);
}
pClipLine = ln; // next clip line
}
}
EditLeaveTargetTransaction();
ObserveNotifyChangeEvent();
SciCall_SetMultiPaste(SC_MULTIPASTE_EACH);
SciCall_Paste();
SciCall_SetMultiPaste(SC_MULTIPASTE_ONCE);
}
else // Selection: SC_SEL_STREAM, SC_SEL_LINES, SC_SEL_THIN
{
const DocPos iCurPos = SciCall_GetCurrentPos();
const DocPos iAnchorPos = SciCall_GetAnchor();
else {
if (SciCall_IsSelectionRectangle())
{
EditPaste2RectSel(hwnd, pClip);
}
else // Selection: SC_SEL_STREAM, SC_SEL_LINES, SC_SEL_THIN
{
const DocPos iCurPos = SciCall_GetCurrentPos();
const DocPos iAnchorPos = SciCall_GetAnchor();
if (SciCall_IsSelectionEmpty())
SciCall_Paste();
else
SciCall_ReplaceSel(pClip);
if (bSwapClipBoard) {
if (iCurPos < iAnchorPos)
EditSelectEx(hwnd, iCurPos + clipLen, iCurPos);
else
EditSelectEx(hwnd, iAnchorPos, iAnchorPos + clipLen);
}
else if (iCurPos < iAnchorPos)
{
EditSelectEx(hwnd, iCurPos, iCurPos);
if (bSwapClipBoard) {
if (iCurPos < iAnchorPos)
EditSelectEx(hwnd, iCurPos + clipLen, iCurPos);
else
EditSelectEx(hwnd, iAnchorPos, iAnchorPos + clipLen);
}
else if (iCurPos < iAnchorPos) {
EditSelectEx(hwnd, iCurPos, iCurPos);
}
}
}
EndUndoAction(token);
LocalFree(pClip);
return TRUE;
}
@ -2665,23 +2678,48 @@ void EditModifyLines(HWND hwnd,LPCWSTR pwszPrefix,LPCWSTR pwszAppend)
//
// EditIndentBlock()
//
void EditIndentBlock(HWND hwnd, int mode, BOOL bTabIndents, BOOL bBackspaceUnindents)
void EditIndentBlock(HWND hwnd, int cmd, BOOL bFormatIndentation)
{
if ((cmd != SCI_TAB) && (cmd != SCI_BACKTAB)) {
SendMessage(hwnd, cmd, 0, 0);
return;
}
if (SciCall_IsSelectionRectangle()) {
if (cmd == SCI_TAB) {
if (bTabsAsSpaces)
EditPaste2RectSel(hwnd, " ");
else
EditPaste2RectSel(hwnd, "\t");
return;
}
//TODO: workaround for rectangular selection: make stream selection
EditSelectEx(hwnd, SciCall_GetAnchor(), SciCall_GetCurrentPos());
}
const DocPos iCurPos = SciCall_GetCurrentPos();
const DocPos iAnchorPos = SciCall_GetAnchor();
//const DocPos iSelStart = SciCall_GetSelectionStart();
//const DocPos iSelEnd = SciCall_GetSelectionEnd();
const DocLn iCurLine = SciCall_LineFromPosition(iCurPos);
const DocLn iAnchorLine = SciCall_LineFromPosition(iAnchorPos);
const BOOL bSingleLine = (iCurLine == iAnchorLine);
const int _bTabIndents = (int)SendMessage(hwnd, SCI_GETTABINDENTS, 0, 0);
const int _bBSpUnindents = (int)SendMessage(hwnd, SCI_GETBACKSPACEUNINDENTS, 0, 0);
DocPos iDiffCurrent = 0;
DocPos iDiffAnchor = 0;
BOOL bFixStart = FALSE;
if (bSingleLine) {
SendMessage(hwnd, SCI_VCHOME, 0, 0);
if (SciCall_PositionFromLine(iCurLine) == SciCall_GetCurrentPos()) {
if (bFormatIndentation) {
SendMessage(hwnd, SCI_VCHOME, 0, 0);
if (SciCall_PositionFromLine(iCurLine) == SciCall_GetCurrentPos()) {
SendMessage(hwnd, SCI_VCHOME, 0, 0);
}
iDiffCurrent = (iCurPos - SciCall_GetCurrentPos());
}
iDiffCurrent = (iCurPos - SciCall_GetCurrentPos());
}
else {
iDiffCurrent = (SciCall_GetLineEndPosition(iCurLine) - iCurPos);
@ -2692,21 +2730,25 @@ void EditIndentBlock(HWND hwnd, int mode, BOOL bTabIndents, BOOL bBackspaceUnind
bFixStart = (SciCall_PositionFromLine(iAnchorLine) == SciCall_GetAnchor());
}
if (mode == SCI_TAB) {
SendMessage(hwnd, SCI_SETTABINDENTS, TRUE, 0);
SendMessage(hwnd, mode, 0, 0);
SendMessage(hwnd, SCI_SETTABINDENTS, bTabIndents, 0);
}
else if (((mode == SCI_BACKTAB) || (mode == SCI_DELETEBACK)) &&
(SciCall_PositionFromLine(iCurLine) != SciCall_GetSelectionStart()))
if (cmd == SCI_TAB)
{
SendMessage(hwnd, SCI_SETBACKSPACEUNINDENTS, TRUE, 0);
SendMessage(hwnd, mode, 0, 0);
SendMessage(hwnd, SCI_SETBACKSPACEUNINDENTS, bBackspaceUnindents, 0);
SendMessage(hwnd, SCI_SETTABINDENTS, (bFormatIndentation ? TRUE : _bTabIndents), 0);
SendMessage(hwnd, SCI_TAB, 0, 0);
if (bFormatIndentation)
SendMessage(hwnd, SCI_SETTABINDENTS, _bTabIndents, 0);
}
else // SCI_BACKTAB
{
//if (SciCall_PositionFromLine(iCurLine) != SciCall_GetSelectionStart())
SendMessage(hwnd, SCI_SETBACKSPACEUNINDENTS, (bFormatIndentation ? TRUE : _bBSpUnindents), 0);
SendMessage(hwnd, SCI_BACKTAB, 0, 0);
if (bFormatIndentation)
SendMessage(hwnd, SCI_SETBACKSPACEUNINDENTS, _bBSpUnindents, 0);
}
if (bSingleLine) {
EditSelectEx(hwnd, SciCall_GetCurrentPos() + iDiffCurrent + (iAnchorPos - iCurPos), SciCall_GetCurrentPos() + iDiffCurrent);
if (bFormatIndentation)
EditSelectEx(hwnd, SciCall_GetCurrentPos() + iDiffCurrent + (iAnchorPos - iCurPos), SciCall_GetCurrentPos() + iDiffCurrent);
}
else { // on multiline indentation, anchor and current positions are moved to line begin resp. end
if (bFixStart) {
@ -6999,10 +7041,6 @@ extern int iTabWidth;
extern int iTabWidthG;
extern int iIndentWidth;
extern int iIndentWidthG;
extern BOOL bTabsAsSpaces;
extern BOOL bTabsAsSpacesG;
extern BOOL bTabIndents;
extern BOOL bTabIndentsG;
extern BOOL bWordWrap;
extern BOOL bWordWrapG;
extern int iWordWrapMode;

5
src/Edit.h
View File

@ -63,7 +63,8 @@ BOOL EditConvertText(HWND,int,int,BOOL);
BOOL EditSetNewEncoding(HWND,int,BOOL,BOOL);
BOOL EditIsRecodingNeeded(WCHAR*,int);
char* EditGetClipboardText(HWND,BOOL,int*,int*);
BOOL EditPaste(HWND,BOOL);
void EditPaste2RectSel(HWND,char*);
BOOL EditPasteClipboard(HWND,BOOL);
BOOL EditCopyAppend(HWND);
int EditDetectEOLMode(HWND,char*,DWORD);
BOOL EditLoadFile(HWND,LPCWSTR,BOOL,int*,int*,BOOL*,BOOL*,BOOL*);
@ -89,7 +90,7 @@ void EditSpacesToTabs(HWND,int,BOOL);
void EditMoveUp(HWND);
void EditMoveDown(HWND);
void EditModifyLines(HWND,LPCWSTR,LPCWSTR);
void EditIndentBlock(HWND,int,BOOL,BOOL);
void EditIndentBlock(HWND,int,BOOL);
void EditAlignText(HWND,int);
void EditEncloseSelection(HWND,LPCWSTR,LPCWSTR);
void EditToggleLineComments(HWND,LPCWSTR,BOOL);

113
src/Notepad3.c
View File

@ -2780,7 +2780,9 @@ LRESULT MsgCommand(HWND hwnd, WPARAM wParam, LPARAM lParam)
{
if (flagPasteBoard)
bLastCopyFromMe = TRUE;
int token = BeginUndoAction();
SendMessage(g_hwndEdit, SCI_COPYALLOWLINE, 0, 0);
EndUndoAction(token);
UpdateToolbar();
}
break;
@ -2790,7 +2792,9 @@ LRESULT MsgCommand(HWND hwnd, WPARAM wParam, LPARAM lParam)
{
if (flagPasteBoard)
bLastCopyFromMe = TRUE;
int token = BeginUndoAction();
SendMessage(g_hwndEdit,SCI_COPYRANGE,0,(LPARAM)SciCall_GetTextLength());
EndUndoAction(token);
UpdateToolbar();
}
break;
@ -2800,7 +2804,9 @@ LRESULT MsgCommand(HWND hwnd, WPARAM wParam, LPARAM lParam)
{
if (flagPasteBoard)
bLastCopyFromMe = TRUE;
int token = BeginUndoAction();
EditCopyAppend(g_hwndEdit);
EndUndoAction(token);
UpdateToolbar();
}
break;
@ -2809,7 +2815,9 @@ LRESULT MsgCommand(HWND hwnd, WPARAM wParam, LPARAM lParam)
{
if (flagPasteBoard)
bLastCopyFromMe = TRUE;
EditPaste(g_hwndEdit, FALSE);
int token = BeginUndoAction();
EditPasteClipboard(g_hwndEdit, FALSE);
EndUndoAction(token);
UpdateToolbar();
UpdateStatusbar();
}
@ -2819,7 +2827,9 @@ LRESULT MsgCommand(HWND hwnd, WPARAM wParam, LPARAM lParam)
{
if (flagPasteBoard)
bLastCopyFromMe = TRUE;
EditPaste(g_hwndEdit, TRUE);
int token = BeginUndoAction();
EditPasteClipboard(g_hwndEdit, TRUE);
EndUndoAction(token);
UpdateToolbar();
UpdateStatusbar();
}
@ -2969,73 +2979,55 @@ LRESULT MsgCommand(HWND hwnd, WPARAM wParam, LPARAM lParam)
case IDM_EDIT_INDENT:
{
int token = SciCall_IsSelectionEmpty() ? -1 : BeginUndoAction();
if (SciCall_IsSelectionRectangle())
{
SendMessage(g_hwndEdit, SCI_TAB, 0, 0);
}
else {
EditIndentBlock(g_hwndEdit, SCI_TAB, bTabIndents, bBackspaceUnindents);
}
if (token >= 0) { EndUndoAction(token); }
int token = BeginUndoAction();
EditIndentBlock(g_hwndEdit, SCI_TAB, TRUE);
EndUndoAction(token);
}
break;
case IDM_EDIT_UNINDENT:
{
int token = SciCall_IsSelectionEmpty() ? -1 : BeginUndoAction();
if (SciCall_IsSelectionRectangle())
{
SendMessage(g_hwndEdit, SCI_DELETEBACK, 0, 0);
}
else {
EditIndentBlock(g_hwndEdit, SCI_DELETEBACK, bTabIndents, bBackspaceUnindents);
}
if (token >= 0) { EndUndoAction(token); }
int token = BeginUndoAction();
EditIndentBlock(g_hwndEdit, SCI_BACKTAB, TRUE);
EndUndoAction(token);
}
break;
case CMD_TAB:
{
int token = SciCall_IsSelectionEmpty() ? -1 : BeginUndoAction();
if (IsSingleLineSelection() || SciCall_IsSelectionRectangle())
{
SendMessage(g_hwndEdit, SCI_TAB, 0, 0);
}
else {
EditIndentBlock(g_hwndEdit, SCI_TAB, bTabIndents, bBackspaceUnindents);
}
if (token >= 0) { EndUndoAction(token); }
}
break;
case CMD_BACKTAB:
{
int token = SciCall_IsSelectionEmpty() ? -1 : BeginUndoAction();
if (IsSingleLineSelection() || SciCall_IsSelectionRectangle())
{
SendMessage(g_hwndEdit, SCI_BACKTAB, 0, 0);
}
else {
EditIndentBlock(g_hwndEdit, SCI_BACKTAB, bTabIndents, bBackspaceUnindents);
}
if (token >= 0) { EndUndoAction(token); }
}
break;
case CMD_CTRLTAB:
{
int token = SciCall_IsSelectionEmpty() ? -1 : BeginUndoAction();
SendMessage(g_hwndEdit, SCI_SETUSETABS, TRUE, 0);
SendMessage(g_hwndEdit, SCI_SETTABINDENTS, FALSE, 0);
SendMessage(g_hwndEdit, SCI_TAB, 0, 0);
SendMessage(g_hwndEdit, SCI_SETTABINDENTS, bTabIndents, 0);
SendMessage(g_hwndEdit, SCI_SETUSETABS, !bTabsAsSpaces, 0);
if (token >= 0) { EndUndoAction(token); }
int token = BeginUndoAction();
EditIndentBlock(g_hwndEdit, SCI_TAB, FALSE);
EndUndoAction(token);
}
break;
case CMD_BACKTAB:
{
int token = BeginUndoAction();
EditIndentBlock(g_hwndEdit, SCI_BACKTAB, FALSE);
EndUndoAction(token);
}
break;
case CMD_CTRLTAB:
{
int token = BeginUndoAction();
SendMessage(g_hwndEdit, SCI_SETUSETABS, TRUE, 0);
SendMessage(g_hwndEdit, SCI_SETTABINDENTS, FALSE, 0);
EditIndentBlock(g_hwndEdit, SCI_TAB, FALSE);
SendMessage(g_hwndEdit, SCI_SETTABINDENTS, bTabIndents, 0);
SendMessage(g_hwndEdit, SCI_SETUSETABS, !bTabsAsSpaces, 0);
EndUndoAction(token);
}
break;
case CMD_DELETEBACK:
{
int token = BeginUndoAction();
SendMessage(g_hwndEdit, SCI_DELETEBACK, 0, 0);
EndUndoAction(token);
}
break;
case IDM_EDIT_ENCLOSESELECTION:
if (EditEncloseSelectionDlg(hwnd,wchPrefixSelection,wchAppendSelection)) {
@ -4405,15 +4397,6 @@ LRESULT MsgCommand(HWND hwnd, WPARAM wParam, LPARAM lParam)
break;
case CMD_BACK:
{
int token = BeginUndoAction();
SendMessage(g_hwndEdit, SCI_DELETEBACK, 0, 0);
EndUndoAction(token);
}
break;
case CMD_CTRLLEFT:
SendMessage(g_hwndEdit, SCI_WORDLEFT, 0, 0);
break;

10
src/Notepad3.rc
View File

@ -181,8 +181,8 @@ BEGIN
END
POPUP "&Block"
BEGIN
MENUITEM "&Indent\t(Tab)", IDM_EDIT_INDENT
MENUITEM "&Unindent\t(Shift+Tab)", IDM_EDIT_UNINDENT
MENUITEM "&Indent", IDM_EDIT_INDENT
MENUITEM "&Unindent", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
POPUP "&Enclose Selection"
BEGIN
@ -376,8 +376,8 @@ BEGIN
MENUITEM "&Online Documentation\tF1", IDM_HELP_ONLINEDOCUMENTATION
MENUITEM SEPARATOR
MENUITEM "&About...\tShift+F1", IDM_HELP_ABOUT
MENUITEM "&Command Line Help", IDM_HELP_CMD
MENUITEM "Check for &Updates", IDM_HELP_UPDATECHECK
MENUITEM "&Command Line Help...", IDM_HELP_CMD
MENUITEM "Launch &Update Installer", IDM_HELP_UPDATECHECK
END
END
@ -524,7 +524,7 @@ BEGIN
VK_ADD, IDM_VIEW_ZOOMIN, VIRTKEY, CONTROL, NOINVERT
VK_ADD, CMD_INCLINELIMIT, VIRTKEY, ALT, NOINVERT
VK_ADD, CMD_INCREASENUM, VIRTKEY, CONTROL, ALT, NOINVERT
VK_BACK, CMD_BACK, 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

3
src/SciCall.h
View File

@ -90,6 +90,7 @@ DeclareSciCallR0(IsDocModified, GETMODIFY, bool);
DeclareSciCallR0(IsSelectionEmpty, GETSELECTIONEMPTY, bool);
DeclareSciCallR0(IsSelectionRectangle, SELECTIONISRECTANGLE, bool);
DeclareSciCallR0(GetCurrentPos, GETCURRENTPOS, DocPos);
DeclareSciCallR0(GetAnchor, GETANCHOR, DocPos);
DeclareSciCallR0(GetSelectionMode, GETSELECTIONMODE, int);
@ -228,6 +229,8 @@ DeclareSciCallV1(SetTechnology, SETTECHNOLOGY, int, technology);
// Utilities
//
#define IsSelThinRectangle() (SciCall_GetSelectionMode() == SC_SEL_THIN)
#define SciClearClipboard() SciCall_CopyText(0, "")
#define IsSingleLineSelection() \

2
src/resource.h
View File

@ -188,7 +188,7 @@
#define CMD_SHIFTCTRLENTER 20002
#define CMD_CTRLLEFT 20003
#define CMD_CTRLRIGHT 20004
#define CMD_BACK 20005
#define CMD_DELETEBACK 20005
#define CMD_CTRLBACK 20006
#define CMD_DEL 20007
#define CMD_CTRLDEL 20008