gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-08-25 02:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

lots of work towards task 1741, which is to have emblem attach points

Browse source 
lots of work towards task 1741, which is to have emblem attach points
	optionally associated with an icon, but no payoff quite yet.
This commit is contained in:
Andy Hertzfeld 2000-08-02 02:03:40 +00:00
parent a0be119686
commit 3c18bed9f7
14 changed files with 283 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
ChangeLog
View file

@ -1,3 +1,44 @@
2000-08-01 Andy Hertzfeld <andy@eazel.com>
lots of work towards task 1741, which is to have emblem attach points
optionally associated with an icon, but no payoff quite yet.
* libnautilus-extensions/nautilus-icon-factory.c,h:
(parse_attach_points), (get_themed_icon_file_path),
(get_icon_file_path), (load_specific_image),
(load_image_for_scaling), (scale_image_down_if_too_big),
(load_image_scale_if_necessary), (get_image_from_cache),
(nautilus_icon_factory_get_pixbuf_for_icon),
(nautilus_icon_factory_get_pixbuf_for_file),
(load_image_with_embedded_text):
changed the text_rect structure to an internal IconInfo structure
that includes the text_rect and an array of emblem attach points.
also, define an EmblemAttachPoints structure for external use.
Read in the attach points from an xml file if present.
added a parameter to get_pixbuf_for_icon to optionally return
an EmblemAttachPoints structure.
* libnautilus-extensions/nautilus-icon-container.c:
(nautilus_icon_container_update_icon):
ask for emblem attach points when fetching an icons's pixbuf
* libnautilus-extensions/nautilus-bookmark.c:
(nautilus_bookmark_get_pixbuf):
added NULL parameter to get_pixbuf_for_icon_call
* src/file-manager/fm-list-view.c:
(fm_list_view_get_emblem_pixbufs_for_file):
added NULL parameter to get_pixbuf_for_icon_call
* src/file-manager/fm-properties-window.c:
(create_image_widget_for_emblem):
added NULL parameter to get_pixbuf_for_icon_call
* src/nautilus-sidebar-title.c: (update_emblems):
added NULL parameter to get_pixbuf_for_icon_call
* icons/eazel/Makefile.am:
* icons/eazel/i-directory.xml:
added an xml file for the directory in the eazel theme to specify
its emblem attach points
2000-08-01 Darin Adler <darin@eazel.com>
* src/nautilus-sidebar-tabs.c: (draw_or_hit_test_all_tabs):

1
icons/eazel/Makefile.am
View file

@ -36,6 +36,7 @@ eazel_DATA = \
i-directory-accept-aa.png \
i-directory.png \
i-directory-aa.png \
i-directory.xml \
i-regular-12.png \
i-regular-12-aa.png \
i-regular-24.png \

7
icons/eazel/i-directory.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0"?>
<ICON_SET>
<ICON SIZE="36" ATTACH_POINTS="16,16|38,0|38,20|38,40"/>
<ICON SIZE="48" ATTACH_POINTS="24,24|50,0|50,20|50,40"/>
<ICON SIZE="72" ATTACH_POINTS="32,32|76,0|76,20|76,40"/>
<ICON SIZE="96" ATTACH_POINTS="48,48|100,0|100,20|100,40"/>
</ICON_SET>

2
libnautilus-extensions/nautilus-bookmark.c
View file

@ -205,7 +205,7 @@ nautilus_bookmark_get_pixbuf (NautilusBookmark *bookmark,
}
return nautilus_icon_factory_get_pixbuf_for_icon
(bookmark->details->icon, icon_size, icon_size, icon_size, icon_size);
(bookmark->details->icon, icon_size, icon_size, icon_size, icon_size, NULL);
}
NautilusScalableIcon *

9
libnautilus-extensions/nautilus-icon-container.c
View file

