X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-syntax-window.c;h=66838dd307172943d0a59fd26097013192d8e6c4;hb=64c3106b6b4900aa3515fb3ebc930ce80b59bb1e;hp=47df52be82922ad83999ba2f251f715d263ab05f;hpb=3ca11d9dd35fd7a6f343e008724a7b245dc2e6e5;p=pspp diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c index 47df52be82..66838dd307 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 @@ -19,6 +19,11 @@ #include #include +#include +#include +#include +#include + #include "language/lexer/lexer.h" #include "libpspp/encoding-guesser.h" #include "libpspp/i18n.h" @@ -26,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" @@ -180,9 +185,32 @@ psppire_syntax_window_dispose (GObject *obj) static void psppire_syntax_window_class_init (PsppireSyntaxWindowClass *class) { + GParamSpec *encoding_spec; GObjectClass *gobject_class = G_OBJECT_CLASS (class); - GParamSpec *encoding_spec = + 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); + + 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 (); + gtk_source_language_manager_set_search_path (lm, new_paths); + + class->lan = gtk_source_language_manager_get_language (lm, "pspp"); + + if (class->lan == NULL) + 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", @@ -205,7 +233,6 @@ static void psppire_syntax_window_base_init (PsppireSyntaxWindowClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); - object_class->finalize = psppire_syntax_window_finalize; } @@ -223,12 +250,7 @@ editor_execute_syntax (const PsppireSyntaxWindow *sw, GtkTextIter start, GtkTextIter stop) { PsppireWindow *win = PSPPIRE_WINDOW (sw); - 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); + 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)); @@ -240,14 +262,13 @@ 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, @@ -258,7 +279,7 @@ enum { 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); @@ -275,7 +296,7 @@ clipboard_get_cb (GtkClipboard *clipboard, PsppireSyntaxWindow *sw = data; g_assert (info == SELECT_FMT_TEXT); - gtk_selection_data_set (selection_data, selection_data->target, + gtk_selection_data_set (selection_data, gtk_selection_data_get_target (selection_data), 8, (const guchar *) sw->cliptext, strlen (sw->cliptext)); @@ -311,12 +332,13 @@ 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); @@ -336,7 +358,7 @@ 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 @@ -347,30 +369,6 @@ on_edit_copy (PsppireSyntaxWindow *sw) 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); - -} - static void on_edit_paste (PsppireSyntaxWindow *sw) { @@ -378,10 +376,7 @@ on_edit_paste (PsppireSyntaxWindow *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); + gtk_text_buffer_paste_clipboard (GTK_TEXT_BUFFER (sw->buffer), clipboard, NULL, TRUE); } @@ -418,8 +413,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); } @@ -431,7 +426,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); } @@ -448,17 +443,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); } @@ -476,17 +471,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); } @@ -518,7 +513,7 @@ 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; @@ -570,8 +565,8 @@ syntax_pick_filename (PsppireWindow *window) gtk_file_chooser_dialog_new (_("Save Syntax"), GTK_WINDOW (se), GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + _("Cancel"), GTK_RESPONSE_CANCEL, + _("Save"), GTK_RESPONSE_ACCEPT, NULL); g_object_set (dialog, "local-only", FALSE, NULL); @@ -644,6 +639,22 @@ on_quit (GtkMenuItem *menuitem, gpointer user_data) } +static void +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, encoding, NULL); + 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) { @@ -654,19 +665,15 @@ 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 ( 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, encoding); } -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) @@ -675,21 +682,57 @@ on_modified_changed (GtkTextBuffer *buffer, PsppireWindow *window) psppire_window_set_unsaved (window); } +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) { GtkBuilder *xml = builder_new ("syntax-editor.ui"); - GtkWidget *box = gtk_vbox_new (FALSE, 0); + GtkWidget *box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); 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); + window->encoding = NULL; window->cliptext = NULL; @@ -700,7 +743,7 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window) 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->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"); @@ -711,6 +754,22 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window) 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); @@ -806,12 +865,12 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window) { - GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER)); + GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER)); + GtkWidget *w = gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all"); - merge_help_menu (uim); + gtk_menu_shell_append (GTK_MENU_SHELL (menubar), create_help_menu (GTK_WINDOW (window))); - PSPPIRE_WINDOW (window)->menu = - GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent); + PSPPIRE_WINDOW (window)->menu = GTK_MENU_SHELL (gtk_widget_get_parent (w)); } g_object_unref (xml); @@ -845,7 +904,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); @@ -859,7 +918,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; @@ -868,8 +928,7 @@ syntax_load (PsppireWindow *window, const gchar *filename) gsize len_utf8 = -1; GtkTextIter iter; PsppireSyntaxWindow *sw = PSPPIRE_SYNTAX_WINDOW (window); - gchar *encoding; - char *mime_type; + GtkTextBuffer *buffer = GTK_TEXT_BUFFER (sw->buffer); /* FIXME: What if it's a very big file ? */ if ( ! g_file_get_contents (filename, &text_locale, &len_locale, &err) ) @@ -879,30 +938,46 @@ 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, + text_utf8 = recode_substring_pool ("UTF-8", sw->encoding, ss_buffer (text_locale, len_locale), NULL).string; free (text_locale); - gtk_text_buffer_get_iter_at_line (sw->buffer, &iter, 0); + if ( text_utf8 == NULL ) + { + error_dialog (GTK_WINDOW (window), filename, err); + g_clear_error (&err); + return FALSE; + } + + 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); + add_most_recent (filename, "text/x-spss-syntax", sw->encoding); return TRUE; } @@ -917,3 +992,113 @@ psppire_syntax_window_iface_init (PsppireWindowIface *iface) 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); +}