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

Sending CTRL+ALT+DEL and CTRL+ALT+ESC using the menu now uses the same protocol as actual key presses instead of forcibly injecting scan codes into the keyboard buffer;

Browse Source 
Fixed the machine not available string to treat the machine name string as ANSI.
This commit is contained in:
OBattler
2020-12-28 01:33:13 +01:00
parent 8349b88c3e
commit f8dee03b4f
2 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/pc.c
View File

@@ -647,26 +647,15 @@ pc_init_modules(void)
} }
/* Insert keystrokes into the machine's keyboard buffer. */
static void
pc_keyboard_send(uint8_t val)
{
if (AT)
keyboard_at_adddata_keyboard_raw(val);
else
keyboard_send(val);
}
void void
pc_send_ca(uint8_t sc) pc_send_ca(uint8_t sc)
{ {
pc_keyboard_send(29); /* Ctrl key pressed */ keyboard_input(1, 29); /* Ctrl key pressed */
pc_keyboard_send(56); /* Alt key pressed */ keyboard_input(1, 56); /* Alt key pressed */
pc_keyboard_send(sc); keyboard_input(1, sc);
pc_keyboard_send(sc | 0x80); keyboard_input(0, sc);
pc_keyboard_send(184); /* Alt key released */ keyboard_input(0, 56); /* Alt key released */
pc_keyboard_send(157); /* Ctrl key released */ keyboard_input(0, 29); /* Ctrl key released */
} }

2
src/win/86Box.rc
View File

@@ -931,7 +931,7 @@ BEGIN
IDS_2060 "On" IDS_2060 "On"
IDS_2061 "Off" IDS_2061 "Off"
IDS_2062 "All images (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0Basic sector images (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0Surface images (*.86F)\0*.86F\0" IDS_2062 "All images (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0Basic sector images (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0Surface images (*.86F)\0*.86F\0"
IDS_2063 "Machine ""%S"" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine." IDS_2063 "Machine ""%s"" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine."
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE