X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-output-window.c;h=8a29fab18cbc1bf4ae38e87c35156687f6b7d736;hb=f90510564f1031696c6608ccd1bb88d7852fd3ce;hp=3aee31399df863a0502eac3527adb885d1124c48;hpb=fae7f48b9cd875ed466ed83862554282e2c17f3f;p=pspp diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c index 3aee31399d..8a29fab18c 100644 --- a/src/ui/gui/psppire-output-window.c +++ b/src/ui/gui/psppire-output-window.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2008, 2009, 2010 Free Software Foundation + Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013 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,33 +16,34 @@ #include -#include -#include -#include "helper.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include #include - -#include "help-menu.h" - -#include "psppire-output-window.h" - - -#include "xalloc.h" - -#include #include +#include #include +#include "libpspp/cast.h" +#include "libpspp/message.h" +#include "libpspp/string-map.h" +#include "output/cairo.h" +#include "output/chart-item.h" +#include "output/driver-provider.h" +#include "output/message-item.h" +#include "output/output-item.h" +#include "output/tab.h" +#include "output/table-item.h" +#include "output/text-item.h" +#include "ui/gui/help-menu.h" +#include "ui/gui/builder-wrapper.h" +#include "ui/gui/psppire-output-window.h" + +#include "gl/tmpdir.h" +#include "gl/xalloc.h" +#include "gl/c-xvasprintf.h" + +#include "helper.h" + #include #define _(msgid) gettext (msgid) #define N_(msgid) msgid @@ -55,11 +56,11 @@ enum N_COLS }; -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); +static void psppire_output_window_style_set (GtkWidget *window, GtkStyle *prev); + GType psppire_output_window_get_type (void) @@ -71,8 +72,8 @@ psppire_output_window_get_type (void) static const GTypeInfo psppire_output_window_info = { sizeof (PsppireOutputWindowClass), - (GBaseInitFunc) psppire_output_window_base_init, - (GBaseFinalizeFunc) psppire_output_window_base_finalize, + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, (GClassInitFunc)psppire_output_window_class_init, (GClassFinalizeFunc) NULL, NULL, @@ -94,6 +95,9 @@ static GObjectClass *parent_class; static void psppire_output_window_finalize (GObject *object) { + string_map_destroy (&PSPPIRE_OUTPUT_WINDOW(object)->render_opts); + + if (G_OBJECT_CLASS (parent_class)->finalize) (*G_OBJECT_CLASS (parent_class)->finalize) (object); } @@ -105,13 +109,18 @@ psppire_output_window_dispose (GObject *obj) PsppireOutputWindow *viewer = PSPPIRE_OUTPUT_WINDOW (obj); size_t i; + if (viewer->dispose_has_run) + return; + + viewer->dispose_has_run = TRUE; for (i = 0; i < viewer->n_items; i++) output_item_unref (viewer->items[i]); free (viewer->items); viewer->items = NULL; viewer->n_items = viewer->allocated_items = 0; - g_object_unref (viewer->print_settings); + if (viewer->print_settings != NULL) + g_object_unref (viewer->print_settings); /* Chain up to the parent class */ G_OBJECT_CLASS (parent_class)->dispose (obj); @@ -124,24 +133,12 @@ psppire_output_window_class_init (PsppireOutputWindowClass *class) parent_class = g_type_class_peek_parent (class); object_class->dispose = psppire_output_window_dispose; -} - - -static void -psppire_output_window_base_init (PsppireOutputWindowClass *class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (class); - + + GTK_WIDGET_CLASS (object_class)->style_set = psppire_output_window_style_set; object_class->finalize = psppire_output_window_finalize; } - -static void -psppire_output_window_base_finalize (PsppireOutputWindowClass *class, - gpointer class_data) -{ -} /* Output driver class. */ @@ -150,6 +147,7 @@ struct psppire_output_driver struct output_driver driver; PsppireOutputWindow *viewer; struct xr_driver *xr; + int font_height; }; static struct output_driver_class psppire_output_class; @@ -161,14 +159,44 @@ psppire_output_cast (struct output_driver *driver) return UP_CAST (driver, struct psppire_output_driver, driver); } +static void on_dwgarea_realize (GtkWidget *widget, gpointer data); + static gboolean expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data) { + PsppireOutputWindow *viewer = PSPPIRE_OUTPUT_WINDOW (data); struct xr_rendering *r = g_object_get_data (G_OBJECT (widget), "rendering"); - cairo_t *cr; + cairo_t *cr = gdk_cairo_create (widget->window); + + const GtkStyle *style = gtk_widget_get_style (GTK_WIDGET (viewer)); + + PangoFontDescription *font_desc; + char *font_name; + + gchar *fgc = + gdk_color_to_string (&style->text[gtk_widget_get_state (GTK_WIDGET (widget))]); + + string_map_replace (&viewer->render_opts, "foreground-color", fgc); + + free (fgc); + + /* Use GTK+ default font as proportional font. */ + font_name = pango_font_description_to_string (style->font_desc); + string_map_replace (&viewer->render_opts, "prop-font", font_name); + g_free (font_name); + + /* Derived emphasized font from proportional font. */ + font_desc = pango_font_description_copy (style->font_desc); + pango_font_description_set_style (font_desc, PANGO_STYLE_ITALIC); + font_name = pango_font_description_to_string (font_desc); + string_map_replace (&viewer->render_opts, "emph-font", font_name); + g_free (font_name); + pango_font_description_free (font_desc); + + xr_rendering_apply_options (r, &viewer->render_opts); - cr = gdk_cairo_create (widget->window); - xr_rendering_draw (r, cr); + xr_rendering_draw (r, cr, event->area.x, event->area.y, + event->area.width, event->area.height); cairo_destroy (cr); return TRUE; @@ -221,20 +249,27 @@ psppire_output_submit (struct output_driver *this, if (pod->xr == NULL) { const GtkStyle *style = gtk_widget_get_style (GTK_WIDGET (viewer)); - struct string_map options = STRING_MAP_INITIALIZER (options); + struct text_item *text_item; PangoFontDescription *font_desc; char *font_name; + int font_width; + + /* Set the widget's text color as the foreground color for the output driver */ + gchar *fgc = gdk_color_to_string (&style->text[gtk_widget_get_state (GTK_WIDGET (viewer))]); + + string_map_insert (&pod->viewer->render_opts, "foreground-color", fgc); + g_free (fgc); /* Use GTK+ default font as proportional font. */ font_name = pango_font_description_to_string (style->font_desc); - string_map_insert (&options, "prop-font", font_name); + string_map_insert (&pod->viewer->render_opts, "prop-font", font_name); g_free (font_name); /* Derived emphasized font from proportional font. */ font_desc = pango_font_description_copy (style->font_desc); pango_font_description_set_style (font_desc, PANGO_STYLE_ITALIC); font_name = pango_font_description_to_string (font_desc); - string_map_insert (&options, "emph-font", font_name); + string_map_insert (&pod->viewer->render_opts, "emph-font", font_name); g_free (font_name); pango_font_description_free (font_desc); @@ -243,17 +278,23 @@ psppire_output_submit (struct output_driver *this, scrolling only. (The length should not be increased very much because it is already close enough to INT_MAX when expressed as thousands of a point.) */ - string_map_insert (&options, "paper-size", "300x200000mm"); - string_map_insert (&options, "headers", "off"); - string_map_insert (&options, "left-margin", "0"); - string_map_insert (&options, "right-margin", "0"); - string_map_insert (&options, "top-margin", "0"); - string_map_insert (&options, "bottom-margin", "0"); + string_map_insert (&pod->viewer->render_opts, "paper-size", "300x200000mm"); + string_map_insert (&pod->viewer->render_opts, "left-margin", "0"); + string_map_insert (&pod->viewer->render_opts, "right-margin", "0"); + string_map_insert (&pod->viewer->render_opts, "top-margin", "0"); + string_map_insert (&pod->viewer->render_opts, "bottom-margin", "0"); - pod->xr = xr_driver_create (cr, &options); + pod->xr = xr_driver_create (cr, &pod->viewer->render_opts); - string_map_destroy (&options); + + text_item = text_item_create (TEXT_ITEM_PARAGRAPH, "X"); + r = xr_rendering_create (pod->xr, text_item_super (text_item), cr); + xr_rendering_measure (r, &font_width, &pod->font_height); + /* xr_rendering_destroy (r); */ + text_item_unref (text_item); } + else + pod->viewer->y += pod->font_height / 2; r = xr_rendering_create (pod->xr, item, cr); if (r == NULL) @@ -262,15 +303,18 @@ psppire_output_submit (struct output_driver *this, xr_rendering_measure (r, &tw, &th); drawing_area = gtk_drawing_area_new (); - gtk_widget_modify_bg ( - GTK_WIDGET (drawing_area), GTK_STATE_NORMAL, - >k_widget_get_style (drawing_area)->base[GTK_STATE_NORMAL]); + g_object_set_data (G_OBJECT (drawing_area), "rendering", r); + g_signal_connect (drawing_area, "realize", + G_CALLBACK (on_dwgarea_realize), pod->viewer); + + g_signal_connect (drawing_area, "expose_event", + G_CALLBACK (expose_event_callback), pod->viewer); + gtk_widget_set_size_request (drawing_area, tw, th); gtk_layout_put (pod->viewer->output, drawing_area, 0, pod->viewer->y); + gtk_widget_show (drawing_area); - g_signal_connect (G_OBJECT (drawing_area), "expose_event", - G_CALLBACK (expose_event_callback), NULL); if (!is_text_item (item) || text_item_get_type (to_text_item (item)) != TEXT_ITEM_SYNTAX @@ -295,6 +339,13 @@ psppire_output_submit (struct output_driver *this, ds_clear (&title); if (is_text_item (item)) ds_put_cstr (&title, text_item_get_text (to_text_item (item))); + else if (is_message_item (item)) + { + const struct message_item *msg_item = to_message_item (item); + const struct msg *msg = message_item_get_msg (msg_item); + ds_put_format (&title, "%s: %s", _("Message"), + msg_severity_to_string (msg->severity)); + } else if (is_table_item (item)) { const char *caption = table_item_get_caption (to_table_item (item)); @@ -356,9 +407,8 @@ psppire_output_window_setup (void) SETTINGS_DEVICE_UNFILTERED); output_driver_register (d); } + -int viewer_length = 16; -int viewer_width = 59; /* Callback for the "delete" action (clicking the x on the top right hand corner of the window) */ @@ -415,17 +465,6 @@ on_row_activate (GtkTreeView *overview, static void psppire_output_window_print (PsppireOutputWindow *window); -static GtkFileFilter * -add_filter (GtkFileChooser *chooser, const char *name, const char *pattern) -{ - GtkFileFilter *filter = gtk_file_filter_new (); - g_object_ref_sink (G_OBJECT (filter)); - gtk_file_filter_set_name (filter, name); - gtk_file_filter_add_pattern (filter, pattern); - gtk_file_chooser_add_filter (chooser, filter); - return filter; -} - static void export_output (PsppireOutputWindow *window, struct string_map *options, const char *format) @@ -443,62 +482,231 @@ export_output (PsppireOutputWindow *window, struct string_map *options, output_driver_destroy (driver); } + +struct file_types +{ + const gchar *label; + const gchar *ext; +}; + +enum + { + FT_AUTO = 0, + FT_PDF, + FT_HTML, + FT_ODT, + FT_TXT, + FT_PS, + FT_CSV, + n_FT + }; + +#define N_EXTENSIONS (n_FT - 1) + +struct file_types ft[n_FT] = { + {N_("Infer file type from extension"), NULL}, + {N_("PDF (*.pdf)"), ".pdf"}, + {N_("HTML (*.html)"), ".html"}, + {N_("OpenDocument (*.odt)"), ".odt"}, + {N_("Text (*.txt)"), ".txt"}, + {N_("PostScript (*.ps)"), ".ps"}, + {N_("Comma-Separated Values (*.csv)"), ".csv"} +}; + + +static void +on_combo_change (GtkFileChooser *chooser) +{ + gboolean sensitive = FALSE; + GtkWidget *combo = gtk_file_chooser_get_extra_widget (chooser); + + int x = 0; + gchar *fn = gtk_file_chooser_get_filename (chooser); + + if (combo && gtk_widget_get_realized (combo)) + x = gtk_combo_box_get_active (GTK_COMBO_BOX (combo)); + + if (fn == NULL) + { + sensitive = FALSE; + } + else + { + gint i; + if ( x != 0 ) + sensitive = TRUE; + + for (i = 1 ; i < N_EXTENSIONS ; ++i) + { + if ( g_str_has_suffix (fn, ft[i].ext)) + { + sensitive = TRUE; + break; + } + } + } + + g_free (fn); + + gtk_dialog_set_response_sensitive (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT, sensitive); +} + + +static void +on_file_chooser_change (GObject *w, GParamSpec *pspec, gpointer data) +{ + + GtkFileChooser *chooser = data; + const gchar *name = g_param_spec_get_name (pspec); + + if ( ! gtk_widget_get_realized (GTK_WIDGET (chooser))) + return; + + /* Ignore this one. It causes recursion. */ + if ( 0 == strcmp ("tooltip-text", name)) + return; + + on_combo_change (chooser); +} + + +/* Recursively descend all the children of W, connecting + to their "notify" signal */ +static void +iterate_widgets (GtkWidget *w, gpointer data) +{ + if ( GTK_IS_CONTAINER (w)) + gtk_container_forall (GTK_CONTAINER (w), iterate_widgets, data); + else + g_signal_connect (w, "notify", G_CALLBACK (on_file_chooser_change), data); +} + + + +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_export (PsppireOutputWindow *window) { gint response; + GtkWidget *combo; + GtkListStore *list; - GtkFileFilter *pdf_filter; - GtkFileFilter *html_filter; - GtkFileFilter *odt_filter; - GtkFileFilter *txt_filter; - GtkFileFilter *ps_filter; - GtkFileFilter *csv_filter; GtkFileChooser *chooser; - GtkWidget *dialog; - - dialog = gtk_file_chooser_dialog_new (_("Export Output"), + + GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Export Output"), GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); + + g_object_set (dialog, "local-only", FALSE, NULL); + chooser = GTK_FILE_CHOOSER (dialog); - pdf_filter = add_filter (chooser, _("PDF Files (*.pdf)"), "*.pdf"); - html_filter = add_filter (chooser, _("HTML Files (*.html)"), "*.html"); - odt_filter = add_filter (chooser, _("OpenDocument Files (*.odt)"), "*.odt"); - txt_filter = add_filter (chooser, _("Text Files (*.txt)"), "*.txt"); - ps_filter = add_filter (chooser, _("PostScript Files (*.ps)"), "*.ps"); - csv_filter = add_filter (chooser, _("Comma-Separated Value Files (*.csv)"), - "*.csv"); + list = create_file_type_list (); + + 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); + + gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); + + gtk_file_chooser_set_extra_widget (chooser, combo); + + /* This kludge is necessary because there is no signal to tell us + when the candidate filename of a GtkFileChooser has changed */ + gtk_container_forall (GTK_CONTAINER (dialog), iterate_widgets, dialog); + gtk_file_chooser_set_do_overwrite_confirmation (chooser, TRUE); - gtk_file_chooser_set_filter (chooser, pdf_filter); response = gtk_dialog_run (GTK_DIALOG (dialog)); if ( response == GTK_RESPONSE_ACCEPT ) { - char *filename = gtk_file_chooser_get_filename (chooser); - GtkFileFilter *filter = gtk_file_chooser_get_filter (chooser); + 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); - g_return_if_fail (filter); + 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_EXTENSIONS ; ++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); - if (filter == pdf_filter) - { + + switch (file_type) + { + case FT_PDF: export_output (window, &options, "pdf"); - } - else if (filter == html_filter) - export_output (window, &options, "html"); - else if (filter == odt_filter) - export_output (window, &options, "odt"); - else if (filter == txt_filter) - { + 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_TXT: string_map_insert (&options, "headers", "false"); string_map_insert (&options, "paginate", "false"); string_map_insert (&options, "squeeze", "true"); @@ -507,23 +715,16 @@ psppire_output_window_export (PsppireOutputWindow *window) string_map_insert (&options, "top-margin", "0"); string_map_insert (&options, "bottom-margin", "0"); export_output (window, &options, "txt"); - } - else if (filter == ps_filter) - export_output (window, &options, "ps"); - else if (filter == csv_filter) - export_output (window, &options, "csv"); - else - g_return_if_reached (); + break; + default: + g_assert_not_reached (); + } + + string_map_destroy (&options); free (filename); } - g_object_unref (G_OBJECT (pdf_filter)); - g_object_unref (G_OBJECT (html_filter)); - g_object_unref (G_OBJECT (txt_filter)); - g_object_unref (G_OBJECT (ps_filter)); - g_object_unref (G_OBJECT (csv_filter)); - gtk_widget_destroy (dialog); } @@ -536,57 +737,11 @@ enum { SELECT_FMT_ODT }; - -static void -insert_glyph (struct string_map *map, const char *opt, gunichar glyph) -{ - char s[6] = {0,0,0,0,0,0}; - - g_unichar_to_utf8 (glyph, s); - string_map_insert (map, opt, s); -} - -struct glyph_pair -{ - gunichar glyph; - char opt[10]; -}; - -struct glyph_pair table[] = { - {0x250C, "box[1100]"}, - {0x2518, "box[0011]"}, - {0x2510, "box[0110]"}, - {0x2514, "box[1001]"}, - {0x2502, "box[0101]"}, - {0x2500, "box[1010]"}, - {0x2534, "box[1011]"}, - {0x252C, "box[1110]"}, - {0x2501, "box[2020]"}, - {0x2503, "box[0202]"}, - {0x253F, "box[2121]"}, - {0x2542, "box[1212]"}, - {0x254B, "box[2222]"}, - {0x2525, "box[0121]"}, - {0x2530, "box[1210]"}, - {0x2538, "box[1012]"}, - {0x251D, "box[2101]"}, - {0x2537, "box[2021]"}, - {0x252F, "box[2120]"} -}; - - -static void -utf8_box_chars (struct string_map *map) -{ - int i; - for (i = 0; i < sizeof (table) / sizeof (table[0]); ++i) - { - const struct glyph_pair *p = &table[i]; - insert_glyph (map, p->opt, p->glyph); - } -} - - +/* GNU Hurd doesn't have PATH_MAX. Use a fallback. + Temporary directory names are usually not that long. */ +#ifndef PATH_MAX +# define PATH_MAX 1024 +#endif static void clipboard_get_cb (GtkClipboard *clipboard, @@ -599,7 +754,7 @@ clipboard_get_cb (GtkClipboard *clipboard, gsize length; gchar *text = NULL; struct output_driver *driver = NULL; - char *filename = NULL; + char dirname[PATH_MAX], *filename; struct string_map options; GtkTreeSelection *sel = gtk_tree_view_get_selection (window->overview); @@ -611,14 +766,21 @@ clipboard_get_cb (GtkClipboard *clipboard, if ( n == NULL) return; + if (path_search (dirname, sizeof dirname, NULL, NULL, true) + || mkdtemp (dirname) == NULL) + { + msg_error (errno, _("failed to create temporary directory during clipboard operation")); + return; + } + filename = xasprintf ("%s/clip.tmp", dirname); + string_map_init (&options); - filename = tempnam (NULL, NULL); string_map_insert (&options, "output-file", filename); switch (info) { case SELECT_FMT_UTF8: - utf8_box_chars (&options); + string_map_insert (&options, "box", "unicode"); /* fall-through */ case SELECT_FMT_TEXT: @@ -627,6 +789,8 @@ clipboard_get_cb (GtkClipboard *clipboard, case SELECT_FMT_HTML: string_map_insert (&options, "format", "html"); + string_map_insert (&options, "borders", "false"); + string_map_insert (&options, "css", "false"); break; case SELECT_FMT_ODT: @@ -634,7 +798,7 @@ clipboard_get_cb (GtkClipboard *clipboard, break; default: - g_print ("unsupportted clip target\n"); + g_warning ("unsupported clip target\n"); goto finish; break; } @@ -682,6 +846,7 @@ clipboard_get_cb (GtkClipboard *clipboard, unlink (filename); free (filename); + rmdir (dirname); g_list_free (rows); } @@ -735,10 +900,53 @@ static void on_select_all (PsppireOutputWindow *window) { GtkTreeSelection *sel = gtk_tree_view_get_selection (window->overview); + gtk_tree_view_expand_all (window->overview); gtk_tree_selection_select_all (sel); } +static void +copy_base_to_bg (GtkWidget *dest, GtkWidget *src) +{ + int i; + for (i = 0; i < 5; ++i) + { + GdkColor *col = >k_widget_get_style (src)->base[i]; + gtk_widget_modify_bg (dest, i, col); + + col = >k_widget_get_style (src)->text[i]; + gtk_widget_modify_fg (dest, i, col); + } +} + +static void +on_dwgarea_realize (GtkWidget *dwg_area, gpointer data) +{ + GtkWidget *viewer = GTK_WIDGET (data); + + copy_base_to_bg (dwg_area, viewer); +} + + +static void +psppire_output_window_style_set (GtkWidget *w, GtkStyle *prev) +{ + GtkWidget *op = GTK_WIDGET (PSPPIRE_OUTPUT_WINDOW (w)->output); + + /* Copy the base style from the parent widget to the container and + all its children. + We do this, because the container's primary purpose is to + display text. This way psppire appears to follow the chosen + gnome theme. + */ + copy_base_to_bg (op, w); + gtk_container_foreach (GTK_CONTAINER (op), (GtkCallback) copy_base_to_bg, + PSPPIRE_OUTPUT_WINDOW (w)->output); + + /* Chain up to the parent class */ + GTK_WIDGET_CLASS (parent_class)->style_set (w, prev); +} + static void psppire_output_window_init (PsppireOutputWindow *window) { @@ -748,6 +956,9 @@ psppire_output_window_init (PsppireOutputWindow *window) GtkAction *copy_action; GtkAction *select_all_action; GtkTreeSelection *sel; + GtkTreeModel *model; + + string_map_init (&window->render_opts); xml = builder_new ("output-viewer.ui"); @@ -764,6 +975,8 @@ psppire_output_window_init (PsppireOutputWindow *window) window->output = GTK_LAYOUT (get_widget_assert (xml, "output")); window->y = 0; + window->print_settings = NULL; + window->dispose_has_run = FALSE; window->overview = GTK_TREE_VIEW (get_widget_assert (xml, "overview")); @@ -773,12 +986,13 @@ psppire_output_window_init (PsppireOutputWindow *window) g_signal_connect (sel, "changed", G_CALLBACK (on_selection_change), copy_action); - gtk_tree_view_set_model (window->overview, - GTK_TREE_MODEL (gtk_tree_store_new ( + model = GTK_TREE_MODEL (gtk_tree_store_new ( N_COLS, G_TYPE_STRING, /* COL_TITLE */ G_TYPE_POINTER, /* COL_ADDR */ - G_TYPE_LONG))); /* COL_Y */ + G_TYPE_LONG)); /* COL_Y */ + gtk_tree_view_set_model (window->overview, model); + g_object_unref (model); window->in_command = false; @@ -794,9 +1008,6 @@ psppire_output_window_init (PsppireOutputWindow *window) g_signal_connect (GTK_TREE_VIEW (window->overview), "row-activated", G_CALLBACK (on_row_activate), window); - gtk_widget_modify_bg (GTK_WIDGET (window->output), GTK_STATE_NORMAL, - >k_widget_get_style (GTK_WIDGET (window->output))->base[GTK_STATE_NORMAL]); - connect_help (xml); g_signal_connect (window, @@ -835,13 +1046,33 @@ GtkWidget* psppire_output_window_new (void) { return GTK_WIDGET (g_object_new (psppire_output_window_get_type (), - "filename", "Output", + /* TRANSLATORS: This will form a filename. Please avoid whitespace. */ + "filename", _("Output"), "description", _("Output Viewer"), NULL)); } - + +static cairo_t * +get_cairo_context_from_print_context (GtkPrintContext *context) +{ + cairo_t *cr = gtk_print_context_get_cairo_context (context); + + /* + For all platforms except windows, gtk_print_context_get_dpi_[xy] returns 72. + Windows returns 600. + */ + double xres = gtk_print_context_get_dpi_x (context); + double yres = gtk_print_context_get_dpi_y (context); + + /* This means that the cairo context now has its dimensions in Points */ + cairo_scale (cr, xres / 72.0, yres / 72.0); + + return cr; +} + + static void create_xr_print_driver (GtkPrintContext *context, PsppireOutputWindow *window) { @@ -863,18 +1094,17 @@ create_xr_print_driver (GtkPrintContext *context, PsppireOutputWindow *window) string_map_init (&options); string_map_insert_nocopy (&options, xstrdup ("paper-size"), - xasprintf("%.2fx%.2fmm", width, height)); + c_xasprintf("%.2fx%.2fmm", width, height)); string_map_insert_nocopy (&options, xstrdup ("left-margin"), - xasprintf ("%.2fmm", left_margin)); + c_xasprintf ("%.2fmm", left_margin)); string_map_insert_nocopy (&options, xstrdup ("right-margin"), - xasprintf ("%.2fmm", right_margin)); + c_xasprintf ("%.2fmm", right_margin)); string_map_insert_nocopy (&options, xstrdup ("top-margin"), - xasprintf ("%.2fmm", top_margin)); + c_xasprintf ("%.2fmm", top_margin)); string_map_insert_nocopy (&options, xstrdup ("bottom-margin"), - xasprintf ("%.2fmm", bottom_margin)); + c_xasprintf ("%.2fmm", bottom_margin)); - window->print_xrd = - xr_driver_create (gtk_print_context_get_cairo_context (context), &options); + window->print_xrd = xr_driver_create (get_cairo_context_from_print_context (context), &options); string_map_destroy (&options); } @@ -884,10 +1114,16 @@ paginate (GtkPrintOperation *operation, GtkPrintContext *context, PsppireOutputWindow *window) { - if ( window->print_item < window->n_items ) + if (window->paginated) + { + /* Sometimes GTK+ emits this signal again even after pagination is + complete. Don't let that screw up printing. */ + return TRUE; + } + else if ( window->print_item < window->n_items ) { xr_driver_output_item (window->print_xrd, window->items[window->print_item++]); - if (xr_driver_need_new_page (window->print_xrd)) + while (xr_driver_need_new_page (window->print_xrd)) { xr_driver_next_page (window->print_xrd, NULL); window->print_n_pages ++; @@ -897,8 +1133,13 @@ paginate (GtkPrintOperation *operation, else { gtk_print_operation_set_n_pages (operation, window->print_n_pages); - window->print_item = 0; + + /* Re-create the driver to do the real printing. */ + xr_driver_destroy (window->print_xrd); create_xr_print_driver (context, window); + window->print_item = 0; + window->paginated = TRUE; + return TRUE; } } @@ -912,6 +1153,7 @@ begin_print (GtkPrintOperation *operation, window->print_item = 0; window->print_n_pages = 1; + window->paginated = FALSE; } static void @@ -929,13 +1171,10 @@ draw_page (GtkPrintOperation *operation, gint page_number, PsppireOutputWindow *window) { - xr_driver_next_page (window->print_xrd, gtk_print_context_get_cairo_context (context)); - while ( window->print_item < window->n_items) - { - xr_driver_output_item (window->print_xrd, window->items [window->print_item++]); - if ( xr_driver_need_new_page (window->print_xrd) ) - break; - } + xr_driver_next_page (window->print_xrd, get_cairo_context_from_print_context (context)); + while (!xr_driver_need_new_page (window->print_xrd) + && window->print_item < window->n_items) + xr_driver_output_item (window->print_xrd, window->items [window->print_item++]); } @@ -950,9 +1189,9 @@ psppire_output_window_print (PsppireOutputWindow *window) 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, "paginate", G_CALLBACK (paginate), window); - g_signal_connect (print, "draw_page", G_CALLBACK (draw_page), window); + g_signal_connect (print, "end_print", G_CALLBACK (end_print), window); + g_signal_connect (print, "paginate", G_CALLBACK (paginate), window); + g_signal_connect (print, "draw_page", G_CALLBACK (draw_page), window); res = gtk_print_operation_run (print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, GTK_WINDOW (window), NULL); @@ -962,7 +1201,6 @@ psppire_output_window_print (PsppireOutputWindow *window) 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);