--- BasiliskII/src/Unix/prefs_editor_gtk.cpp	2000/07/13 13:47:11	1.11
+++ BasiliskII/src/Unix/prefs_editor_gtk.cpp	2001/07/12 19:48:27	1.18
@@ -1,7 +1,7 @@
 /*
  *  prefs_editor_gtk.cpp - Preferences editor, Unix implementation using GTK+
  *
- *  Basilisk II (C) 1997-2000 Christian Bauer
+ *  Basilisk II (C) 1997-2001 Christian Bauer
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -45,6 +45,7 @@ static bool start_clicked = true;	// Ret
 static void create_volumes_pane(GtkWidget *top);
 static void create_scsi_pane(GtkWidget *top);
 static void create_graphics_pane(GtkWidget *top);
+static void create_input_pane(GtkWidget *top);
 static void create_serial_pane(GtkWidget *top);
 static void create_memory_pane(GtkWidget *top);
 static void read_settings(void);
@@ -226,13 +227,21 @@ static void mn_about(...)
 {
 	GtkWidget *dialog, *label, *button;
 
-	char str[256];
-	sprintf(str, GetString(STR_ABOUT_TEXT1), VERSION_MAJOR, VERSION_MINOR);
-	strncat(str, "\n", 255);
-	strncat(str, GetString(STR_ABOUT_TEXT2), 255);
+	char str[512];
+	sprintf(str,
+		"Basilisk II\nVersion %d.%d\n\n"
+		"Copyright (C) 1997-2001 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"
+		"WARRANTY. This is free software, and\n"
+		"you are welcome to redistribute it\n"
+		"under the terms of the GNU General\n"
+		"Public License.\n",
+		VERSION_MAJOR, VERSION_MINOR
+	);
 
 	dialog = gtk_dialog_new();
-	gtk_widget_set_usize(GTK_WIDGET(dialog), strlen(GetString(STR_ABOUT_TEXT2)) + 200, 120);
 	gtk_window_set_title(GTK_WINDOW(dialog), GetString(STR_ABOUT_TITLE));
 	gtk_container_border_width(GTK_CONTAINER(dialog), 5);
 	gtk_widget_set_uposition(GTK_WIDGET(dialog), 100, 150);
@@ -297,6 +306,7 @@ bool PrefsEditor(void)
 	create_volumes_pane(notebook);
 	create_scsi_pane(notebook);
 	create_graphics_pane(notebook);
+	create_input_pane(notebook);
 	create_serial_pane(notebook);
 	create_memory_pane(notebook);
 
@@ -400,8 +410,8 @@ static void cb_remove_volume(...)
 }
 
 // "Boot From" selected
-static void mn_boot_any(...) {PrefsReplaceInt16("bootdriver", 0);}
-static void mn_boot_cdrom(...) {PrefsReplaceInt16("bootdriver", CDROMRefNum);}
+static void mn_boot_any(...) {PrefsReplaceInt32("bootdriver", 0);}
+static void mn_boot_cdrom(...) {PrefsReplaceInt32("bootdriver", CDROMRefNum);}
 
 // "No CD-ROM Driver" button toggled
 static void tb_nocdrom(GtkWidget *widget)
@@ -464,7 +474,7 @@ static void create_volumes_pane(GtkWidge
 		{STR_BOOT_CDROM_LAB, GTK_SIGNAL_FUNC(mn_boot_cdrom)},
 		{0, NULL}
 	};
-	int bootdriver = PrefsFindInt16("bootdriver"), active = 0;
+	int bootdriver = PrefsFindInt32("bootdriver"), active = 0;
 	switch (bootdriver) {
 		case 0: active = 0; break;
 		case CDROMRefNum: active = 1; break;
@@ -575,6 +585,7 @@ static void mn_10hz(...) {PrefsReplaceIn
 static void mn_15hz(...) {PrefsReplaceInt32("frameskip", 4);}
 static void mn_30hz(...) {PrefsReplaceInt32("frameskip", 2);}
 static void mn_60hz(...) {PrefsReplaceInt32("frameskip", 1);}
+static void mn_dynamic(...) {PrefsReplaceInt32("frameskip", 0);}
 
 // "Disable Sound Output" button toggled
 static void tb_nosound(GtkWidget *widget)
@@ -680,27 +691,20 @@ static void create_graphics_pane(GtkWidg
 	add_menu_item(menu, STR_REF_15HZ_LAB, GTK_SIGNAL_FUNC(mn_15hz));
 	add_menu_item(menu, STR_REF_30HZ_LAB, GTK_SIGNAL_FUNC(mn_30hz));
 	add_menu_item(menu, STR_REF_60HZ_LAB, GTK_SIGNAL_FUNC(mn_60hz));
+	add_menu_item(menu, STR_REF_DYNAMIC_LAB, GTK_SIGNAL_FUNC(mn_dynamic));
 	int frameskip = PrefsFindInt32("frameskip");
+	int item = -1;
 	switch (frameskip) {
-		case 12:
-			gtk_menu_set_active(GTK_MENU(menu), 0);
-			break;
-		case 8:
-			gtk_menu_set_active(GTK_MENU(menu), 1);
-			break;
-		case 6:
-			gtk_menu_set_active(GTK_MENU(menu), 2);
-			break;
-		case 4:
-			gtk_menu_set_active(GTK_MENU(menu), 3);
-			break;
-		case 2:
-			gtk_menu_set_active(GTK_MENU(menu), 4);
-			break;
-		case 1:
-			gtk_menu_set_active(GTK_MENU(menu), 5);
-			break;
+		case 12: item = 0; break;
+		case 8: item = 1; break;
+		case 6: item = 2; break;
+		case 4: item = 3; break;
+		case 2: item = 4; break;
+		case 1: item = 5; break;
+		case 0: item = 6; break;
 	}
+	if (item >= 0)
+		gtk_menu_set_active(GTK_MENU(menu), item);
 	gtk_option_menu_set_menu(GTK_OPTION_MENU(w_frameskip), menu);
 	gtk_table_attach(GTK_TABLE(table), w_frameskip, 1, 2, 1, 2, (GtkAttachOptions)GTK_FILL, (GtkAttachOptions)0, 4, 4);
 
@@ -759,6 +763,7 @@ static void create_graphics_pane(GtkWidg
 	w_fbdevice_file = make_entry(box, STR_FBDEVICE_FILE_CTRL, "fbdevicefile");
 #endif
 
+	make_separator(box);
 	make_checkbox(box, STR_NOSOUND_CTRL, "nosound", GTK_SIGNAL_FUNC(tb_nosound));
 
 	hide_show_graphics_widgets();
@@ -766,10 +771,105 @@ static void create_graphics_pane(GtkWidg
 
 
 /*
+ *  "Input" pane
+ */
+
+static GtkWidget *w_keycode_file;
+static GtkWidget *w_mouse_wheel_lines;
+
+// Set sensitivity of widgets
+static void set_input_sensitive(void)
+{
+	gtk_widget_set_sensitive(w_keycode_file, PrefsFindBool("keycodes"));
+	gtk_widget_set_sensitive(w_mouse_wheel_lines, PrefsFindInt32("mousewheelmode") == 1);
+}
+
+// "Use Raw Keycodes" button toggled
+static void tb_keycodes(GtkWidget *widget)
+{
+	PrefsReplaceBool("keycodes", GTK_TOGGLE_BUTTON(widget)->active);
+	set_input_sensitive();
+}
+
+// "Mouse Wheel Mode" selected
+static void mn_wheel_page(...) {PrefsReplaceInt32("mousewheelmode", 0); set_input_sensitive();}
+static void mn_wheel_cursor(...) {PrefsReplaceInt32("mousewheelmode", 1); set_input_sensitive();}
+
+// Read settings from widgets and set preferences
+static void read_input_settings(void)
+{
+	const char *str = gtk_entry_get_text(GTK_ENTRY(w_keycode_file));
+	if (str && strlen(str))
+		PrefsReplaceString("keycodefile", str);
+	else
+		PrefsRemoveItem("keycodefile");
+
+	PrefsReplaceInt32("mousewheellines", gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(w_mouse_wheel_lines)));
+}
+
+// Create "Input" pane
+static void create_input_pane(GtkWidget *top)
+{
+	GtkWidget *box, *hbox, *menu, *label;
+	GtkObject *adj;
+
+	box = make_pane(top, STR_INPUT_PANE_TITLE);
+
+	make_checkbox(box, STR_KEYCODES_CTRL, "keycodes", GTK_SIGNAL_FUNC(tb_keycodes));
+	w_keycode_file = make_entry(box, STR_KEYCODE_FILE_CTRL, "keycodefile");
+
+	make_separator(box);
+
+	static const opt_desc options[] = {
+		{STR_MOUSEWHEELMODE_PAGE_LAB, GTK_SIGNAL_FUNC(mn_wheel_page)},
+		{STR_MOUSEWHEELMODE_CURSOR_LAB, GTK_SIGNAL_FUNC(mn_wheel_cursor)},
+		{0, NULL}
+	};
+	int wheelmode = PrefsFindInt32("mousewheelmode"), active = 0;
+	switch (wheelmode) {
+		case 0: active = 0; break;
+		case 1: active = 1; break;
+	}
+	menu = make_option_menu(box, STR_MOUSEWHEELMODE_CTRL, options, active);
+
+	hbox = gtk_hbox_new(FALSE, 4);
+	gtk_widget_show(hbox);
+	gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0);
+
+	label = gtk_label_new(GetString(STR_MOUSEWHEELLINES_CTRL));
+	gtk_widget_show(label);
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+
+	adj = gtk_adjustment_new(PrefsFindInt32("mousewheellines"), 1, 1000, 1, 5, 0);
+	w_mouse_wheel_lines = gtk_spin_button_new(GTK_ADJUSTMENT(adj), 0.0, 0);
+	gtk_widget_show(w_mouse_wheel_lines);
+	gtk_box_pack_start(GTK_BOX(hbox), w_mouse_wheel_lines, FALSE, FALSE, 0);
+
+	set_input_sensitive();
+}
+
+
+/*
  *  "Serial/Network" pane
  */
 
