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

Merge remote-tracking branch 'upstream/master' into hdd-speed

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-11-08 13:58:05 -05:00
parent 40d39f1baa 14fa9649a8
commit 9291b184fe
26 changed files with 217 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
src/include/86box/resource.h
View File

@@ -71,87 +71,89 @@
#define IDT_MEMORY 1714 /* Memory: */
/* DLG_CFG_VIDEO */
#define IDT_VIDEO 1715 /* Video: */
#define IDT_VIDEO 1715 /* Video: */
#define IDT_VIDEO_2 1716 /* Video 2: */
/* DLG_CFG_INPUT */
#define IDT_MOUSE 1716 /* Mouse: */
#define IDT_JOYSTICK 1717 /* Joystick: */
#define IDT_MOUSE 1717 /* Mouse: */
#define IDT_JOYSTICK 1718 /* Joystick: */
/* DLG_CFG_SOUND */
#define IDT_SOUND 1718 /* Sound card: */
#define IDT_MIDI_OUT 1719 /* MIDI Out Device: */
#define IDT_MIDI_IN 1720 /* MIDI In Device: */
#define IDT_SOUND 1719 /* Sound card: */
#define IDT_MIDI_OUT 1720 /* MIDI Out Device: */
#define IDT_MIDI_IN 1721 /* MIDI In Device: */
/* DLG_CFG_NETWORK */
#define IDT_NET_TYPE 1721 /* Network type: */
#define IDT_PCAP 1722 /* PCap device: */
#define IDT_NET 1723 /* Network adapter: */
#define IDT_NET_TYPE 1722 /* Network type: */
#define IDT_PCAP 1723 /* PCap device: */
#define IDT_NET 1724 /* Network adapter: */
/* DLG_CFG_PORTS */
#define IDT_COM1 1724 /* COM1 Device: */
#define IDT_COM2 1725 /* COM1 Device: */
#define IDT_COM3 1726 /* COM1 Device: */
#define IDT_COM4 1727 /* COM1 Device: */
#define IDT_COM1 1725 /* COM1 Device: */
#define IDT_COM2 1726 /* COM1 Device: */
#define IDT_COM3 1727 /* COM1 Device: */
#define IDT_COM4 1728 /* COM1 Device: */
#define IDT_LPT1 1728 /* LPT1 Device: */
#define IDT_LPT2 1729 /* LPT2 Device: */
#define IDT_LPT3 1730 /* LPT3 Device: */
#define IDT_LPT4 1731 /* LPT4 Device: */
#define IDT_LPT1 1729 /* LPT1 Device: */
#define IDT_LPT2 1730 /* LPT2 Device: */
#define IDT_LPT3 1731 /* LPT3 Device: */
#define IDT_LPT4 1732 /* LPT4 Device: */
/* DLG_CFG_STORAGE */
#define IDT_HDC 1732 /* HD Controller: */
#define IDT_FDC 1733 /* Ext FD Controller: */
#define IDT_SCSI_1 1734 /* SCSI Board #1: */
#define IDT_SCSI_2 1735 /* SCSI Board #2: */
#define IDT_SCSI_3 1736 /* SCSI Board #3: */
#define IDT_SCSI_4 1737 /* SCSI Board #4: */
#define IDT_HDC 1733 /* HD Controller: */
#define IDT_FDC 1734 /* Ext FD Controller: */
#define IDT_SCSI_1 1735 /* SCSI Board #1: */
#define IDT_SCSI_2 1736 /* SCSI Board #2: */
#define IDT_SCSI_3 1737 /* SCSI Board #3: */
#define IDT_SCSI_4 1738 /* SCSI Board #4: */
/* DLG_CFG_HARD_DISKS */
#define IDT_HDD 1738 /* Hard disks: */
#define IDT_BUS 1739 /* Bus: */
#define IDT_CHANNEL 1740 /* Channel: */
#define IDT_ID 1741 /* ID: */
#define IDT_LUN 1742 /* LUN: */
#define IDT_HDD 1739 /* Hard disks: */
#define IDT_BUS 1740 /* Bus: */
#define IDT_CHANNEL 1741 /* Channel: */
#define IDT_ID 1742 /* ID: */
#define IDT_LUN 1743 /* LUN: */
/* DLG_CFG_HARD_DISKS_ADD */
#define IDT_SECTORS 1743 /* Sectors: */
#define IDT_HEADS 1744 /* Heads: */
#define IDT_CYLS 1745 /* Cylinders: */
#define IDT_SIZE_MB 1746 /* Size (MB): */
#define IDT_TYPE 1747 /* Type: */
#define IDT_FILE_NAME 1748 /* File name: */
#define IDT_IMG_FORMAT 1749 /* Image Format: */
#define IDT_BLOCK_SIZE 1750 /* Block Size: */
#define IDT_PROGRESS 1751 /* Progress: */
#define IDT_SECTORS 1744 /* Sectors: */
#define IDT_HEADS 1745 /* Heads: */
#define IDT_CYLS 1746 /* Cylinders: */
#define IDT_SIZE_MB 1747 /* Size (MB): */
#define IDT_TYPE 1748 /* Type: */
#define IDT_FILE_NAME 1749 /* File name: */
#define IDT_IMG_FORMAT 1750 /* Image Format: */
#define IDT_BLOCK_SIZE 1751 /* Block Size: */
#define IDT_PROGRESS 1752 /* Progress: */
/* DLG_CFG_FLOPPY_AND_CDROM_DRIVES */
#define IDT_FLOPPY_DRIVES 1752 /* Floppy drives: */
#define IDT_FDD_TYPE 1753 /* Type: */
#define IDT_CD_DRIVES 1754 /* CD-ROM drives: */
#define IDT_CD_BUS 1755 /* Bus: */
#define IDT_CD_ID 1756 /* ID: */
#define IDT_CD_CHANNEL 1757 /* Channel: */
#define IDT_CD_SPEED 1758 /* Speed: */
#define IDT_FLOPPY_DRIVES 1753 /* Floppy drives: */
#define IDT_FDD_TYPE 1754 /* Type: */
#define IDT_CD_DRIVES 1755 /* CD-ROM drives: */
#define IDT_CD_BUS 1756 /* Bus: */
#define IDT_CD_ID 1757 /* ID: */
#define IDT_CD_LUN 1758 /* LUN: */
#define IDT_CD_CHANNEL 1759 /* Channel: */
#define IDT_CD_SPEED 1760 /* Speed: */
/* DLG_CFG_OTHER_REMOVABLE_DEVICES */
#define IDT_MO_DRIVES 1760 /* MO drives: */
#define IDT_MO_BUS 1761 /* Bus: */
#define IDT_MO_ID 1762 /* ID: */
#define IDT_MO_CHANNEL 1763 /* Channel */
#define IDT_MO_TYPE 1764 /* Type: */
#define IDT_MO_DRIVES 1761 /* MO drives: */
#define IDT_MO_BUS 1762 /* Bus: */
#define IDT_MO_ID 1763 /* ID: */
#define IDT_MO_CHANNEL 1764 /* Channel */
#define IDT_MO_TYPE 1765 /* Type: */
#define IDT_ZIP_DRIVES 1765 /* ZIP drives: */
#define IDT_ZIP_BUS 1766 /* Bus: */
#define IDT_ZIP_ID 1767 /* ID: */
#define IDT_ZIP_LUN 1768 /* LUN: */
#define IDT_ZIP_CHANNEL 1769 /* Channel: */
#define IDT_ZIP_DRIVES 1766 /* ZIP drives: */
#define IDT_ZIP_BUS 1767 /* Bus: */
#define IDT_ZIP_ID 1768 /* ID: */
#define IDT_ZIP_LUN 1769 /* LUN: */
#define IDT_ZIP_CHANNEL 1770 /* Channel: */
/* DLG_CFG_PERIPHERALS */
#define IDT_ISARTC 1770 /* ISA RTC: */
#define IDT_ISAMEM_1 1771 /* ISAMEM Board #1: */
#define IDT_ISAMEM_2 1772 /* ISAMEM Board #2: */
#define IDT_ISAMEM_3 1773 /* ISAMEM Board #3: */
#define IDT_ISAMEM_4 1774 /* ISAMEM Board #4: */
#define IDT_ISARTC 1771 /* ISA RTC: */
#define IDT_ISAMEM_1 1772 /* ISAMEM Board #1: */
#define IDT_ISAMEM_2 1773 /* ISAMEM Board #2: */
#define IDT_ISAMEM_3 1774 /* ISAMEM Board #3: */
#define IDT_ISAMEM_4 1775 /* ISAMEM Board #4: */
/*
* To try to keep these organized, we now group the
@@ -181,11 +183,13 @@
#define IDC_VIDEO 1020 /* video config */
#define IDC_COMBO_VIDEO 1021
#define IDC_CHECK_VOODOO 1022
#define IDC_BUTTON_VOODOO 1023
#define IDC_CHECK_IBM8514 1024
#define IDC_CHECK_XGA 1025
#define IDC_BUTTON_XGA 1026
#define IDC_VIDEO_2 1022
#define IDC_COMBO_VIDEO_2 1023
#define IDC_CHECK_VOODOO 1024
#define IDC_BUTTON_VOODOO 1025
#define IDC_CHECK_IBM8514 1026
#define IDC_CHECK_XGA 1027
#define IDC_BUTTON_XGA 1028
#define IDC_INPUT 1030 /* input config */
#define IDC_COMBO_MOUSE 1031
@@ -323,19 +327,20 @@
/* For the DeviceConfig code, re-do later. */
#define IDC_CONFIG_BASE 1300
#define IDC_CONFIGURE_VID 1300
#define IDC_CONFIGURE_SND 1301
#define IDC_CONFIGURE_VOODOO 1302
#define IDC_CONFIGURE_MOD 1303
#define IDC_CONFIGURE_NET_TYPE 1304
#define IDC_CONFIGURE_BUSLOGIC 1305
#define IDC_CONFIGURE_PCAP 1306
#define IDC_CONFIGURE_NET 1307
#define IDC_CONFIGURE_MIDI_OUT 1308
#define IDC_CONFIGURE_MIDI_IN 1309
#define IDC_JOY1 1310
#define IDC_JOY2 1311
#define IDC_JOY3 1312
#define IDC_JOY4 1313
#define IDC_CONFIGURE_VID_2 1301
#define IDC_CONFIGURE_SND 1302
#define IDC_CONFIGURE_VOODOO 1303
#define IDC_CONFIGURE_MOD 1304
#define IDC_CONFIGURE_NET_TYPE 1305
#define IDC_CONFIGURE_BUSLOGIC 1306
#define IDC_CONFIGURE_PCAP 1307
#define IDC_CONFIGURE_NET 1308
#define IDC_CONFIGURE_MIDI_OUT 1309
#define IDC_CONFIGURE_MIDI_IN 1310
#define IDC_JOY1 1311
#define IDC_JOY2 1312
#define IDC_JOY3 1313
#define IDC_JOY4 1314
#define IDC_HDTYPE 1380
#define IDC_RENDER 1381
#define IDC_STATUS 1382
@@ -366,8 +371,9 @@
#define IDM_VID_HIDE_TOOLBAR 40023
#define IDM_UPDATE_ICONS 40030
#define IDM_SND_GAIN 40031
#define IDM_VID_RESIZE 40040
#define IDM_VID_REMEMBER 40041
#define IDM_VID_MONITORS 40040
#define IDM_VID_RESIZE 40041
#define IDM_VID_REMEMBER 40042
#define IDM_VID_SDL_SW 40050
#define IDM_VID_SDL_HW 40051
#define IDM_VID_SDL_OPENGL 40052

