--- hatari/src/includes/sdlgui.h	2019/04/09 08:49:28	1.1.1.9
+++ hatari/src/includes/sdlgui.h	2019/04/09 08:56:51	1.1.1.13
@@ -1,8 +1,8 @@
 /*
   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.
+  This file is distributed under the GNU General 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.
 */
@@ -12,8 +12,10 @@
 
 #include <SDL.h>
 
+/* object types: */
 enum
 {
+  SGSTOP = -1, /* type used at end of dialog to terminate it */
   SGBOX,
   SGTEXT,
   SGEDITFIELD,
@@ -28,13 +30,20 @@ enum
 /* Object flags: */
 #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_DEFAULT     4   /* Marks a default button, selectable with Enter & Return keys */
 #define SG_CANCEL      8   /* Marks a cancel button, selectable with ESC key */
 
 /* Object states: */
 #define SG_SELECTED    1
-#define SG_MOUSEDOWN   16
-#define SG_MOUSEUP     (((int)-1) - SG_MOUSEDOWN)
+#define SG_MOUSEDOWN   2
+#define SG_FOCUSED     4   /* Marks an object that has selection focus */
+#define SG_WASFOCUSED  8   /* Marks an object that had selection focus & its bg needs redraw */
+
+/* special shortcut keys, something that won't conflict with text shortcuts */
+#define SG_SHORTCUT_LEFT	'<'
+#define SG_SHORTCUT_RIGHT	'>'
+#define SG_SHORTCUT_UP  	'^'
+#define SG_SHORTCUT_DOWN	'|'
 
 /* Special characters: */
 #define SGRADIOBUTTON_NORMAL    12
@@ -45,11 +54,11 @@ enum
 #define SGARROWDOWN              2
 #define SGFOLDER                 5
 
-/* Return codes: */
+/* Object matching return codes: (negative so they aren't mixed with object indeces) */
 #define SDLGUI_ERROR         -1
 #define SDLGUI_QUIT          -2
 #define SDLGUI_UNKNOWNEVENT  -3
-
+#define SDLGUI_NOTFOUND      -4
 
 typedef struct
 {
@@ -59,10 +68,11 @@ typedef struct
   int x, y;             /* The offset to the upper left corner */
   int w, h;             /* Width and height (for scrollbar : height and position) */
   char *txt;            /* Text string */
+  int shortcut;         /* shortcut key */
 }  SGOBJ;
 
-int sdlgui_fontwidth;	/* Width of the actual font */
-int sdlgui_fontheight;	/* Height of the actual font */
+extern int sdlgui_fontwidth;	/* Width of the actual font */
+extern int sdlgui_fontheight;	/* Height of the actual font */
 
 extern int SDLGui_Init(void);
 extern int SDLGui_UnInit(void);
@@ -70,9 +80,9 @@ extern int SDLGui_SetScreen(SDL_Surface
 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 int SDLGui_DoDialog(SGOBJ *dlg, SDL_Event *pEventOut, bool KeepCurrentObject);
 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);
+extern char* SDLGui_FileSelect(const char *title, const char *path_and_name, char **zip_path, bool bAllowNew);
+extern bool SDLGui_FileConfSelect(const char *title, char *dlgname, char *confname, int maxlen, bool bAllowNew);
 
 #endif