Added initial emulator configuration window, cleanup of settings code.

[apple2] / src / settings.h

diff --git a/src/settings.h b/src/settings.h
old mode 100755 (executable)
new mode 100644 (file)
index 1fcca61..41be54d
--- a/src/settings.h
+++ b/src/settings.h
@@ -10,38 +10,37 @@
 #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.
 #endif
-#include "types.h"
+#endif
+#include <stdint.h>
 
 // Settings struct
 
 struct Settings
 {
        bool useJoystick;
-       int32 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 glFilter;
-       uint32 frameSkip;
-       uint32 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, #, *
+       uint32_t glFilter;
+       uint32_t renderType;
+       bool autoStateSaving;           // Auto-state loading/saving on entry/exit
+
+       // Window settings
 
-       uint16 p1KeyBindings[21];
-       uint16 p2KeyBindings[21];
+       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
@@ -58,3 +57,4 @@ void SaveSettings(void);
 extern Settings settings;
 
 #endif // __SETTINGS_H__
+