X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=36716f3a26b9a537d7ad3707965de7463c36e9be;hb=681f6120a7998b83ccd439068d8c4090de10b9b5;hp=017a85f4b62868ce6eed578030d4623157c6a690;hpb=0d01f7bd35591882cd13b6352409858ea33d39f7;p=pspp diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index 017a85f4b6..36716f3a26 100644 --- a/src/ui/gui/psppire.c +++ b/src/ui/gui/psppire.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation + Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011, 2012 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 @@ -16,162 +16,116 @@ #include -#include #include -#include #include - -#include -#include -#include -#include "relocatable.h" - -#include "psppire-data-window.h" -#include "psppire.h" -#include "widgets.h" - -#include -#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 "executor.h" -#include "message-dialog.h" -#include - -#include "psppire-window-register.h" -#include "psppire-output-window.h" - -#include -#include - -#include - -GtkRecentManager *the_recent_mgr = 0; -PsppireDataStore *the_data_store = 0; -PsppireVarStore *the_var_store = 0; +#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-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); -struct source_stream *the_source_stream ; -struct dataset * the_dataset = NULL; - -static GtkWidget *the_data_window; - -static void -replace_casereader (struct casereader *s) -{ - psppire_data_store_set_reader (the_data_store, s); -} #define _(msgid) gettext (msgid) #define N_(msgid) msgid -const char * output_file_name (void); - - void -initialize (struct command_line_processor *clp, int argc, char **argv) +initialize (const char *data_file) { - PsppireDict *dictionary = 0; - - i18n_init (); preregister_widgets (); gsl_set_error_handler_off (); - fn_init (); - outp_init (); - settings_init (&viewer_width, &viewer_length); + settings_init (); fh_init (); - the_source_stream = - create_source_stream ( - fn_getenv_default ("STAT_INCLUDE_PATH", include_path) - ); - - the_dataset = create_dataset (); - - message_dialog_init (the_source_stream); - - 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); - + inject_renamed_icons (); create_icon_factory (); - { - const char *filename = output_file_name (); - - struct string config_string; - - ds_init_empty (&config_string); - - ds_put_format (&config_string, - "gui:ascii:screen:squeeze=on headers=off top-margin=0 " - "bottom-margin=0 paginate=off length=auto width=auto " - "emphasis=none " - "output-file=\"%s\" append=yes", filename); - - outp_configure_driver_line (ds_ss (&config_string)); - - unlink (filename); - - ds_destroy (&config_string); - } + psppire_output_window_setup (); journal_enable (); textdomain (PACKAGE); + 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); - the_recent_mgr = gtk_recent_manager_get_default (); - - the_data_window = psppire_data_window_new (); - - command_line_processor_replace_aux (clp, &post_init_argp, the_source_stream); - command_line_processor_replace_aux (clp, &non_option_argp, the_source_stream); - - command_line_processor_parse (clp, argc, argv); + if (data_file) + { + gchar *filename = local_to_filename_encoding (data_file); - execute_syntax (create_syntax_string_source ("")); + /* 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)) + open_data_window (NULL, filename); + else + { + create_data_window (); + open_syntax_window (filename, NULL); + } - gtk_widget_show (the_data_window); + g_free (filename); + } + else + create_data_window (); } void de_initialize (void) { - destroy_source_stream (the_source_stream); - message_dialog_done (); settings_done (); - outp_done (); + output_close (); i18n_done (); } - static void func (gpointer key, gpointer value, gpointer data) { @@ -190,6 +144,46 @@ psppire_quit (void) gtk_main_quit (); } +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); + } + } + } +} + +/* 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. + + 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"); + } +} struct icon_info { @@ -262,94 +256,88 @@ create_icon_factory (void) gtk_icon_factory_add_default (factory); } - - -static error_t -parse_non_options (int key, char *arg, struct argp_state *state) +/* + 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) { - struct source_stream *ss = state->input; - - if ( NULL == ss ) - return 0; + 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) + { + utf8 = xstrdup (fn); + } + else + { + 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); + } + } - switch (key) + if ( NULL != utf8) { - case ARGP_KEY_ARG: - { - 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) - { - utf8 = xstrdup (arg); - } - else - { - GError *err = NULL; - utf8 = g_locale_to_utf8 (arg, -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 ( NULL != utf8) - { - 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); - } - } - - g_free (utf8); - - if ( filename == NULL) - filename = xstrdup (arg); - - psppire_window_load (PSPPIRE_WINDOW (the_data_window), filename); - - g_free (filename); - break; - } - default: - return ARGP_ERR_UNKNOWN; + 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 0; -} + g_free (utf8); -const struct argp non_option_argp = {NULL, parse_non_options, 0, 0, 0, 0, 0}; + if ( filename == NULL) + filename = xstrdup (fn); + return filename; +} -const char * -output_file_name (void) +static void +handle_msg (const struct msg *m_, void *lexer_) { - const char *dir = default_output_path (); - static char *filename = NULL; + struct lexer *lexer = lexer_; + struct msg m = *m_; - if ( NULL == filename ) - filename = xasprintf ("%s%s", dir, OUTPUT_FILE_NAME); + 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); + } - return filename; + message_item_submit (message_item_create (&m)); +} + +void +psppire_set_lexer (struct lexer *lexer) +{ + msg_set_handler (handle_msg, lexer); }