![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index 498a2499807a3f65628f1266a26f08062fe049df..ec3af771e4e6ada345c3030eca7162b40243ce6a 100644 (file)
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
#include <cstring>
#include <glib/gmem.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkimage.h>
-#include <gtkmm/image.h>
+#include <gtk/gtk.h>
+#include <gtkmm.h>
#include "path-prefix.h"
-#include "prefs-utils.h"
+#include "preferences.h"
#include "inkscape.h"
#include "document.h"
#include "sp-item.h"
#include "icon.h"
-static gboolean icon_prerender_task(gpointer data);
-
-static void addPreRender( Inkscape::IconSize 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);
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, GtkIconSize lsize, unsigned psize);
static void sp_icon_overlay_pixels( guchar *px, int width, int height, int stride,
unsigned r, unsigned g, unsigned b );
GTK_ICON_SIZE_MENU, // for Inkscape::ICON_SIZE_DECORATION
};
-GtkType
+class IconCacheItem
+{
+public:
+ IconCacheItem( GtkIconSize lsize, GdkPixbuf* pb ) :
+ _lsize( lsize ),
+ _pb( pb )
+ {}
+ GtkIconSize _lsize;
+ GdkPixbuf* _pb;
+};
+
+static Glib::RefPtr<Gtk::IconFactory> inkyIcons;
+
+GType
sp_icon_get_type()
{
- static GtkType type = 0;
+ //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 GType type = 0;
if (!type) {
- GtkTypeInfo info = {
- "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;
}
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;
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);
icon->name = 0;
}
- ((GtkObjectClass *) (parent_class))->destroy(object);
+ ((GObjectClass *) (parent_class))->dispose(object);
}
static void sp_icon_reset( 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
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);
+ GtkIconTheme *theme = gtk_icon_theme_get_default();
- pixels = sp_icon_image_load( icon, icon->name );
-
- 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);
- 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;
+ GdkPixbuf *pb = 0;
+ if (gtk_icon_theme_has_icon(theme, icon->name)) {
+ pb = gtk_icon_theme_load_icon(theme, icon->name, icon->psize, (GtkIconLookupFlags) 0, NULL);
+ }
+ if (!pb) {
+ pb = sp_icon_image_load_svg( icon->name, Inkscape::getRegisteredIconSize(icon->lsize), icon->psize );
+ // if this was loaded from SVG, add it as a builtin icon
+ if (pb) {
+ gtk_icon_theme_add_builtin_icon(icon->name, icon->psize, pb);
}
+ }
+ if (!pb) {
+ pb = sp_icon_image_load_pixmap( icon->name, icon->lsize, icon->psize );
+ }
+ if ( pb ) {
+ icon->pb = pb;
} else {
/* TODO: We should do something more useful if we can't load the image. */
g_warning ("failed to load icon '%s'", icon->name);
}
+static Glib::ustring icon_cache_key(gchar const *name, unsigned lsize, unsigned psize);
+static GdkPixbuf *get_cached_pixbuf(Glib::ustring const &key);
+
+std::map<Glib::ustring, Glib::ustring> 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 );
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ static bool dump = prefs->getBool( "/debug/icons/dumpGtk");
- addPreRender( lsize, name );
+ GtkWidget *widget = 0;
+ gint trySize = CLAMP( static_cast<gint>(lsize), 0, static_cast<gint>(G_N_ELEMENTS(iconSizeLookup) - 1) );
+ if ( !sizeMapDone ) {
+ injectCustomSize();
+ }
+ GtkIconSize mappedSize = iconSizeLookup[trySize];
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;
- }
+ gboolean stockFound = gtk_stock_lookup( name, &stock );
- GtkWidget *widget = 0;
- if ( tryLoad ) {
- gint trySize = CLAMP( static_cast<gint>(lsize), 0, static_cast<gint>(G_N_ELEMENTS(iconSizeLookup) - 1) );
+ GtkWidget *img = 0;
+ if ( legacyNames.empty() ) {
+ setupLegacyNaming();
+ }
- if ( !sizeMapDone ) {
- injectCustomSize();
+ if ( stockFound ) {
+ img = gtk_image_new_from_stock( name, mappedSize );
+ }
+ else if ( legacyNames.find(name) != legacyNames.end() ) {
+ 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"));
}
+ }
- GtkWidget *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 ) {
- widget = GTK_WIDGET(img);
- img = 0;
+ 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
+ // TODO restore: populate_placeholder_icon( name, mappedSize );
+ // TODO restore: addPreRender( mappedSize, name );
+ // Add a hook to render if set visible before prerender is done.
+ // TODO restore g_signal_connect( G_OBJECT(img), "map", G_CALLBACK(imageMapCB), GINT_TO_POINTER(static_cast<int>(mappedSize)) );
if ( dump ) {
- g_message( "loaded gtk '%s' %d (GTK_IMAGE_STOCK)", name, lsize );
+ g_message(" connecting %p for imageMapCB for [%s] %d", img, name, (int)mappedSize);
}
+ }
+ widget = GTK_WIDGET(img);
+ img = 0;
+ if ( dump ) {
+ g_message( "loaded gtk '%s' %d (GTK_IMAGE_STOCK) %s on %p", name, mappedSize, (stockFound ? "STOCK" : "local"), widget );
+ }
+ } 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.
+ // TODO restore g_signal_connect( G_OBJECT(widget), "map", G_CALLBACK(imageMapNamedCB), GINT_TO_POINTER(0) );
+
+ if ( prefs->getBool("/options/iconrender/named_nodelay") ) {
+ // TODO restore int psize = sp_icon_get_phys_size(lsize);
+ // TODO restore prerender_icon(name, mappedSize, psize);
} else {
- if ( dump ) {
- g_message( "skipped gtk '%s' %d (not GTK_IMAGE_STOCK)", name, lsize );
- }
- g_object_unref( (GObject *)img );
- img = 0;
+ // TODO restore addPreRender( mappedSize, name );
+ }
+ } else {
+ if ( dump ) {
+ g_message( "skipped gtk '%s' %d (not GTK_IMAGE_STOCK)", name, lsize );
}
+ //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);
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;
- GtkWidget *widget = sp_icon_new_full( size, oid.c_str() );
+ GtkWidget *widget = sp_icon_new_full( static_cast<Inkscape::IconSize>(Inkscape::getRegisteredIconSize(size)), oid.c_str() );
if ( widget ) {
if ( GTK_IS_IMAGE(widget) ) {
@@ -340,38 +384,28 @@ 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()
{
// TODO - still need to handle the case of theme changes and resize, especially as we can't re-register a string.
if ( !sizeMapDone )
{
- gint dump = prefs_get_int_attribute_limited( "debug.icons", "dumpDefault", 0, 0, 1 );
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ bool dump = prefs->getBool( "/debug/icons/dumpDefault");
gint width = 0;
gint height = 0;
if ( gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height ) ) {
sizeMapDone = true;
}
+ static bool hit = false;
+ if ( !hit ) {
+ hit = true;
+ inkyIcons = Gtk::IconFactory::create();
+ inkyIcons->add_default();
+ }
+}
+
+GtkIconSize Inkscape::getRegisteredIconSize( Inkscape::IconSize size )
+{
+ GtkIconSize other = GTK_ICON_SIZE_MENU;
+ injectCustomSize();
+ size = CLAMP( size, Inkscape::ICON_SIZE_MENU, Inkscape::ICON_SIZE_DECORATION );
+ if ( size == Inkscape::ICON_SIZE_DECORATION ) {
+ other = gtk_icon_size_from_name("inkscape-decoration");
+ } else {
+ other = static_cast<GtkIconSize>(size);
+ }
+
+ return other;
}
+
+// PUBLIC CALL:
int sp_icon_get_phys_size(int size)
{
static bool init = false;
if ( !init ) {
sizeDirty = false;
- gint dump = prefs_get_int_attribute_limited( "debug.icons", "dumpDefault", 0, 0, 1 );
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ bool dump = prefs->getBool("/debug/icons/dumpDefault");
if ( dump ) {
g_message( "Default icon sizes:" );
init = true;
}
+ // Fixup workaround
+ if ((size == GTK_ICON_SIZE_MENU) || (size == GTK_ICON_SIZE_SMALL_TOOLBAR) || (size == GTK_ICON_SIZE_LARGE_TOOLBAR)) {
+ gint width = 0;
+ gint height = 0;
+ if ( gtk_icon_size_lookup( static_cast<GtkIconSize>(size), &width, &height ) ) {
+ vals[size] = std::max( width, height );
+ }
+ }
+
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 = icon->pb;
+ bool unref_image = false;
- GdkPixbuf *image = GTK_WIDGET_IS_SENSITIVE(&widget) ? icon->pb : icon->pb_faded;
+ /* 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<int>(icon->psize) );
- int const y1 = std::min(area->y + area->height, widget.allocation.y + pady + static_cast<int>(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));
+ }
}
-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 +620,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 +638,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<unsigned>(gdk_pixbuf_get_width(pb)) != psize )
|| ( static_cast<unsigned>(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
sp_icon_doc_icon( SPDocument *doc, NRArenaItem *root,
gchar const *name, unsigned psize )
{
- gint const dump = prefs_get_int_attribute_limited( "debug.icons", "dumpSvg", 0, 0, 1 );
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ bool const dump = prefs->getBool("/debug/icons/dumpSvg");
guchar *px = NULL;
if (doc) {
SPObject *object = doc->getObjectById(name);
if (object && SP_IS_ITEM(object)) {
/* Find bbox in document */
- NR::Matrix const i2doc(sp_item_i2doc_affine(SP_ITEM(object)));
- NR::Maybe<NR::Rect> dbox = SP_ITEM(object)->getBounds(i2doc);
+ Geom::Matrix const i2doc(sp_item_i2doc_affine(SP_ITEM(object)));
+ Geom::OptRect dbox = SP_ITEM(object)->getBounds(i2doc);
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 */
- if ( dbox && !dbox->isEmpty() ) {
+ if ( dbox ) {
NRGC gc(NULL);
/* Update to renderable state */
double sf = 1.0;
- nr_arena_item_set_transform(root, NR::Matrix(NR::scale(sf, sf)));
- gc.transform.set_identity();
+ nr_arena_item_set_transform(root, (Geom::Matrix)Geom::Scale(sf, sf));
+ gc.transform.setIdentity();
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 );
}
sf = (double)psize / (double)block;
- nr_arena_item_set_transform(root, NR::Matrix(NR::scale(sf, sf)));
- gc.transform.set_identity();
+ nr_arena_item_set_transform(root, (Geom::Matrix)Geom::Scale(sf, sf));
+ gc.transform.setIdentity();
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 );
NR_ARENA_ITEM_RENDER_NO_CACHE );
nr_pixblock_release(&B);
- gint useOverlay = prefs_get_int_attribute_limited( "debug.icons", "overlaySvg", 0, 0, 1 );
+ bool useOverlay = prefs->getBool("/debug/icons/overlaySvg");
if ( useOverlay ) {
sp_icon_overlay_pixels( px, psize, psize, 4 * psize, 0x00, 0x00, 0xff );
}
};
static std::map<Glib::ustring, svg_doc_cache_t *> doc_cache;
-static std::map<Glib::ustring, guchar *> px_cache;
+static std::map<Glib::ustring, GdkPixbuf *> 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 += ":";
return key;
}
-static guchar *get_cached_pixels(Glib::ustring const &key) {
- std::map<Glib::ustring, guchar *>::iterator found=px_cache.find(key);
- if ( found != px_cache.end() ) {
+GdkPixbuf *get_cached_pixbuf(Glib::ustring const &key) {
+ std::map<Glib::ustring, GdkPixbuf *>::iterator found = pb_cache.find(key);
+ if ( found != pb_cache.end() ) {
return found->second;
}
return NULL;
}
+static std::list<gchar*> &icons_svg_paths()
+{
+ static std::list<gchar *> 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)
{
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<gchar *> 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<gchar *> &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<gchar*>::iterator i = sources.begin(); i != sources.end() && !px; ++i) {
+ gchar *doc_filename = *i;
// Did we already load this doc?
Glib::ustring key(doc_filename);
Inkscape::IO::file_test( doc_filename, G_FILE_TEST_IS_REGULAR ) &&
(doc = sp_document_new( doc_filename, FALSE )) ) {
+ //g_message("Loaded icon file %s", doc_filename);
// prep the document
sp_document_ensure_up_to_date(doc);
/* Create new arena */
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;
}
-// returns true if icon needed preloading, false if nothing was done
-static bool prerender_icon(gchar const *name, unsigned lsize, unsigned psize)
-{
- Glib::ustring key = icon_cache_key(name, lsize, psize);
- guchar *px = get_cached_pixels(key);
- if (px) {
- return false;
- } else {
- px = load_svg_pixels(name, lsize, psize);
- if (px) {
- px_cache[key] = px;
- }
- 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, GtkIconSize 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;
}
}
- 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,
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;
}
}
-class preRenderItem
-{
-public:
- preRenderItem( Inkscape::IconSize lsize, gchar const *name ) :
- _lsize( lsize ),
- _name( name )
- {}
- Inkscape::IconSize _lsize;
- Glib::ustring _name;
-};
-
-
-#include <queue>
-
-static std::queue<preRenderItem> 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));
-}
-
-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);
- }
-
- if (!pendingRenders.empty()) {
- return TRUE;
- } else {
- callbackHooked = false;
- return FALSE;
- }
-}
/*
Local Variables: