X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-syntax-window.c;fp=src%2Fui%2Fgui%2Fpsppire-syntax-window.c;h=b5cf0d3345d27cc45474bcc24e3cbe53c6562c0c;hb=fe8dc2171009e90d2335f159d05f7e6660e24780;hp=c7251a1ab77206c9772df3f377b408708ef67ad3;hpb=a258e53c63a08b0ec48aea8f03808eb651729424;p=pspp diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c index c7251a1ab7..b5cf0d3345 100644 --- a/src/ui/gui/psppire-syntax-window.c +++ b/src/ui/gui/psppire-syntax-window.c @@ -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 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,32 +16,33 @@ #include -#include "relocatable.h" - -#include -#include -#include "executor.h" -#include "helper.h" +#include +#include #include #include #include #include -#include -#include - -#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 -#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/psppire-data-window.h" +#include "ui/gui/psppire-encoding-selector.h" +#include "ui/gui/psppire-syntax-window.h" +#include "ui/gui/psppire-syntax-window.h" +#include "ui/gui/psppire-window-register.h" +#include "ui/gui/psppire.h" +#include "ui/gui/psppire.h" + +#include "gl/localcharset.h" +#include "gl/xalloc.h" +#include "gl/xvasprintf.h" #include #define _(msgid) gettext (msgid) @@ -56,6 +57,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) { @@ -116,6 +164,9 @@ psppire_syntax_window_dispose (GObject *obj) 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); @@ -135,6 +186,7 @@ psppire_syntax_window_dispose (GObject *obj) static void psppire_syntax_window_class_init (PsppireSyntaxWindowClass *class) { + GParamSpec *encoding_spec; GObjectClass *gobject_class = G_OBJECT_CLASS (class); GtkSourceLanguageManager *lm = gtk_source_language_manager_get_default (); @@ -159,9 +211,22 @@ psppire_syntax_window_class_init (PsppireSyntaxWindowClass *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); } @@ -186,13 +251,16 @@ 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; + gchar *text = gtk_text_buffer_get_text (GTK_TEXT_BUFFER (sw->buffer), &start, &stop, FALSE); + reader = lex_reader_for_string (text); + g_free (text); + lex_reader_set_file_name (reader, psppire_window_get_filename (win)); + execute_syntax (psppire_default_data_window (), reader); +} - /* Delete the currently selected text */ static void on_edit_delete (PsppireSyntaxWindow *sw) @@ -477,6 +545,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; @@ -491,8 +560,13 @@ 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 ) @@ -509,10 +583,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; @@ -537,44 +613,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); } } @@ -607,14 +686,14 @@ 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 (encoding); if ( file_name) load_and_show_syntax_window (se, file_name); @@ -631,8 +710,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); @@ -661,7 +738,6 @@ psppire_syntax_window_init (PsppireSyntaxWindow *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"); @@ -685,6 +761,8 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window) "highlight-current-line", TRUE, NULL); + window->encoding = NULL; + window->cliptext = NULL; window->dispose_has_run = FALSE; @@ -693,7 +771,7 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window) window->edit_cut = get_action_assert (xml, "edit_cut"); window->edit_paste = get_action_assert (xml, "edit_paste"); - window->lexer = lex_create (the_source_stream); + 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"); @@ -744,21 +822,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"), @@ -831,12 +912,11 @@ 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 (), - /* TRANSLATORS: This will form a filename. Please avoid whitespace. */ - "filename", _("Syntax"), "description", _("Syntax Editor"), + "encoding", encoding, NULL)); } @@ -879,6 +959,9 @@ syntax_load (PsppireWindow *window, const gchar *filename) GtkTextIter iter; PsppireSyntaxWindow *sw = PSPPIRE_SYNTAX_WINDOW (window); GtkTextBuffer *buffer = GTK_TEXT_BUFFER (sw->buffer); + gchar *encoding; + char *mime_type; + /* FIXME: What if it's a very big file ? */ if ( ! g_file_get_contents (filename, &text_locale, &len_locale, &err) ) { @@ -887,8 +970,17 @@ syntax_load (PsppireWindow *window, const gchar *filename) return FALSE; } - text_utf8 = g_locale_to_utf8 (text_locale, len_locale, NULL, &len_utf8, &err); - + /* 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.) */ + encoding = g_strdup (encoding_guess_whole_file (sw->encoding, text_locale, + len_locale)); + g_free (sw->encoding); + sw->encoding = encoding; + + text_utf8 = recode_substring_pool ("UTF-8", encoding, + ss_buffer (text_locale, len_locale), + NULL).string; free (text_locale); if ( text_utf8 == NULL ) @@ -906,6 +998,10 @@ syntax_load (PsppireWindow *window, const gchar *filename) free (text_utf8); + mime_type = xasprintf ("text/x-spss-syntax; charset=%s", sw->encoding); + add_most_recent (filename, mime_type); + free (mime_type); + return TRUE; } @@ -915,6 +1011,7 @@ static void psppire_syntax_window_iface_init (PsppireWindowIface *iface) { iface->save = syntax_save; + iface->pick_filename = syntax_pick_filename; iface->load = syntax_load; }