X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-syntax-window.c;h=50e7f09d1365a358cbcfcecb1e6adc8a967de197;hb=9ade26c8349b4434008c46cf09bc7473ec743972;hp=77d20ab2bb3860c65114eda1b367d95772dfd235;hpb=b6088c04a2380078af7ce9c18b6ba52a0f6b38cf;p=pspp-builds.git diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c index 77d20ab2..50e7f09d 100644 --- a/src/ui/gui/psppire-syntax-window.c +++ b/src/ui/gui/psppire-syntax-window.c @@ -21,19 +21,15 @@ #include "executor.h" #include "helper.h" +#include #include #include +#include "help-menu.h" #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" @@ -99,10 +95,41 @@ 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; + + 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) { + GObjectClass *gobject_class = G_OBJECT_CLASS (class); + parent_class = g_type_class_peek_parent (class); + + gobject_class->dispose = psppire_syntax_window_dispose; } @@ -128,8 +155,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 (sw->buffer, start, stop, name)); + struct lex_reader *reader; + gchar *text; + + text = gtk_text_buffer_get_text (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 (reader); } @@ -271,7 +306,7 @@ contents_received_callback (GtkClipboard *clipboard, } -void +static void on_edit_paste (PsppireSyntaxWindow *sw) { GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (sw)); @@ -285,6 +320,30 @@ on_edit_paste (PsppireSyntaxWindow *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 */ @@ -416,7 +475,7 @@ save_editor_to_file (PsppireSyntaxWindow *se, 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); @@ -538,8 +597,6 @@ on_modified_changed (GtkTextBuffer *buffer, PsppireWindow *window) psppire_window_set_unsaved (window); } -extern struct source_stream *the_source_stream ; - static void psppire_syntax_window_init (PsppireSyntaxWindow *window) { @@ -552,32 +609,34 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window) GtkWidget *text_view = get_widget_assert (xml, "syntax_text_view"); - - GtkClipboard *clipboard = - gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_PRIMARY); - - g_signal_connect_swapped (clipboard, "owner-change", G_CALLBACK (selection_changed), 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->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"); -gtk_action_set_sensitive (window->edit_paste, TRUE); - window->buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view)); - window->lexer = lex_create (the_source_stream); 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); + 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); @@ -588,7 +647,6 @@ gtk_action_set_sensitive (window->edit_paste, TRUE); 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); @@ -684,7 +742,8 @@ GtkWidget* psppire_syntax_window_new (void) { return GTK_WIDGET (g_object_new (psppire_syntax_window_get_type (), - "filename", "Syntax", + /* TRANSLATORS: This will form a filename. Please avoid whitespace. */ + "filename", _("Syntax"), "description", _("Syntax Editor"), NULL)); } @@ -699,7 +758,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); @@ -767,5 +826,3 @@ psppire_syntax_window_iface_init (PsppireWindowIface *iface) iface->load = syntax_load; } - -