mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-23 09:58:19 -07:00
Code Issues Packages Projects Releases Activity

Reverted the previous approach and switched to the new, non-hacky approach of getting rid of the accelerator and instead handling enter full screen the same way exit full screen is handled.

Browse Source
This commit is contained in:
OBattler
2023-04-13 22:47:42 +02:00
parent a0c292d27e
commit df24b4be0f
10 changed files with 79 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/win/86Box.rc
View File

@@ -42,7 +42,7 @@ BEGIN
#ifdef MTR_ENABLED
"T", IDM_ACTION_TRACE, CONTROL, VIRTKEY
#endif
VK_PRIOR,IDM_VID_FULLSCREEN, VIRTKEY, CONTROL , ALT
// VK_PRIOR,IDM_VID_FULLSCREEN, VIRTKEY, CONTROL , ALT
VK_F11, IDM_ACTION_SCREENSHOT, VIRTKEY, CONTROL
VK_F12, IDM_ACTION_RESET_CAD, VIRTKEY, CONTROL
VK_PAUSE,IDM_ACTION_PAUSE, VIRTKEY

134
src/win/win_keyboard.c
View File

@@ -107,8 +107,7 @@ void
keyboard_handle(PRAWINPUT raw)
{
USHORT scancode;
static int recv_lalt = 0, recv_ralt = 0, recv_tab = 0, recv_lctrl = 0, recv_rctrl = 0;
static int recv_npgup = 0, recv_pgup = 0;
static int recv_lalt = 0, recv_ralt = 0, recv_tab = 0;
RAWKEYBOARD rawKB = raw->data.keyboard;
scancode = rawKB.MakeCode;
@@ -158,148 +157,17 @@ keyboard_handle(PRAWINPUT raw)
is not captured, suppress the ALT and send a TAB key up. */
keyboard_input(0, 0x00f);
recv_tab = 0;
} else if (((scancode == 0x049) || (scancode == 0x149)) && !(rawKB.Flags & RI_KEY_BREAK) && (recv_lalt || recv_ralt) && (recv_lctrl || recv_rctrl) && (!kbd_req_capture || mouse_capture)) {
/* We received a NumPad Page Up or Page Up while CTRL+ALT was pressed, while the keyboard
is captured, suppress the Page Up and send an CTRL+ALT key up. */
if (recv_lctrl) {
keyboard_input(0, 0x01d);
/* Extra key press and release so the guest is not stuck in the
menu bar. */
keyboard_input(1, 0x01d);
keyboard_input(0, 0x01d);
recv_lctrl = 0;
}
if (recv_rctrl) {
keyboard_input(0, 0x11d);
/* Extra key press and release so the guest is not stuck in the
menu bar. */
keyboard_input(1, 0x11d);
keyboard_input(0, 0x11d);
recv_rctrl = 0;
}
if (recv_lalt) {
keyboard_input(0, 0x038);
/* Extra key press and release so the guest is not stuck in the
menu bar. */
keyboard_input(1, 0x038);
keyboard_input(0, 0x038);
recv_lalt = 0;
}
if (recv_ralt) {
keyboard_input(0, 0x138);
/* Extra key press and release so the guest is not stuck in the
menu bar. */
keyboard_input(1, 0x138);
keyboard_input(0, 0x138);
recv_ralt = 0;
}
} else if (((scancode == 0x038) || (scancode == 0x138)) && !(rawKB.Flags & RI_KEY_BREAK) && recv_npgup && (recv_lctrl || recv_rctrl) && (!kbd_req_capture || mouse_capture)) {
/* We received an ALT while CTRL+NumPad Page Up was pressed, while the mouse
is not captured, suppress the ALT and send a TAB key up. */
if (recv_lctrl) {
keyboard_input(0, 0x01d);
/* Extra key press and release so the guest is not stuck in the
menu bar. */
keyboard_input(1, 0x01d);
keyboard_input(0, 0x01d);
recv_lctrl = 0;
}
if (recv_rctrl) {
keyboard_input(0, 0x11d);
/* Extra key press and release so the guest is not stuck in the
menu bar. */
keyboard_input(1, 0x11d);
keyboard_input(0, 0x11d);
recv_rctrl = 0;
}
keyboard_input(0, 0x049);
recv_npgup = 0;
} else if (((scancode == 0x01d) || (scancode == 0x11d)) && !(rawKB.Flags & RI_KEY_BREAK) && recv_npgup && (recv_lalt || recv_ralt) && (!kbd_req_capture || mouse_capture)) {
/* We received an CTRL while ALT+NumPad Page Up was pressed, while the mouse
is not captured, suppress the ALT and send a TAB key up. */
if (recv_lalt) {
keyboard_input(0, 0x038);
/* Extra key press and release so the guest is not stuck in the
menu bar. */
keyboard_input(1, 0x038);
keyboard_input(0, 0x038);
recv_lalt = 0;
}
if (recv_ralt) {
keyboard_input(0, 0x138);
/* Extra key press and release so the guest is not stuck in the
menu bar. */
keyboard_input(1, 0x138);
keyboard_input(0, 0x138);
recv_ralt = 0;
}
keyboard_input(0, 0x049);
recv_npgup = 0;
} else if (((scancode == 0x038) || (scancode == 0x138)) && !(rawKB.Flags & RI_KEY_BREAK) && recv_pgup && (recv_lctrl || recv_rctrl) && (!kbd_req_capture || mouse_capture)) {
/* We received an ALT while CTRL+Page Up was pressed, while the mouse
is not captured, suppress the ALT and send a TAB key up. */
if (recv_lalt) {
keyboard_input(0, 0x038);
/* Extra key press and release so the guest is not stuck in the
menu bar. */
keyboard_input(1, 0x038);
keyboard_input(0, 0x038);
recv_lalt = 0;
}
if (recv_ralt) {
keyboard_input(0, 0x138);
/* Extra key press and release so the guest is not stuck in the
menu bar. */
keyboard_input(1, 0x138);
keyboard_input(0, 0x138);
recv_ralt = 0;
}
keyboard_input(0, 0x149);
recv_pgup = 0;
} else if (((scancode == 0x01d) || (scancode == 0x11d)) && !(rawKB.Flags & RI_KEY_BREAK) && recv_pgup && (recv_lalt || recv_ralt) && (!kbd_req_capture || mouse_capture)) {
/* We received an CTRL while ALT+Page Up was pressed, while the mouse
is not captured, suppress the ALT and send a TAB key up. */
if (recv_lctrl) {
keyboard_input(0, 0x01d);
/* Extra key press and release so the guest is not stuck in the
menu bar. */
keyboard_input(1, 0x01d);
keyboard_input(0, 0x01d);
recv_lctrl = 0;
}
if (recv_rctrl) {
keyboard_input(0, 0x11d);
/* Extra key press and release so the guest is not stuck in the
menu bar. */
keyboard_input(1, 0x11d);
keyboard_input(0, 0x11d);
recv_rctrl = 0;
}
keyboard_input(0, 0x149);
recv_pgup = 0;
} else {
switch (scancode) {
case 0x00f:
recv_tab = !(rawKB.Flags & RI_KEY_BREAK);
break;
case 0x01d:
recv_lctrl = !(rawKB.Flags & RI_KEY_BREAK);
break;
case 0x049:
recv_npgup = !(rawKB.Flags & RI_KEY_BREAK);
break;
case 0x038:
recv_lalt = !(rawKB.Flags & RI_KEY_BREAK);
break;
case 0x11d:
recv_rctrl = !(rawKB.Flags & RI_KEY_BREAK);
break;
case 0x138:
recv_ralt = !(rawKB.Flags & RI_KEY_BREAK);
break;
case 0x149:
recv_pgup = !(rawKB.Flags & RI_KEY_BREAK);
break;
}
/* Translate right CTRL to left ALT if the user has so

14
src/win/win_ui.c
View File

@@ -1183,6 +1183,7 @@ ui_init(int nCmdShow)
{IDCANCEL, MAKEINTRESOURCE(IDS_2120)}
};
uint32_t helper_lang;
static int fs_on_signal = 0, fs_off_signal = 0;
/* Load DPI related Windows 10 APIs */
user32_handle = dynld_module("user32.dll", user32_imports);
@@ -1461,9 +1462,20 @@ ui_init(int nCmdShow)
plat_mouse_capture(0);
}
if (video_fullscreen && keyboard_isfsexit()) {
if (!fs_off_signal && video_fullscreen && keyboard_isfsexit()) {
/* Signal "exit fullscreen mode". */
fs_off_signal = 1;
} else if (fs_off_signal && video_fullscreen && keyboard_isfsexit_down()) {
plat_setfullscreen(0);
fs_off_signal = 0;
}
if (!fs_on_signal && !video_fullscreen && keyboard_isfsenter()) {
/* Signal "enter fullscreen mode". */
fs_on_signal = 1;
} else if (fs_on_signal && !video_fullscreen && keyboard_isfsenter_down()) {
plat_setfullscreen(1);
fs_on_signal = 0;
}
#ifdef DISCORD