From: John Darrington Date: Tue, 24 Aug 2010 13:23:05 +0000 (+0200) Subject: Merge commit 'origin/master' into sso X-Git-Tag: v0.7.9~159^2~2 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca5f6bb9df6d4019d777b52da0419d917d4dfc52;p=pspp-builds.git Merge commit 'origin/master' into sso Conflicts: src/ui/gui/psppire-syntax-window.c src/ui/gui/psppire-syntax-window.h src/ui/gui/syntax-editor.ui --- ca5f6bb9df6d4019d777b52da0419d917d4dfc52 diff --cc src/ui/gui/psppire-syntax-window.c index 68c1546e,058e27c5..c162e219 --- a/src/ui/gui/psppire-syntax-window.c +++ b/src/ui/gui/psppire-syntax-window.c @@@ -158,6 -133,180 +158,180 @@@ editor_execute_syntax (const PsppireSyn } + + + /* 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 (sw->buffer, &begin, &end) ) - gtk_text_buffer_delete (sw->buffer, &begin, &end); ++ 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 (sw->buffer); ++ 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 (sw->buffer, begin, end) ) ++ if ( ! gtk_text_buffer_get_selection_bounds (buffer, begin, end) ) + return FALSE; + + g_free (sw->cliptext); - sw->cliptext = gtk_text_buffer_get_text (sw->buffer, begin, end, FALSE); ++ 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 (sw->buffer, &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 (syntax_window->buffer, ++ 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); + } + + static void + on_owner_change (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 on_run_all (GtkMenuItem *menuitem, gpointer user_data) @@@ -442,34 -569,24 +616,48 @@@ psppire_syntax_window_init (PsppireSynt GtkWidget *menubar = get_widget_assert (xml, "menubar"); GtkWidget *sw = get_widget_assert (xml, "scrolledwindow8"); - GtkWidget *text_view = get_widget_assert (xml, "syntax_text_view"); + 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_source_buffer_new_with_language (class->lan); + else + window->buffer = gtk_source_buffer_new (NULL); + + 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, + "show-line-marks", TRUE, + "auto-indent", TRUE, + "indent-width", 4, + "highlight-current-line", TRUE, + NULL); ++ + g_signal_connect_swapped (clip_primary, "owner-change", G_CALLBACK (selection_changed), window); + + g_signal_connect (clip_selection, "owner-change", G_CALLBACK (on_owner_change), window); + + window->cliptext = NULL; + + 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_text_view_get_buffer (GTK_TEXT_VIEW (text_view)); window->lexer = lex_create (the_source_stream); window->sb = get_widget_assert (xml, "statusbar2"); diff --cc src/ui/gui/psppire-syntax-window.h index 14710df2,9da7c869..1f97cbc7 --- a/src/ui/gui/psppire-syntax-window.h +++ b/src/ui/gui/psppire-syntax-window.h @@@ -57,10 -52,12 +57,17 @@@ struct _PsppireSyntaxWindo GtkWidget *sb; guint text_context; + GtkPrintSettings *print_settings; + GtkSourcePrintCompositor *compositor; + GtkAction *undo_menuitem; + GtkAction *redo_menuitem; ++ + gchar *cliptext; + + GtkAction *edit_cut; + GtkAction *edit_copy; + GtkAction *edit_delete; + GtkAction *edit_paste; }; struct _PsppireSyntaxWindowClass diff --cc src/ui/gui/syntax-editor.ui index a3450973,c9436629..4f134c2e --- a/src/ui/gui/syntax-editor.ui +++ b/src/ui/gui/syntax-editor.ui @@@ -97,21 -94,10 +100,22 @@@ gtk-delete - delete + edit_delete + false + + + gtk-undo + edit_undo + + + + + gtk-redo + edit_redo + + run1