--- BasiliskII/src/Windows/prefs_editor_gtk.cpp	2005/11/20 23:59:18	1.6
+++ BasiliskII/src/Windows/prefs_editor_gtk.cpp	2005/11/29 22:59:44	1.10
@@ -32,6 +32,7 @@
 #include "xpram.h"
 #include "prefs.h"
 #include "prefs_editor.h"
+#include "b2ether/inc/b2ether_hl.h"
 
 
 // Global variables
@@ -52,6 +53,24 @@ static void read_settings(void);
 
 
 /*
+ *  SheepShaver glue
+ */
+
+#ifdef SHEEPSHAVER
+#define DISABLE_SCSI 1
+#define PROGRAM_NAME "SheepShaver"
+enum {
+	STR_WINDOW_LAB = STR_WINDOW_CTRL,
+	STR_FULLSCREEN_LAB = STR_FULLSCREEN_CTRL,
+	STR_SERIALA_CTRL = STR_SERPORTA_CTRL,
+	STR_SERIALB_CTRL = STR_SERPORTB_CTRL,
+};
+#else
+#define PROGRAM_NAME "BasiliskII"
+#endif
+
+
+/*
  *  Utility functions
  */
 
@@ -305,10 +324,9 @@ static GtkWidget *make_checkbox(GtkWidge
 	return button;
 }
 
-static GtkWidget *make_combobox(GtkWidget *top, int label_id, const char *prefs_item, const combo_desc *options)
+static GtkWidget *make_combobox(GtkWidget *top, int label_id, const char *default_value, GList *glist)
 {
 	GtkWidget *box, *label, *combo;
-	char str[32];
 
 	box = gtk_hbox_new(FALSE, 4);
 	gtk_widget_show(box);
@@ -317,24 +335,28 @@ static GtkWidget *make_combobox(GtkWidge
 	label = gtk_label_new(GetString(label_id));
 	gtk_widget_show(label);
 	gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 0);
-
-	GList *glist = NULL;
-	while (options->label_id) {
-		glist = g_list_append(glist, (void *)GetString(options->label_id));
-		options++;
-	}
 	
 	combo = gtk_combo_new();
 	gtk_widget_show(combo);
 	gtk_combo_set_popdown_strings(GTK_COMBO(combo), glist);
 	
-	sprintf(str, "%d", PrefsFindInt32(prefs_item));
-	gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), str);
+	gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), default_value);
 	gtk_box_pack_start(GTK_BOX(box), combo, TRUE, TRUE, 0);
 	
 	return combo;
 }
 
+static GtkWidget *make_combobox(GtkWidget *top, int label_id, const char *default_value, const combo_desc *options)
+{
+	GList *glist = NULL;
+	while (options->label_id) {
+		glist = g_list_append(glist, (void *)GetString(options->label_id));
+		options++;
+	}
+
+	return make_combobox(top, label_id, default_value, glist);
+}
+
  
 /*
  *  Show preferences editor
@@ -390,11 +412,15 @@ static void cb_about(...)
 
 	char str[512];
 	sprintf(str,
-		"Basilisk II\nVersion %d.%d\n\n"
+		PROGRAM_NAME "\nVersion %d.%d\n\n"
 		"Copyright (C) 1997-2005 Christian Bauer et al.\n"
-		"E-mail: Christian.Bauer@uni-mainz.de\n"
-		"http://www.uni-mainz.de/~bauec002/B2Main.html\n\n"
-		"Basilisk II comes with ABSOLUTELY NO\n"
+		"E-mail: cb@cebix.net\n"
+#ifdef SHEEPSHAVER
+		"http://sheepshaver.cebix.net/\n\n"
+#else
+		"http://basilisk.cebix.net/\n\n"
+#endif
+		PROGRAM_NAME " comes with ABSOLUTELY NO\n"
 		"WARRANTY. This is free software, and\n"
 		"you are welcome to redistribute it\n"
 		"under the terms of the GNU General\n"
@@ -490,7 +516,7 @@ bool PrefsEditor(void)
  *  "Volumes" pane
  */
 
-static GtkWidget *w_enableextfs, *w_extdrives;
+static GtkWidget *w_enableextfs, *w_extdrives, *w_cdrom_drive;
 static GtkWidget *volume_list;
 static int selected_volume;
 
@@ -499,6 +525,8 @@ static void set_volumes_sensitive(void)
 {
 	const bool enable_extfs = PrefsFindBool("enableextfs");
 	gtk_widget_set_sensitive(w_extdrives, enable_extfs);
+	const bool no_cdrom = PrefsFindBool("nocdrom");
+	gtk_widget_set_sensitive(w_cdrom_drive, !no_cdrom);
 }
 
 // Volume in list selected