@ -2742,6 +2742,7 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
NautilusIconContainerDetails *details;
guint icon_size_x, icon_size_y, max_image_size, max_emblem_size;
NautilusScalableIcon *scalable_icon;
EmblemAttachPoints attach_points;
GdkPixbuf *pixbuf, *emblem_pixbuf;
GList *emblem_scalable_icons, *emblem_pixbufs, *p;
char *editable_text, *additional_text;
@ -2781,8 +2782,11 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
icon_size_x,
icon_size_y,
max_image_size * icon->scale_x,
max_image_size * icon->scale_y);
max_image_size * icon->scale_y,
&attach_points);
nautilus_scalable_icon_unref (scalable_icon);
emblem_pixbufs = NULL;
for (p = emblem_scalable_icons; p != NULL; p = p->next) {
emblem_pixbuf = nautilus_icon_factory_get_pixbuf_for_icon
@ -2790,7 +2794,8 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
icon_size_x,
icon_size_y,
max_emblem_size * icon->scale_x,
max_emblem_size * icon->scale_y);
max_emblem_size * icon->scale_y,
NULL);
if (emblem_pixbuf != NULL) {
emblem_pixbufs = g_list_prepend
(emblem_pixbufs, emblem_pixbuf);

138
libnautilus-extensions/nautilus-icon-factory.c
View file

@ -20,7 +20,8 @@
Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
Authors: John Sullivan <sullivan@eazel.com>, Darin Adler <darin@eazel.com>
Authors: John Sullivan <sullivan@eazel.com>, Darin Adler <darin@eazel.com>,
Andy Hertzfeld <andy@eazel.com>
*/
#include <config.h>
@ -185,6 +186,14 @@ typedef struct {
guint maximum_height;
} IconSizeRequest;
/* A structure to hold the icon meta-info, like the text rectangle and emblem attach points */
typedef struct {
ArtIRect text_rect;
gboolean has_attach_points;
GdkPoint attach_points[8];
} IconInfo;
/* The key to a hash table that holds the scaled icons as pixbufs.
* In a way, it's not really completely a key, because part of the
* data is stored in here, including the LRU chain.
@ -198,7 +207,7 @@ typedef struct {
gboolean aa_mode;
gboolean custom;
gboolean scaled;
ArtIRect text_rect;
IconInfo icon_info;
} IconCacheKey;
#define MINIMUM_EMBEDDED_TEXT_RECT_WIDTH 20.0
@ -227,7 +236,7 @@ static GdkPixbuf * get_image_from_cache (NautilusSc
const IconSizeRequest *size,
gboolean picky,
gboolean custom,
ArtIRect *text_rect);
IconInfo *icon_info);
static gboolean check_for_thumbnails (NautilusIconFactory *factory);
static int nautilus_icon_factory_make_thumbnails (gpointer data);
static GdkPixbuf * load_image_with_embedded_text (NautilusScalableIcon *scalable_icon,
@ -565,6 +574,29 @@ make_full_icon_path (const char *path, const char *suffix)
return full_path;
}
/* utility routine to parse the attach points string to set up the array in icon_info */
static void
parse_attach_points (IconInfo *icon_info, const char* attach_point_string)
{
char *text_piece;
char **point_array;
int index, x_offset, y_offset;
/* split the attach point string into a string array, then process
each point with sscanf in a loop */
point_array = g_strsplit (attach_point_string, "|", 8);
for (index = 0; (text_piece = point_array[index]) != NULL; index++) {
if (sscanf (text_piece, " %d , %d , %*s", &x_offset, &y_offset) == 2) {
icon_info->attach_points[index].x = x_offset;
icon_info->attach_points[index].y = y_offset;
} else {
g_warning ("bad attach point specification: %s", text_piece);
}
}
g_strfreev (point_array);
}
/* Pick a particular icon to use, trying all the various suffixes.
* Return the path of the icon or NULL if no icon is found.
*/
@ -572,7 +604,7 @@ static char *
get_themed_icon_file_path (const char *theme_name,
const char *icon_name,
guint icon_size,
ArtIRect *text_rect,
IconInfo *icon_info,
gboolean aa_mode)
{
int i;
@ -635,9 +667,9 @@ get_themed_icon_file_path (const char *theme_name,
path = NULL;
}
/* Open the XML file to get the text rectangle. */
if (path != NULL && text_rect != NULL) {
memset (text_rect, 0, sizeof (*text_rect));
/* Open the XML file to get the text rectangle and emblem attach points */
if (path != NULL && icon_info != NULL) {
memset (&icon_info->text_rect, 0, sizeof (icon_info->text_rect));
xml_path = make_full_icon_path (themed_icon_name, ".xml");
@ -649,6 +681,8 @@ get_themed_icon_file_path (const char *theme_name,
(doc, "ICON", "SIZE", size_as_string);
g_free (size_as_string);
icon_info->has_attach_points = FALSE;
property = xmlGetProp (node, "EMBEDDED_TEXT_RECTANGLE");
if (property != NULL) {
@ -658,11 +692,17 @@ get_themed_icon_file_path (const char *theme_name,
&parsed_rect.y0,
&parsed_rect.x1,
&parsed_rect.y1) == 4) {
*text_rect = parsed_rect;
icon_info->text_rect = parsed_rect;
}
xmlFree (property);
}
property = xmlGetProp (node, "ATTACH_POINTS");
if (property != NULL) {
icon_info->has_attach_points = TRUE;
parse_attach_points (icon_info, property);
xmlFree (property);
}
xmlFreeDoc (doc);
}
@ -698,7 +738,7 @@ static char *
get_icon_file_path (const char *name,
const char* modifier,
guint size_in_pixels,
ArtIRect *text_rect,
IconInfo *icon_info,
gboolean aa_mode)
{
gboolean use_theme_icon;
@ -736,7 +776,7 @@ get_icon_file_path (const char *name,
path = get_themed_icon_file_path (use_theme_icon ? theme_name : NULL,
modified_name,
size_in_pixels,
text_rect,
icon_info,
aa_mode);
g_free (modified_name);
if (path != NULL) {
@ -747,7 +787,7 @@ get_icon_file_path (const char *name,
return get_themed_icon_file_path (use_theme_icon ? theme_name : NULL,
name,
size_in_pixels,
text_rect,
icon_info,
aa_mode);
}
@ -1508,17 +1548,17 @@ static GdkPixbuf *
load_specific_image (NautilusScalableIcon *scalable_icon,
guint size_in_pixels,
gboolean custom,
ArtIRect *text_rect)
IconInfo *icon_info)
{
char *image_path;
GdkPixbuf *pixbuf;
g_assert (text_rect != NULL);
g_assert (icon_info != NULL);
if (custom) {
/* Custom icon. */
memset (text_rect, 0, sizeof (*text_rect));
memset (&icon_info->text_rect, 0, sizeof (icon_info->text_rect));
/* FIXME bugzilla.eazel.com 643: we can't load svgs asynchronously, so this
* only works for local files
@ -1545,7 +1585,7 @@ load_specific_image (NautilusScalableIcon *scalable_icon,
path = get_icon_file_path (scalable_icon->name,
scalable_icon->modifier,
size_in_pixels,
text_rect,
icon_info,
scalable_icon->aa_mode);
if (path == NULL) {
@ -1569,7 +1609,7 @@ load_image_for_scaling (NautilusScalableIcon *scalable_icon,
guint requested_size,
guint *actual_size_result,
gboolean *custom,
ArtIRect *text_rect)
IconInfo *icon_info)
{
GdkPixbuf *image;
guint actual_size;
@ -1589,7 +1629,7 @@ load_image_for_scaling (NautilusScalableIcon *scalable_icon,
&size_request,
TRUE,
TRUE,
text_rect);
icon_info);
if (image != NULL) {
*actual_size_result = actual_size;
*custom = TRUE;
@ -1607,7 +1647,7 @@ load_image_for_scaling (NautilusScalableIcon *scalable_icon,
&size_request,
TRUE,
FALSE,
text_rect);
icon_info);
if (image != NULL) {
*actual_size_result = actual_size;
*custom = FALSE;
@ -1630,7 +1670,7 @@ load_image_for_scaling (NautilusScalableIcon *scalable_icon,
}
gdk_pixbuf_ref (fallback_image);
memset (text_rect, 0, sizeof (*text_rect));
memset (&icon_info->text_rect, 0, sizeof (icon_info->text_rect));
*actual_size_result = NAUTILUS_ICON_SIZE_STANDARD;
*custom = FALSE;
return fallback_image;
@ -1712,14 +1752,14 @@ revise_scale_factors_if_too_big (GdkPixbuf *image,
static GdkPixbuf *
scale_image_down_if_too_big (GdkPixbuf *image,
const IconSizeRequest *size,
ArtIRect *text_rect)
IconInfo *icon_info)
{
double scale_x, scale_y;
scale_x = 1.0;
scale_y = 1.0;
revise_scale_factors_if_too_big (image, size, &scale_x, &scale_y);
return scale_image_and_rectangle (image, text_rect, scale_x, scale_y);
return scale_image_and_rectangle (image, &icon_info->text_rect, scale_x, scale_y);
}
/* This load function is not allowed to return NULL. */
@ -1728,7 +1768,7 @@ load_image_scale_if_necessary (NautilusScalableIcon *scalable_icon,
const IconSizeRequest *size,
gboolean *scaled,
gboolean *custom,
ArtIRect *text_rect)
IconInfo *icon_info)
{
GdkPixbuf *image;
guint nominal_actual_size;
@ -1736,11 +1776,11 @@ load_image_scale_if_necessary (NautilusScalableIcon *scalable_icon,
/* Load the image for the icon that's closest in size to what we want. */
image = load_image_for_scaling (scalable_icon, size->nominal_width,
&nominal_actual_size, custom, text_rect);
&nominal_actual_size, custom, icon_info);
if (size->nominal_width == nominal_actual_size
&& size->nominal_height == nominal_actual_size) {
*scaled = FALSE;
return scale_image_down_if_too_big (image, size, text_rect);
return scale_image_down_if_too_big (image, size, icon_info);
}
/* Scale the image to the size we want. */
@ -1748,7 +1788,7 @@ load_image_scale_if_necessary (NautilusScalableIcon *scalable_icon,
scale_x = (double) size->nominal_width / nominal_actual_size;
scale_y = (double) size->nominal_height / nominal_actual_size;
revise_scale_factors_if_too_big (image, size, &scale_x, &scale_y);
return scale_image_and_rectangle (image, text_rect, scale_x, scale_y);
return scale_image_and_rectangle (image, &icon_info->text_rect, scale_x, scale_y);
}
/* Move this item to the head of the recently-used list,
@ -1845,7 +1885,7 @@ get_image_from_cache (NautilusScalableIcon *scalable_icon,
const IconSizeRequest *size,
gboolean picky,
gboolean custom,
ArtIRect *text_rect)
IconInfo *icon_info)
{
NautilusIconFactory *factory;
GHashTable *hash_table;
@ -1885,7 +1925,7 @@ get_image_from_cache (NautilusScalableIcon *scalable_icon,
{
gboolean got_scaled_image;
gboolean got_custom_image;
ArtIRect key_text_rect;
IconInfo key_icon_info;
/* Not in the table, so load the image. */
/* If we're picky, then we want the image only if this exact
@ -1904,7 +1944,7 @@ get_image_from_cache (NautilusScalableIcon *scalable_icon,
image = load_specific_image (scalable_icon,
size->nominal_width,
custom,
&key_text_rect);
&key_icon_info);
if (image == NULL) {
return NULL;
}
@ -1913,7 +1953,7 @@ get_image_from_cache (NautilusScalableIcon *scalable_icon,
* the maximum size? If so we scale it, even but we don't
* call it "scaled" for caching purposese.
*/
image = scale_image_down_if_too_big (image, size, &key_text_rect);
image = scale_image_down_if_too_big (image, size, &key_icon_info);
got_scaled_image = FALSE;
got_custom_image = custom;
@ -1926,14 +1966,14 @@ get_image_from_cache (NautilusScalableIcon *scalable_icon,
*/
got_scaled_image = FALSE;
got_custom_image = FALSE;
memset (&key_text_rect, 0, sizeof (key_text_rect));
memset (&key_icon_info.text_rect, 0, sizeof (key_icon_info.text_rect));
} else {
image = load_image_scale_if_necessary
(scalable_icon,
size,
&got_scaled_image,
&got_custom_image,
&key_text_rect);
&key_icon_info);
}
g_assert (image != NULL);
}
@ -1947,7 +1987,7 @@ get_image_from_cache (NautilusScalableIcon *scalable_icon,
key->size = *size;
key->scaled = got_scaled_image;
key->custom = got_custom_image;
key->text_rect = key_text_rect;
key->icon_info = key_icon_info;
key->cache_time = time(NULL);
/* Add the item to the hash table. */
@ -1955,8 +1995,8 @@ get_image_from_cache (NautilusScalableIcon *scalable_icon,
}
/* Return the text rect if the caller asked for it. */
if (text_rect != NULL) {
*text_rect = key->text_rect;
if (icon_info != NULL) {
*icon_info = key->icon_info;
}
/* Since this item was used, keep it in the cache longer. */
@ -1975,18 +2015,32 @@ nautilus_icon_factory_get_pixbuf_for_icon (NautilusScalableIcon *scalable_icon,
guint nominal_width,
guint nominal_height,
guint maximum_width,
guint maximum_height)
guint maximum_height,
EmblemAttachPoints *attach_data)
{
IconSizeRequest size;
IconInfo icon_info;
GdkPixbuf *pixbuf;
int index;
size.nominal_width = nominal_width;
size.nominal_height = nominal_width;
size.maximum_width = maximum_width;
size.maximum_height = maximum_height;
return get_image_from_cache (scalable_icon, &size,
FALSE, scalable_icon->uri != NULL, NULL);
pixbuf = get_image_from_cache (scalable_icon, &size,
FALSE, scalable_icon->uri != NULL,
&icon_info);
if (attach_data != NULL) {
attach_data->has_attach_points = icon_info.has_attach_points;
for (index = 0; index < 8; index++) {
attach_data->attach_points[index] = icon_info.attach_points[index];
}
}
return pixbuf;
}
static void
icon_cache_key_destroy (IconCacheKey *key)
{
@ -2071,7 +2125,7 @@ nautilus_icon_factory_get_pixbuf_for_file (NautilusFile *file,
pixbuf = nautilus_icon_factory_get_pixbuf_for_icon
(icon,
size_in_pixels, size_in_pixels,
size_in_pixels, size_in_pixels);
size_in_pixels, size_in_pixels, NULL);
nautilus_scalable_icon_unref (icon);
return pixbuf;
@ -2167,7 +2221,7 @@ load_image_with_embedded_text (NautilusScalableIcon *scalable_icon,
{
NautilusScalableIcon *scalable_icon_without_text;
GdkPixbuf *pixbuf_without_text, *pixbuf;
ArtIRect text_rect;
IconInfo icon_info;
g_assert (scalable_icon->embedded_text != NULL);
@ -2180,11 +2234,11 @@ load_image_with_embedded_text (NautilusScalableIcon *scalable_icon,
pixbuf_without_text = get_image_from_cache
(scalable_icon_without_text, size,
FALSE, FALSE, &text_rect);
FALSE, FALSE, &icon_info);
nautilus_scalable_icon_unref (scalable_icon_without_text);
pixbuf = embed_text (pixbuf_without_text,
&text_rect,
&icon_info. text_rect,
scalable_icon->embedded_text);
gdk_pixbuf_unref (pixbuf_without_text);

14
libnautilus-extensions/nautilus-icon-factory.h
View file

@ -76,6 +76,12 @@ typedef enum {
typedef struct NautilusScalableIcon NautilusScalableIcon;
/* here's a structure to hold the emblem attach points */
typedef struct {
gboolean has_attach_points;
GdkPoint attach_points[8];
} EmblemAttachPoints;
/* Instead of a class declaration here, I will just document
* the signals.
*
@ -104,15 +110,15 @@ NautilusScalableIcon *nautilus_icon_factory_get_emblem_icon_by_name (const cha
/* Render an icon to a particular size.
* Ownership of a ref. count in this pixbuf comes with the deal.
* This allows scaling in both dimensions. All other calls assume
* that X and Y scaling are the same. The text rectangle tells where
* this icon can accomodate text. If the icon can't accomodate any
* text, then the rectangle is (0, 0, 0, 0).
* that X and Y scaling are the same. Optionally, we also pass
* back an array of emblem attach points, if the pointer is non-null
*/
GdkPixbuf * nautilus_icon_factory_get_pixbuf_for_icon (NautilusScalableIcon *scalable_icon,
guint nominal_size_in_pixels_x,
guint nominal_size_in_pixels_y,
guint maximum_size_in_pixels_x,
guint maximum_size_in_pixels_y);
guint maximum_size_in_pixels_y,
EmblemAttachPoints *attach_points);
/* Convenience functions for the common case where you want to choose
* and render the icon into a pixbuf all at once.

2
libnautilus-private/nautilus-bookmark.c
View file

@ -205,7 +205,7 @@ nautilus_bookmark_get_pixbuf (NautilusBookmark *bookmark,
}
return nautilus_icon_factory_get_pixbuf_for_icon
(bookmark->details->icon, icon_size, icon_size, icon_size, icon_size);
(bookmark->details->icon, icon_size, icon_size, icon_size, icon_size, NULL);
}
NautilusScalableIcon *

9
libnautilus-private/nautilus-icon-container.c
View file

@ -2742,6 +2742,7 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
NautilusIconContainerDetails *details;
guint icon_size_x, icon_size_y, max_image_size, max_emblem_size;
NautilusScalableIcon *scalable_icon;
EmblemAttachPoints attach_points;
GdkPixbuf *pixbuf, *emblem_pixbuf;
GList *emblem_scalable_icons, *emblem_pixbufs, *p;
char *editable_text, *additional_text;
@ -2781,8 +2782,11 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
icon_size_x,
icon_size_y,
max_image_size * icon->scale_x,
max_image_size * icon->scale_y);
max_image_size * icon->scale_y,
&attach_points);
nautilus_scalable_icon_unref (scalable_icon);
emblem_pixbufs = NULL;
for (p = emblem_scalable_icons; p != NULL; p = p->next) {
emblem_pixbuf = nautilus_icon_factory_get_pixbuf_for_icon
@ -2790,7 +2794,8 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
icon_size_x,
icon_size_y,
max_emblem_size * icon->scale_x,
max_emblem_size * icon->scale_y);
max_emblem_size * icon->scale_y,
NULL);
if (emblem_pixbuf != NULL) {
emblem_pixbufs = g_list_prepend
(emblem_pixbufs, emblem_pixbuf);

138
libnautilus-private/nautilus-icon-factory.c
View file

@ -20,7 +20,8 @@
Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
Authors: John Sullivan <sullivan@eazel.com>, Darin Adler <darin@eazel.com>
Authors: John Sullivan <sullivan@eazel.com>, Darin Adler <darin@eazel.com>,
Andy Hertzfeld <andy@eazel.com>
*/
#include <config.h>
@ -185,6 +186,14 @@ typedef struct {
guint maximum_height;
} IconSizeRequest;
/* A structure to hold the icon meta-info, like the text rectangle and emblem attach points */
typedef struct {
ArtIRect text_rect;
gboolean has_attach_points;
GdkPoint attach_points[8];
} IconInfo;
/* The key to a hash table that holds the scaled icons as pixbufs.
* In a way, it's not really completely a key, because part of the
* data is stored in here, including the LRU chain.
@ -198,7 +207,7 @@ typedef struct {
gboolean aa_mode;
gboolean custom;
gboolean scaled;
ArtIRect text_rect;
IconInfo icon_info;
} IconCacheKey;
#define MINIMUM_EMBEDDED_TEXT_RECT_WIDTH 20.0
@ -227,7 +236,7 @@ static GdkPixbuf * get_image_from_cache (NautilusSc
const IconSizeRequest *size,
gboolean picky,
gboolean custom,
ArtIRect *text_rect);
IconInfo *icon_info);
static gboolean check_for_thumbnails (NautilusIconFactory *factory);
static int nautilus_icon_factory_make_thumbnails (gpointer data);
static GdkPixbuf * load_image_with_embedded_text (NautilusScalableIcon *scalable_icon,
@ -565,6 +574,29 @@ make_full_icon_path (const char *path, const char *suffix)
return full_path;
}
/* utility routine to parse the attach points string to set up the array in icon_info */
static void
parse_attach_points (IconInfo *icon_info, const char* attach_point_string)
{
char *text_piece;
char **point_array;
int index, x_offset, y_offset;
/* split the attach point string into a string array, then process
each point with sscanf in a loop */
point_array = g_strsplit (attach_point_string, "|", 8);
for (index = 0; (text_piece = point_array[index]) != NULL; index++) {
if (sscanf (text_piece, " %d , %d , %*s", &x_offset, &y_offset) == 2) {
icon_info->attach_points[index].x = x_offset;
icon_info->attach_points[index].y = y_offset;
} else {
g_warning ("bad attach point specification: %s", text_piece);
}
}
g_strfreev (point_array);
}
/* Pick a particular icon to use, trying all the various suffixes.
* Return the path of the icon or NULL if no icon is found.
*/
@ -572,7 +604,7 @@ static char *
get_themed_icon_file_path (const char *theme_name,
const char *icon_name,
guint icon_size,
ArtIRect *text_rect,
IconInfo *icon_info,
gboolean aa_mode)
{
int i;
@ -635,9 +667,9 @@ get_themed_icon_file_path (const char *theme_name,
path = NULL;
}
/* Open the XML file to get the text rectangle. */
if (path != NULL && text_rect != NULL) {
memset (text_rect, 0, sizeof (*text_rect));
/* Open the XML file to get the text rectangle and emblem attach points */
if (path != NULL && icon_info != NULL) {
memset (&icon_info->text_rect, 0, sizeof (icon_info->text_rect));
xml_path = make_full_icon_path (themed_icon_name, ".xml");
@ -649,6 +681,8 @@ get_themed_icon_file_path (const char *theme_name,
(doc, "ICON", "SIZE", size_as_string);
g_free (size_as_string);
icon_info->has_attach_points = FALSE;
property = xmlGetProp (node, "EMBEDDED_TEXT_RECTANGLE");
if (property != NULL) {
@ -658,11 +692,17 @@ get_themed_icon_file_path (const char *theme_name,
&parsed_rect.y0,
&parsed_rect.x1,
&parsed_rect.y1) == 4) {
*text_rect = parsed_rect;
icon_info->text_rect = parsed_rect;
}
xmlFree (property);
}
property = xmlGetProp (node, "ATTACH_POINTS");
if (property != NULL) {
icon_info->has_attach_points = TRUE;
parse_attach_points (icon_info, property);
xmlFree (property);
}
xmlFreeDoc (doc);
}
@ -698,7 +738,7 @@ static char *
get_icon_file_path (const char *name,
const char* modifier,
guint size_in_pixels,
ArtIRect *text_rect,
IconInfo *icon_info,
gboolean aa_mode)
{
gboolean use_theme_icon;
@ -736,7 +776,7 @@ get_icon_file_path (const char *name,
path = get_themed_icon_file_path (use_theme_icon ? theme_name : NULL,
modified_name,
size_in_pixels,
text_rect,
icon_info,
aa_mode);
g_free (modified_name);
if (path != NULL) {
@ -747,7 +787,7 @@ get_icon_file_path (const char *name,
return get_themed_icon_file_path (use_theme_icon ? theme_name : NULL,
name,
size_in_pixels,
text_rect,
icon_info,
aa_mode);
}
@ -1508,17 +1548,17 @@ static GdkPixbuf *
load_specific_image (NautilusScalableIcon *scalable_icon,
guint size_in_pixels,
gboolean custom,
ArtIRect *text_rect)
IconInfo *icon_info)
{
char *image_path;
GdkPixbuf *pixbuf;
g_assert (text_rect != NULL);
g_assert (icon_info != NULL);
if (custom) {
/* Custom icon. */
memset (text_rect, 0, sizeof (*text_rect));
memset (&icon_info->text_rect, 0, sizeof (icon_info->text_rect));
/* FIXME bugzilla.eazel.com 643: we can't load svgs asynchronously, so this
* only works for local files
@ -1545,7 +1585,7 @@ load_specific_image (NautilusScalableIcon *scalable_icon,
path = get_icon_file_path (scalable_icon->name,
scalable_icon->modifier,
size_in_pixels,
text_rect,
icon_info,
scalable_icon->aa_mode);
if (path == NULL) {
@ -1569,7 +1609,7 @@ load_image_for_scaling (NautilusScalableIcon *scalable_icon,
guint requested_size,
guint *actual_size_result,
gboolean *custom,
ArtIRect *text_rect)
IconInfo *icon_info)
{
GdkPixbuf *image;
guint actual_size;
@ -1589,7 +1629,7 @@ load_image_for_scaling (NautilusScalableIcon *scalable_icon,
&size_request,
TRUE,
TRUE,
text_rect);
icon_info);
if (image != NULL) {
*actual_size_result = actual_size;
*custom = TRUE;
@ -1607,7 +1647,7 @@ load_image_for_scaling (NautilusScalableIcon *scalable_icon,
&size_request,
TRUE,
FALSE,
text_rect);
icon_info);
if (image != NULL) {
*actual_size_result = actual_size;
*custom = FALSE;
@ -1630,7 +1670,7 @@ load_image_for_scaling (NautilusScalableIcon *scalable_icon,
}
gdk_pixbuf_ref (fallback_image);
memset (text_rect, 0, sizeof (*text_rect));
memset (&icon_info->text_rect, 0, sizeof (icon_info->text_rect));
*actual_size_result = NAUTILUS_ICON_SIZE_STANDARD;
*custom = FALSE;
return fallback_image;
@ -1712,14 +1752,14 @@ revise_scale_factors_if_too_big (GdkPixbuf *image,
static GdkPixbuf *
scale_image_down_if_too_big (GdkPixbuf *image,
const IconSizeRequest *size,
ArtIRect *text_rect)
IconInfo *icon_info)
{
double scale_x, scale_y;
scale_x = 1.0;
scale_y = 1.0;
revise_scale_factors_if_too_big (image, size, &scale_x, &scale_y);
return scale_image_and_rectangle (image, text_rect, scale_x, scale_y);
return scale_image_and_rectangle (image, &icon_info->text_rect, scale_x, scale_y);
}
/* This load function is not allowed to return NULL. */
@ -1728,7 +1768,7 @@ load_image_scale_if_necessary (NautilusScalableIcon *scalable_icon,
const IconSizeRequest *size,
gboolean *scaled,
gboolean *custom,
ArtIRect *text_rect)
IconInfo *icon_info)
{
GdkPixbuf *image;
guint nominal_actual_size;
@ -1736,11 +1776,11 @@ load_image_scale_if_necessary (NautilusScalableIcon *scalable_icon,
/* Load the image for the icon that's closest in size to what we want. */
image = load_image_for_scaling (scalable_icon, size->nominal_width,
&nominal_actual_size, custom, text_rect);
&nominal_actual_size, custom, icon_info);
if (size->nominal_width == nominal_actual_size
&& size->nominal_height == nominal_actual_size) {
*scaled = FALSE;
return scale_image_down_if_too_big (image, size, text_rect);
return scale_image_down_if_too_big (image, size, icon_info);
}
/* Scale the image to the size we want. */
@ -1748,7 +1788,7 @@ load_image_scale_if_necessary (NautilusScalableIcon *scalable_icon,
scale_x = (double) size->nominal_width / nominal_actual_size;
scale_y = (double) size->nominal_height / nominal_actual_size;
revise_scale_factors_if_too_big (image, size, &scale_x, &scale_y);
return scale_image_and_rectangle (image, text_rect, scale_x, scale_y);
return scale_image_and_rectangle (image, &icon_info->text_rect, scale_x, scale_y);
}
/* Move this item to the head of the recently-used list,
@ -1845,7 +1885,7 @@ get_image_from_cache (NautilusScalableIcon *scalable_icon,
const IconSizeRequest *size,
gboolean picky,
gboolean custom,
ArtIRect *text_rect)
IconInfo *icon_info)
{
NautilusIconFactory *factory;
GHashTable *hash_table;
@ -1885,7 +1925,7 @@ get_image_from_cache (NautilusScalableIcon *scalable_icon,
{
gboolean got_scaled_image;
gboolean got_custom_image;
ArtIRect key_text_rect;
IconInfo key_icon_info;
/* Not in the table, so load the image. */
/* If we're picky, then we want the image only if this exact
@ -1904,7 +1944,7 @@ get_image_from_cache (NautilusScalableIcon *scalable_icon,
image = load_specific_image (scalable_icon,
size->nominal_width,
custom,
&key_text_rect);
&key_icon_info);
if (image == NULL) {
return NULL;
}
@ -1913,7 +1953,7 @@ get_image_from_cache (NautilusScalableIcon *scalable_icon,
* the maximum size? If so we scale it, even but we don't
* call it "scaled" for caching purposese.
*/
image = scale_image_down_if_too_big (image, size, &key_text_rect);
image = scale_image_down_if_too_big (image, size, &key_icon_info);
got_scaled_image = FALSE;
got_custom_image = custom;
@ -1926,14 +1966,14 @@ get_image_from_cache (NautilusScalableIcon *scalable_icon,
*/
got_scaled_image = FALSE;
got_custom_image = FALSE;
memset (&key_text_rect, 0, sizeof (key_text_rect));
memset (&key_icon_info.text_rect, 0, sizeof (key_icon_info.text_rect));
} else {
image = load_image_scale_if_necessary
(scalable_icon,
size,
&got_scaled_image,
&got_custom_image,
&key_text_rect);
&key_icon_info);
}
g_assert (image != NULL);
}
@ -1947,7 +1987,7 @@ get_image_from_cache (NautilusScalableIcon *scalable_icon,
key->size = *size;
key->scaled = got_scaled_image;
key->custom = got_custom_image;
key->text_rect = key_text_rect;
key->icon_info = key_icon_info;
key->cache_time = time(NULL);
/* Add the item to the hash table. */
@ -1955,8 +1995,8 @@ get_image_from_cache (NautilusScalableIcon *scalable_icon,
}
/* Return the text rect if the caller asked for it. */
if (text_rect != NULL) {
*text_rect = key->text_rect;
if (icon_info != NULL) {
*icon_info = key->icon_info;
}
/* Since this item was used, keep it in the cache longer. */
@ -1975,18 +2015,32 @@ nautilus_icon_factory_get_pixbuf_for_icon (NautilusScalableIcon *scalable_icon,
guint nominal_width,
guint nominal_height,
guint maximum_width,
guint maximum_height)
guint maximum_height,
EmblemAttachPoints *attach_data)
{
IconSizeRequest size;
IconInfo icon_info;
GdkPixbuf *pixbuf;
int index;
size.nominal_width = nominal_width;
size.nominal_height = nominal_width;
size.maximum_width = maximum_width;
size.maximum_height = maximum_height;
return get_image_from_cache (scalable_icon, &size,
FALSE, scalable_icon->uri != NULL, NULL);
pixbuf = get_image_from_cache (scalable_icon, &size,
FALSE, scalable_icon->uri != NULL,
&icon_info);
if (attach_data != NULL) {
attach_data->has_attach_points = icon_info.has_attach_points;
for (index = 0; index < 8; index++) {
attach_data->attach_points[index] = icon_info.attach_points[index];
}
}
return pixbuf;
}
static void
icon_cache_key_destroy (IconCacheKey *key)
{
@ -2071,7 +2125,7 @@ nautilus_icon_factory_get_pixbuf_for_file (NautilusFile *file,
pixbuf = nautilus_icon_factory_get_pixbuf_for_icon
(icon,
size_in_pixels, size_in_pixels,
size_in_pixels, size_in_pixels);
size_in_pixels, size_in_pixels, NULL);
nautilus_scalable_icon_unref (icon);
return pixbuf;
@ -2167,7 +2221,7 @@ load_image_with_embedded_text (NautilusScalableIcon *scalable_icon,
{
NautilusScalableIcon *scalable_icon_without_text;
GdkPixbuf *pixbuf_without_text, *pixbuf;
ArtIRect text_rect;
IconInfo icon_info;
g_assert (scalable_icon->embedded_text != NULL);
@ -2180,11 +2234,11 @@ load_image_with_embedded_text (NautilusScalableIcon *scalable_icon,
pixbuf_without_text = get_image_from_cache
(scalable_icon_without_text, size,
FALSE, FALSE, &text_rect);
FALSE, FALSE, &icon_info);
nautilus_scalable_icon_unref (scalable_icon_without_text);
pixbuf = embed_text (pixbuf_without_text,
&text_rect,
&icon_info. text_rect,
scalable_icon->embedded_text);
gdk_pixbuf_unref (pixbuf_without_text);

14
libnautilus-private/nautilus-icon-factory.h
View file

@ -76,6 +76,12 @@ typedef enum {
typedef struct NautilusScalableIcon NautilusScalableIcon;
/* here's a structure to hold the emblem attach points */
typedef struct {
gboolean has_attach_points;
GdkPoint attach_points[8];
} EmblemAttachPoints;
/* Instead of a class declaration here, I will just document
* the signals.
*
@ -104,15 +110,15 @@ NautilusScalableIcon *nautilus_icon_factory_get_emblem_icon_by_name (const cha
/* Render an icon to a particular size.
* Ownership of a ref. count in this pixbuf comes with the deal.
* This allows scaling in both dimensions. All other calls assume
* that X and Y scaling are the same. The text rectangle tells where
* this icon can accomodate text. If the icon can't accomodate any
* text, then the rectangle is (0, 0, 0, 0).
* that X and Y scaling are the same. Optionally, we also pass
* back an array of emblem attach points, if the pointer is non-null
*/
GdkPixbuf * nautilus_icon_factory_get_pixbuf_for_icon (NautilusScalableIcon *scalable_icon,
guint nominal_size_in_pixels_x,
guint nominal_size_in_pixels_y,
guint maximum_size_in_pixels_x,
guint maximum_size_in_pixels_y);
guint maximum_size_in_pixels_y,
EmblemAttachPoints *attach_points);
/* Convenience functions for the common case where you want to choose
* and render the icon into a pixbuf all at once.

3
src/file-manager/fm-list-view.c
View file

@ -1324,7 +1324,8 @@ fm_list_view_get_emblem_pixbufs_for_file (FMListView *list_view,
emblem_pixbuf = nautilus_icon_factory_get_pixbuf_for_icon
(p->data,
emblem_size, emblem_size,
emblem_size, emblem_size);
emblem_size, emblem_size,
NULL);
if (emblem_pixbuf != NULL) {
emblem_pixbufs = g_list_prepend
(emblem_pixbufs, emblem_pixbuf);

3
src/file-manager/fm-properties-window.c
View file

@ -1124,7 +1124,8 @@ create_image_widget_for_emblem (const char *emblem_name)
NAUTILUS_ICON_SIZE_STANDARD,
NAUTILUS_ICON_SIZE_STANDARD,
NAUTILUS_ICON_SIZE_STANDARD,
NAUTILUS_ICON_SIZE_STANDARD);
NAUTILUS_ICON_SIZE_STANDARD,
NULL);
nautilus_scalable_icon_unref (icon);
gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &mask, 128);

3
src/nautilus-sidebar-title.c
View file

@ -362,7 +362,8 @@ update_emblems (NautilusSidebarTitle *sidebar_title)
pixbuf = nautilus_icon_factory_get_pixbuf_for_icon
(p->data,
NAUTILUS_ICON_SIZE_STANDARD, NAUTILUS_ICON_SIZE_STANDARD,
NAUTILUS_ICON_SIZE_STANDARD, NAUTILUS_ICON_SIZE_STANDARD);
NAUTILUS_ICON_SIZE_STANDARD, NAUTILUS_ICON_SIZE_STANDARD,
NULL);
if (pixbuf != NULL) {
add_emblem (sidebar_title, pixbuf);
gdk_pixbuf_unref (pixbuf);