3
src/include/86box/win.h
View File

@@ -104,7 +104,8 @@ extern "C" {
extern HINSTANCE hinstance;
extern HWND hwndMain,
hwndRender;
hwndRender,
hwndRender2;
extern HANDLE ghMutex;
extern HICON hIcon[256];
extern int dpi;

2
src/win/languages/cs-CZ.rc
View File

@@ -34,6 +34,7 @@ BEGIN
MENUITEM "&Schovat stavový řádek", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Schovat panel &nástrojů", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR
MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
MENUITEM "&Měnitelná velikost okna", IDM_VID_RESIZE
MENUITEM "&Pamatovat velikost a pozici", IDM_VID_REMEMBER
MENUITEM SEPARATOR
@@ -271,6 +272,7 @@ END
#define STR_DYNAREC "Dynamický překladač"
#define STR_VIDEO "Grafika:"
#define STR_VIDEO_2 "Grafika 2:"
#define STR_VOODOO "Použít grafický akcelerátor Voodoo"
#define STR_IBM8514 "Grafika IBM 8514/a"
#define STR_XGA "Grafika XGA"

4
src/win/languages/de-DE.rc
View File

@@ -34,6 +34,7 @@ BEGIN
MENUITEM "&Statusleiste ausblenden", IDM_VID_HIDE_STATUS_BAR
MENUITEM "&Werkzeugleiste ausblenden", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR
MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
MENUITEM "&Größenverstellbares Fenster", IDM_VID_RESIZE
MENUITEM "&Größe && Position merken", IDM_VID_REMEMBER
MENUITEM SEPARATOR
@@ -271,6 +272,7 @@ END
#define STR_DYNAREC "Dynamischer Recompiler"
#define STR_VIDEO "Videokarte:"
#define STR_VIDEO_2 "Videokarte 2:"
#define STR_VOODOO "Voodoo-Grafik"
#define STR_IBM8514 "IBM 8514/a-Grafik"
#define STR_XGA "XGA-Grafik"
@@ -347,7 +349,7 @@ END
#define STR_TURBO "Turbo-Timings"
#define STR_CHECKBPB "BPB überprüfen"
#define STR_CDROM_DRIVES "CD-ROM-Laufwerke:"
#define STR_CD_SPEED "Takt:"
#define STR_CD_SPEED "Geschwindigkeit:"
#define STR_EARLY "Früheres Laufwerk"
#define STR_MO_DRIVES "MO-Laufwerke:"

19
src/win/languages/dialogs.rc
View File

@@ -260,21 +260,29 @@ BEGIN
PUSHBUTTON STR_CONFIGURE, IDC_CONFIGURE_VID,
CFG_COMBO_BTN_LEFT, 6, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
LTEXT STR_VIDEO_2, IDT_VIDEO_2,
CFG_HMARGIN, 28, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
COMBOBOX IDC_COMBO_VIDEO_2,
CFG_COMBO_BOX_LEFT, 26, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON STR_CONFIGURE, IDC_CONFIGURE_VID_2,
CFG_COMBO_BTN_LEFT, 25, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
CONTROL STR_VOODOO, IDC_CHECK_VOODOO,
"Button", BS_AUTOCHECKBOX | WS_TABSTOP,
7, 27, 199, CFG_CHECKBOX_HEIGHT
CFG_HMARGIN, 47, 199, CFG_CHECKBOX_HEIGHT
PUSHBUTTON STR_CONFIGURE, IDC_BUTTON_VOODOO,
CFG_COMBO_BTN_LEFT, 25, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
CFG_COMBO_BTN_LEFT, 45, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
CONTROL STR_IBM8514, IDC_CHECK_IBM8514,
"Button", BS_AUTOCHECKBOX | WS_TABSTOP,
7, 46, 199, CFG_CHECKBOX_HEIGHT
CFG_HMARGIN, 66, 199, CFG_CHECKBOX_HEIGHT
CONTROL STR_XGA, IDC_CHECK_XGA,
"Button", BS_AUTOCHECKBOX | WS_TABSTOP,
7, 65, 199, CFG_CHECKBOX_HEIGHT
CFG_HMARGIN, 85, 199, CFG_CHECKBOX_HEIGHT
PUSHBUTTON STR_CONFIGURE, IDC_BUTTON_XGA,
CFG_COMBO_BTN_LEFT, 64, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
CFG_COMBO_BTN_LEFT, 84, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
END
DLG_CFG_INPUT DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT
@@ -938,6 +946,7 @@ END
#undef STR_DYNAREC
#undef STR_VIDEO
#undef STR_VIDEO_2
#undef STR_VOODOO
#undef STR_IBM8514
#undef STR_XGA

2
src/win/languages/en-GB.rc
View File

@@ -34,6 +34,7 @@ BEGIN
MENUITEM "&Hide status bar", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR
MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
MENUITEM "&Resizeable window", IDM_VID_RESIZE
MENUITEM "R&emember size && position", IDM_VID_REMEMBER
MENUITEM SEPARATOR
@@ -271,6 +272,7 @@ END
#define STR_DYNAREC "Dynamic Recompiler"
#define STR_VIDEO "Video:"
#define STR_VIDEO_2 "Video 2:"
#define STR_VOODOO "Voodoo Graphics"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_XGA "XGA Graphics"

2
src/win/languages/en-US.rc
View File

@@ -34,6 +34,7 @@ BEGIN
MENUITEM "&Hide status bar", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR
MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
MENUITEM "&Resizeable window", IDM_VID_RESIZE
MENUITEM "R&emember size && position", IDM_VID_REMEMBER
MENUITEM SEPARATOR
@@ -271,6 +272,7 @@ END
#define STR_DYNAREC "Dynamic Recompiler"
#define STR_VIDEO "Video:"
#define STR_VIDEO_2 "Video 2:"
#define STR_VOODOO "Voodoo Graphics"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_XGA "XGA Graphics"

2
src/win/languages/es-ES.rc
View File

@@ -34,6 +34,7 @@ BEGIN
MENUITEM "&Ocultar barra de estado", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR
MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
MENUITEM "&Ventana redimensionable", IDM_VID_RESIZE
MENUITEM "&Recordar tamaño y posición", IDM_VID_REMEMBER
MENUITEM SEPARATOR
@@ -271,6 +272,7 @@ END
#define STR_DYNAREC "Recompilador Dinámico"
#define STR_VIDEO "Vídeo:"
#define STR_VIDEO_2 "Vídeo 2:"
#define STR_VOODOO "Voodoo Graphics"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_XGA "XGA Graphics"

2
src/win/languages/fi-FI.rc
View File

@@ -34,6 +34,7 @@ BEGIN
MENUITEM "&Piilota tilapalkki", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Piilota &työkalupalkki", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR
MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
MENUITEM "&Salli koon muuttaminen", IDM_VID_RESIZE
MENUITEM "&Muista koko ja sijainti", IDM_VID_REMEMBER
MENUITEM SEPARATOR
@@ -271,6 +272,7 @@ END
#define STR_DYNAREC "Dynaaminen uudelleenkääntäjä"
#define STR_VIDEO "Näytönohjain:"
#define STR_VIDEO_2 "Näytönohjain 2:"
#define STR_VOODOO "Voodoo-grafiikkasuoritin"
#define STR_IBM8514 "IBM 8514/a-grafiikkasuoritin"
#define STR_XGA "XGA-grafiikkasuoritin"

2
src/win/languages/fr-FR.rc
View File

@@ -34,6 +34,7 @@ BEGIN
MENUITEM "&Masquer la barre de status", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR
MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
MENUITEM "Fenètre &Retaillable", IDM_VID_RESIZE
MENUITEM "S&auvegarder taille && position", IDM_VID_REMEMBER
MENUITEM SEPARATOR
@@ -271,6 +272,7 @@ END
#define STR_DYNAREC "Recompilateur dynamique"
#define STR_VIDEO "Vidéo:"
#define STR_VIDEO_2 "Vidéo 2:"
#define STR_VOODOO "Graphique Voodoo"
#define STR_IBM8514 "Graphique IBM 8514/a"
#define STR_XGA "Graphique XGA"

2
src/win/languages/hr-HR.rc
View File

@@ -34,6 +34,7 @@ BEGIN
MENUITEM "&Sakrij statusni redak", IDM_VID_HIDE_STATUS_BAR
MENUITEM "&Sakrij alatni redak", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR
MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
MENUITEM "&Prozor s promjenjivim veličinama", IDM_VID_RESIZE
MENUITEM "&Zapamtite veličinu i položaj", IDM_VID_REMEMBER
MENUITEM SEPARATOR
@@ -271,6 +272,7 @@ END
#define STR_DYNAREC "Dinamički rekompilator"
#define STR_VIDEO "Video:"
#define STR_VIDEO_2 "Video 2:"
#define STR_VOODOO "Voodoo grafika"
#define STR_IBM8514 "IBM 8514/a grafika"
#define STR_XGA "XGA grafika"

2
src/win/languages/hu-HU.rc
View File

@@ -39,6 +39,7 @@ BEGIN
MENUITEM "Állapotsor &elrejtése", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR
MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
MENUITEM "&Átméretezhető ablak", IDM_VID_RESIZE
MENUITEM "Méret és pozíció &megjegyzése", IDM_VID_REMEMBER
MENUITEM SEPARATOR
@@ -276,6 +277,7 @@ END
#define STR_DYNAREC "Dinamikus újrafordítás"
#define STR_VIDEO "Videokártya:"
#define STR_VIDEO_2 "Videokártya 2:"
#define STR_VOODOO "Voodoo-gyorsítókártya"
#define STR_IBM8514 "IBM 8514/a-gyorsítókártya"
#define STR_XGA "XGA-gyorsítókártya"

2
src/win/languages/it-IT.rc
View File

@@ -35,6 +35,7 @@ BEGIN
MENUITEM "&Nascondi barra di stato", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR
MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
MENUITEM "&Finestra ridimensionabile", IDM_VID_RESIZE
MENUITEM "R&icorda dimensioni e posizione", IDM_VID_REMEMBER
MENUITEM SEPARATOR
@@ -272,6 +273,7 @@ END
#define STR_DYNAREC "Ricompilatore dinamico"
#define STR_VIDEO "Video:"
#define STR_VIDEO_2 "Video 2:"
#define STR_VOODOO "Grafica Voodoo"
#define STR_IBM8514 "Grafica IBM 8514/a"
#define STR_XGA "Grafica XGA"

2
src/win/languages/ja-JP.rc
View File

@@ -34,6 +34,7 @@ BEGIN
MENUITEM "ステータスバーを隠す(&H)", IDM_VID_HIDE_STATUS_BAR
MENUITEM "ツールバーを隠す(&T)", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR
MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
MENUITEM "ウィンドウのサイズをリサイズ可能(&R)", IDM_VID_RESIZE
MENUITEM "ウィンドウのサイズと位置を記憶(&E)", IDM_VID_REMEMBER
MENUITEM SEPARATOR
@@ -271,6 +272,7 @@ END
#define STR_DYNAREC "動的リコンパイラ"
#define STR_VIDEO "ビデオカード:"
#define STR_VIDEO_2 "ビデオカード 2:"
#define STR_VOODOO "Voodooグラフィック"
#define STR_IBM8514 "IBM 8514/aグラフィック"
#define STR_XGA "XGAグラフィック"

2
src/win/languages/ko-KR.rc
View File

@@ -34,6 +34,7 @@ BEGIN
MENUITEM "상태 바 숨기기(&H)", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR
MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
MENUITEM "창 크기 조절 가능하게 하기(&R)", IDM_VID_RESIZE
MENUITEM "창 크기와 위치를 기억하기(&E)", IDM_VID_REMEMBER
MENUITEM SEPARATOR
@@ -271,6 +272,7 @@ END
#define STR_DYNAREC "동적 재컴파일"
#define STR_VIDEO "비디오 카드:"
#define STR_VIDEO_2 "비디오 카드 2:"
#define STR_VOODOO "Voodoo 그래픽"
#define STR_IBM8514 "IBM 8514/a 그래픽"
#define STR_XGA "XGA 그래픽"

2
src/win/languages/pl-PL.rc
View File

@@ -34,6 +34,7 @@ BEGIN
MENUITEM "&Ukryj pasek statusu", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Ukryj &pasek narzędzi", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR
MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
MENUITEM "&Okno o zmiennym rozmiarze", IDM_VID_RESIZE
MENUITEM "P&amiętaj rozmiar &i pozycję", IDM_VID_REMEMBER
MENUITEM SEPARATOR
@@ -271,6 +272,7 @@ END
#define STR_DYNAREC "Dynamiczny rekompilator"
#define STR_VIDEO "Wideo:"
#define STR_VIDEO_2 "Wideo 2:"
#define STR_VOODOO "Grafika Voodoo"
#define STR_IBM8514 "Grafika IBM 8514/a"
#define STR_XGA "Grafika XGA"

2
src/win/languages/pt-BR.rc
View File

@@ -37,6 +37,7 @@ BEGIN
MENUITEM "&Ocultar barra de status", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Ocultar &barra de ferramenta", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR
MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
MENUITEM "&Janela redimensionável", IDM_VID_RESIZE
MENUITEM "&Lembrar tamanho e posição", IDM_VID_REMEMBER
MENUITEM SEPARATOR
@@ -274,6 +275,7 @@ END
#define STR_DYNAREC "Recompilador dinâmico"
#define STR_VIDEO "Vídeo:"
#define STR_VIDEO_2 "Vídeo 2:"
#define STR_VOODOO "3DFX Voodoo"
#define STR_IBM8514 "Gráficos IBM 8514/a"
#define STR_XGA "Gráficos XGA"

2
src/win/languages/pt-PT.rc
View File

@@ -34,6 +34,7 @@ BEGIN
MENUITEM "&Ocultar barra de estado", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR
MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
MENUITEM "&Janela redimensionável", IDM_VID_RESIZE
MENUITEM "&Lembrar tamanho e posição", IDM_VID_REMEMBER
MENUITEM SEPARATOR
@@ -271,6 +272,7 @@ END
#define STR_DYNAREC "Recompilador dinâmico"
#define STR_VIDEO "Vídeo:"
#define STR_VIDEO_2 "Vídeo 2:"
#define STR_VOODOO "Gráficos Voodoo"
#define STR_IBM8514 "Gráficos IBM 8514/a"
#define STR_XGA "Gráficos XGA"

2
src/win/languages/ru-RU.rc
View File

@@ -34,6 +34,7 @@ BEGIN
MENUITEM "&Скрыть строку состояния", IDM_VID_HIDE_STATUS_BAR
MENUITEM "С&крыть панель инструментов", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR
MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
MENUITEM "&Изменяемый размер окна", IDM_VID_RESIZE
MENUITEM "&Запомнить размер и положение", IDM_VID_REMEMBER
MENUITEM SEPARATOR
@@ -271,6 +272,7 @@ END
#define STR_DYNAREC "Динамический рекомпилятор"
#define STR_VIDEO "Видеокарта:"
#define STR_VIDEO_2 "Видеокарта 2:"
#define STR_VOODOO "Ускоритель Voodoo"
#define STR_IBM8514 "Ускоритель IBM 8514/a"
#define STR_XGA "Ускоритель XGA"

2
src/win/languages/sl-SI.rc
View File

@@ -34,6 +34,7 @@ BEGIN
MENUITEM "&Skrij statusno vrstico", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR
MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
MENUITEM "S&premenljiva velikost okna", IDM_VID_RESIZE
MENUITEM "&Zapomni si velikost in položaj", IDM_VID_REMEMBER
MENUITEM SEPARATOR
@@ -271,6 +272,7 @@ END
#define STR_DYNAREC "Dinamični prevajalnik"
#define STR_VIDEO "Video:"
#define STR_VIDEO_2 "Video 2:"
#define STR_VOODOO "Voodoo grafika"
#define STR_IBM8514 "IBM 8514/a grafika"
#define STR_XGA "XGA grafika"

2
src/win/languages/tr-TR.rc
View File

@@ -34,6 +34,7 @@ BEGIN
MENUITEM "&Durum çubuğunu gizle", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR
MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
MENUITEM "&Yeniden boyutlandırılabilir pencere", IDM_VID_RESIZE
MENUITEM "&Pencere boyut ve pozisyonunu hatırla", IDM_VID_REMEMBER
MENUITEM SEPARATOR
@@ -271,6 +272,7 @@ END
#define STR_DYNAREC "Dinamik Derleyici"
#define STR_VIDEO "Ekran kartı:"
#define STR_VIDEO_2 "Ekran kartı 2:"
#define STR_VOODOO "Voodoo Grafikleri"
#define STR_IBM8514 "IBM 8514/a Grafikleri"
#define STR_XGA "XGA Grafikleri"

2
src/win/languages/uk-UA.rc
View File

@@ -34,6 +34,7 @@ BEGIN
MENUITEM "&Приховати рядок стану", IDM_VID_HIDE_STATUS_BAR
MENUITEM "&Приховати панель інструментів", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR
MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
MENUITEM "&Змінний розмір вікна", IDM_VID_RESIZE
MENUITEM "&Запам'ятати розмір і становище", IDM_VID_REMEMBER
MENUITEM SEPARATOR
@@ -271,6 +272,7 @@ END
#define STR_DYNAREC "Динамічний рекомпілятор"
#define STR_VIDEO "Відеокарта:"
#define STR_VIDEO_2 "Відеокарта 2:"
#define STR_VOODOO "Прискорювач Voodoo"
#define STR_IBM8514 "Прискорювач IBM 8514/a"
#define STR_XGA "Прискорювач XGA"

2
src/win/languages/zh-CN.rc
View File

@@ -34,6 +34,7 @@ BEGIN
MENUITEM "隐藏状态栏(&H)", IDM_VID_HIDE_STATUS_BAR
MENUITEM "隐藏工具栏(&T)", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR
MENUITEM "Show non-primary monitors(&S)", IDM_VID_MONITORS
MENUITEM "窗口大小可调(&R)", IDM_VID_RESIZE
MENUITEM "记住窗口大小和位置(&E)", IDM_VID_REMEMBER
MENUITEM SEPARATOR
@@ -271,6 +272,7 @@ END
#define STR_DYNAREC "动态重编译器"
#define STR_VIDEO "显卡:"
#define STR_VIDEO_2 "显卡 2:"
#define STR_VOODOO "Voodoo Graphics"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_XGA "XGA Graphics"

2
src/win/languages/zh-TW.rc
View File

@@ -34,6 +34,7 @@ BEGIN
MENUITEM "隱藏狀態列(&H)", IDM_VID_HIDE_STATUS_BAR
MENUITEM "隱藏工具列(&T)", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR
MENUITEM "Show non-primary monitors(&S)", IDM_VID_MONITORS
MENUITEM "視窗大小可調(&R)", IDM_VID_RESIZE
MENUITEM "記住視窗大小和位置(&E)", IDM_VID_REMEMBER
MENUITEM SEPARATOR
@@ -271,6 +272,7 @@ END
#define STR_DYNAREC "動態重編譯器"
#define STR_VIDEO "顯示卡:"
#define STR_VIDEO_2 "顯示卡 2:"
#define STR_VOODOO "Voodoo Graphics"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_XGA "XGA Graphics"

69
src/win/win_settings.c
View File

@@ -88,7 +88,7 @@ static int temp_dynarec;
#endif
/* Video category */
static int temp_gfxcard, temp_ibm8514, temp_voodoo, temp_xga;
static int temp_gfxcard, temp_gfxcard_2, temp_ibm8514, temp_voodoo, temp_xga;
/* Input devices category */
static int temp_mouse, temp_joystick;
@@ -320,6 +320,7 @@ win_settings_init(void)
/* Video category */
temp_gfxcard = gfxcard;
temp_gfxcard_2 = gfxcard_2;
temp_voodoo = voodoo_enabled;
temp_ibm8514 = ibm8514_enabled;
temp_xga = xga_enabled;
@@ -446,6 +447,7 @@ win_settings_changed(void)
/* Video category */
i = i || (gfxcard != temp_gfxcard);
i = i || (gfxcard_2 != temp_gfxcard_2);
i = i || (voodoo_enabled != temp_voodoo);
i = i || (ibm8514_enabled != temp_ibm8514);
i = i || (xga_enabled != temp_xga);
@@ -538,6 +540,7 @@ win_settings_save(void)
/* Video category */
gfxcard = temp_gfxcard;
gfxcard_2 = temp_gfxcard_2;
voodoo_enabled = temp_voodoo;
ibm8514_enabled = temp_ibm8514;
xga_enabled = temp_xga;
@@ -1057,6 +1060,7 @@ win_settings_video_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
switch (message) {
case WM_INITDIALOG:
// Primary Video Card
settings_reset_content(hdlg, IDC_COMBO_VIDEO);
while (1) {
@@ -1072,9 +1076,9 @@ win_settings_video_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
break;
if (video_card_available(c) && device_is_valid(video_card_getdevice(c), temp_machine)) {
if (c == 0)
if (c == 0) // "None"
settings_add_string(hdlg, IDC_COMBO_VIDEO, win_get_string(IDS_2103));
else if (c == 1)
else if (c == 1) // "Internal"
settings_add_string(hdlg, IDC_COMBO_VIDEO, win_get_string(IDS_2118));
else
settings_add_string(hdlg, IDC_COMBO_VIDEO, (LPARAM) device_name);
@@ -1093,6 +1097,46 @@ win_settings_video_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
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));
// Secondary Video Card
c = 0;
settings_reset_content(hdlg, IDC_COMBO_VIDEO_2);
while (1) {
/* Skip "internal" if machine doesn't have it. */
if ((c == 1) && !machine_has_flags(temp_machine, MACHINE_VIDEO)) {
c++;
continue;
}
generate_device_name(video_card_getdevice(c), video_get_internal_name(c), 1);
if (!device_name[0])
break;
if (video_card_available(c) &&
device_is_valid(video_card_getdevice(c), temp_machine) &&
!(video_card_get_flags(c) == video_card_get_flags(gfxcard))) {
if (c == 0) // "None"
settings_add_string(hdlg, IDC_COMBO_VIDEO_2, win_get_string(IDS_2103));
else if (c == 1) // "Internal"
settings_add_string(hdlg, IDC_COMBO_VIDEO_2, win_get_string(IDS_2118));
else
settings_add_string(hdlg, IDC_COMBO_VIDEO_2, (LPARAM) device_name);
settings_list_to_device[1][d] = c;
if ((c == 0) || (c == temp_gfxcard_2))
settings_set_cur_sel(hdlg, IDC_COMBO_VIDEO_2, d);
d++;
}
c++;
settings_process_messages();
}
settings_enable_window(hdlg, IDC_COMBO_VIDEO_2, !machine_has_flags(temp_machine, MACHINE_VIDEO_ONLY));
e = settings_list_to_device[1][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO_2)];
settings_enable_window(hdlg, IDC_CONFIGURE_VID_2, video_card_has_config(e));
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_enable_window(hdlg, IDC_BUTTON_VOODOO, machine_has_bus(temp_machine, MACHINE_BUS_PCI) && temp_voodoo);
@@ -1113,6 +1157,11 @@ win_settings_video_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
settings_enable_window(hdlg, IDC_CONFIGURE_VID, video_card_has_config(temp_gfxcard));
break;
case IDC_COMBO_VIDEO_2:
temp_gfxcard_2 = settings_list_to_device[1][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO_2)];
settings_enable_window(hdlg, IDC_CONFIGURE_VID_2, video_card_has_config(temp_gfxcard_2));
break;
case IDC_CHECK_VOODOO:
temp_voodoo = settings_get_check(hdlg, IDC_CHECK_VOODOO);
settings_enable_window(hdlg, IDC_BUTTON_VOODOO, temp_voodoo);
@@ -1143,14 +1192,20 @@ win_settings_video_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
temp_gfxcard = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO)];
temp_deviceconfig |= deviceconfig_open(hdlg, (void *) video_card_getdevice(temp_gfxcard));
break;
case IDC_CONFIGURE_VID_2:
temp_gfxcard_2 = settings_list_to_device[1][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO_2)];
temp_deviceconfig |= deviceconfig_open(hdlg, (void *)video_card_getdevice(temp_gfxcard_2));
break;
}
return FALSE;
case WM_SAVESETTINGS:
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_ibm8514 = settings_get_check(hdlg, IDC_CHECK_IBM8514);
temp_xga = settings_get_check(hdlg, IDC_CHECK_XGA);
temp_gfxcard = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO)];
temp_gfxcard_2 = settings_list_to_device[1][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO_2)];
temp_voodoo = settings_get_check(hdlg, IDC_CHECK_VOODOO);
temp_ibm8514 = settings_get_check(hdlg, IDC_CHECK_IBM8514);
temp_xga = settings_get_check(hdlg, IDC_CHECK_XGA);
default:
return FALSE;

