Added initial emulator configuration window, cleanup of settings code.

[apple2] / src / settings.h

diff --git a/src/settings.h b/src/settings.h
index 4dbca07912dc6e91157635c00ce5958406e881c7..41be54d8c8b26ca9fd27f3d7b403179c116508a2 100644 (file)
--- a/src/settings.h
+++ b/src/settings.h
@@ -10,7 +10,7 @@
 #include <limits.h>
 #define MAX_PATH               _POSIX_PATH_MAX
 #else
-#include <stdlib.h>                                                            // for MAX_PATH on MinGW/Darwin
+#include <stdlib.h>                                            // for MAX_PATH on MinGW/Darwin
 // Win64 kludge
 #ifndef MAX_PATH
 #define MAX_PATH               _MAX_PATH               // Ugh.
@@ -23,29 +23,24 @@
 struct Settings
 {
        bool useJoystick;
-       int32_t joyport;                                                                // Joystick port
-       bool hardwareTypeNTSC;                                          // Set to false for PAL
+       int32_t joyport;                        // Joystick port
+       bool hardwareTypeNTSC;          // Set to false for PAL
        bool fullscreen;
        bool useOpenGL;
        uint32_t glFilter;
-       uint32_t frameSkip;
        uint32_t renderType;
-       bool autoStateSaving;                                           // Auto-state loading/saving on entry/exit
-       
-       // Keybindings in order of U, D, L, R, C, B, A, Op, Pa, 0-9, #, *
+       bool autoStateSaving;           // Auto-state loading/saving on entry/exit
 
-       uint16_t p1KeyBindings[21];
-       uint16_t p2KeyBindings[21];
+       // Window settings
+
+       int winX, winY;
 
        // Paths
 
-       char BIOSPath[MAX_PATH];
-       char disksPath[MAX_PATH];
-       char diskImagePath1[MAX_PATH];
-       char diskImagePath2[MAX_PATH];
-       char autoStatePath[MAX_PATH];
-//     char CDBootPath[MAX_PATH];
-//     char EEPROMPath[MAX_PATH];
+       char BIOSPath[MAX_PATH + 1];
+       char disksPath[MAX_PATH + 1];
+       char autoStatePath[MAX_PATH + 1];
+       char hd[7][MAX_PATH + 1];
 };
 
 // Render types