-static GtkWidget *w_seriala, *w_serialb, *w_ether;
+static GtkWidget *w_seriala, *w_serialb, *w_ether, *w_udp_port;
+
+// Set sensitivity of widgets
+static void set_serial_sensitive(void)
+{
+#if SUPPORTS_UDP_TUNNEL
+	gtk_widget_set_sensitive(w_ether, !PrefsFindBool("udptunnel"));
+	gtk_widget_set_sensitive(w_udp_port, PrefsFindBool("udptunnel"));
+#endif
+}
+
+// "Tunnel AppleTalk over IP" button toggled
+static void tb_udptunnel(GtkWidget *widget)
+{
+	PrefsReplaceBool("udptunnel", GTK_TOGGLE_BUTTON(widget)->active);
+	set_serial_sensitive();
+}
 
 // Read settings from widgets and set preferences
 static void read_serial_settings(void)
@@ -787,6 +887,10 @@ static void read_serial_settings(void)
 		PrefsReplaceString("ether", str);
 	else
 		PrefsRemoveItem("ether");
+
+#if SUPPORTS_UDP_TUNNEL
+	PrefsReplaceInt32("udpport", gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(w_udp_port)));
+#endif
 }
 
 // Add names of serial devices
@@ -870,16 +974,17 @@ static GList *add_ether_names(void)
 // Create "Serial/Network" pane
 static void create_serial_pane(GtkWidget *top)
 {
-	GtkWidget *box, *table, *label, *combo;
-	GList *glist = add_serial_names();
+	GtkWidget *box, *hbox, *table, *label, *combo, *sep;
+	GtkObject *adj;
 
 	box = make_pane(top, STR_SERIAL_NETWORK_PANE_TITLE);
-	table = make_table(box, 2, 3);
+	table = make_table(box, 2, 4);
 
 	label = gtk_label_new(GetString(STR_SERIALA_CTRL));
 	gtk_widget_show(label);
 	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4);
 
