--- uae/src/gtkui.c	2018/04/24 16:40:02	1.1
+++ uae/src/gtkui.c	2018/04/24 16:58:23	1.1.1.9
@@ -4,6 +4,7 @@
  * Yet Another User Interface for the X11 version
  *
  * Copyright 1997, 1998 Bernd Schmidt
+ * Copyright 1998 Michael Krause
  * 
  * The Tk GUI doesn't work.
  * The X Forms Library isn't available as source, and there aren't any
@@ -20,24 +21,40 @@
 #include "uae.h"
 #include "memory.h"
 #include "custom.h"
-#include "readcpu.h"
 #include "gui.h"
 #include "newcpu.h"
 #include "threaddep/penguin.h"
+#include "sounddep/sound.h"
 
 #include <gtk/gtk.h>
 
+/* One of the 1.1.6 "features" is a gratuitous name change */
+#ifndef HAVE_GTK_FEATURES_1_1_6
+#define gtk_container_set_border_width gtk_container_border_width
+#endif
+/* Likewise for 1.1.8.  */
+#ifndef HAVE_GTK_FEATURES_1_1_8
+#define gtk_label_set_text gtk_label_set
+#endif
+/* This is beginning to suck... */
+#ifndef HAVE_GTK_FEATURES_1_1_13
+#define gtk_toggle_button_set_active gtk_toggle_button_set_state
+#endif
+
 static int gui_active;
 
+static GtkWidget *pause_uae_widget;
+
 static GtkWidget *disk_insert_widget[4], *disk_eject_widget[4], *disk_text_widget[4];
-static char *disk_string[4];
 static char *new_disk_string[4];
 
 static GtkAdjustment *cpuspeed_adj;
-static GtkWidget *cpu_widget[4], *a24m_widget, *ccpu_widget;
+static GtkWidget *cpuspeed_widgets[4], *cpuspeed_scale;
+static GtkWidget *cpu_widget[5], *a24m_widget, *ccpu_widget;
+static GtkWidget *sound_widget[4], *sound_bits_widget[2], *sound_freq_widget[3], *sound_ch_widget[3];
 
 static GtkAdjustment *framerate_adj;
-static GtkWidget *bimm_widget, *b32_widget;
+static GtkWidget *bimm_widget, *b32_widget, *afscr_widget, *pfscr_widget;
 
 static GtkWidget *joy_widget[2][6];
 
@@ -45,6 +62,11 @@ static GtkWidget *led_widgets[5];
 static GdkColor led_on[5], led_off[5];
 static unsigned int prevledstate;
 
+static smp_comm_pipe to_gui_pipe, from_gui_pipe;
+static uae_sem_t gui_sem, gui_quit_sem; /* gui_sem protects the DFx fields */
+
+static volatile int quit_gui = 0, quitted_gui = 0;
+
 static void save_config (void)
 {
     FILE *f;
@@ -57,10 +79,10 @@ static void save_config (void)
 
     f = fopen (optionsfile, "w");
     if (f == NULL) {
-	fprintf(stderr, "Error saving options file!\n");
+	fprintf (stderr, "Error saving options file!\n");
 	return;
     }
-    save_options (f);
+    save_options (f, &currprefs);
     fclose (f);
 }
 
@@ -73,11 +95,6 @@ static int nr_for_led (GtkWidget *led)
     return i;
 }
 
-static smp_comm_pipe to_gui_pipe, from_gui_pipe;
-static uae_sem_t gui_sem, gui_quit_sem;
-
-static volatile int quit_gui = 0, quitted_gui = 0;
-
 static void enable_disk_buttons (int enable)
 {
     int i;
@@ -89,28 +106,41 @@ static void enable_disk_buttons (int ena
 
 static void set_cpu_state (void)
 {
-    gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (a24m_widget), changed_prefs.address_space_24 != 0);
-    gtk_widget_set_sensitive (a24m_widget, changed_prefs.cpu_level > 1);
-    gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (ccpu_widget), changed_prefs.cpu_compatible != 0);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (a24m_widget), changed_prefs.address_space_24 != 0);
+    gtk_widget_set_sensitive (a24m_widget, changed_prefs.cpu_level > 1 && changed_prefs.cpu_level < 4);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ccpu_widget), changed_prefs.cpu_compatible != 0);
     gtk_widget_set_sensitive (ccpu_widget, changed_prefs.cpu_level == 0);
+    gtk_widget_set_sensitive (cpuspeed_scale, changed_prefs.m68k_speed > 0);
 }
 
 static void set_cpu_widget (void)
 {
     int nr = changed_prefs.cpu_level;
-    gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (cpu_widget[nr]), TRUE);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cpu_widget[nr]), TRUE);
+    nr = currprefs.m68k_speed + 1 < 3 ? currprefs.m68k_speed + 1 : 2;
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cpuspeed_widgets[nr]), TRUE);
 }
 
 static void set_gfx_state (void)
 {
-    gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (bimm_widget), currprefs.immediate_blits != 0);
-    gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (b32_widget), currprefs.blits_32bit_enabled != 0);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (bimm_widget), currprefs.immediate_blits != 0);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b32_widget), currprefs.blits_32bit_enabled != 0);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (afscr_widget), currprefs.gfx_afullscreen != 0);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pfscr_widget), currprefs.gfx_pfullscreen != 0);
+}
+
+static void set_sound_state (void)
+{
+    int stereo = currprefs.stereo + currprefs.mixed_stereo;
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sound_widget[currprefs.produce_sound]), 1);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sound_ch_widget[stereo]), 1);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sound_bits_widget[currprefs.sound_bits == 16]), 1);
 }
 
 static void set_joy_state (void)
 {
-    int j0t = changed_prefs.fake_joystick & 255;
-    int j1t = (changed_prefs.fake_joystick >> 8) & 255;
+    int j0t = changed_prefs.jport0;
+    int j1t = changed_prefs.jport1;
     int i;
 
     if (j0t == j1t) {
@@ -119,8 +149,8 @@ static void set_joy_state (void)
 	j0t %= 6;
     }
     for (i = 0; i < 6; i++) {
-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (joy_widget[0][i]), j0t == i);
-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (joy_widget[1][i]), j1t == i);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (joy_widget[0][i]), j0t == i);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (joy_widget[1][i]), j1t == i);
 	gtk_widget_set_sensitive (joy_widget[0][i], j1t != i);
 	gtk_widget_set_sensitive (joy_widget[1][i], j0t != i);
     }
