/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2008, 2009, 2010, 2011 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
#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_realize (GtkWidget *window);
+static void psppire_output_window_style_set (GtkWidget *window, GtkStyle *prev);
GType
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);
}
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);
parent_class = g_type_class_peek_parent (class);
object_class->dispose = psppire_output_window_dispose;
- GTK_WIDGET_CLASS (object_class)->realize = psppire_output_window_realize;
-}
-
-
-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. */
static void on_dwgarea_realize (GtkWidget *widget, gpointer data);
static gboolean
-expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data)
+draw_callback (GtkWidget *widget, cairo_t *cr, gpointer data)
{
+ PsppireOutputWindow *viewer = PSPPIRE_OUTPUT_WINDOW (data);
struct xr_rendering *r = g_object_get_data (G_OBJECT (widget), "rendering");
- cairo_t *cr;
+ const GtkStyle *style = gtk_widget_get_style (GTK_WIDGET (viewer));
- 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);
+ 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);
+ xr_rendering_draw_all (r, cr);
return TRUE;
}
+
static void
psppire_output_submit (struct output_driver *this,
const struct output_item *item)
return;
}
- cr = gdk_cairo_create (GTK_WIDGET (pod->viewer)->window);
+ cr = gdk_cairo_create (gtk_widget_get_window (GTK_WIDGET (pod->viewer)));
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;
/* 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 (&options, "foreground-color", fgc);
+
+ 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);
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->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);
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), NULL);
+ g_signal_connect (drawing_area, "draw",
+ G_CALLBACK (draw_callback), pod->viewer);
gtk_widget_set_size_request (drawing_area, tw, th);
gtk_layout_put (pod->viewer->output, drawing_area, 0, pod->viewer->y);
g_value_unset (&value);
vadj = gtk_layout_get_vadjustment (window->output);
- min = vadj->lower;
- max = vadj->upper - vadj->page_size;
+ min = gtk_adjustment_get_lower (vadj);
+ max = gtk_adjustment_get_upper (vadj) - gtk_adjustment_get_page_size (vadj);
if (y < min)
y = min;
else if (y > max)
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_EXTENSIONS ; ++i)
{
}
}
}
-
+ 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
};
+/* 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,
GtkSelectionData *selection_data,
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);
if ( g_file_get_contents (filename, &text, &length, NULL) )
{
- gtk_selection_data_set (selection_data, selection_data->target,
+ gtk_selection_data_set (selection_data, gtk_selection_data_get_target (selection_data),
8,
(const guchar *) text, length);
}
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);
}
}
copy_base_to_bg (dwg_area, viewer);
}
+
static void
-psppire_output_window_realize (GtkWidget *w)
+psppire_output_window_style_set (GtkWidget *w, GtkStyle *prev)
{
GtkWidget *op = GTK_WIDGET (PSPPIRE_OUTPUT_WINDOW (w)->output);
- copy_base_to_bg (op, w);
+ /* 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)->realize (w);
+ GTK_WIDGET_CLASS (parent_class)->style_set (w, prev);
}
static void
GtkAction *copy_action;
GtkAction *select_all_action;
GtkTreeSelection *sel;
+ GtkTreeModel *model;
+
+ string_map_init (&window->render_opts);
xml = builder_new ("output-viewer.ui");
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;
NULL);
{
+ GtkWidget *w;
GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER));
merge_help_menu (uim);
+ w = gtk_ui_manager_get_widget (uim,"/ui/menubar/windows_menuitem/windows_minimise-all");
+
PSPPIRE_WINDOW (window)->menu =
- GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows_menuitem/windows_minimise-all")->parent);
+ GTK_MENU_SHELL (gtk_widget_get_parent (w));
}
g_signal_connect_swapped (get_action_assert (xml, "file_export"), "activate",
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);
}
gint page_number,
PsppireOutputWindow *window)
{
- xr_driver_next_page (window->print_xrd, gtk_print_context_get_cairo_context (context));
+ 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