X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-output-view.c;h=67296b446d44b9604731ebbb8f4d96c9a2f3338f;hb=79e9887871a20d1edadf86f78ef34ae6ab32aba4;hp=b7d2c2074c48beffa135b057412e8d331772861e;hpb=5144f3be8f6220bc40613322e1e213e3093acadd;p=pspp diff --git a/src/ui/gui/psppire-output-view.c b/src/ui/gui/psppire-output-view.c index b7d2c2074c..67296b446d 100644 --- a/src/ui/gui/psppire-output-view.c +++ b/src/ui/gui/psppire-output-view.c @@ -21,6 +21,9 @@ #include #include +#if HAVE_RSVG +#include "librsvg/rsvg.h" +#endif #include "libpspp/assertion.h" #include "libpspp/string-map.h" #include "output/cairo.h" @@ -66,6 +69,7 @@ struct psppire_output_view struct output_view_item *items; size_t n_items, allocated_items; + struct output_view_item *selected_item; /* Variables pertaining to printing */ GtkPrintSettings *print_settings; @@ -88,16 +92,10 @@ enum static gboolean layout_draw_callback (GtkWidget *widget, cairo_t *cr, gpointer data) { - cairo_save (cr); - int width = gtk_widget_get_allocated_width (widget); int height = gtk_widget_get_allocated_height (widget); - cairo_rectangle (cr, 0, 0, width, height); - cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); - cairo_fill (cr); - - cairo_restore (cr); - + GtkStyleContext *context = gtk_widget_get_style_context (widget); + gtk_render_background (context, cr, 0, 0, width, height); return FALSE; /* Continue drawing the GtkDrawingAreas. */ } @@ -109,8 +107,21 @@ draw_callback (GtkWidget *widget, cairo_t *cr, gpointer data) return TRUE; struct xr_rendering *r = g_object_get_data (G_OBJECT (widget), "rendering"); + + /* Draw the background based on the state of the widget + which can be selected or not selected */ + GtkStyleContext *context = gtk_widget_get_style_context (widget); + gtk_render_background (context, cr, clip.x, clip.y, + clip.x + clip.width, clip.y + clip.height); + /* Select the default foreground color based on current style + and state of the widget */ + GtkStateFlags state = gtk_widget_get_state_flags (widget); + GdkRGBA color; + gtk_style_context_get_color (context, state, &color); + cairo_set_source_rgba (cr, color.red, color.green, color.blue, color.alpha); xr_rendering_draw (r, cr, clip.x, clip.y, clip.x + clip.width, clip.y + clip.height); + return TRUE; } @@ -196,14 +207,98 @@ get_xpos (const struct psppire_output_view *view, gint child_width) return (gtk_widget_get_direction (GTK_WIDGET (view->output)) == GTK_TEXT_DIR_RTL) ? w - child_width - gutter: gutter; } +static struct output_view_item * +find_selected_item (struct psppire_output_view *view) +{ + struct output_view_item *item = NULL; + if (view == NULL) + return NULL; + if (view->items == NULL) + return NULL; + + for (item = view->items; item < &view->items[view->n_items]; item++) + { + GtkWidget *widget = GTK_WIDGET (item->drawing_area); + if GTK_IS_WIDGET (widget) + { + GtkStateFlags state = gtk_widget_get_state_flags (widget); + if (state & GTK_STATE_FLAG_SELECTED) + return item; + } + } + return NULL; +} + + +static void +set_copy_action (struct psppire_output_view *view, + gboolean state) +{ + GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (view->output)); + GAction *copy_action = g_action_map_lookup_action (G_ACTION_MAP (toplevel), + "copy"); + g_object_set (copy_action, + "enabled", state, + NULL); +} + +static void +clear_selection (struct psppire_output_view *view) +{ + if (view == NULL) + return; + struct output_view_item *item = find_selected_item (view); + if (item == NULL) + return; + set_copy_action (view, FALSE); + GtkWidget *widget = GTK_WIDGET (item->drawing_area); + if (GTK_IS_WIDGET (widget)) + { + gtk_widget_unset_state_flags (widget, GTK_STATE_FLAG_SELECTED); + gtk_widget_queue_draw (widget); + } +} + +static gboolean +off_item_button_press_event_cb (GtkWidget *widget, + GdkEventButton *event, + struct psppire_output_view *view) +{ + clear_selection (view); + return FALSE; /* Forward the event */ +} + +static gboolean +button_press_event_cb (GtkWidget *widget, + GdkEventButton *event, + struct psppire_output_view *view) +{ + clear_selection (view); + set_copy_action (view, TRUE); + gtk_widget_set_state_flags (widget, GTK_STATE_FLAG_SELECTED, FALSE); + gtk_widget_queue_draw (widget); + return TRUE; /* We have handled the event */ +} + static void create_drawing_area (struct psppire_output_view *view, GtkWidget *drawing_area, struct xr_rendering *r, int tw, int th) { + struct string_map options = STRING_MAP_INITIALIZER (options); + string_map_insert (&options, "transparent", "true"); + string_map_insert (&options, "systemcolors", "true"); + xr_rendering_apply_options (r, &options); + g_object_set_data_full (G_OBJECT (drawing_area), "rendering", r, free_rendering); + g_signal_connect (drawing_area, "button-press-event", + G_CALLBACK (button_press_event_cb), view); + gtk_widget_add_events (drawing_area, GDK_BUTTON_PRESS_MASK); + GtkStyleContext *context = gtk_widget_get_style_context (drawing_area); + gtk_style_context_add_class (context, + GTK_STYLE_CLASS_VIEW); g_signal_connect (drawing_area, "draw", G_CALLBACK (draw_callback), view); @@ -301,6 +396,7 @@ rerender (struct psppire_output_view *view) cairo_region_destroy (region); } + void psppire_output_view_put (struct psppire_output_view *view, const struct output_item *item) @@ -363,7 +459,6 @@ psppire_output_view_put (struct psppire_output_view *view, } 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); @@ -505,6 +600,8 @@ enum { SELECT_FMT_TEXT, SELECT_FMT_UTF8, SELECT_FMT_HTML, + SELECT_FMT_SVG, + SELECT_FMT_IMG, SELECT_FMT_ODT }; @@ -514,6 +611,34 @@ enum { # define PATH_MAX 1024 #endif +/* Returns a pixbuf from a svg file */ +/* You must unref the pixbuf after usage */ +static GdkPixbuf * +derive_pixbuf_from_svg (const char *filename) +{ + GError *err = NULL; + GdkPixbuf *pixbuf = NULL; +#if HAVE_RSVG + RsvgHandle *handle = rsvg_handle_new_from_file (filename, &err); + if (err == NULL) + { + rsvg_handle_set_dpi (handle, 300.0); + pixbuf = rsvg_handle_get_pixbuf (handle); + g_object_unref (handle); + } +#else + pixbuf = gdk_pixbuf_new_from_file (filename, &err); +#endif + if (err != NULL) + { + msg (ME, _("Could not open file %s during copy operation: %s"), + filename, err->message); + g_error_free (err); + return NULL; + } + return pixbuf; +} + static void clipboard_get_cb (GtkClipboard *clipboard, GtkSelectionData *selection_data, @@ -528,13 +653,7 @@ clipboard_get_cb (GtkClipboard *clipboard, char dirname[PATH_MAX], *filename; struct string_map options; - GtkTreeSelection *sel = gtk_tree_view_get_selection (view->overview); - GtkTreeModel *model = gtk_tree_view_get_model (view->overview); - - GList *rows = gtk_tree_selection_get_selected_rows (sel, &model); - GList *n = rows; - - if ( n == NULL) + if (view->selected_item == NULL) return; if (path_search (dirname, sizeof dirname, NULL, NULL, true) @@ -564,6 +683,11 @@ clipboard_get_cb (GtkClipboard *clipboard, string_map_insert (&options, "css", "false"); break; + case SELECT_FMT_SVG: + case SELECT_FMT_IMG: + /* see below */ + break; + case SELECT_FMT_ODT: string_map_insert (&options, "format", "odt"); break; @@ -574,39 +698,43 @@ clipboard_get_cb (GtkClipboard *clipboard, break; } - driver = output_driver_create (&options); - if (driver == NULL) - goto finish; - - while (n) + if ((info == SELECT_FMT_IMG) || + (info == SELECT_FMT_SVG) ) { - GtkTreePath *path = n->data ; - GtkTreeIter iter; - struct output_item *item ; - - gtk_tree_model_get_iter (model, &iter, path); - gtk_tree_model_get (model, &iter, COL_ADDR, &item, -1); - - driver->class->submit (driver, item); - - n = n->next; + GtkWidget *widget = view->selected_item->drawing_area; + struct xr_rendering *r = g_object_get_data (G_OBJECT (widget), "rendering"); + xr_draw_svg_file (r, filename); } + else + { + driver = output_driver_create (&options); + if (driver == NULL) + goto finish; - if ( driver->class->flush) - driver->class->flush (driver); + driver->class->submit (driver, view->selected_item->item); + if (driver->class->flush) + driver->class->flush (driver); - /* Some drivers (eg: the odt one) don't write anything until they - are closed */ - output_driver_destroy (driver); - driver = NULL; + /* Some drivers (eg: the odt one) don't write anything until they + are closed */ + output_driver_destroy (driver); + driver = NULL; + } - if ( g_file_get_contents (filename, &text, &length, NULL) ) + if (info == SELECT_FMT_IMG) { - gtk_selection_data_set (selection_data, gtk_selection_data_get_target (selection_data), - 8, - (const guchar *) text, length); + GdkPixbuf *pixbuf = derive_pixbuf_from_svg (filename); + if (pixbuf) + { + gtk_selection_data_set_pixbuf (selection_data, pixbuf); + g_object_unref (pixbuf); + } } + else if (g_file_get_contents (filename, &text, &length, NULL)) + gtk_selection_data_set (selection_data, gtk_selection_data_get_target (selection_data), + 8, + (const guchar *) text, length); finish: @@ -618,8 +746,6 @@ clipboard_get_cb (GtkClipboard *clipboard, unlink (filename); free (filename); rmdir (dirname); - - g_list_free (rows); } static void @@ -628,19 +754,26 @@ clipboard_clear_cb (GtkClipboard *clipboard, { } -static const GtkTargetEntry targets[] = { - - { "STRING", 0, SELECT_FMT_TEXT }, - { "TEXT", 0, SELECT_FMT_TEXT }, - { "COMPOUND_TEXT", 0, SELECT_FMT_TEXT }, - { "text/plain", 0, SELECT_FMT_TEXT }, - - { "UTF8_STRING", 0, SELECT_FMT_UTF8 }, - { "text/plain;charset=utf-8", 0, SELECT_FMT_UTF8 }, +#define CBTARGETS \ +CT ( ctn1, "STRING", 0, SELECT_FMT_TEXT ) \ +CT ( ctn2, "TEXT", 0, SELECT_FMT_TEXT ) \ +CT ( ctn3, "COMPOUND_TEXT", 0, SELECT_FMT_TEXT ) \ +CT ( ctn4, "text/plain", 0, SELECT_FMT_TEXT ) \ +CT ( ctn5, "UTF8_STRING", 0, SELECT_FMT_UTF8 ) \ +CT ( ctn6, "text/plain;charset=utf-8", 0, SELECT_FMT_UTF8 ) \ +CT ( ctn7, "text/html", 0, SELECT_FMT_HTML ) \ +CT ( ctn8, "image/svg+xml", 0, SELECT_FMT_SVG ) + +#define CT(ID, TARGET, FLAGS, INFO) static gchar ID[] = TARGET; +CBTARGETS +#undef CT +gchar ctnlast[] = "application/vnd.oasis.opendocument.text"; - { "text/html", 0, SELECT_FMT_HTML }, - - { "application/vnd.oasis.opendocument.text", 0, SELECT_FMT_ODT } +static const GtkTargetEntry targets[] = { +#define CT(ID, TARGET, FLAGS, INFO) { ID, FLAGS, INFO }, + CBTARGETS +#undef CT + { ctnlast, 0, SELECT_FMT_ODT } }; static void @@ -649,27 +782,25 @@ on_copy (struct psppire_output_view *view) GtkWidget *widget = GTK_WIDGET (view->overview); GtkClipboard *cb = gtk_widget_get_clipboard (widget, GDK_SELECTION_CLIPBOARD); - if (!gtk_clipboard_set_with_data (cb, targets, G_N_ELEMENTS (targets), + struct output_view_item *ov_item = find_selected_item (view); + if (ov_item == NULL) + return; + view->selected_item = ov_item; + GtkTargetList *tl = gtk_target_list_new (targets, G_N_ELEMENTS (targets)); + g_return_if_fail (tl); + if (is_table_item (ov_item->item) || + is_chart_item (ov_item->item)) + gtk_target_list_add_image_targets (tl, SELECT_FMT_IMG, TRUE); + gint no_of_targets = 0; + GtkTargetEntry *ta = gtk_target_table_new_from_list (tl, &no_of_targets); + g_return_if_fail (ta); + if (!gtk_clipboard_set_with_data (cb, ta, no_of_targets, clipboard_get_cb, clipboard_clear_cb, view)) clipboard_clear_cb (cb, view); -} - -static void -on_selection_change (GtkTreeSelection *sel, GAction *copy_action) -{ - /* The Copy action is available only if there is something selected */ - g_object_set (copy_action, - "enabled", gtk_tree_selection_count_selected_rows (sel) > 0, - NULL); -} -static void -on_select_all (struct psppire_output_view *view) -{ - GtkTreeSelection *sel = gtk_tree_view_get_selection (view->overview); - gtk_tree_view_expand_all (view->overview); - gtk_tree_selection_select_all (sel); + gtk_target_list_unref (tl); + gtk_target_table_free (ta,no_of_targets); } static void @@ -684,9 +815,6 @@ on_size_allocate (GtkWidget *widget, static void on_realize (GtkWidget *overview, GObject *view) { - GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (overview)); - gtk_tree_selection_set_mode (sel, GTK_SELECTION_MULTIPLE); - GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (overview)); GAction *copy_action = g_action_map_lookup_action (G_ACTION_MAP (toplevel), @@ -696,15 +824,11 @@ on_realize (GtkWidget *overview, GObject *view) "select-all"); g_object_set (copy_action, "enabled", FALSE, NULL); - - g_signal_connect_swapped (select_all_action, "activate", - G_CALLBACK (on_select_all), view); + g_object_set (select_all_action, "enabled", FALSE, NULL); g_signal_connect_swapped (copy_action, "activate", G_CALLBACK (on_copy), view); - g_signal_connect (sel, "changed", G_CALLBACK (on_selection_change), - copy_action); } struct psppire_output_view * @@ -729,6 +853,7 @@ psppire_output_view_new (GtkLayout *output, GtkTreeView *overview) view->toplevel = gtk_widget_get_toplevel (GTK_WIDGET (output)); view->items = NULL; view->n_items = view->allocated_items = 0; + view->selected_item = NULL; view->print_settings = NULL; view->print_xrd = NULL; view->print_item = 0; @@ -741,6 +866,10 @@ psppire_output_view_new (GtkLayout *output, GtkTreeView *overview) g_signal_connect (output, "size-allocate", G_CALLBACK (on_size_allocate), view); + gtk_widget_add_events (GTK_WIDGET (output), GDK_BUTTON_PRESS_MASK); + g_signal_connect (output, "button-press-event", + G_CALLBACK (off_item_button_press_event_cb), view); + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (output)), GTK_STYLE_CLASS_VIEW); @@ -793,6 +922,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); } @@ -902,7 +1034,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);