psppire-syntax-window: Recode file from final encoding, not original one.
[pspp] / src / ui / gui / psppire-syntax-window.c
index 7c70cbcba80688be52e5e4fb8015b7a900d5dc0b..8491eb3142c7be207f6f3d3d7d67d3498380c611 100644 (file)
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2009, 2010  Free Software Foundation
+   Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014  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 <config.h>
 
-#include "relocatable.h"
-
-#include <gtk/gtksignal.h>
-#include <gtk/gtkbox.h>
-#include "executor.h"
-#include "helper.h"
+#include <gtk/gtk.h>
+#include <stdlib.h>
 
 #include <gtksourceview/gtksourcebuffer.h>
 #include <gtksourceview/gtksourcelanguage.h>
 #include <gtksourceview/gtksourcelanguagemanager.h>
 #include <gtksourceview/gtksourceprintcompositor.h>
 
-#include <libpspp/message.h>
-#include <stdlib.h>
-
-#include "psppire.h"
-
-#include "psppire-data-window.h"
-#include "psppire-window-register.h"
-#include "psppire.h"
-#include "help-menu.h"
-#include "psppire-syntax-window.h"
-#include "syntax-editor-source.h"
-#include <language/lexer/lexer.h>
-
-#include "xalloc.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/encoding-guesser.h"
+#include "libpspp/i18n.h"
+#include "libpspp/message.h"
+#include "ui/gui/executor.h"
+#include "ui/gui/help-menu.h"
+#include "ui/gui/helper.h"
+#include "ui/gui/builder-wrapper.h"
+#include "ui/gui/psppire-data-window.h"
+#include "ui/gui/psppire-encoding-selector.h"
+#include "ui/gui/psppire-lex-reader.h"
+#include "ui/gui/psppire-syntax-window.h"
+#include "ui/gui/psppire-window-register.h"
+#include "ui/gui/psppire.h"
+
+#include "gl/localcharset.h"
+#include "gl/xalloc.h"
+#include "gl/xvasprintf.h"
 
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
@@ -56,6 +56,53 @@ static void psppire_syntax_window_init          (PsppireSyntaxWindow      *synta
 static void psppire_syntax_window_iface_init (PsppireWindowIface *iface);
 
 
+/* Properties */
+enum
+{
+  PROP_0,
+  PROP_ENCODING
+};
+
+static void
+psppire_syntax_window_set_property (GObject         *object,
+                                    guint            prop_id,
+                                    const GValue    *value,
+                                    GParamSpec      *pspec)
+{
+  PsppireSyntaxWindow *window = PSPPIRE_SYNTAX_WINDOW (object);
+
+  switch (prop_id)
+    {
+    case PROP_ENCODING:
+      g_free (window->encoding);
+      window->encoding = g_value_dup_string (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    };
+}
+
+
+static void
+psppire_syntax_window_get_property (GObject         *object,
+                                    guint            prop_id,
+                                    GValue          *value,
+                                    GParamSpec      *pspec)
+{
+  PsppireSyntaxWindow *window = PSPPIRE_SYNTAX_WINDOW (object);
+
+  switch (prop_id)
+    {
+    case PROP_ENCODING:
+      g_value_set_string (value, window->encoding);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    };
+}
+
 GType
 psppire_syntax_window_get_type (void)
 {
@@ -106,18 +153,48 @@ psppire_syntax_window_finalize (GObject *object)
 
 
 static void
-psppire_syntax_window_class_init (PsppireSyntaxWindowClass *class)
+psppire_syntax_window_dispose (GObject *obj)
 {
-  GtkSourceLanguageManager *lm = gtk_source_language_manager_get_default ();
+  PsppireSyntaxWindow *sw = (PsppireSyntaxWindow *)obj;
+
+  GtkClipboard *clip_selection;
+  GtkClipboard *clip_primary;
+
+  if (sw->dispose_has_run)
+    return;
+
+  g_free (sw->encoding);
+  sw->encoding = NULL;
+
+  clip_selection = gtk_widget_get_clipboard (GTK_WIDGET (sw), GDK_SELECTION_CLIPBOARD);
+  clip_primary =   gtk_widget_get_clipboard (GTK_WIDGET (sw), GDK_SELECTION_PRIMARY);
+
+  g_signal_handler_disconnect (clip_primary, sw->sel_handler);
+
+  g_signal_handler_disconnect (clip_selection, sw->ps_handler);
+
+  /* Make sure dispose does not run twice. */
+  sw->dispose_has_run = TRUE;
+
+  /* Chain up to the parent class */
+  G_OBJECT_CLASS (parent_class)->dispose (obj);
+}
 
-  const gchar * const *existing_paths =  gtk_source_language_manager_get_search_path (lm);
 
-  const gchar **new_paths = g_strdupv (existing_paths);
 
-  int n = g_strv_length (existing_paths);
+static void
+psppire_syntax_window_class_init (PsppireSyntaxWindowClass *class)
+{
+  GParamSpec *encoding_spec;
+  GObjectClass *gobject_class = G_OBJECT_CLASS (class);
 
-  new_paths = g_realloc (new_paths, (n+1) * sizeof (*new_paths));
+  GtkSourceLanguageManager *lm = gtk_source_language_manager_get_default ();
+
+  const gchar * const *existing_paths =  gtk_source_language_manager_get_search_path (lm);
+  gchar **new_paths = g_strdupv ((gchar **)existing_paths);
+  int n = g_strv_length ((gchar **) existing_paths);
 
+  new_paths = g_realloc (new_paths, (n + 2) * sizeof (*new_paths));
   new_paths[n] = g_strdup (relocate (PKGDATADIR));
   new_paths[n+1] = NULL;
 
@@ -130,6 +207,25 @@ psppire_syntax_window_class_init (PsppireSyntaxWindowClass *class)
     g_warning ("pspp.lang file not found.  Syntax highlighting will not be available.");
 
   parent_class = g_type_class_peek_parent (class);
+
+  g_strfreev (new_paths);
+
+  encoding_spec =
+    null_if_empty_param ("encoding",
+                         "Character encoding",
+                         "IANA character encoding in this syntax file",
+                        NULL,
+                        G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
+
+  parent_class = g_type_class_peek_parent (class);
+
+  gobject_class->set_property = psppire_syntax_window_set_property;
+  gobject_class->get_property = psppire_syntax_window_get_property;
+  gobject_class->dispose = psppire_syntax_window_dispose;
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_ENCODING,
+                                   encoding_spec);
 }
 
 
@@ -154,11 +250,186 @@ editor_execute_syntax (const PsppireSyntaxWindow *sw, GtkTextIter start,
                       GtkTextIter stop)
 {
   PsppireWindow *win = PSPPIRE_WINDOW (sw);
-  const gchar *name = psppire_window_get_filename (win);
-  execute_syntax (create_syntax_editor_source (GTK_TEXT_BUFFER (sw->buffer), start, stop, name));
+  struct lex_reader *reader = lex_reader_for_gtk_text_buffer (GTK_TEXT_BUFFER (sw->buffer), start, stop);
+
+  lex_reader_set_file_name (reader, psppire_window_get_filename (win));
+
+  execute_syntax (psppire_default_data_window (), reader);
+}
+\f
+/* Delete the currently selected text */
+static void
+on_edit_delete (PsppireSyntaxWindow *sw)
+{
+  GtkTextIter begin, end;
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (sw->buffer);
+  
+  if ( gtk_text_buffer_get_selection_bounds (buffer, &begin, &end) )
+    gtk_text_buffer_delete (buffer, &begin, &end);
+}
+
+
+/* The syntax editor's clipboard deals only with text */
+enum {
+  SELECT_FMT_NULL,
+  SELECT_FMT_TEXT,
+};
+
+
+static void
+selection_changed (PsppireSyntaxWindow *sw)
+{
+  gboolean sel = gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER (sw->buffer));
+
+  gtk_action_set_sensitive (sw->edit_copy, sel);
+  gtk_action_set_sensitive (sw->edit_cut, sel);
+  gtk_action_set_sensitive (sw->edit_delete, sel);
+}
+
+/* The callback which runs when something request clipboard data */
+static void
+clipboard_get_cb (GtkClipboard     *clipboard,
+                 GtkSelectionData *selection_data,
+                 guint             info,
+                 gpointer          data)
+{
+  PsppireSyntaxWindow *sw = data;
+  g_assert (info == SELECT_FMT_TEXT);
+
+  gtk_selection_data_set (selection_data, selection_data->target,
+                         8,
+                         (const guchar *) sw->cliptext, strlen (sw->cliptext));
+
+}
+
+static void
+clipboard_clear_cb (GtkClipboard *clipboard,
+                   gpointer data)
+{
+  PsppireSyntaxWindow *sw = data;
+  g_free (sw->cliptext);
+  sw->cliptext = NULL;
 }
 
 
+static const GtkTargetEntry targets[] = {
+  { "UTF8_STRING",   0, SELECT_FMT_TEXT },
+  { "STRING",        0, SELECT_FMT_TEXT },
+  { "TEXT",          0, SELECT_FMT_TEXT },
+  { "COMPOUND_TEXT", 0, SELECT_FMT_TEXT },
+  { "text/plain;charset=utf-8", 0, SELECT_FMT_TEXT },
+  { "text/plain",    0, SELECT_FMT_TEXT },
+};
+
+
+/*
+  Store a clip containing the currently selected text.
+  Returns true iff something was set.
+  As a side effect, begin and end will be set to indicate
+  the limits of the selected text.
+*/
+static gboolean
+set_clip (PsppireSyntaxWindow *sw, GtkTextIter *begin, GtkTextIter *end)
+{
+  GtkClipboard *clipboard ;
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (sw->buffer);
+
+  if ( ! gtk_text_buffer_get_selection_bounds (buffer, begin, end) )
+    return FALSE;
+
+  g_free (sw->cliptext);
+  sw->cliptext = gtk_text_buffer_get_text  (buffer, begin, end, FALSE);
+
+  clipboard =
+    gtk_widget_get_clipboard (GTK_WIDGET (sw), GDK_SELECTION_CLIPBOARD);
+
+  if (!gtk_clipboard_set_with_owner (clipboard, targets,
+                                    G_N_ELEMENTS (targets),
+                                    clipboard_get_cb, clipboard_clear_cb,
+                                    G_OBJECT (sw)))
+    clipboard_clear_cb (clipboard, sw);
+
+  return TRUE;
+}
+
+static void
+on_edit_cut (PsppireSyntaxWindow *sw)
+{
+  GtkTextIter begin, end;
+  
+  if ( set_clip (sw, &begin, &end))
+    gtk_text_buffer_delete (GTK_TEXT_BUFFER (sw->buffer), &begin, &end);
+}
+
+static void
+on_edit_copy (PsppireSyntaxWindow *sw)
+{
+  GtkTextIter begin, end;
+
+  set_clip (sw, &begin, &end);
+}
+
+
+/* A callback for when the clipboard contents have been received */
+static void
+contents_received_callback (GtkClipboard *clipboard,
+                           GtkSelectionData *sd,
+                           gpointer data)
+{
+  PsppireSyntaxWindow *syntax_window = data;
+
+  if ( sd->length < 0 )
+    return;
+
+  if ( sd->type != gdk_atom_intern ("UTF8_STRING", FALSE))
+    return;
+
+  gtk_text_buffer_insert_at_cursor (GTK_TEXT_BUFFER (syntax_window->buffer),
+                                   (gchar *) sd->data,
+                                   sd->length);
+
+}
+
+static void
+on_edit_paste (PsppireSyntaxWindow *sw)
+{
+  GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (sw));
+  GtkClipboard *clipboard =
+    gtk_clipboard_get_for_display (display, GDK_SELECTION_CLIPBOARD);
+
+  gtk_clipboard_request_contents (clipboard,
+                                 gdk_atom_intern ("UTF8_STRING", TRUE),
+                                 contents_received_callback,
+                                 sw);
+}
+
+
+/* Check to see if CLIP holds a target which we know how to paste,
+   and set the sensitivity of the Paste action accordingly.
+ */
+static void
+set_paste_sensitivity (GtkClipboard *clip, GdkEventOwnerChange *event, gpointer data)
+{
+  gint i;
+  gboolean compatible_target = FALSE;
+  PsppireSyntaxWindow *sw = PSPPIRE_SYNTAX_WINDOW (data);
+
+  for (i = 0 ; i < sizeof (targets) / sizeof (targets[0]) ; ++i)
+    {
+      GdkAtom atom = gdk_atom_intern (targets[i].target, TRUE);
+      if ( gtk_clipboard_wait_is_target_available (clip, atom))
+       {
+         compatible_target = TRUE;
+         break;
+       }
+    }
+
+  gtk_action_set_sensitive (sw->edit_paste, compatible_target);
+}
+
+
+\f
+
 /* Parse and execute all the text in the buffer */
 static void
 on_run_all (GtkMenuItem *menuitem, gpointer user_data)
@@ -267,6 +538,7 @@ save_editor_to_file (PsppireSyntaxWindow *se,
                     GError **err)
 {
   GtkTextBuffer *buffer = GTK_TEXT_BUFFER (se->buffer);
+  struct substring text_locale;
   gboolean result ;
   GtkTextIter start, stop;
   gchar *text;
@@ -281,14 +553,19 @@ save_editor_to_file (PsppireSyntaxWindow *se,
 
   text = gtk_text_buffer_get_text (buffer, &start, &stop, FALSE);
 
-  result =  g_file_set_contents (suffixedname, text, -1, err);
+  text_locale = recode_substring_pool (se->encoding, "UTF-8", ss_cstr (text),
+                                       NULL);
+
+  result =  g_file_set_contents (suffixedname, ss_data (text_locale),
+                                 ss_length (text_locale), err);
 
+  ss_dealloc (&text_locale);
   g_free (suffixedname);
 
   if ( result )
     {
       char *fn = g_filename_display_name (filename);
-      gchar *msg = g_strdup_printf (_("Saved file \"%s\""), fn);
+      gchar *msg = g_strdup_printf (_("Saved file `%s'"), fn);
       g_free (fn);
       gtk_statusbar_push (GTK_STATUSBAR (se->sb), se->text_context, msg);
       gtk_text_buffer_set_modified (buffer, FALSE);
@@ -299,10 +576,12 @@ save_editor_to_file (PsppireSyntaxWindow *se,
 }
 
 
-/* Callback for the File->SaveAs menuitem */
+/* PsppireWindow 'pick_Filename' callback. */
 static void
-syntax_save_as (PsppireWindow *se)
+syntax_pick_filename (PsppireWindow *window)
 {
+  PsppireSyntaxWindow *se = PSPPIRE_SYNTAX_WINDOW (window);
+  const char *default_encoding;
   GtkFileFilter *filter;
   gint response;
 
@@ -314,6 +593,8 @@ syntax_save_as (PsppireWindow *se)
                                 GTK_STOCK_SAVE,   GTK_RESPONSE_ACCEPT,
                                 NULL);
 
+  g_object_set (dialog, "local-only", FALSE, NULL);
+
   filter = gtk_file_filter_new ();
   gtk_file_filter_set_name (filter, _("Syntax Files (*.sps) "));
   gtk_file_filter_add_pattern (filter, "*.sps");
@@ -327,44 +608,47 @@ syntax_save_as (PsppireWindow *se)
 
   gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog),
                                                  TRUE);
+
+  default_encoding = se->encoding != NULL ? se->encoding : locale_charset ();
+  gtk_file_chooser_set_extra_widget (
+    GTK_FILE_CHOOSER (dialog),
+    psppire_encoding_selector_new (default_encoding, false));
+
   response = gtk_dialog_run (GTK_DIALOG (dialog));
 
   if ( response == GTK_RESPONSE_ACCEPT )
     {
-      GError *err = NULL;
-      char *filename =
-       gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog) );
-
-      if ( ! save_editor_to_file (PSPPIRE_SYNTAX_WINDOW (se), filename, &err) )
-       {
-         msg ( ME, "%s", err->message );
-         g_error_free (err);
-       }
+      gchar *encoding;
+      char *filename;
 
+      filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog) );
+      psppire_window_set_filename (window, filename);
       free (filename);
