8514/a in win32 UI

This commit is contained in:
Jasmine Iwanek
2022-05-22 19:37:53 -04:00
parent 825141621f
commit 3e566c2bf3
23 changed files with 38 additions and 1 deletions

View File

@@ -183,6 +183,7 @@
#define IDC_COMBO_VIDEO 1021 #define IDC_COMBO_VIDEO 1021
#define IDC_CHECK_VOODOO 1022 #define IDC_CHECK_VOODOO 1022
#define IDC_BUTTON_VOODOO 1023 #define IDC_BUTTON_VOODOO 1023
#define IDC_CHECK_IBM8514 1024
#define IDC_INPUT 1030 /* input config */ #define IDC_INPUT 1030 /* input config */
#define IDC_COMBO_MOUSE 1031 #define IDC_COMBO_MOUSE 1031

View File

@@ -271,6 +271,7 @@ END
#define STR_VIDEO "Grafika:" #define STR_VIDEO "Grafika:"
#define STR_VOODOO "Použít grafický akcelerátor Voodoo" #define STR_VOODOO "Použít grafický akcelerátor Voodoo"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Myš:" #define STR_MOUSE "Myš:"
#define STR_JOYSTICK "Joystick:" #define STR_JOYSTICK "Joystick:"

View File

@@ -271,6 +271,7 @@ END
#define STR_VIDEO "Videokarte:" #define STR_VIDEO "Videokarte:"
#define STR_VOODOO "Voodoo-Grafik" #define STR_VOODOO "Voodoo-Grafik"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Maus:" #define STR_MOUSE "Maus:"
#define STR_JOYSTICK "Joystick:" #define STR_JOYSTICK "Joystick:"

View File

@@ -265,6 +265,10 @@ BEGIN
7, 27, 199, CFG_CHECKBOX_HEIGHT 7, 27, 199, CFG_CHECKBOX_HEIGHT
PUSHBUTTON STR_CONFIGURE, IDC_BUTTON_VOODOO, PUSHBUTTON STR_CONFIGURE, IDC_BUTTON_VOODOO,
CFG_COMBO_BTN_LEFT, 25, CFG_BTN_WIDTH, CFG_BTN_HEIGHT CFG_COMBO_BTN_LEFT, 25, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
CONTROL STR_IBM8514, IDC_CHECK_IBM8514,
"Button", BS_AUTOCHECKBOX | WS_TABSTOP,
7, 46, 199, CFG_CHECKBOX_HEIGHT
END END
DLG_CFG_INPUT DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT DLG_CFG_INPUT DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT

View File

@@ -271,6 +271,7 @@ END
#define STR_VIDEO "Video:" #define STR_VIDEO "Video:"
#define STR_VOODOO "Voodoo Graphics" #define STR_VOODOO "Voodoo Graphics"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Mouse:" #define STR_MOUSE "Mouse:"
#define STR_JOYSTICK "Joystick:" #define STR_JOYSTICK "Joystick:"

View File

@@ -271,6 +271,7 @@ END
#define STR_VIDEO "Video:" #define STR_VIDEO "Video:"
#define STR_VOODOO "Voodoo Graphics" #define STR_VOODOO "Voodoo Graphics"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Mouse:" #define STR_MOUSE "Mouse:"
#define STR_JOYSTICK "Joystick:" #define STR_JOYSTICK "Joystick:"

View File

@@ -271,6 +271,7 @@ END
#define STR_VIDEO "Vídeo:" #define STR_VIDEO "Vídeo:"
#define STR_VOODOO "Voodoo Graphics" #define STR_VOODOO "Voodoo Graphics"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Ratón:" #define STR_MOUSE "Ratón:"
#define STR_JOYSTICK "Mando:" #define STR_JOYSTICK "Mando:"

View File

@@ -271,6 +271,7 @@ END
#define STR_VIDEO "Näytönohjain:" #define STR_VIDEO "Näytönohjain:"
#define STR_VOODOO "Voodoo-grafiikkasuoritin" #define STR_VOODOO "Voodoo-grafiikkasuoritin"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Hiiri:" #define STR_MOUSE "Hiiri:"
#define STR_JOYSTICK "Peliohjain:" #define STR_JOYSTICK "Peliohjain:"

View File

@@ -271,6 +271,7 @@ END
#define STR_VIDEO "Vidéo:" #define STR_VIDEO "Vidéo:"
#define STR_VOODOO "Graphique Voodoo" #define STR_VOODOO "Graphique Voodoo"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Souris:" #define STR_MOUSE "Souris:"
#define STR_JOYSTICK "Manette de commande:" #define STR_JOYSTICK "Manette de commande:"

View File

@@ -271,6 +271,7 @@ END
#define STR_VIDEO "Video:" #define STR_VIDEO "Video:"
#define STR_VOODOO "Voodoo grafika" #define STR_VOODOO "Voodoo grafika"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Miš:" #define STR_MOUSE "Miš:"
#define STR_JOYSTICK "Palica za igru:" #define STR_JOYSTICK "Palica za igru:"