@@ -159,7 +189,7 @@ static int my_idle (void)
 	switch (cmd) {
 	 case 0:
 	    n = read_comm_pipe_int_blocking (&to_gui_pipe);
-	    gtk_label_set (GTK_LABEL (disk_text_widget[n]), currprefs.df[n]);
+	    gtk_label_set_text (GTK_LABEL (disk_text_widget[n]), currprefs.df[n]);
 	    break;
 	 case 1:
 	    /* Initialization.  */
@@ -167,6 +197,8 @@ static int my_idle (void)
 	    set_cpu_state ();
 	    set_gfx_state ();
 	    set_joy_state ();
+	    set_sound_state ();
+
 	    gui_active = 1;
 	    break;
 	}
@@ -174,7 +206,7 @@ static int my_idle (void)
     
     for (i = 0; i < 5; i++) {
 	unsigned int mask = 1 << i;
-	int on = leds & mask;
+	unsigned int on = leds & mask;
 
 	if (on == (prevledstate & mask))
 	    continue;
@@ -187,37 +219,42 @@ out:
     return 1;
 }
 
-static void joy_changed (void)
+static int find_current_toggle (GtkWidget **widgets, int count)
 {
-    int j0t = 0, j1t = 0;
     int i;
+    for (i = 0; i < count; i++)
+	if (GTK_TOGGLE_BUTTON (*widgets++)->active)
+	    return i;
+    fprintf (stderr, "GTKUI: Can't happen!\n");
+    return -1;
+}
+
+static void joy_changed (void)
+{
     if (! gui_active)
 	return;
 
-    for (i = 0; i < 6; i++)
-	if (GTK_TOGGLE_BUTTON (joy_widget[0][i])->active) {
-	    j0t = i;
-	    break;
-	}
-    for (i = 0; i < 6; i++)
-	if (GTK_TOGGLE_BUTTON (joy_widget[1][i])->active) {
-	    j1t = i;
-	    break;
-	}
-    changed_prefs.fake_joystick = j0t | (j1t << 8);
+    changed_prefs.jport0 = find_current_toggle (joy_widget[0], 6);
+    changed_prefs.jport1 = find_current_toggle (joy_widget[1], 6);
     set_joy_state ();
 }
 
-static void gfx_changed (void)
+static void custom_changed (void)
 {
-    changed_prefs.framerate = framerate_adj->value;
+    changed_prefs.gfx_framerate = framerate_adj->value;
     changed_prefs.blits_32bit_enabled = GTK_TOGGLE_BUTTON (b32_widget)->active;
     changed_prefs.immediate_blits = GTK_TOGGLE_BUTTON (bimm_widget)->active;
+    changed_prefs.gfx_afullscreen = GTK_TOGGLE_BUTTON (afscr_widget)->active;
+    changed_prefs.gfx_pfullscreen = GTK_TOGGLE_BUTTON (pfscr_widget)->active;
 }
 
 static void cpuspeed_changed (void)
 {
-    changed_prefs.m68k_speed = cpuspeed_adj->value;
+    int which = find_current_toggle (cpuspeed_widgets, 3);
+    changed_prefs.m68k_speed = (which == 0 ? -1
+				: which == 1 ? 0
+				: cpuspeed_adj->value);
+    set_cpu_state ();
 }
 
 static void cputype_changed (void)
@@ -228,13 +265,7 @@ static void cputype_changed (void)
 
     oldcl = changed_prefs.cpu_level;
 
-    changed_prefs.cpu_level = 0;
-    for (i = 0; i < 4; i++)
-	if (GTK_TOGGLE_BUTTON (cpu_widget[i])->active) {
-	    changed_prefs.cpu_level = i;
-	    break;
-	}
-
+    changed_prefs.cpu_level = find_current_toggle (cpu_widget, 5);
     changed_prefs.cpu_compatible = GTK_TOGGLE_BUTTON (ccpu_widget)->active;
     changed_prefs.address_space_24 = GTK_TOGGLE_BUTTON (a24m_widget)->active;
 
@@ -246,10 +277,20 @@ static void cputype_changed (void)
     /* Changing from 68000/68010 to 68020 should set a sane default.  */
     else if (oldcl < 2)
 	changed_prefs.address_space_24 = 0;
-    
+
     set_cpu_state ();
 }
 
+static void sound_changed (void)
+{
+    changed_prefs.produce_sound = find_current_toggle (sound_widget, 4);
+    changed_prefs.stereo = find_current_toggle (sound_ch_widget, 3);
+    changed_prefs.mixed_stereo = 0;
+    if (changed_prefs.stereo == 2)
+	changed_prefs.mixed_stereo = changed_prefs.stereo = 1;
+    changed_prefs.sound_bits = (find_current_toggle (sound_bits_widget, 2) + 1) * 8;
+}
+
 static void did_reset (void)
 {
     if (quit_gui)
@@ -274,15 +315,28 @@ static void did_quit (void)
     write_comm_pipe_int (&from_gui_pipe, 4, 1);
 }
 
