--- hatari/src/gui-sdl/dlgScreen.c 2019/04/01 07:13:49 1.1.1.5 +++ hatari/src/gui-sdl/dlgScreen.c 2019/04/09 08:52:14 1.1.1.12 @@ -3,8 +3,10 @@ This file is distributed under the GNU Public License, version 2 or at your option any later version. Read the file gpl.txt for details. + + Atari monitor and Hatari window settings. */ -const char DlgScreen_rcsid[] = "Hatari $Id: dlgScreen.c,v 1.1.1.5 2019/04/01 07:13:49 root Exp $"; +const char DlgScreen_fileid[] = "Hatari dlgScreen.c : " __DATE__ " " __TIME__; #include "main.h" #include "configuration.h" @@ -12,101 +14,145 @@ const char DlgScreen_rcsid[] = "Hatari $ #include "sdlgui.h" #include "screen.h" #include "screenSnapShot.h" +#include "resolution.h" #include "vdi.h" - - -#define DLGSCRN_FULLSCRN 3 -#define DLGSCRN_OVERSCAN 4 -#define DLGSCRN_ZOOMLOWRES 5 -#define DLGSCRN_8BPP 6 -#define DLGSCRN_SKIP0 8 -#define DLGSCRN_SKIP1 9 -#define DLGSCRN_SKIP2 10 -#define DLGSCRN_SKIP3 11 -#define DLGSCRN_SKIP4 12 -#define DLGSCRN_MONO 14 -#define DLGSCRN_RGB 15 -#define DLGSCRN_VGA 16 -#define DLGSCRN_TV 17 -#define DLGSCRN_USEVDIRES 19 -#define DLGSCRN_WIDTHLESS 21 -#define DLGSCRN_WIDTHTEXT 22 -#define DLGSCRN_WIDTHMORE 23 -#define DLGSCRN_HEIGHTLESS 25 -#define DLGSCRN_HEIGHTTEXT 26 -#define DLGSCRN_HEIGHTMORE 27 -#define DLGSCRN_BPP1 29 -#define DLGSCRN_BPP2 30 -#define DLGSCRN_BPP4 31 -#define DLGSCRN_ONCHANGE 34 -#define DLGSCRN_FPSPOPUP 36 -#define DLGSCRN_CAPTURE 37 -#define DLGSCRN_RECANIM 38 -#define DLGSCRN_EXIT 39 +#include "video.h" +#include "avi_record.h" +#include "statusbar.h" +#include "clocks_timings.h" #define ITEMS_IN_ARRAY(a) (sizeof(a)/sizeof(a[0])) -/* needs to match Frame skip values in screendlg[]! */ -static const int skip_frames[] = { 0, 1, 2, 4, 8 }; + +/* The Monitor dialog: */ +#define DLGSCRN_MONO 3 +#define DLGSCRN_RGB 4 +#define DLGSCRN_VGA 5 +#define DLGSCRN_TV 6 +#define DLGSCRN_OVERSCAN 7 +#define DLGSCRN_USEVDIRES 9 +#define DLGSCRN_VDI_WLESS 11 +#define DLGSCRN_VDI_WTEXT 12 +#define DLGSCRN_VDI_WMORE 13 +#define DLGSCRN_VDI_HLESS 15 +#define DLGSCRN_VDI_HTEXT 16 +#define DLGSCRN_VDI_HMORE 17 +#define DLGSCRN_BPP1 18 +#define DLGSCRN_BPP2 19 +#define DLGSCRN_BPP4 20 +#define DLGSCRN_EXIT_MONITOR 21 /* Strings for VDI resolution width and height */ static char sVdiWidth[5]; static char sVdiHeight[5]; -/* The screen dialog: */ -static SGOBJ screendlg[] = +static SGOBJ monitordlg[] = { - { SGBOX, 0, 0, 0,0, 50,25, NULL }, + { SGBOX, 0, 0, 0,0, 34,18, NULL }, - { SGBOX, 0, 0, 1,1, 48,7, NULL }, - { SGTEXT, 0, 0, 18,1, 14,1, "Screen options" }, - { SGCHECKBOX, 0, 0, 4,3, 12,1, "Fullscreen" }, - { SGCHECKBOX, 0, 0, 4,4, 13,1, "Use borders" }, - { SGCHECKBOX, 0, 0, 25,3, 18,1, "Zoom ST-low res." }, - { SGCHECKBOX, 0, 0, 25,4, 13,1, "Force 8 bpp" }, - { SGTEXT, 0, 0, 4,6, 9,1, "Frame skip:" }, - { SGRADIOBUT, 0, 0, 17,6, 5,1, "Off" }, - { SGRADIOBUT, 0, 0, 24,6, 3,1, "1" }, - { SGRADIOBUT, 0, 0, 29,6, 3,1, "2" }, - { SGRADIOBUT, 0, 0, 35,6, 3,1, "4" }, - { SGRADIOBUT, 0, 0, 40,6, 3,1, "8" }, - { SGTEXT, 0, 0, 4,7, 8,1, "Monitor:" }, - { SGRADIOBUT, 0, 0, 14,7, 6,1, "Mono" }, - { SGRADIOBUT, 0, 0, 22,7, 5,1, "RGB" }, - { SGRADIOBUT, 0, 0, 29,7, 5,1, "VGA" }, - { SGRADIOBUT, 0, 0, 36,7, 4,1, "TV" }, - - { SGBOX, 0, 0, 1,9, 48,6, NULL }, - { SGCHECKBOX, 0, 0, 2,10, 33,1, "Use extended GEM VDI resolution" }, - { SGTEXT, 0, 0, 2,12, 11,1, "Resolution:" }, - { SGBUTTON, 0, 0, 18,12, 1,1, "\x04" }, /* Arrow left */ - { SGTEXT, 0, 0, 20,12, 4,1, sVdiWidth }, - { SGBUTTON, 0, 0, 25,12, 1,1, "\x03" }, /* Arrow right */ - { SGTEXT, 0, 0, 28,12, 1,1, "*" }, - { SGBUTTON, 0, 0, 31,12, 1,1, "\x04" }, /* Arrow left */ - { SGTEXT, 0, 0, 33,12, 4,1, sVdiHeight }, - { SGBUTTON, 0, 0, 38,12, 1,1, "\x03" }, /* Arrow right */ - - { SGTEXT, 0, 0, 2,13, 12,1, "Color Depth:" }, - { SGRADIOBUT, SG_EXIT, 0, 17,13, 7,1, "1 bpp" }, - { SGRADIOBUT, SG_EXIT, 0, 26,13, 7,1, "2 bpp" }, - { SGRADIOBUT, SG_EXIT, 0, 35,13, 7,1, "4 bpp" }, - - { SGBOX, 0, 0, 1,16, 48,6, NULL }, - { SGTEXT, 0, 0, 18,16, 14,1, "Screen capture" }, - { SGCHECKBOX, 0, 0, 4,18, 39,1, "Capture only when display changes" }, - { SGTEXT, 0, 0, 31,19, 4,1, ""/*"FPS:"*/ }, - { SGTEXT/*SGPOPUP*/, 0, 0, 36,19, 3,1, ""/*"25"*/ }, - { SGBUTTON, 0, 0, 6,20, 16,1, "Capture screen" }, - { SGBUTTON, 0, 0, 26,20, 18,1, NULL }, + { SGBOX, 0, 0, 1,1, 32,6, NULL }, + { SGTEXT, 0, 0, 10,1, 14,1, "Atari monitor" }, + { SGRADIOBUT, 0, 0, 4,3, 6,1, "Mono" }, + { SGRADIOBUT, 0, 0, 12,3, 6,1, "RGB" }, + { SGRADIOBUT, 0, 0, 19,3, 6,1, "VGA" }, + { SGRADIOBUT, 0, 0, 26,3, 6,1, "TV" }, + { SGCHECKBOX, 0, 0, 12,5, 22,1, "Show borders" }, + + { SGBOX, 0, 0, 1,8, 32,7, NULL }, + { SGCHECKBOX, 0, 0, 4,9, 33,1, "Use extended VDI screen" }, + { SGTEXT, 0, 0, 4,11, 5,1, "Size:" }, + { SGBUTTON, 0, 0, 6,12, 1,1, "\x04" }, /* Arrow left */ + { SGTEXT, 0, 0, 8,12, 4,1, sVdiWidth }, + { SGBUTTON, 0, 0, 13,12, 1,1, "\x03" }, /* Arrow right */ + { SGTEXT, 0, 0, 4,13, 1,1, "x" }, + { SGBUTTON, 0, 0, 6,13, 1,1, "\x04" }, /* Arrow left */ + { SGTEXT, 0, 0, 8,13, 4,1, sVdiHeight }, + { SGBUTTON, 0, 0, 13,13, 1,1, "\x03" }, /* Arrow right */ + + { SGRADIOBUT, SG_EXIT, 0, 18,11, 11,1, " 2 colors" }, + { SGRADIOBUT, SG_EXIT, 0, 18,12, 11,1, " 4 colors" }, + { SGRADIOBUT, SG_EXIT, 0, 18,13, 11,1, "16 colors" }, - { SGBUTTON, SG_DEFAULT, 0, 15,23, 20,1, "Back to main menu" }, + { SGBUTTON, SG_DEFAULT, 0, 7,16, 20,1, "Back to main menu" }, { -1, 0, 0, 0,0, 0,0, NULL } }; -static int nVdiStepX, nVdiStepY; /* VDI resolution changing steps */ +/* The window dialog: */ +#define DLGSCRN_FULLSCRN 3 +#define DLGSCRN_STATUSBAR 5 +#define DLGSCRN_DRIVELED 6 +#define DLGSCRN_NONE 7 +#define DLGSCRN_SKIP0 9 +#define DLGSCRN_SKIP1 10 +#define DLGSCRN_SKIP2 11 +#define DLGSCRN_SKIP3 12 +#define DLGSCRN_SKIP4 13 +#define DLGSCRN_KEEP_RES 15 +#define DLGSCRN_MAX_WLESS 18 +#define DLGSCRN_MAX_WTEXT 19 +#define DLGSCRN_MAX_WMORE 20 +#define DLGSCRN_MAX_HLESS 22 +#define DLGSCRN_MAX_HTEXT 23 +#define DLGSCRN_MAX_HMORE 24 +#define DLGSCRN_CROP 27 +#define DLGSCRN_CAPTURE 28 +#define DLGSCRN_RECANIM 29 +#define DLGSCRN_EXIT_WINDOW 30 + +/* needs to match Frame skip values in windowdlg[]! */ +static const int skip_frames[] = { 0, 1, 2, 4, AUTO_FRAMESKIP_LIMIT }; + +/* Strings for doubled resolution max width and height */ +static char sMaxWidth[5]; +static char sMaxHeight[5]; + +#define MAX_SIZE_STEP 8 + +/* The window dialog: */ +static SGOBJ windowdlg[] = +{ + { SGBOX, 0, 0, 0,0, 52,20, NULL }, + + { SGBOX, 0, 0, 1,1, 50,10, NULL }, + { SGTEXT, 0, 0, 4,2, 20,1, "Hatari screen options" }, + { SGCHECKBOX, 0, 0, 4,4, 12,1, "Fullscreen" }, + { SGTEXT, 0, 0, 4,6, 12,1, "Indicators:" }, + { SGRADIOBUT, 0, 0, 6,7, 11,1, "Statusbar" }, + { SGRADIOBUT, 0, 0, 6,8, 11,1, "Drive led" }, + { SGRADIOBUT, 0, 0, 6,9, 11,1, "None" }, + { SGTEXT, 0, 0, 19,4, 12,1, "Frame skip:" }, + { SGRADIOBUT, 0, 0, 21,5, 7,1, "Off" }, + { SGRADIOBUT, 0, 0, 21,6, 7,1, "1" }, + { SGRADIOBUT, 0, 0, 21,7, 7,1, "2" }, + { SGRADIOBUT, 0, 0, 21,8, 7,1, "4" }, + { SGRADIOBUT, 0, 0, 21,9, 7,1, "Auto" }, + { SGTEXT, 0, 0, 33,2, 15,1, "Falcon/TT only:" }, + { SGCHECKBOX, 0, 0, 33,4, 14,2, "Keep desktop" }, + { SGTEXT, 0, 0, 35,5, 12,1, "resolution" }, + { SGTEXT, 0, 0, 33,7, 15,1, "Max zoomed win:" }, + { SGBUTTON, 0, 0, 35,8, 1,1, "\x04" }, /* Arrow left */ + { SGTEXT, 0, 0, 37,8, 4,1, sMaxWidth }, + { SGBUTTON, 0, 0, 43,8, 1,1, "\x03" }, /* Arrow right */ + { SGTEXT, 0, 0, 33,9, 1,1, "x" }, + { SGBUTTON, 0, 0, 35,9, 1,1, "\x04" }, /* Arrow left */ + { SGTEXT, 0, 0, 37,9, 4,1, sMaxHeight }, + { SGBUTTON, 0, 0, 43,9, 1,1, "\x03" }, /* Arrow right */ + + { SGBOX, 0, 0, 1,12, 50,5, NULL }, + { SGTEXT, 0, 0, 7,13, 16,1, "Screen capture" }, + { SGCHECKBOX, 0, 0, 8,15, 16,1, "Crop statusbar" }, + { SGBUTTON, 0, 0, 29,13, 14,1, " Screenshot " }, + { SGBUTTON, 0, 0, 29,15, 14,1, " Record AVI " }, + + { SGBUTTON, SG_DEFAULT, 0, 17,18, 20,1, "Back to main menu" }, + { -1, 0, 0, 0,0, 0,0, NULL } +}; + +/* ---------------------------------------------------------------- */ + +static int nVdiStepX, nVdiStepY; /* VDI resolution changing steps */ /** * Set width and height stepping for VDI resolution changing. @@ -118,14 +164,14 @@ static int nVdiStepX, nVdiStepY; /* VD * - The screen height must be a multiple of the character cell height * (i.e. 16 pixels in monochrome, 8 pixels in color mode). */ -static void DlgScreen_SetStepping(void) +static void DlgMonitor_SetVdiStepping(void) { - if (screendlg[DLGSCRN_BPP1].state & SG_SELECTED) + if (monitordlg[DLGSCRN_BPP1].state & SG_SELECTED) { nVdiStepX = 128; nVdiStepY = 16; } - else if (screendlg[DLGSCRN_BPP2].state & SG_SELECTED) + else if (monitordlg[DLGSCRN_BPP2].state & SG_SELECTED) { nVdiStepX = 64; nVdiStepY = 8; @@ -140,179 +186,248 @@ static void DlgScreen_SetStepping(void) /*-----------------------------------------------------------------------*/ /** - * Show and process the screen dialog. + * Show and process the monitor dialog. */ -void Dialog_ScreenDlg(void) +void Dialog_MonitorDlg(void) { - int but, skip = 0; + int but; unsigned int i; + MONITORTYPE mti; - SDLGui_CenterDlg(screendlg); - - /* Set up general screen options in the dialog from actual values: */ - - if (DialogParams.Screen.bFullScreen) - screendlg[DLGSCRN_FULLSCRN].state |= SG_SELECTED; - else - screendlg[DLGSCRN_FULLSCRN].state &= ~SG_SELECTED; - - if (DialogParams.Screen.bAllowOverscan) - screendlg[DLGSCRN_OVERSCAN].state |= SG_SELECTED; - else - screendlg[DLGSCRN_OVERSCAN].state &= ~SG_SELECTED; + SDLGui_CenterDlg(monitordlg); - if (DialogParams.Screen.nForceBpp == 8) - screendlg[DLGSCRN_8BPP].state |= SG_SELECTED; - else - screendlg[DLGSCRN_8BPP].state &= ~SG_SELECTED; + /* Set up general monitor options in the dialog from actual values: */ - if (DialogParams.Screen.bZoomLowRes) - screendlg[DLGSCRN_ZOOMLOWRES].state |= SG_SELECTED; + if (ConfigureParams.Screen.bAllowOverscan) + monitordlg[DLGSCRN_OVERSCAN].state |= SG_SELECTED; else - screendlg[DLGSCRN_ZOOMLOWRES].state &= ~SG_SELECTED; - - for (i = 0; i < ITEMS_IN_ARRAY(skip_frames); i++) - { - if (DialogParams.Screen.FrameSkips >= skip_frames[i]) - skip = i; - screendlg[i+DLGSCRN_SKIP0].state &= ~SG_SELECTED; - } - screendlg[DLGSCRN_SKIP0+skip].state |= SG_SELECTED; + monitordlg[DLGSCRN_OVERSCAN].state &= ~SG_SELECTED; for (i = DLGSCRN_MONO; i <= DLGSCRN_TV; i++) - screendlg[i].state &= ~SG_SELECTED; - screendlg[DLGSCRN_MONO+DialogParams.Screen.MonitorType].state |= SG_SELECTED; + monitordlg[i].state &= ~SG_SELECTED; + monitordlg[DLGSCRN_MONO+ConfigureParams.Screen.nMonitorType].state |= SG_SELECTED; /* Initialize VDI resolution options: */ - if (DialogParams.Screen.bUseExtVdiResolutions) - screendlg[DLGSCRN_USEVDIRES].state |= SG_SELECTED; + if (ConfigureParams.Screen.bUseExtVdiResolutions) + monitordlg[DLGSCRN_USEVDIRES].state |= SG_SELECTED; else - screendlg[DLGSCRN_USEVDIRES].state &= ~SG_SELECTED; + monitordlg[DLGSCRN_USEVDIRES].state &= ~SG_SELECTED; for (i=0; i<3; i++) - screendlg[DLGSCRN_BPP1 + i].state &= ~SG_SELECTED; - screendlg[DLGSCRN_BPP1 + DialogParams.Screen.nVdiColors - GEMCOLOR_2].state |= SG_SELECTED; - sprintf(sVdiWidth, "%4i", DialogParams.Screen.nVdiWidth); - sprintf(sVdiHeight, "%4i", DialogParams.Screen.nVdiHeight); - DlgScreen_SetStepping(); - - /* Initialize screen capture options: */ - - if (DialogParams.Screen.bCaptureChange) - screendlg[DLGSCRN_ONCHANGE].state |= SG_SELECTED; - else - screendlg[DLGSCRN_ONCHANGE].state &= ~SG_SELECTED; + monitordlg[DLGSCRN_BPP1 + i].state &= ~SG_SELECTED; + monitordlg[DLGSCRN_BPP1 + ConfigureParams.Screen.nVdiColors - GEMCOLOR_2].state |= SG_SELECTED; + sprintf(sVdiWidth, "%4i", ConfigureParams.Screen.nVdiWidth); + sprintf(sVdiHeight, "%4i", ConfigureParams.Screen.nVdiHeight); + DlgMonitor_SetVdiStepping(); - if (ScreenSnapShot_AreWeRecording()) - screendlg[DLGSCRN_RECANIM].txt = "Stop recording"; - else - screendlg[DLGSCRN_RECANIM].txt = "Record animation"; - - /* The screen dialog main loop */ + /* The monitor dialog main loop */ do { - but = SDLGui_DoDialog(screendlg, NULL); + but = SDLGui_DoDialog(monitordlg, NULL); switch (but) { - case DLGSCRN_FPSPOPUP: - //fprintf(stderr,"Sorry, popup menus don't work yet\n"); - break; - - case DLGSCRN_WIDTHLESS: - DialogParams.Screen.nVdiWidth = VDI_Limit(DialogParams.Screen.nVdiWidth - nVdiStepX, + case DLGSCRN_VDI_WLESS: + ConfigureParams.Screen.nVdiWidth = VDI_Limit(ConfigureParams.Screen.nVdiWidth - nVdiStepX, nVdiStepX, MIN_VDI_WIDTH, MAX_VDI_WIDTH); - sprintf(sVdiWidth, "%4i", DialogParams.Screen.nVdiWidth); + sprintf(sVdiWidth, "%4i", ConfigureParams.Screen.nVdiWidth); break; - case DLGSCRN_WIDTHMORE: - DialogParams.Screen.nVdiWidth = VDI_Limit(DialogParams.Screen.nVdiWidth + nVdiStepX, + case DLGSCRN_VDI_WMORE: + ConfigureParams.Screen.nVdiWidth = VDI_Limit(ConfigureParams.Screen.nVdiWidth + nVdiStepX, nVdiStepX, MIN_VDI_WIDTH, MAX_VDI_WIDTH); - sprintf(sVdiWidth, "%4i", DialogParams.Screen.nVdiWidth); + sprintf(sVdiWidth, "%4i", ConfigureParams.Screen.nVdiWidth); break; - case DLGSCRN_HEIGHTLESS: - DialogParams.Screen.nVdiHeight = VDI_Limit(DialogParams.Screen.nVdiHeight - nVdiStepY, + case DLGSCRN_VDI_HLESS: + ConfigureParams.Screen.nVdiHeight = VDI_Limit(ConfigureParams.Screen.nVdiHeight - nVdiStepY, nVdiStepY, MIN_VDI_HEIGHT, MAX_VDI_HEIGHT); - sprintf(sVdiHeight, "%4i", DialogParams.Screen.nVdiHeight); + sprintf(sVdiHeight, "%4i", ConfigureParams.Screen.nVdiHeight); break; - case DLGSCRN_HEIGHTMORE: - DialogParams.Screen.nVdiHeight = VDI_Limit(DialogParams.Screen.nVdiHeight + nVdiStepY, + case DLGSCRN_VDI_HMORE: + ConfigureParams.Screen.nVdiHeight = VDI_Limit(ConfigureParams.Screen.nVdiHeight + nVdiStepY, nVdiStepY, MIN_VDI_HEIGHT, MAX_VDI_HEIGHT); - sprintf(sVdiHeight, "%4i", DialogParams.Screen.nVdiHeight); + sprintf(sVdiHeight, "%4i", ConfigureParams.Screen.nVdiHeight); break; case DLGSCRN_BPP1: case DLGSCRN_BPP2: case DLGSCRN_BPP4: - DlgScreen_SetStepping(); + DlgMonitor_SetVdiStepping(); /* Align resolution to actual conditions: */ - DialogParams.Screen.nVdiWidth = VDI_Limit(DialogParams.Screen.nVdiWidth, nVdiStepX, + ConfigureParams.Screen.nVdiWidth = VDI_Limit(ConfigureParams.Screen.nVdiWidth, nVdiStepX, MIN_VDI_WIDTH, MAX_VDI_WIDTH); - DialogParams.Screen.nVdiHeight = VDI_Limit(DialogParams.Screen.nVdiHeight, nVdiStepY, + ConfigureParams.Screen.nVdiHeight = VDI_Limit(ConfigureParams.Screen.nVdiHeight, nVdiStepY, MIN_VDI_HEIGHT, MAX_VDI_HEIGHT); - sprintf(sVdiWidth, "%4i", DialogParams.Screen.nVdiWidth); - sprintf(sVdiHeight, "%4i", DialogParams.Screen.nVdiHeight); + sprintf(sVdiWidth, "%4i", ConfigureParams.Screen.nVdiWidth); + sprintf(sVdiHeight, "%4i", ConfigureParams.Screen.nVdiHeight); + break; + } + } + while (but != DLGSCRN_EXIT_MONITOR && but != SDLGUI_QUIT + && but != SDLGUI_ERROR && !bQuitProgram); + + /* Read new values from dialog: */ + + ConfigureParams.Screen.bAllowOverscan = (monitordlg[DLGSCRN_OVERSCAN].state & SG_SELECTED); + + for (mti = MONITOR_TYPE_MONO; mti <= MONITOR_TYPE_TV; mti++) + { + if (monitordlg[mti + DLGSCRN_MONO].state & SG_SELECTED) + { + ConfigureParams.Screen.nMonitorType = mti; + break; + } + } + + ConfigureParams.Screen.bUseExtVdiResolutions = (monitordlg[DLGSCRN_USEVDIRES].state & SG_SELECTED); + for (i=0; i<3; i++) + { + if (monitordlg[DLGSCRN_BPP1 + i].state & SG_SELECTED) + ConfigureParams.Screen.nVdiColors = GEMCOLOR_2 + i; + } +} + + +/*-----------------------------------------------------------------------*/ +/** + * Show and process the window dialog. + */ +void Dialog_WindowDlg(void) +{ + int deskw, deskh, but, skip = 0; + unsigned int i; + + SDLGui_CenterDlg(windowdlg); + + /* Set up general window options in the dialog from actual values: */ + + if (ConfigureParams.Screen.bFullScreen) + windowdlg[DLGSCRN_FULLSCRN].state |= SG_SELECTED; + else + windowdlg[DLGSCRN_FULLSCRN].state &= ~SG_SELECTED; + + if (ConfigureParams.Screen.bKeepResolution) + windowdlg[DLGSCRN_KEEP_RES].state |= SG_SELECTED; + else + windowdlg[DLGSCRN_KEEP_RES].state &= ~SG_SELECTED; + + windowdlg[DLGSCRN_STATUSBAR].state |= SG_SELECTED; + + windowdlg[DLGSCRN_STATUSBAR].state &= ~SG_SELECTED; + windowdlg[DLGSCRN_DRIVELED].state &= ~SG_SELECTED; + windowdlg[DLGSCRN_NONE].state &= ~SG_SELECTED; + if (ConfigureParams.Screen.bShowStatusbar) + windowdlg[DLGSCRN_STATUSBAR].state |= SG_SELECTED; + else if (ConfigureParams.Screen.bShowDriveLed) + windowdlg[DLGSCRN_DRIVELED].state |= SG_SELECTED; + else + windowdlg[DLGSCRN_NONE].state |= SG_SELECTED; + + for (i = 0; i < ITEMS_IN_ARRAY(skip_frames); i++) + { + if (ConfigureParams.Screen.nFrameSkips >= skip_frames[i]) + skip = i; + windowdlg[i+DLGSCRN_SKIP0].state &= ~SG_SELECTED; + } + windowdlg[DLGSCRN_SKIP0+skip].state |= SG_SELECTED; + + Resolution_GetDesktopSize(&deskw, &deskh); + sprintf(sMaxWidth, "%4i", ConfigureParams.Screen.nMaxWidth); + sprintf(sMaxHeight, "%4i", ConfigureParams.Screen.nMaxHeight); + + /* Initialize window capture options: */ + + if (ConfigureParams.Screen.bCrop) + windowdlg[DLGSCRN_CROP].state |= SG_SELECTED; + else + windowdlg[DLGSCRN_CROP].state &= ~SG_SELECTED; + + if (Avi_AreWeRecording()) + windowdlg[DLGSCRN_RECANIM].txt = "Stop record"; + else + windowdlg[DLGSCRN_RECANIM].txt = "Record AVI"; + + /* The window dialog main loop */ + do + { + but = SDLGui_DoDialog(windowdlg, NULL); + switch (but) + { + case DLGSCRN_MAX_WLESS: + ConfigureParams.Screen.nMaxWidth = VDI_Limit(ConfigureParams.Screen.nMaxWidth - MAX_SIZE_STEP, + MAX_SIZE_STEP, MIN_VDI_WIDTH, deskw); + sprintf(sMaxWidth, "%4i", ConfigureParams.Screen.nMaxWidth); + break; + case DLGSCRN_MAX_WMORE: + ConfigureParams.Screen.nMaxWidth = VDI_Limit(ConfigureParams.Screen.nMaxWidth + MAX_SIZE_STEP, + MAX_SIZE_STEP, MIN_VDI_WIDTH, deskw); + sprintf(sMaxWidth, "%4i", ConfigureParams.Screen.nMaxWidth); + break; + + case DLGSCRN_MAX_HLESS: + ConfigureParams.Screen.nMaxHeight = VDI_Limit(ConfigureParams.Screen.nMaxHeight - MAX_SIZE_STEP, + MAX_SIZE_STEP, MIN_VDI_HEIGHT, deskh); + sprintf(sMaxHeight, "%4i", ConfigureParams.Screen.nMaxHeight); + break; + case DLGSCRN_MAX_HMORE: + ConfigureParams.Screen.nMaxHeight = VDI_Limit(ConfigureParams.Screen.nMaxHeight + MAX_SIZE_STEP, + MAX_SIZE_STEP, MIN_VDI_HEIGHT, deskh); + sprintf(sMaxHeight, "%4i", ConfigureParams.Screen.nMaxHeight); break; case DLGSCRN_CAPTURE: SDL_UpdateRect(sdlscrn, 0,0,0,0); + ConfigureParams.Screen.bCrop = (windowdlg[DLGSCRN_CROP].state & SG_SELECTED); ScreenSnapShot_SaveScreen(); break; - case DLGSCRN_RECANIM: - if (ScreenSnapShot_AreWeRecording()) + + case DLGSCRN_RECANIM: + if (Avi_AreWeRecording()) { - screendlg[DLGSCRN_RECANIM].txt = "Record animation"; - ScreenSnapShot_EndRecording(); + /* AVI indexing can take a while for larger files */ + Statusbar_AddMessage("Finishing AVI file...", 100); + Statusbar_Update(sdlscrn); + Avi_StopRecording(); + windowdlg[DLGSCRN_RECANIM].txt = "Record AVI"; + Statusbar_AddMessage("Emulation paused", 100); + Statusbar_Update(sdlscrn); } else { - screendlg[DLGSCRN_RECANIM].txt = "Stop recording"; - DialogParams.Screen.bCaptureChange = (screendlg[DLGSCRN_ONCHANGE].state & SG_SELECTED); - ScreenSnapShot_BeginRecording(DialogParams.Screen.bCaptureChange, 25); + ConfigureParams.Screen.bCrop = (windowdlg[DLGSCRN_CROP].state & SG_SELECTED); + Avi_StartRecording ( ConfigureParams.Video.AviRecordFile , ConfigureParams.Screen.bCrop , + ConfigureParams.Video.AviRecordFps == 0 ? + ClocksTimings_GetVBLPerSec ( ConfigureParams.System.nMachineType , nScreenRefreshRate ) : + (Uint32)ConfigureParams.Video.AviRecordFps << CLOCKS_TIMINGS_SHIFT_VBL , + 1 << CLOCKS_TIMINGS_SHIFT_VBL , + ConfigureParams.Video.AviRecordVcodec ); + windowdlg[DLGSCRN_RECANIM].txt = "Stop record"; } break; } } - while (but != DLGSCRN_EXIT && but != SDLGUI_QUIT + while (but != DLGSCRN_EXIT_WINDOW && but != SDLGUI_QUIT && but != SDLGUI_ERROR && !bQuitProgram); /* Read new values from dialog: */ - DialogParams.Screen.bFullScreen = (screendlg[DLGSCRN_FULLSCRN].state & SG_SELECTED); - DialogParams.Screen.bAllowOverscan = (screendlg[DLGSCRN_OVERSCAN].state & SG_SELECTED); + ConfigureParams.Screen.bFullScreen = (windowdlg[DLGSCRN_FULLSCRN].state & SG_SELECTED); + ConfigureParams.Screen.bKeepResolution = (windowdlg[DLGSCRN_KEEP_RES].state & SG_SELECTED); - if (screendlg[DLGSCRN_8BPP].state & SG_SELECTED) - DialogParams.Screen.nForceBpp = 8; - else - /* TODO: disables this setting if it's != 8 */ - DialogParams.Screen.nForceBpp = 0; - - if (screendlg[DLGSCRN_ZOOMLOWRES].state & SG_SELECTED) - DialogParams.Screen.bZoomLowRes = TRUE; - else - DialogParams.Screen.bZoomLowRes = FALSE; + ConfigureParams.Screen.bShowStatusbar = false; + ConfigureParams.Screen.bShowDriveLed = false; + if (windowdlg[DLGSCRN_STATUSBAR].state & SG_SELECTED) + ConfigureParams.Screen.bShowStatusbar = true; + else if (windowdlg[DLGSCRN_DRIVELED].state & SG_SELECTED) + ConfigureParams.Screen.bShowDriveLed = true; - DialogParams.Screen.bUseExtVdiResolutions = (screendlg[DLGSCRN_USEVDIRES].state & SG_SELECTED); for (i = DLGSCRN_SKIP0; i <= DLGSCRN_SKIP4; i++) { - if (screendlg[i].state & SG_SELECTED) - { - DialogParams.Screen.FrameSkips = skip_frames[i-DLGSCRN_SKIP0]; - break; - } - } - for (i = DLGSCRN_MONO; i <= DLGSCRN_TV; i++) - { - if (screendlg[i].state & SG_SELECTED) + if (windowdlg[i].state & SG_SELECTED) { - DialogParams.Screen.MonitorType = i - DLGSCRN_MONO; + ConfigureParams.Screen.nFrameSkips = skip_frames[i-DLGSCRN_SKIP0]; break; } } - for (i=0; i<3; i++) - { - if (screendlg[DLGSCRN_BPP1 + i].state & SG_SELECTED) - DialogParams.Screen.nVdiColors = GEMCOLOR_2 + i; - } - DialogParams.Screen.bCaptureChange = (screendlg[DLGSCRN_ONCHANGE].state & SG_SELECTED); + ConfigureParams.Screen.bCrop = (windowdlg[DLGSCRN_CROP].state & SG_SELECTED); }