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

keyboard: Rename inaccurate fullscreen hotkey function

Browse Source
This commit is contained in:
RichardG867
2023-07-24 15:07:08 -03:00
parent 85baf8ac2f
commit 8d46224893
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/device/keyboard.c
View File

@@ -320,7 +320,7 @@ keyboard_isfsenter(void)
} }
int int
keyboard_isfsenter_down(void) keyboard_isfsenter_up(void)
{ {
return (!recv_key[0x01d] && !recv_key[0x11d] && !recv_key[0x038] && !recv_key[0x138] && !recv_key[0x049] && !recv_key[0x149]); return (!recv_key[0x01d] && !recv_key[0x11d] && !recv_key[0x038] && !recv_key[0x138] && !recv_key[0x049] && !recv_key[0x149]);
} }
@@ -333,7 +333,7 @@ keyboard_isfsexit(void)
} }
int int
keyboard_isfsexit_down(void) keyboard_isfsexit_up(void)
{ {
return (!recv_key[0x01d] && !recv_key[0x11d] && !recv_key[0x038] && !recv_key[0x138] && !recv_key[0x051] && !recv_key[0x151]); return (!recv_key[0x01d] && !recv_key[0x11d] && !recv_key[0x038] && !recv_key[0x138] && !recv_key[0x051] && !recv_key[0x151]);
} }

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

@@ -268,9 +268,9 @@ extern void keyboard_get_states(uint8_t *cl, uint8_t *nl, uint8_t *sl);
extern void keyboard_set_states(uint8_t cl, uint8_t nl, uint8_t sl); extern void keyboard_set_states(uint8_t cl, uint8_t nl, uint8_t sl);
extern int keyboard_recv(uint16_t key); extern int keyboard_recv(uint16_t key);
extern int keyboard_isfsenter(void); extern int keyboard_isfsenter(void);
extern int keyboard_isfsenter_down(void); extern int keyboard_isfsenter_up(void);
extern int keyboard_isfsexit(void); extern int keyboard_isfsexit(void);
extern int keyboard_isfsexit_down(void); extern int keyboard_isfsexit_up(void);
extern int keyboard_ismsexit(void); extern int keyboard_ismsexit(void);
extern void keyboard_set_is_amstrad(int ams); extern void keyboard_set_is_amstrad(int ams);

4
src/win/win_ui.c
View File

@@ -1493,7 +1493,7 @@ ui_init(int nCmdShow)
if (!fs_off_signal && video_fullscreen && keyboard_isfsexit()) { if (!fs_off_signal && video_fullscreen && keyboard_isfsexit()) {
/* Signal "exit fullscreen mode". */ /* Signal "exit fullscreen mode". */
fs_off_signal = 1; fs_off_signal = 1;
} else if (fs_off_signal && video_fullscreen && keyboard_isfsexit_down()) { } else if (fs_off_signal && video_fullscreen && keyboard_isfsexit_up()) {
plat_setfullscreen(0); plat_setfullscreen(0);
fs_off_signal = 0; fs_off_signal = 0;
} }
@@ -1501,7 +1501,7 @@ ui_init(int nCmdShow)
if (!fs_on_signal && !video_fullscreen && keyboard_isfsenter()) { if (!fs_on_signal && !video_fullscreen && keyboard_isfsenter()) {
/* Signal "enter fullscreen mode". */ /* Signal "enter fullscreen mode". */
fs_on_signal = 1; fs_on_signal = 1;
} else if (fs_on_signal && !video_fullscreen && keyboard_isfsenter_down()) { } else if (fs_on_signal && !video_fullscreen && keyboard_isfsenter_up()) {
plat_setfullscreen(1); plat_setfullscreen(1);
fs_on_signal = 0; fs_on_signal = 0;
} }