@@ -589,6 +617,22 @@ static void tb_enableextfs(GtkWidget *wi
 static void tb_nocdrom(GtkWidget *widget)
 {
 	PrefsReplaceBool("nocdrom", GTK_TOGGLE_BUTTON(widget)->active);
+	set_volumes_sensitive();
+}
+
+// Add names of CD-ROM devices
+static GList *add_cdrom_names(void)
+{
+	GList *glist = NULL;
+
+	char rootdir[4] = "X:\\";
+	for (char letter = 'C'; letter <= 'Z'; letter++) {
+		rootdir[0] = letter;
+		if (GetDriveType(rootdir) == DRIVE_CDROM)
+			glist = g_list_append(glist, strdup(rootdir));
+	}
+
+	return glist;
 }
 
 // "Enable polling" button toggled
@@ -609,6 +653,12 @@ static void read_volumes_settings(void)
 		PrefsAddString("disk", str);
 	}
 
+	const char *str = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(w_cdrom_drive)->entry));
+	if (str && strlen(str))
+		PrefsReplaceString("cdrom", str);
+	else
+		PrefsRemoveItem("cdrom");
+
 	PrefsReplaceString("extdrives", get_file_entry_path(w_extdrives));
 }
 
@@ -659,6 +709,12 @@ static void create_volumes_pane(GtkWidge
 
 	make_checkbox(box, STR_NOCDROM_CTRL, "nocdrom", GTK_SIGNAL_FUNC(tb_nocdrom));
 
+	GList *glist = add_cdrom_names();
+	str = const_cast<char *>(PrefsFindString("cdrom"));
+	if (str == NULL)
+		str = "";
+	w_cdrom_drive = make_combobox(box, STR_CDROM_DRIVE_CTRL, str, glist);
+
 	make_checkbox(box, STR_POLLMEDIA_CTRL, "pollmedia", GTK_SIGNAL_FUNC(tb_pollmedia));
 
 	make_separator(box);
@@ -673,20 +729,24 @@ static void create_volumes_pane(GtkWidge
  *  "JIT Compiler" pane
  */
 
+#ifndef SHEEPSHAVER
 static GtkWidget *w_jit_fpu;
 static GtkWidget *w_jit_atraps;
 static GtkWidget *w_jit_cache_size;
 static GtkWidget *w_jit_lazy_flush;
 static GtkWidget *w_jit_follow_const_jumps;
+#endif
 
 // Set sensitivity of widgets
 static void set_jit_sensitive(void)
 {
+#ifndef SHEEPSHAVER
 	const bool jit_enabled = PrefsFindBool("jit");
 	gtk_widget_set_sensitive(w_jit_fpu, jit_enabled);
 	gtk_widget_set_sensitive(w_jit_cache_size, jit_enabled);
 	gtk_widget_set_sensitive(w_jit_lazy_flush, jit_enabled);
 	gtk_widget_set_sensitive(w_jit_follow_const_jumps, jit_enabled);
+#endif
 }
 
 // "Use JIT Compiler" button toggled
@@ -697,22 +757,28 @@ static void tb_jit(GtkWidget *widget)
 }
 
 // "Compile FPU Instructions" button toggled
+#ifndef SHEEPSHAVER
 static void tb_jit_fpu(GtkWidget *widget)
 {
 	PrefsReplaceBool("jitfpu", GTK_TOGGLE_BUTTON(widget)->active);
 }
+#endif
 
 // "Lazy translation cache invalidation" button toggled
+#ifndef SHEEPSHAVER
 static void tb_jit_lazy_flush(GtkWidget *widget)
 {
 	PrefsReplaceBool("jitlazyflush", GTK_TOGGLE_BUTTON(widget)->active);
 }
+#endif
 
 // "Translate through constant jumps (inline blocks)" button toggled
+#ifndef SHEEPSHAVER
 static void tb_jit_follow_const_jumps(GtkWidget *widget)
 {
 	PrefsReplaceBool("jitinline", GTK_TOGGLE_BUTTON(widget)->active);
 }
+#endif
 
 // Read settings from widgets and set preferences
 static void read_jit_settings(void)
@@ -720,12 +786,22 @@ static void read_jit_settings(void)
 #if USE_JIT
 	bool jit_enabled = PrefsFindBool("jit");
 	if (jit_enabled) {
+#ifndef SHEEPSHAVER
 		const char *str = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(w_jit_cache_size)->entry));
 		PrefsReplaceInt32("jitcachesize", atoi(str));
