![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index 60cc40a7440463e4ee610cca6eacef4c4202b43e..7c8beeb75b7fd98b70b2e6fdb607aa64bf53fd26 100644 (file)
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
* Author:
* Lauris Kaplinski <lauris@kaplinski.com>
* Jon A. Cruz <jon@joncruz.org>
+ * Abhishek Sharma
*
* Copyright (C) 2002 Lauris Kaplinski
*
#include <glib/gmem.h>
#include <gtk/gtk.h>
#include <gtkmm.h>
+#include <gdkmm/pixbuf.h>
#include "path-prefix.h"
#include "preferences.h"
#include "icon.h"
+static gboolean icon_prerender_task(gpointer data);
+
+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_dispose(GObject *object);
GdkPixbuf* _pb;
};
-static Glib::RefPtr<Gtk::IconFactory> inkyIcons;
+static std::map<Glib::ustring, std::vector<IconCacheItem> > iconSetCache;
+static std::set<Glib::ustring> internalNames;
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 GType type = 0;
if (!type) {
GTypeInfo info = {
@@ -210,7 +213,6 @@ static GdkPixbuf* renderup( gchar const* name, Inkscape::IconSize lsize, unsigne
// PUBLIC CALL:
void sp_icon_fetch_pixbuf( SPIcon *icon )
{
- g_message("sp_icon_fetch_pixbuf(%p) [%s]", icon, icon->name);
if ( icon ) {
if ( !icon->pb ) {
icon->psize = sp_icon_get_phys_size(icon->lsize);
}
}
-static GdkPixbuf* renderup( gchar const* name, Inkscape::IconSize lsize, unsigned psize ) {
+GdkPixbuf* renderup( gchar const* name, Inkscape::IconSize lsize, unsigned psize ) {
GtkIconTheme *theme = gtk_icon_theme_get_default();
GdkPixbuf *pb = 0;
@@ -229,7 +231,9 @@ static GdkPixbuf* renderup( gchar const* name, Inkscape::IconSize lsize, unsigne
if (!pb) {
pb = sp_icon_image_load_svg( name, Inkscape::getRegisteredIconSize(lsize), psize );
if (!pb && (legacyNames.find(name) != legacyNames.end())) {
- g_message("Checking fallback [%s]->[%s]", name, legacyNames[name].c_str());
+ 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 );
}
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) );
}
-static Glib::ustring icon_cache_key(gchar const *name, unsigned lsize, unsigned psize);
+static void imageMapCB(GtkWidget* widget, gpointer user_data);
+static void imageMapNamedCB(GtkWidget* widget, gpointer user_data);
+static bool prerender_icon(gchar const *name, GtkIconSize lsize, unsigned psize);
+static Glib::ustring icon_cache_key(gchar const *name, unsigned psize);
static GdkPixbuf *get_cached_pixbuf(Glib::ustring const &key);
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<gint>(lsize), 0, static_cast<gint>(G_N_ELEMENTS(iconSizeLookup) - 1) );
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 );
+ 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)) );
+ g_signal_connect( G_OBJECT(img), "map", G_CALLBACK(imageMapCB), GINT_TO_POINTER(static_cast<int>(mappedSize)) );
if ( dump ) {
g_message(" connecting %p for imageMapCB for [%s] %d", img, name, (int)mappedSize);
}
widget = GTK_WIDGET(img);
img = 0;
- if (!gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), name)) {
- // TODO temporary work-around. until background rendering is restored.
- int psize = sp_icon_get_phys_size(lsize);
- renderup(name, lsize, psize);
- }
-
// 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) );
+ 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);
+ if ( Inkscape::Preferences::get()->getBool("/options/iconrender/named_nodelay") ) {
+ int psize = sp_icon_get_phys_size(lsize);
+ prerender_icon(name, mappedSize, psize);
} else {
- // TODO restore addPreRender( mappedSize, name );
+ addPreRender( mappedSize, name );
}
} else {
if ( dump ) {
// 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 ) ) {
}
sizeMapDone = true;
}
-
- static bool hit = false;
- if ( !hit ) {
- hit = true;
- inkyIcons = Gtk::IconFactory::create();
- inkyIcons->add_default();
- }
}
GtkIconSize Inkscape::getRegisteredIconSize( Inkscape::IconSize 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<int>(GTK_ICON_SIZE_MENU), static_cast<int>(Inkscape::ICON_SIZE_DECORATION) );
if ( !sizeMapDone ) {
injectCustomSize();
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:" );
}
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) {
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];
}
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 */
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 );
}
}
-struct svg_doc_cache_t
+class SVGDocCache
{
+public:
+ SVGDocCache( SPDocument *doc, NRArenaItem *root ) : doc(doc), root(root) {}
SPDocument *doc;
NRArenaItem *root;
};
-static std::map<Glib::ustring, svg_doc_cache_t *> doc_cache;
+static std::map<Glib::ustring, SVGDocCache *> doc_cache;
static std::map<Glib::ustring, GdkPixbuf *> 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<Glib::ustring, GdkPixbuf *>::iterator found = pb_cache.find(key);
if ( found != pb_cache.end() ) {
- return found->second;
+ pb = found->second;
}
- return NULL;
+ return pb;
}
static std::list<gchar*> &icons_svg_paths()
}
// this function renders icons from icons.svg and returns the pixels.
-static guchar *load_svg_pixels(gchar const *name,
+static guchar *load_svg_pixels(std::list<Glib::ustring> const &names,
unsigned /*lsize*/, unsigned psize)
{
- SPDocument *doc = NULL;
- NRArenaItem *root = NULL;
- svg_doc_cache_t *info = NULL;
-
+ bool const dump = Inkscape::Preferences::get()->getBool("/debug/icons/dumpSvg");
std::list<gchar *> &sources = icons_svg_paths();
// Try each document in turn until we successfully load the icon from one
- guchar *px=NULL;
- for (std::list<gchar*>::iterator i = sources.begin(); i != sources.end() && !px; ++i) {
+ guchar *px = NULL;
+ for (std::list<gchar*>::iterator i = sources.begin(); (i != sources.end()) && !px; ++i) {
gchar *doc_filename = *i;
+ SVGDocCache *info = 0;
// Did we already load this doc?
Glib::ustring key(doc_filename);
- info = 0;
{
- std::map<Glib::ustring, svg_doc_cache_t *>::iterator i = doc_cache.find(key);
+ std::map<Glib::ustring, SVGDocCache *>::iterator i = doc_cache.find(key);
if ( i != doc_cache.end() ) {
info = i->second;
}
}
- /* 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 )) ) {
-
- //g_message("Loaded icon file %s", doc_filename);
- // prep the document
- sp_document_ensure_up_to_date(doc);
- /* Create new arena */
- NRArena *arena = NRArena::create();
- /* Create ArenaItem and set transform */
- unsigned visionkey = sp_item_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 );
-
- // store into the cache
- info = new svg_doc_cache_t;
- g_assert(info);
-
- info->doc=doc;
- info->root=root;
- doc_cache[key]=info;
+ // Try to load from document.
+ if (!info && Inkscape::IO::file_test( doc_filename, G_FILE_TEST_IS_REGULAR ) ) {
+ SPDocument *doc = SPDocument::createNewDoc( doc_filename, FALSE );
+ if ( doc ) {
+ if ( dump ) {
+ g_message("Loaded icon file %s", doc_filename);
+ }
+ // prep the document
+ doc->ensureUpToDate();
+
+ // Create new arena
+ NRArena *arena = NRArena::create();
+
+ // Create ArenaItem and set transform
+ unsigned visionkey = SPItem::display_key_new(1);
+ // fixme: Memory manage root if needed (Lauris)
+ // 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
+ NRArenaItem *root = SP_ITEM(doc->getRoot())->invoke_show( arena, visionkey, SP_ITEM_SHOW_DISPLAY );
+
+ // store into the cache
+ info = new SVGDocCache(doc, root);
+ doc_cache[key] = info;
+ }
}
if (info) {
- doc=info->doc;
- root=info->root;
+ for (std::list<Glib::ustring>::const_iterator it = names.begin(); !px && (it != names.end()); ++it ) {
+ px = sp_icon_doc_icon( info->doc, info->root, it->c_str(), psize );
+ }
+ }
+ }
+
+ return px;
+}
+
+static void addToIconSet(GdkPixbuf* pb, gchar const* name, GtkIconSize lsize, unsigned psize) {
+ static bool dump = Inkscape::Preferences::get()->getBool("/debug/icons/dumpGtk");
+ 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);
}
+ }
+}
- // move on to the next document if we couldn't get anything
- if (!info && !doc) {
- continue;
+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<gint>(lsize), 0, static_cast<gint>(G_N_ELEMENTS(iconSizeLookup) - 1) );
+ if ( !sizeMapDone ) {
+ injectCustomSize();
}
+ GtkIconSize mappedSize = iconSizeLookup[trySize];
- px = sp_icon_doc_icon( doc, root, name, psize );
-// if (px) {
-// g_message("Found icon %s in %s", name, doc_filename);
-// }
+ 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);
}
+}
-// if (!px) {
-// g_message("Not found icon %s", name);
-// }
- return px;
+static std::map<unsigned, Glib::ustring> sizePaths;
+
+static std::string getDestDir( unsigned psize )
+{
+ if ( sizePaths.find(psize) == sizePaths.end() ) {
+ gchar *tmp = g_strdup_printf("%dx%d", psize, psize);
+ sizePaths[psize] = tmp;
+ g_free(tmp);
+ }
+
+ return sizePaths[psize];
+}
+
+// returns true if icon needed preloading, false if nothing was done
+bool prerender_icon(gchar const *name, GtkIconSize lsize, unsigned 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);
+ }
+
+ std::string potentialFile;
+ bool dataLoaded = false;
+ if ( useCache ) {
+ // In file encoding:
+ std::string iconCacheDir = Glib::build_filename(Glib::build_filename(Glib::get_user_cache_dir(), "inkscape"), "icons");
+ std::string subpart = getDestDir(psize);
+ std::string subdir = Glib::build_filename( iconCacheDir, subpart );
+ if ( !Glib::file_test(subdir, Glib::FILE_TEST_EXISTS) ) {
+ g_mkdir_with_parents( subdir.c_str(), 0x1ED );
+ }
+ potentialFile = Glib::build_filename( subdir, name );
+ potentialFile += ".png";
+
+ if ( Glib::file_test(potentialFile, Glib::FILE_TEST_EXISTS) && Glib::file_test(potentialFile, Glib::FILE_TEST_IS_REGULAR) ) {
+ bool badFile = false;
+ try {
+ Glib::RefPtr<Gdk::Pixbuf> 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);
+ }
+ }
+ } catch ( Glib::FileError &ex ) {
+ g_warning("FileError [%s]", ex.what().c_str());
+ badFile = true;
+ } catch ( Gdk::PixbufError &ex ) {
+ g_warning("PixbufError [%s]", ex.what().c_str());
+ // Invalid contents. Remove cached item
+ badFile = true;
+ }
+ if ( badFile ) {
+ g_remove(potentialFile.c_str());
+ }
+ }
+ }
+
+ if (!dataLoaded) {
+ std::list<Glib::ustring> names;
+ names.push_back(name);
+ if ( legacyNames.find(name) != legacyNames.end() ) {
+ names.push_back(legacyNames[name]);
+ if ( dump ) {
+ g_message("load_svg_pixels([%s] = %s, %d, %d)", name, legacyNames[name].c_str(), lsize, psize);
+ }
+ }
+ guchar* px = load_svg_pixels(names, lsize, psize);
+ if (px) {
+ GdkPixbuf* pb = gdk_pixbuf_new_from_data( px, GDK_COLORSPACE_RGB, TRUE, 8,
+ psize, psize, psize * 4,
+ reinterpret_cast<GdkPixbufDestroyNotify>(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<Gdk::Pixbuf> 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);
+ }
+ }
+ }
+ else if (dump) {
+ g_message("prerender_icon [%s] %d NOT!!!!!!", name, psize);
+ }
+ }
+ 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) {
- guchar *px = load_svg_pixels(name, lsize, psize);
+ std::list<Glib::ustring> names;
+ names.push_back(name);
+ guchar *px = load_svg_pixels(names, lsize, psize);
if (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);
}
}
}
}
+class preRenderItem
+{
+public:
+ preRenderItem( GtkIconSize lsize, gchar const *name ) :
+ _lsize( lsize ),
+ _name( name )
+ {}
+ GtkIconSize _lsize;
+ Glib::ustring _name;
+};
+
+
+static std::vector<preRenderItem> pendingRenders;
+static bool callbackHooked = false;
+
+static void addPreRender( GtkIconSize lsize, gchar const *name )
+{
+ if ( !callbackHooked )
+ {
+ callbackHooked = true;
+ g_idle_add_full( G_PRIORITY_LOW, &icon_prerender_task, NULL, NULL );
+ }
+
+ pendingRenders.push_back(preRenderItem(lsize, name));
+}
+
+gboolean icon_prerender_task(gpointer /*data*/) {
+ if ( inkscapeIsCrashing() ) {
+ // stop
+ } else if (!pendingRenders.empty()) {
+ 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 (!inkscapeIsCrashing() && !pendingRenders.empty()) {
+ return TRUE;
+ } else {
+ callbackHooked = false;
+ return FALSE;
+ }
+}
+
+
+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);
+ GtkIconSize lsize = static_cast<GtkIconSize>(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);
+ for ( std::vector<preRenderItem>::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);
+ if (lsize != size) {
+ int psize = sp_icon_get_phys_size(size);
+ prerender_icon(id, size, psize);
+ }
+ 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 ) {
+
+ gint iconSize = 0;
+ gchar* iconName = 0;
+ {
+ g_object_get(G_OBJECT(widget),
+ "icon-name", &iconName,
+ "icon-size", &iconSize,
+ NULL);
+ }
+
+ for ( std::vector<preRenderItem>::iterator it = pendingRenders.begin(); it != pendingRenders.end(); ++it ) {
+ if ( (it->_name == iconName) && (it->_lsize == size) ) {
+ int psize = sp_icon_get_phys_size(size);
+ prerender_icon(iconName, size, psize);
+ pendingRenders.erase(it);
+ break;
+ }
+ }
+
+ 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);
+ }
+ }
+
+ g_signal_handlers_disconnect_by_func(widget, (gpointer)imageMapNamedCB, user_data);
+}
+
/*
Local Variables:
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 :