X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-output-window.c;h=46535b0f2362fd7cc8777cdeeaf18a67057c7e9b;hb=b525a9596e60d5ae4c6c464b4a426b77ade3dd72;hp=b0eff950c7e5e6b466b70edda79e9faf40702a8b;hpb=50b850e3c0b7dbe38c3acc6723bec337b0391410;p=pspp diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c index b0eff950c7..46535b0f23 100644 --- a/src/ui/gui/psppire-output-window.c +++ b/src/ui/gui/psppire-output-window.c @@ -1,5 +1,6 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2008 Free Software Foundation + Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, + 2021 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,63 +17,35 @@ #include -#include -#include -#include "helper.h" +#include "ui/gui/psppire-output-window.h" -#include +#include +#include #include +#include +#include +#include -#include "about.h" - -#include "psppire-output-window.h" - +#include "libpspp/cast.h" +#include "libpspp/message.h" +#include "libpspp/string-map.h" +#include "output/driver-provider.h" +#include "output/output-item.h" +#include "ui/gui/help-menu.h" +#include "ui/gui/builder-wrapper.h" +#include "ui/gui/psppire-output-view.h" +#include "ui/gui/psppire-conf.h" +#include "ui/gui/windows-menu.h" -#include "xalloc.h" +#include "gl/xalloc.h" -#include -#include -#include +#include "helper.h" #include #define _(msgid) gettext (msgid) #define N_(msgid) msgid - - -static void psppire_output_window_base_finalize (PsppireOutputWindowClass *, gpointer); -static void psppire_output_window_base_init (PsppireOutputWindowClass *class); -static void psppire_output_window_class_init (PsppireOutputWindowClass *class); -static void psppire_output_window_init (PsppireOutputWindow *window); - - -GType -psppire_output_window_get_type (void) -{ - static GType psppire_output_window_type = 0; - - if (!psppire_output_window_type) - { - static const GTypeInfo psppire_output_window_info = - { - sizeof (PsppireOutputWindowClass), - (GBaseInitFunc) psppire_output_window_base_init, - (GBaseFinalizeFunc) psppire_output_window_base_finalize, - (GClassInitFunc)psppire_output_window_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (PsppireOutputWindow), - 0, - (GInstanceInitFunc) psppire_output_window_init, - }; - - psppire_output_window_type = - g_type_register_static (PSPPIRE_TYPE_WINDOW, "PsppireOutputWindow", - &psppire_output_window_info, 0); - } - - return psppire_output_window_type; -} +G_DEFINE_TYPE (PsppireOutputWindow, psppire_output_window, PSPPIRE_TYPE_WINDOW) static GObjectClass *parent_class; @@ -85,36 +58,124 @@ psppire_output_window_finalize (GObject *object) static void -psppire_output_window_class_init (PsppireOutputWindowClass *class) +psppire_output_window_dispose (GObject *obj) { - parent_class = g_type_class_peek_parent (class); -} + PsppireOutputWindow *window = PSPPIRE_OUTPUT_WINDOW (obj); + + if (window->dispose_has_run) + return; + window->dispose_has_run = TRUE; + psppire_output_view_destroy (window->view); + window->view = NULL; + + /* Chain up to the parent class */ + G_OBJECT_CLASS (parent_class)->dispose (obj); +} static void -psppire_output_window_base_init (PsppireOutputWindowClass *class) +psppire_output_window_class_init (PsppireOutputWindowClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); + parent_class = g_type_class_peek_parent (class); + object_class->dispose = psppire_output_window_dispose; + object_class->finalize = psppire_output_window_finalize; } + +/* Output driver class. */ +struct psppire_output_driver + { + struct output_driver driver; + PsppireOutputWindow *window; + }; +static struct output_driver_class psppire_output_class; -static void -psppire_output_window_base_finalize (PsppireOutputWindowClass *class, - gpointer class_data) +static struct psppire_output_driver * +psppire_output_cast (struct output_driver *driver) { + assert (driver->class == &psppire_output_class); + return UP_CAST (driver, struct psppire_output_driver, driver); } +static void +psppire_output_submit (struct output_driver *this, + const struct output_item *item) +{ + struct psppire_output_driver *pod = psppire_output_cast (this); + PsppireOutputWindow *window; + bool new; + + new = pod->window == NULL; + if (new) + { + pod->window = PSPPIRE_OUTPUT_WINDOW (psppire_output_window_new ()); + GApplication *app = g_application_get_default (); + gtk_application_add_window (GTK_APPLICATION (app), + GTK_WINDOW (pod->window)); - + pod->window->driver = pod; + } + window = pod->window; + + psppire_output_view_put (window->view, item); + + if (new) + { + /* We could have called this earlier in the previous "if (new)" block, + but doing it here finds, in a plain GTK+ environment, a bug that + otherwise only showed up on an Ubuntu Unity desktop. See bug + #43362. */ + gtk_widget_show_all (GTK_WIDGET (pod->window)); + } + + PsppireConf *conf = psppire_conf_new (); + { + gboolean status = true; + psppire_conf_get_boolean (conf, "OutputWindowAction", "alert", + &status); + gtk_window_set_urgency_hint (GTK_WINDOW (pod->window), status); + } + + { + gboolean status ; + if (psppire_conf_get_boolean (conf, "OutputWindowAction", "maximize", + &status) && status) + gtk_window_maximize (GTK_WINDOW (pod->window)); + } + + { + gboolean status ; + if (psppire_conf_get_boolean (conf, "OutputWindowAction", "raise", + &status) && status) + gtk_window_present (GTK_WINDOW (pod->window)); + } +} -static PsppireOutputWindow *the_output_viewer = NULL; +static struct output_driver_class psppire_output_class = + { + .name = "PSPPIRE", + .submit = psppire_output_submit, + .handles_groups = true, + .handles_show = true, + }; +void +psppire_output_window_setup (void) +{ + struct psppire_output_driver *pod = XZALLOC (struct psppire_output_driver); + struct output_driver *d; -int viewer_length = 16; -int viewer_width = 59; + d = &pod->driver; + output_driver_init (d, &psppire_output_class, "PSPPIRE", + SETTINGS_DEVICE_UNFILTERED); + output_driver_register (d); +} + + /* Callback for the "delete" action (clicking the x on the top right hand corner of the window) */ @@ -125,9 +186,7 @@ on_delete (GtkWidget *w, GdkEvent *event, gpointer user_data) gtk_widget_destroy (GTK_WIDGET (ow)); - the_output_viewer = NULL; - - unlink (output_file_name()); + ow->driver->window = NULL; return FALSE; } @@ -139,121 +198,303 @@ cancel_urgency (GtkWindow *window, gpointer data) { gtk_window_set_urgency_hint (window, FALSE); } -/* Sets width and length according to the new size - of the output window */ + +static void psppire_output_window_print (PsppireOutputWindow *window); + + static void -on_textview_resize (GtkWidget *widget, - GtkAllocation *allocation, - gpointer user_data) +export_output (PsppireOutputWindow *window, struct string_map *options, + const char *format) { - PangoContext * context ; - PangoLayout *layout ; - PangoRectangle logical; - GtkStyle *style; - gint right_margin, left_margin; - GtkTextView *text_view = GTK_TEXT_VIEW (widget); + string_map_insert (options, "format", format); + psppire_output_view_export (window->view, options); +} - context = gtk_widget_create_pango_context (widget); - layout = pango_layout_new (context); - style = gtk_widget_get_style (widget); +struct file_types +{ + const gchar *label; + const gchar *ext; +}; - pango_layout_set_font_description (layout, style->font_desc); +enum + { + FT_AUTO = 0, + FT_SPV, + FT_PDF, + FT_HTML, + FT_ODT, + FT_TXT, + FT_ASCII, + FT_PS, + FT_CSV, + FT_PNG, + FT_SVG, + n_FT + }; + +static const struct file_types ft[n_FT] = { + {N_("Infer file type from extension"), NULL}, + {N_("SPSS Viewer (*.spv)"), ".spv"}, + {N_("PDF (*.pdf)"), ".pdf"}, + {N_("HTML (*.html)"), ".html"}, + {N_("OpenDocument (*.odt)"), ".odt"}, + {N_("Text (*.txt)"), ".txt"}, + {N_("Text [plain] (*.txt)"), ".txt"}, + {N_("PostScript (*.ps)"), ".ps"}, + {N_("Comma-Separated Values (*.csv)"), ".csv"}, + {N_("Portable Network Graphics (*.png)"), ".png"}, + {N_("Scalable Vector Graphics (*.svg)"), ".svg"} +}; - /* Find the width of one character. We can use any character, because - the textview has a monospaced font */ - pango_layout_set_text (layout, "M", 1); - pango_layout_get_extents (layout, NULL, &logical); +static void +on_combo_change (GtkFileChooser *chooser) +{ + gboolean sensitive = FALSE; + GtkWidget *combo = gtk_file_chooser_get_extra_widget (chooser); - left_margin = gtk_text_view_get_left_margin (text_view); - right_margin = gtk_text_view_get_right_margin (text_view); + int file_type = FT_AUTO; + gchar *fn = gtk_file_chooser_get_filename (chooser); - viewer_length = allocation->height / PANGO_PIXELS (logical.height); - viewer_width = (allocation->width - right_margin - left_margin) - / PANGO_PIXELS (logical.width); + if (combo && gtk_widget_get_realized (combo)) + file_type = gtk_combo_box_get_active (GTK_COMBO_BOX (combo)); - g_object_unref (G_OBJECT (layout)); - g_object_unref (G_OBJECT (context)); + if (fn != NULL && file_type == FT_AUTO) + { + for (gint i = 1 ; i < n_FT ; ++i) + { + if (g_str_has_suffix (fn, ft[i].ext)) + { + sensitive = TRUE; + break; + } + } + } + else + sensitive = (fn != NULL); + + g_free (fn); + + gtk_dialog_set_response_sensitive (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT, sensitive); } +static GtkListStore * +create_file_type_list (void) +{ + int i; + GtkTreeIter iter; + GtkListStore *list = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING); + + for (i = 0 ; i < n_FT ; ++i) + { + gtk_list_store_append (list, &iter); + gtk_list_store_set (list, &iter, + 0, gettext (ft[i].label), + 1, ft[i].ext, + -1); + } + + return list; +} + static void -psppire_output_window_init (PsppireOutputWindow *window) +psppire_output_window_export (PsppireOutputWindow *window) { - GtkBuilder *xml = builder_new ("output-viewer.ui"); + gint response; + GtkWidget *combo; + GtkListStore *list; - GtkWidget *box = gtk_vbox_new (FALSE, 0); + GtkFileChooser *chooser; - GtkWidget *sw = get_widget_assert (xml, "scrolledwindow1"); + GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Export Output"), + GTK_WINDOW (window), + GTK_FILE_CHOOSER_ACTION_SAVE, + _("Cancel"), GTK_RESPONSE_CANCEL, + _("Save"), GTK_RESPONSE_ACCEPT, + NULL); - GtkWidget *menubar = get_widget_assert (xml, "menubar1"); + g_object_set (dialog, "local-only", FALSE, NULL); - window->textview = get_widget_assert (xml, "output-viewer-textview"); + chooser = GTK_FILE_CHOOSER (dialog); + list = create_file_type_list (); - gtk_container_add (GTK_CONTAINER (window), box); + combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (list)); + + + { + /* Create text cell renderer */ + GtkCellRenderer *cell = gtk_cell_renderer_text_new(); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, FALSE); + + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), cell, "text", 0); + } + g_signal_connect_swapped (combo, "changed", G_CALLBACK (on_combo_change), chooser); - g_object_ref (menubar); - gtk_widget_unparent (menubar); + gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); - g_object_ref (sw); - gtk_widget_unparent (sw); + gtk_file_chooser_set_extra_widget (chooser, combo); + g_signal_connect (chooser, "selection-changed", G_CALLBACK (on_combo_change), NULL); + gtk_file_chooser_set_do_overwrite_confirmation (chooser, TRUE); - gtk_box_pack_start (GTK_BOX (box), menubar, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE, 0); + response = gtk_dialog_run (GTK_DIALOG (dialog)); + if (response == GTK_RESPONSE_ACCEPT) + { + gint file_type = gtk_combo_box_get_active (GTK_COMBO_BOX (combo)); + gchar *filename = gtk_file_chooser_get_filename (chooser); + struct string_map options; + + g_return_if_fail (filename); + + if (file_type == FT_AUTO) + { + /* If the "Infer file type from extension" option was chosen, + search for the respective type in the list. + (It's a O(n) search, but fortunately n is small). */ + gint i; + for (i = 1 ; i < n_FT ; ++i) + { + if (g_str_has_suffix (filename, ft[i].ext)) + { + file_type = i; + break; + } + } + } + else if (! g_str_has_suffix (filename, ft[file_type].ext)) + { + /* If an explicit document format was chosen, and if the chosen + filename does not already have that particular "extension", + then append it. + */ + + gchar *of = filename; + filename = g_strconcat (filename, ft[file_type].ext, NULL); + g_free (of); + } + + string_map_init (&options); + string_map_insert (&options, "output-file", filename); + + switch (file_type) + { + case FT_SPV: + export_output (window, &options, "spv"); + break; + case FT_PDF: + export_output (window, &options, "pdf"); + break; + case FT_HTML: + export_output (window, &options, "html"); + break; + case FT_ODT: + export_output (window, &options, "odt"); + break; + case FT_PS: + export_output (window, &options, "ps"); + break; + case FT_CSV: + export_output (window, &options, "csv"); + break; + case FT_PNG: + export_output (window, &options, "png"); + break; + case FT_SVG: + export_output (window, &options, "svg"); + break; + + case FT_TXT: + string_map_insert (&options, "box", "unicode"); + /* Fall through */ + + case FT_ASCII: + string_map_insert (&options, "charts", "none"); + export_output (window, &options, "txt"); + break; + default: + g_assert_not_reached (); + } + + string_map_destroy (&options); + + free (filename); + } + + gtk_widget_destroy (dialog); +} + +static void +psppire_output_window_init (PsppireOutputWindow *window) +{ + GtkBuilder *xml = builder_new ("output-window.ui"); + GtkApplication *app = GTK_APPLICATION (g_application_get_default()); + GtkWidget *box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_container_add (GTK_CONTAINER (window), box); - gtk_widget_show_all (box); + GtkWidget *paned = get_widget_assert (xml, "paned1"); - connect_help (xml); + window->dispose_has_run = FALSE; - window->buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (window->textview)); + window->view = psppire_output_view_new ( + GTK_LAYOUT (get_widget_assert (xml, "output")), + GTK_TREE_VIEW (get_widget_assert (xml, "overview"))); g_signal_connect (window, "focus-in-event", G_CALLBACK (cancel_urgency), NULL); - { - /* Output uses ascii characters for tabular material. - So we need a monospaced font otherwise it'll look silly */ - PangoFontDescription *font_desc = - pango_font_description_from_string ("monospace"); + GObject *menu = get_object_assert (xml, "output-window-menu", G_TYPE_MENU); + GtkWidget *menubar = gtk_menu_bar_new_from_model (G_MENU_MODEL (menu)); + gtk_box_pack_start (GTK_BOX (box), menubar, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (box), paned, TRUE, TRUE, 0); - gtk_widget_modify_font (window->textview, font_desc); - pango_font_description_free (font_desc); - } + gtk_menu_shell_append (GTK_MENU_SHELL (menubar), + create_windows_menu (GTK_WINDOW (window))); - g_signal_connect (window->textview, "size-allocate", - G_CALLBACK (on_textview_resize), NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (menubar), + create_help_menu (GTK_WINDOW (window))); - window->fp = NULL; + { + GSimpleAction *print = g_simple_action_new ("print", NULL); + g_signal_connect_swapped (print, "activate", G_CALLBACK (psppire_output_window_print), window); + g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (print)); - g_signal_connect (get_action_assert (xml,"help_about"), - "activate", - G_CALLBACK (about_new), - window); - g_signal_connect (get_action_assert (xml,"help_reference"), - "activate", - G_CALLBACK (reference_manual), - NULL); + const gchar *accels[2] = { "P", NULL}; + gtk_application_set_accels_for_action (app, + "win.print", + accels); + } - g_signal_connect (get_action_assert (xml,"windows_minimise-all"), - "activate", - G_CALLBACK (psppire_window_minimise_all), - NULL); { - GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER)); + GSimpleAction *export = g_simple_action_new ("export", NULL); + g_signal_connect_swapped (export, "activate", G_CALLBACK (psppire_output_window_export), window); + g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (export)); + } - PSPPIRE_WINDOW (window)->menu = - GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar1/windows_menuitem/windows_minimise-all")->parent); + { + GSimpleAction *select_all = g_simple_action_new ("select-all", NULL); + g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (select_all)); } + { + GSimpleAction *copy = g_simple_action_new ("copy", NULL); + g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (copy)); + + const gchar *accels[2] = { "C", NULL}; + gtk_application_set_accels_for_action (app, + "win.copy", + accels); + } + + g_object_unref (xml); g_signal_connect (window, "delete-event", @@ -265,112 +506,14 @@ GtkWidget* psppire_output_window_new (void) { return GTK_WIDGET (g_object_new (psppire_output_window_get_type (), - "filename", "Output", + /* TRANSLATORS: This will be part of a filename. Please avoid whitespace. */ + "filename", _("Output"), "description", _("Output Viewer"), NULL)); } -static void reload_viewer (PsppireOutputWindow *ow); - -void -psppire_output_window_reload (void) -{ - struct stat buf; - - /* If there is no output, then don't do anything */ - if (0 != stat (output_file_name(), &buf)) - return ; - - if ( NULL == the_output_viewer ) - { - the_output_viewer = PSPPIRE_OUTPUT_WINDOW (psppire_output_window_new ()); - gtk_widget_show (GTK_WIDGET (the_output_viewer)); - } - - reload_viewer (the_output_viewer); - -} - - static void -reload_viewer (PsppireOutputWindow *ow) +psppire_output_window_print (PsppireOutputWindow *window) { - GtkTextIter end_iter; - GtkTextMark *mark ; - - char *line = NULL; - - gboolean chars_inserted = FALSE; - - gtk_text_buffer_get_end_iter (ow->buffer, &end_iter); - - line = xrealloc (line, sizeof (char) * (viewer_width + 1)); - - mark = gtk_text_buffer_create_mark (ow->buffer, NULL, &end_iter, TRUE); - -#ifdef __CYGWIN__ - /* - Apparently Windoze is not capabale of writing to a file whilst - another (or the same) process is reading from it. Therefore, we - must close the file after reading it, and clear the entire buffer - before writing to it. - This will be slower for large buffers, but should work - (in so far as anything ever works on windows). - */ - { - GtkTextIter start_iter; - FILE *fp = fopen (output_file_name(), "r"); - if ( !fp) - { - g_critical ("Cannot open %s\n", output_file_name()); - return; - } - - /* Delete all the entire buffer */ - gtk_text_buffer_get_start_iter (ow->buffer, &start_iter); - gtk_text_buffer_delete (ow->buffer, &start_iter, &end_iter); - - - gtk_text_buffer_get_start_iter (ow->buffer, &start_iter); - /* Read in the next lot of text */ - while (fgets (line, viewer_width + 1, fp) != NULL) - { - chars_inserted = TRUE; - gtk_text_buffer_insert (ow->buffer, &start_iter, line, -1); - } - - fclose (fp); - } -#else - { - if ( ow->fp == NULL) - { - ow->fp = fopen (output_file_name(), "r"); - if ( ow->fp == NULL) - { - g_critical ("Cannot open %s\n", output_file_name()); - return; - } - } - - /* Read in the next lot of text */ - while (fgets (line, viewer_width + 1, ow->fp) != NULL) - { - chars_inserted = TRUE; - gtk_text_buffer_insert (ow->buffer, &end_iter, line, -1); - } - } -#endif - - /* Scroll to where the start of this lot of text begins */ - gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW (ow->textview), - mark, - 0.1, TRUE, 0.0, 0.0); - - - if ( chars_inserted ) - gtk_window_set_urgency_hint ( GTK_WINDOW (ow), TRUE); + psppire_output_view_print (window->view, GTK_WINDOW (window)); } - - -