-static void did_eject (int n)
-{ 
+static void did_eject (GtkWidget *w, gpointer data)
+{
     if (quit_gui)
 	return;
     
     write_comm_pipe_int (&from_gui_pipe, 0, 0);
-    write_comm_pipe_int (&from_gui_pipe, n, 1);
+    write_comm_pipe_int (&from_gui_pipe, (int)data, 1);
 }
 
+static void pause_uae (GtkWidget *widget, gpointer data)
+{
+    if (quit_gui)
+	return;
+
+    write_comm_pipe_int (&from_gui_pipe, GTK_TOGGLE_BUTTON (widget)->active ? 5 : 6, 1);  
+}
+
+static void end_pause_uae (void)
+{
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pause_uae_widget), FALSE);
+}
+    
 static int filesel_active = -1;
 static GtkWidget *selector;
 
@@ -321,8 +375,9 @@ static void did_insert_select (GtkObject
 
 static char fsbuffer[100];
 
-static void did_insert (int n)
+static void did_insert (GtkWidget *w, gpointer data)
 {
+    int n = (int)data;
     if (filesel_active != -1)
 	return;
     filesel_active = n;
@@ -335,20 +390,8 @@ static void did_insert (int n)
     gtk_widget_show (selector);
 }
 
-static void did_eject_0 (void) { did_eject (0); }
-static void did_eject_1 (void) { did_eject (1); }
-static void did_eject_2 (void) { did_eject (2); }
-static void did_eject_3 (void) { did_eject (3); }
-
-static void did_insert_0 (void) { did_insert (0); }
-static void did_insert_1 (void) { did_insert (1); }
-static void did_insert_2 (void) { did_insert (2); }
-static void did_insert_3 (void) { did_insert (3); }
-
 static gint driveled_event (GtkWidget *thing, GdkEvent *event)
 {
-    gint x, y;
-    GtkStyle *style;
     int lednr = nr_for_led (thing);
 
     switch (event->type) {
@@ -365,6 +408,83 @@ static gint driveled_event (GtkWidget *t
   return 0;
 }
 
+static void add_empty_vbox (GtkWidget *tobox)
+{
+    GtkWidget *thing = gtk_vbox_new (FALSE, 0);
+    gtk_widget_show (thing);
+    gtk_box_pack_start (GTK_BOX (tobox), thing, TRUE, TRUE, 0);
+}
+
+static void add_empty_hbox (GtkWidget *tobox)
+{
+    GtkWidget *thing = gtk_hbox_new (FALSE, 0);
+    gtk_widget_show (thing);
+    gtk_box_pack_start (GTK_BOX (tobox), thing, TRUE, TRUE, 0);
+}
+
+static void add_centered_to_vbox (GtkWidget *vbox, GtkWidget *w)
+{
+    GtkWidget *hbox = gtk_hbox_new (TRUE, 0);
+    gtk_widget_show (hbox);
+    gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
+}
+
+static GtkWidget *make_labelled_widget (const char *str, GtkWidget *thing)
+{
+    GtkWidget *label = gtk_label_new (str);
+    GtkWidget *hbox2 = gtk_hbox_new (FALSE, 4);
+
+    gtk_widget_show (label);
+    gtk_widget_show (thing);
+
+    gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (hbox2), thing, FALSE, TRUE, 0);
+
+    return hbox2;
+}
+
+static GtkWidget *add_labelled_widget_centered (const char *str, GtkWidget *thing, GtkWidget *vbox)
+{
+    GtkWidget *w = make_labelled_widget (str, thing);
+    gtk_widget_show (w);
+    add_centered_to_vbox (vbox, w);
+    return w;
+}
+
+static void make_radio_group (const char **labels, GtkWidget *tobox,
+			      GtkWidget **saveptr, gint t1, gint t2,
+			      void (*sigfunc) (void))
+{
+    GtkWidget *thing = NULL;
+
+    while (*labels) {
+	thing = gtk_radio_button_new_with_label ((thing
+						  ? gtk_radio_button_group (GTK_RADIO_BUTTON (thing))
+						  : 0),
+						 *labels++);
+	*saveptr++ = thing;
+	gtk_widget_show (thing);
+	gtk_box_pack_start (GTK_BOX (tobox), thing, t1, t2, 0);
+	gtk_signal_connect (GTK_OBJECT (thing), "clicked", (GtkSignalFunc) sigfunc, NULL);
+    }
+}
+
+static GtkWidget *make_radio_group_box (const char *title, const char **labels,
+					GtkWidget **saveptr, int horiz,
+					void (*sigfunc) (void))
+{
+    GtkWidget *frame, *newbox;
+
+    frame = gtk_frame_new (title);
+    newbox = (horiz ? gtk_hbox_new : gtk_vbox_new) (FALSE, 4);
+    gtk_widget_show (newbox);
+    gtk_container_set_border_width (GTK_CONTAINER (newbox), 4);
+    gtk_container_add (GTK_CONTAINER (frame), newbox);
+    make_radio_group (labels, newbox, saveptr, horiz, !horiz, sigfunc);
+    return frame;
+}
+
 static GtkWidget *make_led (int nr)
 {
     GtkWidget *subframe, *the_led, *thing;
@@ -410,196 +530,230 @@ static GtkWidget *make_led (int nr)
 
 static void make_floppy_disks (GtkWidget *vbox)
 {
+    GtkWidget *thing, *subthing, *subframe, *buttonbox;
+    char buf[5];
     int i;
-    /* Now, the floppy disk control.  */
+
+    add_empty_vbox (vbox);
+
     for (i = 0; i < 4; i++) {
-	GtkWidget *thing, *subthing, *subframe, *buttonbox;
-	char buf[5];
+	/* Frame with an hbox and the "DFx:" title */
 	sprintf (buf, "DF%d:", i);
-
-	/* Each line: a frame with a hbox in it. The hbox contains
-	 * the LED, the name of the drive and the diskfile in it, an
-	 * Insert button, and an Eject button.  */
-	buttonbox = gtk_frame_new (buf);
-	thing = gtk_hbox_new (FALSE, 4);
-	gtk_container_add (GTK_CONTAINER (buttonbox), thing);
-        gtk_box_pack_start (GTK_BOX (vbox), buttonbox, FALSE, TRUE, 0);
+	thing = gtk_frame_new (buf);
+	buttonbox = gtk_hbox_new (FALSE, 4);
+	gtk_container_set_border_width (GTK_CONTAINER (buttonbox), 4);
+	gtk_container_add (GTK_CONTAINER (thing), buttonbox);
+        gtk_box_pack_start (GTK_BOX (vbox), thing, FALSE, TRUE, 0);
 	gtk_widget_show (buttonbox);
 	gtk_widget_show (thing);
-	buttonbox = thing;
 
+	/* LED */
 	subthing = make_led (i + 1);
 	gtk_box_pack_start (GTK_BOX (buttonbox), subthing, FALSE, TRUE, 0);
 
-	/* Make the "DF0:xxx" label.  */
+	/* Current file display */
 	subframe = gtk_frame_new (NULL);
 	gtk_frame_set_shadow_type (GTK_FRAME (subframe), GTK_SHADOW_ETCHED_OUT);
-	gtk_box_pack_start (GTK_BOX (buttonbox), subframe, FALSE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (buttonbox), subframe, TRUE, TRUE, 0);
 	gtk_widget_show (subframe);
-
 	subthing = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (subthing);
 	gtk_container_add (GTK_CONTAINER (subframe), subthing);
-
 	thing = gtk_label_new ("");
 	disk_text_widget[i] = thing;
 	gtk_widget_show (thing);
-	gtk_box_pack_start (GTK_BOX (subthing), thing, FALSE, TRUE, 0);
-
-	gtk_widget_set_usize (subthing,
-			      gdk_string_measure (subframe->style->font,
-						  "This is a very long name for a disk file, should be enough") + 7, 0);
-	gtk_container_disable_resize (GTK_CONTAINER (subthing));
+	gtk_box_pack_start (GTK_BOX (subthing), thing, TRUE, TRUE, 0);
 
 	/* Now, the buttons.  */
 	thing = gtk_button_new_with_label ("Eject");
 	gtk_box_pack_start (GTK_BOX (buttonbox), thing, FALSE, TRUE, 0);
 	gtk_widget_show (thing);
 	disk_eject_widget[i] = thing;
-	gtk_signal_connect (GTK_OBJECT (thing), "clicked",
-			    (GtkSignalFunc) (i == 0 ? did_eject_0 
-					     : i == 1 ? did_eject_1 
-					     : i == 2 ? did_eject_2 : did_eject_3),
-			    NULL);
+	gtk_signal_connect (GTK_OBJECT (thing), "clicked", (GtkSignalFunc) did_eject, (gpointer) i);
 
 	thing = gtk_button_new_with_label ("Insert");
 	gtk_box_pack_start (GTK_BOX (buttonbox), thing, FALSE, TRUE, 0);
 	gtk_widget_show (thing);
 	disk_insert_widget[i] = thing;
-	gtk_signal_connect (GTK_OBJECT (thing), "clicked",
-			    (GtkSignalFunc) (i == 0 ? did_insert_0 
-					     : i == 1 ? did_insert_1 
-					     : i == 2 ? did_insert_2 : did_insert_3),
-			    NULL);
+	gtk_signal_connect (GTK_OBJECT (thing), "clicked", (GtkSignalFunc) did_insert, (gpointer) i);
     }
+
+    add_empty_vbox (vbox);
 }
 
-static void make_cpu_widgets (GtkWidget *hbox)
+static GtkWidget *make_cpu_speed_sel (void)
 {
-    int i;
-    GtkWidget *vbox, *hbox2, *frame;
-    GtkWidget *thing;
+    static const char *labels[] = {
+	"Optimize for host CPU speed","Approximate 68000/7MHz speed", "Adjustable",
+	NULL
+    };
+    GtkWidget *frame, *newbox;
 
-    frame = gtk_frame_new ("CPU type");
-    gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, TRUE, 0);
-    gtk_widget_show (frame);
-    vbox = gtk_vbox_new (FALSE, 4);
-    gtk_widget_show (vbox);
-    gtk_container_add (GTK_CONTAINER (frame), vbox);
-    
-    thing = gtk_radio_button_new_with_label (0, "68000");
-    gtk_box_pack_start (GTK_BOX (vbox), thing, FALSE, TRUE, 0);
-    gtk_widget_show (thing);
-    cpu_widget[0] = thing;
-    thing = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (thing)), "68010");
-    gtk_box_pack_start (GTK_BOX (vbox), thing, FALSE, TRUE, 0);
-    gtk_widget_show (thing);
-    cpu_widget[1] = thing;
-    thing = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (thing)), "68020");
-    gtk_box_pack_start (GTK_BOX (vbox), thing, FALSE, TRUE, 0);
-    gtk_widget_show (thing);
-    cpu_widget[2] = thing;
-    thing = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (thing)), "68020/68881");
-    gtk_box_pack_start (GTK_BOX (vbox), thing, FALSE, TRUE, 0);
-    gtk_widget_show (thing);
-    cpu_widget[3] = thing;
+    frame = gtk_frame_new ("CPU speed");
+    newbox = gtk_vbox_new (FALSE, 4);
+    gtk_widget_show (newbox);
+    gtk_container_set_border_width (GTK_CONTAINER (newbox), 4);
+    gtk_container_add (GTK_CONTAINER (frame), newbox);
+    make_radio_group (labels, newbox, cpuspeed_widgets, 0, 1, cpuspeed_changed);
 
