comparison: ui/gtk/image.c
ui/gtk/image.c
- changeset 146
- dd0ae1c62a72
- parent 140
- c03c338a7dcf
- child 157
- 0b33b9396851
equal
deleted
inserted
replaced
| 145:853685152c1d | 146:dd0ae1c62a72 |
|---|---|
| 29 #include <stdio.h> | 29 #include <stdio.h> |
| 30 #include <stdlib.h> | 30 #include <stdlib.h> |
| 31 #include <string.h> | 31 #include <string.h> |
| 32 #include "../../ucx/map.h" | 32 #include "../../ucx/map.h" |
| 33 | 33 |
| 34 #include "toolkit.h" | |
| 34 #include "image.h" | 35 #include "image.h" |
| 35 #include "../common/properties.h" | 36 #include "../common/properties.h" |
| 36 | 37 |
| 37 | |
| 38 static UcxMap *image_map; | 38 static UcxMap *image_map; |
| 39 | 39 |
| 40 void ui_image_init() { | 40 static GtkIconTheme *icon_theme; |
| 41 | |
| 42 void ui_image_init(void) { | |
| 41 image_map = ucx_map_new(8); | 43 image_map = ucx_map_new(8); |
| 44 | |
| 45 icon_theme = gtk_icon_theme_get_default(); | |
| 42 } | 46 } |
| 43 | 47 |
| 44 void ui_add_image(char *imgname, char *filename) { | 48 // **** deprecated functions **** |
| 45 // create file path | 49 |
| 50 GdkPixbuf* ui_get_image(char *name) { | |
| 51 UiImage *img = ucx_map_cstr_get(image_map, name); | |
| 52 if(img) { | |
| 53 return img->pixbuf; | |
| 54 } else { | |
| 55 //ui_add_image(name, name); | |
| 56 //return ucx_map_cstr_get(image_map, name); | |
| 57 // TODO | |
| 58 return NULL; | |
| 59 } | |
| 60 } | |
| 61 | |
| 62 // **** new functions **** | |
| 63 | |
| 64 static UiIcon* get_icon(const char *name, int size, int scale) { | |
| 65 #ifdef UI_SUPPORTS_SCALE | |
| 66 GtkIconInfo *info = gtk_icon_theme_lookup_icon_for_scale(icon_theme, name, size, scale, 0); | |
| 67 #else | |
| 68 GtkIconInfo *info = gtk_icon_theme_lookup_icon(icon_theme, name, size, 0); | |
| 69 #endif | |
| 70 if(info) { | |
| 71 UiIcon *icon = malloc(sizeof(UiIcon)); | |
| 72 icon->info = info; | |
| 73 return icon; | |
| 74 } | |
| 75 return NULL; | |
| 76 } | |
| 77 | |
| 78 UiIcon* ui_icon(const char *name, int size) { | |
| 79 return get_icon(name, size, ui_get_scalefactor()); | |
| 80 } | |
| 81 | |
| 82 UiIcon* ui_icon_unscaled(const char *name, int size) { | |
| 83 return get_icon(name, size, 1); | |
| 84 } | |
| 85 | |
| 86 void ui_free_icon(UiIcon *icon) { | |
| 87 g_object_unref(icon->info); | |
| 88 free(icon); | |
| 89 } | |
| 90 | |
| 91 UiImage* ui_icon_image(UiIcon *icon) { | |
| 92 GError *error = NULL; | |
| 93 GdkPixbuf *pixbuf = gtk_icon_info_load_icon(icon->info, &error); | |
| 94 if(pixbuf) { | |
| 95 UiImage *img = malloc(sizeof(UiImage)); | |
| 96 img->pixbuf = pixbuf; | |
| 97 return img; | |
| 98 } | |
| 99 return NULL; | |
| 100 } | |
| 101 | |
| 102 UiImage* ui_image(const char *filename) { | |
| 103 return ui_named_image(filename, NULL); | |
| 104 } | |
| 105 | |
| 106 UiImage* ui_named_image(const char *filename, const char *name) { | |
| 46 char *path = uic_get_image_path(filename); | 107 char *path = uic_get_image_path(filename); |
| 47 if(!path) { | 108 if(!path) { |
| 48 // TODO: error | |
| 49 fprintf(stderr, "UiError: pixmaps directory not set\n"); | 109 fprintf(stderr, "UiError: pixmaps directory not set\n"); |
| 50 return; | 110 return NULL; |
| 111 } | |
| 112 UiImage *img = ui_load_image_from_path(path, name); | |
| 113 free(path); | |
| 114 return img; | |
| 115 } | |
| 116 | |
| 117 UiImage* ui_load_image_from_path(const char *path, const char *name) { | |
| 118 GError *error = NULL; | |
| 119 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(path, &error); | |
| 120 if(!pixbuf) { | |
| 121 fprintf(stderr, "UiError: Cannot load image: %s\n", path); | |
| 122 return NULL; | |
| 51 } | 123 } |
| 52 | 124 |
| 53 GError *error = NULL; | 125 UiImage *img = malloc(sizeof(UiImage)); |
| 54 GdkPixbuf *image = gdk_pixbuf_new_from_file(path, &error); | 126 img->pixbuf = pixbuf; |
| 55 if(!image) { | 127 if(name) { |
| 56 // TODO: error | 128 ucx_map_cstr_put(image_map, name, img); |
| 57 fprintf(stderr, "UiError: Cannot load image: %s\n", path); | |
| 58 } else { | |
| 59 ucx_map_cstr_put(image_map, imgname, image); | |
| 60 } | 129 } |
| 61 | 130 return img; |
| 62 free(path); | |
| 63 } | 131 } |
| 64 | 132 |
| 65 GdkPixbuf* ui_get_image(char *name) { | 133 void ui_free_image(UiImage *img) { |
| 66 GdkPixbuf *pixbuf = ucx_map_cstr_get(image_map, name); | 134 g_object_unref(img->pixbuf); |
| 67 if(pixbuf) { | 135 free(img); |
| 68 return pixbuf; | |
| 69 } else { | |
| 70 ui_add_image(name, name); | |
| 71 return ucx_map_cstr_get(image_map, name); | |
| 72 } | |
| 73 } | 136 } |
