--- hatari/src/includes/sdlgui.h	2019/04/01 07:09:59	1.1
+++ hatari/src/includes/sdlgui.h	2019/04/09 08:49:28	1.1.1.9
@@ -1,44 +1,78 @@
 /*
-  Hatari
+  Hatari - sdlgui.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.
 
   Header for the tiny graphical user interface for Hatari.
 */
 
+#ifndef HATARI_SDLGUI_H
+#define HATARI_SDLGUI_H
+
 #include <SDL.h>
 
 enum
 {
   SGBOX,
   SGTEXT,
+  SGEDITFIELD,
   SGBUTTON,
   SGRADIOBUT,
   SGCHECKBOX,
-  SGPOPUP
+  SGPOPUP,
+  SGSCROLLBAR
 };
 
 
 /* Object flags: */
-#define SG_TOUCHEXIT  1
-#define SG_EXIT       2  /* Not yet tested */
+#define SG_TOUCHEXIT   1   /* Exit immediately when mouse button is pressed down */
+#define SG_EXIT        2   /* Exit when mouse button has been pressed (and released) */
+#define SG_DEFAULT     4   /* Marks a default button, selectable with return key */
+#define SG_CANCEL      8   /* Marks a cancel button, selectable with ESC key */
 
 /* Object states: */
-#define SG_SELECTED   1
+#define SG_SELECTED    1
+#define SG_MOUSEDOWN   16
+#define SG_MOUSEUP     (((int)-1) - SG_MOUSEDOWN)
+
+/* Special characters: */
+#define SGRADIOBUTTON_NORMAL    12
+#define SGRADIOBUTTON_SELECTED  13
+#define SGCHECKBOX_NORMAL       14
+#define SGCHECKBOX_SELECTED     15
+#define SGARROWUP                1
+#define SGARROWDOWN              2
+#define SGFOLDER                 5
+
+/* Return codes: */
+#define SDLGUI_ERROR         -1
+#define SDLGUI_QUIT          -2
+#define SDLGUI_UNKNOWNEVENT  -3
 
 
 typedef struct
 {
   int type;             /* What type of object */
   int flags;            /* Object flags */
-  int state;		/* Object state */
+  int state;            /* Object state */
   int x, y;             /* The offset to the upper left corner */
-  int w, h;             /* Width and height */
+  int w, h;             /* Width and height (for scrollbar : height and position) */
   char *txt;            /* Text string */
 }  SGOBJ;
 
+int sdlgui_fontwidth;	/* Width of the actual font */
+int sdlgui_fontheight;	/* Height of the actual font */
+
+extern int SDLGui_Init(void);
+extern int SDLGui_UnInit(void);
+extern int SDLGui_SetScreen(SDL_Surface *pScrn);
+extern void SDLGui_GetFontSize(int *width, int *height);
+extern void SDLGui_Text(int x, int y, const char *txt);
+extern void SDLGui_DrawDialog(const SGOBJ *dlg);
+extern int SDLGui_DoDialog(SGOBJ *dlg, SDL_Event *pEventOut);
+extern void SDLGui_CenterDlg(SGOBJ *dlg);
+extern char* SDLGui_FileSelect(const char *path_and_name, char **zip_path, bool bAllowNew);
+extern bool SDLGui_FileConfSelect(char *dlgname, char *confname, int maxlen, bool bAllowNew);
 
-int SDLGui_Init(void);
-int SDLGui_UnInit(void);
-int SDLGui_DoDialog(SGOBJ *dlg);
-int SDLGui_PrepareFont(void);
-void SDLGui_CenterDlg(SGOBJ *dlg);
-int SDLGui_FileSelect(char *path_and_name);
+#endif