X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-output-window.c;h=61f3bbdd28f70c28dc4fd54a910b21e08a0cce09;hb=a0bac37037e42c7c9b90cb702866b297dbcab79e;hp=4793b3b305b007f8d10480ebf01875df96d29467;hpb=37d5f592081a2ec8fa461c20c84087e8bf5dc560;p=pspp diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c index 4793b3b305..61f3bbdd28 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, 2011 Free Software Foundation + Copyright (C) 2008, 2009, 2010, 2011, 2012 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 @@ -35,13 +35,15 @@ #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 "helper.h" + #include #define _(msgid) gettext (msgid) #define N_(msgid) msgid @@ -59,6 +61,8 @@ 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) @@ -93,6 +97,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); } @@ -124,6 +131,8 @@ psppire_output_window_class_init (PsppireOutputWindowClass *class) parent_class = g_type_class_peek_parent (class); object_class->dispose = psppire_output_window_dispose; + + GTK_WIDGET_CLASS (object_class)->style_set = psppire_output_window_style_set; } @@ -162,13 +171,42 @@ 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, event->area.x, event->area.y, event->area.width, event->area.height); cairo_destroy (cr); @@ -223,22 +261,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); @@ -247,15 +290,14 @@ 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, "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); @@ -273,15 +315,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 @@ -374,9 +419,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) */ @@ -469,7 +513,7 @@ enum 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}, @@ -504,7 +548,7 @@ on_combo_change (GtkFileChooser *chooser) 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)) { @@ -558,7 +602,7 @@ create_file_type_list (void) 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, @@ -629,7 +673,7 @@ psppire_output_window_export (PsppireOutputWindow *window) if (file_type == FT_AUTO) { 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)) { @@ -692,6 +736,12 @@ enum { 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, @@ -854,6 +904,48 @@ on_select_all (PsppireOutputWindow *window) } +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) { @@ -863,6 +955,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"); @@ -888,12 +983,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; @@ -909,9 +1005,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, @@ -1000,10 +1093,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 ++; @@ -1013,8 +1112,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; } } @@ -1028,6 +1132,7 @@ begin_print (GtkPrintOperation *operation, window->print_item = 0; window->print_n_pages = 1; + window->paginated = FALSE; } static void @@ -1046,12 +1151,9 @@ draw_page (GtkPrintOperation *operation, 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; - } + 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++]); }