/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation
+ Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 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
#include "output/table-item.h"
#include "output/text-item.h"
#include "ui/gui/help-menu.h"
-#include "ui/gui/helper.h"
+#include "ui/gui/builder-wrapper.h"
#include "ui/gui/psppire-output-window.h"
-#include "gl/error.h"
#include "gl/tmpdir.h"
#include "gl/xalloc.h"
+#include "gl/c-xvasprintf.h"
+
+#include "helper.h"
#include <gettext.h>
#define _(msgid) gettext (msgid)
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)
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,
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);
}
static void
psppire_output_window_dispose (GObject *obj)
{
- PsppireOutputWindow *viewer = PSPPIRE_OUTPUT_WINDOW (obj);
+ PsppireOutputWindow *window = PSPPIRE_OUTPUT_WINDOW (obj);
size_t i;
- 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;
+ if (window->dispose_has_run)
+ return;
- if (viewer->print_settings != NULL)
- g_object_unref (viewer->print_settings);
+ window->dispose_has_run = TRUE;
+ for (i = 0; i < window->n_items; i++)
+ output_item_unref (window->items[i]);
+ free (window->items);
+ window->items = NULL;
+ window->n_items = window->allocated_items = 0;
+
+ if (window->print_settings != NULL)
+ g_object_unref (window->print_settings);
/* Chain up to the parent class */
G_OBJECT_CLASS (parent_class)->dispose (obj);
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)
-{
-}
\f
/* Output driver class. */
struct psppire_output_driver
{
struct output_driver driver;
- PsppireOutputWindow *viewer;
+ PsppireOutputWindow *window;
struct xr_driver *xr;
int font_height;
};
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 *window = 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 (window));
+
+ PangoFontDescription *font_desc;
+ char *font_name;
+
+ gchar *fgc =
+ gdk_color_to_string (&style->text[gtk_widget_get_state (GTK_WIDGET (widget))]);
+
+ string_map_replace (&window->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 (&window->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 (&window->render_opts, "emph-font", font_name);
+ g_free (font_name);
+ pango_font_description_free (font_desc);
+
+ xr_rendering_apply_options (r, &window->render_opts);
- cr = gdk_cairo_create (widget->window);
xr_rendering_draw (r, cr, event->area.x, event->area.y,
event->area.width, event->area.height);
cairo_destroy (cr);
const struct output_item *item)
{
struct psppire_output_driver *pod = psppire_output_cast (this);
- PsppireOutputWindow *viewer;
+ PsppireOutputWindow *window;
GtkWidget *drawing_area;
struct xr_rendering *r;
struct string title;
cairo_t *cr;
int tw, th;
- if (pod->viewer == NULL)
+ if (pod->window == NULL)
{
- pod->viewer = PSPPIRE_OUTPUT_WINDOW (psppire_output_window_new ());
- gtk_widget_show_all (GTK_WIDGET (pod->viewer));
- pod->viewer->driver = pod;
+ pod->window = PSPPIRE_OUTPUT_WINDOW (psppire_output_window_new ());
+ gtk_widget_show_all (GTK_WIDGET (pod->window));
+ pod->window->driver = pod;
}
- viewer = pod->viewer;
+ window = pod->window;
- if (viewer->n_items >= viewer->allocated_items)
- viewer->items = x2nrealloc (viewer->items, &viewer->allocated_items,
- sizeof *viewer->items);
- viewer->items[viewer->n_items++] = output_item_ref (item);
+ if (window->n_items >= window->allocated_items)
+ window->items = x2nrealloc (window->items, &window->allocated_items,
+ sizeof *window->items);
+ window->items[window->n_items++] = output_item_ref (item);
if (is_text_item (item))
{
if (type == TEXT_ITEM_COMMAND_CLOSE)
{
- viewer->in_command = false;
+ window->in_command = false;
return;
}
else if (text[0] == '\0')
return;
}
- cr = gdk_cairo_create (GTK_WIDGET (pod->viewer)->window);
+ cr = gdk_cairo_create (GTK_WIDGET (pod->window)->window);
if (pod->xr == NULL)
{
- const GtkStyle *style = gtk_widget_get_style (GTK_WIDGET (viewer));
- struct string_map options = STRING_MAP_INITIALIZER (options);
+ const GtkStyle *style = gtk_widget_get_style (GTK_WIDGET (window));
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 (window))]);
+
+ string_map_insert (&pod->window->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->window->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->window->render_opts, "emph-font", font_name);
g_free (font_name);
pango_font_description_free (font_desc);
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, "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->window->render_opts, "paper-size", "300x200000mm");
+ string_map_insert (&pod->window->render_opts, "left-margin", "0");
+ string_map_insert (&pod->window->render_opts, "right-margin", "0");
+ string_map_insert (&pod->window->render_opts, "top-margin", "0");
+ string_map_insert (&pod->window->render_opts, "bottom-margin", "0");
- pod->xr = xr_driver_create (cr, &options);
+ pod->xr = xr_driver_create (cr, &pod->window->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);
text_item_unref (text_item);
}
else
- pod->viewer->y += pod->font_height / 2;
+ pod->window->y += pod->font_height / 2;
r = xr_rendering_create (pod->xr, item, cr);
if (r == NULL)
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->window);
+
+ g_signal_connect (drawing_area, "expose_event",
+ G_CALLBACK (expose_event_callback), pod->window);
+
gtk_widget_set_size_request (drawing_area, tw, th);
- gtk_layout_put (pod->viewer->output, drawing_area, 0, pod->viewer->y);
+ gtk_layout_put (pod->window->output, drawing_area, 0, pod->window->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
- || !viewer->in_command)
+ || !window->in_command)
{
- store = GTK_TREE_STORE (gtk_tree_view_get_model (viewer->overview));
+ store = GTK_TREE_STORE (gtk_tree_view_get_model (window->overview));
ds_init_empty (&title);
if (is_text_item (item)
&& text_item_get_type (to_text_item (item)) == TEXT_ITEM_COMMAND_OPEN)
{
gtk_tree_store_append (store, &iter, NULL);
- viewer->cur_command = iter; /* XXX shouldn't save a GtkTreeIter */
- viewer->in_command = true;
+ window->cur_command = iter; /* XXX shouldn't save a GtkTreeIter */
+ window->in_command = true;
}
else
{
- GtkTreeIter *p = viewer->in_command ? &viewer->cur_command : NULL;
+ GtkTreeIter *p = window->in_command ? &window->cur_command : NULL;
gtk_tree_store_append (store, &iter, p);
}
gtk_tree_store_set (store, &iter,
COL_TITLE, ds_cstr (&title),
COL_ADDR, item,
- COL_Y, viewer->y,
+ COL_Y, window->y,
-1);
ds_destroy (&title);
path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &iter);
- gtk_tree_view_expand_row (viewer->overview, path, TRUE);
+ gtk_tree_view_expand_row (window->overview, path, TRUE);
gtk_tree_path_free (path);
}
- if (pod->viewer->max_width < tw)
- pod->viewer->max_width = tw;
- pod->viewer->y += th;
+ if (pod->window->max_width < tw)
+ pod->window->max_width = tw;
+ pod->window->y += th;
- gtk_layout_set_size (pod->viewer->output,
- pod->viewer->max_width, pod->viewer->y);
+ gtk_layout_set_size (pod->window->output,
+ pod->window->max_width, pod->window->y);
- gtk_window_set_urgency_hint (GTK_WINDOW (pod->viewer), TRUE);
+ gtk_window_set_urgency_hint (GTK_WINDOW (pod->window), TRUE);
done:
cairo_destroy (cr);
SETTINGS_DEVICE_UNFILTERED);
output_driver_register (d);
}
+
\f
-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) */
gtk_widget_destroy (GTK_WIDGET (ow));
- ow->driver->viewer = NULL;
+ ow->driver->window = NULL;
return FALSE;
}
n_FT
};
-#define N_EXTENTIONS (n_FT - 1)
+#define N_EXTENSIONS (n_FT - 1)
struct file_types ft[n_FT] = {
{N_("Infer file type from extension"), NULL},
if ( x != 0 )
sensitive = TRUE;
- for (i = 1 ; i < N_EXTENTIONS ; ++i)
+ for (i = 1 ; i < N_EXTENSIONS ; ++i)
{
if ( g_str_has_suffix (fn, ft[i].ext))
{
GtkTreeIter iter;
GtkListStore *list = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
- for (i = 0 ; i < 6 ; ++i)
+ for (i = 0 ; i < n_FT ; ++i)
{
gtk_list_store_append (list, &iter);
gtk_list_store_set (list, &iter,
if ( response == GTK_RESPONSE_ACCEPT )
{
- int file_type = gtk_combo_box_get_active (GTK_COMBO_BOX (combo));
- char *filename = gtk_file_chooser_get_filename (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);
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_EXTENTIONS ; ++i)
+ for (i = 1 ; i < N_EXTENSIONS ; ++i)
{
if ( g_str_has_suffix (filename, ft[i].ext))
{
}
}
}
-
+ 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);
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];
-};
-
-/* See the table at
- http://en.wikipedia.org/wiki/Box-drawing_characters */
-struct glyph_pair table[] = {
- {0x2500, "box[1010]"},
- {0x2501, "box[2020]"},
- {0x2502, "box[0101]"},
- {0x2503, "box[0202]"},
-
- {0x250C, "box[1100]"},
- {0x250D, "box[2100]"},
- {0x250E, "box[1200]"},
- {0x250F, "box[2200]"},
- {0x2510, "box[0110]"},
- {0x2511, "box[0110]"},
- {0x2512, "box[0210]"},
- {0x2513, "box[0220]"},
- {0x2514, "box[1001]"},
- {0x2515, "box[2001]"},
- {0x2516, "box[1002]"},
- {0x2517, "box[2002]"},
- {0x2518, "box[0011]"},
- {0x2519, "box[0021]"},
- {0x251A, "box[0012]"},
- {0x251B, "box[0022]"},
- {0x251C, "box[1101]"},
- {0x251D, "box[2101]"},
- {0x251E, "box[1102]"},
- {0x251F, "box[1201]"},
- {0x2520, "box[1202]"},
- {0x2521, "box[2102]"},
- {0x2522, "box[2201]"},
- {0x2523, "box[2202]"},
- {0x2524, "box[0111]"},
- {0x2525, "box[0121]"},
- {0x2526, "box[0112]"},
- {0x2527, "box[0211]"},
- {0x2528, "box[0212]"},
- {0x2529, "box[0122]"},
- {0x252A, "box[0221]"},
- {0x252B, "box[0222]"},
- {0x252C, "box[1110]"},
- {0x252D, "box[1120]"},
- {0x252E, "box[2110]"},
- {0x252F, "box[2120]"},
- {0x2530, "box[1210]"},
- {0x2531, "box[1220]"},
- {0x2532, "box[2210]"},
- {0x2533, "box[2220]"},
- {0x2534, "box[1011]"},
- {0x2535, "box[1021]"},
- {0x2536, "box[2011]"},
- {0x2537, "box[2021]"},
- {0x2538, "box[1012]"},
- {0x2539, "box[1022]"},
- {0x253A, "box[2012]"},
- {0x253B, "box[2022]"},
- {0x253C, "box[1111]"},
- {0x253D, "box[1121]"},
- {0x253E, "box[2111]"},
- {0x253F, "box[2121]"},
- {0x2540, "box[1112]"},
- {0x2541, "box[1211]"},
- {0x2542, "box[1212]"},
- {0x2543, "box[1122]"},
- {0x2544, "box[2112]"},
- {0x2545, "box[1221]"},
- {0x2546, "box[2211]"},
- {0x2547, "box[2122]"},
- {0x2548, "box[2221]"},
- {0x2549, "box[1222]"},
- {0x254A, "box[2212]"},
- {0x254B, "box[2222]"},
-
- {0x2574, "box[0010]"},
- {0x2575, "box[0001]"},
- {0x2576, "box[1000]"},
- {0x2577, "box[0100]"},
- {0x2578, "box[0020]"},
- {0x2579, "box[0002]"},
- {0x257A, "box[2000]"},
- {0x257B, "box[0200]"},
- {0x257C, "box[2010]"},
- {0x257D, "box[0201]"},
- {0x257E, "box[1020]"},
- {0x257F, "box[0102]"},
-};
-
-
-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,
if (path_search (dirname, sizeof dirname, NULL, NULL, true)
|| mkdtemp (dirname) == NULL)
{
- error (0, errno, _("failed to create temporary directory"));
+ msg_error (errno, _("failed to create temporary directory during clipboard operation"));
return;
}
filename = xasprintf ("%s/clip.tmp", dirname);
switch (info)
{
case SELECT_FMT_UTF8:
- utf8_box_chars (&options);
+ string_map_insert (&options, "box", "unicode");
/* fall-through */
case SELECT_FMT_TEXT:
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:
}
+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 *window = GTK_WIDGET (data);
+
+ copy_base_to_bg (dwg_area, window);
+}
+
+
+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)
{
GtkAction *copy_action;
GtkAction *select_all_action;
GtkTreeSelection *sel;
+ GtkTreeModel *model;
- xml = builder_new ("output-viewer.ui");
+ string_map_init (&window->render_opts);
+
+ xml = builder_new ("output-window.ui");
copy_action = get_action_assert (xml, "edit_copy");
select_all_action = get_action_assert (xml, "edit_select-all");
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"));
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;
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,
NULL));
}
-
\f
+
+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)
{
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);
}
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 ++;
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;
}
}
window->print_item = 0;
window->print_n_pages = 1;
+ window->paginated = FALSE;
}
static void
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++]);
}
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);
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);
projects / pspp / blobdiff