-    for (i = 0; i < 4; i++)
-	gtk_signal_connect (GTK_OBJECT (cpu_widget[i]), "clicked",
-			    (GtkSignalFunc) cputype_changed, NULL);
-    
-    frame = gtk_frame_new ("CPU flags");
-    gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, TRUE, 0);
-    gtk_widget_show (frame);
-    vbox = gtk_vbox_new (FALSE, 4);
-    gtk_widget_show (vbox);
-    gtk_container_add (GTK_CONTAINER (frame), vbox);
+    cpuspeed_adj = GTK_ADJUSTMENT (gtk_adjustment_new (currprefs.m68k_speed, 1.0, 5120.0, 1.0, 1.0, 1.0));
+    gtk_signal_connect (GTK_OBJECT (cpuspeed_adj), "value_changed",
+			GTK_SIGNAL_FUNC (cpuspeed_changed), NULL);
 
-    hbox2 = gtk_hbox_new (FALSE, 4);
-    gtk_widget_show (hbox2);
-    gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, TRUE, 0);
+    cpuspeed_scale = gtk_hscale_new (cpuspeed_adj);
+    gtk_range_set_update_policy (GTK_RANGE (cpuspeed_scale), GTK_UPDATE_DELAYED);
+    gtk_scale_set_digits (GTK_SCALE (cpuspeed_scale), 0);
+    gtk_scale_set_value_pos (GTK_SCALE (cpuspeed_scale), GTK_POS_RIGHT);
+    cpuspeed_scale = add_labelled_widget_centered ("Cycles per instruction:", cpuspeed_scale, newbox);
 
