--- uae/src/cfgfile.c	2018/04/24 17:03:56	1.1.1.11
+++ uae/src/cfgfile.c	2018/04/24 17:16:42	1.1.1.17
@@ -12,13 +12,15 @@
 
 #include <ctype.h>
 
-#include "config.h"
 #include "options.h"
 #include "threaddep/thread.h"
 #include "uae.h"
 #include "autoconf.h"
 #include "events.h"
 #include "custom.h"
+#include "inputdevice.h"
+
+#define cfgfile_write fprintf
 
 /* @@@ need to get rid of this... just cut part of the manual and print that
  * as a help text.  */
@@ -60,6 +62,7 @@ static struct cfg_lines opttable[] =
     {"gfx_colour_mode", "" },
     {"32bit_blits", "Enable 32 bit blitter emulation" },
     {"immediate_blits", "Perform blits immediately" },
+    {"show_leds", "LED display" },
     {"gfxlib_replacement", "Use graphics.library replacement?" },
     {"sound_output", "" },
     {"sound_frequency", "" },
@@ -72,6 +75,7 @@ static struct cfg_lines opttable[] =
     {"joyport0", "" },
     {"joyport1", "" },
     {"kickstart_rom_file", "Kickstart ROM image, (C) Copyright Amiga, Inc." },
+    {"kickstart_ext_rom_file", "Extended Kickstart ROM image, (C) Copyright Amiga, Inc." },
     {"kickstart_key_file", "Key-file for encrypted ROM images (from Cloanto's Amiga Forever)" },
     {"floppy0", "Diskfile for drive 0" },
     {"floppy1", "Diskfile for drive 1" },
@@ -92,7 +96,6 @@ static const char *cpumode[] = {
     "68000", "68000", "68010", "68010", "68ec020", "68020", "68ec020/68881", "68020/68881",
     "68040", "68040", 0
 };
-static const char *portmode[] = { "joy0", "joy1", "mouse", "kbd1", "kbd2", "kbd3", 0 };
 static const char *colormode1[] = { "8bit", "15bit", "16bit", "8bit_dither", "4bit_dither", "32bit", 0 };
 static const char *colormode2[] = { "8", "15", "16", "8d", "4d", "32", 0 };
 static const char *soundmode[] = { "none", "interrupts", "normal", "exact", 0 };
