diff --git a/src/win32/Commands.cpp b/src/win32/Commands.cpp index 7fc34e8e..362dfcd4 100644 --- a/src/win32/Commands.cpp +++ b/src/win32/Commands.cpp @@ -92,6 +92,8 @@ struct { { "OptionsVideoX2", ID_OPTIONS_VIDEO_X2 }, { "OptionsVideoX3", ID_OPTIONS_VIDEO_X3 }, { "OptionsVideoX4", ID_OPTIONS_VIDEO_X4 }, + { "OptionsVideoX5", ID_OPTIONS_VIDEO_X5 }, + { "OptionsVideoX6", ID_OPTIONS_VIDEO_X6 }, { "OptionsVideo320x240", ID_OPTIONS_VIDEO_FULLSCREEN320X240 }, { "OptionsVideo640x480", ID_OPTIONS_VIDEO_FULLSCREEN640X480 }, { "OptionsVideo800x600", ID_OPTIONS_VIDEO_FULLSCREEN800X600 }, diff --git a/src/win32/MainWnd.cpp b/src/win32/MainWnd.cpp index 16e01618..eb3d4f82 100644 --- a/src/win32/MainWnd.cpp +++ b/src/win32/MainWnd.cpp @@ -127,6 +127,8 @@ BEGIN_MESSAGE_MAP(MainWnd, CWnd) ON_UPDATE_COMMAND_UI(ID_OPTIONS_VIDEO_X2, OnUpdateOptionsVideoX2) ON_UPDATE_COMMAND_UI(ID_OPTIONS_VIDEO_X3, OnUpdateOptionsVideoX3) ON_UPDATE_COMMAND_UI(ID_OPTIONS_VIDEO_X4, OnUpdateOptionsVideoX4) + ON_UPDATE_COMMAND_UI(ID_OPTIONS_VIDEO_X5, OnUpdateOptionsVideoX5) + ON_UPDATE_COMMAND_UI(ID_OPTIONS_VIDEO_X6, OnUpdateOptionsVideoX6) ON_COMMAND(ID_OPTIONS_VIDEO_FULLSCREEN, OnOptionsVideoFullscreen) ON_UPDATE_COMMAND_UI(ID_OPTIONS_VIDEO_FULLSCREEN, OnUpdateOptionsVideoFullscreen) ON_WM_MOVING() diff --git a/src/win32/MainWndOptions.cpp b/src/win32/MainWndOptions.cpp index ba7069e0..a661255e 100644 --- a/src/win32/MainWndOptions.cpp +++ b/src/win32/MainWndOptions.cpp @@ -271,6 +271,16 @@ void MainWnd::OnUpdateOptionsVideoX4(CCmdUI* pCmdUI) pCmdUI->SetCheck(theApp.videoOption == VIDEO_4X); } +void MainWnd::OnUpdateOptionsVideoX5(CCmdUI* pCmdUI) +{ + pCmdUI->SetCheck(theApp.videoOption == VIDEO_5X); +} + +void MainWnd::OnUpdateOptionsVideoX6(CCmdUI* pCmdUI) +{ + pCmdUI->SetCheck(theApp.videoOption == VIDEO_6X); +} + BOOL MainWnd::OnOptionVideoSize(UINT nID) { theApp.updateVideoSize(nID); diff --git a/src/win32/OpenGL.cpp b/src/win32/OpenGL.cpp index 091015b7..e59f5b0b 100644 --- a/src/win32/OpenGL.cpp +++ b/src/win32/OpenGL.cpp @@ -228,6 +228,14 @@ bool OpenGLDisplay::initialize() theApp.surfaceSizeX = theApp.sizeX * 4; theApp.surfaceSizeY = theApp.sizeY * 4; break; + case VIDEO_5X: + theApp.surfaceSizeX = theApp.sizeX * 5; + theApp.surfaceSizeY = theApp.sizeY * 5; + break; + case VIDEO_6X: + theApp.surfaceSizeX = theApp.sizeX * 6; + theApp.surfaceSizeY = theApp.sizeY * 6; + break; case VIDEO_320x240: case VIDEO_640x480: case VIDEO_800x600: diff --git a/src/win32/VBA.cpp b/src/win32/VBA.cpp index e9f9cda9..bcd25aaa 100644 --- a/src/win32/VBA.cpp +++ b/src/win32/VBA.cpp @@ -1662,6 +1662,12 @@ void VBA::updateVideoSize(UINT id) case ID_OPTIONS_VIDEO_X4: value = VIDEO_4X; break; + case ID_OPTIONS_VIDEO_X5: + value = VIDEO_5X; + break; + case ID_OPTIONS_VIDEO_X6: + value = VIDEO_6X; + break; case ID_OPTIONS_VIDEO_FULLSCREEN320X240: value = VIDEO_320x240; fsWidth = 320; @@ -1801,6 +1807,14 @@ void VBA::updateWindowSize(int value) surfaceSizeX = sizeX * 4; surfaceSizeY = sizeY * 4; break; + case VIDEO_5X: + surfaceSizeX = sizeX * 5; + surfaceSizeY = sizeY * 5; + break; + case VIDEO_6X: + surfaceSizeX = sizeX * 6; + surfaceSizeY = sizeY * 6; + break; case VIDEO_320x240: case VIDEO_640x480: case VIDEO_800x600: @@ -1928,6 +1942,14 @@ bool VBA::preInitialize() surfaceSizeX = sizeX * 4; surfaceSizeY = sizeY * 4; break; + case VIDEO_5X: + surfaceSizeX = sizeX * 5; + surfaceSizeY = sizeY * 5; + break; + case VIDEO_6X: + surfaceSizeX = sizeX * 6; + surfaceSizeY = sizeY * 6; + break; case VIDEO_320x240: case VIDEO_640x480: case VIDEO_800x600: diff --git a/src/win32/VBA.h b/src/win32/VBA.h index 1170495f..f5310470 100644 --- a/src/win32/VBA.h +++ b/src/win32/VBA.h @@ -19,7 +19,7 @@ // enum VIDEO_SIZE{ - VIDEO_1X, VIDEO_2X, VIDEO_3X, VIDEO_4X, + VIDEO_1X, VIDEO_2X, VIDEO_3X, VIDEO_4X, VIDEO_5X, VIDEO_6X, VIDEO_320x240, VIDEO_640x480, VIDEO_800x600, VIDEO_1024x768, VIDEO_1280x1024, VIDEO_OTHER }; diff --git a/src/win32/VBA.rc b/src/win32/VBA.rc index 486b2924..afc2e2e7 100644 --- a/src/win32/VBA.rc +++ b/src/win32/VBA.rc @@ -1705,6 +1705,8 @@ BEGIN MENUITEM "2x window size", ID_OPTIONS_VIDEO_X2 MENUITEM "3x window size", ID_OPTIONS_VIDEO_X3 MENUITEM "4x window size", ID_OPTIONS_VIDEO_X4 + MENUITEM "5x window size", ID_OPTIONS_VIDEO_X5 + MENUITEM "6x window size", ID_OPTIONS_VIDEO_X6 MENUITEM SEPARATOR MENUITEM "Select fullscreen mode...", ID_OPTIONS_VIDEO_FULLSCREEN MENUITEM SEPARATOR diff --git a/src/win32/resource.h b/src/win32/resource.h index 5ab17819..097d5430 100644 --- a/src/win32/resource.h +++ b/src/win32/resource.h @@ -585,6 +585,8 @@ #define ID_OPTIONS_VIDEO_X2 40011 #define ID_OPTIONS_VIDEO_X3 40012 #define ID_OPTIONS_VIDEO_X4 40013 +#define ID_OPTIONS_VIDEO_X5 40373 +#define ID_OPTIONS_VIDEO_X6 40374 #define ID_FILE_PAUSE 40014 #define ID_OPTIONS_EMULATOR_DIRECTORIES 40015 #define ID_OPTIONS_JOYPAD 40016 @@ -877,7 +879,7 @@ #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 165 -#define _APS_NEXT_COMMAND_VALUE 40373 +#define _APS_NEXT_COMMAND_VALUE 40375 #define _APS_NEXT_CONTROL_VALUE 1297 #define _APS_NEXT_SYMED_VALUE 103 #endif