-    thing = gtk_label_new ("Cycles per instruction:");
-    gtk_box_pack_start (GTK_BOX (hbox2), thing, FALSE, TRUE, 0);
-    gtk_widget_show (thing);
+    return frame;
+}
 
-    cpuspeed_adj = GTK_ADJUSTMENT (gtk_adjustment_new (currprefs.m68k_speed, 1.0, 10.0, 1.0, 1.0, 1.0));
-    gtk_signal_connect (GTK_OBJECT (cpuspeed_adj), "value_changed",
-			GTK_SIGNAL_FUNC (cpuspeed_changed), NULL);
+static void make_cpu_widgets (GtkWidget *vbox)
+{
+    int i;
+    GtkWidget *newbox, *hbox, *frame;
+    GtkWidget *thing;
+    static const char *radiolabels[] = {
+	"68000", "68010", "68020", "68020+68881", "68040",
+	NULL
+    };
+
+    add_empty_vbox (vbox);
+
+    hbox = gtk_hbox_new (FALSE, 0);
+    add_empty_vbox (hbox);
+
+    newbox = make_radio_group_box ("CPU type", radiolabels, cpu_widget, 0, cputype_changed);
+    gtk_widget_show (newbox);
+    gtk_box_pack_start (GTK_BOX (hbox), newbox, FALSE, FALSE, 0);
+
+    newbox = make_cpu_speed_sel ();
+    gtk_widget_show (newbox);
+    gtk_box_pack_start (GTK_BOX (hbox), newbox, FALSE, FALSE, 0);
+
+    add_empty_vbox (hbox);
+    gtk_widget_show (hbox); 
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
-    thing = gtk_hscale_new (cpuspeed_adj);
-    gtk_range_set_update_policy (GTK_RANGE (thing), GTK_UPDATE_DELAYED);
-    gtk_scale_set_digits (GTK_SCALE (thing), 0);
-    gtk_scale_set_value_pos (GTK_SCALE (thing), GTK_POS_RIGHT);
-    gtk_box_pack_start (GTK_BOX (hbox2), thing, FALSE, TRUE, 0);
-    gtk_widget_show (thing);
+    frame = gtk_frame_new ("CPU flags");
+    add_centered_to_vbox (vbox, frame);
+    gtk_widget_show (frame);
+    newbox = gtk_vbox_new (FALSE, 4);
+    gtk_widget_show (newbox);
+    gtk_container_set_border_width (GTK_CONTAINER (newbox), 4);
+    gtk_container_add (GTK_CONTAINER (frame), newbox);
 
     a24m_widget = gtk_check_button_new_with_label ("24 bit address space");
-    gtk_box_pack_start (GTK_BOX (vbox), a24m_widget, FALSE, TRUE, 0);
+    add_centered_to_vbox (newbox, a24m_widget);
     gtk_widget_show (a24m_widget);
     ccpu_widget = gtk_check_button_new_with_label ("Slow but compatible");
-    gtk_box_pack_start (GTK_BOX (vbox), ccpu_widget, FALSE, TRUE, 0);
+    add_centered_to_vbox (newbox, ccpu_widget);
     gtk_widget_show (ccpu_widget);
 
+    add_empty_vbox (vbox);
+
     gtk_signal_connect (GTK_OBJECT (ccpu_widget), "clicked",
 			(GtkSignalFunc) cputype_changed, NULL);
     gtk_signal_connect (GTK_OBJECT (a24m_widget), "clicked",
 			(GtkSignalFunc) cputype_changed, NULL);    
 }
 
-static void make_gfx_widgets (GtkWidget *hbox)
+static void make_gfx_widgets (GtkWidget *vbox)
 {
-    int i;
-    GtkWidget *vbox, *hbox2, *frame;
     GtkWidget *thing;
 
-#if 0
-    frame = gtk_frame_new ("CPU type");
-    gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, TRUE, 0);
-    gtk_widget_show (frame);
-#endif
-    vbox = gtk_vbox_new (FALSE, 4);
-    gtk_widget_show (vbox);
-    gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, TRUE, 0);
-#if 0
-    gtk_container_add (GTK_CONTAINER (frame), vbox);
-#endif
-    
-    hbox2 = gtk_hbox_new (FALSE, 4);
-    gtk_widget_show (hbox2);
-    gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, TRUE, 0);
+    add_empty_vbox (vbox);
 
