input: fix screenshot button

Resolves #1780
LostArtefacts · Nov 2, 2024 · b84a9ff · b84a9ff
1 parent e0fc30e
commit b84a9ff
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/src/libtrx/include/libtrx/game/input/backends/keyboard_tr1.def b/src/libtrx/include/libtrx/game/input/backends/keyboard_tr1.def
@@ -35,7 +35,6 @@ INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_EQUIP_UZIS,        SDL_SCANCODE_4)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_USE_SMALL_MEDI,    SDL_SCANCODE_8)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_USE_BIG_MEDI,      SDL_SCANCODE_9)
 
-INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_SCREENSHOT,        SDL_SCANCODE_PRINTSCREEN)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_TOGGLE_FULLSCREEN, SDL_SCANCODE_UNKNOWN)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_FPS,               SDL_SCANCODE_F2)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_BILINEAR,          SDL_SCANCODE_F3)

diff --git a/src/libtrx/include/libtrx/game/input/backends/keyboard_tr2.def b/src/libtrx/include/libtrx/game/input/backends/keyboard_tr2.def
@@ -30,7 +30,6 @@ INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_USE_SMALL_MEDI,              SDL_SCANCODE_8)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_USE_BIG_MEDI,                SDL_SCANCODE_9)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_USE_FLARE,                   SDL_SCANCODE_COMMA)
 
-INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_SCREENSHOT,                  SDL_SCANCODE_PRINTSCREEN)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_SWITCH_RESOLUTION,           SDL_SCANCODE_F1)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_SWITCH_INTERNAL_SCREEN_SIZE, SDL_SCANCODE_F2)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_TOGGLE_BILINEAR_FILTER,      SDL_SCANCODE_F3)

diff --git a/src/tr1/specific/s_shell.c b/src/tr1/specific/s_shell.c
@@ -228,6 +228,14 @@ void S_Shell_SpinMessageLoop(void)
             break;
         }
 
+        case SDL_KEYUP:
+            // NOTE: needs special handling on Windows -
+            // SDL_SCANCODE_PRINTSCREEN is not sufficient to react to this.
+            if (event.key.keysym.sym == SDLK_PRINTSCREEN) {
+                Screenshot_Make(g_Config.screenshot_format);
+            }
+            break;
+
         case SDL_TEXTEDITING:
             UI_HandleTextEdit(event.text.text);
             break;

diff --git a/src/tr2/game/shell/common.c b/src/tr2/game/shell/common.c
@@ -236,6 +236,14 @@ void Shell_ProcessEvents(void)
             break;
         }
 
+        case SDL_KEYUP:
+            // NOTE: needs special handling on Windows -
+            // SDL_SCANCODE_PRINTSCREEN is not sufficient to react to this.
+            if (event.key.keysym.sym == SDLK_PRINTSCREEN) {
+                Screenshot_Make(g_Config.rendering.screenshot_format);
+            }
+            break;
+
         case SDL_TEXTEDITING:
             UI_HandleTextEdit(event.text.text);
             break;