X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fwidgets%2Ficon.cpp;h=41c4ca5df5370139629e52cf7be5239091b21cd1;hb=2eff5d815d33c0d2005d7cb11ff4a352c3438d4c;hp=3f398b9e67dbebfe3ff22c9f4684b96cc7e5ae65;hpb=e77e2e02d8ab186389f86e48b1834d95f51cf68d;p=inkscape.git diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp index 3f398b9e6..41c4ca5df 100644 --- a/src/widgets/icon.cpp +++ b/src/widgets/icon.cpp @@ -20,6 +20,10 @@ #include #include #include +#include +#include +#include +#include #include #include "path-prefix.h" @@ -54,10 +58,8 @@ static void sp_icon_screen_changed( GtkWidget *widget, GdkScreen *previous_scree static void sp_icon_style_set( GtkWidget *widget, GtkStyle *previous_style ); static void sp_icon_theme_changed( SPIcon *icon ); -static guchar *sp_icon_image_load_pixmap(gchar const *name, unsigned lsize, unsigned psize); -static guchar *sp_icon_image_load_svg(gchar const *name, unsigned lsize, unsigned psize); - -static guchar *sp_icon_image_load(SPIcon *icon, gchar const *name); +static GdkPixbuf *sp_icon_image_load_pixmap(gchar const *name, unsigned lsize, unsigned psize); +static GdkPixbuf *sp_icon_image_load_svg(gchar const *name, unsigned lsize, unsigned psize); static void sp_icon_overlay_pixels( guchar *px, int width, int height, int stride, unsigned r, unsigned g, unsigned b ); @@ -80,6 +82,20 @@ static GtkIconSize iconSizeLookup[] = { GTK_ICON_SIZE_MENU, // for Inkscape::ICON_SIZE_DECORATION }; +class IconCacheItem +{ +public: + IconCacheItem( Inkscape::IconSize lsize, GdkPixbuf* pb ) : + _lsize( lsize ), + _pb( pb ) + {} + Inkscape::IconSize _lsize; + GdkPixbuf* _pb; +}; + +static Glib::RefPtr inkyIcons; +static std::map > iconSetCache; + GtkType sp_icon_get_type() { @@ -195,36 +211,22 @@ static int sp_icon_expose(GtkWidget *widget, GdkEventExpose *event) return TRUE; } +// PUBLIC CALL: void sp_icon_fetch_pixbuf( SPIcon *icon ) { if ( icon ) { if ( !icon->pb ) { - guchar *pixels = 0; - icon->psize = sp_icon_get_phys_size(icon->lsize); - pixels = sp_icon_image_load( icon, icon->name ); + GdkPixbuf *pb = sp_icon_image_load_svg( icon->name, icon->lsize, icon->psize ); + if (!pb) { + pb = sp_icon_image_load_pixmap( icon->name, icon->lsize, icon->psize ); + } - if (pixels) { - // don't pass the g_free because we're caching the pixel - // space loaded through ... - // I just changed this. make sure sp_icon_image_load still does the right thing. - icon->pb = gdk_pixbuf_new_from_data(pixels, GDK_COLORSPACE_RGB, TRUE, 8, - icon->psize, icon->psize, icon->psize * 4, - /*(GdkPixbufDestroyNotify)g_free*/NULL, NULL); + if ( pb ) { + icon->pb = pb; icon->pb_faded = gdk_pixbuf_copy(icon->pb); - - pixels = gdk_pixbuf_get_pixels(icon->pb_faded); - size_t stride = gdk_pixbuf_get_rowstride(icon->pb_faded); - pixels += 3; // alpha - for ( int row = 0 ; row < icon->psize ; row++ ) { - guchar *row_pixels = pixels; - for ( int column = 0 ; column < icon->psize ; column++ ) { - *row_pixels = *row_pixels >> 1; - row_pixels += 4; - } - pixels += stride; - } + 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); @@ -260,52 +262,94 @@ 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, unsigned lsize); +static bool prerender_icon(gchar const *name, unsigned lsize, unsigned psize); +static Glib::ustring icon_cache_key(gchar const *name, unsigned lsize, 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"; +} + static GtkWidget * sp_icon_new_full( Inkscape::IconSize lsize, gchar const *name ) { static gint dump = prefs_get_int_attribute_limited( "debug.icons", "dumpGtk", 0, 0, 1 ); - static gint fallback = prefs_get_int_attribute_limited( "debug.icons", "checkNames", 0, 0, 1 ); - - addPreRender( lsize, name ); - - GtkStockItem stock; - gboolean tryLoad = gtk_stock_lookup( name, &stock ); - if ( !tryLoad && fallback ) { - tryLoad |= strncmp("gtk-", name, 4 ) == 0; - } - if ( !tryLoad && fallback ) { - tryLoad |= strncmp("gnome-", name, 6 ) == 0; - } GtkWidget *widget = 0; - if ( tryLoad ) { gint trySize = CLAMP( static_cast(lsize), 0, static_cast(G_N_ELEMENTS(iconSizeLookup) - 1) ); if ( !sizeMapDone ) { injectCustomSize(); } - GtkWidget *img = gtk_image_new_from_stock( name, iconSizeLookup[trySize] ); + GtkStockItem stock; + gboolean stockFound = gtk_stock_lookup( name, &stock ); + + GtkWidget *img = 0; + if ( legacyNames.empty() ) { + setupLegacyNaming(); + } + + bool flagMe = false; + if ( legacyNames.find(name) != legacyNames.end() ) { + img = gtk_image_new_from_icon_name( name, iconSizeLookup[trySize] ); + flagMe = true; + if ( dump ) { + g_message("gtk_image_new_from_icon_name( '%s', %d ) = %p", name, iconSizeLookup[trySize], 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, iconSizeLookup[trySize] ); + } + if ( img ) { GtkImageType type = gtk_image_get_storage_type( GTK_IMAGE(img) ); 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, lsize ); + addPreRender( lsize, name ); + + // Add a hook to render if set visible before prerender is done. + g_signal_connect( G_OBJECT(img), "map", G_CALLBACK(imageMapCB), GINT_TO_POINTER(0) ); + } widget = GTK_WIDGET(img); img = 0; - if ( dump ) { - g_message( "loaded gtk '%s' %d (GTK_IMAGE_STOCK)", name, lsize ); + g_message( "loaded gtk '%s' %d (GTK_IMAGE_STOCK) %s", name, lsize, (stockFound ? "STOCK" : "local") ); + } + } else if ( type == GTK_IMAGE_ICON_NAME ) { + widget = GTK_WIDGET(img); + img = 0; + + // 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_get_int_attribute_limited( "options.iconrender", "named_nodelay", 0, 0, 1 ) ) { + int psize = sp_icon_get_phys_size(lsize); + prerender_icon(name, lsize, psize); + } else { + addPreRender( lsize, name ); } } else { if ( dump ) { g_message( "skipped gtk '%s' %d (not GTK_IMAGE_STOCK)", name, lsize ); } - g_object_unref( (GObject *)img ); + //g_object_unref( (GObject *)img ); img = 0; } } - } if ( !widget ) { + //g_message("Creating an SPIcon instance for %s:%d", name, (int)lsize); SPIcon *icon = (SPIcon *)g_object_new(SP_TYPE_ICON, NULL); icon->lsize = lsize; icon->name = g_strdup(name); @@ -323,6 +367,7 @@ sp_icon_new( Inkscape::IconSize lsize, gchar const *name ) return sp_icon_new_full( lsize, name ); } +// PUBLIC CALL: Gtk::Widget *sp_icon_get_icon( Glib::ustring const &oid, Inkscape::IconSize size ) { Gtk::Widget *result = 0; @@ -340,30 +385,18 @@ Gtk::Widget *sp_icon_get_icon( Glib::ustring const &oid, Inkscape::IconSize size return result; } -// Try to load the named svg, falling back to pixmaps -guchar * -sp_icon_image_load( SPIcon *icon, gchar const *name ) -{ - guchar *px = sp_icon_image_load_svg( name, icon->lsize, icon->psize ); - if (!px) { - px = sp_icon_image_load_pixmap(name, icon->lsize, icon->psize); - } - - return px; -} - GtkIconSize sp_icon_get_gtk_size(int size) { - static GtkIconSize map[64] = {(GtkIconSize)0}; + static GtkIconSize sizemap[64] = {(GtkIconSize)0}; size = CLAMP(size, 4, 63); - if (!map[size]) { + if (!sizemap[size]) { static int count = 0; char c[64]; g_snprintf(c, 64, "InkscapeIcon%d", count++); - map[size] = gtk_icon_size_register(c, size, size); + sizemap[size] = gtk_icon_size_register(c, size, size); } - return map[size]; + return sizemap[size]; } static void injectCustomSize() @@ -393,8 +426,15 @@ static void injectCustomSize() sizeMapDone = true; } + static bool hit = false; + if ( !hit ) { + hit = true; + inkyIcons = Gtk::IconFactory::create(); + inkyIcons->add_default(); + } } +// PUBLIC CALL: int sp_icon_get_phys_size(int size) { static bool init = false; @@ -539,14 +579,9 @@ static void sp_icon_paint(SPIcon *icon, GdkRectangle const *area) } } -static guchar * -sp_icon_image_load_pixmap(gchar const *name, unsigned /*lsize*/, unsigned psize) +GdkPixbuf *sp_icon_image_load_pixmap(gchar const *name, unsigned /*lsize*/, unsigned psize) { - gchar *path; - guchar *px; - GdkPixbuf *pb; - - path = (gchar *) g_strdup_printf("%s/%s.png", INKSCAPE_PIXMAPDIR, name); + gchar *path = (gchar *) g_strdup_printf("%s/%s.png", INKSCAPE_PIXMAPDIR, name); // TODO: bulia, please look over gsize bytesRead = 0; gsize bytesWritten = 0; @@ -556,7 +591,7 @@ sp_icon_image_load_pixmap(gchar const *name, unsigned /*lsize*/, unsigned psize) &bytesRead, &bytesWritten, &error); - pb = gdk_pixbuf_new_from_file(localFilename, NULL); + GdkPixbuf *pb = gdk_pixbuf_new_from_file(localFilename, NULL); g_free(localFilename); g_free(path); if (!pb) { @@ -574,27 +609,21 @@ sp_icon_image_load_pixmap(gchar const *name, unsigned /*lsize*/, unsigned psize) g_free(localFilename); g_free(path); } + if (pb) { - if (!gdk_pixbuf_get_has_alpha(pb)) + if (!gdk_pixbuf_get_has_alpha(pb)) { gdk_pixbuf_add_alpha(pb, FALSE, 0, 0, 0); + } + if ( ( static_cast(gdk_pixbuf_get_width(pb)) != psize ) || ( static_cast(gdk_pixbuf_get_height(pb)) != psize ) ) { GdkPixbuf *spb = gdk_pixbuf_scale_simple(pb, psize, psize, GDK_INTERP_HYPER); g_object_unref(G_OBJECT(pb)); pb = spb; } - guchar *spx = gdk_pixbuf_get_pixels(pb); - int srs = gdk_pixbuf_get_rowstride(pb); - px = g_new(guchar, 4 * psize * psize); - for (unsigned y = 0; y < psize; y++) { - memcpy(px + 4 * y * psize, spx + y * srs, 4 * psize); - } - g_object_unref(G_OBJECT(pb)); - - return px; } - return NULL; + return pb; } // takes doc, root, icon, and icon name to produce pixels @@ -609,13 +638,17 @@ sp_icon_doc_icon( SPDocument *doc, NRArenaItem *root, SPObject *object = doc->getObjectById(name); if (object && SP_IS_ITEM(object)) { /* Find bbox in document */ - NR::Matrix const i2doc(from_2geom(sp_item_i2doc_affine(SP_ITEM(object)))); - NR::Maybe dbox = SP_ITEM(object)->getBounds(i2doc); + Geom::Matrix const i2doc(sp_item_i2doc_affine(SP_ITEM(object))); + boost::optional nrdbox = SP_ITEM(object)->getBounds(i2doc); + boost::optional dbox; + if (nrdbox) { + dbox = to_2geom(*nrdbox); + } if ( SP_OBJECT_PARENT(object) == NULL ) { - dbox = NR::Rect(NR::Point(0, 0), - NR::Point(sp_document_width(doc), sp_document_height(doc))); + dbox = Geom::Rect(Geom::Point(0, 0), + Geom::Point(sp_document_width(doc), sp_document_height(doc))); } /* This is in document coordinates, i.e. pixels */ @@ -623,17 +656,17 @@ sp_icon_doc_icon( SPDocument *doc, NRArenaItem *root, NRGC gc(NULL); /* Update to renderable state */ double sf = 1.0; - nr_arena_item_set_transform(root, NR::Matrix(NR::scale(sf, sf))); + nr_arena_item_set_transform(root, (Geom::Matrix)Geom::Scale(sf, sf)); gc.transform.set_identity(); nr_arena_item_invoke_update( root, NULL, &gc, NR_ARENA_ITEM_STATE_ALL, NR_ARENA_ITEM_STATE_NONE ); /* Item integer bbox in points */ NRRectL ibox; - ibox.x0 = (int) floor(sf * dbox->min()[NR::X] + 0.5); - ibox.y0 = (int) floor(sf * dbox->min()[NR::Y] + 0.5); - ibox.x1 = (int) floor(sf * dbox->max()[NR::X] + 0.5); - ibox.y1 = (int) floor(sf * dbox->max()[NR::Y] + 0.5); + ibox.x0 = (int) floor(sf * dbox->min()[Geom::X] + 0.5); + ibox.y0 = (int) floor(sf * dbox->min()[Geom::Y] + 0.5); + ibox.x1 = (int) floor(sf * dbox->max()[Geom::X] + 0.5); + ibox.y1 = (int) floor(sf * dbox->max()[Geom::Y] + 0.5); if ( dump ) { g_message( " box --'%s' (%f,%f)-(%f,%f)", name, (double)ibox.x0, (double)ibox.y0, (double)ibox.x1, (double)ibox.y1 ); @@ -655,16 +688,16 @@ sp_icon_doc_icon( SPDocument *doc, NRArenaItem *root, } sf = (double)psize / (double)block; - nr_arena_item_set_transform(root, NR::Matrix(NR::scale(sf, sf))); + nr_arena_item_set_transform(root, (Geom::Matrix)Geom::Scale(sf, sf)); gc.transform.set_identity(); nr_arena_item_invoke_update( root, NULL, &gc, NR_ARENA_ITEM_STATE_ALL, NR_ARENA_ITEM_STATE_NONE ); /* Item integer bbox in points */ - ibox.x0 = (int) floor(sf * dbox->min()[NR::X] + 0.5); - ibox.y0 = (int) floor(sf * dbox->min()[NR::Y] + 0.5); - ibox.x1 = (int) floor(sf * dbox->max()[NR::X] + 0.5); - ibox.y1 = (int) floor(sf * dbox->max()[NR::Y] + 0.5); + ibox.x0 = (int) floor(sf * dbox->min()[Geom::X] + 0.5); + ibox.y0 = (int) floor(sf * dbox->min()[Geom::Y] + 0.5); + ibox.x1 = (int) floor(sf * dbox->max()[Geom::X] + 0.5); + ibox.y1 = (int) floor(sf * dbox->max()[Geom::Y] + 0.5); if ( dump ) { g_message( " box2 --'%s' (%f,%f)-(%f,%f)", name, (double)ibox.x0, (double)ibox.y0, (double)ibox.x1, (double)ibox.y1 ); @@ -735,10 +768,10 @@ struct svg_doc_cache_t }; static std::map doc_cache; -static std::map px_cache; +static std::map pb_cache; -static Glib::ustring icon_cache_key(gchar const *name, - unsigned lsize, unsigned psize) +Glib::ustring icon_cache_key(gchar const *name, + unsigned lsize, unsigned psize) { Glib::ustring key=name; key += ":"; @@ -748,9 +781,9 @@ static Glib::ustring icon_cache_key(gchar const *name, return key; } -static guchar *get_cached_pixels(Glib::ustring const &key) { - std::map::iterator found=px_cache.find(key); - if ( found != px_cache.end() ) { +GdkPixbuf *get_cached_pixbuf(Glib::ustring const &key) { + std::map::iterator found = pb_cache.find(key); + if ( found != pb_cache.end() ) { return found->second; } return NULL; @@ -828,36 +861,106 @@ static guchar *load_svg_pixels(gchar const *name, return px; } +static void populate_placeholder_icon(gchar const* name, unsigned lsize) +{ + 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(lsize) ); + icnset.add_source(src); + inkyIcons->add(Gtk::StockID(name), icnset); + } +} + +static void addToIconSet(GdkPixbuf* pb, gchar const* name, unsigned lsize, unsigned psize) { + static gint dump = prefs_get_int_attribute_limited( "debug.icons", "dumpGtk", 0, 0, 1 ); + GtkStockItem stock; + gboolean stockFound = gtk_stock_lookup( name, &stock ); + 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 == Inkscape::IconSize(lsize) ) { + iconSetCache[name].erase(it); + break; + } + } + iconSetCache[name].push_back(IconCacheItem(Inkscape::IconSize(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 -static bool prerender_icon(gchar const *name, unsigned lsize, unsigned psize) +bool prerender_icon(gchar const *name, unsigned lsize, unsigned psize) { + static gint dump = prefs_get_int_attribute_limited( "debug.icons", "dumpGtk", 0, 0, 1 ); Glib::ustring key = icon_cache_key(name, lsize, psize); - guchar *px = get_cached_pixels(key); - if (px) { + GdkPixbuf *pb = get_cached_pixbuf(key); + if (pb) { return false; } else { - px = load_svg_pixels(name, lsize, psize); + 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) { - px_cache[key] = px; + pb = gdk_pixbuf_new_from_data(px, GDK_COLORSPACE_RGB, TRUE, 8, + psize, psize, psize * 4, + (GdkPixbufDestroyNotify)g_free, NULL); + pb_cache[key] = pb; + addToIconSet(pb, name, lsize, psize); + } else if (dump) { + g_message("XXXXXXXXXXXXXXXXXXXXXXXXXXXXX error!!! pixels not found for '%s'", name); } return true; } } -static guchar * -sp_icon_image_load_svg(gchar const *name, unsigned lsize, unsigned psize) +static GdkPixbuf *sp_icon_image_load_svg(gchar const *name, unsigned lsize, unsigned psize) { Glib::ustring key = icon_cache_key(name, lsize, psize); // did we already load this icon at this scale/size? - guchar *px = get_cached_pixels(key); - if (!px) { - px = load_svg_pixels(name, lsize, psize); + GdkPixbuf* pb = get_cached_pixbuf(key); + if (!pb) { + guchar *px = load_svg_pixels(name, lsize, psize); if (px) { - px_cache[key] = px; + pb = gdk_pixbuf_new_from_data(px, GDK_COLORSPACE_RGB, TRUE, 8, + psize, psize, psize * 4, + (GdkPixbufDestroyNotify)g_free, NULL); + pb_cache[key] = pb; + addToIconSet(pb, name, lsize, psize); } } - return px; + + if ( pb ) { + // increase refcount since we're handing out ownership + g_object_ref(G_OBJECT(pb)); + } + return pb; } void sp_icon_overlay_pixels(guchar *px, int width, int height, int stride, @@ -927,29 +1030,29 @@ public: }; -#include - -static std::queue pendingRenders; +static std::vector pendingRenders; static bool callbackHooked = false; static void addPreRender( Inkscape::IconSize lsize, gchar const *name ) { - if ( !callbackHooked ) { callbackHooked = true; g_idle_add_full( G_PRIORITY_LOW, &icon_prerender_task, NULL, NULL ); } - pendingRenders.push(preRenderItem(lsize, name)); + pendingRenders.push_back(preRenderItem(lsize, name)); } gboolean icon_prerender_task(gpointer /*data*/) { if (!pendingRenders.empty()) { - preRenderItem single=pendingRenders.front(); - pendingRenders.pop(); - int psize = sp_icon_get_phys_size(single._lsize); - prerender_icon(single._name.c_str(), single._lsize, psize); + bool workDone = false; + do { + preRenderItem single = pendingRenders.front(); + pendingRenders.erase(pendingRenders.begin()); + int psize = sp_icon_get_phys_size(single._lsize); + workDone = prerender_icon(single._name.c_str(), single._lsize, psize); + } while (!pendingRenders.empty() && !workDone); } if (!pendingRenders.empty()) { @@ -960,6 +1063,51 @@ gboolean icon_prerender_task(gpointer /*data*/) { } } + +void imageMapCB(GtkWidget* widget, gpointer user_data) { + gchar* id = 0; + GtkIconSize size = GTK_ICON_SIZE_INVALID; + gtk_image_get_stock(GTK_IMAGE(widget), &id, &size); + if ( id ) { + for ( std::vector::iterator it = pendingRenders.begin(); it != pendingRenders.end(); ++it ) { + if ( (it->_name == id) && (it->_lsize == static_cast(size)) ) { + int psize = sp_icon_get_phys_size(size); + prerender_icon(id, size, psize); + pendingRenders.erase(it); + break; + } + } + } + + g_signal_handlers_disconnect_by_func(widget, (gpointer)imageMapCB, user_data); +} + +static void imageMapNamedCB(GtkWidget* widget, gpointer user_data) { + GtkImage* img = GTK_IMAGE(widget); + gchar const* iconName = 0; + GtkIconSize size = GTK_ICON_SIZE_INVALID; + gtk_image_get_icon_name(img, &iconName, &size); + if ( iconName ) { + GtkImageType type = gtk_image_get_storage_type( GTK_IMAGE(img) ); + if ( type == GTK_IMAGE_ICON_NAME ) { + for ( std::vector::iterator it = pendingRenders.begin(); it != pendingRenders.end(); ++it ) { + if ( (it->_name == iconName) && (it->_lsize == static_cast(size)) ) { + int psize = sp_icon_get_phys_size(size); + prerender_icon(iconName, size, psize); + pendingRenders.erase(it); + break; + } + } + + } else { + g_warning("UNEXPECTED TYPE of %d", (int)type); + } + } + + g_signal_handlers_disconnect_by_func(widget, (gpointer)imageMapNamedCB, user_data); +} + + /* Local Variables: mode:c++