--- hatari/src/gui-sdl/dlgFileSelect.c	2019/04/01 07:11:38	1.1
+++ hatari/src/gui-sdl/dlgFileSelect.c	2019/04/01 07:13:16	1.1.1.3
@@ -6,29 +6,33 @@
  
   A file selection dialog for the graphical user interface for Hatari.
 */
-char DlgFileSelect_rcsid[] = "Hatari $Id: dlgFileSelect.c,v 1.1 2019/04/01 07:11:38 root Exp $";
+const char DlgFileSelect_rcsid[] = "Hatari $Id: dlgFileSelect.c,v 1.1.1.3 2019/04/01 07:13:16 root Exp $";
 
 #include <SDL.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <dirent.h>
 
 #include "main.h"
-#include "screen.h"
+#include "scandir.h"
 #include "sdlgui.h"
 #include "file.h"
 #include "zip.h"
 
 
+#define SGFS_NUMENTRIES   16            /* How many entries are displayed at once */
+
+
 #define SGFSDLG_FILENAME  5
 #define SGFSDLG_UPDIR     6
-#define SGFSDLG_ROOTDIR   7
-#define SGFSDLG_ENTRY1    10
-#define SGFSDLG_ENTRY16   25
-#define SGFSDLG_UP        26
-#define SGFSDLG_DOWN      27
-#define SGFSDLG_OKAY      28
-#define SGFSDLG_CANCEL    29
+#define SGFSDLG_HOMEDIR   7
+#define SGFSDLG_ROOTDIR   8
+#define SGFSDLG_ENTRY1    11
+#define SGFSDLG_ENTRY16   26
+#define SGFSDLG_UP        27
+#define SGFSDLG_DOWN      28
+#define SGFSDLG_SHOWHIDDEN  29
+#define SGFSDLG_OKAY      30
+#define SGFSDLG_CANCEL    31
 
 
 #define DLGPATH_SIZE 62
@@ -38,7 +42,7 @@ static char dlgpath[DLGPATH_SIZE+1];
 static char dlgfname[DLGFNAME_SIZE+1];  /* Name of the selected file in the dialog */
 
 #define DLGFILENAMES_SIZE 59
-static char dlgfilenames[16][DLGFILENAMES_SIZE+1];  /* Visible file names in the dialog */
+static char dlgfilenames[SGFS_NUMENTRIES][DLGFILENAMES_SIZE+1];  /* Visible file names in the dialog */
 
 /* The dialog data: */
 static SGOBJ fsdlg[] =
@@ -49,7 +53,8 @@ static SGOBJ fsdlg[] =
 	{ SGTEXT, 0, 0, 1,3, DLGPATH_SIZE,1, dlgpath },
 	{ SGTEXT, 0, 0, 1,4, 6,1, "File:" },
 	{ SGTEXT, 0, 0, 7,4, DLGFNAME_SIZE,1, dlgfname },
-	{ SGBUTTON, 0, 0, 55,1, 4,1, ".." },
+	{ SGBUTTON, 0, 0, 51,1, 4,1, ".." },
+	{ SGBUTTON, 0, 0, 56,1, 3,1, "~" },
 	{ SGBUTTON, 0, 0, 60,1, 3,1, "/" },
 	{ SGBOX, 0, 0, 1,6, 62,16, NULL },
 	{ SGBOX, 0, 0, 62,7, 1,14, NULL },
@@ -71,20 +76,24 @@ static SGOBJ fsdlg[] =
 	{ SGTEXT, SG_EXIT, 0, 2,21, DLGFILENAMES_SIZE,1, dlgfilenames[15] },
 	{ SGBUTTON, SG_TOUCHEXIT, 0, 62,6, 1,1, "\x01" },           /* Arrow up */
 	{ SGBUTTON, SG_TOUCHEXIT, 0, 62,21, 1,1, "\x02" },          /* Arrow down */
-	{ SGBUTTON, 0, 0, 14,23, 8,1, "Okay" },
-	{ SGBUTTON, 0, 0, 34,23, 8,1, "Cancel" },
+	{ SGCHECKBOX, SG_EXIT, SG_SELECTED, 2,23, 18,1, "Show hidden files" },
+	{ SGBUTTON, 0, 0, 32,23, 8,1, "Okay" },
+	{ SGBUTTON, 0, 0, 50,23, 8,1, "Cancel" },
 	{ -1, 0, 0, 0,0, 0,0, NULL }
 };
 
 
+static int ypos;                        /* First entry number to be displayed */
+static BOOL refreshentries;             /* Do we have to update the file names in the dialog? */
+static int entries;                     /* How many files are in the actual directory? */
+
 
 /*-----------------------------------------------------------------------*/
 /*
   Update the file name strings in the dialog.
   Returns FALSE if it failed, TRUE on success.
 */
