X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fwidgets%2Ficon.cpp;h=d8d68461440cdd645711b0c514bbe62c62fa1476;hb=b947b86feae33a7df233d6818a0b121611127cad;hp=0bed152f8e338714cc75d5c689d33d522d766e5f;hpb=d76e1a8d027e852965ecba07116e86f2082ebca7;p=inkscape.git diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp index 0bed152f8..d8d684614 100644 --- a/src/widgets/icon.cpp +++ b/src/widgets/icon.cpp @@ -5,6 +5,7 @@ * Author: * Lauris Kaplinski * Jon A. Cruz + * Abhishek Sharma * * Copyright (C) 2002 Lauris Kaplinski * @@ -19,6 +20,7 @@ #include #include #include +#include #include "path-prefix.h" #include "preferences.h" @@ -37,7 +39,7 @@ static void addPreRender( GtkIconSize lsize, gchar const *name ); static void sp_icon_class_init(SPIconClass *klass); static void sp_icon_init(SPIcon *icon); -static void sp_icon_destroy(GtkObject *object); +static void sp_icon_dispose(GObject *object); static void sp_icon_reset(SPIcon *icon); static void sp_icon_clear(SPIcon *icon); @@ -76,6 +78,8 @@ static GtkIconSize iconSizeLookup[] = { GTK_ICON_SIZE_MENU, // for Inkscape::ICON_SIZE_DECORATION }; +static std::map legacyNames; + class IconCacheItem { public: @@ -87,27 +91,27 @@ public: GdkPixbuf* _pb; }; -static Glib::RefPtr inkyIcons; static std::map > iconSetCache; +static std::set internalNames; -GtkType +GType sp_icon_get_type() { - //TODO: switch to GObject - // GtkType and such calls were deprecated a while back with the - // introduction of GObject as a separate layer, with GType instead. --JonCruz - - static GtkType type = 0; + static GType type = 0; if (!type) { - GtkTypeInfo info = { - (gchar*) "SPIcon", - sizeof(SPIcon), + GTypeInfo info = { sizeof(SPIconClass), - (GtkClassInitFunc) sp_icon_class_init, - (GtkObjectInitFunc) sp_icon_init, - NULL, NULL, NULL + NULL, + NULL, + (GClassInitFunc) sp_icon_class_init, + NULL, + NULL, + sizeof(SPIcon), + 0, + (GInstanceInitFunc) sp_icon_init, + NULL }; - type = gtk_type_unique(GTK_TYPE_WIDGET, &info); + type = g_type_register_static(GTK_TYPE_WIDGET, "SPIcon", &info, (GTypeFlags)0); } return type; } @@ -115,15 +119,15 @@ sp_icon_get_type() static void sp_icon_class_init(SPIconClass *klass) { - GtkObjectClass *object_class; + GObjectClass *object_class; GtkWidgetClass *widget_class; - object_class = (GtkObjectClass *) klass; + object_class = (GObjectClass *) klass; widget_class = (GtkWidgetClass *) klass; parent_class = (GtkWidgetClass*)g_type_class_peek_parent(klass); - object_class->destroy = sp_icon_destroy; + object_class->dispose = sp_icon_dispose; widget_class->size_request = sp_icon_size_request; widget_class->size_allocate = sp_icon_size_allocate; @@ -141,11 +145,10 @@ sp_icon_init(SPIcon *icon) icon->psize = 0; icon->name = 0; icon->pb = 0; - icon->pb_faded = 0; } static void -sp_icon_destroy(GtkObject *object) +sp_icon_dispose(GObject *object) { SPIcon *icon = SP_ICON(object); sp_icon_clear(icon); @@ -154,7 +157,7 @@ sp_icon_destroy(GtkObject *object) icon->name = 0; } - ((GtkObjectClass *) (parent_class))->destroy(object); + ((GObjectClass *) (parent_class))->dispose(object); } static void sp_icon_reset( SPIcon *icon ) { @@ -167,10 +170,6 @@ static void sp_icon_clear( SPIcon *icon ) { g_object_unref(G_OBJECT(icon->pb)); icon->pb = NULL; } - if (icon->pb_faded) { - g_object_unref(G_OBJECT(icon->pb_faded)); - icon->pb_faded = NULL; - } } static void @@ -209,33 +208,48 @@ static int sp_icon_expose(GtkWidget *widget, GdkEventExpose *event) return TRUE; } +static GdkPixbuf* renderup( gchar const* name, Inkscape::IconSize lsize, unsigned psize ); + // PUBLIC CALL: void sp_icon_fetch_pixbuf( SPIcon *icon ) { if ( icon ) { if ( !icon->pb ) { icon->psize = sp_icon_get_phys_size(icon->lsize); + icon->pb = renderup(icon->name, icon->lsize, icon->psize); + } + } +} - GdkPixbuf *pb; - - pb = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), icon->name, icon->psize, - (GtkIconLookupFlags) 0, NULL); - if (!pb) { - pb = sp_icon_image_load_svg( icon->name, Inkscape::getRegisteredIconSize(icon->lsize), icon->psize ); - } - if (!pb) { - pb = sp_icon_image_load_pixmap( icon->name, icon->lsize, icon->psize ); - } - if ( pb ) { - icon->pb = pb; - icon->pb_faded = gdk_pixbuf_copy(icon->pb); - gdk_pixbuf_saturate_and_pixelate(icon->pb, icon->pb_faded, 0.5, TRUE); - } else { - /* TODO: We should do something more useful if we can't load the image. */ - g_warning ("failed to load icon '%s'", icon->name); +GdkPixbuf* renderup( gchar const* name, Inkscape::IconSize lsize, unsigned psize ) { + GtkIconTheme *theme = gtk_icon_theme_get_default(); + + GdkPixbuf *pb = 0; + if (gtk_icon_theme_has_icon(theme, name)) { + pb = gtk_icon_theme_load_icon(theme, name, psize, (GtkIconLookupFlags) 0, NULL); + } + if (!pb) { + pb = sp_icon_image_load_svg( name, Inkscape::getRegisteredIconSize(lsize), psize ); + if (!pb && (legacyNames.find(name) != legacyNames.end())) { + if ( Inkscape::Preferences::get()->getBool("/debug/icons/dumpSvg") ) { + g_message("Checking fallback [%s]->[%s]", name, legacyNames[name].c_str()); } + pb = sp_icon_image_load_svg( legacyNames[name].c_str(), Inkscape::getRegisteredIconSize(lsize), psize ); + } + + // if this was loaded from SVG, add it as a builtin icon + if (pb) { + gtk_icon_theme_add_builtin_icon(name, psize, pb); } } + if (!pb) { + pb = sp_icon_image_load_pixmap( name, lsize, psize ); + } + if ( !pb ) { + // TODO: We should do something more useful if we can't load the image. + g_warning ("failed to load icon '%s'", name); + } + return pb; } static void sp_icon_screen_changed( GtkWidget *widget, GdkScreen *previous_screen ) @@ -258,7 +272,10 @@ static void sp_icon_style_set( GtkWidget *widget, GtkStyle *previous_style ) static void sp_icon_theme_changed( SPIcon *icon ) { - //g_message("Got a change bump for this icon"); + bool const dump = Inkscape::Preferences::get()->getBool("/debug/icons/dumpSvg"); + if ( dump ) { + g_message("Got a change bump for this icon"); + } sizeDirty = true; sp_icon_reset(icon); gtk_widget_queue_draw( GTK_WIDGET(icon) ); @@ -267,24 +284,268 @@ static void sp_icon_theme_changed( SPIcon *icon ) static void imageMapCB(GtkWidget* widget, gpointer user_data); static void imageMapNamedCB(GtkWidget* widget, gpointer user_data); -static void populate_placeholder_icon(gchar const* name, GtkIconSize size); static bool prerender_icon(gchar const *name, GtkIconSize lsize, unsigned psize); -static Glib::ustring icon_cache_key(gchar const *name, unsigned lsize, unsigned psize); +static Glib::ustring icon_cache_key(gchar const *name, unsigned psize); static GdkPixbuf *get_cached_pixbuf(Glib::ustring const &key); -std::map legacyNames; - static void setupLegacyNaming() { - legacyNames["view-fullscreen"] = "fullscreen"; - legacyNames["edit-select-all"] = "selection_select_all"; - legacyNames["window-new"] = "view_new"; + legacyNames["document-import"] ="file_import"; + legacyNames["document-export"] ="file_export"; + legacyNames["document-import-ocal"] ="ocal_import"; + legacyNames["document-export-ocal"] ="ocal_export"; + legacyNames["document-metadata"] ="document_metadata"; + legacyNames["dialog-input-devices"] ="input_devices"; + legacyNames["edit-duplicate"] ="edit_duplicate"; + legacyNames["edit-clone"] ="edit_clone"; + legacyNames["edit-clone-unlink"] ="edit_unlink_clone"; + legacyNames["edit-select-original"] ="edit_select_original"; + legacyNames["edit-undo-history"] ="edit_undo_history"; + legacyNames["edit-paste-in-place"] ="selection_paste_in_place"; + legacyNames["edit-paste-style"] ="selection_paste_style"; + legacyNames["selection-make-bitmap-copy"] ="selection_bitmap"; + legacyNames["edit-select-all"] ="selection_select_all"; + legacyNames["edit-select-all-layers"] ="selection_select_all_in_all_layers"; + legacyNames["edit-select-invert"] ="selection_invert"; + legacyNames["edit-select-none"] ="selection_deselect"; + legacyNames["dialog-xml-editor"] ="xml_editor"; + legacyNames["zoom-original"] ="zoom_1_to_1"; + legacyNames["zoom-half-size"] ="zoom_1_to_2"; + legacyNames["zoom-double-size"] ="zoom_2_to_1"; + legacyNames["zoom-fit-selection"] ="zoom_select"; + legacyNames["zoom-fit-drawing"] ="zoom_draw"; + legacyNames["zoom-fit-page"] ="zoom_page"; + legacyNames["zoom-fit-width"] ="zoom_pagewidth"; + legacyNames["zoom-previous"] ="zoom_previous"; + legacyNames["zoom-next"] ="zoom_next"; + legacyNames["zoom-in"] ="zoom_in"; + legacyNames["zoom-out"] ="zoom_out"; + legacyNames["show-grid"] ="grid"; + legacyNames["show-guides"] ="guides"; + legacyNames["color-management"] ="color_management"; + legacyNames["show-dialogs"] ="dialog_toggle"; + legacyNames["dialog-messages"] ="messages"; + legacyNames["dialog-scripts"] ="scripts"; + legacyNames["window-previous"] ="window_previous"; + legacyNames["window-next"] ="window_next"; + legacyNames["dialog-icon-preview"] ="view_icon_preview"; + legacyNames["window-new"] ="view_new"; + legacyNames["view-fullscreen"] ="fullscreen"; + legacyNames["layer-new"] ="new_layer"; + legacyNames["layer-rename"] ="rename_layer"; + legacyNames["layer-previous"] ="switch_to_layer_above"; + legacyNames["layer-next"] ="switch_to_layer_below"; + legacyNames["selection-move-to-layer-above"] ="move_selection_above"; + legacyNames["selection-move-to-layer-below"] ="move_selection_below"; + legacyNames["layer-raise"] ="raise_layer"; + legacyNames["layer-lower"] ="lower_layer"; + legacyNames["layer-top"] ="layer_to_top"; + legacyNames["layer-bottom"] ="layer_to_bottom"; + legacyNames["layer-delete"] ="delete_layer"; + legacyNames["dialog-layers"] ="layers"; + legacyNames["dialog-fill-and-stroke"] ="fill_and_stroke"; + legacyNames["dialog-object-properties"] ="dialog_item_properties"; + legacyNames["object-group"] ="selection_group"; + legacyNames["object-ungroup"] ="selection_ungroup"; + legacyNames["selection-raise"] ="selection_up"; + legacyNames["selection-lower"] ="selection_down"; + legacyNames["selection-top"] ="selection_top"; + legacyNames["selection-bottom"] ="selection_bot"; + legacyNames["object-rotate-left"] ="object_rotate_90_CCW"; + legacyNames["object-rotate-right"] ="object_rotate_90_CW"; + legacyNames["object-flip-horizontal"] ="object_flip_hor"; + legacyNames["object-flip-vertical"] ="object_flip_ver"; + legacyNames["dialog-transform"] ="object_trans"; + legacyNames["dialog-align-and-distribute"] ="object_align"; + legacyNames["dialog-rows-and-columns"] ="grid_arrange"; + legacyNames["object-to-path"] ="object_tocurve"; + legacyNames["stroke-to-path"] ="stroke_tocurve"; + legacyNames["bitmap-trace"] ="selection_trace"; + legacyNames["path-union"] ="union"; + legacyNames["path-difference"] ="difference"; + legacyNames["path-intersection"] ="intersection"; + legacyNames["path-exclusion"] ="exclusion"; + legacyNames["path-division"] ="division"; + legacyNames["path-cut"] ="cut_path"; + legacyNames["path-combine"] ="selection_combine"; + legacyNames["path-break-apart"] ="selection_break"; + legacyNames["path-outset"] ="outset_path"; + legacyNames["path-inset"] ="inset_path"; + legacyNames["path-offset-dynamic"] ="dynamic_offset"; + legacyNames["path-offset-linked"] ="linked_offset"; + legacyNames["path-simplify"] ="simplify"; + legacyNames["path-reverse"] ="selection_reverse"; + legacyNames["dialog-text-and-font"] ="object_font"; + legacyNames["text-put-on-path"] ="put_on_path"; + legacyNames["text-remove-from-path"] ="remove_from_path"; + legacyNames["text-flow-into-frame"] ="flow_into_frame"; + legacyNames["text-unflow"] ="unflow"; + legacyNames["text-convert-to-regular"] ="convert_to_text"; + legacyNames["text-unkern"] ="remove_manual_kerns"; + legacyNames["help-keyboard-shortcuts"] ="help_keys"; + legacyNames["help-contents"] ="help_tutorials"; + legacyNames["inkscape-logo"] ="inkscape_options"; + legacyNames["dialog-memory"] ="about_memory"; + legacyNames["tool-pointer"] ="draw_select"; + legacyNames["tool-node-editor"] ="draw_node"; + legacyNames["tool-tweak"] ="draw_tweak"; + legacyNames["zoom"] ="draw_zoom"; + legacyNames["draw-rectangle"] ="draw_rect"; + legacyNames["draw-cuboid"] ="draw_3dbox"; + legacyNames["draw-ellipse"] ="draw_arc"; + legacyNames["draw-polygon-star"] ="draw_star"; + legacyNames["draw-spiral"] ="draw_spiral"; + legacyNames["draw-freehand"] ="draw_freehand"; + legacyNames["draw-path"] ="draw_pen"; + legacyNames["draw-calligraphic"] ="draw_calligraphic"; + legacyNames["draw-eraser"] ="draw_erase"; + legacyNames["color-fill"] ="draw_paintbucket"; + legacyNames["draw-text"] ="draw_text"; + legacyNames["draw-connector"] ="draw_connector"; + legacyNames["color-gradient"] ="draw_gradient"; + legacyNames["color-picker"] ="draw_dropper"; + legacyNames["transform-affect-stroke"] ="transform_stroke"; + legacyNames["transform-affect-rounded-corners"] ="transform_corners"; + legacyNames["transform-affect-gradient"] ="transform_gradient"; + legacyNames["transform-affect-pattern"] ="transform_pattern"; + legacyNames["node-add"] ="node_insert"; + legacyNames["node-delete"] ="node_delete"; + legacyNames["node-join"] ="node_join"; + legacyNames["node-break"] ="node_break"; + legacyNames["node-join-segment"] ="node_join_segment"; + legacyNames["node-delete-segment"] ="node_delete_segment"; + legacyNames["node-type-cusp"] ="node_cusp"; + legacyNames["node-type-smooth"] ="node_smooth"; + legacyNames["node-type-symmetric"] ="node_symmetric"; + legacyNames["node-type-auto-smooth"] ="node_auto"; + legacyNames["node-segment-curve"] ="node_curve"; + legacyNames["node-segment-line"] ="node_line"; + legacyNames["show-node-handles"] ="nodes_show_handles"; + legacyNames["path-effect-parameter-next"] ="edit_next_parameter"; + legacyNames["show-path-outline"] ="nodes_show_helperpath"; + legacyNames["path-clip-edit"] ="nodeedit-clippath"; + legacyNames["path-mask-edit"] ="nodeedit-mask"; + legacyNames["node-type-cusp"] ="node_cusp"; + legacyNames["object-tweak-push"] ="tweak_move_mode"; + legacyNames["object-tweak-attract"] ="tweak_move_mode_inout"; + legacyNames["object-tweak-randomize"] ="tweak_move_mode_jitter"; + legacyNames["object-tweak-shrink"] ="tweak_scale_mode"; + legacyNames["object-tweak-rotate"] ="tweak_rotate_mode"; + legacyNames["object-tweak-duplicate"] ="tweak_moreless_mode"; + legacyNames["object-tweak-push"] ="tweak_move_mode"; + legacyNames["path-tweak-push"] ="tweak_push_mode"; + legacyNames["path-tweak-shrink"] ="tweak_shrink_mode"; + legacyNames["path-tweak-attract"] ="tweak_attract_mode"; + legacyNames["path-tweak-roughen"] ="tweak_roughen_mode"; + legacyNames["object-tweak-paint"] ="tweak_colorpaint_mode"; + legacyNames["object-tweak-jitter-color"] ="tweak_colorjitter_mode"; + legacyNames["object-tweak-blur"] ="tweak_blur_mode"; + legacyNames["rectangle-make-corners-sharp"] ="squared_corner"; + legacyNames["perspective-parallel"] ="toggle_vp_x"; + legacyNames["draw-ellipse-whole"] ="reset_circle"; + legacyNames["draw-ellipse-segment"] ="circle_closed_arc"; + legacyNames["draw-ellipse-arc"] ="circle_open_arc"; + legacyNames["draw-polygon"] ="star_flat"; + legacyNames["draw-star"] ="star_angled"; + legacyNames["path-mode-bezier"] ="bezier_mode"; + legacyNames["path-mode-spiro"] ="spiro_splines_mode"; + legacyNames["path-mode-polyline"] ="polylines_mode"; + legacyNames["path-mode-polyline-paraxial"] ="paraxial_lines_mode"; + legacyNames["draw-use-tilt"] ="guse_tilt"; + legacyNames["draw-use-pressure"] ="guse_pressure"; + legacyNames["draw-trace-background"] ="trace_background"; + legacyNames["draw-eraser-delete-objects"] ="delete_object"; + legacyNames["format-text-direction-vertical"] ="writing_mode_tb"; + legacyNames["format-text-direction-horizontal"] ="writing_mode_lr"; + legacyNames["connector-avoid"] ="connector_avoid"; + legacyNames["connector-ignore"] ="connector_ignore"; + legacyNames["object-fill"] ="controls_fill"; + legacyNames["object-stroke"] ="controls_stroke"; + legacyNames["snap"] ="toggle_snap_global"; + legacyNames["snap-bounding-box"] ="toggle_snap_bbox"; + legacyNames["snap-bounding-box-edges"] ="toggle_snap_to_bbox_path"; + legacyNames["snap-bounding-box-corners"] ="toggle_snap_to_bbox_node"; + legacyNames["snap-bounding-box-midpoints"] ="toggle_snap_to_bbox_edge_midpoints"; + legacyNames["snap-bounding-box-center"] ="toggle_snap_to_bbox_midpoints"; + legacyNames["snap-nodes"] ="toggle_snap_nodes"; + legacyNames["snap-nodes-path"] ="toggle_snap_to_paths"; + legacyNames["snap-nodes-cusp"] ="toggle_snap_to_nodes"; + legacyNames["snap-nodes-smooth"] ="toggle_snap_to_smooth_nodes"; + legacyNames["snap-nodes-midpoint"] ="toggle_snap_to_midpoints"; + legacyNames["snap-nodes-intersection"] ="toggle_snap_to_path_intersections"; + legacyNames["snap-nodes-center"] ="toggle_snap_to_bbox_midpoints-3"; + legacyNames["snap-nodes-rotation-center"] ="toggle_snap_center"; + legacyNames["snap-page"] ="toggle_snap_page_border"; + legacyNames["snap-grid-guide-intersections"] ="toggle_snap_grid_guide_intersections"; + legacyNames["align-horizontal-right-to-anchor"] ="al_left_out"; + legacyNames["align-horizontal-left"] ="al_left_in"; + legacyNames["align-horizontal-center"] ="al_center_hor"; + legacyNames["align-horizontal-right"] ="al_right_in"; + legacyNames["align-horizontal-left-to-anchor"] ="al_right_out"; + legacyNames["align-horizontal-baseline"] ="al_baselines_vert"; + legacyNames["align-vertical-bottom-to-anchor"] ="al_top_out"; + legacyNames["align-vertical-top"] ="al_top_in"; + legacyNames["align-vertical-center"] ="al_center_ver"; + legacyNames["align-vertical-bottom"] ="al_bottom_in"; + legacyNames["align-vertical-top-to-anchor"] ="al_bottom_out"; + legacyNames["align-vertical-baseline"] ="al_baselines_hor"; + legacyNames["distribute-horizontal-left"] ="distribute_left"; + legacyNames["distribute-horizontal-center"] ="distribute_hcentre"; + legacyNames["distribute-horizontal-right"] ="distribute_right"; + legacyNames["distribute-horizontal-baseline"] ="distribute_baselines_hor"; + legacyNames["distribute-vertical-bottom"] ="distribute_bottom"; + legacyNames["distribute-vertical-center"] ="distribute_vcentre"; + legacyNames["distribute-vertical-top"] ="distribute_top"; + legacyNames["distribute-vertical-baseline"] ="distribute_baselines_vert"; + legacyNames["distribute-randomize"] ="distribute_randomize"; + legacyNames["distribute-unclump"] ="unclump"; + legacyNames["distribute-graph"] ="graph_layout"; + legacyNames["distribute-graph-directed"] ="directed_graph"; + legacyNames["distribute-remove-overlaps"] ="remove_overlaps"; + legacyNames["align-horizontal-node"] ="node_valign"; + legacyNames["align-vertical-node"] ="node_halign"; + legacyNames["distribute-vertical-node"] ="node_vdistribute"; + legacyNames["distribute-horizontal-node"] ="node_hdistribute"; + legacyNames["xml-element-new"] ="add_xml_element_node"; + legacyNames["xml-text-new"] ="add_xml_text_node"; + legacyNames["xml-node-delete"] ="delete_xml_node"; + legacyNames["xml-node-duplicate"] ="duplicate_xml_node"; + legacyNames["xml-attribute-delete"] ="delete_xml_attribute"; + legacyNames["transform-move-horizontal"] ="arrows_hor"; + legacyNames["transform-move-vertical"] ="arrows_ver"; + legacyNames["transform-scale-horizontal"] ="transform_scale_hor"; + legacyNames["transform-scale-vertical"] ="transform_scale_ver"; + legacyNames["transform-skew-horizontal"] ="transform_scew_hor"; + legacyNames["transform-skew-vertical"] ="transform_scew_ver"; + legacyNames["object-fill"] ="properties_fill"; + legacyNames["object-stroke"] ="properties_stroke_paint"; + legacyNames["object-stroke-style"] ="properties_stroke"; + legacyNames["paint-none"] ="fill_none"; + legacyNames["paint-solid"] ="fill_solid"; + legacyNames["paint-gradient-linear"] ="fill_gradient"; + legacyNames["paint-gradient-radial"] ="fill_radial"; + legacyNames["paint-pattern"] ="fill_pattern"; + legacyNames["paint-unknown"] ="fill_unset"; + legacyNames["fill-rule-even-odd"] ="fillrule_evenodd"; + legacyNames["fill-rule-nonzero"] ="fillrule_nonzero"; + legacyNames["stroke-join-miter"] ="join_miter"; + legacyNames["stroke-join-bevel"] ="join_bevel"; + legacyNames["stroke-join-round"] ="join_round"; + legacyNames["stroke-cap-butt"] ="cap_butt"; + legacyNames["stroke-cap-square"] ="cap_square"; + legacyNames["stroke-cap-round"] ="cap_round"; + legacyNames["guides"] ="guide"; + legacyNames["grid-rectangular"] ="grid_xy"; + legacyNames["grid-axonometric"] ="grid_axonom"; + legacyNames["object-visible"] ="visible"; + legacyNames["object-hidden"] ="hidden"; + legacyNames["object-unlocked"] ="lock_unlocked"; + legacyNames["object-locked"] ="width_height_lock"; + legacyNames["zoom"] ="sticky_zoom"; } -static GtkWidget * -sp_icon_new_full( Inkscape::IconSize lsize, gchar const *name ) +static GtkWidget *sp_icon_new_full( Inkscape::IconSize lsize, gchar const *name ) { - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - static bool dump = prefs->getBool( "/debug/icons/dumpGtk"); + static bool dump = Inkscape::Preferences::get()->getBool("/debug/icons/dumpGtk"); GtkWidget *widget = 0; gint trySize = CLAMP( static_cast(lsize), 0, static_cast(G_N_ELEMENTS(iconSizeLookup) - 1) ); @@ -301,15 +562,15 @@ sp_icon_new_full( Inkscape::IconSize lsize, gchar const *name ) setupLegacyNaming(); } - if ( legacyNames.find(name) != legacyNames.end() ) { + if ( stockFound ) { + img = gtk_image_new_from_stock( name, mappedSize ); + } else { img = gtk_image_new_from_icon_name( name, mappedSize ); if ( dump ) { g_message("gtk_image_new_from_icon_name( '%s', %d ) = %p", name, mappedSize, img); GtkImageType thing = gtk_image_get_storage_type(GTK_IMAGE(img)); g_message(" Type is %d %s", (int)thing, (thing == GTK_IMAGE_EMPTY ? "Empty" : "ok")); } - } else { - img = gtk_image_new_from_stock( name, mappedSize ); } if ( img ) { @@ -317,7 +578,6 @@ sp_icon_new_full( Inkscape::IconSize lsize, gchar const *name ) if ( type == GTK_IMAGE_STOCK ) { if ( !stockFound ) { // It's not showing as a stock ID, so assume it will be present internally - populate_placeholder_icon( name, mappedSize ); addPreRender( mappedSize, name ); // Add a hook to render if set visible before prerender is done. @@ -338,7 +598,7 @@ sp_icon_new_full( Inkscape::IconSize lsize, gchar const *name ) // Add a hook to render if set visible before prerender is done. g_signal_connect( G_OBJECT(widget), "map", G_CALLBACK(imageMapNamedCB), GINT_TO_POINTER(0) ); - if ( prefs->getBool("/options/iconrender/named_nodelay") ) { + if ( Inkscape::Preferences::get()->getBool("/options/iconrender/named_nodelay") ) { int psize = sp_icon_get_phys_size(lsize); prerender_icon(name, mappedSize, psize); } else { @@ -410,8 +670,7 @@ static void injectCustomSize() // TODO - still need to handle the case of theme changes and resize, especially as we can't re-register a string. if ( !sizeMapDone ) { - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - bool dump = prefs->getBool( "/debug/icons/dumpDefault"); + bool dump = Inkscape::Preferences::get()->getBool("/debug/icons/dumpDefault"); gint width = 0; gint height = 0; if ( gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height ) ) { @@ -432,13 +691,6 @@ static void injectCustomSize() } sizeMapDone = true; } - - static bool hit = false; - if ( !hit ) { - hit = true; - inkyIcons = Gtk::IconFactory::create(); - inkyIcons->add_default(); - } } GtkIconSize Inkscape::getRegisteredIconSize( Inkscape::IconSize size ) @@ -463,7 +715,7 @@ int sp_icon_get_phys_size(int size) static int lastSys[Inkscape::ICON_SIZE_DECORATION + 1]; static int vals[Inkscape::ICON_SIZE_DECORATION + 1]; - size = CLAMP( size, GTK_ICON_SIZE_MENU, Inkscape::ICON_SIZE_DECORATION ); + size = CLAMP( size, static_cast(GTK_ICON_SIZE_MENU), static_cast(Inkscape::ICON_SIZE_DECORATION) ); if ( !sizeMapDone ) { injectCustomSize(); @@ -496,9 +748,7 @@ int sp_icon_get_phys_size(int size) if ( !init ) { sizeDirty = false; - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - bool dump = prefs->getBool("/debug/icons/dumpDefault"); - + bool dump = Inkscape::Preferences::get()->getBool("/debug/icons/dumpDefault"); if ( dump ) { g_message( "Default icon sizes:" ); } @@ -545,6 +795,11 @@ int sp_icon_get_phys_size(int size) i, gtkSizes[i], ( used ? ' ' : 'X' ), width, height, names[i]); } + + // The following is needed due to this documented behavior of gtk_icon_size_lookup: + // "The rendered pixbuf may not even correspond to the width/height returned by + // gtk_icon_size_lookup(), because themes are free to render the pixbuf however + // they like, including changing the usual size." gchar const *id = GTK_STOCK_OPEN; GdkPixbuf *pb = gtk_widget_render_icon( icon, id, gtkSizes[i], NULL); if (pb) { @@ -569,37 +824,40 @@ int sp_icon_get_phys_size(int size) return vals[size]; } -static void sp_icon_paint(SPIcon *icon, GdkRectangle const *area) +static void sp_icon_paint(SPIcon *icon, GdkRectangle const */*area*/) { GtkWidget &widget = *GTK_WIDGET(icon); - - GdkPixbuf *image = GTK_WIDGET_IS_SENSITIVE(&widget) ? icon->pb : icon->pb_faded; + GdkPixbuf *image = icon->pb; + bool unref_image = false; + + /* copied from the expose function of GtkImage */ + if (GTK_WIDGET_STATE (icon) != GTK_STATE_NORMAL && image) { + GtkIconSource *source = gtk_icon_source_new(); + gtk_icon_source_set_pixbuf(source, icon->pb); + gtk_icon_source_set_size(source, GTK_ICON_SIZE_SMALL_TOOLBAR); // note: this is boilerplate and not used + gtk_icon_source_set_size_wildcarded(source, FALSE); + image = gtk_style_render_icon (widget.style, source, gtk_widget_get_direction(&widget), + (GtkStateType) GTK_WIDGET_STATE(&widget), (GtkIconSize)-1, &widget, "gtk-image"); + gtk_icon_source_free(source); + unref_image = true; + } if (image) { - int const padx = ( ( widget.allocation.width > icon->psize ) - ? ( widget.allocation.width - icon->psize ) / 2 - : 0 ); - int const pady = ( ( widget.allocation.height > icon->psize ) - ? ( widget.allocation.height - icon->psize ) / 2 - : 0 ); - - int const x0 = std::max(area->x, widget.allocation.x + padx); - int const y0 = std::max(area->y, widget.allocation.y + pady); - int const x1 = std::min(area->x + area->width, widget.allocation.x + padx + static_cast(icon->psize) ); - int const y1 = std::min(area->y + area->height, widget.allocation.y + pady + static_cast(icon->psize) ); - - int width = x1 - x0; - int height = y1 - y0; + int x = floor(widget.allocation.x + ((widget.allocation.width - widget.requisition.width) * 0.5)); + int y = floor(widget.allocation.y + ((widget.allocation.height - widget.requisition.height) * 0.5)); + int width = gdk_pixbuf_get_width(image); + int height = gdk_pixbuf_get_height(image); // Limit drawing to when we actually have something. Avoids some crashes. if ( (width > 0) && (height > 0) ) { - gdk_draw_pixbuf(GDK_DRAWABLE(widget.window), NULL, image, - x0 - widget.allocation.x - padx, - y0 - widget.allocation.y - pady, - x0, y0, - width, height, - GDK_RGB_DITHER_NORMAL, x0, y0); + gdk_draw_pixbuf(GDK_DRAWABLE(widget.window), widget.style->black_gc, image, + 0, 0, x, y, width, height, + GDK_RGB_DITHER_NORMAL, x, y); } } + + if (unref_image) { + g_object_unref(G_OBJECT(image)); + } } GdkPixbuf *sp_icon_image_load_pixmap(gchar const *name, unsigned /*lsize*/, unsigned psize) @@ -654,21 +912,20 @@ extern "C" guchar * sp_icon_doc_icon( SPDocument *doc, NRArenaItem *root, gchar const *name, unsigned psize ) { - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - bool const dump = prefs->getBool("/debug/icons/dumpSvg"); + bool const dump = Inkscape::Preferences::get()->getBool("/debug/icons/dumpSvg"); guchar *px = NULL; if (doc) { SPObject *object = doc->getObjectById(name); if (object && SP_IS_ITEM(object)) { /* Find bbox in document */ - Geom::Matrix const i2doc(sp_item_i2doc_affine(SP_ITEM(object))); + Geom::Matrix const i2doc(SP_ITEM(object)->i2doc_affine()); Geom::OptRect dbox = SP_ITEM(object)->getBounds(i2doc); if ( SP_OBJECT_PARENT(object) == NULL ) { dbox = Geom::Rect(Geom::Point(0, 0), - Geom::Point(sp_document_width(doc), sp_document_height(doc))); + Geom::Point(doc->getWidth(), doc->getHeight())); } /* This is in document coordinates, i.e. pixels */ @@ -768,8 +1025,7 @@ sp_icon_doc_icon( SPDocument *doc, NRArenaItem *root, NR_ARENA_ITEM_RENDER_NO_CACHE ); nr_pixblock_release(&B); - bool useOverlay = prefs->getBool("/debug/icons/overlaySvg"); - if ( useOverlay ) { + if ( Inkscape::Preferences::get()->getBool("/debug/icons/overlaySvg") ) { sp_icon_overlay_pixels( px, psize, psize, 4 * psize, 0x00, 0x00, 0xff ); } } @@ -790,25 +1046,39 @@ struct svg_doc_cache_t static std::map doc_cache; static std::map pb_cache; -Glib::ustring icon_cache_key(gchar const *name, - unsigned lsize, unsigned psize) +Glib::ustring icon_cache_key(gchar const *name, unsigned psize) { Glib::ustring key=name; key += ":"; - key += lsize; - key += ":"; key += psize; return key; } GdkPixbuf *get_cached_pixbuf(Glib::ustring const &key) { + GdkPixbuf* pb = 0; std::map::iterator found = pb_cache.find(key); if ( found != pb_cache.end() ) { - return found->second; + pb = found->second; } - return NULL; + return pb; } +static std::list &icons_svg_paths() +{ + static std::list sources; + static bool initialized = false; + if (!initialized) { + // Fall back from user prefs dir into system locations. + gchar *userdir = profile_path("icons"); + sources.push_back(g_build_filename(userdir,"icons.svg", NULL)); + sources.push_back(g_build_filename(INKSCAPE_PIXMAPDIR, "icons.svg", NULL)); + g_free(userdir); + initialized = true; + } + return sources; +} + +// this function renders icons from icons.svg and returns the pixels. static guchar *load_svg_pixels(gchar const *name, unsigned /*lsize*/, unsigned psize) { @@ -816,19 +1086,12 @@ static guchar *load_svg_pixels(gchar const *name, NRArenaItem *root = NULL; svg_doc_cache_t *info = NULL; - // Fall back from user prefs dir into system locations. - Glib::ustring iconsvg = name; - iconsvg += ".svg"; - std::list sources; - sources.push_back(g_build_filename(profile_path("icons"),iconsvg.c_str(), NULL)); - sources.push_back(g_build_filename(profile_path("icons"),"icons.svg", NULL)); - sources.push_back(g_build_filename(INKSCAPE_PIXMAPDIR, iconsvg.c_str(), NULL)); - sources.push_back(g_build_filename(INKSCAPE_PIXMAPDIR, "icons.svg", NULL)); + std::list &sources = icons_svg_paths(); // Try each document in turn until we successfully load the icon from one guchar *px=NULL; - while ( !sources.empty() && !px ) { - gchar *doc_filename = sources.front(); + for (std::list::iterator i = sources.begin(); i != sources.end() && !px; ++i) { + gchar *doc_filename = *i; // Did we already load this doc? Glib::ustring key(doc_filename); @@ -843,17 +1106,37 @@ static guchar *load_svg_pixels(gchar const *name, /* Try to load from document. */ if (!info && Inkscape::IO::file_test( doc_filename, G_FILE_TEST_IS_REGULAR ) && - (doc = sp_document_new( doc_filename, FALSE )) ) { + (doc = SPDocument::createNewDoc( doc_filename, FALSE )) ) { + //g_message("Loaded icon file %s", doc_filename); // prep the document - sp_document_ensure_up_to_date(doc); + doc->ensureUpToDate(); /* Create new arena */ NRArena *arena = NRArena::create(); /* Create ArenaItem and set transform */ - unsigned visionkey = sp_item_display_key_new(1); + unsigned visionkey = SPItem::display_key_new(1); /* fixme: Memory manage root if needed (Lauris) */ - root = sp_item_invoke_show( SP_ITEM(SP_DOCUMENT_ROOT(doc)), - arena, visionkey, SP_ITEM_SHOW_DISPLAY ); + // This needs to be fixed indeed; this leads to a memory leak of a few megabytes these days + // because shapes are being rendered which are not being freed + // Valgrind output: + /*==7014== 1,548,344 bytes in 599 blocks are possibly lost in loss record 20,361 of 20,362 + ==7014== at 0x4A05974: operator new(unsigned long) (vg_replace_malloc.c:220) + ==7014== by 0x4F1015: __gnu_cxx::new_allocator::allocate(unsigned long, void const*) (new_allocator.h:89) + ==7014== by 0x4F02AC: std::_Vector_base >::_M_allocate(unsigned long) (stl_vector.h:140) + ==7014== by 0xCF62D7: std::vector >::_M_fill_insert(__gnu_cxx::__normal_iterator > >, unsigned long, Shape::point_data const&) (vector.tcc:414) + ==7014== by 0xCF4D45: std::vector >::insert(__gnu_cxx::__normal_iterator > >, unsigned long, Shape::point_data const&) (stl_vector.h:851) + ==7014== by 0xCF3DCD: std::vector >::resize(unsigned long, Shape::point_data) (stl_vector.h:557) + ==7014== by 0xCEA771: Shape::AddPoint(Geom::Point) (Shape.cpp:326) + ==7014== by 0xD0F413: Shape::ConvertToShape(Shape*, fill_typ, bool) (ShapeSweep.cpp:257) + ==7014== by 0x5ECD4F: nr_arena_shape_update_stroke(NRArenaShape*, NRGC*, NRRectL*) (nr-arena-shape.cpp:651) + ==7014== by 0x5EE0DA: nr_arena_shape_render(_cairo*, NRArenaItem*, NRRectL*, NRPixBlock*, unsigned int) (nr-arena-shape.cpp:862) + ==7014== by 0x5E72FB: nr_arena_item_invoke_render(_cairo*, NRArenaItem*, NRRectL const*, NRPixBlock*, unsigned int) (nr-arena-item.cpp:578) + ==7014== by 0x5E9DDE: nr_arena_group_render(_cairo*, NRArenaItem*, NRRectL*, NRPixBlock*, unsigned int) (nr-arena-group.cpp:228) + ==7014== by 0x5E72FB: nr_arena_item_invoke_render(_cairo*, NRArenaItem*, NRRectL const*, NRPixBlock*, unsigned int) (nr-arena-item.cpp:578) + ==7014== by 0x5E9DDE: nr_arena_group_render(_cairo*, NRArenaItem*, NRRectL*, NRPixBlock*, unsigned int) (nr-arena-group.cpp:228) + ==7014== by 0x5E72FB: nr_arena_item_invoke_render(_cairo*, NRArenaItem*, NRRectL const*, NRPixBlock*, unsigned int) (nr-arena-item.cpp:578) + */ + root = SP_ITEM(doc->getRoot())->invoke_show(arena, visionkey, SP_ITEM_SHOW_DISPLAY ); // store into the cache info = new svg_doc_cache_t; @@ -868,112 +1151,140 @@ static guchar *load_svg_pixels(gchar const *name, root=info->root; } - // toss the filename - g_free(doc_filename); - sources.pop_front(); - // move on to the next document if we couldn't get anything - if (!info && !doc) continue; + if (!info && !doc) { + continue; + } px = sp_icon_doc_icon( doc, root, name, psize ); +// if (px) { +// g_message("Found icon %s in %s", name, doc_filename); +// } } +// if (!px) { +// g_message("Not found icon %s", name); +// } return px; } -static void populate_placeholder_icon(gchar const* name, GtkIconSize size) -{ - if ( iconSetCache.find(name) == iconSetCache.end() ) { - // only add a placeholder if nothing is already set - Gtk::IconSet icnset; - Gtk::IconSource src; - src.set_icon_name( GTK_STOCK_MISSING_IMAGE ); - src.set_size( Gtk::IconSize(size) ); - icnset.add_source(src); - inkyIcons->add(Gtk::StockID(name), icnset); - } -} - static void addToIconSet(GdkPixbuf* pb, gchar const* name, GtkIconSize lsize, unsigned psize) { - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - static bool dump = prefs->getBool("/debug/icons/dumpGtk"); + static bool dump = Inkscape::Preferences::get()->getBool("/debug/icons/dumpGtk"); GtkStockItem stock; gboolean stockFound = gtk_stock_lookup( name, &stock ); - if ( !stockFound ) { + if ( !stockFound ) { Gtk::IconTheme::add_builtin_icon( name, psize, Glib::wrap(pb) ); if (dump) { g_message(" set in a builtin for %s:%d:%d", name, lsize, psize); } } +} - for ( std::vector::iterator it = iconSetCache[name].begin(); it != iconSetCache[name].end(); ++it ) { - if ( it->_lsize == lsize ) { - iconSetCache[name].erase(it); - break; +void Inkscape::queueIconPrerender( Glib::ustring const &name, Inkscape::IconSize lsize ) +{ + GtkStockItem stock; + gboolean stockFound = gtk_stock_lookup( name.c_str(), &stock ); + gboolean themedFound = gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), name.c_str()); + if (!stockFound && !themedFound ) { + gint trySize = CLAMP( static_cast(lsize), 0, static_cast(G_N_ELEMENTS(iconSizeLookup) - 1) ); + if ( !sizeMapDone ) { + injectCustomSize(); } + GtkIconSize mappedSize = iconSizeLookup[trySize]; + + int psize = sp_icon_get_phys_size(lsize); + // TODO place in a queue that is triggered by other map events + prerender_icon(name.c_str(), mappedSize, psize); } - iconSetCache[name].push_back(IconCacheItem(lsize, pb)); - - Gtk::IconSet icnset; - for ( std::vector::iterator it = iconSetCache[name].begin(); it != iconSetCache[name].end(); ++it ) { - Gtk::IconSource src; - g_object_ref( G_OBJECT(it->_pb) ); - src.set_pixbuf( Glib::wrap(it->_pb) ); - src.set_size( Gtk::IconSize(it->_lsize) ); - src.set_size_wildcarded( (it->_lsize != 1) || (iconSetCache[name].size() == 1) ); - src.set_state_wildcarded( true ); - icnset.add_source(src); - } - inkyIcons->add(Gtk::StockID(name), icnset); } // returns true if icon needed preloading, false if nothing was done bool prerender_icon(gchar const *name, GtkIconSize lsize, unsigned psize) { - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - static bool dump = prefs->getBool("/debug/icons/dumpGtk"); - Glib::ustring key = icon_cache_key(name, lsize, psize); - GdkPixbuf *pb = get_cached_pixbuf(key); - if (pb) { - return false; - } else { - pb = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), name, psize, - (GtkIconLookupFlags) 0, NULL); - if (!pb) { - guchar* px = load_svg_pixels(name, lsize, psize); - if ( !px ) { - // check for a fallback name - if ( legacyNames.find(name) != legacyNames.end() ) { - if ( dump ) { - g_message("load_svg_pixels([%s]=%s, %d, %d)", name, legacyNames[name].c_str(), lsize, psize); + bool loadNeeded = false; + static bool dump = Inkscape::Preferences::get()->getBool("/debug/icons/dumpGtk"); + static bool useCache = Inkscape::Preferences::get()->getBool("/debug/icons/useCache"); + + Glib::ustring key = icon_cache_key(name, psize); + if ( !get_cached_pixbuf(key) ) { + if ((internalNames.find(name) != internalNames.end()) + || (!gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), name))) { + if (dump) { + g_message("prerender_icon [%s] %d:%d", name, lsize, psize); + } + // In file encoding: + std::string iconCacheDir = Glib::build_filename(Glib::build_filename(Glib::get_user_cache_dir(), "inkscape"), "icons"); + std::string potentialFile = Glib::build_filename( iconCacheDir, name ); + potentialFile += ".png"; + + bool dataLoaded = false; + if ( useCache && Glib::file_test(potentialFile, Glib::FILE_TEST_EXISTS) && Glib::file_test(potentialFile, Glib::FILE_TEST_IS_REGULAR) ) { + Glib::RefPtr pb = Gdk::Pixbuf::create_from_file(potentialFile); + if (pb) { + dataLoaded = true; + GdkPixbuf *obj = pb->gobj(); + g_object_ref(obj); + pb_cache[key] = obj; + addToIconSet(obj, name, lsize, psize); + loadNeeded = true; + if (internalNames.find(name) == internalNames.end()) { + internalNames.insert(name); } - px = load_svg_pixels(legacyNames[name].c_str(), lsize, psize); } } - if (px) { - pb = gdk_pixbuf_new_from_data(px, GDK_COLORSPACE_RGB, TRUE, 8, - psize, psize, psize * 4, - (GdkPixbufDestroyNotify)g_free, NULL); - } else if (dump) { - g_message("XXXXXXXXXXXXXXXXXXXXXXXXXXXXX error!!! pixels not found for '%s'", name); + + if (!dataLoaded) { + guchar* px = load_svg_pixels(name, lsize, psize); + if ( !px ) { + // check for a fallback name + if ( legacyNames.find(name) != legacyNames.end() ) { + if ( dump ) { + g_message("load_svg_pixels([%s]=%s, %d, %d)", name, legacyNames[name].c_str(), lsize, psize); + } + px = load_svg_pixels(legacyNames[name].c_str(), lsize, psize); + } + } + if (px) { + GdkPixbuf* pb = gdk_pixbuf_new_from_data( px, GDK_COLORSPACE_RGB, TRUE, 8, + psize, psize, psize * 4, + reinterpret_cast(g_free), NULL ); + pb_cache[key] = pb; + addToIconSet(pb, name, lsize, psize); + loadNeeded = true; + if (internalNames.find(name) == internalNames.end()) { + internalNames.insert(name); + } + if (useCache) { + g_object_ref(pb); + Glib::RefPtr ppp = Glib::wrap(pb); + try { + ppp->save( potentialFile, "png" ); + } catch ( Glib::FileError &ex ) { + g_warning("FileError [%s]", ex.what().c_str()); + } catch ( Gdk::PixbufError &ex ) { + g_warning("PixbufError [%s]", ex.what().c_str()); + } + } + } else if (dump) { + g_message("XXXXXXXXXXXXXXXXXXXXXXXXXXXXX error!!! pixels not found for '%s'", name); + } } } - - if (pb) { - pb_cache[key] = pb; - addToIconSet(pb, name, lsize, psize); + else if (dump) { + g_message("prerender_icon [%s] %d NOT!!!!!!", name, psize); } - return true; } + return loadNeeded; } static GdkPixbuf *sp_icon_image_load_svg(gchar const *name, GtkIconSize lsize, unsigned psize) { - Glib::ustring key = icon_cache_key(name, lsize, psize); + Glib::ustring key = icon_cache_key(name, psize); // did we already load this icon at this scale/size? GdkPixbuf* pb = get_cached_pixbuf(key); if (!pb) { + g_message("YYYYYYYYYYYYY YYYYYYYYYYYYYYY two load_svg_pixels(%s, %d, %d)", name, lsize, psize); guchar *px = load_svg_pixels(name, lsize, psize); if (px) { pb = gdk_pixbuf_new_from_data(px, GDK_COLORSPACE_RGB, TRUE, 8, @@ -994,21 +1305,23 @@ static GdkPixbuf *sp_icon_image_load_svg(gchar const *name, GtkIconSize lsize, u void sp_icon_overlay_pixels(guchar *px, int width, int height, int stride, unsigned r, unsigned g, unsigned b) { - for ( int y = 0; y < height; y += 4 ) { + int bytesPerPixel = 4; + int spacing = 4; + for ( int y = 0; y < height; y += spacing ) { guchar *ptr = px + y * stride; - for ( int x = 0; x < width; x += 4 ) { + for ( int x = 0; x < width; x += spacing ) { *(ptr++) = r; *(ptr++) = g; *(ptr++) = b; *(ptr++) = 0xff; - ptr += 4 * 3; + ptr += bytesPerPixel * (spacing - 1); } } if ( width > 1 && height > 1 ) { // point at the last pixel - guchar *ptr = px + ((height-1) * stride) + ((width - 1) * 4); + guchar *ptr = px + ((height-1) * stride) + ((width - 1) * bytesPerPixel); if ( width > 2 ) { px[4] = r; @@ -1073,7 +1386,9 @@ static void addPreRender( GtkIconSize lsize, gchar const *name ) } gboolean icon_prerender_task(gpointer /*data*/) { - if (!pendingRenders.empty()) { + if ( inkscapeIsCrashing() ) { + // stop + } else if (!pendingRenders.empty()) { bool workDone = false; do { preRenderItem single = pendingRenders.front(); @@ -1083,7 +1398,7 @@ gboolean icon_prerender_task(gpointer /*data*/) { } while (!pendingRenders.empty() && !workDone); } - if (!pendingRenders.empty()) { + if (!inkscapeIsCrashing() && !pendingRenders.empty()) { return TRUE; } else { callbackHooked = false; @@ -1099,12 +1414,12 @@ void imageMapCB(GtkWidget* widget, gpointer user_data) { GtkIconSize lsize = static_cast(GPOINTER_TO_INT(user_data)); if ( id ) { int psize = sp_icon_get_phys_size(lsize); - //g_message("imageMapCB(%p) for %s:%d:%d", widget, id, lsize, psize); + g_message("imageMapCB(%p) for [%s]:%d:%d", widget, id, lsize, psize); for ( std::vector::iterator it = pendingRenders.begin(); it != pendingRenders.end(); ++it ) { if ( (it->_name == id) && (it->_lsize == lsize) ) { prerender_icon(id, lsize, psize); pendingRenders.erase(it); - //g_message(" prerender for %s:%d:%d", id, lsize, psize); + g_message(" prerender for %s:%d:%d", id, lsize, psize); if (lsize != size) { int psize = sp_icon_get_phys_size(size); prerender_icon(id, size, psize); @@ -1125,6 +1440,16 @@ static void imageMapNamedCB(GtkWidget* widget, gpointer user_data) { if ( iconName ) { GtkImageType type = gtk_image_get_storage_type( GTK_IMAGE(img) ); if ( type == GTK_IMAGE_ICON_NAME ) { + + gint iconSize = 0; + gchar* iconName = 0; + { + g_object_get(G_OBJECT(widget), + "icon-name", &iconName, + "icon-size", &iconSize, + NULL); + } + for ( std::vector::iterator it = pendingRenders.begin(); it != pendingRenders.end(); ++it ) { if ( (it->_name == iconName) && (it->_lsize == size) ) { int psize = sp_icon_get_phys_size(size); @@ -1134,6 +1459,8 @@ static void imageMapNamedCB(GtkWidget* widget, gpointer user_data) { } } + gtk_image_set_from_icon_name(img, "", (GtkIconSize)iconSize); + gtk_image_set_from_icon_name(img, iconName, (GtkIconSize)iconSize); } else { g_warning("UNEXPECTED TYPE of %d", (int)type); } @@ -1152,4 +1479,4 @@ static void imageMapNamedCB(GtkWidget* widget, gpointer user_data) { fill-column:99 End: */ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 : +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :