#include "defs.h"
#include <glib.h>
#include <gtk/gtkwidget.h>
-#include <gtk/gtkpixmap.h>
+#include <gtk/gtkimage.h>
#include <string.h>
#include <dirent.h>
#include "pixmaps/complete.xpm"
#include "pixmaps/continue.xpm"
#include "pixmaps/deleted.xpm"
-#include "pixmaps/dir_close.xpm"
-#include "pixmaps/dir_open.xpm"
-#include "pixmaps/dir_open_hrm.xpm"
#include "pixmaps/error.xpm"
#include "pixmaps/forwarded.xpm"
#include "pixmaps/group.xpm"
-#include "pixmaps/inbox.xpm"
-#include "pixmaps/inbox_hrm.xpm"
#include "pixmaps/interface.xpm"
#include "pixmaps/jpilot.xpm"
#include "pixmaps/key.xpm"
#include "pixmaps/ldap.xpm"
#include "pixmaps/linewrap.xpm"
+#include "pixmaps/linewrapcurrent.xpm"
#include "pixmaps/mark.xpm"
#include "pixmaps/locked.xpm"
#include "pixmaps/new.xpm"
-#include "pixmaps/outbox.xpm"
-#include "pixmaps/outbox_hrm.xpm"
#include "pixmaps/replied.xpm"
#include "pixmaps/close.xpm"
#include "pixmaps/down_arrow.xpm"
#include "pixmaps/paste.xpm"
#include "pixmaps/preferences.xpm"
#include "pixmaps/properties.xpm"
+#include "pixmaps/sylpheed_icon.xpm"
#include "pixmaps/sylpheed_logo.xpm"
#include "pixmaps/address_book.xpm"
-#include "pixmaps/trash.xpm"
-#include "pixmaps/trash_hrm.xpm"
#include "pixmaps/unread.xpm"
+#include "pixmaps/read.xpm"
#include "pixmaps/vcard.xpm"
#include "pixmaps/ignorethread.xpm"
-#include "pixmaps/work_online.xpm"
-#include "pixmaps/work_offline.xpm"
+#include "pixmaps/online.xpm"
+#include "pixmaps/offline.xpm"
#include "pixmaps/notice_warn.xpm"
#include "pixmaps/notice_error.xpm"
#include "pixmaps/notice_note.xpm"
#include "pixmaps/quicksearch.xpm"
+#include "pixmaps/clip_gpg_signed.xpm"
#include "pixmaps/gpg_signed.xpm"
-#include "pixmaps/drafts_close.xpm"
-#include "pixmaps/drafts_open.xpm"
-#include "pixmaps/messageview_text.xpm"
#include "pixmaps/mime_text_plain.xpm"
#include "pixmaps/mime_text_html.xpm"
#include "pixmaps/mime_application.xpm"
-#include "pixmaps/mime_application_octet_stream.xpm"
#include "pixmaps/mime_image.xpm"
#include "pixmaps/mime_audio.xpm"
#include "pixmaps/mime_text_enriched.xpm"
#include "pixmaps/mime_unknown.xpm"
-#include "pixmaps/mime_gpg_signed.xpm"
-#include "pixmaps/mime_gpg_passed.xpm"
-#include "pixmaps/mime_gpg_failed.xpm"
-#include "pixmaps/mime_gpg_unknown.xpm"
-#include "pixmaps/mime_gpg_expired.xpm"
+#include "pixmaps/privacy_signed.xpm"
+#include "pixmaps/privacy_passed.xpm"
+#include "pixmaps/privacy_failed.xpm"
+#include "pixmaps/privacy_unknown.xpm"
+#include "pixmaps/privacy_expired.xpm"
+#include "pixmaps/privacy_warn.xpm"
+#include "pixmaps/privacy_emblem_encrypted.xpm"
+#include "pixmaps/privacy_emblem_signed.xpm"
+#include "pixmaps/privacy_emblem_passed.xpm"
+#include "pixmaps/privacy_emblem_failed.xpm"
+#include "pixmaps/privacy_emblem_warn.xpm"
+#include "pixmaps/mime_message.xpm"
+#include "pixmaps/address_search.xpm"
+#include "pixmaps/check_spelling.xpm"
+
+#include "pixmaps/dir_close.xpm"
+#include "pixmaps/dir_open.xpm"
+#include "pixmaps/dir_open_hrm.xpm"
+#include "pixmaps/inbox.xpm"
+#include "pixmaps/inbox_hrm.xpm"
+#include "pixmaps/outbox.xpm"
+#include "pixmaps/outbox_hrm.xpm"
+#include "pixmaps/trash.xpm"
+#include "pixmaps/trash_btn.xpm"
+#include "pixmaps/trash_hrm.xpm"
+#include "pixmaps/drafts_close.xpm"
+#include "pixmaps/drafts_open.xpm"
+#include "pixmaps/dir_close_mark.xpm"
+#include "pixmaps/dir_open_mark.xpm"
+#include "pixmaps/dir_open_hrm_mark.xpm"
+#include "pixmaps/inbox_mark.xpm"
+#include "pixmaps/inbox_hrm_mark.xpm"
+#include "pixmaps/outbox_mark.xpm"
+#include "pixmaps/outbox_hrm_mark.xpm"
+#include "pixmaps/trash_mark.xpm"
+#include "pixmaps/trash_hrm_mark.xpm"
+#include "pixmaps/drafts_close_mark.xpm"
+#include "pixmaps/drafts_open_mark.xpm"
+#include "pixmaps/dir_noselect.xpm"
typedef struct _StockPixmapData StockPixmapData;
GdkBitmap *mask;
gchar *file;
gchar *icon_path;
+ GdkPixbuf *pixbuf;
+};
+
+typedef struct _OverlayData OverlayData;
+
+struct _OverlayData
+{
+ GdkPixmap *base_pixmap;
+ GdkBitmap *base_mask;
+ GdkPixmap *overlay_pixmap;
+ GdkBitmap *overlay_mask;
+ guint base_height;
+ guint base_width;
+ guint overlay_height;
+ guint overlay_width;
+ OverlayPosition position;
+ gint border_x;
+ gint border_y;
};
static void stock_pixmap_find_themes_in_dir(GList **list, const gchar *dirname);
static StockPixmapData pixmaps[] =
{
- {address_xpm , NULL, NULL, "address", " "},
- {address_book_xpm , NULL, NULL, "address_book", " "},
- {book_xpm , NULL, NULL, "book", " "},
- {category_xpm , NULL, NULL, "category", " "},
- {checkbox_off_xpm , NULL, NULL, "checkbox_off", " "},
- {checkbox_on_xpm , NULL, NULL, "checkbox_on", " "},
- {clip_xpm , NULL, NULL, "clip", " "},
- {clipkey_xpm , NULL, NULL, "clipkey", " "},
- {close_xpm , NULL, NULL, "close", " "},
- {complete_xpm , NULL, NULL, "complete", " "},
- {continue_xpm , NULL, NULL, "continue", " "},
- {deleted_xpm , NULL, NULL, "deleted", " "},
- {dir_close_xpm , NULL, NULL, "dir_close", " "},
- {dir_close_xpm , NULL, NULL, "dir_close_hrm", " "},
- {dir_open_xpm , NULL, NULL, "dir_open", " "},
- {dir_open_hrm_xpm , NULL, NULL, "dir_open_hrm", " "},
- {down_arrow_xpm , NULL, NULL, "down_arrow", " "},
- {up_arrow_xpm , NULL, NULL, "up_arrow", " "},
- {mail_compose_xpm , NULL, NULL, "edit_extern", " "},
- {error_xpm , NULL, NULL, "error", " "},
- {exec_xpm , NULL, NULL, "exec", " "},
- {forwarded_xpm , NULL, NULL, "forwarded", " "},
- {group_xpm , NULL, NULL, "group", " "},
- {ignorethread_xpm , NULL, NULL, "ignorethread", " "},
- {inbox_xpm , NULL, NULL, "inbox_close", " "},
- {inbox_hrm_xpm , NULL, NULL, "inbox_close_hrm", " "},
- {inbox_xpm , NULL, NULL, "inbox_open", " "},
- {inbox_hrm_xpm , NULL, NULL, "inbox_open_hrm", " "},
- {paste_xpm , NULL, NULL, "insert_file", " "},
- {interface_xpm , NULL, NULL, "interface", " "},
- {jpilot_xpm , NULL, NULL, "jpilot", " "},
- {key_xpm , NULL, NULL, "key", " "},
- {ldap_xpm , NULL, NULL, "ldap", " "},
- {linewrap_xpm , NULL, NULL, "linewrap", " "},
- {locked_xpm , NULL, NULL, "locked", " "},
- {mail_xpm , NULL, NULL, "mail", " "},
- {mail_attach_xpm , NULL, NULL, "mail_attach", " "},
- {mail_compose_xpm , NULL, NULL, "mail_compose", " "},
- {mail_forward_xpm , NULL, NULL, "mail_forward", " "},
- {mail_receive_xpm , NULL, NULL, "mail_receive", " "},
- {mail_receive_all_xpm , NULL, NULL, "mail_receive_all", " "},
- {mail_reply_xpm , NULL, NULL, "mail_reply", " "},
- {mail_reply_to_all_xpm , NULL, NULL, "mail_reply_to_all", " "},
- {mail_reply_to_author_xpm
- , NULL, NULL, "mail_reply_to_author", " "},
- {mail_send_xpm , NULL, NULL, "mail_send", " "},
- {mail_send_queue_xpm , NULL, NULL, "mail_send_queue", " "},
- {mail_xpm , NULL, NULL, "mail_sign", " "},
- {mark_xpm , NULL, NULL, "mark", " "},
- {new_xpm , NULL, NULL, "new", " "},
- {news_compose_xpm , NULL, NULL, "news_compose", " "},
- {outbox_xpm , NULL, NULL, "outbox_close", " "},
- {outbox_hrm_xpm , NULL, NULL, "outbox_close_hrm", " "},
- {outbox_xpm , NULL, NULL, "outbox_open", " "},
- {outbox_hrm_xpm , NULL, NULL, "outbox_open_hrm", " "},
- {replied_xpm , NULL, NULL, "replied", " "},
- {paste_xpm , NULL, NULL, "paste", " "},
- {preferences_xpm , NULL, NULL, "preferences", " "},
- {properties_xpm , NULL, NULL, "properties", " "},
- {outbox_xpm , NULL, NULL, "queue_close", " "},
- {outbox_hrm_xpm , NULL, NULL, "queue_close_hrm", " "},
- {outbox_xpm , NULL, NULL, "queue_open", " "},
- {outbox_hrm_xpm , NULL, NULL, "queue_open_hrm", " "},
- {trash_xpm , NULL, NULL, "trash_open", " "},
- {trash_hrm_xpm , NULL, NULL, "trash_open_hrm", " "},
- {trash_xpm , NULL, NULL, "trash_close", " "},
- {trash_hrm_xpm , NULL, NULL, "trash_close_hrm", " "},
- {unread_xpm , NULL, NULL, "unread", " "},
- {vcard_xpm , NULL, NULL, "vcard", " "},
- {work_online_xpm , NULL, NULL, "work_online", " "},
- {work_offline_xpm , NULL, NULL, "work_offline", " "},
- {notice_warn_xpm , NULL, NULL, "notice_warn", " "},
- {notice_error_xpm , NULL, NULL, "notice_error", " "},
- {notice_note_xpm , NULL, NULL, "notice_note", " "},
- {quicksearch_xpm , NULL, NULL, "quicksearch", " "},
- {gpg_signed_xpm , NULL, NULL, "gpg_signed", " "},
- {drafts_close_xpm , NULL, NULL, "drafts_close", " "},
- {drafts_open_xpm , NULL, NULL, "drafts_open", " "},
- {messageview_text_xpm , NULL, NULL, "messageview_text", " "},
- {mime_text_plain_xpm , NULL, NULL, "mime_text_plain", " "},
- {mime_text_html_xpm , NULL, NULL, "mime_text_html", " "},
- {mime_application_xpm , NULL, NULL, "mime_application", " "},
- {mime_application_octet_stream_xpm , NULL, NULL, "mime_application_octet_stream", " "},
- {mime_image_xpm , NULL, NULL, "mime_image", " "},
- {mime_audio_xpm , NULL, NULL, "mime_audio", " "},
- {mime_text_enriched_xpm , NULL, NULL, "mime_text_enriched", " "},
- {mime_unknown_xpm , NULL, NULL, "mime_unknown", " "},
- {mime_gpg_signed_xpm , NULL, NULL, "mime_gpg_signed", " "},
- {mime_gpg_passed_xpm , NULL, NULL, "mime_gpg_passed", " "},
- {mime_gpg_failed_xpm , NULL, NULL, "mime_gpg_failed", " "},
- {mime_gpg_unknown_xpm , NULL, NULL, "mime_gpg_unknown", " "},
- {mime_gpg_expired_xpm , NULL, NULL, "mime_gpg_expired", " "},
- {sylpheed_logo_xpm , NULL, NULL, "sylpheed_logo", " "},
+ {address_xpm , NULL, NULL, "address", NULL},
+ {address_book_xpm , NULL, NULL, "address_book", NULL},
+ {address_search_xpm , NULL, NULL, "address_search", NULL},
+ {book_xpm , NULL, NULL, "book", NULL},
+ {category_xpm , NULL, NULL, "category", NULL},
+ {checkbox_off_xpm , NULL, NULL, "checkbox_off", NULL},
+ {checkbox_on_xpm , NULL, NULL, "checkbox_on", NULL},
+ {check_spelling_xpm , NULL, NULL, "check_spelling", NULL},
+ {clip_xpm , NULL, NULL, "clip", NULL},
+ {clipkey_xpm , NULL, NULL, "clipkey", NULL},
+ {clip_gpg_signed_xpm , NULL, NULL, "clip_gpg_signed", NULL},
+ {close_xpm , NULL, NULL, "close", NULL},
+ {complete_xpm , NULL, NULL, "complete", NULL},
+ {continue_xpm , NULL, NULL, "continue", NULL},
+ {deleted_xpm , NULL, NULL, "deleted", NULL},
+ {dir_close_xpm , NULL, NULL, "dir_close", NULL},
+ {dir_close_xpm , NULL, NULL, "dir_close_hrm", NULL},
+ {dir_open_xpm , NULL, NULL, "dir_open", NULL},
+ {dir_open_hrm_xpm , NULL, NULL, "dir_open_hrm", NULL},
+ {dir_close_mark_xpm , NULL, NULL, "dir_close_mark", NULL},
+ {dir_close_mark_xpm , NULL, NULL, "dir_close_hrm_mark", NULL},
+ {dir_open_mark_xpm , NULL, NULL, "dir_open_mark", NULL},
+ {dir_open_hrm_mark_xpm , NULL, NULL, "dir_open_hrm_mark", NULL},
+ {down_arrow_xpm , NULL, NULL, "down_arrow", NULL},
+ {up_arrow_xpm , NULL, NULL, "up_arrow", NULL},
+ {mail_compose_xpm , NULL, NULL, "edit_extern", NULL},
+ {error_xpm , NULL, NULL, "error", NULL},
+ {exec_xpm , NULL, NULL, "exec", NULL},
+ {forwarded_xpm , NULL, NULL, "forwarded", NULL},
+ {group_xpm , NULL, NULL, "group", NULL},
+ {ignorethread_xpm , NULL, NULL, "ignorethread", NULL},
+ {inbox_xpm , NULL, NULL, "inbox_close", NULL},
+ {inbox_hrm_xpm , NULL, NULL, "inbox_close_hrm", NULL},
+ {inbox_xpm , NULL, NULL, "inbox_open", NULL},
+ {inbox_hrm_xpm , NULL, NULL, "inbox_open_hrm", NULL},
+ {inbox_mark_xpm , NULL, NULL, "inbox_close_mark", NULL},
+ {inbox_hrm_mark_xpm , NULL, NULL, "inbox_close_hrm_mark", NULL},
+ {inbox_mark_xpm , NULL, NULL, "inbox_open_mark", NULL},
+ {inbox_hrm_mark_xpm , NULL, NULL, "inbox_open_hrm_mark", NULL},
+ {paste_xpm , NULL, NULL, "insert_file", NULL},
+ {interface_xpm , NULL, NULL, "interface", NULL},
+ {jpilot_xpm , NULL, NULL, "jpilot", NULL},
+ {key_xpm , NULL, NULL, "key", NULL},
+ {ldap_xpm , NULL, NULL, "ldap", NULL},
+ {linewrapcurrent_xpm , NULL, NULL, "linewrapcurrent", NULL},
+ {linewrap_xpm , NULL, NULL, "linewrap", NULL},
+ {locked_xpm , NULL, NULL, "locked", NULL},
+ {mail_xpm , NULL, NULL, "mail", NULL},
+ {mail_attach_xpm , NULL, NULL, "mail_attach", NULL},
+ {mail_compose_xpm , NULL, NULL, "mail_compose", NULL},
+ {mail_forward_xpm , NULL, NULL, "mail_forward", NULL},
+ {mail_receive_xpm , NULL, NULL, "mail_receive", NULL},
+ {mail_receive_all_xpm , NULL, NULL, "mail_receive_all", NULL},
+ {mail_reply_xpm , NULL, NULL, "mail_reply", NULL},
+ {mail_reply_to_all_xpm , NULL, NULL, "mail_reply_to_all", NULL},
+ {mail_reply_to_author_xpm , NULL, NULL, "mail_reply_to_author", NULL},
+ {mail_send_xpm , NULL, NULL, "mail_send", NULL},
+ {mail_send_queue_xpm , NULL, NULL, "mail_send_queue", NULL},
+ {mail_xpm , NULL, NULL, "mail_sign", NULL},
+ {mark_xpm , NULL, NULL, "mark", NULL},
+ {new_xpm , NULL, NULL, "new", NULL},
+ {news_compose_xpm , NULL, NULL, "news_compose", NULL},
+ {outbox_xpm , NULL, NULL, "outbox_close", NULL},
+ {outbox_hrm_xpm , NULL, NULL, "outbox_close_hrm", NULL},
+ {outbox_xpm , NULL, NULL, "outbox_open", NULL},
+ {outbox_hrm_xpm , NULL, NULL, "outbox_open_hrm", NULL},
+ {outbox_mark_xpm , NULL, NULL, "outbox_close_mark", NULL},
+ {outbox_hrm_mark_xpm , NULL, NULL, "outbox_close_hrm_mark", NULL},
+ {outbox_mark_xpm , NULL, NULL, "outbox_open_mark", NULL},
+ {outbox_hrm_mark_xpm , NULL, NULL, "outbox_open_hrm_mark", NULL},
+ {replied_xpm , NULL, NULL, "replied", NULL},
+ {paste_xpm , NULL, NULL, "paste", NULL},
+ {preferences_xpm , NULL, NULL, "preferences", NULL},
+ {properties_xpm , NULL, NULL, "properties", NULL},
+ {outbox_xpm , NULL, NULL, "queue_close", NULL},
+ {outbox_hrm_xpm , NULL, NULL, "queue_close_hrm", NULL},
+ {outbox_xpm , NULL, NULL, "queue_open", NULL},
+ {outbox_hrm_xpm , NULL, NULL, "queue_open_hrm", NULL},
+ {trash_xpm , NULL, NULL, "trash_open", NULL},
+ {trash_hrm_xpm , NULL, NULL, "trash_open_hrm", NULL},
+ {trash_xpm , NULL, NULL, "trash_close", NULL},
+ {trash_hrm_xpm , NULL, NULL, "trash_close_hrm", NULL},
+ {outbox_mark_xpm , NULL, NULL, "queue_close_mark", NULL},
+ {outbox_hrm_mark_xpm , NULL, NULL, "queue_close_hrm_mark", NULL},
+ {outbox_mark_xpm , NULL, NULL, "queue_open_mark", NULL},
+ {outbox_hrm_mark_xpm , NULL, NULL, "queue_open_hrm_mark", NULL},
+ {trash_mark_xpm , NULL, NULL, "trash_open_mark", NULL},
+ {trash_hrm_mark_xpm , NULL, NULL, "trash_open_hrm_mark", NULL},
+ {trash_mark_xpm , NULL, NULL, "trash_close_mark", NULL},
+ {trash_hrm_mark_xpm , NULL, NULL, "trash_close_hrm_mark", NULL},
+ {unread_xpm , NULL, NULL, "unread", NULL},
+ {vcard_xpm , NULL, NULL, "vcard", NULL},
+ {online_xpm , NULL, NULL, "online", NULL},
+ {offline_xpm , NULL, NULL, "offline", NULL},
+ {notice_warn_xpm , NULL, NULL, "notice_warn", NULL},
+ {notice_error_xpm , NULL, NULL, "notice_error", NULL},
+ {notice_note_xpm , NULL, NULL, "notice_note", NULL},
+ {quicksearch_xpm , NULL, NULL, "quicksearch", NULL},
+ {gpg_signed_xpm , NULL, NULL, "gpg_signed", NULL},
+ {drafts_close_xpm , NULL, NULL, "drafts_close", NULL},
+ {drafts_open_xpm , NULL, NULL, "drafts_open", NULL},
+ {drafts_close_mark_xpm , NULL, NULL, "drafts_close_mark", NULL},
+ {drafts_open_mark_xpm , NULL, NULL, "drafts_open_mark", NULL},
+ {mime_text_plain_xpm , NULL, NULL, "mime_text_plain", NULL},
+ {mime_text_html_xpm , NULL, NULL, "mime_text_html", NULL},
+ {mime_application_xpm , NULL, NULL, "mime_application", NULL},
+ {mime_image_xpm , NULL, NULL, "mime_image", NULL},
+ {mime_audio_xpm , NULL, NULL, "mime_audio", NULL},
+ {mime_text_enriched_xpm , NULL, NULL, "mime_text_enriched", NULL},
+ {mime_unknown_xpm , NULL, NULL, "mime_unknown", NULL},
+ {privacy_signed_xpm , NULL, NULL, "privacy_signed", NULL},
+ {privacy_passed_xpm , NULL, NULL, "privacy_passed", NULL},
+ {privacy_failed_xpm , NULL, NULL, "privacy_failed", NULL},
+ {privacy_unknown_xpm , NULL, NULL, "privacy_unknown", NULL},
+ {privacy_expired_xpm , NULL, NULL, "privacy_expired", NULL},
+ {privacy_warn_xpm , NULL, NULL, "privacy_warn", NULL},
+ {privacy_emblem_encrypted_xpm , NULL, NULL, "privacy_emblem_encrypted", NULL},
+ {privacy_emblem_signed_xpm , NULL, NULL, "privacy_emblem_signed", NULL},
+ {privacy_emblem_passed_xpm , NULL, NULL, "privacy_emblem_passed", NULL},
+ {privacy_emblem_failed_xpm , NULL, NULL, "privacy_emblem_failed", NULL},
+ {privacy_emblem_warn_xpm , NULL, NULL, "privacy_emblem_warn", NULL},
+ {mime_message_xpm , NULL, NULL, "mime_message", NULL},
+ {sylpheed_icon_xpm , NULL, NULL, "sylpheed_icon", NULL},
+ {read_xpm , NULL, NULL, "read", NULL},
+ {trash_btn_xpm , NULL, NULL, "trash_btn", NULL},
+ {sylpheed_logo_xpm , NULL, NULL, "sylpheed_logo", NULL},
+ {dir_noselect_xpm , NULL, NULL, "dir_noselect" , NULL}
};
/* return newly constructed GtkPixmap from GdkPixmap */
g_return_val_if_fail(icon >= 0 && icon < N_STOCK_PIXMAPS, NULL);
if (stock_pixmap_gdk(window, icon, &pixmap, &mask) != -1)
- return gtk_pixmap_new(pixmap, mask);
+ return gtk_image_new_from_pixmap(pixmap, mask);
return NULL;
}
+/*!
+ *\brief
+ */
+gint stock_pixbuf_gdk(GtkWidget *window, StockPixmap icon, GdkPixbuf **pixbuf)
+{
+ StockPixmapData *pix_d;
+
+ if (pixbuf)
+ *pixbuf = NULL;
+
+ g_return_val_if_fail(icon >= 0 && icon < N_STOCK_PIXMAPS, -1);
+
+ pix_d = &pixmaps[icon];
+
+ if (!pix_d->pixbuf || (strcmp2(pix_d->icon_path, prefs_common.pixmap_theme_path) != 0)) {
+ GdkPixbuf *pix = NULL;
+
+ if (strcmp(prefs_common.pixmap_theme_path, DEFAULT_PIXMAP_THEME) != 0) {
+ if (is_dir_exist(prefs_common.pixmap_theme_path)) {
+ char *icon_file_name;
+
+ icon_file_name = g_strconcat(prefs_common.pixmap_theme_path,
+ G_DIR_SEPARATOR_S,
+ pix_d->file,
+ ".xpm",
+ NULL);
+ if (is_file_exist(icon_file_name)) {
+ GError *err = NULL;
+ pix = gdk_pixbuf_new_from_file(icon_file_name, &err);
+ if (err) g_error_free(err);
+ }
+ if (pix) {
+ if (pix_d->icon_path != NULL) g_free(pix_d->icon_path);
+ pix_d->icon_path = g_strdup(prefs_common.pixmap_theme_path);
+ }
+ g_free(icon_file_name);
+ } else {
+ /* even the path does not exist (deleted between two sessions), so
+ set the preferences to the internal theme */
+ prefs_common.pixmap_theme_path = g_strdup(DEFAULT_PIXMAP_THEME);
+ }
+ }
+ pix_d->pixbuf = pix;
+ }
+
+ if (!pix_d->pixbuf) {
+ pix_d->pixbuf = gdk_pixbuf_new_from_xpm_data((const gchar **) pix_d->data);
+ if (pix_d->pixbuf) {
+ if (pix_d->icon_path != NULL) g_free(pix_d->icon_path);
+ pix_d->icon_path = g_strdup(DEFAULT_PIXMAP_THEME);
+ }
+ }
+
+ g_return_val_if_fail(pix_d->pixbuf != NULL, -1);
+
+ if (pixbuf)
+ *pixbuf = pix_d->pixbuf;
+
+ /* pixbuf should have one ref outstanding */
+
+ return 0;
+}
+
/* create GdkPixmap if it has not created yet */
gint stock_pixmap_gdk(GtkWidget *window, StockPixmap icon,
GdkPixmap **pixmap, GdkBitmap **mask)
pix_d = &pixmaps[icon];
- if (!pix_d->pixmap || (strcmp(pix_d->icon_path, prefs_common.pixmap_theme_path) != 0)) {
+ if (!pix_d->pixmap || (strcmp2(pix_d->icon_path, prefs_common.pixmap_theme_path) != 0)) {
GdkPixmap *pix = NULL;
if (strcmp(prefs_common.pixmap_theme_path, DEFAULT_PIXMAP_THEME) != 0) {
NULL);
if (is_file_exist(icon_file_name))
PIXMAP_CREATE_FROM_FILE(window, pix, pix_d->mask, icon_file_name);
- if (pix)
- pix_d->icon_path = prefs_common.pixmap_theme_path;
+ if (pix) {
+ if (pix_d->icon_path != NULL) g_free(pix_d->icon_path);
+ pix_d->icon_path = g_strdup(prefs_common.pixmap_theme_path);
+ }
g_free(icon_file_name);
} else {
/* even the path does not exist (deleted between two sessions), so
set the preferences to the internal theme */
- prefs_common.pixmap_theme_path = DEFAULT_PIXMAP_THEME;
+ prefs_common.pixmap_theme_path = g_strdup(DEFAULT_PIXMAP_THEME);
}
}
pix_d->pixmap = pix;
if (!pix_d->pixmap) {
PIXMAP_CREATE(window, pix_d->pixmap, pix_d->mask, pix_d->data);
- if (pix_d->pixmap)
- pix_d->icon_path = DEFAULT_PIXMAP_THEME;
+ if (pix_d->pixmap) {
+ if (pix_d->icon_path != NULL) g_free(pix_d->icon_path);
+ pix_d->icon_path = g_strdup(DEFAULT_PIXMAP_THEME);
+ }
}
g_return_val_if_fail(pix_d->pixmap != NULL, -1);
}
return -1;
}
+
+static gboolean pixmap_with_overlay_expose_event_cb(GtkWidget *widget, GdkEventExpose *expose,
+ OverlayData *data)
+{
+ GdkDrawable *drawable = widget->window;
+ GdkGC *gc_pix;
+ gint left = 0;
+ gint top = 0;
+
+ g_return_val_if_fail(data->base_pixmap != NULL, FALSE);
+ g_return_val_if_fail(data->base_mask != NULL, FALSE);
+
+ gc_pix = gdk_gc_new((GdkWindow *)drawable);
+
+ gdk_window_clear_area (drawable, expose->area.x, expose->area.y,
+ expose->area.width, expose->area.height);
+
+ gdk_gc_set_tile(gc_pix, data->base_pixmap);
+ gdk_gc_set_ts_origin(gc_pix, data->border_x, data->border_y);
+ gdk_gc_set_clip_mask(gc_pix, data->base_mask);
+ gdk_gc_set_clip_origin(gc_pix, data->border_x, data->border_y);
+ gdk_gc_set_fill(gc_pix, GDK_TILED);
+
+ gdk_draw_rectangle(drawable, gc_pix, TRUE, data->border_x, data->border_y,
+ data->base_width, data->base_height);
+
+ if (data->position != OVERLAY_NONE) {
+ g_return_val_if_fail(data->overlay_pixmap != NULL, FALSE);
+ g_return_val_if_fail(data->overlay_mask != NULL, FALSE);
+
+ gdk_gc_set_tile(gc_pix, data->overlay_pixmap);
+ gdk_gc_set_clip_mask(gc_pix, data->overlay_mask);
+
+ switch (data->position) {
+ case OVERLAY_TOP_LEFT:
+ case OVERLAY_MID_LEFT:
+ case OVERLAY_BOTTOM_LEFT:
+ left = 0;
+ break;
+
+ case OVERLAY_TOP_CENTER:
+ case OVERLAY_MID_CENTER:
+ case OVERLAY_BOTTOM_CENTER:
+ left = (data->base_width + data->border_x * 2 - data->overlay_width)/2;
+ break;
+
+ case OVERLAY_TOP_RIGHT:
+ case OVERLAY_MID_RIGHT:
+ case OVERLAY_BOTTOM_RIGHT:
+ left = data->base_width + data->border_x * 2 - data->overlay_width;
+ break;
+
+ default:
+ break;
+ }
+ switch (data->position) {
+ case OVERLAY_TOP_LEFT:
+ case OVERLAY_TOP_CENTER:
+ case OVERLAY_TOP_RIGHT:
+ top = 0;
+ break;
+
+ case OVERLAY_MID_LEFT:
+ case OVERLAY_MID_CENTER:
+ case OVERLAY_MID_RIGHT:
+ top = (data->base_height + data->border_y * 2 - data->overlay_height)/2;
+ break;
+
+ case OVERLAY_BOTTOM_LEFT:
+ case OVERLAY_BOTTOM_CENTER:
+ case OVERLAY_BOTTOM_RIGHT:
+ top = data->base_height + data->border_y * 2 - data->overlay_height;
+ break;
+
+ default:
+ break;
+ }
+
+ gdk_gc_set_ts_origin(gc_pix, left, top);
+ gdk_gc_set_clip_origin(gc_pix, left, top);
+ gdk_gc_set_fill(gc_pix, GDK_TILED);
+ gdk_draw_rectangle(drawable, gc_pix, TRUE, left, top,
+ data->overlay_width, data->overlay_height);
+ }
+ g_object_unref(gc_pix);
+
+ return TRUE;
+}
+
+static void pixmap_with_overlay_destroy_cb(GtkObject *object, OverlayData *data)
+{
+ g_object_unref(data->base_pixmap);
+ g_object_unref(data->base_mask);
+ if (data->position != OVERLAY_NONE) {
+ g_object_unref(data->overlay_pixmap);
+ g_object_unref(data->overlay_mask);
+ }
+ g_free(data);
+}
+
+/**
+ * \brief Get a widget showing one icon with another overlaid on top of it.
+ *
+ * The base icon is always centralised, the other icon can be positioned.
+ * The overlay icon is ignored if pos=OVERLAY_NONE is used
+ *
+ * \param window top-level window widget
+ * \param icon the base icon
+ * \param overlay the icon to overlay
+ * \param pos how to align the overlay widget, or OVERLAY_NONE for no overlay
+ * \param border_x size of the border around the base icon (left and right)
+ * \param border_y size of the border around the base icon (top and bottom)
+ */
+GtkWidget *stock_pixmap_widget_with_overlay(GtkWidget *window, StockPixmap icon,
+ StockPixmap overlay, OverlayPosition pos,
+ gint border_x, gint border_y)
+{
+ GdkPixmap *stock_pixmap;
+ GdkBitmap *stock_mask;
+ GtkWidget *widget;
+ GtkWidget *stock_wid;
+ OverlayData *data;
+
+ data = g_new0(OverlayData, 1);
+
+ stock_wid = stock_pixmap_widget(window, icon);
+ gtk_image_get_pixmap(GTK_IMAGE(stock_wid), &stock_pixmap, &stock_mask);
+ g_object_ref(stock_pixmap);
+ g_object_ref(stock_mask);
+ data->base_pixmap = stock_pixmap;
+ data->base_mask = stock_mask;
+ data->base_height = stock_wid->requisition.height;
+ data->base_width = stock_wid->requisition.width;
+ gtk_widget_destroy(stock_wid);
+
+ if (pos == OVERLAY_NONE) {
+ data->overlay_pixmap = NULL;
+ data->overlay_mask = NULL;
+ } else {
+ stock_wid = stock_pixmap_widget(window, overlay);
+ gtk_image_get_pixmap(GTK_IMAGE(stock_wid), &stock_pixmap, &stock_mask);
+ g_object_ref(stock_pixmap);
+ g_object_ref(stock_mask);
+ data->overlay_pixmap = stock_pixmap;
+ data->overlay_mask = stock_mask;
+ data->overlay_height = stock_wid->requisition.height;
+ data->overlay_width = stock_wid->requisition.width;
+
+ gtk_widget_destroy(stock_wid);
+ }
+
+ data->position = pos;
+ data->border_x = border_x;
+ data->border_y = border_y;
+
+ widget = gtk_drawing_area_new();
+ gtk_drawing_area_size(GTK_DRAWING_AREA(widget), data->base_width + border_x * 2,
+ data->base_height + border_y * 2);
+ g_signal_connect(G_OBJECT(widget), "expose_event",
+ G_CALLBACK(pixmap_with_overlay_expose_event_cb), data);
+ g_signal_connect(G_OBJECT(widget), "destroy",
+ G_CALLBACK(pixmap_with_overlay_destroy_cb), data);
+ return widget;
+
+}
projects / claws.git / blobdiff