-    thing = gtk_label_new ("Framerate:");
-    gtk_box_pack_start (GTK_BOX (hbox2), thing, FALSE, TRUE, 0);
-    gtk_widget_show (thing);
-
-    framerate_adj = GTK_ADJUSTMENT (gtk_adjustment_new (currprefs.framerate, 1.0, 21.0, 1.0, 1.0, 1.0));
+    framerate_adj = GTK_ADJUSTMENT (gtk_adjustment_new (currprefs.gfx_framerate, 1.0, 21.0, 1.0, 1.0, 1.0));
     gtk_signal_connect (GTK_OBJECT (framerate_adj), "value_changed",
-			GTK_SIGNAL_FUNC (gfx_changed), NULL);
+			GTK_SIGNAL_FUNC (custom_changed), NULL);
 
     thing = gtk_hscale_new (framerate_adj);
     gtk_range_set_update_policy (GTK_RANGE (thing), GTK_UPDATE_DELAYED);
     gtk_scale_set_digits (GTK_SCALE (thing), 0);
     gtk_scale_set_value_pos (GTK_SCALE (thing), GTK_POS_RIGHT);
-    gtk_box_pack_start (GTK_BOX (hbox2), thing, FALSE, TRUE, 0);
-    gtk_widget_show (thing);
+    add_labelled_widget_centered ("Framerate:", thing, vbox);
 
     b32_widget = gtk_check_button_new_with_label ("32 bit blitter");
-    gtk_box_pack_start (GTK_BOX (vbox), b32_widget, FALSE, TRUE, 0);
+    add_centered_to_vbox (vbox, b32_widget);
+#if 0
     gtk_widget_show (b32_widget);
+#endif
     bimm_widget = gtk_check_button_new_with_label ("Immediate blits");
-    gtk_box_pack_start (GTK_BOX (vbox), bimm_widget, FALSE, TRUE, 0);
+    add_centered_to_vbox (vbox, bimm_widget);
     gtk_widget_show (bimm_widget);
 
+    afscr_widget = gtk_check_button_new_with_label ("Amiga modes fullscreen");
+    add_centered_to_vbox (vbox, afscr_widget);
+#if 0
+    gtk_widget_show (afscr_widget);
+#endif
+    pfscr_widget = gtk_check_button_new_with_label ("Picasso modes fullscreen");
+    add_centered_to_vbox (vbox, pfscr_widget);
+#if 0
+    gtk_widget_show (pfscr_widget);
+#endif
+    add_empty_vbox (vbox);
+
     gtk_signal_connect (GTK_OBJECT (bimm_widget), "clicked",
-			(GtkSignalFunc) gfx_changed, NULL);
+			(GtkSignalFunc) custom_changed, NULL);
     gtk_signal_connect (GTK_OBJECT (b32_widget), "clicked",
-			(GtkSignalFunc) gfx_changed, NULL);    
+			(GtkSignalFunc) custom_changed, NULL);
+    gtk_signal_connect (GTK_OBJECT (afscr_widget), "clicked",
+			(GtkSignalFunc) custom_changed, NULL);
+    gtk_signal_connect (GTK_OBJECT (pfscr_widget), "clicked",
+			(GtkSignalFunc) custom_changed, NULL);
+}
+
+static void make_sound_widgets (GtkWidget *vbox)
+{
+    GtkWidget *frame, *newbox;
+    int i;
+    GtkWidget *hbox;
+    static const char *soundlabels1[] = {
+	"None", "No output", "Normal", "Accurate",
+	NULL
+    }, *soundlabels2[] = {
+	"8 bit", "16 bit",
+	NULL
+    }, *soundlabels3[] = {
+	"Mono", "Stereo", "Mixed",
+	NULL
+    };
+
+    add_empty_vbox (vbox);
+
+    newbox = make_radio_group_box ("Mode", soundlabels1, sound_widget, 1, sound_changed);
+    gtk_widget_show (newbox);
+    add_centered_to_vbox (vbox, newbox);
+
+    hbox = gtk_hbox_new (FALSE, 10);
+    gtk_widget_show (hbox);
+    add_centered_to_vbox (vbox, hbox);
+    newbox = make_radio_group_box ("Channels", soundlabels3, sound_ch_widget, 1, sound_changed);
+    gtk_widget_show (newbox);
+    gtk_box_pack_start (GTK_BOX (hbox), newbox, FALSE, TRUE, 0);
+    newbox = make_radio_group_box ("Resolution", soundlabels2, sound_bits_widget, 1, sound_changed);
+    gtk_widget_show (newbox);
+    gtk_box_pack_start (GTK_BOX (hbox), newbox, FALSE, TRUE, 0);
+
+    add_empty_vbox (vbox);
 }
 