View File

@@ -276,6 +276,7 @@ END
#define STR_VIDEO "Videokártya:" #define STR_VIDEO "Videokártya:"
#define STR_VOODOO "Voodoo-gyorsítókártya" #define STR_VOODOO "Voodoo-gyorsítókártya"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Egér:" #define STR_MOUSE "Egér:"
#define STR_JOYSTICK "Játékvezérlő:" #define STR_JOYSTICK "Játékvezérlő:"

View File

@@ -272,6 +272,7 @@ END
#define STR_VIDEO "Video:" #define STR_VIDEO "Video:"
#define STR_VOODOO "Grafica Voodoo" #define STR_VOODOO "Grafica Voodoo"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Mouse:" #define STR_MOUSE "Mouse:"
#define STR_JOYSTICK "Joystick:" #define STR_JOYSTICK "Joystick:"

View File

@@ -271,6 +271,7 @@ END
#define STR_VIDEO "ビデオカード:" #define STR_VIDEO "ビデオカード:"
#define STR_VOODOO "Voodooグラフィック" #define STR_VOODOO "Voodooグラフィック"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "マウス:" #define STR_MOUSE "マウス:"
#define STR_JOYSTICK "ジョイスティック:" #define STR_JOYSTICK "ジョイスティック:"

View File

@@ -271,6 +271,7 @@ END
#define STR_VIDEO "비디오 카드:" #define STR_VIDEO "비디오 카드:"
#define STR_VOODOO "Voodoo 그래픽" #define STR_VOODOO "Voodoo 그래픽"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "마우스:" #define STR_MOUSE "마우스:"
#define STR_JOYSTICK "조이스틱:" #define STR_JOYSTICK "조이스틱:"

View File

@@ -271,6 +271,7 @@ END
#define STR_VIDEO "Wideo:" #define STR_VIDEO "Wideo:"
#define STR_VOODOO "Grafika Voodoo" #define STR_VOODOO "Grafika Voodoo"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Mysz:" #define STR_MOUSE "Mysz:"
#define STR_JOYSTICK "Joystick:" #define STR_JOYSTICK "Joystick:"

View File

@@ -274,6 +274,7 @@ END
#define STR_VIDEO "Vídeo:" #define STR_VIDEO "Vídeo:"
#define STR_VOODOO "3DFX Voodoo" #define STR_VOODOO "3DFX Voodoo"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Mouse:" #define STR_MOUSE "Mouse:"
#define STR_JOYSTICK "Joystick:" #define STR_JOYSTICK "Joystick:"

View File

@@ -271,6 +271,7 @@ END
#define STR_VIDEO "Vídeo:" #define STR_VIDEO "Vídeo:"
#define STR_VOODOO "Gráficos Voodoo" #define STR_VOODOO "Gráficos Voodoo"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Rato:" #define STR_MOUSE "Rato:"
#define STR_JOYSTICK "Joystick:" #define STR_JOYSTICK "Joystick:"

View File

@@ -271,6 +271,7 @@ END
#define STR_VIDEO "Видеокарта:" #define STR_VIDEO "Видеокарта:"
#define STR_VOODOO "Ускоритель Voodoo" #define STR_VOODOO "Ускоритель Voodoo"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Мышь:" #define STR_MOUSE "Мышь:"
#define STR_JOYSTICK "Джойстик:" #define STR_JOYSTICK "Джойстик:"

View File

@@ -271,6 +271,7 @@ END
#define STR_VIDEO "Video:" #define STR_VIDEO "Video:"
#define STR_VOODOO "Voodoo grafika" #define STR_VOODOO "Voodoo grafika"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Miška:" #define STR_MOUSE "Miška:"
#define STR_JOYSTICK "Igralna palica:" #define STR_JOYSTICK "Igralna palica:"

View File

@@ -271,6 +271,7 @@ END
#define STR_VIDEO "Ekran kartı:" #define STR_VIDEO "Ekran kartı:"
#define STR_VOODOO "Voodoo Grafikleri" #define STR_VOODOO "Voodoo Grafikleri"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Fare:" #define STR_MOUSE "Fare:"
#define STR_JOYSTICK "Oyun kolu:" #define STR_JOYSTICK "Oyun kolu:"

View File

@@ -271,6 +271,7 @@ END
#define STR_VIDEO "Відеокарта:" #define STR_VIDEO "Відеокарта:"
#define STR_VOODOO "Прискорювач Voodoo" #define STR_VOODOO "Прискорювач Voodoo"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Миша:" #define STR_MOUSE "Миша:"
#define STR_JOYSTICK "Джойстик:" #define STR_JOYSTICK "Джойстик:"

View File

@@ -271,6 +271,7 @@ END
#define STR_VIDEO "显卡:" #define STR_VIDEO "显卡:"
#define STR_VOODOO "Voodoo Graphics" #define STR_VOODOO "Voodoo Graphics"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "鼠标:" #define STR_MOUSE "鼠标:"
#define STR_JOYSTICK "操纵杆:" #define STR_JOYSTICK "操纵杆:"

