new controls dialog; using gconf instead of hgw

[drnoksnes] / platform / platform.h

diff --git a/platform/platform.h b/platform/platform.h
index e4b73b9..8e510a6 100644 (file)
--- a/platform/platform.h
+++ b/platform/platform.h
@@ -1,41 +1,68 @@
-#ifndef _PLATFORM_SDL_H_
-#define _PLATFORM_SDL_H_
+#ifndef _PLATFORM_H_
+#define _PLATFORM_H_
 
 #include "port.h"
 
 // Configuration and command line parsing
 void S9xLoadConfig(int argc, const char ** argv);
+void S9xUnloadConfig();
 void S9xSetRomFile(const char * file);
 extern struct config {
-       char romFile[PATH_MAX];
-       char hacksFile[PATH_MAX];
+       /** Unfreeze from .frz.gz snapshot on start */
+       bool snapshotLoad;
+       /** Freeze to .frz.gz on exit */
+       bool snapshotSave;
+       /** Create fullscreen surface */
        bool fullscreen;
-       bool xsp;
+       /** Name of the scaler to use or NULL for default */
+       char * scaler;
+       /** Audio output enabled */
        bool enableAudio;
-       bool enableMouse;
-       bool enableSuperScope;
+       /** Speedhacks file to use */
+       char * hacksFile;
+       /** Enable touchscreen controls */
+       bool touchscreenInput;
+       /** Display touchscreen controls grid */
+       bool touchscreenShow;
+       /** If true, next time the main loop is entered application will close */
+       bool quitting;
+       /** Current scancode->joypad mapping */
        unsigned short joypad1Mapping[256];
+       unsigned short joypad2Mapping[256];
        unsigned char action[256];
-       bool quitting;
 } Config;
 
 // Video
+extern struct gui {
+       /** Size of the GUI Window */
+       unsigned short Width, Height;
+       /** Size of the (scaled) rendering area, relative to window. */
+       unsigned short RenderX, RenderY, RenderW, RenderH;
+       /** Scaling ratio */
+       float ScaleX, ScaleY;
+} GUI;
 void S9xVideoToggleFullscreen();
-void S9xVideoOutputFocus(bool hasFocus);
 
 // Audio output
 void S9xInitAudioOutput();
 void S9xDeinitAudioOutput();
 void S9xAudioOutputEnable(bool enable);
 
+// Input devices
+EXTERN_C void S9xInitInputDevices();
+void S9xDeinitInputDevices();
+void S9xInputScreenChanged();
+void S9xInputScreenDraw(int pixelSize, void * buffer, int pitch);
+
 // Input actions
 #define kActionNone                                            0
 #define kActionQuit                                    (1U << 0)
 #define        kActionToggleFullscreen         (1U << 1)
+#define kActionQuickLoad1                      (1U << 2)
+#define kActionQuickSave1                      (1U << 3)
+#define kActionQuickLoad2                      (1U << 4)
+#define kActionQuickSave2                      (1U << 5)
 
 void S9xDoAction(unsigned char action);
 
-// Path things
-const char * S9xFiletitle (const char * f);
-
 #endif