+	GList *glist = add_serial_names();
 	combo = gtk_combo_new();
 	gtk_widget_show(combo);
 	gtk_combo_set_popdown_strings(GTK_COMBO(combo), glist);
@@ -904,9 +1009,13 @@ static void create_serial_pane(GtkWidget
 	gtk_table_attach(GTK_TABLE(table), combo, 1, 2, 1, 2, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)0, 4, 4);
 	w_serialb = GTK_COMBO(combo)->entry;
 
+	sep = gtk_hseparator_new();
+	gtk_widget_show(sep);
+	gtk_table_attach(GTK_TABLE(table), sep, 0, 2, 2, 3, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4);
+
 	label = gtk_label_new(GetString(STR_ETHERNET_IF_CTRL));
 	gtk_widget_show(label);
-	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4);
+	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4);
 
 	glist = add_ether_names();
 	combo = gtk_combo_new();
@@ -916,8 +1025,27 @@ static void create_serial_pane(GtkWidget
 	if (str == NULL)
 		str = "";
 	gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), str); 
-	gtk_table_attach(GTK_TABLE(table), combo, 1, 2, 2, 3, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)0, 4, 4);
+	gtk_table_attach(GTK_TABLE(table), combo, 1, 2, 3, 4, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)0, 4, 4);
 	w_ether = GTK_COMBO(combo)->entry;