12
src/win/win_ui.c
View File

@@ -54,7 +54,8 @@
/* Platform Public data, specific. */
HWND hwndMain = NULL, /* application main window */
hwndRender = NULL; /* machine render window */
hwndRender = NULL, /* machine render window */
hwndRender2 = NULL; /* machine second screen render window */
HMENU menuMain; /* application main menu */
RECT oldclip; /* mouse rect */
int sbar_height = 23; /* statusbar height */
@@ -252,6 +253,7 @@ ResetAllMenus(void)
CheckMenuItem(menuMain, IDM_VID_OVERSCAN, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_INVERT, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_MONITORS, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_RESIZE, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_SDL_SW, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_SDL_HW, MF_UNCHECKED);
@@ -297,6 +299,9 @@ ResetAllMenus(void)
CheckMenuItem(menuMain, IDM_VID_OVERSCAN, enable_overscan ? MF_CHECKED : MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_INVERT, invert_display ? MF_CHECKED : MF_UNCHECKED);
if (show_second_monitors == 1)
CheckMenuItem(menuMain, IDM_VID_MONITORS, MF_CHECKED);
if (vid_resize == 1)
CheckMenuItem(menuMain, IDM_VID_RESIZE, MF_CHECKED);
CheckMenuItem(menuMain, IDM_VID_SDL_SW + vid_api, MF_CHECKED);
@@ -600,6 +605,11 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
config_save();
break;
case IDM_VID_MONITORS:
show_second_monitors ^= 1;
CheckMenuItem(hmenu, IDM_VID_MONITORS, (show_second_monitors & 1) ? MF_CHECKED : MF_UNCHECKED);
break;
case IDM_VID_RESIZE:
vid_resize ^= 1;
CheckMenuItem(hmenu, IDM_VID_RESIZE, (vid_resize & 1) ? MF_CHECKED : MF_UNCHECKED);