X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-output-view.c;h=2ac85a52ada2e3418963a86fbab8cb6718fd5865;hb=16aa04bddc7bdf95f1cbbebfce6ea93773391c44;hp=3a7ce4d357bb70b8e2a9e5a6f5e812fa33826b44;hpb=355f0104f7b496494d4ca4fe71162e3df0754226;p=pspp diff --git a/src/ui/gui/psppire-output-view.c b/src/ui/gui/psppire-output-view.c index 3a7ce4d357..2ac85a52ad 100644 --- a/src/ui/gui/psppire-output-view.c +++ b/src/ui/gui/psppire-output-view.c @@ -30,6 +30,7 @@ #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" @@ -59,8 +60,7 @@ struct psppire_output_view struct string_map render_opts; GtkTreeView *overview; - GtkTreeIter cur_command; - bool in_command; + GtkTreePath *cur_group; GtkWidget *toplevel; @@ -164,18 +164,24 @@ create_xr (struct psppire_output_view *view) 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))); + + 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); + view->xr = xr_driver_create (cr, &options); string_map_destroy (&options); 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); + 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); - cairo_destroy (cr); + gdk_window_end_draw_frame (win, ctx); + cairo_region_destroy (region); } /* Return the horizontal position to place a widget whose @@ -195,18 +201,6 @@ create_drawing_area (struct psppire_output_view *view, GtkWidget *drawing_area, struct xr_rendering *r, int tw, int th) { - /* Enable this to help with debugging. It shows you which widgets are being - put where. */ - if (0) - { - GdkRGBA green = {0, 1, 0, 1}; - gtk_widget_override_background_color (GTK_WIDGET (view->output), - GTK_STATE_FLAG_NORMAL, &green); - GdkRGBA red = {1, 0, 0, 1}; - gtk_widget_override_background_color (drawing_area, - GTK_STATE_FLAG_NORMAL, &red); - } - g_object_set_data_full (G_OBJECT (drawing_area), "rendering", r, free_rendering); @@ -226,14 +220,18 @@ rerender (struct psppire_output_view *view) { struct output_view_item *item; GdkWindow *gdkw = gtk_widget_get_window (GTK_WIDGET (view->output)); - cairo_t *cr; if (!view->n_items || ! gdkw) return; - cr = gdk_cairo_create (gdkw); 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); + view->y = 0; view->max_width = 0; for (item = view->items; item < &view->items[view->n_items]; item++) @@ -245,6 +243,9 @@ rerender (struct psppire_output_view *view) 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) { @@ -295,7 +296,9 @@ rerender (struct psppire_output_view *view) gtk_layout_set_size (view->output, view->max_width + view->font_height, view->y + view->font_height); - cairo_destroy (cr); + + gdk_window_end_draw_frame (win, ctx); + cairo_region_destroy (region); } void @@ -304,21 +307,20 @@ psppire_output_view_put (struct psppire_output_view *view, { 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)) { @@ -335,51 +337,72 @@ psppire_output_view_put (struct psppire_output_view *view, view_item->item = output_item_ref (item); view_item->drawing_area = NULL; - if (gtk_widget_get_window (GTK_WIDGET (view->output))) + GdkWindow *win = gtk_widget_get_window (GTK_WIDGET (view->output)); + if (is_group_open_item (item)) + tw = th = 0; + else if (win) { view_item->drawing_area = drawing_area = gtk_drawing_area_new (); - cr = gdk_cairo_create (gtk_widget_get_window (GTK_WIDGET (view->output))); 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->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; + { + gdk_window_end_draw_frame (win, ctx); + cairo_region_destroy (region); + return; + } xr_rendering_measure (r, &tw, &th); create_drawing_area (view, drawing_area, r, tw, th); + gdk_window_end_draw_frame (win, ctx); + cairo_region_destroy (region); } 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); @@ -413,7 +436,8 @@ psppire_output_view_put (struct psppire_output_view *view, -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); } @@ -423,9 +447,6 @@ psppire_output_view_put (struct psppire_output_view *view, view->y += th; gtk_layout_set_size (view->output, view->max_width, view->y); - -done: - cairo_destroy (cr); } static void @@ -513,7 +534,7 @@ clipboard_get_cb (GtkClipboard *clipboard, 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) @@ -571,7 +592,7 @@ clipboard_get_cb (GtkClipboard *clipboard, n = n->next; } - if ( driver->class->flush) + if (driver->class->flush) driver->class->flush (driver); @@ -580,7 +601,7 @@ clipboard_get_cb (GtkClipboard *clipboard, 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, @@ -704,8 +725,7 @@ psppire_output_view_new (GtkLayout *output, GtkTreeView *overview) 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; @@ -773,6 +793,9 @@ psppire_output_view_destroy (struct psppire_output_view *view) xr_driver_destroy (view->xr); + if (view->cur_group) + gtk_tree_path_free (view->cur_group); + free (view); } @@ -882,7 +905,7 @@ paginate (GtkPrintOperation *operation, 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);