From 3f6ef077eadf2b699e9c1d0e29ffd7f2aa0a8538 Mon Sep 17 00:00:00 2001 From: iks Date: Sat, 27 Sep 2003 14:52:26 +0000 Subject: [PATCH] =?utf8?q?=E3=83=AA=E3=83=93=E3=82=B8=E3=83=A7=E3=83=B31.2?= =?utf8?q?7=E3=81=AE=E4=BF=AE=E6=AD=A3=EF=BC=9Aswitch=E6=96=87=E3=81=A7wPa?= =?utf8?q?ram=E3=82=92=E5=8F=82=E7=85=A7=E3=81=99=E3=82=8B=E3=82=88?= =?utf8?q?=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3=E3=80=82'/'=E4=BB=A5?= =?utf8?q?=E5=A4=96=E3=81=AE=E3=82=AD=E3=83=BC=E3=81=AB=E3=82=82=E5=AF=BE?= =?utf8?q?=E5=BF=9C=E3=80=82=20ASCII=E3=82=B3=E3=83=BC=E3=83=89=E3=82=92?= =?utf8?q?=E4=BC=B4=E3=81=86=E3=83=9E=E3=82=AF=E3=83=AD=E3=83=88=E3=83=AA?= =?utf8?q?=E3=82=AC=E3=83=BC=E3=82=92=E6=8A=BC=E3=81=97=E3=81=9F=E3=81=A8?= =?utf8?q?=E3=81=8D=E3=81=AB=E3=80=81=E3=83=9E=E3=82=AF=E3=83=AD=E3=82=B3?= =?utf8?q?=E3=83=BC=E3=83=89=E3=81=A8ASCII=E3=82=B3=E3=83=BC=E3=83=89?= =?utf8?q?=E3=81=AE=E4=B8=A1=E6=96=B9=E3=82=92=E5=85=A5=E5=8A=9B=E3=81=97?= =?utf8?q?=E3=81=A6=E3=81=9F=E3=81=AE=E3=81=A7=E3=80=81ASCII=E3=82=B3?= =?utf8?q?=E3=83=BC=E3=83=89=E3=82=92=E5=85=A5=E5=8A=9B=E3=81=97=E3=81=AA?= =?utf8?q?=E3=81=84=E3=82=88=E3=81=86=E4=BF=AE=E6=AD=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/main-win.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/main-win.c b/src/main-win.c index 833d5f9bc..bfb33a762 100644 --- a/src/main-win.c +++ b/src/main-win.c @@ -565,6 +565,12 @@ static COLORREF win_clr[256]; /* + * Flag for macro trigger with dump ASCII + */ +static bool Term_no_press = FALSE; + + +/* * The "simple" color values * * See "main-ibm.c" for original table information @@ -610,6 +616,7 @@ VK_CONVERT,VK_NONCONVERT,VK_ACCEPT,VK_MODECHANGE, VK_PRIOR,VK_NEXT,VK_END,VK_HOME,VK_LEFT,VK_UP,VK_RIGHT,VK_DOWN, VK_SELECT,VK_PRINT,VK_EXECUTE,VK_SNAPSHOT,VK_INSERT,VK_DELETE, VK_HELP,VK_APPS, +VK_MULTIPLY,VK_ADD,VK_SEPARATOR,VK_SUBTRACT,VK_DIVIDE, VK_F1,VK_F2,VK_F3,VK_F4,VK_F5,VK_F6,VK_F7,VK_F8,VK_F9,VK_F10, VK_F11,VK_F12,VK_F13,VK_F14,VK_F15,VK_F16,VK_F17,VK_F18,VK_F19,VK_F20, VK_F21,VK_F22,VK_F23,VK_F24,VK_NUMLOCK,VK_SCROLL, @@ -4205,12 +4212,19 @@ LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, Term_keypress('x'); /* Extended key bit */ - switch (i) + switch (wParam) { - case VK_ENTER: - case '/': + case VK_DIVIDE: + Term_no_press = TRUE; + case VK_RETURN: /* Numpad Enter and '/' are extended key */ numpad = ext_key; + break; + case VK_ADD: + case VK_MULTIPLY: + case VK_SUBTRACT: + case VK_SEPARATOR: + Term_no_press = TRUE; default: /* Other extended keys are on full keyboard */ numpad = !ext_key; @@ -4234,7 +4248,8 @@ LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, case WM_CHAR: { - Term_keypress(wParam); + if (Term_no_press) Term_no_press = FALSE; + else Term_keypress(wParam); return 0; } -- 2.11.0