+
+      encoding = psppire_encoding_selector_get_encoding (
+        gtk_file_chooser_get_extra_widget (GTK_FILE_CHOOSER (dialog)));
+      if (encoding != NULL)
+        {
+          g_free (se->encoding);
+          se->encoding = encoding;
+        }
     }
 
   gtk_widget_destroy (dialog);
 }
 
 
-/* Callback for the File->Save menuitem */
+/* PsppireWindow 'save' callback. */
 static void
 syntax_save (PsppireWindow *se)
 {
   const gchar *filename = psppire_window_get_filename (se);
-
-  if ( filename == NULL )
-    syntax_save_as (se);
-  else
+  GError *err = NULL;
+  save_editor_to_file (PSPPIRE_SYNTAX_WINDOW (se), filename, &err);
+  if ( err )
     {
-      GError *err = NULL;
-      save_editor_to_file (PSPPIRE_SYNTAX_WINDOW (se), filename, &err);
-      if ( err )
-       {
-         msg (ME, "%s", err->message);
-         g_error_free (err);
-       }
+      msg (ME, "%s", err->message);
+      g_error_free (err);
     }
 }
 
@@ -380,12 +664,13 @@ on_quit (GtkMenuItem *menuitem, gpointer    user_data)
 
 
 static void
-load_and_show_syntax_window (GtkWidget *se, const gchar *filename)
+load_and_show_syntax_window (GtkWidget *se, const gchar *filename,
+                             const gchar *encoding)
 {
   gboolean ok;
 
   gtk_source_buffer_begin_not_undoable_action (PSPPIRE_SYNTAX_WINDOW (se)->buffer);
-  ok = psppire_window_load (PSPPIRE_WINDOW (se), filename);
+  ok = psppire_window_load (PSPPIRE_WINDOW (se), filename, encoding, NULL);
   gtk_source_buffer_end_not_undoable_action (PSPPIRE_SYNTAX_WINDOW (se)->buffer);
 
   if (ok )
@@ -397,17 +682,17 @@ load_and_show_syntax_window (GtkWidget *se, const gchar *filename)
 void
 create_syntax_window (void)
 {
-  GtkWidget *w = psppire_syntax_window_new ();
+  GtkWidget *w = psppire_syntax_window_new (NULL);
   gtk_widget_show (w);
 }
 
 void
-open_new_syntax_window (const char *file_name)
+open_syntax_window (const char *file_name, const gchar *encoding)
 {
-  GtkWidget *se = psppire_syntax_window_new ();
+  GtkWidget *se = psppire_syntax_window_new (NULL);
 
   if ( file_name)
-    load_and_show_syntax_window (se, file_name);
+    load_and_show_syntax_window (se, file_name, encoding);
 }
 
 
@@ -421,8 +706,6 @@ on_modified_changed (GtkTextBuffer *buffer, PsppireWindow *window)
     psppire_window_set_unsaved (window);
 }
 
