/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2008, 2009, 2010 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 <config.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkbox.h>
-#include "helper.h"
-
-#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/output-item.h>
-#include <output/table-item.h>
-#include <output/text-item.h>
-#include <output/tab.h>
+#include <errno.h>
+#include <gtk/gtk.h>
#include <stdlib.h>
-
-#include "help-menu.h"
-
-#include "psppire-output-window.h"
-
-
-#include "xalloc.h"
-
-#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/types.h>
#include <unistd.h>
+#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 <gettext.h>
#define _(msgid) gettext (msgid)
#define N_(msgid) 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;
- 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;
};
static struct output_driver_class psppire_output_class;
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));
- cr = gdk_cairo_create (widget->window);
- xr_rendering_draw (r, cr);
+ 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);
+
+ xr_rendering_draw (r, cr, event->area.x, event->area.y,
+ event->area.width, event->area.height);
cairo_destroy (cr);
return TRUE;
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, "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->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);
+ xr_rendering_measure (r, &font_width, &pod->font_height);
+ /* xr_rendering_destroy (r); */
+ text_item_unref (text_item);
}
+ else
+ 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);
}
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));
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;
}
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)
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");
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);
}
SELECT_FMT_NULL,
SELECT_FMT_TEXT,
SELECT_FMT_UTF8,
- SELECT_FMT_HTML
-};
-
-
-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]"}
+ SELECT_FMT_HTML,
+ SELECT_FMT_ODT
};
-
-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,
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);
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:
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:
+ string_map_insert (&options, "format", "odt");
break;
default:
+ g_warning ("unsupported clip target\n");
goto finish;
break;
}
if ( driver->class->flush)
driver->class->flush (driver);
+
+ /* Some drivers (eg: the odt one) don't write anything until they
+ are closed */
+ output_driver_destroy (driver);
+ driver = NULL;
+
if ( g_file_get_contents (filename, &text, &length, NULL) )
{
gtk_selection_data_set (selection_data, selection_data->target,
finish:
- output_driver_destroy (driver);
+ if (driver != NULL)
+ output_driver_destroy (driver);
+
g_free (text);
unlink (filename);
free (filename);
+ rmdir (dirname);
g_list_free (rows);
}
{ "UTF8_STRING", 0, SELECT_FMT_UTF8 },
{ "text/plain;charset=utf-8", 0, SELECT_FMT_UTF8 },
- { "text/html", 0, SELECT_FMT_HTML }
+ { "text/html", 0, SELECT_FMT_HTML },
+
+ { "application/vnd.oasis.opendocument.text", 0, SELECT_FMT_ODT }
};
static void
gtk_action_set_sensitive (copy_action, gtk_tree_selection_count_selected_rows (sel) > 0);
}
+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 *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)
{
GtkCellRenderer *renderer;
GtkBuilder *xml;
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");
gtk_action_set_sensitive (copy_action, FALSE);
g_signal_connect_swapped (copy_action, "activate", G_CALLBACK (on_copy), window);
+ g_signal_connect_swapped (select_all_action, "activate", G_CALLBACK (on_select_all), window);
+
gtk_widget_reparent (get_widget_assert (xml, "vbox1"), GTK_WIDGET (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"));
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,
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));
}
-
\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