/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation
+ Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Free Software Foundation
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
#include <unistd.h>
#include "data/casereader.h"
+#include "data/dataset.h"
#include "data/datasheet.h"
#include "data/file-handle-def.h"
#include "data/file-name.h"
#include "data/por-file-reader.h"
-#include "data/procedure.h"
+#include "data/session.h"
#include "data/settings.h"
#include "data/sys-file-reader.h"
#include "language/lexer/lexer.h"
-#include "language/syntax-string-source.h"
-
-#include "libpspp/getl.h"
#include "libpspp/i18n.h"
#include "libpspp/message.h"
#include "libpspp/version.h"
#include "ui/gui/psppire-data-store.h"
#include "ui/gui/psppire-data-window.h"
#include "ui/gui/psppire-dict.h"
+#include "ui/gui/psppire.h"
#include "ui/gui/psppire-output-window.h"
#include "ui/gui/psppire-selector.h"
#include "ui/gui/psppire-var-store.h"
#include "ui/gui/psppire-var-view.h"
#include "ui/gui/psppire-window-register.h"
-#include "ui/gui/psppire.h"
#include "ui/gui/widgets.h"
#include "ui/source-init-opts.h"
#include "ui/syntax-gen.h"
#include "gl/xalloc.h"
#include "gl/relocatable.h"
-GtkRecentManager *the_recent_mgr = 0;
-PsppireDataStore *the_data_store = 0;
-PsppireVarStore *the_var_store = 0;
+GtkRecentManager *the_recent_mgr;
static void create_icon_factory (void);
-
-struct source_stream *the_source_stream ;
-struct dataset * the_dataset = NULL;
-
-static GtkWidget *the_data_window;
-
-static void handle_msg (const struct msg *);
-static void load_data_file (const char *);
-
-static void
-replace_casereader (struct casereader *s)
-{
- psppire_data_store_set_reader (the_data_store, s);
-}
+static void load_data_file (PsppireDataWindow *, const char *);
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
-
-
void
-initialize (struct source_stream *ss, const char *data_file)
+initialize (const char *data_file)
{
- PsppireDict *dictionary = 0;
+ PsppireDataWindow *data_window;
i18n_init ();
settings_init ();
fh_init ();
- the_dataset = create_dataset ();
-
- the_source_stream = ss;
- msg_init (ss, handle_msg);
-
- dictionary = psppire_dict_new_from_dict (dataset_dict (the_dataset));
+ psppire_set_lexer (NULL);
bind_textdomain_codeset (PACKAGE, "UTF-8");
- /* Create the model for the var_sheet */
- the_var_store = psppire_var_store_new (dictionary);
-
- the_data_store = psppire_data_store_new (dictionary);
- replace_casereader (NULL);
-
create_icon_factory ();
psppire_output_window_setup ();
psppire_selector_set_default_selection_func (PSPPIRE_VAR_VIEW_TYPE, insert_source_row_into_tree_view);
psppire_selector_set_default_selection_func (GTK_TYPE_TREE_VIEW, insert_source_row_into_tree_view);
- the_data_window = psppire_data_window_new ();
+ data_window = psppire_default_data_window ();
if (data_file != NULL)
- load_data_file (data_file);
-
- execute_syntax (create_syntax_string_source (""));
-
- gtk_widget_show (the_data_window);
+ load_data_file (data_window, data_file);
+ execute_const_syntax_string (data_window, "");
}
void
de_initialize (void)
{
- destroy_source_stream (the_source_stream);
settings_done ();
output_close ();
i18n_done ();
}
-
static void
func (gpointer key, gpointer value, gpointer data)
{
}
\f
static void
-load_data_file (const char *arg)
+load_data_file (PsppireDataWindow *window, const char *arg)
{
gchar *filename = NULL;
gchar *utf8 = NULL;
if ( filename == NULL)
filename = xstrdup (arg);
- psppire_window_load (PSPPIRE_WINDOW (the_data_window), filename);
+ psppire_window_load (PSPPIRE_WINDOW (window), filename);
g_free (filename);
}
static void
-handle_msg (const struct msg *m)
+handle_msg (const struct msg *m_, void *lexer_)
+{
+ struct lexer *lexer = lexer_;
+ struct msg m = *m_;
+
+ if (lexer != NULL && m.file_name == NULL)
+ {
+ m.file_name = CONST_CAST (char *, lex_get_file_name (lexer));
+ m.first_line = lex_get_first_line_number (lexer, 0);
+ m.last_line = lex_get_last_line_number (lexer, 0);
+ m.first_column = lex_get_first_column (lexer, 0);
+ m.last_column = lex_get_last_column (lexer, 0);
+ }
+
+ message_item_submit (message_item_create (&m));
+}
+
+void
+psppire_set_lexer (struct lexer *lexer)
{
- message_item_submit (message_item_create (m));
+ msg_set_handler (handle_msg, lexer);
}