-extern struct source_stream *the_source_stream ;
-
 static void undo_redo_update (PsppireSyntaxWindow *window);
 static void undo_last_edit (PsppireSyntaxWindow *window);
 static void redo_last_edit (PsppireSyntaxWindow *window);
@@ -448,6 +731,9 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window)
   PsppireSyntaxWindowClass *class
     = PSPPIRE_SYNTAX_WINDOW_CLASS (G_OBJECT_GET_CLASS (window));
 
+  GtkClipboard *clip_selection = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_CLIPBOARD);
+  GtkClipboard *clip_primary =   gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_PRIMARY);
+
   window->print_settings = NULL;
   window->undo_menuitem = get_action_assert (xml, "edit_undo");
   window->redo_menuitem = get_action_assert (xml, "edit_redo");
@@ -463,7 +749,6 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window)
                "highlight-matching-brackets", TRUE,
                NULL);
 
-
   g_object_set (text_view,
                "show-line-numbers", TRUE,
                "show-line-marks", TRUE,
@@ -471,14 +756,26 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window)
                "indent-width", 4,
                "highlight-current-line", TRUE,
                NULL);
-  window->lexer = lex_create (the_source_stream);
+
+  window->encoding = NULL;
+
+  window->cliptext = NULL;
+  window->dispose_has_run = FALSE;
+
+  window->edit_delete = get_action_assert (xml, "edit_delete");
+  window->edit_copy = get_action_assert (xml, "edit_copy");
+  window->edit_cut = get_action_assert (xml, "edit_cut");
+  window->edit_paste = get_action_assert (xml, "edit_paste");
+
+  window->buffer = GTK_SOURCE_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view)));
 
   window->sb = get_widget_assert (xml, "statusbar2");
   window->text_context = gtk_statusbar_get_context_id (GTK_STATUSBAR (window->sb), "Text Context");
 
