X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-syntax-window.c;h=35f57e587b4cc950f30eaf8ef40683426e7b46e4;hb=refs%2Fbuilds%2F20140207030506%2Fpspp;hp=5ccbca5cb5660635a982b09ae4965a925ca59ae0;hpb=32ee0e0402d6d56674f53a47d879ec5c07dabe09;p=pspp diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c index 5ccbca5cb5..35f57e587b 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, 2011 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 @@ -24,7 +24,6 @@ #include #include - #include "language/lexer/lexer.h" #include "libpspp/encoding-guesser.h" #include "libpspp/i18n.h" @@ -32,13 +31,13 @@ #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-syntax-window.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 "ui/gui/psppire.h" #include "gl/localcharset.h" #include "gl/xalloc.h" @@ -251,10 +250,7 @@ editor_execute_syntax (const PsppireSyntaxWindow *sw, GtkTextIter start, GtkTextIter stop) { PsppireWindow *win = PSPPIRE_WINDOW (sw); - 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); + 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)); @@ -380,7 +376,6 @@ contents_received_callback (GtkClipboard *clipboard, GtkSelectionData *sd, gpointer data) { - gchar *c; PsppireSyntaxWindow *syntax_window = data; if ( sd->length < 0 ) @@ -389,8 +384,6 @@ contents_received_callback (GtkClipboard *clipboard, if ( sd->type != gdk_atom_intern ("UTF8_STRING", FALSE)) return; - c = (gchar *) sd->data; - gtk_text_buffer_insert_at_cursor (GTK_TEXT_BUFFER (syntax_window->buffer), (gchar *) sd->data, sd->length); @@ -671,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 ) @@ -695,10 +689,10 @@ create_syntax_window (void) void open_syntax_window (const char *file_name, const gchar *encoding) { - GtkWidget *se = psppire_syntax_window_new (encoding); + 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); } @@ -937,7 +931,7 @@ error_dialog (GtkWindow *w, const gchar *filename, GError *err) 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); @@ -951,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; @@ -961,8 +956,6 @@ 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) ) @@ -972,13 +965,24 @@ syntax_load (PsppireWindow *window, const gchar *filename) return FALSE; } - /* 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; + 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", encoding, ss_buffer (text_locale, len_locale), @@ -1000,9 +1004,7 @@ 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); + add_most_recent (filename, "text/x-spss-syntax", sw->encoding); return TRUE; }