X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=8491851383f4405805bbf71d0a35d5e172500b29;hb=82cdb6b894ba84fad617196cdba815c9aa15605f;hp=dbba57b69d6d0063866ba3b295eceba1f0fb0a62;hpb=8af88c0b7ea2fe75df7e45497988ed0371006a86;p=pspp-builds.git

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index dbba57b6..84918513 100644
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -16,11 +16,12 @@
 
 #include <config.h>
 
-#include <locale.h>
+#include <libpspp/i18n.h>
 #include <assert.h>
 #include <libintl.h>
 #include <gsl/gsl_errno.h>
 
+#include <xalloc.h>
 #include <argp.h>
 #include <ui/command-line.h>
 #include "relocatable.h"
@@ -46,9 +47,12 @@
 
 #include <gtk/gtk.h>
 #include "psppire-dict.h"
+#include "dict-display.h"
+#include "psppire-selector.h"
+#include "psppire-var-view.h"
 #include "psppire-var-store.h"
 #include "psppire-data-store.h"
-#include "helper.h"
+#include "executor.h"
 #include "message-dialog.h"
 #include <ui/syntax-gen.h>
 
@@ -81,7 +85,6 @@ replace_casereader (struct casereader *s)
 #define N_(msgid) msgid
 
 
-const char * output_file_name (void);
 
 
 void
@@ -89,12 +92,7 @@ initialize (struct command_line_processor *clp, int argc, char **argv)
 {
   PsppireDict *dictionary = 0;
 
-  /* gtk_init messes with the locale.
-     So unset the bits we want to control ourselves */
-  setlocale (LC_NUMERIC, "C");
-
-  bindtextdomain (PACKAGE, locale_dir);
-
+  i18n_init ();
 
   preregister_widgets ();
 
@@ -151,6 +149,10 @@ initialize (struct command_line_processor *clp, int argc, char **argv)
 
   the_recent_mgr = gtk_recent_manager_get_default ();
 
+  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_data_window = psppire_data_window_new ();
 
   command_line_processor_replace_aux (clp, &post_init_argp, the_source_stream);
@@ -171,6 +173,7 @@ de_initialize (void)
   message_dialog_done ();
   settings_done ();
   outp_done ();
+  i18n_done ();
 }
 
 
@@ -279,8 +282,59 @@ parse_non_options (int key, char *arg, struct argp_state *state)
     {
     case ARGP_KEY_ARG:
       {
-	psppire_data_window_load_file (PSPPIRE_DATA_WINDOW (the_data_window),
-				       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:
@@ -302,6 +356,5 @@ output_file_name (void)
   if ( NULL == filename )
     filename = xasprintf ("%s%s", dir, OUTPUT_FILE_NAME);
 
-
   return filename;
 }