-  g_signal_connect (window->buffer, "changed", G_CALLBACK (on_text_changed), window);
+  g_signal_connect (window->buffer, "changed", 
+                   G_CALLBACK (on_text_changed), window);
 
-  g_signal_connect (window->buffer, "modified-changed",
+  g_signal_connect (window->buffer, "modified-changed", 
                    G_CALLBACK (on_modified_changed), window);
 
   g_signal_connect_swapped (get_action_assert (xml, "file_print"), "activate",
@@ -497,6 +794,12 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window)
 
   undo_redo_update (window);
 
+  window->sel_handler = g_signal_connect_swapped (clip_primary, "owner-change", 
+                                                  G_CALLBACK (selection_changed), window);
+
+  window->ps_handler = g_signal_connect (clip_selection, "owner-change", 
+                                         G_CALLBACK (set_paste_sensitivity), window);
+
   connect_help (xml);
 
   gtk_container_add (GTK_CONTAINER (window), box);
@@ -507,7 +810,6 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window)
 
   g_object_ref (window->sb);
 
-
   gtk_box_pack_start (GTK_BOX (box), menubar, FALSE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (box), window->sb, FALSE, TRUE, 0);
@@ -516,21 +818,24 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window)
 
   g_signal_connect_swapped (get_action_assert (xml,"file_new_syntax"), "activate", G_CALLBACK (create_syntax_window), NULL);
 
