X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=7013fcfc1ad7affdc57afaf8ca68549486297cc2;hb=refs%2Fbuilds%2F20140209033012%2Fpspp;hp=d18788150fbb97eb5f66edac01ffebe1efade87d;hpb=ad024edf80de3f4d8c720eb3e9af80d3cd8a18f3;p=pspp
diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index d18788150f..7013fcfc1a 100644
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -1,11 +1,9 @@
-/*
- PSPPIRE --- A Graphical User Interface for PSPP
- Copyright (C) 2004, 2005, 2006 Free Software Foundation
- Written by John Darrington
+/* PSPPIRE - a graphical user interface for PSPP.
+ Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011, 2012, 2013 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,
@@ -14,128 +12,394 @@
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
-/*
- * Initial main.c file generated by Glade. Edit as required.
- * Glade will not overwrite this file.
- */
#include
-#include
-#include
-#include
-#include
+#include
#include
-#include
-#include "menu-actions.h"
-#include "psppire-dict.h"
-#include "psppire-var-store.h"
-#include "psppire-data-store.h"
+#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 "ui/gui/icons/icon-names.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
+
+
+void
+initialize (const char *data_file)
+{
+ i18n_init ();
+
+ preregister_widgets ();
-#include "helper.h"
-#include "data-sheet.h"
-#include "var-sheet.h"
-#include "psppire-case-array.h"
+ gsl_set_error_handler_off ();
+ settings_init ();
+ fh_init ();
-GladeXML *xml;
+ psppire_set_lexer (NULL);
+ bind_textdomain_codeset (PACKAGE, "UTF-8");
-PsppireDict *the_dictionary = 0;
-PsppireCaseArray *the_cases = 0;
+ inject_renamed_icons ();
+ create_icon_factory ();
+ psppire_output_window_setup ();
-PsppireDataStore *data_store = 0;
+ journal_init ();
+ 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);
-static bool parse_command_line (int *argc, char ***argv);
+ if (data_file)
+ {
+ gchar *filename = local_to_filename_encoding (data_file);
+
+ /* 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, NULL);
+ else
+ {
+ create_data_window ();
+ open_syntax_window (filename, NULL);
+ }
+
+ g_free (filename);
+ }
+ else
+ create_data_window ();
+}
-int
-main(int argc, char *argv[])
+void
+de_initialize (void)
{
- if ( ! parse_command_line(&argc, &argv) )
- return 0;
+ settings_done ();
+ output_close ();
+ i18n_done ();
+}
- gtk_init(&argc, &argv);
+static void
+func (gpointer key, gpointer value, gpointer data)
+{
+ gboolean rv;
+ PsppireWindow *window = PSPPIRE_WINDOW (value);
- glade_init();
+ g_signal_emit_by_name (window, "delete-event", 0, &rv);
+}
- the_dictionary = psppire_dict_new();
+void
+psppire_quit (void)
+{
+ PsppireWindowRegister *reg = psppire_window_register_new ();
+ psppire_window_register_foreach (reg, func, NULL);
- /* Create the model for the var_sheet */
- PsppireVarStore *var_store = psppire_var_store_new(the_dictionary);
+ gtk_main_quit ();
+}
- /* Create the model for the data sheet */
- the_cases = psppire_case_array_new(100, 20);
+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);
+ }
+ }
+ }
+}
- data_store = psppire_data_store_new(the_dictionary, the_cases);
+/* 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.
- /* load the interface */
- xml = glade_xml_new(PKGDATADIR "/psppire.glade", NULL, NULL);
+ 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");
+ }
+}
- if ( !xml ) return 1;
- GtkWidget *data_editor = get_widget_assert(xml, "data_editor");
- gtk_window_set_icon_from_file(GTK_WINDOW(data_editor),
- PKGDATADIR "/psppicon.png",0);
+struct icon_size
+{
+ int resolution; /* The dimension of the images which will be used */
+ size_t n_sizes; /* The number of items in the array below.
+ This may be zero, in which case the iconset will be wildcarded
+ (used by default when no non-wildcarded set is available) */
+ const GtkIconSize *usage; /* An array determining for what the icon set is used */
+};
- /* connect the signals in the interface */
- glade_xml_signal_autoconnect(xml);
+static const GtkIconSize menus[] = {GTK_ICON_SIZE_MENU};
+static const GtkIconSize toolbar[] = {GTK_ICON_SIZE_LARGE_TOOLBAR};
- GtkSheet *var_sheet = GTK_SHEET(get_widget_assert(xml, "variable_sheet"));
- GtkSheet *data_sheet = GTK_SHEET(get_widget_assert(xml, "data_sheet"));
- gtk_sheet_set_model(var_sheet, G_SHEET_MODEL(var_store));
-
- gtk_sheet_set_model(data_sheet, G_SHEET_MODEL(data_store));
+/* We currently have three icon sets viz: 16x16, 24x24 and 32x32
+ We use the 16x16 for menus, the 32x32 for the toolbar and
+ the 24x24 for everything else.
+ Exactly one element of the following array should have its 2nd and 3rd
+ argument as zero.
+*/
+static const struct icon_size sizemap[] =
+{
+ {16, sizeof (menus) / sizeof (GtkIconSize), menus},
+ {24, 0, 0},
+ {32, sizeof (toolbar) / sizeof (GtkIconSize), toolbar}
+};
- gtk_init_add(callbacks_on_init, 0);
- /* start the event loop */
- gtk_main();
- return 0;
-}
+static void
+create_icon_factory (void)
+{
+ gint c;
+ GtkIconFactory *factory = gtk_icon_factory_new ();
+ struct icon_context ctx[2];
+ ctx[0] = action_icon_context;
+ ctx[1] = category_icon_context;
+ for (c = 0 ; c < 2 ; ++c)
+ {
+ const struct icon_context *ic = &ctx[c];
+ gint i;
+ for (i = 0 ; i < ic->n_icons ; ++i)
+ {
+ GtkIconSet *icon_set = gtk_icon_set_new ();
+ int r;
+ for (r = 0 ; r < sizeof (sizemap) / sizeof (sizemap[0]); ++r)
+ {
+ int s;
+ GtkIconSource *source = gtk_icon_source_new ();
+ gchar *filename = g_strdup_printf ("%s/%s/%dx%d/%s.png", PKGDATADIR,
+ ic->context_name,
+ sizemap[r].resolution, sizemap[r].resolution,
+ ic->icon_name[i]);
+ const char *relocated_filename = relocate (filename);
+
+ gtk_icon_source_set_filename (source, relocated_filename);
+ gtk_icon_source_set_size_wildcarded (source, sizemap[r].n_sizes <= 0);
+ for (s = 0 ; s < sizemap[r].n_sizes ; ++s)
+ gtk_icon_source_set_size (source, sizemap[r].usage[s]);
+ if (filename != relocated_filename)
+ free (CONST_CAST (char *, relocated_filename));
+ g_free (filename);
+ gtk_icon_set_add_source (icon_set, source);
+ }
+
+ gtk_icon_factory_add (factory, ic->icon_name[i], icon_set);
+ }
+ }
+ {
+ struct iconmap
+ {
+ const gchar *gtk_id;
+ gchar *pspp_id;
+ };
-/* 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)
-{
- static struct option long_options[] =
+ /* We have our own icons for some things.
+ But we want the Stock Item to be identical to the Gtk standard
+ ones in all other respects.
+ */
+ const struct iconmap map[] = {
+ {GTK_STOCK_NEW, "file-new-document"},
+ {GTK_STOCK_QUIT, "file-quit"},
+ {GTK_STOCK_SAVE, "file-save-document"},
+ {GTK_STOCK_CUT, "edit-cut"},
+ {GTK_STOCK_COPY, "edit-copy"},
+ {GTK_STOCK_PASTE, "edit-paste"},
+ {GTK_STOCK_UNDO, "edit-undo"},
+ {GTK_STOCK_REDO, "edit-redo"},
+ {GTK_STOCK_DELETE, "edit-delete"},
+ {GTK_STOCK_ABOUT, "help-about"},
+ {GTK_STOCK_PRINT, "file-print-document"}
+ };
+
+ GtkStockItem customised[sizeof (map) / sizeof (map[0])];
+ int i;
+
+ for (i = 0; i < sizeof (map) / sizeof (map[0]); ++i)
{
- {"help", no_argument, NULL, 'h'},
- {"version", no_argument, NULL, 'V'},
- {0, 0, 0, 0},
+ gtk_stock_lookup (map[i].gtk_id, &customised[i]);
+ customised[i].stock_id = map[i].pspp_id;
+ }
+
+
+
+ gtk_stock_add (customised, sizeof (map) / sizeof (map[0]));
+ }
+
+ {
+ /* Create our own "pspp-stock-reset" item, using the
+ GTK_STOCK_REFRESH icon set */
+ GtkStockItem items[2] = {
+ {"pspp-stock-reset", N_("_Reset"), 0, 0, PACKAGE},
+ {"pspp-stock-select", N_("_Select"), 0, 0, PACKAGE}
};
- int c;
+ gtk_stock_add (items, 2);
+
+ gtk_icon_factory_add (factory, "pspp-stock-reset",
+ gtk_icon_factory_lookup_default (GTK_STOCK_REFRESH)
+ );
+
+ gtk_icon_factory_add (factory, "pspp-stock-select",
+ gtk_icon_factory_lookup_default (GTK_STOCK_INDEX)
+ );
+ }
+
+ gtk_icon_factory_add_default (factory);
+}
+
+/*
+ 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)
+{
+ 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);
+ }
+ }
+
+ 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 (fn);
- for (;;)
+ return filename;
+}
+
+static void
+handle_msg (const struct msg *m_, void *lexer_)
+{
+ struct lexer *lexer = lexer_;
+ struct msg m = *m_;
+
+ if (lexer != NULL && m.file_name == NULL)
{
- 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:
- assert (0);
- }
+ 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 true;
+ message_item_submit (message_item_create (&m));
+}
+
+void
+psppire_set_lexer (struct lexer *lexer)
+{
+ msg_set_handler (handle_msg, lexer);
}