+
+#if SUPPORTS_UDP_TUNNEL
+	make_checkbox(box, STR_UDPTUNNEL_CTRL, "udptunnel", GTK_SIGNAL_FUNC(tb_udptunnel));
+
+	hbox = gtk_hbox_new(FALSE, 4);
+	gtk_widget_show(hbox);
+	gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0);
+
+	label = gtk_label_new(GetString(STR_UDPPORT_CTRL));
+	gtk_widget_show(label);
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+
+	adj = gtk_adjustment_new(PrefsFindInt32("udpport"), 1, 65535, 1, 5, 0);
+	w_udp_port = gtk_spin_button_new(GTK_ADJUSTMENT(adj), 0.0, 0);
+	gtk_widget_show(w_udp_port);
+	gtk_box_pack_start(GTK_BOX(hbox), w_udp_port, FALSE, FALSE, 0);
+#endif
+
+	set_serial_sensitive();
 }
 
 
@@ -927,7 +1055,6 @@ static void create_serial_pane(GtkWidget
 
 static GtkObject *w_ramsize_adj;
 static GtkWidget *w_rom_file;
-static GtkWidget *w_keycode_file;
 
 // Model ID selected
 static void mn_modelid_5(...) {PrefsReplaceInt32("modelid", 5);}
@@ -940,12 +1067,6 @@ static void mn_cpu_68030(...) {PrefsRepl
 static void mn_cpu_68030_fpu(...) {PrefsReplaceInt32("cpu", 3); PrefsReplaceBool("fpu", true);}
 static void mn_cpu_68040(...) {PrefsReplaceInt32("cpu", 4); PrefsReplaceBool("fpu", true);}
 
-// "Use Raw Keycodes" button toggled
-static void tb_keycodes(GtkWidget *widget)
-{
-	PrefsReplaceBool("keycodes", GTK_TOGGLE_BUTTON(widget)->active);
-}
-
 // Read settings from widgets and set preferences
 static void read_memory_settings(void)
 {
@@ -957,17 +1078,12 @@ static void read_memory_settings(void)
 	else
 		PrefsRemoveItem("rom");
 
-	str = gtk_entry_get_text(GTK_ENTRY(w_keycode_file));
-	if (str && strlen(str))
-		PrefsReplaceString("keycodefile", str);
-	else
-		PrefsRemoveItem("keycodefile");
 }
 
 // Create "Memory/Misc" pane
 static void create_memory_pane(GtkWidget *top)
 {
-	GtkWidget *box, *vbox, *hbox, *hbox2, *label, *scale, *menu;
+	GtkWidget *box, *hbox, *vbox, *hbox2, *label, *scale;
 
 	box = make_pane(top, STR_MEMORY_MISC_PANE_TITLE);
 
@@ -1042,9 +1158,6 @@ static void create_memory_pane(GtkWidget
 #endif
 
 	w_rom_file = make_entry(box, STR_ROM_FILE_CTRL, "rom");
-
-	make_checkbox(box, STR_KEYCODES_CTRL, "keycodes", GTK_SIGNAL_FUNC(tb_keycodes));
-	w_keycode_file = make_entry(box, STR_KEYCODE_FILE_CTRL, "keycodefile");
 }
 
 
@@ -1057,6 +1170,7 @@ static void read_settings(void)
 	read_volumes_settings();
 	read_scsi_settings();
 	read_graphics_settings();
+	read_input_settings();
 	read_serial_settings();
 	read_memory_settings();
 }