-#if 0
   g_signal_connect (get_action_assert (xml,"file_new_data"),
                    "activate",
                    G_CALLBACK (create_data_window),
                    window);
-#endif
+
+  g_signal_connect_swapped (get_action_assert (xml, "file_open"),
+                   "activate",
+                   G_CALLBACK (psppire_window_open),
+                   window);
 
   g_signal_connect_swapped (get_action_assert (xml, "file_save"),
                    "activate",
-                   G_CALLBACK (syntax_save),
+                   G_CALLBACK (psppire_window_save),
                    window);
 
   g_signal_connect_swapped (get_action_assert (xml, "file_save_as"),
                    "activate",
-                   G_CALLBACK (syntax_save_as),
+                   G_CALLBACK (psppire_window_save_as),
                    window);
 
   g_signal_connect (get_action_assert (xml,"file_quit"),
@@ -538,12 +843,31 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window)
                    G_CALLBACK (on_quit),
                    window);
 
+  g_signal_connect_swapped (window->edit_delete,
+                   "activate",
+                   G_CALLBACK (on_edit_delete),
+                   window);
+
+  g_signal_connect_swapped (window->edit_copy,
+                   "activate",
+                   G_CALLBACK (on_edit_copy),
+                   window);
+
+  g_signal_connect_swapped (window->edit_cut,
+                   "activate",
+                   G_CALLBACK (on_edit_cut),
+                   window);
+
+  g_signal_connect_swapped (window->edit_paste,
+                   "activate",
+                   G_CALLBACK (on_edit_paste),
+                   window);
+
   g_signal_connect (get_action_assert (xml,"run_all"),
                    "activate",
                    G_CALLBACK (on_run_all),
                    window);
 
