--- hatari/src/includes/dialog.h	2019/04/01 07:10:18	1.1.1.3
+++ hatari/src/includes/dialog.h	2019/04/01 07:13:05	1.1.1.7
@@ -1,197 +1,37 @@
-/* Hatari */
+/*
+  Hatari - dialog.h
 
+  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.
+*/
 
-/*  Dialog TOS/GEM  */
-typedef struct {
-  char szTOSImageFileName[MAX_FILENAME_LENGTH];
-  BOOL bUseTimeDate;
-  BOOL bAccGEMGraphics;
-  BOOL bUseExtGEMResolutions;
-  int nGEMResolution;
-  int nGEMColours;
-} DLG_TOSGEM;
-
-
-/* Dialog Sound */
-typedef struct {
-  BOOL bEnableSound;
-  int nPlaybackQuality;
-  char szYMCaptureFileName[MAX_FILENAME_LENGTH];
-} DLG_SOUND;
-
-enum {
-  PLAYBACK_LOW,
-  PLAYBACK_MEDIUM,
-  PLAYBACK_HIGH
-};
-
-
-/* Dialog RS232 */
-typedef struct {
-  BOOL bEnableRS232;
-  int nCOMPort;
-} DLG_RS232;
-
-enum {
-  COM_PORT_1,
-  COM_PORT_2,
-  COM_PORT_3,
-  COM_PORT_4
-};
-
-
-/* Dialog Keyboard */
-typedef struct {
-  BOOL bDisableKeyRepeat;
-  int ShortCuts[2][3];     /* F11+F12, NORMAL+SHIFT+CTRL */
-  char szMappingFileName[MAX_FILENAME_LENGTH];
-} DLG_KEYBOARD;
-
-enum {
-  SHORT_CUT_F11,
-  SHORT_CUT_F12,
-  SHORT_CUT_NONE
-};
-
-enum {
-  SHORT_CUT_KEY,
-  SHORT_CUT_SHIFT,
-  SHORT_CUT_CTRL
-};
-
-
-/* Dialog Memory */
-typedef struct {
-  int nMemorySize;
-  char szMemoryCaptureFileName[MAX_FILENAME_LENGTH];
-} DLG_MEMORY;
-
-enum {
-  MEMORY_SIZE_512Kb,
-  MEMORY_SIZE_1Mb,
-  MEMORY_SIZE_2Mb,
-  MEMORY_SIZE_4Mb
-};
-
-
-/* Dialog Joystick */
-typedef struct {
-  BOOL bCursorEmulation;
-  BOOL bEnableAutoFire;
-} JOYSTICK;
-
-typedef struct {
-  JOYSTICK Joy[2];
-} DLG_JOYSTICKS;
-
-
-/* Dialog Discimage */
-typedef struct {
-  BOOL bAutoInsertDiscB;
-  char szDiscImageDirectory[MAX_FILENAME_LENGTH];
-} DLG_DISCIMAGE;
-
-
-/* Dialog configure */
-typedef struct {
-  int nMinMaxSpeed;
-  int nPrevMinMaxSpeed;
-} DLG_CONFIGURE;
-
-enum {
-  MINMAXSPEED_MIN,
-  MINMAXSPEED_1,
-  MINMAXSPEED_2,
-  MINMAXSPEED_3,
-  MINMAXSPEED_MAX
-};
-
-
-/* Dialog hard discs */
-#define MAX_HARDDRIVES  1
-#define DRIVELIST_TO_DRIVE_INDEX(DriveList)  (DriveList+1)
-typedef struct {
-  int nDriveList;
-  BOOL bBootFromHardDisc;
-  int nHardDiscDir;
-  char szHardDiscDirectories[MAX_HARDDRIVES][MAX_FILENAME_LENGTH];
-  char szHardDiscImage[MAX_FILENAME_LENGTH];
-} DLG_HARDDISC;
-
-enum {
-  DRIVELIST_NONE,
-  DRIVELIST_C,
-  DRIVELIST_CD,
-  DRIVELIST_CDE,
-  DRIVELIST_CDEF
-};
-
-enum {
-  DRIVE_C,
-  DRIVE_D,
-  DRIVE_E,
-  DRIVE_F
-};
-
-
-/* Dialog screen */
-typedef struct {
-  BOOL bDoubleSizeWindow;
-  BOOL bAllowOverscan;
-  BOOL bInterlacedFullScreen;
-  BOOL bSyncToRetrace;
-  BOOL bFrameSkip;
-} DLG_SCREEN_ADVANCED;
-
-typedef struct {
-  BOOL bFullScreen;
-  DLG_SCREEN_ADVANCED Advanced;
-  int ChosenDisplayMode;
-
-  BOOL bCaptureChange;
-  int nFramesPerSecond;
-  BOOL bUseHighRes;
-} DLG_SCREEN;
-
-
-/* Dialog Printer */
-typedef struct {
-  BOOL bEnablePrinting;
-  BOOL bPrintToFile;
-  char szPrintToFileName[MAX_FILENAME_LENGTH];
-} DLG_PRINTER;
-
-
-/* Dialog System */
-typedef struct {
-  int nCpuLevel;
-  BOOL bCompatibleCpu;
-  BOOL bAddressSpace24;
-  BOOL bBlitter;                /* TRUE if blitter is enabled */
-} DLG_SYSTEM;
-
-
-/* State of system is stored in this structure */
-/* On reset, variables are copied into system globals and used. */
-typedef struct {
-  /* Configure */
-  DLG_CONFIGURE Configure;
-  DLG_SCREEN Screen;
-  DLG_JOYSTICKS Joysticks;
-  DLG_KEYBOARD Keyboard;
-  DLG_SOUND Sound;
-  DLG_MEMORY Memory;
-  DLG_DISCIMAGE DiscImage;
-  DLG_HARDDISC HardDisc;
-  DLG_TOSGEM TOSGEM;
-  DLG_RS232 RS232;
-  DLG_PRINTER Printer;
-  DLG_SYSTEM System;
-} DLG_PARAMS;
+#ifndef HATARI_DIALOG_H
+#define HATARI_DIALOG_H
 
+#include "configuration.h"
 
-extern DLG_PARAMS ConfigureParams, DialogParams;
+extern CNF_PARAMS  DialogParams;
 
-extern void Dialog_DefaultConfigurationDetails(void);
-extern void Dialog_CopyDetailsFromConfiguration(BOOL bReset);
 extern BOOL Dialog_DoProperty(void);
+
+/* prototypes for gui-sdl/dlg*.c functions: */
+extern int Dialog_MainDlg(BOOL *bReset);
+extern void Dialog_AboutDlg(void);
+extern int DlgAlert_Notice(const char *text);
+extern int DlgAlert_Query(const char *text);
+extern void Dialog_DeviceDlg(void);
+extern void Dialog_DiskDlg(void);
+extern void Dialog_JoyDlg(void);
+extern void Dialog_KeyboardDlg(void);
+extern void Dialog_MemDlg(void);
+extern void DlgNewDisk_Main(void);
+extern void Dialog_ScreenDlg(void);
+extern void Dialog_SoundDlg(void);
+extern void Dialog_SystemDlg(void);
+extern void DlgRom_Main(void);
+extern void Dialog_CopyDialogParamsToConfiguration(BOOL bForceReset);
+extern BOOL Dialog_DoNeedReset(void);
+extern void Dialog_LoadParams(void);
+extern void Dialog_SaveParams(void);
+
+#endif