--- uae/src/gtkui.c 2018/04/24 16:42:09 1.1.1.2 +++ uae/src/gtkui.c 2018/04/24 17:00:10 1.1.1.10 @@ -21,25 +21,50 @@ #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 "savestate.h" #include +/* 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, *snap_save_widget, *snap_load_widget; + +static GtkWidget *chipsize_widget[5]; +static GtkWidget *bogosize_widget[4]; +static GtkWidget *fastsize_widget[5]; +static GtkWidget *z3size_widget[10]; +static GtkWidget *p96size_widget[7]; + static GtkWidget *disk_insert_widget[4], *disk_eject_widget[4], *disk_text_widget[4]; static char *new_disk_string[4]; static GtkAdjustment *cpuspeed_adj; -static GtkWidget *cpu_widget[4], *a24m_widget, *ccpu_widget; -static GtkWidget *sound_widget[4], *sound_bits_widget[2], *sound_freq_widget[3], *sound_ch_widget[2]; +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 GtkWidget *coll_widget[4], *cslevel_widget[4]; +static GtkWidget *fcop_widget; 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]; @@ -67,7 +92,7 @@ static void save_config (void) fprintf (stderr, "Error saving options file!\n"); return; } - save_options (f); + save_options (f, &currprefs); fclose (f); } @@ -89,37 +114,107 @@ static void enable_disk_buttons (int ena } } +static void enable_snap_buttons (int enable) +{ + gtk_widget_set_sensitive (snap_save_widget, enable); + gtk_widget_set_sensitive (snap_load_widget, enable); +} + 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); + int i; + + 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); + for (i = 0; i < 10; i++) + gtk_widget_set_sensitive (z3size_widget[i], + changed_prefs.cpu_level >= 2 && ! changed_prefs.address_space_24); } 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); +#if 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); +#endif +} + +static void set_chipset_state (void) +{ + int t0 = 0; + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (coll_widget[currprefs.collision_level]), TRUE); + if (currprefs.chipset_mask & CSMASK_AGA) + t0 = 3; + else if (currprefs.chipset_mask & CSMASK_ECS_DENISE) + t0 = 2; + else if (currprefs.chipset_mask & CSMASK_ECS_AGNUS) + t0 = 1; + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cslevel_widget[t0]), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fcop_widget), currprefs.fast_copper != 0); } static void set_sound_state (void) { - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (sound_widget[currprefs.produce_sound]), 1); - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (sound_ch_widget[currprefs.stereo]), 1); - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (sound_bits_widget[currprefs.sound_bits == 16]), 1); + 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_mem_state (void) +{ + int t, t2; + + t = 0; + t2 = currprefs.chipmem_size; + while (t < 4 && t2 > 0x80000) + t++, t2 >>= 1; + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chipsize_widget[t]), 1); + + t = 0; + t2 = currprefs.bogomem_size; + while (t < 3 && t2 >= 0x80000) + t++, t2 >>= 1; + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (bogosize_widget[t]), 1); + + t = 0; + t2 = currprefs.fastmem_size; + while (t < 4 && t2 >= 0x100000) + t++, t2 >>= 1; + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fastsize_widget[t]), 1); + + t = 0; + t2 = currprefs.z3fastmem_size; + while (t < 9 && t2 >= 0x100000) + t++, t2 >>= 1; + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (z3size_widget[t]), 1); + + t = 0; + t2 = currprefs.gfxmem_size; + while (t < 6 && t2 >= 0x100000) + t++, t2 >>= 1; + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (p96size_widget[t]), 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) { @@ -128,8 +223,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); } @@ -164,11 +259,10 @@ static int my_idle (void) while (comm_pipe_has_data (&to_gui_pipe)) { int cmd = read_comm_pipe_int_blocking (&to_gui_pipe); int n; - /*printf ("cmd %d\n", cmd);*/ 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. */ @@ -176,14 +270,15 @@ static int my_idle (void) set_cpu_state (); set_gfx_state (); set_joy_state (); -#ifdef SOUND_RECONFIG_SUPPORT set_sound_state (); -#endif + set_mem_state (); + set_chipset_state (); + gui_active = 1; break; } } - + for (i = 0; i < 5; i++) { unsigned int mask = 1 << i; unsigned int on = leds & mask; @@ -211,28 +306,51 @@ static int find_current_toggle (GtkWidge static void joy_changed (void) { - int j0t = 0, j1t = 0; - int i; if (! gui_active) return; - j0t = find_current_toggle (joy_widget[0], 6); - j1t = find_current_toggle (joy_widget[1], 6); - - 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 coll_changed (void) +{ + changed_prefs.collision_level = find_current_toggle (coll_widget, 4); +} + +static void cslevel_changed (void) +{ + int t = find_current_toggle (cslevel_widget, 4); + int t1 = 0; + if (t > 0) + t1 |= CSMASK_ECS_AGNUS; + if (t > 1) + t1 |= CSMASK_ECS_DENISE; + if (t > 2) + t1 |= CSMASK_AGA; + changed_prefs.chipset_mask = t1; +} + static void custom_changed (void) { - changed_prefs.framerate = framerate_adj->value; - changed_prefs.blits_32bit_enabled = GTK_TOGGLE_BUTTON (b32_widget)->active; + changed_prefs.gfx_framerate = framerate_adj->value; changed_prefs.immediate_blits = GTK_TOGGLE_BUTTON (bimm_widget)->active; + changed_prefs.fast_copper = GTK_TOGGLE_BUTTON (fcop_widget)->active; +#if 0 + changed_prefs.blits_32bit_enabled = GTK_TOGGLE_BUTTON (b32_widget)->active; + changed_prefs.gfx_afullscreen = GTK_TOGGLE_BUTTON (afscr_widget)->active; + changed_prefs.gfx_pfullscreen = GTK_TOGGLE_BUTTON (pfscr_widget)->active; +#endif } 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) @@ -243,7 +361,7 @@ static void cputype_changed (void) oldcl = changed_prefs.cpu_level; - changed_prefs.cpu_level = find_current_toggle(cpu_widget, 4); + 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; @@ -255,14 +373,53 @@ 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 chipsize_changed (void) +{ + int t = find_current_toggle (chipsize_widget, 5); + changed_prefs.chipmem_size = 0x80000 << t; + for (t = 0; t < 5; t++) + gtk_widget_set_sensitive (fastsize_widget[t], changed_prefs.chipmem_size <= 0x200000); + if (changed_prefs.chipmem_size > 0x200000) { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fastsize_widget[0]), 1); + changed_prefs.fastmem_size = 0; + } +} + +static void bogosize_changed (void) +{ + int t = find_current_toggle (bogosize_widget, 4); + changed_prefs.bogomem_size = (0x40000 << t) & ~0x40000; +} + +static void fastsize_changed (void) +{ + int t = find_current_toggle (fastsize_widget, 5); + changed_prefs.fastmem_size = (0x80000 << t) & ~0x80000; +} + +static void z3size_changed (void) +{ + int t = find_current_toggle (z3size_widget, 10); + changed_prefs.z3fastmem_size = (0x80000 << t) & ~0x80000; +} + +static void p96size_changed (void) +{ + int t = find_current_toggle (p96size_widget, 7); + changed_prefs.gfxmem_size = (0x80000 << t) & ~0x80000; +} + static void sound_changed (void) { changed_prefs.produce_sound = find_current_toggle (sound_widget, 4); - changed_prefs.stereo = find_current_toggle (sound_ch_widget, 2); + 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; } @@ -299,26 +456,43 @@ static void did_eject (GtkWidget *w, gpo 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; +static GtkWidget *disk_selector; + +static int snapsel_active = -1; +static GtkWidget *snap_selector; +static char *gui_snapname; static void did_close_insert (GtkObject *o, GtkWidget *w) { filesel_active = -1; enable_disk_buttons (1); - gtk_widget_hide (selector); + gtk_widget_hide (disk_selector); } static void did_cancel_insert (GtkObject *o) { filesel_active = -1; enable_disk_buttons (1); - gtk_widget_hide (selector); + gtk_widget_hide (disk_selector); } static void did_insert_select (GtkObject *o) { - char *s = gtk_file_selection_get_filename (GTK_FILE_SELECTION (selector)); + char *s = gtk_file_selection_get_filename (GTK_FILE_SELECTION (disk_selector)); printf ("%s\n", s); if (quit_gui) return; @@ -332,7 +506,7 @@ static void did_insert_select (GtkObject write_comm_pipe_int (&from_gui_pipe, filesel_active, 1); filesel_active = -1; enable_disk_buttons (1); - gtk_widget_hide (selector); + gtk_widget_hide (disk_selector); } static char fsbuffer[100]; @@ -346,10 +520,10 @@ static void did_insert (GtkWidget *w, gp enable_disk_buttons (0); sprintf (fsbuffer, "Select a disk image file for DF%d", n); - gtk_window_set_title (GTK_WINDOW (selector), fsbuffer); + gtk_window_set_title (GTK_WINDOW (disk_selector), fsbuffer); - /*printf("%p\n", selector);*/ - gtk_widget_show (selector); + /*printf("%p\n", disk_selector);*/ + gtk_widget_show (disk_selector); } static gint driveled_event (GtkWidget *thing, GdkEvent *event) @@ -370,6 +544,63 @@ static gint driveled_event (GtkWidget *t return 0; } +static void did_close_snap (GtkObject *o, GtkWidget *w) +{ + snapsel_active = -1; + enable_snap_buttons (1); + gtk_widget_hide (snap_selector); +} + +static void did_cancel_snap (GtkObject *o) +{ + snapsel_active = -1; + enable_snap_buttons (1); + gtk_widget_hide (snap_selector); +} + +static void did_snap_select (GtkObject *o) +{ + char *s = gtk_file_selection_get_filename (GTK_FILE_SELECTION (snap_selector)); + printf ("%s\n", s); + if (quit_gui) + return; + + uae_sem_wait (&gui_sem); + gui_snapname = strdup (s); + uae_sem_post (&gui_sem); + write_comm_pipe_int (&from_gui_pipe, 7, 0); + write_comm_pipe_int (&from_gui_pipe, snapsel_active, 1); + snapsel_active = -1; + enable_snap_buttons (1); + gtk_widget_hide (snap_selector); +} + +static void did_loadstate (void) +{ + if (snapsel_active != -1) + return; + snapsel_active = STATE_DORESTORE; + enable_snap_buttons (0); + + gtk_window_set_title (GTK_WINDOW (snap_selector), + "Select a state file to restore"); + + gtk_widget_show (snap_selector); +} + +static void did_savestate (void) +{ + if (snapsel_active != -1) + return; + snapsel_active = STATE_DOSAVE; + enable_snap_buttons (0); + + gtk_window_set_title (GTK_WINDOW (snap_selector), + "Select a filename for the state file"); + + gtk_widget_show (snap_selector); +} + static void add_empty_vbox (GtkWidget *tobox) { GtkWidget *thing = gtk_vbox_new (FALSE, 0); @@ -377,6 +608,13 @@ static void add_empty_vbox (GtkWidget *t 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); @@ -399,29 +637,31 @@ static GtkWidget *make_labelled_widget ( return hbox2; } -static void add_labelled_widget_centered (const char *str, GtkWidget *thing, GtkWidget *vbox) +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, +static int make_radio_group (const char **labels, GtkWidget *tobox, GtkWidget **saveptr, gint t1, gint t2, - void (*sigfunc) (void)) + void (*sigfunc) (void), int count, GSList *group) { - GtkWidget *thing = NULL; + int t = 0; + + while (*labels && (count == -1 || count-- > 0)) { + GtkWidget *thing = gtk_radio_button_new_with_label (group, *labels++); + group = gtk_radio_button_group (GTK_RADIO_BUTTON (thing)); - 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); + t++; } + return t; } static GtkWidget *make_radio_group_box (const char *title, const char **labels, @@ -433,9 +673,36 @@ static GtkWidget *make_radio_group_box ( frame = gtk_frame_new (title); newbox = (horiz ? gtk_hbox_new : gtk_vbox_new) (FALSE, 4); gtk_widget_show (newbox); - gtk_container_border_width (GTK_CONTAINER (newbox), 4); + 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); + make_radio_group (labels, newbox, saveptr, horiz, !horiz, sigfunc, -1, NULL); + return frame; +} + +static GtkWidget *make_radio_group_box_1 (const char *title, const char **labels, + GtkWidget **saveptr, int horiz, + void (*sigfunc) (void), int elts_per_column) +{ + GtkWidget *frame, *newbox; + GtkWidget *column; + GSList *group = 0; + + frame = gtk_frame_new (title); + column = (horiz ? gtk_vbox_new : gtk_hbox_new) (FALSE, 4); + gtk_container_add (GTK_CONTAINER (frame), column); + gtk_widget_show (column); + + while (*labels) { + int count; + 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 (column), newbox); + count = make_radio_group (labels, newbox, saveptr, horiz, !horiz, sigfunc, elts_per_column, group); + labels += count; + saveptr += count; + group = gtk_radio_button_group (GTK_RADIO_BUTTON (saveptr[-1])); + } return frame; } @@ -495,7 +762,7 @@ static void make_floppy_disks (GtkWidget sprintf (buf, "DF%d:", i); thing = gtk_frame_new (buf); buttonbox = gtk_hbox_new (FALSE, 4); - gtk_container_border_width (GTK_CONTAINER (buttonbox), 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); @@ -535,40 +802,71 @@ static void make_floppy_disks (GtkWidget add_empty_vbox (vbox); } +static GtkWidget *make_cpu_speed_sel (void) +{ + int t; + static const char *labels[] = { + "Optimize for host CPU speed","Approximate 68000/7MHz speed", "Adjustable", + NULL + }; + GtkWidget *frame, *newbox; + + 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, -1, NULL); + + t = currprefs.m68k_speed > 0 ? currprefs.m68k_speed : 4 * CYCLE_UNIT; + cpuspeed_adj = GTK_ADJUSTMENT (gtk_adjustment_new (t, 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); + + 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); + + return frame; +} + static void make_cpu_widgets (GtkWidget *vbox) { int i; - GtkWidget *newbox, *frame; + GtkWidget *newbox, *hbox, *frame; GtkWidget *thing; static const char *radiolabels[] = { - "68000", "68010", "68020", "68020+68881", + "68000", "68010", "68020", "68020+68881", "68040", NULL }; add_empty_vbox (vbox); - newbox = make_radio_group_box ("CPU type", radiolabels, cpu_widget, 1, cputype_changed); + 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); - add_centered_to_vbox (vbox, 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); 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_border_width (GTK_CONTAINER (newbox), 4); + gtk_container_set_border_width (GTK_CONTAINER (newbox), 4); gtk_container_add (GTK_CONTAINER (frame), newbox); - 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); - - 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); - add_labelled_widget_centered ("Cycles per instruction:", thing, newbox); - a24m_widget = gtk_check_button_new_with_label ("24 bit address space"); add_centered_to_vbox (newbox, a24m_widget); gtk_widget_show (a24m_widget); @@ -586,11 +884,31 @@ static void make_cpu_widgets (GtkWidget static void make_gfx_widgets (GtkWidget *vbox) { - GtkWidget *thing; + GtkWidget *thing, *frame, *newbox, *hbox; + static const char *p96labels[] = { + "None", "1 MB", "2 MB", "4 MB", "8 MB", "16 MB", "32 MB", NULL + }; add_empty_vbox (vbox); - framerate_adj = GTK_ADJUSTMENT (gtk_adjustment_new (currprefs.framerate, 1.0, 21.0, 1.0, 1.0, 1.0)); + hbox = gtk_hbox_new (FALSE, 10); + gtk_widget_show (hbox); + add_centered_to_vbox (vbox, hbox); + + frame = make_radio_group_box_1 ("P96 RAM", p96labels, p96size_widget, 0, p96size_changed, 4); + gtk_widget_show (frame); + gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, TRUE, 0); + + frame = gtk_frame_new ("Miscellaneous"); + gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0); + + 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); + + 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 (custom_changed), NULL); @@ -598,22 +916,74 @@ static void make_gfx_widgets (GtkWidget 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); - add_labelled_widget_centered ("Framerate:", thing, vbox); + add_labelled_widget_centered ("Framerate:", thing, newbox); b32_widget = gtk_check_button_new_with_label ("32 bit blitter"); - add_centered_to_vbox (vbox, b32_widget); + add_centered_to_vbox (newbox, b32_widget); +#if 0 gtk_widget_show (b32_widget); - +#endif bimm_widget = gtk_check_button_new_with_label ("Immediate blits"); - add_centered_to_vbox (vbox, bimm_widget); + add_centered_to_vbox (newbox, bimm_widget); gtk_widget_show (bimm_widget); + afscr_widget = gtk_check_button_new_with_label ("Amiga modes fullscreen"); + add_centered_to_vbox (newbox, 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 (newbox, pfscr_widget); +#if 0 + gtk_widget_show (pfscr_widget); +#endif add_empty_vbox (vbox); gtk_signal_connect (GTK_OBJECT (bimm_widget), "clicked", (GtkSignalFunc) custom_changed, NULL); +#if 0 gtk_signal_connect (GTK_OBJECT (b32_widget), "clicked", (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); +#endif +} + +static void make_chipset_widgets (GtkWidget *vbox) +{ + GtkWidget *frame, *newbox, *hbox; + static const char *colllabels[] = { + "None (fastest)", "Sprites only", "Sprites & playfields", "Full (very slow)", + NULL + }; + static const char *cslevellabels[] = { + "OCS", "ECS Agnus", "Full ECS", "AGA", NULL + }; + + add_empty_vbox (vbox); + + hbox = gtk_hbox_new (FALSE, 10); + gtk_widget_show (hbox); + add_centered_to_vbox (vbox, hbox); + + newbox = make_radio_group_box ("Sprite collisions", colllabels, coll_widget, 0, coll_changed); + gtk_widget_show (newbox); + gtk_box_pack_start (GTK_BOX (hbox), newbox, FALSE, TRUE, 0); + + newbox = make_radio_group_box ("Chipset", cslevellabels, cslevel_widget, 0, cslevel_changed); + gtk_widget_show (newbox); + gtk_box_pack_start (GTK_BOX (hbox), newbox, FALSE, TRUE, 0); + + fcop_widget = gtk_check_button_new_with_label ("Enable copper speedup code"); + add_centered_to_vbox (vbox, fcop_widget); + gtk_widget_show (fcop_widget); + + gtk_signal_connect (GTK_OBJECT (fcop_widget), "clicked", + (GtkSignalFunc) custom_changed, NULL); + + add_empty_vbox (vbox); } static void make_sound_widgets (GtkWidget *vbox) @@ -628,13 +998,12 @@ static void make_sound_widgets (GtkWidge "8 bit", "16 bit", NULL }, *soundlabels3[] = { - "Mono", "Stereo", + "Mono", "Stereo", "Mixed", NULL }; add_empty_vbox (vbox); -#ifdef SOUND_RECONFIG_SUPPORT newbox = make_radio_group_box ("Mode", soundlabels1, sound_widget, 1, sound_changed); gtk_widget_show (newbox); add_centered_to_vbox (vbox, newbox); @@ -648,12 +1017,55 @@ static void make_sound_widgets (GtkWidge 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); -#else - hbox = gtk_label_new ("Your sound system doesn't support\nrun-time reconfiguration."); + + add_empty_vbox (vbox); +} + +static void make_mem_widgets (GtkWidget *vbox) +{ + GtkWidget *hbox = gtk_hbox_new (FALSE, 10); + GtkWidget *label, *frame; + + static const char *chiplabels[] = { + "512 KB", "1 MB", "2 MB", "4 MB", "8 MB", NULL + }; + static const char *bogolabels[] = { + "None", "512 KB", "1 MB", "1.8 MB", NULL + }; + static const char *fastlabels[] = { + "None", "1 MB", "2 MB", "4 MB", "8 MB", NULL + }; + static const char *z3labels[] = { + "None", "1 MB", "2 MB", "4 MB", "8 MB", + "16 MB", "32 MB", "64 MB", "128 MB", "256 MB", + NULL + }; + + add_empty_vbox (vbox); gtk_widget_show (hbox); add_centered_to_vbox (vbox, hbox); -#endif + add_empty_vbox (vbox); + + label = gtk_label_new ("These settings take effect after the next reset."); + gtk_widget_show (label); + add_centered_to_vbox (vbox, label); + + frame = make_radio_group_box ("Chip Mem", chiplabels, chipsize_widget, 0, chipsize_changed); + gtk_widget_show (frame); + gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, TRUE, 0); + + frame = make_radio_group_box ("Slow Mem", bogolabels, bogosize_widget, 0, bogosize_changed); + gtk_widget_show (frame); + gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, TRUE, 0); + + frame = make_radio_group_box ("Fast Mem", fastlabels, fastsize_widget, 0, fastsize_changed); + gtk_widget_show (frame); + gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, TRUE, 0); + + frame = make_radio_group_box_1 ("Z3 Mem", z3labels, z3size_widget, 0, z3size_changed, 5); + gtk_widget_show (frame); + gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, TRUE, 0); } static void make_joy_widgets (GtkWidget *dvbox) @@ -685,13 +1097,16 @@ static void make_joy_widgets (GtkWidget add_empty_vbox (dvbox); } -static void make_button (const char *label, GtkWidget *box, void (*sigfunc) (void)) +static GtkWidget *make_buttons (const char *label, GtkWidget *box, void (*sigfunc) (void), GtkWidget *(*create)(const char *label)) { - GtkWidget *thing = gtk_button_new_with_label (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) { @@ -706,9 +1121,12 @@ static void *gtk_penguin (void *dummy) const char *title; void (*createfunc)(GtkWidget *); } pages[] = { + /* ??? If this isn't the first page, there are errors in draw_led. */ { "Floppy disks", make_floppy_disks }, + { "Memory", make_mem_widgets }, { "CPU emulation", make_cpu_widgets }, { "Graphics", make_gfx_widgets }, + { "Chipset", make_chipset_widgets }, { "Sound", make_sound_widgets }, { "Game ports", make_joy_widgets } }; @@ -721,7 +1139,7 @@ static void *gtk_penguin (void *dummy) vbox = gtk_vbox_new (FALSE, 4); gtk_container_add (GTK_CONTAINER (window), vbox); - gtk_container_border_width (GTK_CONTAINER (window), 10); + gtk_container_set_border_width (GTK_CONTAINER (window), 10); /* First line - buttons and power LED */ hbox = gtk_hbox_new (FALSE, 10); @@ -736,6 +1154,7 @@ static void *gtk_penguin (void *dummy) 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); /* The LED */ thing = make_led (0); @@ -743,6 +1162,13 @@ static void *gtk_penguin (void *dummy) gtk_widget_show (thing); gtk_box_pack_start (GTK_BOX (hbox), thing, FALSE, TRUE, 0); + /* More buttons */ + buttonbox = gtk_hbox_new (TRUE, 4); + gtk_widget_show (buttonbox); + gtk_box_pack_start (GTK_BOX (vbox), buttonbox, TRUE, TRUE, 0); + snap_save_widget = make_button ("Save state", buttonbox, did_savestate); + snap_load_widget = make_button ("Load state", buttonbox, did_loadstate); + /* Place a separator below those buttons. */ thing = gtk_hseparator_new (); gtk_box_pack_start (GTK_BOX (vbox), thing, FALSE, TRUE, 0); @@ -756,7 +1182,7 @@ static void *gtk_penguin (void *dummy) for (i = 0; i < sizeof pages / sizeof (struct _pages); i++) { thing = gtk_vbox_new (FALSE, 4); gtk_widget_show (thing); - gtk_container_border_width (GTK_CONTAINER (thing), 10); + 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)); } @@ -767,18 +1193,30 @@ static void *gtk_penguin (void *dummy) gtk_widget_show (window); /* We're going to need that later. */ - selector = gtk_file_selection_new (""); - gtk_signal_connect (GTK_OBJECT (selector), "destroy", - (GtkSignalFunc) did_close_insert, selector); + disk_selector = gtk_file_selection_new (""); + gtk_signal_connect (GTK_OBJECT (disk_selector), "destroy", + (GtkSignalFunc) did_close_insert, disk_selector); - gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (selector)->ok_button), + gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (disk_selector)->ok_button), "clicked", (GtkSignalFunc) did_insert_select, - GTK_OBJECT (selector)); - gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (selector)->cancel_button), + GTK_OBJECT (disk_selector)); + gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (disk_selector)->cancel_button), "clicked", (GtkSignalFunc) did_cancel_insert, - GTK_OBJECT (selector)); + GTK_OBJECT (disk_selector)); filesel_active = -1; + snap_selector = gtk_file_selection_new (""); + gtk_signal_connect (GTK_OBJECT (snap_selector), "destroy", + (GtkSignalFunc) did_close_snap, snap_selector); + + gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (snap_selector)->ok_button), + "clicked", (GtkSignalFunc) did_snap_select, + GTK_OBJECT (snap_selector)); + gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (snap_selector)->cancel_button), + "clicked", (GtkSignalFunc) did_cancel_snap, + GTK_OBJECT (snap_selector)); + snapsel_active = -1; + gtk_timeout_add (1000, (GtkFunction)my_idle, 0); gtk_main (); @@ -824,7 +1262,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; @@ -849,36 +1291,62 @@ void gui_filename(int num, const char *n /* gui_update ();*/ } -void gui_handle_events(void) +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; + case 7: + printf ("STATESAVE\n"); + savestate_state = read_comm_pipe_int_blocking (&from_gui_pipe); + uae_sem_wait (&gui_sem); + savestate_filename = gui_snapname; + uae_sem_post (&gui_sem); + break; + } + } + } while (pause_uae); +} + +void gui_update_gfx (void) +{ +#if 0 /* This doesn't work... */ + set_gfx_state (); +#endif }