X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-syntax-window.c;h=b5cf0d3345d27cc45474bcc24e3cbe53c6562c0c;hb=fe8dc2171009e90d2335f159d05f7e6660e24780;hp=eb35ae5216f1c14396019e8289afecc667850fce;hpb=3083d35230ebac09d4a13a5a68a6e7e04dc7a55a;p=pspp-builds.git diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c index eb35ae52..b5cf0d33 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,30 +16,33 @@ #include -#include -#include -#include "executor.h" -#include "helper.h" +#include +#include #include #include #include - -#include -#include - -#include "psppire.h" -#include "psppire-syntax-window.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 + + +#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) @@ -54,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) { @@ -103,19 +153,50 @@ psppire_syntax_window_finalize (GObject *object) } +static void +psppire_syntax_window_dispose (GObject *obj) +{ + 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); +} + + + 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 (); 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); - const gchar **new_paths = g_strdupv (existing_paths); - - int n = g_strv_length (existing_paths); - - new_paths = g_realloc (new_paths, (n+1) * sizeof (*new_paths)); - new_paths[n] = g_strdup (PKGDATADIR); + new_paths = g_realloc (new_paths, (n + 2) * sizeof (*new_paths)); + new_paths[n] = g_strdup (relocate (PKGDATADIR)); new_paths[n+1] = NULL; lm = gtk_source_language_manager_new (); @@ -127,6 +208,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); } @@ -151,10 +251,191 @@ 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 (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) +{ + 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) +{ + gchar *c; + PsppireSyntaxWindow *syntax_window = data; + + if ( sd->length < 0 ) + return; + + 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); + +} + +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); +} + + + /* Parse and execute all the text in the buffer */ static void @@ -163,8 +444,8 @@ on_run_all (GtkMenuItem *menuitem, gpointer user_data) GtkTextIter begin, end; PsppireSyntaxWindow *se = PSPPIRE_SYNTAX_WINDOW (user_data); - gtk_text_buffer_get_iter_at_offset (se->buffer, &begin, 0); - gtk_text_buffer_get_iter_at_offset (se->buffer, &end, -1); + gtk_text_buffer_get_iter_at_offset (GTK_TEXT_BUFFER (se->buffer), &begin, 0); + gtk_text_buffer_get_iter_at_offset (GTK_TEXT_BUFFER (se->buffer), &end, -1); editor_execute_syntax (se, begin, end); } @@ -176,7 +457,7 @@ on_run_selection (GtkMenuItem *menuitem, gpointer user_data) GtkTextIter begin, end; PsppireSyntaxWindow *se = PSPPIRE_SYNTAX_WINDOW (user_data); - if ( gtk_text_buffer_get_selection_bounds (se->buffer, &begin, &end) ) + if ( gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER (se->buffer), &begin, &end) ) editor_execute_syntax (se, begin, end); } @@ -193,17 +474,17 @@ on_run_to_end (GtkMenuItem *menuitem, gpointer user_data) PsppireSyntaxWindow *se = PSPPIRE_SYNTAX_WINDOW (user_data); /* Get the current line */ - gtk_text_buffer_get_iter_at_mark (se->buffer, + gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (se->buffer), &here, - gtk_text_buffer_get_insert (se->buffer) + gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (se->buffer)) ); line = gtk_text_iter_get_line (&here) ; /* Now set begin and end to the start of this line, and end of buffer respectively */ - gtk_text_buffer_get_iter_at_line (se->buffer, &begin, line); - gtk_text_buffer_get_iter_at_line (se->buffer, &end, -1); + gtk_text_buffer_get_iter_at_line (GTK_TEXT_BUFFER (se->buffer), &begin, line); + gtk_text_buffer_get_iter_at_line (GTK_TEXT_BUFFER (se->buffer), &end, -1); editor_execute_syntax (se, begin, end); } @@ -221,17 +502,17 @@ on_run_current_line (GtkMenuItem *menuitem, gpointer user_data) PsppireSyntaxWindow *se = PSPPIRE_SYNTAX_WINDOW (user_data); /* Get the current line */ - gtk_text_buffer_get_iter_at_mark (se->buffer, + gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (se->buffer), &here, - gtk_text_buffer_get_insert (se->buffer) + gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (se->buffer)) ); line = gtk_text_iter_get_line (&here) ; /* Now set begin and end to the start of this line, and start of following line respectively */ - gtk_text_buffer_get_iter_at_line (se->buffer, &begin, line); - gtk_text_buffer_get_iter_at_line (se->buffer, &end, line + 1); + gtk_text_buffer_get_iter_at_line (GTK_TEXT_BUFFER (se->buffer), &begin, line); + gtk_text_buffer_get_iter_at_line (GTK_TEXT_BUFFER (se->buffer), &end, line + 1); editor_execute_syntax (se, begin, end); } @@ -263,7 +544,8 @@ save_editor_to_file (PsppireSyntaxWindow *se, const gchar *filename, GError **err) { - GtkTextBuffer *buffer = se->buffer; + GtkTextBuffer *buffer = GTK_TEXT_BUFFER (se->buffer); + struct substring text_locale; gboolean result ; GtkTextIter start, stop; gchar *text; @@ -278,14 +560,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); @@ -296,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; @@ -324,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); } } @@ -376,29 +668,40 @@ on_quit (GtkMenuItem *menuitem, gpointer user_data) } +static void +load_and_show_syntax_window (GtkWidget *se, const gchar *filename) +{ + gboolean ok; + + gtk_source_buffer_begin_not_undoable_action (PSPPIRE_SYNTAX_WINDOW (se)->buffer); + ok = psppire_window_load (PSPPIRE_WINDOW (se), filename); + gtk_source_buffer_end_not_undoable_action (PSPPIRE_SYNTAX_WINDOW (se)->buffer); + + if (ok ) + gtk_widget_show (se); + else + gtk_widget_destroy (se); +} + void create_syntax_window (void) { - GtkWidget *w = psppire_syntax_window_new (); + GtkWidget *w = psppire_syntax_window_new (NULL); gtk_widget_show (w); } void -open_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 ( psppire_window_load (PSPPIRE_WINDOW (se), file_name) ) - gtk_widget_show (se); - else - gtk_widget_destroy (se); + if ( file_name) + load_and_show_syntax_window (se, file_name); } -static void -on_text_changed (GtkTextBuffer *buffer, PsppireSyntaxWindow *window) -{ - gtk_statusbar_pop (GTK_STATUSBAR (window->sb), window->text_context); -} + + +static void psppire_syntax_window_print (PsppireSyntaxWindow *window); static void on_modified_changed (GtkTextBuffer *buffer, PsppireWindow *window) @@ -407,7 +710,16 @@ 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); + +static void +on_text_changed (GtkTextBuffer *buffer, PsppireSyntaxWindow *window) +{ + gtk_statusbar_pop (GTK_STATUSBAR (window->sb), window->text_context); + undo_redo_update (window); +} static void psppire_syntax_window_init (PsppireSyntaxWindow *window) @@ -423,12 +735,23 @@ 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"); + if (class->lan) - window->buffer = GTK_TEXT_BUFFER (gtk_source_buffer_new_with_language (class->lan)); + window->buffer = gtk_source_buffer_new_with_language (class->lan); else - window->buffer = GTK_TEXT_BUFFER (gtk_source_buffer_new (NULL)); + window->buffer = gtk_source_buffer_new (NULL); - gtk_text_view_set_buffer (GTK_TEXT_VIEW (text_view), window->buffer); + gtk_text_view_set_buffer (GTK_TEXT_VIEW (text_view), GTK_TEXT_BUFFER (window->buffer)); + + g_object_set (window->buffer, + "highlight-matching-brackets", TRUE, + NULL); g_object_set (text_view, "show-line-numbers", TRUE, @@ -437,16 +760,50 @@ 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", + G_CALLBACK (psppire_syntax_window_print), window); + + + g_signal_connect_swapped (window->undo_menuitem, + "activate", + G_CALLBACK (undo_last_edit), + window); + + g_signal_connect_swapped (window->redo_menuitem, + "activate", + G_CALLBACK (redo_last_edit), + 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); @@ -457,7 +814,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); @@ -466,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"), @@ -488,12 +847,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), @@ -514,6 +892,9 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window) G_CALLBACK (psppire_window_minimise_all), NULL); + + + { GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER)); @@ -527,12 +908,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)); } @@ -546,7 +930,7 @@ 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); @@ -574,6 +958,9 @@ syntax_load (PsppireWindow *window, const gchar *filename) gsize len_utf8 = -1; 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) ) @@ -583,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 ) @@ -594,14 +990,18 @@ syntax_load (PsppireWindow *window, const gchar *filename) return FALSE; } - gtk_text_buffer_get_iter_at_line (sw->buffer, &iter, 0); + gtk_text_buffer_get_iter_at_line (buffer, &iter, 0); - gtk_text_buffer_insert (sw->buffer, &iter, text_utf8, len_utf8); + gtk_text_buffer_insert (buffer, &iter, text_utf8, len_utf8); - gtk_text_buffer_set_modified (sw->buffer, FALSE); + gtk_text_buffer_set_modified (buffer, FALSE); 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; } @@ -611,5 +1011,117 @@ static void psppire_syntax_window_iface_init (PsppireWindowIface *iface) { iface->save = syntax_save; + iface->pick_filename = syntax_pick_filename; iface->load = syntax_load; } + + + + +static void +undo_redo_update (PsppireSyntaxWindow *window) +{ + gtk_action_set_sensitive (window->undo_menuitem, + gtk_source_buffer_can_undo (window->buffer)); + + gtk_action_set_sensitive (window->redo_menuitem, + gtk_source_buffer_can_redo (window->buffer)); +} + +static void +undo_last_edit (PsppireSyntaxWindow *window) +{ + gtk_source_buffer_undo (window->buffer); + undo_redo_update (window); +} + +static void +redo_last_edit (PsppireSyntaxWindow *window) +{ + gtk_source_buffer_redo (window->buffer); + undo_redo_update (window); +} + + + +/* Printing related stuff */ + + +static void +begin_print (GtkPrintOperation *operation, + GtkPrintContext *context, + PsppireSyntaxWindow *window) +{ + window->compositor = + gtk_source_print_compositor_new (window->buffer); +} + + +static void +end_print (GtkPrintOperation *operation, + GtkPrintContext *context, + PsppireSyntaxWindow *window) +{ + g_object_unref (window->compositor); + window->compositor = NULL; +} + + + +static gboolean +paginate (GtkPrintOperation *operation, + GtkPrintContext *context, + PsppireSyntaxWindow *window) +{ + if (gtk_source_print_compositor_paginate (window->compositor, context)) + { + gint n_pages = gtk_source_print_compositor_get_n_pages (window->compositor); + gtk_print_operation_set_n_pages (operation, n_pages); + + return TRUE; + } + + return FALSE; +} + +static void +draw_page (GtkPrintOperation *operation, + GtkPrintContext *context, + gint page_nr, + PsppireSyntaxWindow *window) +{ + gtk_source_print_compositor_draw_page (window->compositor, + context, + page_nr); +} + + + +static void +psppire_syntax_window_print (PsppireSyntaxWindow *window) +{ + GtkPrintOperationResult res; + + GtkPrintOperation *print = gtk_print_operation_new (); + + if (window->print_settings != NULL) + gtk_print_operation_set_print_settings (print, window->print_settings); + + + g_signal_connect (print, "begin_print", G_CALLBACK (begin_print), window); + g_signal_connect (print, "end_print", G_CALLBACK (end_print), window); + g_signal_connect (print, "draw_page", G_CALLBACK (draw_page), window); + g_signal_connect (print, "paginate", G_CALLBACK (paginate), window); + + res = gtk_print_operation_run (print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, + GTK_WINDOW (window), NULL); + + if (res == GTK_PRINT_OPERATION_RESULT_APPLY) + { + if (window->print_settings != NULL) + g_object_unref (window->print_settings); + window->print_settings = g_object_ref (gtk_print_operation_get_print_settings (print)); + } + + g_object_unref (print); +}