80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

ALT+TAB now gets special treatment when the mouse is not captured, prevents stuck TAB key.

Browse Source
This commit is contained in:
OBattler
2018-01-20 15:46:37 +01:00
parent a1117f2130
commit f7cdc0f5b4
1 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/win/win_keyboard.c
View File

@@ -8,11 +8,11 @@
* *
* Windows raw keyboard input handler. * Windows raw keyboard input handler.
* *
* Version: @(#)win_keyboard.c 1.0.5 2018/01/09 * Version: @(#)win_keyboard.c 1.0.6 2018/01/20
* *
* Author: Miran Grca, <mgrca8@gmail.com> * Author: Miran Grca, <mgrca8@gmail.com>
* *
* Copyright 2016,2018 Miran Grca. * Copyright 2016-2018 Miran Grca.
*/ */
#define UNICODE #define UNICODE
#define _WIN32_WINNT 0x0501 #define _WIN32_WINNT 0x0501
@@ -150,8 +150,29 @@ keyboard_handle(LPARAM lParam, int infocus)
We use scan code 0xFFFF to mean a mapping that We use scan code 0xFFFF to mean a mapping that
has a prefix other than E0 and that is not E1 1D, has a prefix other than E0 and that is not E1 1D,
which is, for our purposes, invalid. */ which is, for our purposes, invalid. */
if (scancode != 0xFFFF) if ((scancode == 0x00F) &&
keyboard_input(!(rawKB.Flags & RI_KEY_BREAK), scancode); !(rawKB.Flags & RI_KEY_BREAK) &&
(keyboard_recv(0x038) || keyboard_recv(0x138)) &&
!mouse_capture) {
/* We received a TAB while ALT was pressed, while the mouse
is not captured, suppress the TAB and send an ALT key up. */
if (keyboard_recv(0x038))
keyboard_input(0, 0x038);
if (keyboard_recv(0x138))
keyboard_input(0, 0x138);
} else if (((scancode == 0x038) || (scancode == 0x138)) &&
!(rawKB.Flags & RI_KEY_BREAK) &&
keyboard_recv(0x00F) &&
!mouse_capture) {
/* We received an ALT while TAB was pressed, while the mouse
is not captured, suppress the ALT and send a TAB key up. */
keyboard_input(0, 0x00F);
} else {
/* Normal scan code pass through, pass it through as is if
it's not an invalid scan code. */
if (scancode != 0xFFFF)
keyboard_input(!(rawKB.Flags & RI_KEY_BREAK), scancode);
}
} else { } else {
if (rawKB.MakeCode == 0x1D) { if (rawKB.MakeCode == 0x1D) {
scancode = scancode_map[0x100]; /* Translate E1 1D to 0x100 (which would scancode = scancode_map[0x100]; /* Translate E1 1D to 0x100 (which would