Made ChimaraApp class

[projects/chimara/chimara.git] / player / main.c

diff --git a/player/main.c b/player/main.c
index 9827d3193e9a57f20c0c27ed33439203ec3e1c8b..85ed57cbbeab7bd57f2674b20ff0301ae2a0d048 100644 (file)
--- a/player/main.c
+++ b/player/main.c
@@ -30,111 +30,25 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/types.h>
-#include <sys/stat.h>
+
 #include <unistd.h>
 #include <string.h>
 #include <stdio.h>
 
 #include <glib.h>
-#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
 #include "error.h"
 #include <libchimara/chimara-glk.h>
 #include <libchimara/chimara-if.h>
 
-/* Global pointers to widgets */
-GtkBuilder *builder = NULL;
-GtkUIManager *uimanager = NULL;
-GtkWidget *window = NULL;
-GtkWidget *glk = NULL;
-
-static GObject *
-load_object(const gchar *name)
-{
-       GObject *retval;
-       if( (retval = gtk_builder_get_object(builder, name)) == NULL) {
-               error_dialog(NULL, NULL, "Error while getting object '%s'", name);
-               g_error("Error while getting object '%s'", name);
-       }
-       return retval;
-}
-
-static void
-create_window(void)
-{
-       GError *error = NULL;
-
-       builder = gtk_builder_new();
-       if( !gtk_builder_add_from_file(builder, PACKAGE_SRC_DIR "/chimara.ui", &error) ) {
-               error_dialog(NULL, error, "Error while building interface: ");  
-               return;
-       }
-
-       window = GTK_WIDGET(load_object("chimara"));
-       GtkActionGroup *actiongroup = GTK_ACTION_GROUP(load_object("actiongroup"));
-
-       /* 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", "",
-               "cut", NULL,
-               "copy", NULL,
-               "paste", NULL,
-               "preferences", "",
-               "help", "",
-               "about", "",
-               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]);
-
-       uimanager = gtk_ui_manager_new();
-       if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_SRC_DIR "/chimara.menus", &error) ) {
-               error_dialog(NULL, error, "Error while building interface: ");
-               return;
-       }
-       
-       glk = chimara_if_new();
-       g_object_set(glk, "ignore-errors", TRUE, NULL);
-       
-       GtkBox *vbox = GTK_BOX( gtk_builder_get_object(builder, "vbox") );                      
-       if(vbox == NULL)
-       {
-               error_dialog(NULL, NULL, "Could not find vbox");
-               return;
-       }
-
-       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");
-
-       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_builder_connect_signals(builder, glk);
-}
+#include "preferences.h"
+#include "player.h"
+#include "app.h"
 
 int
 main(int argc, char *argv[])
 {
-       GError *error = NULL;
-
 #ifdef ENABLE_NLS
        bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
        bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
@@ -146,25 +60,26 @@ main(int argc, char *argv[])
        gdk_threads_init();
        gtk_init(&argc, &argv);
 
-       create_window();
-       gtk_widget_show_all(window);
+       ChimaraApp *theapp = chimara_app_get();
 
-       g_object_unref( G_OBJECT(builder) );
-       g_object_unref( G_OBJECT(uimanager) );
+       GtkWidget *window = chimara_player_new();
+       gtk_widget_show_all(window);
 
-       if(argc >= 2) {
-               if( !chimara_if_run_game(CHIMARA_IF(glk), argv[1], &error) ) {
-                       error_dialog(GTK_WINDOW(window), error, "Error starting Glk library: ");
-                       return 1;
-               }
-       }
+       //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: ");
+       //              return 1;
+       //      }
+       //}
 
     gdk_threads_enter();
        gtk_main();
        gdk_threads_leave();
 
-       chimara_glk_stop(CHIMARA_GLK(glk));
-       chimara_glk_wait(CHIMARA_GLK(glk));
+       g_object_unref(theapp);
 
        return 0;
 }