-static void make_joy_widgets (GtkWidget *hbox)
+static void make_joy_widgets (GtkWidget *dvbox)
 {
     int i;
+    GtkWidget *hbox = gtk_hbox_new (FALSE, 10);
+    static const char *joylabels[] = {
+	"Joystick 0", "Joystick 1", "Mouse", "Numeric pad",
+	"Cursor keys/Right Ctrl", "T/F/H/B/Left Alt",
+	NULL
+    };
+
+    add_empty_vbox (dvbox);
+    gtk_widget_show (hbox);
+    add_centered_to_vbox (dvbox, hbox);
 
     for (i = 0; i < 2; i++) {
 	GtkWidget *vbox, *frame;
@@ -608,128 +762,93 @@ static void make_joy_widgets (GtkWidget
 	int j;
 
 	sprintf (buffer, "Port %d", i);
-	frame = gtk_frame_new (buffer);
-	gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, TRUE, 0);
+	frame = make_radio_group_box (buffer, joylabels, joy_widget[i], 0, joy_changed);
 	gtk_widget_show (frame);
-	vbox = gtk_vbox_new (FALSE, 4);
-	gtk_widget_show (vbox);
-	gtk_container_add (GTK_CONTAINER (frame), vbox);
-    
-	thing = gtk_radio_button_new_with_label (0, "Joystick 0");
-	gtk_box_pack_start (GTK_BOX (vbox), thing, FALSE, TRUE, 0);
-	gtk_widget_show (thing);
-	joy_widget[i][0] = thing;
-	thing = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (thing)), "Joystick 1");
-	gtk_box_pack_start (GTK_BOX (vbox), thing, FALSE, TRUE, 0);
-	gtk_widget_show (thing);
-	joy_widget[i][1] = thing;
-	thing = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (thing)), "Mouse");
-	gtk_box_pack_start (GTK_BOX (vbox), thing, FALSE, TRUE, 0);
-	gtk_widget_show (thing);
-	joy_widget[i][2] = thing;
-	thing = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (thing)), "Numeric pad");
-	gtk_box_pack_start (GTK_BOX (vbox), thing, FALSE, TRUE, 0);
-	gtk_widget_show (thing);
-	joy_widget[i][3] = thing;
-	thing = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (thing)), "Cursor keys/Right Ctrl");
-	gtk_box_pack_start (GTK_BOX (vbox), thing, FALSE, TRUE, 0);
-	gtk_widget_show (thing);
-	joy_widget[i][4] = thing;
-	thing = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (thing)), "T/F/H/B/Left Alt");
-	gtk_box_pack_start (GTK_BOX (vbox), thing, FALSE, TRUE, 0);
-	gtk_widget_show (thing);
-	joy_widget[i][5] = thing;
-
-	for (j = 0; j < 6; j++)
-	    gtk_signal_connect (GTK_OBJECT (joy_widget[i][j]), "clicked",
-				(GtkSignalFunc) joy_changed, NULL);
+	gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, TRUE, 0);
     }
+
+    add_empty_vbox (dvbox);
 }
 
+static GtkWidget *make_buttons (const char *label, GtkWidget *box, void (*sigfunc) (void), GtkWidget *(*create)(const char *label))
+{
+    GtkWidget *thing = create (label);
+    gtk_widget_show (thing);
+    gtk_signal_connect (GTK_OBJECT (thing), "clicked", (GtkSignalFunc) sigfunc, NULL);
+    gtk_box_pack_start (GTK_BOX (box), thing, TRUE, TRUE, 0);
+
+    return thing;
+}
+#define make_button(label, box, sigfunc) make_buttons(label, box, sigfunc, gtk_button_new_with_label)
+
 static void *gtk_penguin (void *dummy)
 {
     GtkWidget *window, *notebook;
-    GtkWidget *buttonbox, *vbox, *vbox2, *hbox;
+    GtkWidget *buttonbox, *vbox, *hbox;
     GtkWidget *thing;
-
     int i;
-
     int argc = 1;
     char *a[] = {"UAE"};
     char **argv = a;
+    static const struct _pages {
+	const char *title;
+	void (*createfunc)(GtkWidget *);
+    } pages[] = {
+	{ "Floppy disks", make_floppy_disks },
+	{ "CPU emulation", make_cpu_widgets },
+	{ "Graphics", make_gfx_widgets },
+	{ "Sound", make_sound_widgets },
+	{ "Game ports", make_joy_widgets }
+    };
 
     gtk_init (&argc, &argv);
     gtk_rc_parse ("uaegtkrc");
 
     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    gtk_widget_set_name (window, "UAE control");
+    gtk_window_set_title (GTK_WINDOW (window), "UAE control");
 
     vbox = gtk_vbox_new (FALSE, 4);
     gtk_container_add (GTK_CONTAINER (window), vbox);
+    gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
-    /* Make a box with the Reset/Debug/Quit buttons and place it at the top
-     * of our vbox.  */
-    buttonbox = gtk_hbox_new (FALSE, 4);
-    gtk_box_pack_start (GTK_BOX (vbox), buttonbox, FALSE, TRUE, 0);
-    gtk_widget_show (buttonbox);
-    thing = gtk_button_new_with_label ("Reset");
-    gtk_signal_connect (GTK_OBJECT (thing), "clicked", (GtkSignalFunc) did_reset, NULL);
-    gtk_box_pack_start (GTK_BOX (buttonbox), thing, FALSE, TRUE, 0);
-    gtk_widget_show (thing);
-    thing = gtk_button_new_with_label ("Debug");
-    gtk_signal_connect (GTK_OBJECT (thing), "clicked", (GtkSignalFunc) did_debug, NULL);
-    gtk_box_pack_start (GTK_BOX (buttonbox), thing, FALSE, TRUE, 0);
-    gtk_widget_show (thing);
-    thing = gtk_button_new_with_label ("Quit");
-    gtk_signal_connect (GTK_OBJECT (thing), "clicked", (GtkSignalFunc) did_quit, NULL);
-    gtk_box_pack_start (GTK_BOX (buttonbox), thing, FALSE, TRUE, 0);
-    gtk_widget_show (thing);
-    /* An empty but expanded vbox to make the LED appear at the right border.  */
-    thing = gtk_vbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (buttonbox), thing, TRUE, TRUE, 0);
-    gtk_widget_show (thing);
-    thing = make_led (0);
-    gtk_box_pack_start (GTK_BOX (buttonbox), thing, FALSE, TRUE, 0);
-    gtk_widget_show (thing);
+    /* First line - buttons and power LED */
+    hbox = gtk_hbox_new (FALSE, 10);
+    gtk_widget_show (hbox);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
 
-    /* The next box contains the "Save configuration" button.  */
-    buttonbox = gtk_hbox_new (FALSE, 4);
-    gtk_box_pack_start (GTK_BOX (vbox), buttonbox, FALSE, TRUE, 0);
+    /* The buttons */
+    buttonbox = gtk_hbox_new (TRUE, 4);
     gtk_widget_show (buttonbox);
