--- uae/src/od-dos/misc/misc.c	2018/04/24 16:40:30	1.1
+++ uae/src/od-dos/misc/misc.c	2018/04/24 16:44:01	1.1.1.2
@@ -28,10 +28,11 @@
 #include "misc/handlers.h"
 #include "xwin.h"
 #include "video/vbe.h"
-#include "video/dos-supp.h"
+#include "tui.h"
 #include "disk.h"
 #include "debug.h"
 #include "picasso96.h"
+#include "logo.h"
 
 #define MAXMESSAGES 100
 
@@ -48,10 +49,48 @@ void DOS_leave(void);
 void DOS_abort(void);
 void DumpMessages(void);
 static int ScreenWrite(__FSEXT_Fnumber func, int *retval, va_list rest_args);
+int scandir(const char *dir, struct dirent ***namelist,
+       int (*select)(const struct dirent *),
+       int (*cmp)(const void *, const void *));
 
 extern int NeedDither, ModeNumber, UseLinear, ScreenIsPicasso, PicassoModeNumber, PicassoUseLinear;
 extern char PicassoInvalidLines[];
 
+int origrows;
+
+int main(int argc, char **argv)
+{
+    time_t t;
+    _go32_dpmi_registers IntRegs;
+    int HasMode, i;
+
+    origrows = ScreenRows();
+    DOS_init();
+    HasMode = 1;
+    if (!SetMode(NumberOfModes-3, 1, 0))
+      if (!SetMode(NumberOfModes-3, 0, 0))
+	HasMode = 0;
+    if (HasMode) {
+      for (i=0; i<200; i++)
+	CurrentMode.PutLine(&(Logo[320*i]), i);
+      t = time(NULL)+5;
+      while(time(NULL)<t)
+	if (kbhit()) {
+	  getch();
+	  break;
+	}
+    }
+    IntRegs.x.ax = 0x1C;
+    IntRegs.h.ah = 0x00;
+    IntRegs.h.al = 0x03;
+    IntRegs.x.ss = IntRegs.x.sp = IntRegs.x.flags = 0;
+    _go32_dpmi_simulate_int(0x10, &IntRegs);
+    _set_screen_lines(50);
+    clrscr();
+    real_main(argc, argv);
+    return 0;
+}
+
 void DOS_init(void) {
     int i;
 
@@ -84,7 +123,9 @@ void DOS_init(void) {
 }
 
 void DOS_leave(void) {
+    _set_screen_lines(origrows);
     DumpMessages();
+    printf("have a nice day!\n");
 }
 
 void DOS_abort(void) {
@@ -175,7 +216,7 @@ void LeaveText(void) {
 	    InstallKeyboardHandler();
 	    RestoreLEDStatus(SavedLEDb);
 	    /* Set graphics mode */
-	    SetMode(ModeNumber, UseLinear);
+	    SetMode(ModeNumber, UseLinear, 0);
 	    /* Restore screen */
 	    if ((gfxvidinfo.pixbytes == 1) || NeedDither)
 		LoadPalette();
@@ -196,7 +237,7 @@ void LeaveText(void) {
 	    InstallKeyboardHandler();
 	    RestoreLEDStatus(SavedLEDb);
 	    /* Set graphics mode */
-	    SetMode(PicassoModeNumber, PicassoUseLinear);
+	    SetMode(PicassoModeNumber, PicassoUseLinear, 0);
 	    /* Restore screen */
 	    DX_SetPalette (0, 256);
 	    for (i = 0; i < picasso_vidinfo.height; i++, addr += picasso96_state.BytesPerRow) {
@@ -208,40 +249,9 @@ void LeaveText(void) {
     }
 }
 
-void HandleDisk(int num) {
-    char *ptr=NULL, buf[256];
-
+void HandleOptions(void) {
     EnterText();
-
-    tui_reset();
-    switch(num) {
-     case 0:
-	gotoxy(5, 4);
-	cprintf("DF0:");
-	ptr = tuifilereq("*.adf", currprefs.df[0]);
-	break;
-     case 1:
-	gotoxy(5, 4);
-	cprintf("DF1:");
-	ptr = tuifilereq("*.adf", currprefs.df[1]);
-	break;
-     case 2:
-	gotoxy(5, 4);
-	cprintf("DF2:");
-	ptr = tuifilereq("*.adf", currprefs.df[2]);
-	break;
-     case 3:
-	gotoxy(5, 4);
-	cprintf("DF3:");
-	ptr = tuifilereq("*.adf", currprefs.df[3]);
-	break;
-    }
-    tui_shutdown();
-    if (ptr != NULL) {
-	strcpy(buf, ptr);
-	disk_insert(num, buf);
-    }
-
+    gui_changesettings ();
     LeaveText();
 }
 
@@ -338,3 +348,75 @@ void SaveScreen(void) {
     }
     fclose(imagefile);
 }
+
+int scandir(const char *dir, struct dirent ***namelist,
+       int (*select)(const struct dirent *),
+       int (*cmp)(const void *, const void *))
+{
+  DIR *dp = opendir (dir);
+  struct dirent **v = NULL;
+  size_t vsize = 0, i;
+  struct dirent *d;
+  int save;
+
+  if (dp == NULL)
+    return -1;
+
+  save = errno;
+  errno = 0;
+
+  i = 0;
+  while ((d = readdir (dp)) != NULL)
+    if (select == NULL || (*select) (d))
+      {
+	if (i == vsize)
+	  {
+	    struct dirent **new;
+	    if (vsize == 0)
+	      vsize = 10;
+	    else
+	      vsize *= 2;
+	    new = (struct dirent **) realloc (v, vsize * sizeof (*v));
+	    if (new == NULL)
+	      {
+	      lose:
+		(void) closedir (dp);
+		while (i > 0)
+		  free (v[--i]);
+		free (v);
+		errno = ENOMEM;
+		return -1;
+	      }
+	    v = new;
+	  }
+
+	v[i] = (struct dirent *) malloc (sizeof (**v));
+	if (v[i] == NULL)
+	  goto lose;
+
+	*v[i++] = *d;
+      }
+
+  if (errno != 0)
+    {
+      save = errno;
+
+      (void) closedir (dp);
+
+      /* Remember to free allocated memory upon error! */
+      while (i > 0) free(v[--i]);
+      free(v);
+
+      errno = save;
+      return -1;
+    }
+
+  (void) closedir (dp);
+  errno = save;
+
+  /* Sort the list if we have a comparison function to sort with.  */
+  if (cmp != NULL)
+    qsort (v, i, sizeof (*v), cmp);
+  *namelist = v;
+  return i;
+}