Mercurial > hg > toolkit / changeset

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ui/gtk/icon.c	Sun Oct 13 19:41:12 2024 +0200
@@ -0,0 +1,204 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2017 Olaf Wintermann. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <cx/map.h>
+
+#include "toolkit.h"
+#include "icon.h"
+#include "../common/properties.h"
+
+static CxMap *image_map;
+
+static GtkIconTheme *icon_theme;
+
+#if GTK_MAJOR_VERSION >= 4
+#define ICONTHEME_GET_DEFAULT() gtk_icon_theme_get_for_display(gdk_display_get_default())
+#else
+#define ICONTHEME_GET_DEFAULT() gtk_icon_theme_get_default()
+#endif
+
+void ui_image_init(void) {
+    image_map = cxHashMapCreateSimple(CX_STORE_POINTERS);
+    
+    icon_theme = ICONTHEME_GET_DEFAULT();
+}
+
+// **** deprecated functions ****
+
+GdkPixbuf* ui_get_image(const char *name) {
+    UiImage *img = cxMapGet(image_map, name);
+    if(img) {
+        return img->pixbuf;
+    } else {
+        //ui_add_image(name, name);
+        //return ucx_map_cstr_get(image_map, name);
+        // TODO
+        return NULL;
+    }
+}
+
+// **** deprecated2****
+
+static UiIcon* get_icon(const char *name, int size, int scale) {
+#if GTK_MAJOR_VERSION >= 4
+    GtkIconPaintable *info = gtk_icon_theme_lookup_icon(icon_theme, name, NULL, size, scale, GTK_TEXT_DIR_LTR, GTK_ICON_LOOKUP_FORCE_REGULAR);
+#elif defined(UI_SUPPORTS_SCALE)
+    GtkIconInfo *info = gtk_icon_theme_lookup_icon_for_scale(icon_theme, name, size, scale, 0);
+#else
+    GtkIconInfo *info = gtk_icon_theme_lookup_icon(icon_theme, name, size, 0);
+#endif
+    if(info) {
+        UiIcon *icon = malloc(sizeof(UiIcon));
+        icon->info = info;
+        icon->pixbuf = NULL;
+        return icon;
+    }
+    return NULL;
+}
+
+UiIcon* ui_icon(const char* name, size_t size) {
+    return get_icon(name, size, ui_get_scalefactor());
+}
+
+UiIcon* ui_imageicon(const char* file) {
+    GError *error = NULL;
+    GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(file, &error);
+    if(!pixbuf) {
+        fprintf(stderr, "UiError: Cannot load image: %s\n", file);
+        return NULL;
+    }
+    
+    UiIcon *icon = malloc(sizeof(UiIcon));
+    icon->info = NULL;
+    icon->pixbuf = pixbuf;
+    return icon;
+}
+
+void ui_icon_free(UiIcon* icon) {
+    if(icon->info) {
+        g_object_unref(icon->info);
+    }
+    if(icon->pixbuf) {
+        g_object_unref(icon->pixbuf);
+    }
+    free(icon);
+}
+
+UiIcon* ui_foldericon(size_t size) {
+    return ui_icon("folder", size);
+}
+
+UiIcon* ui_fileicon(size_t size) {
+    UiIcon *icon = ui_icon("file", size);
+#if GTK_MAJOR_VERSION >= 4
+    GFile *file = gtk_icon_paintable_get_file(icon->info);
+    char *path = g_file_get_path(file);
+    if(!path) {
+        icon = ui_icon("application-x-generic", size);
+    }
+#endif
+    return icon;
+}
+
+UiIcon* ui_icon_unscaled(const char *name, int size) {
+    return get_icon(name, size, 1);
+}
+
+#if GTK_MAJOR_VERSION >= 4
+GdkPixbuf* ui_icon_pixbuf(UiIcon *icon) {
+    if(!icon->pixbuf) {
+        GFile *file = gtk_icon_paintable_get_file(icon->info);
+        GError *error = NULL;
+        char *path = g_file_get_path(file);
+        icon->pixbuf = gdk_pixbuf_new_from_file(path, &error);
+    }
+    return icon->pixbuf;
+}
+#else
+GdkPixbuf* ui_icon_pixbuf(UiIcon *icon) {
+    if(!icon->pixbuf) {
+        GError *error = NULL;
+        icon->pixbuf = gtk_icon_info_load_icon(icon->info, &error);
+    }
+    return icon->pixbuf;
+}
+#endif
+
+/*
+UiImage* ui_icon_image(UiIcon *icon) {
+    GError *error = NULL;
+    GdkPixbuf *pixbuf = gtk_icon_info_load_icon(icon->info, &error);
+    if(pixbuf) {
+        UiImage *img = malloc(sizeof(UiImage));
+        img->pixbuf = pixbuf;
+        return img;
+    }
+    return NULL;
+}
+*/
+
+/*
+UiImage* ui_image(const char *filename) {
+    return ui_named_image(filename, NULL);
+}
+
+UiImage* ui_named_image(const char *filename, const char *name) {
+    char *path =  uic_get_image_path(filename);
+    if(!path) {
+        fprintf(stderr, "UiError: pixmaps directory not set\n");
+        return NULL;
+    }
+    UiImage *img = ui_load_image_from_path(path, name);
+    free(path);
+    return img;
+}
+
+UiImage* ui_load_image_from_path(const char *path, const char *name) {
+    GError *error = NULL;
+    GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(path, &error);
+    if(!pixbuf) {
+        fprintf(stderr, "UiError: Cannot load image: %s\n", path);
+        return NULL;
+    }
+    
+    UiImage *img = malloc(sizeof(UiImage));
+    img->pixbuf = pixbuf;
+    if(name) {
+        cxMapPut(image_map, name, img);
+    }
+    return img;
+}
+*/
+
+void ui_free_image(UiImage *img) {
+    g_object_unref(img->pixbuf);
+    free(img);
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ui/gtk/icon.h	Sun Oct 13 19:41:12 2024 +0200
@@ -0,0 +1,67 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2017 Olaf Wintermann. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ICON_H
+#define	ICON_H
+
+#include "../ui/icon.h"
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+#if GTK_MAJOR_VERSION >= 3 && GTK_MINOR_VERSION >= 10
+#define UI_SUPPORTS_SCALE
+#endif
+
+    
+struct UiIcon {
+#if GTK_MAJOR_VERSION >= 4
+    GtkIconPaintable *info;
+#else
+    GtkIconInfo *info;
+#endif
+    GdkPixbuf *pixbuf;
+};
+
+struct UiImage {
+    GdkPixbuf *pixbuf;
+};
+
+void ui_image_init(void);
+
+GdkPixbuf* ui_get_image(const char *name);
+
+GdkPixbuf* ui_icon_pixbuf(UiIcon *icon);
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* ICON_H */
+

--- a/ui/gtk/image.c	Sun Oct 13 19:37:00 2024 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,204 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2017 Olaf Wintermann. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <cx/map.h>
-
-#include "toolkit.h"
-#include "image.h"
-#include "../common/properties.h"
-
-static CxMap *image_map;
-
-static GtkIconTheme *icon_theme;
-
-#if GTK_MAJOR_VERSION >= 4
-#define ICONTHEME_GET_DEFAULT() gtk_icon_theme_get_for_display(gdk_display_get_default())
-#else
-#define ICONTHEME_GET_DEFAULT() gtk_icon_theme_get_default()
-#endif
-
-void ui_image_init(void) {
-    image_map = cxHashMapCreateSimple(CX_STORE_POINTERS);
-    
-    icon_theme = ICONTHEME_GET_DEFAULT();
-}
-
-// **** deprecated functions ****
-
-GdkPixbuf* ui_get_image(const char *name) {
-    UiImage *img = cxMapGet(image_map, name);
-    if(img) {
-        return img->pixbuf;
-    } else {
-        //ui_add_image(name, name);
-        //return ucx_map_cstr_get(image_map, name);
-        // TODO
-        return NULL;
-    }
-}
-
-// **** deprecated2****
-
-static UiIcon* get_icon(const char *name, int size, int scale) {
-#if GTK_MAJOR_VERSION >= 4
-    GtkIconPaintable *info = gtk_icon_theme_lookup_icon(icon_theme, name, NULL, size, scale, GTK_TEXT_DIR_LTR, GTK_ICON_LOOKUP_FORCE_REGULAR);
-#elif defined(UI_SUPPORTS_SCALE)
-    GtkIconInfo *info = gtk_icon_theme_lookup_icon_for_scale(icon_theme, name, size, scale, 0);
-#else
-    GtkIconInfo *info = gtk_icon_theme_lookup_icon(icon_theme, name, size, 0);
-#endif
-    if(info) {
-        UiIcon *icon = malloc(sizeof(UiIcon));
-        icon->info = info;
-        icon->pixbuf = NULL;
-        return icon;
-    }
-    return NULL;
-}
-
-UiIcon* ui_icon(const char* name, size_t size) {
-    return get_icon(name, size, ui_get_scalefactor());
-}
-
-UiIcon* ui_imageicon(const char* file) {
-    GError *error = NULL;
-    GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(file, &error);
-    if(!pixbuf) {
-        fprintf(stderr, "UiError: Cannot load image: %s\n", file);
-        return NULL;
-    }
-    
-    UiIcon *icon = malloc(sizeof(UiIcon));
-    icon->info = NULL;
-    icon->pixbuf = pixbuf;
-    return icon;
-}
-
-void ui_icon_free(UiIcon* icon) {
-    if(icon->info) {
-        g_object_unref(icon->info);
-    }
-    if(icon->pixbuf) {
-        g_object_unref(icon->pixbuf);
-    }
-    free(icon);
-}
-
-UiIcon* ui_foldericon(size_t size) {
-    return ui_icon("folder", size);
-}
-
-UiIcon* ui_fileicon(size_t size) {
-    UiIcon *icon = ui_icon("file", size);
-#if GTK_MAJOR_VERSION >= 4
-    GFile *file = gtk_icon_paintable_get_file(icon->info);
-    char *path = g_file_get_path(file);
-    if(!path) {
-        icon = ui_icon("application-x-generic", size);
-    }
-#endif
-    return icon;
-}
-
-UiIcon* ui_icon_unscaled(const char *name, int size) {
-    return get_icon(name, size, 1);
-}
-
-#if GTK_MAJOR_VERSION >= 4
-GdkPixbuf* ui_icon_pixbuf(UiIcon *icon) {
-    if(!icon->pixbuf) {
-        GFile *file = gtk_icon_paintable_get_file(icon->info);
-        GError *error = NULL;
-        char *path = g_file_get_path(file);
-        icon->pixbuf = gdk_pixbuf_new_from_file(path, &error);
-    }
-    return icon->pixbuf;
-}
-#else
-GdkPixbuf* ui_icon_pixbuf(UiIcon *icon) {
-    if(!icon->pixbuf) {
-        GError *error = NULL;
-        icon->pixbuf = gtk_icon_info_load_icon(icon->info, &error);
-    }
-    return icon->pixbuf;
-}
-#endif
-
-/*
-UiImage* ui_icon_image(UiIcon *icon) {
-    GError *error = NULL;
-    GdkPixbuf *pixbuf = gtk_icon_info_load_icon(icon->info, &error);
-    if(pixbuf) {
-        UiImage *img = malloc(sizeof(UiImage));
-        img->pixbuf = pixbuf;
-        return img;
-    }
-    return NULL;
-}
-*/
-
-/*
-UiImage* ui_image(const char *filename) {
-    return ui_named_image(filename, NULL);
-}
-
-UiImage* ui_named_image(const char *filename, const char *name) {
-    char *path =  uic_get_image_path(filename);
-    if(!path) {
-        fprintf(stderr, "UiError: pixmaps directory not set\n");
-        return NULL;
-    }
-    UiImage *img = ui_load_image_from_path(path, name);
-    free(path);
-    return img;
-}
-
-UiImage* ui_load_image_from_path(const char *path, const char *name) {
-    GError *error = NULL;
-    GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(path, &error);
-    if(!pixbuf) {
-        fprintf(stderr, "UiError: Cannot load image: %s\n", path);
-        return NULL;
-    }
-    
-    UiImage *img = malloc(sizeof(UiImage));
-    img->pixbuf = pixbuf;
-    if(name) {
-        cxMapPut(image_map, name, img);
-    }
-    return img;
-}
-*/
-
-void ui_free_image(UiImage *img) {
-    g_object_unref(img->pixbuf);
-    free(img);
-}

--- a/ui/gtk/image.h	Sun Oct 13 19:37:00 2024 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2017 Olaf Wintermann. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef IMAGE_H
-#define	IMAGE_H
-
-#include "../ui/image.h"
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-#if GTK_MAJOR_VERSION >= 3 && GTK_MINOR_VERSION >= 10
-#define UI_SUPPORTS_SCALE
-#endif
-
-    
-struct UiIcon {
-#if GTK_MAJOR_VERSION >= 4
-    GtkIconPaintable *info;
-#else
-    GtkIconInfo *info;
-#endif
-    GdkPixbuf *pixbuf;
-};
-
-struct UiImage {
-    GdkPixbuf *pixbuf;
-};
-
-void ui_image_init(void);
-
-GdkPixbuf* ui_get_image(const char *name);
-
-GdkPixbuf* ui_icon_pixbuf(UiIcon *icon);
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* IMAGE_H */
-

--- a/ui/ui/image.h	Sun Oct 13 19:37:00 2024 +0200
+++ b/ui/ui/image.h	Sun Oct 13 19:41:12 2024 +0200
@@ -45,7 +45,8 @@
     const char *style_class;
 
     UiBool scrollarea;
-    
+    UiGeneric *value;
+    const char *varname;
 } UiImageViewerArgs;
     
 #define ui_imageviewer(obj, ...) ui_imageviewer_create(obj, (UiImageViewerArgs){ __VA_ARGS__ } )