--- uae/src/gtkui.c 2018/04/24 16:42:09 1.1.1.2 +++ uae/src/gtkui.c 2018/04/24 16:44:50 1.1.1.4 @@ -29,12 +29,22 @@ #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 + static int gui_active; 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 *cpuspeed_widgets[4], *cpuspeed_scale; 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]; @@ -67,7 +77,7 @@ static void save_config (void) fprintf (stderr, "Error saving options file!\n"); return; } - save_options (f); + save_options (f, &currprefs); fclose (f); } @@ -95,12 +105,15 @@ static void set_cpu_state (void) 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_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); + nr = currprefs.m68k_speed + 1 < 3 ? currprefs.m68k_speed + 1 : 2; + gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (cpuspeed_widgets[nr]), TRUE); } static void set_gfx_state (void) @@ -118,8 +131,8 @@ static void set_sound_state (void) 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) { @@ -168,7 +181,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. */ @@ -176,9 +189,8 @@ static int my_idle (void) set_cpu_state (); set_gfx_state (); set_joy_state (); -#ifdef SOUND_RECONFIG_SUPPORT set_sound_state (); -#endif + gui_active = 1; break; } @@ -211,15 +223,11 @@ 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 (); } @@ -232,7 +240,11 @@ static void custom_changed (void) 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 +255,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, 4); changed_prefs.cpu_compatible = GTK_TOGGLE_BUTTON (ccpu_widget)->active; changed_prefs.address_space_24 = GTK_TOGGLE_BUTTON (a24m_widget)->active; @@ -377,6 +389,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,11 +418,12 @@ 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, @@ -433,7 +453,7 @@ 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); return frame; @@ -495,7 +515,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,10 +555,38 @@ static void make_floppy_disks (GtkWidget add_empty_vbox (vbox); } +static GtkWidget *make_cpu_speed_sel (void) +{ + 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); + + 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); + + 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", @@ -547,35 +595,36 @@ static void make_cpu_widgets (GtkWidget 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); ccpu_widget = gtk_check_button_new_with_label ("Slow but compatible"); add_centered_to_vbox (newbox, ccpu_widget); gtk_widget_show (ccpu_widget); - + add_empty_vbox (vbox); gtk_signal_connect (GTK_OBJECT (ccpu_widget), "clicked", @@ -634,7 +683,6 @@ static void make_sound_widgets (GtkWidge 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,11 +696,7 @@ 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."); - gtk_widget_show (hbox); - add_centered_to_vbox (vbox, hbox); -#endif + add_empty_vbox (vbox); } @@ -721,7 +765,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); @@ -756,7 +800,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)); } @@ -824,7 +868,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;