#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;
struct xr_rendering *r
= xr_rendering_create (view->xr, text_item_super (text_item), cr);
xr_rendering_measure (r, NULL, &view->font_height);
+ xr_rendering_destroy (r);
text_item_unref (text_item);
gdk_window_end_draw_frame (win, ctx);
if (!view->n_items || ! gdkw)
return;
+ if (view->xr == NULL)
+ create_xr (view);
+
GdkWindow *win = gtk_layout_get_bin_window (view->output);
cairo_region_t *region = gdk_window_get_visible_region (win);
GdkDrawingContext *ctx = gdk_window_begin_draw_frame (win, region);
cairo_t *cr = gdk_drawing_context_get_cairo_context (ctx);
- if (view->xr == NULL)
- create_xr (view);
view->y = 0;
view->max_width = 0;
for (item = view->items; item < &view->items[view->n_items]; item++)
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)
{
{
struct output_view_item *view_item;
GtkWidget *drawing_area;
- struct xr_rendering *r;
struct string name;
- GtkTreeStore *store;
- 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->drawing_area = NULL;
GdkWindow *win = gtk_widget_get_window (GTK_WIDGET (view->output));
- if (win)
+ if (is_group_open_item (item))
+ tw = th = 0;
+ else if (win)
{
view_item->drawing_area = drawing_area = gtk_drawing_area_new ();
+ if (view->xr == NULL)
+ create_xr (view);
+
cairo_region_t *region = gdk_window_get_visible_region (win);
GdkDrawingContext *ctx = gdk_window_begin_draw_frame (win, region);
cairo_t *cr = gdk_drawing_context_get_cairo_context (ctx);
- if (view->xr == NULL)
- create_xr (view);
-
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)
{
gdk_window_end_draw_frame (win, ctx);
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);
}
GList *rows = gtk_tree_selection_get_selected_rows (sel, &model);
GList *n = rows;
- if ( n == NULL)
+ if (n == NULL)
return;
if (path_search (dirname, sizeof dirname, NULL, NULL, true)
n = n->next;
}
- if ( driver->class->flush)
+ if (driver->class->flush)
driver->class->flush (driver);
output_driver_destroy (driver);
driver = NULL;
- if ( g_file_get_contents (filename, &text, &length, NULL) )
+ if (g_file_get_contents (filename, &text, &length, NULL))
{
gtk_selection_data_set (selection_data, gtk_selection_data_get_target (selection_data),
8,
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;
xr_driver_destroy (view->xr);
+ if (view->cur_group)
+ gtk_tree_path_free (view->cur_group);
+
free (view);
}
complete. Don't let that screw up printing. */
return TRUE;
}
- else if ( view->print_item < view->n_items )
+ else if (view->print_item < view->n_items)
{
xr_driver_output_item (view->print_xrd,
view->items[view->print_item++].item);
projects / pspp / blobdiff