+#endif
 	}
 #endif
 }
 
+// "Use built-in 68k DR emulator" button toggled
+#ifdef SHEEPSHAVER
+static void tb_jit_68k(GtkWidget *widget)
+{
+	PrefsReplaceBool("jit68k", GTK_TOGGLE_BUTTON(widget)->active);
+}
+#endif
+
 // Create "JIT Compiler" pane
 static void create_jit_pane(GtkWidget *top)
 {
@@ -736,6 +812,7 @@ static void create_jit_pane(GtkWidget *t
 	box = make_pane(top, STR_JIT_PANE_TITLE);
 	make_checkbox(box, STR_JIT_CTRL, "jit", GTK_SIGNAL_FUNC(tb_jit));
 	
+#ifndef SHEEPSHAVER
 	w_jit_fpu = make_checkbox(box, STR_JIT_FPU_CTRL, "jitfpu", GTK_SIGNAL_FUNC(tb_jit_fpu));
 	
 	// Translation cache size
@@ -746,16 +823,22 @@ static void create_jit_pane(GtkWidget *t
 		STR_JIT_CACHE_SIZE_16MB_LAB,
 		0
 	};
-	w_jit_cache_size = make_combobox(box, STR_JIT_CACHE_SIZE_CTRL, "jitcachesize", options);
+	sprintf(str, "%d", PrefsFindInt32("jitcachesize"));
+	w_jit_cache_size = make_combobox(box, STR_JIT_CACHE_SIZE_CTRL, str, options);
 	
 	// Lazy translation cache invalidation
 	w_jit_lazy_flush = make_checkbox(box, STR_JIT_LAZY_CINV_CTRL, "jitlazyflush", GTK_SIGNAL_FUNC(tb_jit_lazy_flush));
 
 	// Follow constant jumps (inline basic blocks)
 	w_jit_follow_const_jumps = make_checkbox(box, STR_JIT_FOLLOW_CONST_JUMPS, "jitinline", GTK_SIGNAL_FUNC(tb_jit_follow_const_jumps));
+#endif
 
 	set_jit_sensitive();
 #endif
+
+#ifdef SHEEPSHAVER
+	make_checkbox(box, STR_JIT_68K_CTRL, "jit68k", GTK_SIGNAL_FUNC(tb_jit_68k));
+#endif
 }
 
 /*
@@ -767,6 +850,7 @@ static GtkWidget *w_scsi[7];
 // Read settings from widgets and set preferences
 static void read_scsi_settings(void)
 {
+#ifndef DISABLE_SCSI
 	for (int id=0; id<7; id++) {
 		char prefs_name[32];
 		sprintf(prefs_name, "scsi%d", id);
@@ -776,11 +860,13 @@ static void read_scsi_settings(void)
 		else
 			PrefsRemoveItem(prefs_name);
 	}
+#endif
 }
 
 // Create "SCSI" pane
 static void create_scsi_pane(GtkWidget *top)
 {
+#ifndef DISABLE_SCSI
 	GtkWidget *box;
 
 	box = make_pane(top, STR_SCSI_PANE_TITLE);
@@ -790,6 +876,7 @@ static void create_scsi_pane(GtkWidget *
 		sprintf(prefs_name, "scsi%d", id);
 		w_scsi[id] = make_file_entry(box, STR_SCSI_ID_0 + id, prefs_name);
 	}
+#endif
 }
 
 
@@ -833,6 +920,7 @@ static void mn_fullscreen(...)
 {
 	display_type = DISPLAY_SCREEN;
 	hide_show_graphics_widgets();
+	PrefsReplaceInt32("frameskip", 1);
 }
 
 // "5 Hz".."60Hz" selected
@@ -844,6 +932,14 @@ static void mn_30hz(...) {PrefsReplaceIn
 static void mn_60hz(...) {PrefsReplaceInt32("frameskip", 1);}
 static void mn_dynamic(...) {PrefsReplaceInt32("frameskip", 0);}
 
+// QuickDraw acceleration
+#ifdef SHEEPSHAVER
+static void tb_gfxaccel(GtkWidget *widget)
+{
+	PrefsReplaceBool("gfxaccel", GTK_TOGGLE_BUTTON(widget)->active);
+}
+#endif
+
 // Set sensitivity of widgets
 static void set_graphics_sensitive(void)
 {
@@ -861,8 +957,13 @@ static void tb_nosound(GtkWidget *widget
 static void parse_graphics_prefs(void)
 {
 	display_type = DISPLAY_WINDOW;
+#ifdef SHEEPSHAVER
+	dis_width = 640;
+	dis_height = 480;
+#else
 	dis_width = 512;
 	dis_height = 384;
+#endif
 
 	const char *str = PrefsFindString("screen");
 	if (str) {
@@ -1002,6 +1103,10 @@ static void create_graphics_pane(GtkWidg
 	gtk_table_attach(GTK_TABLE(table), combo, 1, 2, 3, 4, (GtkAttachOptions)GTK_FILL, (GtkAttachOptions)0, 4, 4);
 	w_display_y = GTK_COMBO(combo)->entry;
 
+#ifdef SHEEPSHAVER
+	make_checkbox(box, STR_GFXACCEL_CTRL, "gfxaccel", GTK_SIGNAL_FUNC(tb_gfxaccel));
+#endif
+
 	make_separator(box);
 	make_checkbox(box, STR_NOSOUND_CTRL, "nosound", GTK_SIGNAL_FUNC(tb_nosound));
 
@@ -1217,6 +1322,7 @@ static void create_serial_pane(GtkWidget
 static GtkWidget *w_ether;
 static GtkWidget *w_ftp_port_list, *w_tcp_port_list;
 static const char s_nat_router[] = "NAT/Router module";
+static const char s_ndis_tag[] = "NDIS ";
 
 // Set sensitivity of widgets
 static void set_ethernet_sensitive(void)
@@ -1232,8 +1338,8 @@ static void set_ethernet_sensitive(void)
 static void read_ethernet_settings(void)
 {
 	const char *str = gtk_entry_get_text(GTK_ENTRY(w_ether));
-	if (str && strlen(str) > 6 && strncmp(str, "NDIS: ", 6) == 0)
-		PrefsReplaceString("ether", &str[6]);
+	if (str && strlen(str) > sizeof(s_ndis_tag) && strncmp(str, s_ndis_tag, sizeof(s_ndis_tag) - 1) == 0)
+		PrefsReplaceString("ether", &str[sizeof(s_ndis_tag) - 1]);
 	else
 		PrefsRemoveItem("ether");
 
@@ -1254,17 +1360,39 @@ static void cb_ether_changed(...)
 }
 
 // Add names of ethernet interfaces
+// XXX use radio buttons instead (None/NDIS/NAT)
 static GList *add_ether_names(void)
 {
 	GList *glist = NULL;
 
-	// TODO: Get list of all Ethernet interfaces
-#ifdef HAVE_SLIRP
-	static const char s_slirp[] = "slirp";
-	glist = g_list_append(glist, (void *)s_slirp);
-#endif
-	glist = g_list_append(glist, (void *)s_nat_router);
 	glist = g_list_append(glist, (void *)GetString(STR_NONE_LAB));
+	glist = g_list_append(glist, (void *)s_nat_router);
+
+	{	// Get NDIS ethernet adapters (XXX handle "ethermulticastmode")
+		PacketOpenAdapter("", 0);
+		{
+			ULONG sz;
+			char names[1024];
+			sz = sizeof(names);
+			if (PacketGetAdapterNames(NULL, names, &sz) == ERROR_SUCCESS) {
+				char *p = names;
+				while (*p) {
+					const char DEVICE_HEADER[] = "\\Device\\B2ether_";
+					if (strnicmp(p, DEVICE_HEADER, sizeof(DEVICE_HEADER) - 1) == 0) {
+						LPADAPTER fd = PacketOpenAdapter(p + sizeof(DEVICE_HEADER) - 1, 0);
+						if (fd) {
+							char str[256];
+							sprintf(str, "%s%s", s_ndis_tag, p + sizeof(DEVICE_HEADER) - 1);
+							glist = g_list_append(glist, strdup(str));
+							PacketCloseAdapter(fd);
+						}
+					}
+					p += strlen(p) + 1;
+				}
+			}
+		}
+		PacketCloseAdapter(NULL);
+	}
 	return glist;
 }
 
@@ -1292,6 +1420,11 @@ static void create_ethernet_pane(GtkWidg
 		else
 			str = GetString(STR_NONE_LAB);
 	}
+	else if (str[0] == '{') {
+		static char s_device[256];
+		sprintf(s_device, "%s%s", s_ndis_tag, str);
+		str = s_device;
+	}
 	gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), str); 
 	gtk_table_attach(GTK_TABLE(table), combo, 1, 2, 0, 1, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)0, 4, 4);
 	w_ether = GTK_COMBO(combo)->entry;
@@ -1338,6 +1471,14 @@ static void create_ethernet_pane(GtkWidg
 static GtkWidget *w_ramsize;
 static GtkWidget *w_rom_file;
 
+// Don't use CPU when idle?
+#ifdef SHEEPSHAVER
+static void tb_idlewait(GtkWidget *widget)
+{
+	PrefsReplaceBool("idlewait", GTK_TOGGLE_BUTTON(widget)->active);
+}
+#endif
+
 // "Ignore SEGV" button toggled
 #ifdef HAVE_SIGSEGV_SKIP_INSTRUCTION
 static void tb_ignoresegv(GtkWidget *widget)
@@ -1380,7 +1521,9 @@ static void create_memory_pane(GtkWidget
 	table = make_table(box, 2, 5);
 
 	static const combo_desc options[] = {
+#ifndef SHEEPSHAVER
 		STR_RAMSIZE_2MB_LAB,
+#endif
 		STR_RAMSIZE_4MB_LAB,
 		STR_RAMSIZE_8MB_LAB,
 		STR_RAMSIZE_16MB_LAB,
@@ -1389,13 +1532,16 @@ static void create_memory_pane(GtkWidget
 		STR_RAMSIZE_128MB_LAB,
 		STR_RAMSIZE_256MB_LAB,
 		STR_RAMSIZE_512MB_LAB,
+#ifndef SHEEPSHAVER
 		STR_RAMSIZE_1024MB_LAB,
+#endif
 		0
 	};
 	char default_ramsize[10];
 	sprintf(default_ramsize, "%d", PrefsFindInt32("ramsize") >> 20);
 	w_ramsize = table_make_combobox(table, 0, STR_RAMSIZE_CTRL, default_ramsize, options);
 
+#ifndef SHEEPSHAVER
 	static const opt_desc model_options[] = {
 		{STR_MODELID_5_LAB, GTK_SIGNAL_FUNC(mn_modelid_5)},
 		{STR_MODELID_14_LAB, GTK_SIGNAL_FUNC(mn_modelid_14)},
@@ -1407,6 +1553,7 @@ static void create_memory_pane(GtkWidget
 		case 14: active = 1; break;
 	}
 	table_make_option_menu(table, 2, STR_MODELID_CTRL, model_options, active);
+#endif
 
 #if EMULATED_68K
 	static const opt_desc cpu_options[] = {
@@ -1433,6 +1580,10 @@ static void create_memory_pane(GtkWidget
 #ifdef HAVE_SIGSEGV_SKIP_INSTRUCTION
 	make_checkbox(box, STR_IGNORESEGV_CTRL, "ignoresegv", GTK_SIGNAL_FUNC(tb_ignoresegv));
 #endif
+
+#ifdef SHEEPSHAVER
+	make_checkbox(box, STR_IDLEWAIT_CTRL, "idlewait", GTK_SIGNAL_FUNC(tb_idlewait));
+#endif
 }
 
 
@@ -1461,6 +1612,8 @@ uint8 XPRAM[XPRAM_SIZE];
 void MountVolume(void *fh) { }
 void FileDiskLayout(loff_t size, uint8 *data, loff_t &start_byte, loff_t &real_size) { }
 void WarningAlert(const char *text) { }
+void recycle_write_packet(LPPACKET) { }
+VOID CALLBACK packet_read_completion(DWORD, DWORD, LPOVERLAPPED) { }
 
 
 /*
@@ -1508,7 +1661,7 @@ int main(int argc, char *argv[])
 	// Exit preferences
 	PrefsExit();
 
-	// Transfer control to the Basilisk II executable
+	// Transfer control to the executable
 	if (start) {
 		char path[_MAX_PATH];
 		bool ok = GetModuleFileName(NULL, path, sizeof(path)) != 0;
@@ -1518,14 +1671,15 @@ int main(int argc, char *argv[])
 			*++p = '\0';
 			SetCurrentDirectory(path);
 			strcpy(b2_path, path);
-			strcat(b2_path, "BasiliskII.exe");
+			strcat(b2_path, PROGRAM_NAME);
+			strcat(b2_path, ".exe");
 			HINSTANCE h = ShellExecute(GetDesktopWindow(), "open",
 									   b2_path, "", path, SW_SHOWNORMAL);
 			if ((int)h <= 32)
 				ok = false;
 		}
 		if (!ok) {
-			ErrorAlert("Coult not start BasiliskII executable");
+			ErrorAlert("Coult not start " PROGRAM_NAME " executable");
 			return 1;
 		}
 	}