claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4786 from chungy/f8f12_everywhere

Browse Source 
Use F8+F12 to release mouse on all platforms
This commit is contained in:
Miran Grča
2025-01-27 00:58:51 +01:00
committed by GitHub
parent d7f524cf39 dd1d835e15
commit 21eeac3eb7
3 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/device/keyboard.c
View File

@@ -33,23 +33,13 @@ uint16_t scancode_map[768] = { 0 };
int keyboard_scan; int keyboard_scan;
#ifdef _WIN32 /* F8+F12 */
/* Windows: F8+F12 */
uint16_t key_prefix_1_1 = 0x042; /* F8 */ uint16_t key_prefix_1_1 = 0x042; /* F8 */
uint16_t key_prefix_1_2 = 0x000; /* Invalid */ uint16_t key_prefix_1_2 = 0x000; /* Invalid */
uint16_t key_prefix_2_1 = 0x000; /* Invalid */ uint16_t key_prefix_2_1 = 0x000; /* Invalid */
uint16_t key_prefix_2_2 = 0x000; /* Invalid */ uint16_t key_prefix_2_2 = 0x000; /* Invalid */
uint16_t key_uncapture_1 = 0x058; /* F12 */ uint16_t key_uncapture_1 = 0x058; /* F12 */
uint16_t key_uncapture_2 = 0x000; /* Invalid */ uint16_t key_uncapture_2 = 0x000; /* Invalid */
#else
/* WxWidgets cannot do two regular keys.. CTRL+END */
uint16_t key_prefix_1_1 = 0x01d; /* Left Ctrl */
uint16_t key_prefix_1_2 = 0x11d; /* Right Ctrl */
uint16_t key_prefix_2_1 = 0x000; /* Invalid */
uint16_t key_prefix_2_2 = 0x000; /* Invalid */
uint16_t key_uncapture_1 = 0x04f; /* Numpad End */
uint16_t key_uncapture_2 = 0x14f; /* End */
#endif
void (*keyboard_send)(uint16_t val); void (*keyboard_send)(uint16_t val);

4
src/include/86box/plat.h
View File

@@ -32,8 +32,8 @@
/* String ID numbers. */ /* String ID numbers. */
enum { enum {
STRING_MOUSE_CAPTURE, /* "Click to capture mouse" */ STRING_MOUSE_CAPTURE, /* "Click to capture mouse" */
STRING_MOUSE_RELEASE, /* "Press F8+F12/Ctrl+End to release mouse" */ STRING_MOUSE_RELEASE, /* "Press F8+F12 to release mouse" */
STRING_MOUSE_RELEASE_MMB, /* "Press F8+F12/Ctrl+End or middle button to release mouse" */ STRING_MOUSE_RELEASE_MMB, /* "Press F8+F12 or middle button to release mouse" */
STRING_INVALID_CONFIG, /* "Invalid configuration" */ STRING_INVALID_CONFIG, /* "Invalid configuration" */
STRING_NO_ST506_ESDI_CDROM, /* "MFM/RLL or ESDI CD-ROM drives never existed" */ STRING_NO_ST506_ESDI_CDROM, /* "MFM/RLL or ESDI CD-ROM drives never existed" */
STRING_NET_ERROR, /* "Failed to initialize network driver" */ STRING_NET_ERROR, /* "Failed to initialize network driver" */

4
src/qt/qt_platform.cpp
View File

@@ -595,6 +595,8 @@ c16stombs(char dst[], const uint16_t src[], int len)
} }
#endif #endif
# define MOUSE_CAPTURE_KEYSEQ "F8+F12"
#ifdef _WIN32 #ifdef _WIN32
# if defined(__amd64__) || defined(_M_X64) || defined(__aarch64__) || defined(_M_ARM64) # if defined(__amd64__) || defined(_M_X64) || defined(__aarch64__) || defined(_M_ARM64)
# define LIB_NAME_GS "gsdll64.dll" # define LIB_NAME_GS "gsdll64.dll"
@@ -604,12 +606,10 @@ c16stombs(char dst[], const uint16_t src[], int len)
# define LIB_NAME_GPCL "gpcl6dll32.dll" # define LIB_NAME_GPCL "gpcl6dll32.dll"
# endif # endif
# define LIB_NAME_PCAP "Npcap" # define LIB_NAME_PCAP "Npcap"
# define MOUSE_CAPTURE_KEYSEQ "F8+F12"
#else #else
# define LIB_NAME_GS "libgs" # define LIB_NAME_GS "libgs"
# define LIB_NAME_GPCL "libgpcl6" # define LIB_NAME_GPCL "libgpcl6"
# define LIB_NAME_PCAP "libpcap" # define LIB_NAME_PCAP "libpcap"
# define MOUSE_CAPTURE_KEYSEQ "Ctrl+End"
#endif #endif
QMap<int, std::wstring> ProgSettings::translatedstrings; QMap<int, std::wstring> ProgSettings::translatedstrings;