View File

@@ -85,7 +85,7 @@ static int temp_dynarec;
#endif #endif
/* Video category */ /* Video category */
static int temp_gfxcard, temp_voodoo; static int temp_gfxcard, temp_ibm8514, temp_voodoo;
/* Input devices category */ /* Input devices category */
static int temp_mouse, temp_joystick; static int temp_mouse, temp_joystick;
@@ -332,6 +332,7 @@ win_settings_init(void)
/* Video category */ /* Video category */
temp_gfxcard = gfxcard; temp_gfxcard = gfxcard;
temp_voodoo = voodoo_enabled; temp_voodoo = voodoo_enabled;
temp_ibm8514 = ibm8514_enabled;
/* Input devices category */ /* Input devices category */
temp_mouse = mouse_type; temp_mouse = mouse_type;
@@ -456,6 +457,7 @@ win_settings_changed(void)
/* Video category */ /* Video category */
i = i || (gfxcard != temp_gfxcard); i = i || (gfxcard != temp_gfxcard);
i = i || (voodoo_enabled != temp_voodoo); i = i || (voodoo_enabled != temp_voodoo);
i = i || (ibm8514_enabled != temp_ibm8514);
/* Input devices category */ /* Input devices category */
i = i || (mouse_type != temp_mouse); i = i || (mouse_type != temp_mouse);
@@ -546,6 +548,7 @@ win_settings_save(void)
/* Video category */ /* Video category */
gfxcard = temp_gfxcard; gfxcard = temp_gfxcard;
voodoo_enabled = temp_voodoo; voodoo_enabled = temp_voodoo;
ibm8514_enabled = temp_ibm8514;
/* Input devices category */ /* Input devices category */
mouse_type = temp_mouse; mouse_type = temp_mouse;
@@ -1106,9 +1109,13 @@ win_settings_video_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
settings_enable_window(hdlg, IDC_COMBO_VIDEO, !machine_has_flags(temp_machine, MACHINE_VIDEO_ONLY)); settings_enable_window(hdlg, IDC_COMBO_VIDEO, !machine_has_flags(temp_machine, MACHINE_VIDEO_ONLY));
e = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO)]; e = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO)];
settings_enable_window(hdlg, IDC_CONFIGURE_VID, video_card_has_config(e)); settings_enable_window(hdlg, IDC_CONFIGURE_VID, video_card_has_config(e));
settings_enable_window(hdlg, IDC_CHECK_VOODOO, machine_has_bus(temp_machine, MACHINE_BUS_PCI)); settings_enable_window(hdlg, IDC_CHECK_VOODOO, machine_has_bus(temp_machine, MACHINE_BUS_PCI));
settings_set_check(hdlg, IDC_CHECK_VOODOO, temp_voodoo); settings_set_check(hdlg, IDC_CHECK_VOODOO, temp_voodoo);
settings_enable_window(hdlg, IDC_BUTTON_VOODOO, machine_has_bus(temp_machine, MACHINE_BUS_PCI) && temp_voodoo); settings_enable_window(hdlg, IDC_BUTTON_VOODOO, machine_has_bus(temp_machine, MACHINE_BUS_PCI) && temp_voodoo);
settings_enable_window(hdlg, IDC_CHECK_IBM8514, machine_has_bus(temp_machine, MACHINE_BUS_ISA16) || machine_has_bus(temp_machine, MACHINE_BUS_MCA));
settings_set_check(hdlg, IDC_CHECK_IBM8514, temp_ibm8514);
return TRUE; return TRUE;
case WM_COMMAND: case WM_COMMAND:
@@ -1123,6 +1130,10 @@ win_settings_video_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
settings_enable_window(hdlg, IDC_BUTTON_VOODOO, temp_voodoo); settings_enable_window(hdlg, IDC_BUTTON_VOODOO, temp_voodoo);
break; break;
case IDC_CHECK_IBM8514:
temp_ibm8514 = settings_get_check(hdlg, IDC_CHECK_IBM8514);
break;
case IDC_BUTTON_VOODOO: case IDC_BUTTON_VOODOO:
temp_deviceconfig |= deviceconfig_open(hdlg, (void *)&voodoo_device); temp_deviceconfig |= deviceconfig_open(hdlg, (void *)&voodoo_device);
break; break;
@@ -1137,6 +1148,7 @@ win_settings_video_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
case WM_SAVESETTINGS: case WM_SAVESETTINGS:
temp_gfxcard = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO)]; temp_gfxcard = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO)];
temp_voodoo = settings_get_check(hdlg, IDC_CHECK_VOODOO); temp_voodoo = settings_get_check(hdlg, IDC_CHECK_VOODOO);
temp_ibm8514 = settings_get_check(hdlg, IDC_CHECK_IBM8514);
default: default:
return FALSE; return FALSE;