X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=player%2Fmain.c;h=ff5c681cdf6588e5e182b8cffd38c1988b0542d9;hb=012d66921278f7271a323a50c81bb9e2d6ce6aeb;hp=7eef7f740c8228db1fb2a050faa4c542bcc853fb;hpb=f945dd447b55c34d88683ff48d7ffb0b7c3c2ad8;p=projects%2Fchimara%2Fchimara.git

diff --git a/player/main.c b/player/main.c
index 7eef7f7..ff5c681 100644
--- a/player/main.c
+++ b/player/main.c
@@ -55,6 +55,7 @@ static GtkWidget *glk = NULL;
 GtkBuilder *builder = NULL;
 GtkWidget *aboutwindow = NULL;
 GtkWidget *prefswindow = NULL;
+GtkWidget *toolbar = NULL;
 
 GObject *
 load_object(const gchar *name)
@@ -110,52 +111,16 @@ create_window(void)
 	aboutwindow = GTK_WIDGET(load_object("aboutwindow"));
 	prefswindow = GTK_WIDGET(load_object("prefswindow"));
 	GtkActionGroup *actiongroup = GTK_ACTION_GROUP(load_object("actiongroup"));
-	GtkActionGroup *style_actiongroup = GTK_ACTION_GROUP(load_object("style-actiongroup"));
+	GtkToggleAction *toolbar_action = GTK_TOGGLE_ACTION(load_object("toolbar"));
 
-	/* Add all the actions to the action group. This for-loop is a temporary fix
-	and can be removed once Glade supports adding actions and accelerators to an
-	action group. */
-	const gchar *actions[] = { 
-		"game", "",
-		"open", "<ctrl>O", 
-		"recent", "",
-		"stop", "",
-		"quit_chimara", NULL, /* NULL means use stock accelerator */
-		"command", "",
-		"undo", "<ctrl>Z",
-		"save", NULL, 
-		"restore", "<ctrl>R", 
-		"restart", "",
-		"quit", "",
-		"edit", "",
-		"copy", NULL,
-		"paste", NULL,
-		"preferences", "",
-		"help", "",
-		"about", "",
-		NULL
-	};
-	const gchar *style_actions[] = { 
-		"align-left",
-		"align-justify",
-		"align-right",
-		"bold",
-		"italic",
-		"underline",
-		NULL
-	};
 	const gchar **ptr;
-	for(ptr = actions; *ptr; ptr += 2)
-		gtk_action_group_add_action_with_accel(actiongroup, GTK_ACTION(load_object(ptr[0])), ptr[1]);
-	for(ptr = style_actions; *ptr; ptr ++)
-		gtk_action_group_add_action(style_actiongroup, GTK_ACTION(load_object(*ptr)));
 	GtkRecentFilter *filter = gtk_recent_filter_new();
 	/* TODO: Use mimetypes and construct the filter dynamically depending on 
 	what plugins are installed */
 	const gchar *patterns[] = {
 		"*.z[1-8]", "*.[zg]lb", "*.[zg]blorb", "*.ulx", "*.blb", "*.blorb", NULL
 	};
-	
+
 	for(ptr = patterns; *ptr; ptr++)
 		gtk_recent_filter_add_pattern(filter, *ptr);
 	GtkRecentChooser *recent = GTK_RECENT_CHOOSER(load_object("recent"));
@@ -174,9 +139,12 @@ create_window(void)
 		}
 #endif /* DEBUG */
 	}
-	
+
 	glk = chimara_if_new();
-	g_object_set(glk, "ignore-errors", TRUE, NULL);
+	g_object_set(glk,
+	    "ignore-errors", TRUE,
+	    /*"interpreter-number", CHIMARA_IF_ZMACHINE_TANDY_COLOR,*/
+	    NULL);
 	if( !chimara_glk_set_css_from_file(CHIMARA_GLK(glk), PACKAGE_DATA_DIR "/style.css", &error) ) {
 #ifdef DEBUG
 		g_error_free(error);
@@ -189,6 +157,24 @@ create_window(void)
 		}
 #endif /* DEBUG */
 	}
+	chimara_if_set_preferred_interpreter(CHIMARA_IF(glk),
+	    CHIMARA_IF_FORMAT_Z5,
+	    CHIMARA_IF_INTERPRETER_FROTZ);
+	chimara_if_set_preferred_interpreter(CHIMARA_IF(glk),
+	    CHIMARA_IF_FORMAT_Z6,
+	    CHIMARA_IF_INTERPRETER_NITFOL);
+	chimara_if_set_preferred_interpreter(CHIMARA_IF(glk),
+	    CHIMARA_IF_FORMAT_Z8,
+	    CHIMARA_IF_INTERPRETER_FROTZ);
+	chimara_if_set_preferred_interpreter(CHIMARA_IF(glk),
+	    CHIMARA_IF_FORMAT_Z_BLORB,
+	    CHIMARA_IF_INTERPRETER_FROTZ);
+	chimara_if_set_preferred_interpreter(CHIMARA_IF(glk),
+	    CHIMARA_IF_FORMAT_GLULX,
+	    CHIMARA_IF_INTERPRETER_GLULXE);
+	chimara_if_set_preferred_interpreter(CHIMARA_IF(glk),
+	    CHIMARA_IF_FORMAT_GLULX_BLORB,
+	    CHIMARA_IF_INTERPRETER_GLULXE);
 	
 	/* DON'T UNCOMMENT THIS your eyes will burn
 	 but it is a good test of programmatically altering just one style
@@ -204,11 +190,16 @@ create_window(void)
 
 	gtk_ui_manager_insert_action_group(uimanager, actiongroup, 0);
 	GtkWidget *menubar = gtk_ui_manager_get_widget(uimanager, "/menubar");
-	//GtkWidget *toolbar = gtk_ui_manager_get_widget(uimanager, "/toolbar");
+	toolbar = gtk_ui_manager_get_widget(uimanager, "/toolbar");
+	gtk_widget_set_no_show_all(toolbar, TRUE);
+	if(gtk_toggle_action_get_active(toolbar_action))
+		gtk_widget_show(toolbar);
+	else
+		gtk_widget_hide(toolbar);
 
 	gtk_box_pack_end(vbox, glk, TRUE, TRUE, 0);
 	gtk_box_pack_start(vbox, menubar, FALSE, FALSE, 0);
-	//gtk_box_pack_start(vbox, toolbar, FALSE, FALSE, 0);
+	gtk_box_pack_start(vbox, toolbar, FALSE, FALSE, 0);
 	
 	gtk_builder_connect_signals(builder, glk);
 	g_signal_connect(glk, "notify::program-name", G_CALLBACK(change_window_title), window);
@@ -239,6 +230,9 @@ main(int argc, char *argv[])
 
 	g_object_unref( G_OBJECT(uimanager) );
 
+	if(argc == 3) {
+		g_object_set(glk, "graphics-file", argv[2], NULL);
+	}
 	if(argc >= 2) {
 		if( !chimara_if_run_game(CHIMARA_IF(glk), argv[1], &error) ) {
 	   		error_dialog(GTK_WINDOW(window), error, "Error starting Glk library: ");