#include "output/group-item.h"
#include "output/message-item.h"
#include "output/output-item.h"
+#include "output/output-item-provider.h"
#include "output/table-item.h"
#include "output/text-item.h"
struct string_map render_opts;
GtkTreeView *overview;
- GtkTreeIter cur_command;
- bool in_command;
+ GtkTreePath *cur_group;
GtkWidget *toplevel;
}
static void
-create_xr (struct psppire_output_view *view)
+get_xr_options (struct psppire_output_view *view, struct string_map *options)
{
- struct text_item *text_item;
- PangoFontDescription *font_desc;
- struct xr_rendering *r;
- char *font_name;
- int font_width;
- cairo_t *cr;
- gchar *fgc;
+ string_map_clear (options);
- GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET (view->output));
+ GtkStyleContext *context
+ = gtk_widget_get_style_context (GTK_WIDGET (view->output));
GtkStateFlags state = gtk_widget_get_state_flags (GTK_WIDGET (view->output));
- GdkRGBA *fg_color;
-
- gtk_style_context_get (context, state,
- "font", &font_desc, "color", &fg_color, NULL);
-
- cr = gdk_cairo_create (gtk_widget_get_window (GTK_WIDGET (view->output)));
-
- /* Set the widget's text color as the foreground color for the output driver */
- /* gdk_rgba_to_string() would be perfect, but xr's parse_color does not */
- /* understand the rgb(255,128,33) format. Therefore we do it ourself. */
- fgc = xasprintf("#%4x%4x%4x",(int)(fg_color->red*0xffff),
- (int)(fg_color->green*0xffff),(int)(fg_color->blue*0xffff));
- string_map_insert (&view->render_opts, "foreground-color", fgc);
- g_free (fgc);
- gdk_rgba_free (fg_color);
/* Use GTK+ default font as proportional font. */
- font_name = pango_font_description_to_string (font_desc);
- string_map_insert (&view->render_opts, "prop-font", font_name);
+ PangoFontDescription *font_desc;
+ gtk_style_context_get (context, state, "font", &font_desc, NULL);
+ char *font_name = pango_font_description_to_string (font_desc);
+ string_map_insert (options, "prop-font", font_name);
g_free (font_name);
/* Derived emphasized font from proportional font. */
pango_font_description_set_style (font_desc, PANGO_STYLE_ITALIC);
font_name = pango_font_description_to_string (font_desc);
- string_map_insert (&view->render_opts, "emph-font", font_name);
+ string_map_insert (options, "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_nocopy (&view->render_opts, xstrdup ("paper-size"),
+ string_map_insert_nocopy (options, xstrdup ("paper-size"),
xasprintf ("%dx1000000pt", view->render_width));
- string_map_insert (&view->render_opts, "left-margin", "0");
- string_map_insert (&view->render_opts, "right-margin", "0");
- string_map_insert (&view->render_opts, "top-margin", "0");
- string_map_insert (&view->render_opts, "bottom-margin", "0");
+ 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");
+}
- view->xr = xr_driver_create (cr, &view->render_opts);
+static void
+create_xr (struct psppire_output_view *view)
+{
+ get_xr_options (view, &view->render_opts);
+
+ struct string_map options;
+ string_map_clone (&options, &view->render_opts);
+ cairo_t *cr = gdk_cairo_create (
+ gtk_widget_get_window (GTK_WIDGET (view->output)));
+ view->xr = xr_driver_create (cr, &options);
+ string_map_destroy (&options);
- text_item = text_item_create (TEXT_ITEM_PARAGRAPH, "X");
- r = xr_rendering_create (view->xr, text_item_super (text_item), cr);
- xr_rendering_measure (r, &font_width, &view->font_height);
+ struct text_item *text_item = text_item_create (TEXT_ITEM_LOG, "X");
+ struct xr_rendering *r = xr_rendering_create (
+ view->xr, text_item_super (text_item), cr);
+ xr_rendering_measure (r, NULL, &view->font_height);
text_item_unref (text_item);
cairo_destroy (cr);
if (view->y > 0)
view->y += view->font_height / 2;
+ if (is_group_open_item (item->item))
+ continue;
+
r = xr_rendering_create (view->xr, item->item, cr);
if (r == NULL)
{
view->y += th;
}
- gtk_layout_set_size (view->output, view->max_width, view->y);
+ gtk_layout_set_size (view->output,
+ view->max_width + view->font_height,
+ view->y + view->font_height);
cairo_destroy (cr);
}
{
struct output_view_item *view_item;
GtkWidget *drawing_area;
- struct xr_rendering *r;
struct string name;
- GtkTreeStore *store;
cairo_t *cr = NULL;
- GtkTreePath *path;
- GtkTreeIter iter;
int tw, th;
if (is_group_close_item (item))
{
- if (output_get_group_level () == 0)
+ if (view->cur_group)
{
- view->in_command = false;
- return;
+ if (!gtk_tree_path_up (view->cur_group))
+ {
+ gtk_tree_path_free (view->cur_group);
+ view->cur_group = NULL;
+ }
}
+ return;
}
else if (is_text_item (item))
{
view_item->item = output_item_ref (item);
view_item->drawing_area = NULL;
- if (gtk_widget_get_window (GTK_WIDGET (view->output)))
+ if (is_group_open_item (item))
+ tw = th = 0;
+ else if (gtk_widget_get_window (GTK_WIDGET (view->output)))
{
view_item->drawing_area = drawing_area = gtk_drawing_area_new ();
if (view->y > 0)
view->y += view->font_height / 2;
- r = xr_rendering_create (view->xr, item, cr);
+ struct xr_rendering *r = xr_rendering_create (view->xr, item, cr);
if (r == NULL)
goto done;
else
tw = th = 0;
- if (view->overview
- && (!is_text_item (item)
- || text_item_get_type (to_text_item (item)) != TEXT_ITEM_SYNTAX
- || !view->in_command))
+ if (view->overview)
{
- store = GTK_TREE_STORE (gtk_tree_view_get_model (view->overview));
+ GtkTreeStore *store = GTK_TREE_STORE (
+ gtk_tree_view_get_model (view->overview));
ds_init_empty (&name);
- if (is_group_open_item (item) && output_get_group_level () == 1)
- {
- gtk_tree_store_append (store, &iter, NULL);
- view->cur_command = iter; /* XXX shouldn't save a GtkTreeIter */
- view->in_command = true;
- }
+
+ /* Create a new node in the tree and puts a reference to it in 'iter'. */
+ GtkTreeIter iter;
+ GtkTreeIter parent;
+ if (view->cur_group
+ && gtk_tree_path_get_depth (view->cur_group) > 0
+ && gtk_tree_model_get_iter (GTK_TREE_MODEL (store),
+ &parent, view->cur_group))
+ gtk_tree_store_append (store, &iter, &parent);
else
+ gtk_tree_store_append (store, &iter, NULL);
+
+ if (is_group_open_item (item))
{
- GtkTreeIter *p = view->in_command ? &view->cur_command : NULL;
- gtk_tree_store_append (store, &iter, p);
+ gtk_tree_path_free (view->cur_group);
+ view->cur_group = gtk_tree_model_get_path (GTK_TREE_MODEL (store),
+ &iter);
}
ds_clear (&name);
if (is_text_item (item))
- ds_put_cstr (&name, text_item_get_text (to_text_item (item)));
+ {
+ const struct text_item *text_item = to_text_item (item);
+ ds_put_cstr (&name, text_item_type_to_string (
+ text_item_get_type (text_item)));
+ }
else if (is_message_item (item))
{
const struct message_item *msg_item = to_message_item (item);
-1);
ds_destroy (&name);
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &iter);
+ GtkTreePath *path = gtk_tree_model_get_path (
+ GTK_TREE_MODEL (store), &iter);
gtk_tree_view_expand_row (view->overview, path, TRUE);
gtk_tree_path_free (path);
}
{
if (!view->n_items || !gtk_widget_get_window (GTK_WIDGET (view->output)))
return;
- string_map_clear (&view->render_opts);
- xr_driver_destroy (view->xr);
- create_xr (view);
- rerender (view);
+
+ /* GTK+ fires this signal for trivial changes like the mouse moving in or out
+ of the window. Check whether the actual rendering options changed and
+ re-render only if they did. */
+ struct string_map options = STRING_MAP_INITIALIZER (options);
+ get_xr_options (view, &options);
+ if (!string_map_equals (&options, &view->render_opts))
+ {
+ xr_driver_destroy (view->xr);
+ view->xr = NULL;
+
+ rerender (view);
+ }
+ string_map_destroy (&options);
}
enum {
view->y = 0;
string_map_init (&view->render_opts);
view->overview = overview;
- memset (&view->cur_command, 0, sizeof view->cur_command);
- view->in_command = false;
+ view->cur_group = NULL;
view->toplevel = gtk_widget_get_toplevel (GTK_WIDGET (output));
view->items = NULL;
view->n_items = view->allocated_items = 0;
projects / pspp / blobdiff