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

Fix some bugs re vid scaling in win32 ui

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-06-05 00:05:08 -04:00
parent ef2b84ed63
commit a25d48e928
1 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/win/win_ui.c
View File

@@ -13,11 +13,13 @@
* Authors: Sarah Walker, <https://pcem-emulator.co.uk/> * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com> * Fred N. van Kempen, <decwiz@yahoo.com>
* Jasmine Iwanek, <jriwanek@gmail.com>
* *
* Copyright 2008-2020 Sarah Walker. * Copyright 2008-2020 Sarah Walker.
* Copyright 2016-2020 Miran Grca. * Copyright 2016-2020 Miran Grca.
* Copyright 2017-2020 Fred N. van Kempen. * Copyright 2017-2020 Fred N. van Kempen.
* Copyright 2019-2020 GH Cao. * Copyright 2019-2020 GH Cao.
* Copyright 2021-2023 Jasmine Iwanek.
*/ */
#include <stdatomic.h> #include <stdatomic.h>
#define UNICODE #define UNICODE
@@ -271,33 +273,33 @@ ResetAllMenus(void)
#ifdef USE_VNC #ifdef USE_VNC
CheckMenuItem(menuMain, IDM_VID_VNC, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_VNC, MF_UNCHECKED);
#endif #endif
CheckMenuItem(menuMain, IDM_VID_FS_FULL + 0, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_FS_FULL, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_FS_FULL + 1, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_FS_43, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_FS_FULL + 2, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_FS_KEEPRATIO, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_FS_FULL + 3, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_FS_INT, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_FS_FULL + 4, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_SPECIFY_DIM, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_REMEMBER, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_REMEMBER, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 0, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_SCALE_1X, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 1, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_SCALE_2X, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 2, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_SCALE_3X, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 3, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_SCALE_4X, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 4, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_SCALE_5X, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 5, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_SCALE_6X, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 6, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_SCALE_7X, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 7, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_SCALE_8X, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 8, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_SCALE_9X, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 9, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_SCALE_10X, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_HIDPI, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_HIDPI, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_CGACON, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_CGACON, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_GRAYCT_601 + 0, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_GRAYCT_601, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_GRAYCT_601 + 1, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_GRAYCT_709, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_GRAYCT_601 + 2, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_GRAYCT_AVE, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_GRAY_RGB + 0, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_GRAY_RGB, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_GRAY_RGB + 1, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_GRAY_MONO, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_GRAY_RGB + 2, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_GRAY_AMBER, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_GRAY_RGB + 3, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_GRAY_GREEN, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_GRAY_RGB + 4, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_GRAY_WHITE, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_ACTION_RCTRL_IS_LALT, rctrl_is_lalt ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(menuMain, IDM_ACTION_RCTRL_IS_LALT, rctrl_is_lalt ? MF_CHECKED : MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_ACTION_KBD_REQ_CAPTURE, kbd_req_capture ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(menuMain, IDM_ACTION_KBD_REQ_CAPTURE, kbd_req_capture ? MF_CHECKED : MF_UNCHECKED);
@@ -350,6 +352,12 @@ ResetAllMenus(void)
EnableMenuItem(menuMain, IDM_VID_SCALE_2X, MF_GRAYED); EnableMenuItem(menuMain, IDM_VID_SCALE_2X, MF_GRAYED);
EnableMenuItem(menuMain, IDM_VID_SCALE_3X, MF_GRAYED); EnableMenuItem(menuMain, IDM_VID_SCALE_3X, MF_GRAYED);
EnableMenuItem(menuMain, IDM_VID_SCALE_4X, MF_GRAYED); EnableMenuItem(menuMain, IDM_VID_SCALE_4X, MF_GRAYED);
EnableMenuItem(menuMain, IDM_VID_SCALE_5X, MF_GRAYED);
EnableMenuItem(menuMain, IDM_VID_SCALE_6X, MF_GRAYED);
EnableMenuItem(menuMain, IDM_VID_SCALE_7X, MF_GRAYED);
EnableMenuItem(menuMain, IDM_VID_SCALE_8X, MF_GRAYED);
EnableMenuItem(menuMain, IDM_VID_SCALE_9X, MF_GRAYED);
EnableMenuItem(menuMain, IDM_VID_SCALE_10X, MF_GRAYED);
} }
} }
@@ -661,6 +669,12 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
EnableMenuItem(hmenu, IDM_VID_SCALE_2X, vid_resize ? MF_GRAYED : MF_ENABLED); EnableMenuItem(hmenu, IDM_VID_SCALE_2X, vid_resize ? MF_GRAYED : MF_ENABLED);
EnableMenuItem(hmenu, IDM_VID_SCALE_3X, vid_resize ? MF_GRAYED : MF_ENABLED); EnableMenuItem(hmenu, IDM_VID_SCALE_3X, vid_resize ? MF_GRAYED : MF_ENABLED);
EnableMenuItem(hmenu, IDM_VID_SCALE_4X, vid_resize ? MF_GRAYED : MF_ENABLED); EnableMenuItem(hmenu, IDM_VID_SCALE_4X, vid_resize ? MF_GRAYED : MF_ENABLED);
EnableMenuItem(hmenu, IDM_VID_SCALE_5X, vid_resize ? MF_GRAYED : MF_ENABLED);
EnableMenuItem(hmenu, IDM_VID_SCALE_6X, vid_resize ? MF_GRAYED : MF_ENABLED);
EnableMenuItem(hmenu, IDM_VID_SCALE_7X, vid_resize ? MF_GRAYED : MF_ENABLED);
EnableMenuItem(hmenu, IDM_VID_SCALE_8X, vid_resize ? MF_GRAYED : MF_ENABLED);
EnableMenuItem(hmenu, IDM_VID_SCALE_9X, vid_resize ? MF_GRAYED : MF_ENABLED);
EnableMenuItem(hmenu, IDM_VID_SCALE_10X, vid_resize ? MF_GRAYED : MF_ENABLED);
scrnsz_x = unscaled_size_x; scrnsz_x = unscaled_size_x;
scrnsz_y = unscaled_size_y; scrnsz_y = unscaled_size_y;
@@ -757,6 +771,12 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
case IDM_VID_SCALE_2X: case IDM_VID_SCALE_2X:
case IDM_VID_SCALE_3X: case IDM_VID_SCALE_3X:
case IDM_VID_SCALE_4X: case IDM_VID_SCALE_4X:
case IDM_VID_SCALE_5X:
case IDM_VID_SCALE_6X:
case IDM_VID_SCALE_7X:
case IDM_VID_SCALE_8X:
case IDM_VID_SCALE_9X:
case IDM_VID_SCALE_10X:
CheckMenuItem(hmenu, IDM_VID_SCALE_1X + scale, MF_UNCHECKED); CheckMenuItem(hmenu, IDM_VID_SCALE_1X + scale, MF_UNCHECKED);
scale = LOWORD(wParam) - IDM_VID_SCALE_1X; scale = LOWORD(wParam) - IDM_VID_SCALE_1X;
CheckMenuItem(hmenu, IDM_VID_SCALE_1X + scale, MF_CHECKED); CheckMenuItem(hmenu, IDM_VID_SCALE_1X + scale, MF_CHECKED);
@@ -1622,14 +1642,17 @@ plat_mouse_capture(int on)
void void
ui_init_monitor(int monitor_index) ui_init_monitor(int monitor_index)
{ {
// Nothing done here yet
} }
void void
ui_deinit_monitor(int monitor_index) ui_deinit_monitor(int monitor_index)
{ {
// Nothing done here yet
} }
void void
ui_hard_reset_completed(void) ui_hard_reset_completed(void)
{ {
// Nothing done here yet
} }