From 7570ba4271abaf5822254a3b4b740b3f507bd1e7 Mon Sep 17 00:00:00 2001 From: SarahW Date: Tue, 14 Jul 2020 19:17:25 +0100 Subject: [PATCH] Add numeric-keypad alternatives to CTRL-ALT-END/PGUP/PGDN shortcuts. Patch from tigerforce. --- src/wx-sdl2-display-win.c | 6 +++--- src/wx-sdl2-display.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/wx-sdl2-display-win.c b/src/wx-sdl2-display-win.c index 57f92e6..5ac647a 100644 --- a/src/wx-sdl2-display-win.c +++ b/src/wx-sdl2-display-win.c @@ -780,7 +780,7 @@ int render() break; } } - if (rawinputkey[sdl_scancode(SDL_SCANCODE_PAGEDOWN)] && + if ((rawinputkey[sdl_scancode(SDL_SCANCODE_PAGEDOWN)] || rawinputkey[sdl_scancode(SDL_SCANCODE_KP_3)]) && (rawinputkey[sdl_scancode(SDL_SCANCODE_LCTRL)] || rawinputkey[sdl_scancode(SDL_SCANCODE_RCTRL)]) && (rawinputkey[sdl_scancode(SDL_SCANCODE_LALT)] || rawinputkey[sdl_scancode(SDL_SCANCODE_RALT)])) trigger_fullscreen = 1; @@ -789,7 +789,7 @@ int render() trigger_fullscreen = 0; toggle_fullscreen(); } - else if (rawinputkey[sdl_scancode(SDL_SCANCODE_PAGEUP)] && + else if ((rawinputkey[sdl_scancode(SDL_SCANCODE_PAGEUP)] || rawinputkey[sdl_scancode(SDL_SCANCODE_KP_9)]) && (rawinputkey[sdl_scancode(SDL_SCANCODE_LCTRL)] || rawinputkey[sdl_scancode(SDL_SCANCODE_RCTRL)]) && (rawinputkey[sdl_scancode(SDL_SCANCODE_LALT)] || rawinputkey[sdl_scancode(SDL_SCANCODE_RALT)])) trigger_screenshot = 1; @@ -798,7 +798,7 @@ int render() trigger_screenshot = 0; take_screenshot = 1; } - else if (event.key.keysym.scancode == SDL_SCANCODE_END && + else if ((event.key.keysym.scancode == SDL_SCANCODE_END || event.key.keysym.scancode == SDL_SCANCODE_KP_1) && (rawinputkey[sdl_scancode(SDL_SCANCODE_LCTRL)] || rawinputkey[sdl_scancode(SDL_SCANCODE_RCTRL)])) trigger_inputrelease = 1; else if (trigger_inputrelease) diff --git a/src/wx-sdl2-display.c b/src/wx-sdl2-display.c index 0de48c5..ac8c23e 100644 --- a/src/wx-sdl2-display.c +++ b/src/wx-sdl2-display.c @@ -541,7 +541,7 @@ int render() } } } - if (rawinputkey[sdl_scancode(SDL_SCANCODE_PAGEDOWN)] && + if ((rawinputkey[sdl_scancode(SDL_SCANCODE_PAGEDOWN)] || rawinputkey[sdl_scancode(SDL_SCANCODE_KP_3)]) && (rawinputkey[sdl_scancode(SDL_SCANCODE_LCTRL)] || rawinputkey[sdl_scancode(SDL_SCANCODE_RCTRL)]) && (rawinputkey[sdl_scancode(SDL_SCANCODE_LALT)] || rawinputkey[sdl_scancode(SDL_SCANCODE_RALT)])) trigger_fullscreen = 1; @@ -550,7 +550,7 @@ int render() trigger_fullscreen = 0; toggle_fullscreen(); } - else if (rawinputkey[sdl_scancode(SDL_SCANCODE_PAGEUP)] && + else if ((rawinputkey[sdl_scancode(SDL_SCANCODE_PAGEUP)] || rawinputkey[sdl_scancode(SDL_SCANCODE_KP_9)]) && (rawinputkey[sdl_scancode(SDL_SCANCODE_LCTRL)] || rawinputkey[sdl_scancode(SDL_SCANCODE_RCTRL)]) && (rawinputkey[sdl_scancode(SDL_SCANCODE_LALT)] || rawinputkey[sdl_scancode(SDL_SCANCODE_RALT)])) trigger_screenshot = 1; @@ -559,7 +559,7 @@ int render() trigger_screenshot = 0; take_screenshot = 1; } - else if (event.key.keysym.scancode == SDL_SCANCODE_END && + else if ((event.key.keysym.scancode == SDL_SCANCODE_END || event.key.keysym.scancode == SDL_SCANCODE_KP_1) && (rawinputkey[sdl_scancode(SDL_SCANCODE_LCTRL)] || rawinputkey[sdl_scancode(SDL_SCANCODE_RCTRL)])) trigger_inputrelease = 1; else if (trigger_inputrelease)