-
   g_signal_connect (get_action_assert (xml,"run_selection"),
                    "activate",
                    G_CALLBACK (on_run_selection),
@@ -580,12 +904,15 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window)
 }
 
 
+
+
+
 GtkWidget*
-psppire_syntax_window_new (void)
+psppire_syntax_window_new (const char *encoding)
 {
   return GTK_WIDGET (g_object_new (psppire_syntax_window_get_type (),
-                                  "filename", "Syntax",
                                   "description", _("Syntax Editor"),
+                                   "encoding", encoding,
                                   NULL));
 }
 
@@ -599,12 +926,12 @@ error_dialog (GtkWindow *w, const gchar *filename,  GError *err)
                            GTK_DIALOG_DESTROY_WITH_PARENT,
                            GTK_MESSAGE_ERROR,
                            GTK_BUTTONS_CLOSE,
-                           _("Cannot load syntax file '%s'"),
+                           _("Cannot load syntax file `%s'"),
                            fn);
 
   g_free (fn);
 
-  g_object_set (dialog, "icon-name", "psppicon", NULL);
+  g_object_set (dialog, "icon-name", "pspp", NULL);
 
   gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                            "%s", err->message);
@@ -618,7 +945,8 @@ error_dialog (GtkWindow *w, const gchar *filename,  GError *err)
   Loads the buffer from the file called FILENAME
 */
 gboolean