+    gtk_box_pack_start (GTK_BOX (hbox), buttonbox, TRUE, TRUE, 0);
+    make_button ("Reset", buttonbox, did_reset);
+    make_button ("Debug", buttonbox, did_debug);
+    make_button ("Quit", buttonbox, did_quit);
+    make_button ("Save config", buttonbox, save_config);
+    pause_uae_widget = make_buttons ("Pause", buttonbox, pause_uae, gtk_toggle_button_new_with_label);
 
-    thing = gtk_button_new_with_label ("Save config");
-    gtk_signal_connect (GTK_OBJECT (thing), "clicked", (GtkSignalFunc) save_config, NULL);
-    gtk_box_pack_start (GTK_BOX (buttonbox), thing, FALSE, TRUE, 0);
+    /* The LED */
+    thing = make_led (0);
+    thing = make_labelled_widget ("Power:", thing);
     gtk_widget_show (thing);
+    gtk_box_pack_start (GTK_BOX (hbox), thing, FALSE, TRUE, 0);
 
-    /* Place a separator below those three buttons.  */
+    /* Place a separator below those buttons.  */
     thing = gtk_hseparator_new ();
     gtk_box_pack_start (GTK_BOX (vbox), thing, FALSE, TRUE, 0);
     gtk_widget_show (thing);
 
+    /* Now the notebook */
     notebook = gtk_notebook_new ();
-    gtk_box_pack_start (GTK_BOX (vbox), notebook, FALSE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), notebook, TRUE, TRUE, 0);
     gtk_widget_show (notebook);
 
-    thing = gtk_vbox_new (FALSE, 4);
-    gtk_widget_show (thing);
-    make_floppy_disks (thing);
-    gtk_notebook_append_page (GTK_NOTEBOOK (notebook), thing, gtk_label_new ("Floppy disks"));
-
-    thing = gtk_hbox_new (FALSE, 4);
-    gtk_widget_show (thing);
-    make_cpu_widgets (thing);
-    gtk_notebook_append_page (GTK_NOTEBOOK (notebook), thing, gtk_label_new ("CPU emulation"));
-    
-    thing = gtk_hbox_new (FALSE, 4);
-    gtk_widget_show (thing);
-    make_gfx_widgets (thing);
-    gtk_notebook_append_page (GTK_NOTEBOOK (notebook), thing, gtk_label_new ("Graphics"));
-
-    thing = gtk_hbox_new (FALSE, 4);
-    gtk_widget_show (thing);
-    make_joy_widgets (thing);
-    gtk_notebook_append_page (GTK_NOTEBOOK (notebook), thing, gtk_label_new ("Game ports"));
+    for (i = 0; i < sizeof pages / sizeof (struct _pages); i++) {
+	thing = gtk_vbox_new (FALSE, 4);
+	gtk_widget_show (thing);
+	gtk_container_set_border_width (GTK_CONTAINER (thing), 10);
+	pages[i].createfunc (thing);
+	gtk_notebook_append_page (GTK_NOTEBOOK (notebook), thing, gtk_label_new (pages[i].title));
+    }
 
     enable_disk_buttons (1);
 
@@ -794,7 +913,11 @@ void gui_exit (void)
     uae_sem_wait (&gui_quit_sem);
 }
 
-void gui_led(int num, int on)
+void gui_fps (int x)
+{
+}
+
+void gui_led (int num, int on)
 {
     if (no_gui)
 	return;
@@ -821,34 +944,53 @@ void gui_filename(int num, const char *n
 
 void gui_handle_events(void)
 {
+    int pause_uae = FALSE;
+    
     if (no_gui)
 	return;
 
-    while (comm_pipe_has_data (&from_gui_pipe)) {
-	int cmd = read_comm_pipe_int_blocking (&from_gui_pipe);
-	int n;
-	switch (cmd) {
-	 case 0:
-	    n = read_comm_pipe_int_blocking (&from_gui_pipe);
-	    changed_prefs.df[n][0] = '\0';
-	    break;
-	 case 1:
-	    n = read_comm_pipe_int_blocking (&from_gui_pipe);
-	    uae_sem_wait (&gui_sem);
-	    strncpy (changed_prefs.df[n], new_disk_string[n], 255);
-	    changed_prefs.df[n][255] = '\0';
-	    uae_sem_post (&gui_sem);
-	    break;
-	 case 2:
-	    uae_reset ();
-	    break;
-	 case 3:
-	    activate_debugger ();
-	    break;
-	 case 4:
-	    uae_quit ();
-	    break;
-	}
-    }
-    
+    do {
+        while (pause_uae || comm_pipe_has_data (&from_gui_pipe)) {
+            int cmd = read_comm_pipe_int_blocking (&from_gui_pipe);
+            int n;
+            switch (cmd) {
+             case 0:
+                n = read_comm_pipe_int_blocking (&from_gui_pipe);
+                changed_prefs.df[n][0] = '\0';
+                break;
+             case 1:
+                n = read_comm_pipe_int_blocking (&from_gui_pipe);
+                uae_sem_wait (&gui_sem);
+                strncpy (changed_prefs.df[n], new_disk_string[n], 255);
+                changed_prefs.df[n][255] = '\0';
+                uae_sem_post (&gui_sem);
+                break;
+             case 2:
+                uae_reset ();
+                end_pause_uae ();
+                break;
+             case 3:
+                activate_debugger ();
+                end_pause_uae ();
+                break;
+             case 4:
+                uae_quit ();
+                end_pause_uae ();
+                break;
+             case 5:
+                pause_uae = TRUE;
+                break;
+             case 6:
+                pause_uae = FALSE;
+                break;
+            }
+        }
+    } while (pause_uae);
+}
+
+void gui_update_gfx (void)
+{
+#if 0 /* This doesn't work... */
+    set_gfx_state ();
+#endif
 }