X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-syntax-window.c;h=77d20ab2bb3860c65114eda1b367d95772dfd235;hb=b6088c04a2380078af7ce9c18b6ba52a0f6b38cf;hp=48e1ea44fe73d3873c4631d6e5b4bc06311e4636;hpb=aca5e0c21bb5f2cc509ea1fb0ec5ba5be4faaf7d;p=pspp diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c index 48e1ea44fe..77d20ab2bb 100644 --- a/src/ui/gui/psppire-syntax-window.c +++ b/src/ui/gui/psppire-syntax-window.c @@ -30,7 +30,7 @@ #include "psppire-data-window.h" #include "psppire-window-register.h" #include "psppire.h" -#include "about.h" +#include "help-menu.h" #include "psppire-syntax-window.h" #include "syntax-editor-source.h" #include @@ -133,6 +133,160 @@ editor_execute_syntax (const PsppireSyntaxWindow *sw, GtkTextIter start, } + + +/* Delete the currently selected text */ +static void +on_edit_delete (PsppireSyntaxWindow *sw) +{ + GtkTextIter begin, end; + + if ( gtk_text_buffer_get_selection_bounds (sw->buffer, &begin, &end) ) + gtk_text_buffer_delete (sw->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); + + 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 ; + + if ( ! gtk_text_buffer_get_selection_bounds (sw->buffer, begin, end) ) + return FALSE; + + g_free (sw->cliptext); + sw->cliptext = gtk_text_buffer_get_text (sw->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); +} + +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, + (gchar *) sd->data, + sd->length); + +} + +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); +} + + + + /* Parse and execute all the text in the buffer */ static void on_run_all (GtkMenuItem *menuitem, gpointer user_data) @@ -392,11 +546,27 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window) GtkBuilder *xml = builder_new ("syntax-editor.ui"); GtkWidget *box = gtk_vbox_new (FALSE, 0); - GtkWidget *menubar = get_widget_assert (xml, "menubar2"); + GtkWidget *menubar = get_widget_assert (xml, "menubar"); GtkWidget *sw = get_widget_assert (xml, "scrolledwindow8"); 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); + + 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"); + +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); @@ -425,10 +595,7 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window) gtk_widget_show_all (box); - g_signal_connect (get_action_assert (xml,"file_new_syntax"), - "activate", - G_CALLBACK (create_syntax_window), - NULL); + 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"), @@ -437,21 +604,6 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window) window); #endif - { - GtkAction *abt = get_action_assert (xml, "help_about"); - g_object_set (abt, "stock-id", "gtk-about", NULL); - - g_signal_connect (abt, - "activate", - G_CALLBACK (about_new), - window); - } - - g_signal_connect (get_action_assert (xml,"help_reference"), - "activate", - G_CALLBACK (reference_manual), - NULL); - g_signal_connect_swapped (get_action_assert (xml, "file_save"), "activate", G_CALLBACK (syntax_save), @@ -467,12 +619,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), @@ -496,14 +667,19 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window) { GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER)); + merge_help_menu (uim); + PSPPIRE_WINDOW (window)->menu = - GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar2/windows/windows_minimise_all")->parent); + GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent); } g_object_unref (xml); } + + + GtkWidget* psppire_syntax_window_new (void) { @@ -545,12 +721,26 @@ gboolean syntax_load (PsppireWindow *window, const gchar *filename) { GError *err = NULL; - gchar *text; + gchar *text_locale = NULL; + gchar *text_utf8 = NULL; + gsize len_locale = -1; + gsize len_utf8 = -1; GtkTextIter iter; PsppireSyntaxWindow *sw = PSPPIRE_SYNTAX_WINDOW (window); /* FIXME: What if it's a very big file ? */ - if ( ! g_file_get_contents (filename, &text, NULL, &err) ) + if ( ! g_file_get_contents (filename, &text_locale, &len_locale, &err) ) + { + error_dialog (GTK_WINDOW (window), filename, err); + g_clear_error (&err); + return FALSE; + } + + text_utf8 = g_locale_to_utf8 (text_locale, len_locale, NULL, &len_utf8, &err); + + free (text_locale); + + if ( text_utf8 == NULL ) { error_dialog (GTK_WINDOW (window), filename, err); g_clear_error (&err); @@ -559,10 +749,12 @@ syntax_load (PsppireWindow *window, const gchar *filename) gtk_text_buffer_get_iter_at_line (sw->buffer, &iter, 0); - gtk_text_buffer_insert (sw->buffer, &iter, text, -1); + gtk_text_buffer_insert (sw->buffer, &iter, text_utf8, len_utf8); gtk_text_buffer_set_modified (sw->buffer, FALSE); + free (text_utf8); + return TRUE; } @@ -574,3 +766,6 @@ psppire_syntax_window_iface_init (PsppireWindowIface *iface) iface->save = syntax_save; iface->load = syntax_load; } + + +