-syntax_load (PsppireWindow *window, const gchar *filename)
+syntax_load (PsppireWindow *window, const gchar *filename,
+             const gchar *encoding, gpointer not_used)
 {
   GError *err = NULL;
   gchar *text_locale = NULL;
@@ -628,6 +956,7 @@ syntax_load (PsppireWindow *window, const gchar *filename)
   GtkTextIter iter;
   PsppireSyntaxWindow *sw = PSPPIRE_SYNTAX_WINDOW (window);
   GtkTextBuffer *buffer = GTK_TEXT_BUFFER (sw->buffer);
+
   /* FIXME: What if it's a very big file ? */
   if ( ! g_file_get_contents (filename, &text_locale, &len_locale, &err) )
     {
@@ -636,8 +965,28 @@ syntax_load (PsppireWindow *window, const gchar *filename)
       return FALSE;
     }
 
-  text_utf8 = g_locale_to_utf8 (text_locale, len_locale, NULL, &len_utf8, &err);
+  if (!encoding || !encoding[0])
+    {
+      /* Determine the file's encoding and update sw->encoding.  (The ordering
+         is important here because encoding_guess_whole_file() often returns
+         its argument instead of a copy of it.) */
+      char *guessed_encoding;
+
+      guessed_encoding = g_strdup (encoding_guess_whole_file (sw->encoding,
+                                                              text_locale,
+                                                              len_locale));
+      g_free (sw->encoding);
+      sw->encoding = guessed_encoding;
+    }
+  else
+    {
+      g_free (sw->encoding);
+      sw->encoding = g_strdup (encoding);
+    }
 
+  text_utf8 = recode_substring_pool ("UTF-8", sw->encoding,
+                                     ss_buffer (text_locale, len_locale),
+                                     NULL).string;
   free (text_locale);
 
   if ( text_utf8 == NULL )
@@ -655,6 +1004,8 @@ syntax_load (PsppireWindow *window, const gchar *filename)
 
   free (text_utf8);
 
+  add_most_recent (filename, "text/x-spss-syntax", sw->encoding);
+
   return TRUE;
 }
 
@@ -664,9 +1015,11 @@ static void
 psppire_syntax_window_iface_init (PsppireWindowIface *iface)
 {
   iface->save = syntax_save;
+  iface->pick_filename = syntax_pick_filename;
   iface->load = syntax_load;
 }
 
+
 \f
 
 static void