From ed182c2ba3958fa39d52295fab01eb45fd098578 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Thu, 11 Oct 2018 18:56:54 +0200 Subject: [PATCH] + CHARLEFT/CHARRIGHT experimental (disabled) --- language/common_res.h | 2 ++ src/Notepad3.c | 21 +++++++++++++++------ src/Notepad3.rc | 2 ++ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/language/common_res.h b/language/common_res.h index df506011c..32c546383 100644 --- a/language/common_res.h +++ b/language/common_res.h @@ -327,6 +327,8 @@ #define CMD_FULLSCRWINPOS 20050 #define CMD_DEFAULTWINPOS 20051 #define CMD_SAVEASDEFWINPOS 20052 +//#define CMD_LEFT 20053 +//#define CMD_RIGHT 20054 #define IDM_FILE_NEW 40000 #define IDM_FILE_OPEN 40001 diff --git a/src/Notepad3.c b/src/Notepad3.c index 9d87cd43e..151c5cdc0 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -1283,6 +1283,7 @@ LRESULT CALLBACK MainWndProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) case WM_WINDOWPOSCHANGING: case WM_WINDOWPOSCHANGED: case WM_TIMER: + case WM_KEYDOWN: return DefWindowProc(hwnd, umsg, wParam, lParam); case WM_SYSKEYDOWN: @@ -1296,7 +1297,7 @@ LRESULT CALLBACK MainWndProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) } } return DefWindowProc(hwnd, umsg, wParam, lParam); - + case WM_SYSKEYUP: if (!(GetAsyncKeyState(VK_MENU) & SHRT_MIN)) // NOT ALT-KEY DOWN { @@ -2513,13 +2514,10 @@ LRESULT MsgContextMenu(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) return 0LL; } - - //============================================================================= // // MsgChangeNotify() - Handles WM_CHANGENOTIFY // -// LRESULT MsgChangeNotify(HWND hwnd, WPARAM wParam, LPARAM lParam) { UNUSED(wParam); @@ -5144,14 +5142,25 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) } break; +#if 0 + case CMD_LEFT: + //Sci_SendMsgV0(CHARLEFT); + SciCall_GotoPos(SciCall_PositionBefore(SciCall_GetCurrentPos())); + break; + + case CMD_RIGHT: + //Sci_SendMsgV0(CHARRIGHT); + SciCall_GotoPos(SciCall_PositionAfter(SciCall_GetCurrentPos())); + break; +#endif case CMD_CTRLLEFT: - SendMessage(Globals.hwndEdit, SCI_WORDLEFT, 0, 0); + Sci_SendMsgV0(WORDLEFT); break; case CMD_CTRLRIGHT: - SendMessage(Globals.hwndEdit, SCI_WORDRIGHT, 0, 0); + Sci_SendMsgV0(WORDRIGHT); break; diff --git a/src/Notepad3.rc b/src/Notepad3.rc index 762705c06..b3fac607c 100644 --- a/src/Notepad3.rc +++ b/src/Notepad3.rc @@ -191,8 +191,10 @@ BEGIN "Z", IDM_EDIT_UNDO, VIRTKEY, CONTROL, NOINVERT "Z", IDM_EDIT_STRIP1STCHAR, VIRTKEY, ALT, NOINVERT "Z", IDM_EDIT_REDO, VIRTKEY, SHIFT, CONTROL, 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_CTRLRIGHT, VIRTKEY, CONTROL, NOINVERT VK_RIGHT, CMD_ALTRIGHT, VIRTKEY, ALT, NOINVERT VK_ADD, IDM_VIEW_ZOOMIN, VIRTKEY, CONTROL, NOINVERT