X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=be095248a940cdbb6b37befc651f88ec19158b22;hb=0a2ee97da7736d31c23b6b2cac91303b925dab50;hp=f0041eba4ec07b0f57ff072226a8695f54338600;hpb=13d1b533c6ce0545a4b06e5e30c73211591034c5;p=pspp
diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index f0041eba4e..be095248a9 100644
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -1,10 +1,9 @@
-/*
- PSPPIRE --- A Graphical User Interface for PSPP
- Copyright (C) 2004, 2005, 2006 Free Software Foundation
+/* PSPPIRE - a graphical user interface for PSPP.
+ Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Free Software Foundation
- This program is free software; you can redistribute it and/or modify
+ 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
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -13,274 +12,332 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#include
#include
-#include
-
-
-#include "data-editor.h"
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
+#include
#include
-#include
-#include "psppire-dict.h"
-#include "psppire-var-store.h"
-#include "psppire-data-store.h"
-#include "helper.h"
-#include "data-sheet.h"
-#include "var-sheet.h"
-#include "message-dialog.h"
-#include "flexifile-factory.h"
-
-PsppireDataStore *the_data_store = 0;
-
-
-static bool parse_command_line (int *argc, char ***argv,
- gchar **filename, GError **err);
+#include
+#include
+
+#include "data/any-reader.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/session.h"
+#include "data/settings.h"
+#include "data/sys-file-reader.h"
+
+#include "language/lexer/lexer.h"
+#include "libpspp/i18n.h"
+#include "libpspp/message.h"
+#include "libpspp/version.h"
+
+#include "output/driver.h"
+#include "output/journal.h"
+#include "output/message-item.h"
+
+#include "ui/gui/dict-display.h"
+#include "ui/gui/executor.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-syntax-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/widgets.h"
+#include "ui/source-init-opts.h"
+#include "ui/syntax-gen.h"
+
+#include "gl/configmake.h"
+#include "gl/xalloc.h"
+#include "gl/relocatable.h"
+
+static void inject_renamed_icons (void);
+static void create_icon_factory (void);
+static gchar *local_to_filename_encoding (const char *fn);
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
-static void
-give_help(void)
+
+void
+initialize (const char *data_file)
{
- static struct msg m = {
- MSG_GENERAL,
- MSG_NOTE,
- {0, -1},
- 0,
- };
+ PsppireDataWindow *data_window;
- if (! m.text)
- m.text=g_strdup(_("Sorry. The help system hasn't yet been implemented."));
+ i18n_init ();
- popup_message(&m);
-}
+ preregister_widgets ();
-PsppireVarStore *the_var_store = 0;
+ gsl_set_error_handler_off ();
+ settings_init ();
+ fh_init ();
-void create_icon_factory (void);
+ psppire_set_lexer (NULL);
-struct source_stream *the_source_stream ;
-struct dataset * the_dataset = NULL;
+ bind_textdomain_codeset (PACKAGE, "UTF-8");
+ inject_renamed_icons ();
+ create_icon_factory ();
-int
-main(int argc, char *argv[])
-{
- struct casefile_factory *factory;
- PsppireDict *dictionary = 0;
+ psppire_output_window_setup ();
+ journal_enable ();
+ textdomain (PACKAGE);
- GtkWidget *data_editor ;
- GtkSheet *var_sheet ;
- GtkSheet *data_sheet ;
+ psppire_selector_set_default_selection_func (GTK_TYPE_ENTRY, insert_source_row_into_entry);
+ 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);
- gchar *filename=0;
- GError *err = 0;
- gchar *vers;
+ data_window = psppire_default_data_window ();
- gtk_init(&argc, &argv);
- if ( (vers = gtk_check_version(GTK_MAJOR_VERSION,
- GTK_MINOR_VERSION,
- GTK_MICRO_VERSION)) )
+ if (data_file)
{
- g_critical(vers);
- }
-
-
- /* gtk_init messes with the locale.
- So unset the bits we want to control ourselves */
- setlocale (LC_NUMERIC, "C");
+ gchar *filename = local_to_filename_encoding (data_file);
- bindtextdomain (PACKAGE, locale_dir);
+ /* Check to see if the file is a .sav or a .por file. If not
+ assume that it is a syntax file */
+ if ( any_reader_may_open (filename))
+ psppire_window_load (PSPPIRE_WINDOW (data_window), filename);
+ else
+ open_syntax_window (filename, NULL);
- textdomain (PACKAGE);
-
- if ( ! parse_command_line(&argc, &argv, &filename, &err) )
- {
- g_clear_error(&err);
- return 0;
+ g_free (filename);
}
+}
- glade_init();
-
- fmt_init();
- settings_init();
- fh_init ();
- factory = flexifile_factory_create ();
- the_source_stream = create_source_stream (
- fn_getenv_default ("STAT_INCLUDE_PATH", include_path)
- );
-
- the_dataset = create_dataset (factory);
-
- message_dialog_init (the_source_stream);
- dictionary =
- psppire_dict_new_from_dict (
- dataset_dict (the_dataset)
- );
+void
+de_initialize (void)
+{
+ settings_done ();
+ output_close ();
+ i18n_done ();
+}
- bind_textdomain_codeset(PACKAGE, "UTF-8");
+static void
+func (gpointer key, gpointer value, gpointer data)
+{
+ gboolean rv;
+ PsppireWindow *window = PSPPIRE_WINDOW (value);
- /* Create the model for the var_sheet */
- the_var_store = psppire_var_store_new(dictionary);
+ g_signal_emit_by_name (window, "delete-event", 0, &rv);
+}
+void
+psppire_quit (void)
+{
+ PsppireWindowRegister *reg = psppire_window_register_new ();
+ psppire_window_register_foreach (reg, func, NULL);
- the_data_store = psppire_data_store_new (dictionary);
+ gtk_main_quit ();
+}
- create_icon_factory();
+static void
+inject_renamed_icon (const char *icon, const char *substitute)
+{
+ GtkIconTheme *theme = gtk_icon_theme_get_default ();
+ if (!gtk_icon_theme_has_icon (theme, icon)
+ && gtk_icon_theme_has_icon (theme, substitute))
+ {
+ gint *sizes = gtk_icon_theme_get_icon_sizes (theme, substitute);
+ gint *p;
+
+ for (p = sizes; *p != 0; p++)
+ {
+ gint size = *p;
+ GdkPixbuf *pb;
+
+ pb = gtk_icon_theme_load_icon (theme, substitute, size, 0, NULL);
+ if (pb != NULL)
+ {
+ GdkPixbuf *copy = gdk_pixbuf_copy (pb);
+ if (copy != NULL)
+ gtk_icon_theme_add_builtin_icon (icon, size, copy);
+ }
+ }
+ }
+}
-#if 0
- /* load the interface */
- data_editor_xml = glade_xml_new(PKGDATADIR "/data-editor.glade", NULL, NULL);
+/* Avoid a bug in GTK+ 2.22 that can cause a segfault at startup time. Earlier
+ and later versions of GTK+ do not have the bug. Bug #31511.
- if ( !data_editor_xml ) return 1;
+ Based on this patch against Inkscape:
+ https://launchpadlibrarian.net/60175914/copy_renamed_icons.patch */
+static void
+inject_renamed_icons (void)
+{
+ if (gtk_major_version == 2 && gtk_minor_version == 22)
+ {
+ inject_renamed_icon ("gtk-file", "document-x-generic");
+ inject_renamed_icon ("gtk-directory", "folder");
+ }
+}
- data_editor = get_widget_assert(data_editor_xml, "data_editor");
+struct icon_info
+{
+ const char *file_name;
+ const gchar *id;
+};
- /* connect the signals in the interface */
- glade_xml_signal_autoconnect(data_editor_xml);
- var_sheet = GTK_SHEET(get_widget_assert(data_editor_xml, "variable_sheet"));
- data_sheet = GTK_SHEET(get_widget_assert(data_editor_xml, "data_sheet"));
+static const struct icon_info icons[] =
+ {
+ {PKGDATADIR "/value-labels.png", "pspp-value-labels"},
+ {PKGDATADIR "/weight-cases.png", "pspp-weight-cases"},
+ {PKGDATADIR "/goto-variable.png", "pspp-goto-variable"},
+ {PKGDATADIR "/insert-variable.png", "pspp-insert-variable"},
+ {PKGDATADIR "/insert-case.png", "pspp-insert-case"},
+ {PKGDATADIR "/split-file.png", "pspp-split-file"},
+ {PKGDATADIR "/select-cases.png", "pspp-select-cases"},
+ {PKGDATADIR "/recent-dialogs.png", "pspp-recent-dialogs"},
+ {PKGDATADIR "/nominal.png", "var-nominal"},
+ {PKGDATADIR "/ordinal.png", "var-ordinal"},
+ {PKGDATADIR "/scale.png", "var-scale"},
+ {PKGDATADIR "/string.png", "var-string"},
+ {PKGDATADIR "/date-scale.png", "var-date-scale"}
+ };
- gtk_sheet_set_model(var_sheet, G_SHEET_MODEL(the_var_store));
+static void
+create_icon_factory (void)
+{
+ gint i;
+ GtkIconFactory *factory = gtk_icon_factory_new ();
- gtk_sheet_set_model(data_sheet, G_SHEET_MODEL(the_data_store));
+ for (i = 0 ; i < sizeof (icons) / sizeof(icons[0]); ++i)
+ {
+ GError *err = NULL;
+ GdkPixbuf *pixbuf =
+ gdk_pixbuf_new_from_file (relocate (icons[i].file_name), &err);
- var_data_selection_init();
+ if ( pixbuf )
+ {
+ GtkIconSet *icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+ g_object_unref (pixbuf);
+ gtk_icon_factory_add ( factory, icons[i].id, icon_set);
+ }
+ else
+ {
+ g_warning ("Cannot create icon: %s", err->message);
+ g_clear_error (&err);
+ }
+ }
{
- GList *helps = glade_xml_get_widget_prefix(data_editor_xml, "help_button_");
-
- GList *i;
- for ( i = g_list_first(helps); i ; i = g_list_next(i))
- g_signal_connect(GTK_WIDGET(i->data), "clicked", give_help, 0);
- }
-
-#endif
+ /* Create our own "pspp-stock-reset" item, using the
+ GTK_STOCK_REFRESH icon set */
- new_data_window (NULL, NULL);
+ GtkStockItem items[] = {
+ {"pspp-stock-reset", N_("_Reset"), 0, 0, PACKAGE},
+ {"pspp-stock-select", N_("_Select"), 0, 0, PACKAGE}
+ };
- /* start the event loop */
- gtk_main();
- destroy_source_stream (the_source_stream);
- message_dialog_done();
+ gtk_stock_add (items, 2);
+ gtk_icon_factory_add (factory, "pspp-stock-reset",
+ gtk_icon_factory_lookup_default (GTK_STOCK_REFRESH)
+ );
- settings_done();
+ gtk_icon_factory_add (factory, "pspp-stock-select",
+ gtk_icon_factory_lookup_default (GTK_STOCK_INDEX)
+ );
+ }
- return 0;
+ gtk_icon_factory_add_default (factory);
}
-
-
-/* Parses the command line specified by ARGC and ARGV as received by
- main(). Returns true if normal execution should proceed,
- false if the command-line indicates that PSPP should exit. */
-static bool
-parse_command_line (int *argc, char ***argv, gchar **filename, GError **err)
+
+/*
+ Convert a filename from the local encoding into "filename" encoding.
+ The return value will be allocated on the heap. It is the responsibility
+ of the caller to free it.
+ */
+static gchar *
+local_to_filename_encoding (const char *fn)
{
- static struct option long_options[] =
+ gchar *filename = NULL;
+ gchar *utf8 = NULL;
+ const gchar *local_encoding = NULL;
+ gsize written = -1;
+ const gboolean local_is_utf8 = g_get_charset (&local_encoding);
+
+ /* There seems to be no Glib function to convert from local encoding
+ to filename encoding. Therefore it has to be done in two steps:
+ the intermediate encoding is UTF8.
+
+ Either step could fail. However, in many cases the file can still
+ be loaded even if the conversion fails. So in those cases, after showing
+ a warning, we simply copy the locally encoded filename to the destination
+ and hope for the best.
+ */
+
+ if ( local_is_utf8)
{
- {"help", no_argument, NULL, 'h'},
- {"version", no_argument, NULL, 'V'},
- {0, 0, 0, 0},
- };
-
- int c;
-
- for (;;)
+ utf8 = xstrdup (fn);
+ }
+ else
{
- c = getopt_long (*argc, *argv, "hV", long_options, NULL);
- if (c == -1)
- break;
-
- switch (c)
- {
- case 'h':
- g_print ("Usage: psppire {|--help|--version}\n");
- return false;
- case 'V':
- g_print (version);
- g_print ("\n");
- g_print (legal);
- return false;
- default:
- return false;
- }
+ GError *err = NULL;
+ utf8 = g_locale_to_utf8 (fn, -1, NULL, &written, &err);
+ if ( NULL == utf8)
+ {
+ g_warning ("Cannot convert filename from local encoding `%s' to UTF-8: %s",
+ local_encoding,
+ err->message);
+ g_clear_error (&err);
+ }
}
- if ( optind < *argc)
+ if ( NULL != utf8)
{
- *filename = (*argv)[optind];
+ GError *err = NULL;
+ filename = g_filename_from_utf8 (utf8, written, NULL, NULL, &err);
+ if ( NULL == filename)
+ {
+ g_warning ("Cannot convert filename from UTF8 to filename encoding: %s",
+ err->message);
+ g_clear_error (&err);
+ }
}
- return true;
-}
+ g_free (utf8);
+ if ( filename == NULL)
+ filename = xstrdup (fn);
+ return filename;
+}
-void
-create_icon_factory (void)
+static void
+handle_msg (const struct msg *m_, void *lexer_)
{
- GtkIconFactory *factory = gtk_icon_factory_new();
-
- GtkIconSet *icon_set;
-
- GdkPixbuf *pixbuf;
-
- pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/value-labels.png", 0);
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "pspp-value-labels", icon_set);
-
- pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/weight-cases.png", 0);
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "pspp-weight-cases", icon_set);
-
- pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/goto-variable.png", 0);
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "pspp-goto-variable", icon_set);
-
- pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/insert-variable.png", 0);
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "pspp-insert-variable", icon_set);
-
- pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/insert-case.png", 0);
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "pspp-insert-case", icon_set);
-
- pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/split-file.png", 0);
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "pspp-split-file", icon_set);
-
- pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/select-cases.png", 0);
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "pspp-select-cases", icon_set);
+ struct lexer *lexer = lexer_;
+ struct msg m = *m_;
- gtk_icon_factory_add_default (factory);
+ 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)
+{
+ msg_set_handler (handle_msg, lexer);
}