-static int DlgFileSelect_RefreshEntries(struct dirent **files, char *path,
-                                        BOOL browsingzip, int entries, int ypos)
+static int DlgFileSelect_RefreshEntries(struct dirent **files, char *path, BOOL browsingzip)
 {
 	int i;
 	char *tempstr = malloc(FILENAME_MAX);
@@ -96,7 +105,7 @@ static int DlgFileSelect_RefreshEntries(
 	}
 
 	/* Copy entries to dialog: */
-	for(i=0; i<16; i++)
+	for(i=0; i<SGFS_NUMENTRIES; i++)
 	{
 		if( i+ypos < entries )
 		{
@@ -111,7 +120,7 @@ static int DlgFileSelect_RefreshEntries(
 
 			if( browsingzip )
 			{
-				if( tempstr[strlen(tempstr)-1] == '/'  )
+				if (File_DoesFileNameEndWithSlash(tempstr))
 					dlgfilenames[i][0] = SGFOLDER;    /* Mark folders */
 			}
 			else
@@ -133,22 +142,136 @@ static int DlgFileSelect_RefreshEntries(
 
 /*-----------------------------------------------------------------------*/
 /*
+  Remove all hidden files (files with file names that begin with a dot) from
+  the list.
+*/
+static void DlgFileSelect_RemoveHiddenFiles(struct dirent **files)
+{
+	int i;
+	int nActPos = -1;
+	int nOldEntries;
+
+	nOldEntries = entries;
+
+	/* Scan list for hidden files and remove them. */
+	for (i = 0; i < nOldEntries; i++)
+	{
+		/* Does file name start with a dot? -> hidden file! */
+		if (files[i]->d_name[0] == '.')
+		{
+			if (nActPos == -1)
+				nActPos = i;
+			/* Remove file from list: */
+			free(files[i]);
+			files[i] = NULL;
+			entries -= 1;
+		}
+	}
+
+	/* Now close the gaps in the list: */
+	if (nActPos != -1)
+	{
+		for (i = nActPos; i < nOldEntries; i++)
+		{
+			if (files[i] != NULL)
+			{
+				/* Move entry to earlier position: */
+				files[nActPos] = files[i];
+				files[i] = NULL;
+				nActPos += 1;
+			}
+		}
+	}
+}
+
+
+/*-----------------------------------------------------------------------*/
+/*
+  Prepare to scroll up one entry.
+*/
+static void DlgFileSelect_ScrollUp(void)
+{
+	if (ypos > 0)
+	{
+		--ypos;
+		refreshentries = TRUE;
+	}
+}
+
+
+/*-----------------------------------------------------------------------*/
+/*
+  Prepare to scroll down one entry.
+*/
+static void DlgFileSelect_ScrollDown(void)
+{
+	if (ypos+SGFS_NUMENTRIES < entries)
+	{
+		++ypos;
+		refreshentries = TRUE;
+	}
+}
+
+
+/*-----------------------------------------------------------------------*/
+/*
+  Handle SDL events.
+*/
+static void DlgFileSelect_HandleSdlEvents(SDL_Event *pEvent)
+{
+	switch (pEvent->type)
+	{
+	 case SDL_MOUSEBUTTONDOWN:
+		if (pEvent->button.button == SDL_BUTTON_WHEELUP)
+			DlgFileSelect_ScrollUp();
+		else if (pEvent->button.button == SDL_BUTTON_WHEELDOWN)
+			DlgFileSelect_ScrollDown();
+		break;
+	 case SDL_KEYDOWN:
+		switch (pEvent->key.keysym.sym)
+		{
+		 case SDLK_UP:  	DlgFileSelect_ScrollUp(); break;
+		 case SDLK_DOWN:	DlgFileSelect_ScrollDown(); break;
+		 case SDLK_HOME:	ypos = 0; refreshentries = TRUE; break;
+		 case SDLK_END: 	ypos = entries-SGFS_NUMENTRIES; refreshentries = TRUE; break;
+		 case SDLK_PAGEUP:
+			if (ypos > SGFS_NUMENTRIES)
+				ypos -= SGFS_NUMENTRIES;
+			else
+				ypos = 0;
+			refreshentries = TRUE;
+			break;
+		 case SDLK_PAGEDOWN:
+			if (ypos+2*SGFS_NUMENTRIES < entries)
+				ypos += SGFS_NUMENTRIES;
+			else
+				ypos = entries-SGFS_NUMENTRIES;
+			refreshentries = TRUE;
+			break;
+		 default: break;
+		}
+		break;
+	}
+}
+
+
+/*-----------------------------------------------------------------------*/
+/*
   Show and process a file selection dialog.
   Returns TRUE if the use selected "okay", FALSE if "cancel".
   input: zip_path = pointer to buffer to contain file path within a selected
   zip file, or NULL if browsing zip files is disallowed.
   bAllowNew: TRUE if the user is allowed to insert new file names.
+
+  TODO: This function urgently needs refactoring... it's way too big!
 */
 int SDLGui_FileSelect(char *path_and_name, char *zip_path, BOOL bAllowNew)
 {
 	int i,n;
-	int entries = 0;                    /* How many files are in the actual directory? */
-	int ypos = 0;
 	struct dirent **files = NULL;
 	char *pStringMem;
 	char *path, *fname;                 /* The actual file and path names */
 	BOOL reloaddir = TRUE;              /* Do we have to reload the directory file list? */
-	BOOL refreshentries = TRUE;         /* Do we have to update the file names in the dialog? */
 	int retbut;
 	int oldcursorstate;
 	int selection = -1;                 /* The actual selection, -1 if none selected */
@@ -156,6 +279,12 @@ int SDLGui_FileSelect(char *path_and_nam
 	char *zipdir;
 	BOOL browsingzip = FALSE;           /* Are we browsing an archive? */
 	zip_dir *zipfiles = NULL;
+	SDL_Event sdlEvent;
+	struct stat filestat;
+
+	ypos = 0;
+	refreshentries = TRUE;
+	entries = 0;
 
 	/* Allocate memory for the file and path name strings: */
 	pStringMem = malloc(4 * FILENAME_MAX);
@@ -179,7 +308,14 @@ int SDLGui_FileSelect(char *path_and_nam
 	}
 
 	/* Prepare the path and filename variables */
+	if (stat(path_and_name, &filestat) == 0 && S_ISDIR(filestat.st_mode))
+	{
+		/* assure that a directory name ends with a '/' */
+		File_AddSlashToEndFileName(path_and_name);
+	}
 	File_splitpath(path_and_name, path, fname, NULL);
+	File_MakeAbsoluteName(path);
+	File_MakeValidPathName(path);
 	File_ShrinkName(dlgpath, path, DLGPATH_SIZE);
 	File_ShrinkName(dlgfname, fname, DLGFNAME_SIZE);
 
@@ -219,6 +355,12 @@ int SDLGui_FileSelect(char *path_and_nam
 				/* Load directory entries: */
 				entries = scandir(path, &files, 0, alphasort);
 			}
+			
+			/* Remove hidden files from the list if necessary: */
+			if (!(fsdlg[SGFSDLG_SHOWHIDDEN].state & SG_SELECTED))
+			{
+				DlgFileSelect_RemoveHiddenFiles(files);
+			}
 
 			if (entries < 0)
 			{
@@ -234,7 +376,7 @@ int SDLGui_FileSelect(char *path_and_nam
 		/* Update the file name strings in the dialog? */
 		if (refreshentries)
 		{
-			if (!DlgFileSelect_RefreshEntries(files, path, browsingzip, entries, ypos))
+			if (!DlgFileSelect_RefreshEntries(files, path, browsingzip))
 			{
 				free(pStringMem);
 				return FALSE;
@@ -243,13 +385,12 @@ int SDLGui_FileSelect(char *path_and_nam
 		}
 
 		/* Show dialog: */
-		retbut = SDLGui_DoDialog(fsdlg);
+		retbut = SDLGui_DoDialog(fsdlg, &sdlEvent);
 
 		/* Has the user clicked on a file or folder? */
 		if( retbut>=SGFSDLG_ENTRY1 && retbut<=SGFSDLG_ENTRY16 && retbut-SGFSDLG_ENTRY1+ypos<entries)
 		{
 			char *tempstr;
-			struct stat filestat;
 
 			tempstr = malloc(FILENAME_MAX);
 			if (!tempstr)
@@ -263,7 +404,7 @@ int SDLGui_FileSelect(char *path_and_nam
 			{
 				strcpy(tempstr, zipdir);
 				strcat(tempstr, files[retbut-SGFSDLG_ENTRY1+ypos]->d_name);
-				if(tempstr[strlen(tempstr)-1] == '/')
+				if (File_DoesFileNameEndWithSlash(tempstr))
 				{
 					/* handle the ../ directory */
 					if(strcmp(files[retbut-SGFSDLG_ENTRY1+ypos]->d_name, "../") == 0)
@@ -284,9 +425,9 @@ int SDLGui_FileSelect(char *path_and_nam
 							i=strlen(tempstr)-1;
 							n=0;
 							while(i > 0 && n < 3)
-								if( tempstr[i--] == '/' )
+								if (tempstr[i--] == PATHSEP)
 									n++;
-							if(tempstr[i+1] == '/')
+							if (tempstr[i+1] == PATHSEP)
 								tempstr[i+2] = '\0';
 							else
 								tempstr[0] = '\0';
@@ -327,9 +468,9 @@ int SDLGui_FileSelect(char *path_and_nam
 					strcpy(path, tempstr);
 					if( strlen(path)>=3 )
 					{
-						if(path[strlen(path)-2]=='/' && path[strlen(path)-1]=='.')
+						if (path[strlen(path)-2] == PATHSEP && path[strlen(path)-1]=='.')
 							path[strlen(path)-2] = 0;  /* Strip a single dot at the end of the path name */
-						if(path[strlen(path)-3]=='/' && path[strlen(path)-2]=='.' && path[strlen(path)-1]=='.')
+						if (path[strlen(path)-3] == PATHSEP && path[strlen(path)-2]=='.' && path[strlen(path)-1]=='.')
 						{
 							/* Handle the ".." folder */
 							char *ptr;
@@ -338,7 +479,7 @@ int SDLGui_FileSelect(char *path_and_nam
 							else
 							{
 								path[strlen(path)-3] = 0;
-								ptr = strrchr(path, '/');
+								ptr = strrchr(path, PATHSEP);
 								if(ptr)
 									*(ptr+1) = 0;
 							}
@@ -410,9 +551,9 @@ int SDLGui_FileSelect(char *path_and_nam
 						i=strlen(zipdir)-1;
 						n=0;
 						while(i > 0 && n < 2)
-							if( zipdir[i--] == '/' )
+							if (zipdir[i--] == PATHSEP)
 								n++;
-						if(zipdir[i+1] == '/')
+						if (zipdir[i+1] == PATHSEP)
 							zipdir[i+2] = '\0';
 						else
 							zipdir[0] = '\0';
@@ -429,7 +570,7 @@ int SDLGui_FileSelect(char *path_and_nam
 				{
 					char *ptr;
 					File_CleanFileName(path);
-					ptr = strrchr(path, '/');
+					ptr = strrchr(path, PATHSEP);
 					if(ptr)
 						*(ptr+1) = 0;
 					File_AddSlashToEndFileName(path);
@@ -441,6 +582,27 @@ int SDLGui_FileSelect(char *path_and_nam
 					ypos = 0;
 				}
 				break;
+
+			case SGFSDLG_HOMEDIR:               /* Change to home directory */
+				if (getenv("HOME") == NULL)
+					break;
+				if (browsingzip)
+				{
+					/* free zip file entries */
+					ZIP_FreeZipDir(zipfiles);
+					zipfiles = NULL;
+					browsingzip = FALSE;
+				}
+				strcpy(path, getenv("HOME"));
+				File_AddSlashToEndFileName(path);
+				reloaddir = TRUE;
+				strcpy(dlgpath, path);
+				selection = -1;                 /* Remove old selection */
+				fname[0] = 0;
+				dlgfname[0] = 0;
+				ypos = 0;
+				break;
+
 			case SGFSDLG_ROOTDIR:               /* Change to root directory */
 				if( browsingzip )
 				{
@@ -459,32 +621,29 @@ int SDLGui_FileSelect(char *path_and_nam
 				ypos = 0;
 				break;
 			case SGFSDLG_UP:                    /* Scroll up */
-				if( ypos>0 )
-				{
-					--ypos;
-					refreshentries = TRUE;
-				}
-				SDL_Delay(20);
+				DlgFileSelect_ScrollUp();
+				SDL_Delay(10);
 				break;
 			case SGFSDLG_DOWN:                  /* Scroll down */
-				if( ypos+17<=entries )
-				{
-					++ypos;
-					refreshentries = TRUE;
-				}
-				SDL_Delay(20);
+				DlgFileSelect_ScrollDown();
+				SDL_Delay(10);
 				break;
 			case SGFSDLG_FILENAME:              /* User entered new filename */
 				strcpy(fname, dlgfname);
 				break;
+			case SGFSDLG_SHOWHIDDEN:            /* Show/hide hidden files */
+				reloaddir = TRUE;
+				ypos = 0;
+				break;
+			case SDLGUI_UNKNOWNEVENT:
+				DlgFileSelect_HandleSdlEvents(&sdlEvent);
+				break;
 			} /* switch */
 		} /* other button code */
 
 
 	} /* do */
-
-
-	while (retbut!=SGFSDLG_OKAY && retbut!=SGFSDLG_CANCEL && !bQuitProgram);
+	while (retbut!=SGFSDLG_OKAY && retbut!=SGFSDLG_CANCEL && retbut!=SDLGUI_QUIT && !bQuitProgram);
 
 	if (oldcursorstate == SDL_DISABLE)
 		SDL_ShowCursor(SDL_DISABLE);