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

Allow mouse capture on internal mice even if mouse_type is not actually set to MOUSE_TYPE_INTERNAL, fixes #2682.

Browse Source
This commit is contained in:
OBattler
2022-10-23 05:31:39 +02:00
parent 514fd4a3b0
commit da33f5c0cc
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/86box/machine.h
View File

@@ -335,6 +335,7 @@ extern int machine_get_max_ram(int m);
extern int machine_get_ram_granularity(int m); extern int machine_get_ram_granularity(int m);
extern int machine_get_type(int m); extern int machine_get_type(int m);
extern void machine_close(void); extern void machine_close(void);
extern int machine_has_mouse(void);
extern uint8_t machine_get_p1(void); extern uint8_t machine_get_p1(void);
extern void machine_load_p1(int m); extern void machine_load_p1(int m);

6
src/machine/machine_table.c
View File

@@ -11990,3 +11990,9 @@ machine_get_machine_from_internal_name(char *s)
return(0); return(0);
} }
int
machine_has_mouse(void)
{
return(machines[machine].flags & MACHINE_MOUSE);
}

2
src/qt/qt_ui.cpp
View File

@@ -104,7 +104,7 @@ void plat_setfullscreen(int on) {
} }
void plat_mouse_capture(int on) { void plat_mouse_capture(int on) {
if (!kbd_req_capture && (mouse_type == MOUSE_TYPE_NONE)) if (!kbd_req_capture && (mouse_type == MOUSE_TYPE_NONE) && !machine_has_mouse())
return; return;
main_window->setMouseCapture(on > 0 ? true : false); main_window->setMouseCapture(on > 0 ? true : false);

2
src/win/win_ui.c
View File

@@ -1549,7 +1549,7 @@ plat_mouse_capture(int on)
{ {
RECT rect; RECT rect;
if (!kbd_req_capture && (mouse_type == MOUSE_TYPE_NONE)) if (!kbd_req_capture && (mouse_type == MOUSE_TYPE_NONE) && !machine_has_mouse())
return; return;
if (on && !mouse_capture) { if (on && !mouse_capture) {