@@ -101,7 +104,7 @@ static const char *centermode2[] = { "fa
 static const char *stereomode1[] = { "mono", "stereo", "mixed", 0 };
 static const char *stereomode2[] = { "m", "s", "x", 0 };
 static const char *stereomode3[] = { "1", "2", "3", 0 };
-static const char *interpolmode[] = { "none", "rh", "crux", 0 };
+static const char *interpolmode[] = { "none", "rh", "crux", "sinc", 0 };
 static const char *collmode[] = { "none", "sprites", "playfields", "full", 0 };
 
 #define UNEXPANDED "$(FILE_PATH)"
@@ -134,103 +137,126 @@ char *cfgfile_subst_path (const char *pa
     return my_strdup (file);
 }
 
+static void write_gfx_params (FILE *f, struct gfx_params *p, char *suffix)
+{
+    cfgfile_write (f, "gfx_width_%s=%d\n", suffix, p->width);
+    cfgfile_write (f, "gfx_height_%s=%d\n", suffix, p->height);
+    cfgfile_write (f, "gfx_lores_%s=%s\n", suffix, p->lores ? "true" : "false");
+    cfgfile_write (f, "gfx_linemode_%s=%s\n", suffix, linemode1[p->linedbl]);
+    cfgfile_write (f, "gfx_correct_aspect_%s=%s\n", suffix, p->correct_aspect ? "true" : "false");
+    cfgfile_write (f, "gfx_center_horizontal_%s=%s\n", suffix, centermode1[p->xcenter]);
+    cfgfile_write (f, "gfx_center_vertical_%s=%s\n", suffix, centermode1[p->ycenter]);
+}
+
 void save_options (FILE *f, struct uae_prefs *p)
 {
     struct strlist *sl;
     char *str;
     int i;
 
-    fprintf (f, "config_description=%s\n", p->description);
+    cfgfile_write (f, "config_description=%s\n", p->description);
 
     for (sl = p->unknown_lines; sl; sl = sl->next)
-	fprintf (f, "%s\n", sl->str);
+	cfgfile_write (f, "%s\n", sl->str);
 
-    fprintf (f, "%s.rom_path=%s\n", TARGET_NAME, p->path_rom);
-    fprintf (f, "%s.floppy_path=%s\n", TARGET_NAME, p->path_floppy);
-    fprintf (f, "%s.hardfile_path=%s\n", TARGET_NAME, p->path_hardfile);
+    cfgfile_write (f, "%s.rom_path=%s\n", TARGET_NAME, p->path_rom);
+    cfgfile_write (f, "%s.floppy_path=%s\n", TARGET_NAME, p->path_floppy);
+    cfgfile_write (f, "%s.hardfile_path=%s\n", TARGET_NAME, p->path_hardfile);
 
     target_save_options (f, p);
 
-    fprintf (f, "use_gui=%s\n", guimode1[p->start_gui]);
-    fprintf (f, "use_debugger=%s\n", p->start_debugger ? "true" : "false");
+    cfgfile_write (f, "use_gui=%s\n", guimode1[p->start_gui]);
+    cfgfile_write (f, "use_debugger=%s\n", p->start_debugger ? "true" : "false");
     str = cfgfile_subst_path (p->path_rom, UNEXPANDED, p->romfile);
-    fprintf (f, "kickstart_rom_file=%s\n", str);
+    cfgfile_write (f, "kickstart_rom_file=%s\n", str);
+    free (str);
+    str = cfgfile_subst_path (p->path_rom, UNEXPANDED, p->romextfile);
+    cfgfile_write (f, "kickstart_ext_rom_file=%s\n", str);
     free (str);
     str = cfgfile_subst_path (p->path_rom, UNEXPANDED, p->keyfile);
-    fprintf (f, "kickstart_key_file=%s\n", str);
+    cfgfile_write (f, "kickstart_key_file=%s\n", str);
     free (str);
-    fprintf (f, "kickshifter=%s\n", p->kickshifter ? "true" : "false");
+    cfgfile_write (f, "kickshifter=%s\n", p->kickshifter ? "true" : "false");
 
     for (i = 0; i < 4; i++) {
 	str = cfgfile_subst_path (p->path_floppy, UNEXPANDED, p->df[i]);
-	fprintf (f, "floppy%d=%s\n", i, str);
+	cfgfile_write (f, "floppy%d=%s\n", i, str);
 	free (str);
     }
-    fprintf (f, "nr_floppies=%d\n", p->nr_floppies);
-    fprintf (f, "parallel_on_demand=%s\n", p->parallel_demand ? "true" : "false");
-    fprintf (f, "serial_on_demand=%s\n", p->serial_demand ? "true" : "false");
-
-    fprintf (f, "sound_output=%s\n", soundmode[p->produce_sound]);
-    fprintf (f, "sound_channels=%s\n", stereomode1[p->stereo + p->mixed_stereo]);
-    fprintf (f, "sound_bits=%d\n", p->sound_bits);
-    fprintf (f, "sound_min_buff=%d\n", p->sound_minbsiz);
-    fprintf (f, "sound_max_buff=%d\n", p->sound_maxbsiz);
-    fprintf (f, "sound_frequency=%d\n", p->sound_freq);
-    fprintf (f, "sound_interpol=%s\n", interpolmode[p->sound_interpol]);
-
-    fprintf (f, "sound_pri_time=%d\n", p->sound_pri_time);
-    fprintf (f, "sound_pri_cutoff=%d\n", p->sound_pri_cutoff);
-
-    fprintf (f, "joyport0=%s\n", portmode[p->jport0]);
-    fprintf (f, "joyport1=%s\n", portmode[p->jport1]);
-
-    fprintf (f, "bsdsocket_emu=%s\n", p->socket_emu ? "true" : "false");
-
-    fprintf (f, "gfx_framerate=%d\n", p->gfx_framerate);
-    fprintf (f, "gfx_width=%d\n", p->gfx_width);
-    fprintf (f, "gfx_height=%d\n", p->gfx_height);
-    fprintf (f, "gfx_lores=%s\n", p->gfx_lores ? "true" : "false");
-    fprintf (f, "gfx_linemode=%s\n", linemode1[p->gfx_linedbl]);
-    fprintf (f, "gfx_correct_aspect=%s\n", p->gfx_correct_aspect ? "true" : "false");
-    fprintf (f, "gfx_fullscreen_amiga=%s\n", p->gfx_afullscreen ? "true" : "false");
-    fprintf (f, "gfx_fullscreen_picasso=%s\n", p->gfx_pfullscreen ? "true" : "false");
-    fprintf (f, "gfx_center_horizontal=%s\n", centermode1[p->gfx_xcenter]);
-    fprintf (f, "gfx_center_vertical=%s\n", centermode1[p->gfx_ycenter]);
-    fprintf (f, "gfx_colour_mode=%s\n", colormode1[p->color_mode]);
+    cfgfile_write (f, "nr_floppies=%d\n", p->nr_floppies);
+    cfgfile_write (f, "parallel_on_demand=%s\n", p->parallel_demand ? "true" : "false");
+    cfgfile_write (f, "serial_on_demand=%s\n", p->serial_demand ? "true" : "false");
+
+    cfgfile_write (f, "sound_output=%s\n", soundmode[p->produce_sound]);
+    cfgfile_write (f, "sound_channels=%s\n", stereomode1[p->sound_stereo + p->mixed_stereo]);
+    cfgfile_write (f, "sound_bits=%d\n", p->sound_bits);
+    cfgfile_write (f, "sound_min_buff=%d\n", p->sound_minbsiz);
+    cfgfile_write (f, "sound_max_buff=%d\n", p->sound_maxbsiz);
+    cfgfile_write (f, "sound_frequency=%d\n", p->sound_freq);
+    cfgfile_write (f, "sound_interpol=%s\n", interpolmode[p->sound_interpol]);
+
+    cfgfile_write (f, "sound_pri_time=%d\n", p->sound_pri_time);
+    cfgfile_write (f, "sound_pri_cutoff=%d\n", p->sound_pri_cutoff);
+
+    for (i = 0; i < 2; i++) {
+	int v = i == 0 ? p->jport0 : p->jport1;
+	char tmp1[100], tmp2[50];
+	if (v < JSEM_JOYS) {
+	    sprintf (tmp2, "kbd%d", v + 1);
+	} else if (v < JSEM_MICE) {
+	    sprintf (tmp2, "joy%d", v - JSEM_JOYS);
+	} else {
+	    strcpy (tmp2, "mouse");
+	    if (v - JSEM_MICE > 0)
+		sprintf (tmp2, "mouse%d", v - JSEM_MICE);
+	}
+	sprintf (tmp1, "joyport%d=%s\n", i, tmp2);
+	cfgfile_write (f, tmp1);
+    }
 
-    fprintf (f, "immediate_blits=%s\n", p->immediate_blits ? "true" : "false");
-    fprintf (f, "ntsc=%s\n", p->ntscmode ? "true" : "false");
+    cfgfile_write (f, "bsdsocket_emu=%s\n", p->socket_emu ? "true" : "false");
+
+    cfgfile_write (f, "gfx_framerate=%d\n", p->gfx_framerate);
+    write_gfx_params (f, &p->gfx_w, "windowed");
+    write_gfx_params (f, &p->gfx_f, "fullscreen");
+    cfgfile_write (f, "gfx_fullscreen_amiga=%s\n", p->gfx_afullscreen ? "true" : "false");
+    cfgfile_write (f, "gfx_fullscreen_picasso=%s\n", p->gfx_pfullscreen ? "true" : "false");
+    cfgfile_write (f, "gfx_colour_mode=%s\n", colormode1[p->color_mode]);
+
+    cfgfile_write (f, "immediate_blits=%s\n", p->immediate_blits ? "true" : "false");
+    cfgfile_write (f, "ntsc=%s\n", p->ntscmode ? "true" : "false");
+    cfgfile_write (f, "show_leds=%s\n", p->leds_on_screen ? "true" : "false");
     if (p->chipset_mask & CSMASK_AGA)
-	fprintf (f, "chipset=aga\n");
+	cfgfile_write (f, "chipset=aga\n");
     else if ((p->chipset_mask & CSMASK_ECS_AGNUS) && (p->chipset_mask & CSMASK_ECS_AGNUS))
-	fprintf (f, "chipset=ecs\n");
+	cfgfile_write (f, "chipset=ecs\n");
     else if (p->chipset_mask & CSMASK_ECS_AGNUS)
-	fprintf (f, "chipset=ecs_agnus\n");
+	cfgfile_write (f, "chipset=ecs_agnus\n");
     else if (p->chipset_mask & CSMASK_ECS_DENISE)
-	fprintf (f, "chipset=ecs_denise\n");
+	cfgfile_write (f, "chipset=ecs_denise\n");
     else
-	fprintf (f, "chipset=ocs\n");
-    fprintf (f, "collision_level=%s\n", collmode[p->collision_level]);
+	cfgfile_write (f, "chipset=ocs\n");
+    cfgfile_write (f, "collision_level=%s\n", collmode[p->collision_level]);
 
-    fprintf (f, "fastmem_size=%d\n", p->fastmem_size / 0x100000);
-    fprintf (f, "a3000mem_size=%d\n", p->a3000mem_size / 0x100000);
-    fprintf (f, "z3mem_size=%d\n", p->z3fastmem_size / 0x100000);
-    fprintf (f, "bogomem_size=%d\n", p->bogomem_size / 0x40000);
-    fprintf (f, "gfxcard_size=%d\n", p->gfxmem_size / 0x100000);
-    fprintf (f, "chipmem_size=%d\n", p->chipmem_size / 0x80000);
+    cfgfile_write (f, "fastmem_size=%d\n", p->fastmem_size / 0x100000);
+    cfgfile_write (f, "a3000mem_size=%d\n", p->a3000mem_size / 0x100000);
+    cfgfile_write (f, "z3mem_size=%d\n", p->z3fastmem_size / 0x100000);
+    cfgfile_write (f, "bogomem_size=%d\n", p->bogomem_size / 0x40000);
+    cfgfile_write (f, "gfxcard_size=%d\n", p->gfxmem_size / 0x100000);
+    cfgfile_write (f, "chipmem_size=%d\n", p->chipmem_size / 0x80000);
 
     if (p->m68k_speed > 0)
-	fprintf (f, "finegrain_cpu_speed=%d\n", p->m68k_speed);
+	cfgfile_write (f, "finegrain_cpu_speed=%d\n", p->m68k_speed);
     else
-	fprintf (f, "cpu_speed=%s\n", p->m68k_speed == -1 ? "max" : "real");
+	cfgfile_write (f, "cpu_speed=%s\n", p->m68k_speed == -1 ? "max" : "real");
 
-    fprintf (f, "cpu_type=%s\n", cpumode[p->cpu_level * 2 + !p->address_space_24]);
-    fprintf (f, "cpu_compatible=%s\n", p->cpu_compatible ? "true" : "false");
+    cfgfile_write (f, "cpu_type=%s\n", cpumode[p->cpu_level * 2 + !p->address_space_24]);
+    cfgfile_write (f, "cpu_compatible=%s\n", p->cpu_compatible ? "true" : "false");
 
-    fprintf (f, "accuracy=%d\n", p->emul_accuracy);
-    fprintf (f, "log_illegal_mem=%s\n", p->illegal_mem ? "true" : "false");
+    cfgfile_write (f, "accuracy=%d\n", p->emul_accuracy);
+    cfgfile_write (f, "log_illegal_mem=%s\n", p->illegal_mem ? "true" : "false");
 
-    fprintf (f, "kbd_lang=%s\n", (p->keyboard_lang == KBD_LANG_DE ? "de"
+    cfgfile_write (f, "kbd_lang=%s\n", (p->keyboard_lang == KBD_LANG_DE ? "de"
 				  : p->keyboard_lang == KBD_LANG_DK ? "dk"
 				  : p->keyboard_lang == KBD_LANG_ES ? "es"
 				  : p->keyboard_lang == KBD_LANG_US ? "us"
@@ -340,6 +366,11 @@ int cfgfile_parse_option (struct uae_pre
     char *section = 0;
     char *tmpp;
 
+    if (memcmp (option, "input.", 6) == 0) {
+	read_inputdevice_config (p, option, value);
+	return 1;
+    }
+
     for (tmpp = option; *tmpp != '\0'; tmpp++)
 	if (isupper (*tmpp))
 	    *tmpp = tolower (*tmpp);
@@ -362,8 +393,14 @@ int cfgfile_parse_option (struct uae_pre
 	|| cfgfile_yesno (option, value, "bsdsocket_emu", &p->socket_emu)
 	|| cfgfile_yesno (option, value, "immediate_blits", &p->immediate_blits)
 	|| cfgfile_yesno (option, value, "kickshifter", &p->kickshifter)
-	|| cfgfile_yesno (option, value, "gfx_lores", &p->gfx_lores)
-	|| cfgfile_yesno (option, value, "gfx_correct_aspect", &p->gfx_correct_aspect)
+	|| (cfgfile_yesno (option, value, "gfx_lores", &p->gfx_w.lores)
+	    && cfgfile_yesno (option, value, "gfx_lores", &p->gfx_f.lores))
+	|| cfgfile_yesno (option, value, "gfx_lores_windowed", &p->gfx_w.lores)
+	|| cfgfile_yesno (option, value, "gfx_lores_fullscreen", &p->gfx_f.lores)
+	|| (cfgfile_yesno (option, value, "gfx_correct_aspect", &p->gfx_w.correct_aspect)
+	    && cfgfile_yesno (option, value, "gfx_correct_aspect", &p->gfx_f.correct_aspect))
+	|| cfgfile_yesno (option, value, "gfx_correct_aspect_windowed", &p->gfx_w.correct_aspect)
+	|| cfgfile_yesno (option, value, "gfx_correct_aspect_fullscreen", &p->gfx_f.correct_aspect)
 	|| cfgfile_yesno (option, value, "gfx_fullscreen_amiga", &p->gfx_afullscreen)
 	|| cfgfile_yesno (option, value, "gfx_fullscreen_picasso", &p->gfx_pfullscreen)
 	|| cfgfile_yesno (option, value, "ntsc", &p->ntscmode)
@@ -383,8 +420,14 @@ int cfgfile_parse_option (struct uae_pre
 	|| cfgfile_intval (option, value, "sound_pri_cutoff", &p->sound_pri_cutoff, 1)
 	|| cfgfile_intval (option, value, "sound_pri_time", &p->sound_pri_time, 1)
 	|| cfgfile_intval (option, value, "gfx_framerate", &p->gfx_framerate, 1)
-	|| cfgfile_intval (option, value, "gfx_width", &p->gfx_width, 1)
-	|| cfgfile_intval (option, value, "gfx_height", &p->gfx_height, 1)
+	|| (cfgfile_intval (option, value, "gfx_width", &p->gfx_w.width, 1)
+	    && cfgfile_intval (option, value, "gfx_width", &p->gfx_f.width, 1))
+	|| cfgfile_intval (option, value, "gfx_width_windowed", &p->gfx_w.width, 1)
+	|| cfgfile_intval (option, value, "gfx_width_fullscreen", &p->gfx_f.width, 1)
+	|| (cfgfile_intval (option, value, "gfx_height", &p->gfx_w.height, 1)
+	    && cfgfile_intval (option, value, "gfx_height", &p->gfx_f.height, 1))
+	|| cfgfile_intval (option, value, "gfx_height_windowed", &p->gfx_w.height, 1)
+	|| cfgfile_intval (option, value, "gfx_height_fullscreen", &p->gfx_f.height, 1)
 	|| cfgfile_intval (option, value, "fastmem_size", &p->fastmem_size, 0x100000)
 	|| cfgfile_intval (option, value, "a3000mem_size", &p->a3000mem_size, 0x100000)
 	|| cfgfile_intval (option, value, "z3mem_size", &p->z3fastmem_size, 0x100000)
@@ -395,28 +438,77 @@ int cfgfile_parse_option (struct uae_pre
 	return 1;
     if (cfgfile_strval (option, value, "sound_output", &p->produce_sound, soundmode, 0)
 	|| cfgfile_strval (option, value, "sound_interpol", &p->sound_interpol, interpolmode, 0)
-	|| cfgfile_strval (option, value, "joyport0", &p->jport0, portmode, 0)
-	|| cfgfile_strval (option, value, "joyport1", &p->jport1, portmode, 0)
 	|| cfgfile_strval (option, value, "use_gui", &p->start_gui, guimode1, 1)
 	|| cfgfile_strval (option, value, "use_gui", &p->start_gui, guimode2, 1)
 	|| cfgfile_strval (option, value, "use_gui", &p->start_gui, guimode3, 0)
 	|| cfgfile_strval (option, value, "collision_level", &p->collision_level, collmode, 0)
-	|| cfgfile_strval (option, value, "gfx_linemode", &p->gfx_linedbl, linemode1, 1)
-	|| cfgfile_strval (option, value, "gfx_linemode", &p->gfx_linedbl, linemode2, 0)
-	|| cfgfile_strval (option, value, "gfx_center_horizontal", &p->gfx_xcenter, centermode1, 1)
-	|| cfgfile_strval (option, value, "gfx_center_vertical", &p->gfx_ycenter, centermode1, 1)
-	|| cfgfile_strval (option, value, "gfx_center_horizontal", &p->gfx_xcenter, centermode2, 0)
-	|| cfgfile_strval (option, value, "gfx_center_vertical", &p->gfx_ycenter, centermode2, 0)
+	|| (cfgfile_strval (option, value, "gfx_linemode", &p->gfx_w.linedbl, linemode1, 1)
+	    && cfgfile_strval (option, value, "gfx_linemode", &p->gfx_f.linedbl, linemode1, 1))
+	|| (cfgfile_strval (option, value, "gfx_linemode", &p->gfx_w.linedbl, linemode2, 0)
+	    && cfgfile_strval (option, value, "gfx_linemode", &p->gfx_f.linedbl, linemode2, 0))
+	|| cfgfile_strval (option, value, "gfx_linemode_windowed", &p->gfx_w.linedbl, linemode1, 1)
+	|| cfgfile_strval (option, value, "gfx_linemode_windowed", &p->gfx_w.linedbl, linemode2, 0)
+	|| cfgfile_strval (option, value, "gfx_linemode_fullscreen", &p->gfx_f.linedbl, linemode1, 1)
+	|| cfgfile_strval (option, value, "gfx_linemode_fullscreen", &p->gfx_f.linedbl, linemode2, 0)
+	|| (cfgfile_strval (option, value, "gfx_center_horizontal", &p->gfx_w.xcenter, centermode1, 1)
+	    && cfgfile_strval (option, value, "gfx_center_horizontal", &p->gfx_f.xcenter, centermode1, 1))
+	|| (cfgfile_strval (option, value, "gfx_center_horizontal", &p->gfx_w.xcenter, centermode2, 0)
+	    && cfgfile_strval (option, value, "gfx_center_horizontal", &p->gfx_f.xcenter, centermode2, 0))
+	|| cfgfile_strval (option, value, "gfx_center_horizontal_windowed", &p->gfx_w.xcenter, centermode1, 1)
+	|| cfgfile_strval (option, value, "gfx_center_horizontal_windowed", &p->gfx_w.xcenter, centermode2, 0)
+	|| cfgfile_strval (option, value, "gfx_center_horizontal_fullscreen", &p->gfx_f.xcenter, centermode1, 1)
+	|| cfgfile_strval (option, value, "gfx_center_horizontal_fullscreen", &p->gfx_f.xcenter, centermode2, 0)
+	|| (cfgfile_strval (option, value, "gfx_center_vertical", &p->gfx_w.ycenter, centermode1, 1)
+	    && cfgfile_strval (option, value, "gfx_center_vertical", &p->gfx_f.ycenter, centermode1, 1))
+	|| (cfgfile_strval (option, value, "gfx_center_vertical", &p->gfx_w.ycenter, centermode2, 0)
+	    && cfgfile_strval (option, value, "gfx_center_vertical", &p->gfx_f.ycenter, centermode2, 0))
+	|| cfgfile_strval (option, value, "gfx_center_vertical_windowed", &p->gfx_w.ycenter, centermode1, 1)
+	|| cfgfile_strval (option, value, "gfx_center_vertical_windowed", &p->gfx_w.ycenter, centermode2, 0)
+	|| cfgfile_strval (option, value, "gfx_center_vertical_fullscreen", &p->gfx_f.ycenter, centermode1, 1)
+	|| cfgfile_strval (option, value, "gfx_center_vertical_fullscreen", &p->gfx_f.ycenter, centermode2, 0)
 	|| cfgfile_strval (option, value, "gfx_colour_mode", &p->color_mode, colormode1, 1)
 	|| cfgfile_strval (option, value, "gfx_colour_mode", &p->color_mode, colormode2, 0)
 	|| cfgfile_strval (option, value, "gfx_color_mode", &p->color_mode, colormode1, 1)
 	|| cfgfile_strval (option, value, "gfx_color_mode", &p->color_mode, colormode2, 0))
 	return 1;
+
+    if (strcmp (option, "joyport0") == 0 || strcmp (option, "joyport1") == 0) {
+	int port = strcmp (option, "joyport0") == 0 ? 0 : 1;
+	int start = -1;
+	char *pp = 0;
+	if (strncmp (value, "kbd", 3) == 0) {
+	    start = JSEM_KBDLAYOUT;
+	    pp = value + 3;
+	} else if (strncmp (value, "joy", 3) == 0) {
+	    start = JSEM_JOYS;
+	    pp = value + 3;
+	} else if (strncmp (value, "mouse", 5) == 0) {
+	    start = JSEM_MICE;
+	    pp = value + 5;
+	}
+	if (pp) {
+	    int v = atol (pp);
+	    if (start >= 0) {
+		if (start == JSEM_KBDLAYOUT)
+		    v--;
+		if (v >= 0) {
+		    start += v;
+		    if (port)
+			p->jport1 = start;
+		    else
+			p->jport0 = start;
+		}
+	    }
+	}
+	return 1;
+    }
+
     if (cfgfile_string (option, value, "floppy0", p->df[0], 256)
 	|| cfgfile_string (option, value, "floppy1", p->df[1], 256)
 	|| cfgfile_string (option, value, "floppy2", p->df[2], 256)
 	|| cfgfile_string (option, value, "floppy3", p->df[3], 256)
 	|| cfgfile_string (option, value, "kickstart_rom_file", p->romfile, 256)
+	|| cfgfile_string (option, value, "kickstart_ext_rom_file", p->romextfile, 256)
 	|| cfgfile_string (option, value, "kickstart_key_file", p->keyfile, 256)
 	|| cfgfile_string (option, value, "config_description", p->description, 256))
 	return 1;
@@ -427,15 +519,16 @@ int cfgfile_parse_option (struct uae_pre
 	return 1;
     }
 
-    if (cfgfile_strval (option, value, "sound_channels", &p->stereo, stereomode1, 1)
-	|| cfgfile_strval (option, value, "sound_channels", &p->stereo, stereomode2, 1)
-	|| cfgfile_strval (option, value, "sound_channels", &p->stereo, stereomode3, 0))
+    if (cfgfile_strval (option, value, "sound_channels", &p->sound_stereo, stereomode1, 1)
+	|| cfgfile_strval (option, value, "sound_channels", &p->sound_stereo, stereomode2, 1)
+	|| cfgfile_strval (option, value, "sound_channels", &p->sound_stereo, stereomode3, 0))
     {
 	p->mixed_stereo = 0;
-	if (p->stereo == 2) {
-	    p->stereo = 1;
+	if (p->sound_stereo == 2) {
+	    p->sound_stereo = 1;
 	    p->mixed_stereo = 1;
 	}
+	return 1;
     }
 
     if (cfgfile_strval (option, value, "cpu_type", &p->cpu_level, cpumode, 0)) {
@@ -451,7 +544,7 @@ int cfgfile_parse_option (struct uae_pre
 	return 1;
     }
     if (cfgfile_intval (option, value, "cpu_speed", &p->m68k_speed, 1)) {
-        p->m68k_speed *= CYCLE_UNIT;
+	p->m68k_speed *= CYCLE_UNIT;
 	return 1;
     }
     if (cfgfile_intval (option, value, "finegrain_cpu_speed", &p->m68k_speed, 1)) {
@@ -579,7 +672,6 @@ static void subst (char *p, char *f, int
 
 int cfgfile_load (struct uae_prefs *p, const char *filename)
 {
-    char *str;
     int i;
 
     FILE *fh;
@@ -590,7 +682,11 @@ int cfgfile_load (struct uae_prefs *p, c
 	return 0;
 
     while (fgets (line, 256, fh) != 0) {
-	line[strcspn (line, "\t \r\n")] = '\0';
+	int len = strlen (line);
+	/* Delete trailing whitespace.  */
+	while (len > 0 && strcspn (line + len - 1, "\t \r\n") == 0) {
+	    line[--len] = '\0';
+	}
 	if (strlen (line) > 0)
 	    cfgfile_parse_line (p, line);
     }
@@ -599,6 +695,7 @@ int cfgfile_load (struct uae_prefs *p, c
     for (i = 0; i < 4; i++)
 	subst (p->path_floppy, p->df[i], sizeof p->df[i]);
     subst (p->path_rom, p->romfile, sizeof p->romfile);
+    subst (p->path_rom, p->romextfile, sizeof p->romextfile);
     subst (p->path_rom, p->keyfile, sizeof p->keyfile);
 
     return 1;
@@ -621,7 +718,7 @@ int cfgfile_get_description (const char
     struct uae_prefs p;
     default_prefs (&p);
     strcpy (p.description, "");
-    if (cfgfile_load (&p, filename) && strlen (p.description) != 0) {
+    if (cfgfile_load (&p, filename)) {
 	result = 1;
 	strcpy (description, p.description);
     }
@@ -642,7 +739,7 @@ void cfgfile_show_usage (void)
    because the new way of doing things is painful for me (it requires me
    to type a couple hundred characters when invoking UAE).  The following
    is far less annoying to use.  */
-static void parse_gfx_specs (char *spec)
+static void parse_gfx_specs (struct uae_prefs *p, char *spec)
 {
     char *x0 = my_strdup (spec);
     char *x1, *x2;
@@ -655,21 +752,24 @@ static void parse_gfx_specs (char *spec)
 	goto argh;
     *x1++ = 0; *x2++ = 0;
 
-    currprefs.gfx_width = atoi (x0);
-    currprefs.gfx_height = atoi (x1);
-    currprefs.gfx_lores = strchr (x2, 'l') != 0;
-    currprefs.gfx_xcenter = strchr (x2, 'x') != 0 ? 1 : strchr (x2, 'X') != 0 ? 2 : 0;
-    currprefs.gfx_ycenter = strchr (x2, 'y') != 0 ? 1 : strchr (x2, 'Y') != 0 ? 2 : 0;
-    currprefs.gfx_linedbl = strchr (x2, 'd') != 0;
-    currprefs.gfx_linedbl += 2 * (strchr (x2, 'D') != 0);
-    currprefs.gfx_afullscreen = strchr (x2, 'a') != 0;
-    currprefs.gfx_pfullscreen = strchr (x2, 'p') != 0;
-    currprefs.gfx_correct_aspect = strchr (x2, 'c') != 0;
+    p->gfx_w.width = atoi (x0);
+    p->gfx_w.height = atoi (x1);
+    p->gfx_w.lores = strchr (x2, 'l') != 0;
+    p->gfx_w.xcenter = strchr (x2, 'x') != 0 ? 1 : strchr (x2, 'X') != 0 ? 2 : 0;
+    p->gfx_w.ycenter = strchr (x2, 'y') != 0 ? 1 : strchr (x2, 'Y') != 0 ? 2 : 0;
+    p->gfx_w.linedbl = strchr (x2, 'd') != 0;
+    p->gfx_w.linedbl += 2 * (strchr (x2, 'D') != 0);
+    p->gfx_w.correct_aspect = strchr (x2, 'c') != 0;
 
-    if (currprefs.gfx_linedbl == 3) {
+    p->gfx_f = p->gfx_w;
+
+    p->gfx_afullscreen = strchr (x2, 'a') != 0;
+    p->gfx_pfullscreen = strchr (x2, 'p') != 0;
+
+    if (p->gfx_w.linedbl == 3) {
 	fprintf (stderr, "You can't use both 'd' and 'D' modifiers in the display mode specification.\n");
     }
-    
+
     free (x0);
     return;
 
@@ -680,7 +780,7 @@ static void parse_gfx_specs (char *spec)
     free (x0);
 }
 
-static void parse_sound_spec (char *spec)
+static void parse_sound_spec (struct uae_prefs *p, char *spec)
 {
     char *x0 = my_strdup (spec);
     char *x1, *x2 = NULL, *x3 = NULL, *x4 = NULL, *x5 = NULL;
@@ -702,52 +802,52 @@ static void parse_sound_spec (char *spec
 	    }
 	}
     }
-    currprefs.produce_sound = atoi (x0);
+    p->produce_sound = atoi (x0);
     if (x1) {
-	currprefs.mixed_stereo = 0;
+	p->mixed_stereo = 0;
 	if (*x1 == 'S')
-	    currprefs.stereo = currprefs.mixed_stereo = 1;
+	    p->sound_stereo = p->mixed_stereo = 1;
 	else if (*x1 == 's')
-	    currprefs.stereo = 1;
+	    p->sound_stereo = 1;
 	else
-	    currprefs.stereo = 0;
+	    p->sound_stereo = 0;
     }
     if (x2)
-	currprefs.sound_bits = atoi (x2);
+	p->sound_bits = atoi (x2);
     if (x3)
-	currprefs.sound_freq = atoi (x3);
+	p->sound_freq = atoi (x3);
     if (x4)
-	currprefs.sound_maxbsiz = currprefs.sound_minbsiz = atoi (x4);
+	p->sound_maxbsiz = p->sound_minbsiz = atoi (x4);
     if (x5)
-	currprefs.sound_minbsiz = atoi (x5);
+	p->sound_minbsiz = atoi (x5);
     free (x0);
     return;
 }
 
 
-static void parse_joy_spec (char *spec)
+static void parse_joy_spec (struct uae_prefs *p, char *spec)
 {
     int v0 = 2, v1 = 0;
     if (strlen(spec) != 2)
 	goto bad;
 
     switch (spec[0]) {
-     case '0': v0 = 0; break;
-     case '1': v0 = 1; break;
-     case 'M': case 'm': v0 = 2; break;
-     case 'A': case 'a': v0 = 3; break;
-     case 'B': case 'b': v0 = 4; break;
-     case 'C': case 'c': v0 = 5; break;
+     case '0': v0 = JSEM_JOYS; break;
+     case '1': v0 = JSEM_JOYS + 1; break;
+     case 'M': case 'm': v0 = JSEM_MICE; break;
+     case 'A': case 'a': v0 = JSEM_KBDLAYOUT; break;
+     case 'B': case 'b': v0 = JSEM_KBDLAYOUT + 1; break;
+     case 'C': case 'c': v0 = JSEM_KBDLAYOUT + 2; break;
      default: goto bad;
     }
 
     switch (spec[1]) {
-     case '0': v1 = 0; break;
-     case '1': v1 = 1; break;
-     case 'M': case 'm': v1 = 2; break;
-     case 'A': case 'a': v1 = 3; break;
-     case 'B': case 'b': v1 = 4; break;
-     case 'C': case 'c': v1 = 5; break;
+     case '0': v1 = JSEM_JOYS; break;
+     case '1': v1 = JSEM_JOYS + 1; break;
+     case 'M': case 'm': v1 = JSEM_MICE; break;
+     case 'A': case 'a': v1 = JSEM_KBDLAYOUT; break;
+     case 'B': case 'b': v1 = JSEM_KBDLAYOUT + 1; break;
+     case 'C': case 'c': v1 = JSEM_KBDLAYOUT + 2; break;
      default: goto bad;
     }
     if (v0 == v1)
@@ -755,12 +855,12 @@ static void parse_joy_spec (char *spec)
     /* Let's scare Pascal programmers */
     if (0)
 bad:
-    fprintf (stderr, "Bad joystick mode specification. Use -J xy, where x and y\n"
+    write_log ("Bad joystick mode specification. Use -J xy, where x and y\n"
 	     "can be 0 for joystick 0, 1 for joystick 1, M for mouse, and\n"
 	     "a, b or c for different keyboard settings.\n");
 
-    currprefs.jport0 = v0;
-    currprefs.jport1 = v1;
+    p->jport0 = v0;
+    p->jport1 = v1;
 }
 
 static void parse_filesys_spec (int readonly, char *spec)
@@ -775,7 +875,7 @@ static void parse_filesys_spec (int read
 #ifdef __DOS__
 	{
 	    char *tmp;
- 
+
 	    while ((tmp = strchr (s2, '\\')))
 		*tmp = '/';
 	}
@@ -787,7 +887,7 @@ static void parse_filesys_spec (int read
 	fprintf (stderr, "Usage: [-m | -M] VOLNAME:mount_point\n");
     }
 }
- 
+
 static void parse_hardfile_spec (char *spec)
 {
     char *x0 = my_strdup (spec);
@@ -828,7 +928,7 @@ static void parse_cpu_specs (char *spec)
 	fprintf (stderr, "CPU parameter string must begin with '0', '1', '2', '3' or '4'.\n");
 	return;
     }
-	
+
     currprefs.cpu_level = *spec++ - '0';
     currprefs.address_space_24 = currprefs.cpu_level < 2;
     currprefs.cpu_compatible = 0;
@@ -880,12 +980,12 @@ int parse_cmdline_option (char c, char *
 	/*     case 'I': strncpy (currprefs.sername, arg, 255); currprefs.sername[255] = 0; currprefs.use_serial = 1; break; */
     case 'm': case 'M': parse_filesys_spec (c == 'M', arg); break;
     case 'W': parse_hardfile_spec (arg); break;
-    case 'S': parse_sound_spec (arg); break;
+    case 'S': parse_sound_spec (&currprefs, arg); break;
     case 'R': currprefs.gfx_framerate = atoi (arg); break;
     case 'A': currprefs.emul_accuracy = atoi (arg); break;
     case 'x': currprefs.no_xhair = 1; break;
     case 'i': currprefs.illegal_mem = 1; break;
-    case 'J': parse_joy_spec (arg); break;
+    case 'J': parse_joy_spec (&currprefs, arg); break;
 
     case 't': currprefs.test_drawing_speed = 1; break;
     case 'L': currprefs.x11_use_low_bandwidth = 1; break;
@@ -948,7 +1048,7 @@ int parse_cmdline_option (char c, char *
 	    currprefs.keyboard_lang = KBD_LANG_ES;
 	break;
 
-    case 'O': parse_gfx_specs (arg); break;
+    case 'O': parse_gfx_specs (&currprefs, arg); break;
     case 'd':
 	if (strchr (arg, 'S') != NULL || strchr (arg, 's')) {
 	    write_log ("  Serial on demand.\n");