[gimp/nielsdg/script-fu-use-girepository: 13/14] plug-ins/scheme-wrapper: Use GIR for enum values
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/nielsdg/script-fu-use-girepository: 13/14] plug-ins/scheme-wrapper: Use GIR for enum values
- Date: Thu, 16 Dec 2021 10:18:13 +0000 (UTC)
commit 0310e3800a21fba8c1c7c4aa1bb3fe8270464160
Author: Niels De Graef <nielsdegraef gmail com>
Date: Tue Nov 30 11:38:10 2021 +0100
plug-ins/scheme-wrapper: Use GIR for enum values
This allows our script-fu plugins to use the GIMP enum values, just like
all our other plug-ins know them.
In other words:
* Names are consistent with those of other plug-ins
* Introspectable enums are automatically added as they are added to the
introspection file, without even needing a recompile
* No need to keep track of our enum types anymore, as that is just a
redundant implementation of introspection in practice. This in turn
will let us simplify some of the pdb code
meson.build | 1 +
plug-ins/script-fu/Makefile.am | 2 +
plug-ins/script-fu/meson.build | 1 +
plug-ins/script-fu/scheme-wrapper.c | 148 +++++++++++++++++++++++-------------
4 files changed, 99 insertions(+), 53 deletions(-)
---
diff --git a/meson.build b/meson.build
index cb4bb5d8c7..96b267ec21 100644
--- a/meson.build
+++ b/meson.build
@@ -342,6 +342,7 @@ gio_specific = dependency(gio_specific_name)
glib_minver = '2.68.0'
glib = dependency('glib-2.0', version: '>='+glib_minver)
+gi = dependency('gobject-introspection-1.0')
conf.set('G_DISABLE_DEPRECATED', glib.version().version_compare('>=2.57'))
diff --git a/plug-ins/script-fu/Makefile.am b/plug-ins/script-fu/Makefile.am
index bc5e0f829b..cfa9cf5df6 100644
--- a/plug-ins/script-fu/Makefile.am
+++ b/plug-ins/script-fu/Makefile.am
@@ -34,6 +34,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \
+ $(INTROSPECTION_CFLAGS) \
-I$(includedir) \
-DSTANDALONE=0 \
-DUSE_INTERFACE=1 \
@@ -105,6 +106,7 @@ LDADD = \
$(WINSOCK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS) \
+ $(INTROSPECTION_LIBS) \
$(script_fu_RC)
diff --git a/plug-ins/script-fu/meson.build b/plug-ins/script-fu/meson.build
index 1a2fb4ccb2..f3592a3d03 100644
--- a/plug-ins/script-fu/meson.build
+++ b/plug-ins/script-fu/meson.build
@@ -43,6 +43,7 @@ executable(plugin_name,
libgimpui_dep,
math,
winsock,
+ gi,
],
c_args: [
'-DSTANDALONE=0',
diff --git a/plug-ins/script-fu/scheme-wrapper.c b/plug-ins/script-fu/scheme-wrapper.c
index 7698e56ec1..302aa5b66b 100644
--- a/plug-ins/script-fu/scheme-wrapper.c
+++ b/plug-ins/script-fu/scheme-wrapper.c
@@ -24,6 +24,8 @@
#include <glib/gstdio.h>
+#include <girepository.h>
+
#include <gtk/gtk.h>
#include "libgimp/gimp.h"
@@ -50,12 +52,13 @@
#undef cons
-static void ts_init_constants (scheme *sc);
-static void ts_init_enum (scheme *sc,
- GType enum_type);
+static void ts_init_constants (scheme *sc,
+ GIRepository *repo);
+static void ts_init_enums (scheme *sc,
+ GIRepository *repo,
+ const char *namespace);
static void ts_init_procedures (scheme *sc,
gboolean register_scipts);
-static void convert_string (gchar *str);
static pointer script_fu_marshal_procedure_call (scheme *sc,
pointer a,
gboolean permissive,
@@ -142,6 +145,10 @@ void
tinyscheme_init (GList *path,
gboolean register_scripts)
{
+ GIRepository *repo;
+ GITypelib *typelib;
+ GError *error = NULL;
+
/* init the interpreter */
if (! scheme_init (&sc))
{
@@ -157,8 +164,17 @@ tinyscheme_init (GList *path,
init_ftx (&sc);
script_fu_regex_init (&sc);
+ /* Fetch the typelib */
+ repo = g_irepository_get_default ();
+ typelib = g_irepository_require (repo, "Gimp", NULL, 0, &error);
+ if (!typelib)
+ {
+ g_warning ("%s", error->message);
+ return;
+ }
+
/* register in the interpreter the gimp functions and types. */
- ts_init_constants (&sc);
+ ts_init_constants (&sc, repo);
ts_init_procedures (&sc, register_scripts);
if (path)
@@ -282,13 +298,11 @@ ts_gstring_output_func (TsOutputType type,
* gimp functions and types against the scheme interpreter.
*/
static void
-ts_init_constants (scheme *sc)
+ts_init_constants (scheme *sc,
+ GIRepository *repo)
{
- const gchar **enum_type_names;
- gint n_enum_type_names;
- gint i;
- pointer symbol;
- GQuark quark;
+ int i;
+ pointer symbol;
symbol = sc->vptr->mk_symbol (sc, "gimp-directory");
sc->vptr->scheme_define (sc, sc->global_env, symbol,
@@ -315,21 +329,8 @@ ts_init_constants (scheme *sc)
sc->vptr->mk_string (sc, gimp_sysconf_directory ()));
sc->vptr->setimmutable (symbol);
- enum_type_names = gimp_enums_get_type_names (&n_enum_type_names);
- quark = g_quark_from_static_string ("gimp-compat-enum");
-
- for (i = 0; i < n_enum_type_names; i++)
- {
- const gchar *enum_name = enum_type_names[i];
- GType enum_type = g_type_from_name (enum_name);
-
- ts_init_enum (sc, enum_type);
-
- enum_type = (GType) g_type_get_qdata (enum_type, quark);
-
- if (enum_type)
- ts_init_enum (sc, enum_type);
- }
+ ts_init_enums (sc, repo, "Gimp");
+ ts_init_enums (sc, repo, "Gegl");
/* Constants used in the register block of scripts */
for (i = 0; script_constants[i].name != NULL; ++i)
@@ -371,32 +372,83 @@ ts_init_constants (scheme *sc)
}
static void
-ts_init_enum (scheme *sc,
- GType enum_type)
+ts_init_enum (scheme *sc,
+ GIEnumInfo *info,
+ const char *namespace)
{
- GEnumClass *enum_class = g_type_class_ref (enum_type);
- GEnumValue *value;
+ gint n_values;
- for (value = enum_class->values; value->value_name; value++)
+ n_values = g_enum_info_get_n_values ((GIEnumInfo *) info);
+ for (gint j = 0; j < n_values; j++)
{
- if (g_str_has_prefix (value->value_name, "GIMP_"))
+ GIValueInfo *value_info;
+ const char *c_identifier;
+ char *scheme_name;
+ int int_value;
+ pointer symbol;
+
+ value_info = g_enum_info_get_value (info, j);
+
+ /* Get name & value. Normally, we would use the actual name of the
+ * GIBaseInfo here, but that would break bw-compatibility */
+ c_identifier = g_base_info_get_attribute ((GIBaseInfo *) value_info, "c:identifier");
+ if (c_identifier == NULL)
+ {
+ g_warning ("Problem in the GIR file: enum value without \"c:identifier\"!");
+ g_base_info_unref ((GIBaseInfo *) value_info);
+ continue;
+ }
+
+ /* Scheme-ify the name */
+ if (g_strcmp0 (namespace, "Gimp") == 0)
{
- gchar *scheme_name;
- pointer symbol;
+ /* Skip the GIMP prefix for GIMP enums */
+ if (g_str_has_prefix (c_identifier, "GIMP_"))
+ c_identifier += strlen ("GIMP_");
+ }
+ else
+ {
+ /* Other namespaces: skip non-prefixed symbols, to prevent clashes */
+ if (g_ascii_strncasecmp (c_identifier, namespace, strlen (namespace)) != 0)
+ {
+ g_base_info_unref ((GIBaseInfo *) value_info);
+ continue;
+ }
+ }
+ scheme_name = g_strdelimit (g_strdup (c_identifier), "_", '-');
+ int_value = g_value_info_get_value (value_info);
+
+ /* Register the symbol */
+ symbol = sc->vptr->mk_symbol (sc, scheme_name);
+ sc->vptr->scheme_define (sc, sc->global_env, symbol,
+ sc->vptr->mk_integer (sc, int_value));
+ sc->vptr->setimmutable (symbol);
- scheme_name = g_strdup (value->value_name + strlen ("GIMP_"));
- convert_string (scheme_name);
+ g_free (scheme_name);
+ g_base_info_unref ((GIBaseInfo *) value_info);
+ }
+}
+
+static void
+ts_init_enums (scheme *sc,
+ GIRepository *repo,
+ const char *namespace)
+{
+ int i, n_infos;
- symbol = sc->vptr->mk_symbol (sc, scheme_name);
- sc->vptr->scheme_define (sc, sc->global_env, symbol,
- sc->vptr->mk_integer (sc, value->value));
- sc->vptr->setimmutable (symbol);
+ n_infos = g_irepository_get_n_infos (repo, namespace);
+ for (i = 0; i < n_infos; i++)
+ {
+ GIBaseInfo *info;
- g_free (scheme_name);
+ info = g_irepository_get_info (repo, namespace, i);
+ if (GI_IS_ENUM_INFO (info))
+ {
+ ts_init_enum (sc, (GIEnumInfo *) info, namespace);
}
- }
- g_type_class_unref (enum_class);
+ g_base_info_unref (info);
+ }
}
static void
@@ -516,16 +568,6 @@ ts_load_file (const gchar *dirname,
return FALSE;
}
-static void
-convert_string (gchar *str)
-{
- while (*str)
- {
- if (*str == '_') *str = '-';
- str++;
- }
-}
-
/* Called by the Scheme interpreter on calls to GIMP PDB procedures */
static pointer
script_fu_marshal_procedure_call (scheme *sc,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]