char *output_dir = NULL;
+static char file_sep = '-';
+
static int signals = 0; /* number of signals */
static int set_properties = 0; /* number of named (set) properties */
static int get_properties = 0; /* number of named (get) properties */
static int unreftors = 0; /* number of variable unreffing destructors */
static int destructors = 0; /* number of variable non-unreffing destructors */
static int initializers = 0; /* number of variable initializers */
+static int glade_widgets = 0; /* number of glade widgets */
static gboolean overrode_get_type = FALSE; /* provided your won _get_type */
static gboolean made_aliases = FALSE; /* if we made any shorthand aliases
gboolean no_lines = FALSE;
gboolean no_self_alias = FALSE;
gboolean always_private_struct = FALSE;
+gint prealloc = 0;
gboolean use_m4 = FALSE; /* preprocess sources with m4 */
gboolean use_m4_clean = FALSE; /* preprocess sources with m4, no m4 flags */
static void
make_bases (void)
{
- filebase = replace_sep (((Class *)class)->otype, '-');
+ filebase = replace_sep (((Class *)class)->otype, file_sep);
gob_strdown (filebase);
if (output_dir != NULL &&
"\t\t\t(GClassFinalizeFunc) NULL,\n"
"\t\t\tNULL /* class_data */,\n"
"\t\t\tsizeof (%s),\n"
- "\t\t\t0 /* n_preallocs */,\n"
+ "\t\t\t%d /* n_preallocs */,\n"
"\t\t\t(GInstanceInitFunc) %s_init,\n"
"\t\t\tNULL\n"
"\t\t};\n\n",
- funcbase, typebase, funcbase, typebase, funcbase);
+ funcbase, typebase, funcbase, typebase, prealloc, funcbase);
add_interface_infos ();
char *argflags[] = {
"CONSTRUCT",
"CONSTRUCT_ONLY",
- "CHILD_ARG",
- "MASK",
+ "LAX_VALIDATION",
+ "PRIVATE",
NULL
};
if(strcmp(argflags[i], flag)==0)
break;
}
- /* if we haven't found it in our list */
- if( ! argflags[i]) {
- error_printf(GOB_WARN, a->line_no,
- "Unknown flag '%s' used, "
- "perhaps it was misspelled", flag);
- }
- g_string_sprintfa(flags, " | G_PARAM_%s", flag);
+ g_string_sprintfa(flags, " | %s%s", argflags[i] ? "G_PARAM_" : "", flag);
}
g_string_append (flags, ")");
static void
make_property (Property *p)
{
- GString *flags;
- GList *l;
char *s;
- char *argflags[] = {
- "CONSTRUCT",
- "CONSTRUCT_ONLY",
- "CHILD_ARG",
- "MASK",
- NULL
- };
-
- flags = g_string_new ("(GParamFlags)(");
-
- if (p->get != NULL && p->set != NULL)
- g_string_append (flags, "G_PARAM_READABLE | G_PARAM_WRITABLE");
- else if (p->get != NULL)
- g_string_append (flags, "G_PARAM_READABLE");
- else
- g_string_append (flags, "G_PARAM_WRITABLE");
if (p->get == NULL && p->set == NULL) {
error_print (GOB_ERROR, p->line_no,
"Property has no getter nor setter");
}
- for (l = p->flags; l != NULL; l = l->next) {
- char *flag = l->data;
- int i;
- if(strcmp (flag, "READABLE") == 0 ||
- strcmp (flag, "WRITABLE") == 0) {
- error_print(GOB_WARN, p->line_no,
- "READABLE and "
- "WRITABLE argument flags are "
- "set automatically");
- continue;
- }
- for(i = 0; argflags[i]; i++) {
- if(strcmp(argflags[i], flag)==0)
- break;
+ if (p->override) {
+ if (p->flags != NULL)
+ error_print (GOB_WARN, p->line_no,
+ "Overriden property, flags ignored");
+ if (p->nick != NULL)
+ error_print (GOB_WARN, p->line_no,
+ "Overriden property, nick ignored");
+ if (p->blurb != NULL)
+ error_print (GOB_WARN, p->line_no,
+ "Overriden property, blurb ignored");
+ if (p->minimum != NULL)
+ error_print (GOB_WARN, p->line_no,
+ "Overriden property, minimum ignored");
+ if (p->maximum != NULL)
+ error_print (GOB_WARN, p->line_no,
+ "Overriden property, maximum ignored");
+ if (p->default_value != NULL)
+ error_print (GOB_WARN, p->line_no,
+ "Overriden property, default_value ignored");
+
+ s = g_strdup (p->name);
+ gob_strup (s);
+ out_printf (out, "\tg_object_class_override_property (g_object_class,\n"
+ "\t\tPROP_%s,\n"
+ "\t\t\"%s\");\n", s, p->name);
+ g_free (s);
+ } else {
+ GString *flags;
+ GList *l;
+ char *argflags[] = {
+ "CONSTRUCT",
+ "CONSTRUCT_ONLY",
+ "LAX_VALIDATION",
+ "PRIVATE",
+ NULL
+ };
+
+ flags = g_string_new ("(GParamFlags)(");
+
+ if (p->get != NULL && p->set != NULL)
+ g_string_append (flags, "G_PARAM_READABLE | G_PARAM_WRITABLE");
+ else if (p->get != NULL)
+ g_string_append (flags, "G_PARAM_READABLE");
+ else
+ g_string_append (flags, "G_PARAM_WRITABLE");
+
+
+ for (l = p->flags; l != NULL; l = l->next) {
+ char *flag = l->data;
+ int i;
+ if(strcmp (flag, "READABLE") == 0 ||
+ strcmp (flag, "WRITABLE") == 0) {
+ error_print(GOB_WARN, p->line_no,
+ "READABLE and "
+ "WRITABLE argument flags are "
+ "set automatically");
+ continue;
+ }
+ for(i = 0; argflags[i]; i++) {
+ if(strcmp(argflags[i], flag)==0)
+ break;
+ }
+ g_string_sprintfa(flags, " | %s%s", argflags[i] ? "G_PARAM_" : "", flag);
}
- /* if we haven't found it in our list */
- if( ! argflags[i]) {
- error_printf(GOB_WARN, p->line_no,
- "Unknown flag '%s' used, "
- "perhaps it was misspelled", flag);
+
+ g_string_append (flags, ")");
+
+ if (strcmp (p->gtktype, "CHAR") == 0) {
+ out_printf (out, "\tparam_spec = g_param_spec_char\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* minimum */,\n"
+ "\t\t %s /* maximum */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->minimum, "-128"),
+ value_for_print (p->maximum, "127"),
+ value_for_print (p->default_value, "0"),
+ flags->str);
+ } else if (strcmp (p->gtktype, "UCHAR") == 0) {
+ out_printf (out, "\tparam_spec = g_param_spec_uchar\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* minimum */,\n"
+ "\t\t %s /* maximum */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->minimum, "0"),
+ value_for_print (p->maximum, "0xFF"),
+ value_for_print (p->default_value, "0"),
+ flags->str);
+ } else if (strcmp (p->gtktype, "BOOLEAN") == 0) {
+ out_printf (out, "\tparam_spec = g_param_spec_boolean\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->default_value, "FALSE"),
+ flags->str);
+ } else if (strcmp (p->gtktype, "INT") == 0) {
+ out_printf (out, "\tparam_spec = g_param_spec_int\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* minimum */,\n"
+ "\t\t %s /* maximum */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->minimum, "G_MININT"),
+ value_for_print (p->maximum, "G_MAXINT"),
+ value_for_print (p->default_value, "0"),
+ flags->str);
+ } else if (strcmp (p->gtktype, "UINT") == 0) {
+ out_printf (out, "\tparam_spec = g_param_spec_uint\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* minimum */,\n"
+ "\t\t %s /* maximum */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->minimum, "0"),
+ value_for_print (p->maximum, "G_MAXUINT"),
+ value_for_print (p->default_value, "0"),
+ flags->str);
+ } else if (strcmp (p->gtktype, "LONG") == 0) {
+ out_printf (out, "\tparam_spec = g_param_spec_long\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* minimum */,\n"
+ "\t\t %s /* maximum */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->minimum, "G_MINLONG"),
+ value_for_print (p->maximum, "G_MAXLONG"),
+ value_for_print (p->default_value, "0"),
+ flags->str);
+ } else if (strcmp (p->gtktype, "ULONG") == 0) {
+ out_printf (out, "\tparam_spec = g_param_spec_ulong\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* minimum */,\n"
+ "\t\t %s /* maximum */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->minimum, "0"),
+ value_for_print (p->maximum, "G_MAXULONG"),
+ value_for_print (p->default_value, "0"),
+ flags->str);
+ } else if (strcmp (p->gtktype, "INT64") == 0) {
+ out_printf (out, "\tparam_spec = g_param_spec_int64\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* minimum */,\n"
+ "\t\t %s /* maximum */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->minimum, "G_MININT64"),
+ value_for_print (p->maximum, "G_MAXINT64"),
+ value_for_print (p->default_value, "0"),
+ flags->str);
+ } else if (strcmp (p->gtktype, "UINT64") == 0) {
+ out_printf (out, "\tparam_spec = g_param_spec_uint64\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* minimum */,\n"
+ "\t\t %s /* maximum */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->minimum, "0"),
+ value_for_print (p->maximum, "G_MAXUINT64"),
+ value_for_print (p->default_value, "0"),
+ flags->str);
+ } else if (strcmp (p->gtktype, "UNICHAR") == 0) {
+ out_printf (out, "\tparam_spec = g_param_spec_unichar\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->default_value, "0"),
+ flags->str);
+ } else if (strcmp (p->gtktype, "ENUM") == 0) {
+ char *type = make_me_type (p->extra_gtktype,
+ "G_TYPE_ENUM");
+ out_printf (out, "\tparam_spec = g_param_spec_enum\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* enum_type */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ type,
+ value_for_print (p->default_value, "0"),
+ flags->str);
+ g_free (type);
+ } else if (strcmp (p->gtktype, "FLAGS") == 0) {
+ char *type = make_me_type (p->extra_gtktype,
+ "G_TYPE_FLAGS");
+ out_printf (out, "\tparam_spec = g_param_spec_flags\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* flags_type */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ type,
+ value_for_print (p->default_value, "0"),
+ flags->str);
+ g_free (type);
+ } else if (strcmp (p->gtktype, "FLOAT") == 0) {
+ out_printf (out, "\tparam_spec = g_param_spec_float\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* minimum */,\n"
+ "\t\t %s /* maximum */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->minimum, "G_MINFLOAT"),
+ value_for_print (p->maximum, "G_MAXFLOAT"),
+ value_for_print (p->default_value, "0.0"),
+ flags->str);
+ } else if (strcmp (p->gtktype, "DOUBLE") == 0) {
+ out_printf (out, "\tparam_spec = g_param_spec_double\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* minimum */,\n"
+ "\t\t %s /* maximum */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->minimum, "G_MINDOUBLE"),
+ value_for_print (p->maximum, "G_MAXDOUBLE"),
+ value_for_print (p->default_value, "0.0"),
+ flags->str);
+ } else if (strcmp (p->gtktype, "STRING") == 0) {
+ out_printf (out, "\tparam_spec = g_param_spec_string\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->default_value, "NULL"),
+ flags->str);
+ } else if (strcmp (p->gtktype, "PARAM") == 0) {
+ char *type = make_me_type (p->extra_gtktype,
+ "G_TYPE_PARAM");
+ out_printf (out, "\tparam_spec = g_param_spec_param\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* param_type */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ type,
+ flags->str);
+ g_free (type);
+ } else if (strcmp (p->gtktype, "BOXED") == 0) {
+ char *type = make_me_type (p->extra_gtktype,
+ "G_TYPE_BOXED");
+ out_printf (out, "\tparam_spec = g_param_spec_boxed\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* boxed_type */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ type,
+ flags->str);
+ g_free (type);
+ } else if (strcmp (p->gtktype, "POINTER") == 0) {
+ out_printf (out, "\tparam_spec = g_param_spec_pointer\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ flags->str);
+ /* FIXME: VALUE_ARRAY */
+ } else if (strcmp (p->gtktype, "CLOSURE") == 0) {
+ out_printf (out, "\tparam_spec = g_param_spec_pointer\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ flags->str);
+ } else if (strcmp (p->gtktype, "OBJECT") == 0) {
+ char *type = make_me_type (p->extra_gtktype,
+ "G_TYPE_BOXED");
+ out_printf (out, "\tparam_spec = g_param_spec_object\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* object_type */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ type,
+ flags->str);
+ g_free (type);
+ } else {
+ error_printf (GOB_ERROR, p->line_no,
+ "%s type is not supported by properties",
+ p->gtktype);
}
- g_string_sprintfa(flags, " | G_PARAM_%s", flag);
- }
- g_string_append (flags, ")");
+ s = g_strdup (p->name);
+ gob_strup (s);
+ out_printf (out, "\tg_object_class_install_property (g_object_class,\n"
+ "\t\tPROP_%s,\n"
+ "\t\tparam_spec);\n", s);
+ g_free (s);
- if (strcmp (p->gtktype, "CHAR") == 0) {
- out_printf (out, "\tparam_spec = g_param_spec_char\n"
- "\t\t(\"%s\" /* name */,\n"
- "\t\t %s /* nick */,\n"
- "\t\t %s /* blurb */,\n"
- "\t\t %s /* minimum */,\n"
- "\t\t %s /* maximum */,\n"
- "\t\t %s /* default_value */,\n"
- "\t\t %s);\n",
- p->name,
- value_for_print (p->nick, "NULL"),
- value_for_print (p->blurb, "NULL"),
- value_for_print (p->minimum, "-128"),
- value_for_print (p->maximum, "127"),
- value_for_print (p->default_value, "0"),
- flags->str);
- } else if (strcmp (p->gtktype, "UCHAR") == 0) {
- out_printf (out, "\tparam_spec = g_param_spec_uchar\n"
- "\t\t(\"%s\" /* name */,\n"
- "\t\t %s /* nick */,\n"
- "\t\t %s /* blurb */,\n"
- "\t\t %s /* minimum */,\n"
- "\t\t %s /* maximum */,\n"
- "\t\t %s /* default_value */,\n"
- "\t\t %s);\n",
- p->name,
- value_for_print (p->nick, "NULL"),
- value_for_print (p->blurb, "NULL"),
- value_for_print (p->minimum, "0"),
- value_for_print (p->maximum, "0xFF"),
- value_for_print (p->default_value, "0"),
- flags->str);
- } else if (strcmp (p->gtktype, "BOOLEAN") == 0) {
- out_printf (out, "\tparam_spec = g_param_spec_boolean\n"
- "\t\t(\"%s\" /* name */,\n"
- "\t\t %s /* nick */,\n"
- "\t\t %s /* blurb */,\n"
- "\t\t %s /* default_value */,\n"
- "\t\t %s);\n",
- p->name,
- value_for_print (p->nick, "NULL"),
- value_for_print (p->blurb, "NULL"),
- value_for_print (p->default_value, "FALSE"),
- flags->str);
- } else if (strcmp (p->gtktype, "INT") == 0) {
- out_printf (out, "\tparam_spec = g_param_spec_int\n"
- "\t\t(\"%s\" /* name */,\n"
- "\t\t %s /* nick */,\n"
- "\t\t %s /* blurb */,\n"
- "\t\t %s /* minimum */,\n"
- "\t\t %s /* maximum */,\n"
- "\t\t %s /* default_value */,\n"
- "\t\t %s);\n",
- p->name,
- value_for_print (p->nick, "NULL"),
- value_for_print (p->blurb, "NULL"),
- value_for_print (p->minimum, "G_MININT"),
- value_for_print (p->maximum, "G_MAXINT"),
- value_for_print (p->default_value, "0"),
- flags->str);
- } else if (strcmp (p->gtktype, "UINT") == 0) {
- out_printf (out, "\tparam_spec = g_param_spec_uint\n"
- "\t\t(\"%s\" /* name */,\n"
- "\t\t %s /* nick */,\n"
- "\t\t %s /* blurb */,\n"
- "\t\t %s /* minimum */,\n"
- "\t\t %s /* maximum */,\n"
- "\t\t %s /* default_value */,\n"
- "\t\t %s);\n",
- p->name,
- value_for_print (p->nick, "NULL"),
- value_for_print (p->blurb, "NULL"),
- value_for_print (p->minimum, "0"),
- value_for_print (p->maximum, "G_MAXUINT"),
- value_for_print (p->default_value, "0"),
- flags->str);
- } else if (strcmp (p->gtktype, "LONG") == 0) {
- out_printf (out, "\tparam_spec = g_param_spec_long\n"
- "\t\t(\"%s\" /* name */,\n"
- "\t\t %s /* nick */,\n"
- "\t\t %s /* blurb */,\n"
- "\t\t %s /* minimum */,\n"
- "\t\t %s /* maximum */,\n"
- "\t\t %s /* default_value */,\n"
- "\t\t %s);\n",
- p->name,
- value_for_print (p->nick, "NULL"),
- value_for_print (p->blurb, "NULL"),
- value_for_print (p->minimum, "G_MINLONG"),
- value_for_print (p->maximum, "G_MAXLONG"),
- value_for_print (p->default_value, "0"),
- flags->str);
- } else if (strcmp (p->gtktype, "ULONG") == 0) {
- out_printf (out, "\tparam_spec = g_param_spec_ulong\n"
- "\t\t(\"%s\" /* name */,\n"
- "\t\t %s /* nick */,\n"
- "\t\t %s /* blurb */,\n"
- "\t\t %s /* minimum */,\n"
- "\t\t %s /* maximum */,\n"
- "\t\t %s /* default_value */,\n"
- "\t\t %s);\n",
- p->name,
- value_for_print (p->nick, "NULL"),
- value_for_print (p->blurb, "NULL"),
- value_for_print (p->minimum, "0"),
- value_for_print (p->maximum, "G_MAXULONG"),
- value_for_print (p->default_value, "0"),
- flags->str);
- } else if (strcmp (p->gtktype, "INT64") == 0) {
- out_printf (out, "\tparam_spec = g_param_spec_int64\n"
- "\t\t(\"%s\" /* name */,\n"
- "\t\t %s /* nick */,\n"
- "\t\t %s /* blurb */,\n"
- "\t\t %s /* minimum */,\n"
- "\t\t %s /* maximum */,\n"
- "\t\t %s /* default_value */,\n"
- "\t\t %s);\n",
- p->name,
- value_for_print (p->nick, "NULL"),
- value_for_print (p->blurb, "NULL"),
- value_for_print (p->minimum, "G_MININT64"),
- value_for_print (p->maximum, "G_MAXINT64"),
- value_for_print (p->default_value, "0"),
- flags->str);
- } else if (strcmp (p->gtktype, "UINT64") == 0) {
- out_printf (out, "\tparam_spec = g_param_spec_uint64\n"
- "\t\t(\"%s\" /* name */,\n"
- "\t\t %s /* nick */,\n"
- "\t\t %s /* blurb */,\n"
- "\t\t %s /* minimum */,\n"
- "\t\t %s /* maximum */,\n"
- "\t\t %s /* default_value */,\n"
- "\t\t %s);\n",
- p->name,
- value_for_print (p->nick, "NULL"),
- value_for_print (p->blurb, "NULL"),
- value_for_print (p->minimum, "0"),
- value_for_print (p->maximum, "G_MAXUINT64"),
- value_for_print (p->default_value, "0"),
- flags->str);
- } else if (strcmp (p->gtktype, "UNICHAR") == 0) {
- out_printf (out, "\tparam_spec = g_param_spec_unichar\n"
- "\t\t(\"%s\" /* name */,\n"
- "\t\t %s /* nick */,\n"
- "\t\t %s /* blurb */,\n"
- "\t\t %s /* default_value */,\n"
- "\t\t %s);\n",
- p->name,
- value_for_print (p->nick, "NULL"),
- value_for_print (p->blurb, "NULL"),
- value_for_print (p->default_value, "0"),
- flags->str);
- } else if (strcmp (p->gtktype, "ENUM") == 0) {
- char *type = make_me_type (p->extra_gtktype,
- "G_TYPE_ENUM");
- out_printf (out, "\tparam_spec = g_param_spec_enum\n"
- "\t\t(\"%s\" /* name */,\n"
- "\t\t %s /* nick */,\n"
- "\t\t %s /* blurb */,\n"
- "\t\t %s /* enum_type */,\n"
- "\t\t %s /* default_value */,\n"
- "\t\t %s);\n",
- p->name,
- value_for_print (p->nick, "NULL"),
- value_for_print (p->blurb, "NULL"),
- type,
- value_for_print (p->default_value, "0"),
- flags->str);
- g_free (type);
- } else if (strcmp (p->gtktype, "FLAGS") == 0) {
- char *type = make_me_type (p->extra_gtktype,
- "G_TYPE_FLAGS");
- out_printf (out, "\tparam_spec = g_param_spec_flags\n"
- "\t\t(\"%s\" /* name */,\n"
- "\t\t %s /* nick */,\n"
- "\t\t %s /* blurb */,\n"
- "\t\t %s /* flags_type */,\n"
- "\t\t %s /* default_value */,\n"
- "\t\t %s);\n",
- p->name,
- value_for_print (p->nick, "NULL"),
- value_for_print (p->blurb, "NULL"),
- type,
- value_for_print (p->default_value, "0"),
- flags->str);
- g_free (type);
- } else if (strcmp (p->gtktype, "FLOAT") == 0) {
- out_printf (out, "\tparam_spec = g_param_spec_float\n"
- "\t\t(\"%s\" /* name */,\n"
- "\t\t %s /* nick */,\n"
- "\t\t %s /* blurb */,\n"
- "\t\t %s /* minimum */,\n"
- "\t\t %s /* maximum */,\n"
- "\t\t %s /* default_value */,\n"
- "\t\t %s);\n",
- p->name,
- value_for_print (p->nick, "NULL"),
- value_for_print (p->blurb, "NULL"),
- value_for_print (p->minimum, "G_MINFLOAT"),
- value_for_print (p->maximum, "G_MAXFLOAT"),
- value_for_print (p->default_value, "0.0"),
- flags->str);
- } else if (strcmp (p->gtktype, "DOUBLE") == 0) {
- out_printf (out, "\tparam_spec = g_param_spec_double\n"
- "\t\t(\"%s\" /* name */,\n"
- "\t\t %s /* nick */,\n"
- "\t\t %s /* blurb */,\n"
- "\t\t %s /* minimum */,\n"
- "\t\t %s /* maximum */,\n"
- "\t\t %s /* default_value */,\n"
- "\t\t %s);\n",
- p->name,
- value_for_print (p->nick, "NULL"),
- value_for_print (p->blurb, "NULL"),
- value_for_print (p->minimum, "G_MINDOUBLE"),
- value_for_print (p->maximum, "G_MAXDOUBLE"),
- value_for_print (p->default_value, "0.0"),
- flags->str);
- } else if (strcmp (p->gtktype, "STRING") == 0) {
- out_printf (out, "\tparam_spec = g_param_spec_string\n"
- "\t\t(\"%s\" /* name */,\n"
- "\t\t %s /* nick */,\n"
- "\t\t %s /* blurb */,\n"
- "\t\t %s /* default_value */,\n"
- "\t\t %s);\n",
- p->name,
- value_for_print (p->nick, "NULL"),
- value_for_print (p->blurb, "NULL"),
- value_for_print (p->default_value, "NULL"),
- flags->str);
- } else if (strcmp (p->gtktype, "PARAM") == 0) {
- char *type = make_me_type (p->extra_gtktype,
- "G_TYPE_PARAM");
- out_printf (out, "\tparam_spec = g_param_spec_param\n"
- "\t\t(\"%s\" /* name */,\n"
- "\t\t %s /* nick */,\n"
- "\t\t %s /* blurb */,\n"
- "\t\t %s /* param_type */,\n"
- "\t\t %s);\n",
- p->name,
- value_for_print (p->nick, "NULL"),
- value_for_print (p->blurb, "NULL"),
- type,
- flags->str);
- g_free (type);
- } else if (strcmp (p->gtktype, "BOXED") == 0) {
- char *type = make_me_type (p->extra_gtktype,
- "G_TYPE_BOXED");
- out_printf (out, "\tparam_spec = g_param_spec_boxed\n"
- "\t\t(\"%s\" /* name */,\n"
- "\t\t %s /* nick */,\n"
- "\t\t %s /* blurb */,\n"
- "\t\t %s /* boxed_type */,\n"
- "\t\t %s);\n",
- p->name,
- value_for_print (p->nick, "NULL"),
- value_for_print (p->blurb, "NULL"),
- type,
- flags->str);
- g_free (type);
- } else if (strcmp (p->gtktype, "POINTER") == 0) {
- out_printf (out, "\tparam_spec = g_param_spec_pointer\n"
- "\t\t(\"%s\" /* name */,\n"
- "\t\t %s /* nick */,\n"
- "\t\t %s /* blurb */,\n"
- "\t\t %s);\n",
- p->name,
- value_for_print (p->nick, "NULL"),
- value_for_print (p->blurb, "NULL"),
- flags->str);
- /* FIXME: VALUE_ARRAY */
- } else if (strcmp (p->gtktype, "CLOSURE") == 0) {
- out_printf (out, "\tparam_spec = g_param_spec_pointer\n"
- "\t\t(\"%s\" /* name */,\n"
- "\t\t %s /* nick */,\n"
- "\t\t %s /* blurb */,\n"
- "\t\t %s);\n",
- p->name,
- value_for_print (p->nick, "NULL"),
- value_for_print (p->blurb, "NULL"),
- flags->str);
- } else if (strcmp (p->gtktype, "OBJECT") == 0) {
- char *type = make_me_type (p->extra_gtktype,
- "G_TYPE_BOXED");
- out_printf (out, "\tparam_spec = g_param_spec_object\n"
- "\t\t(\"%s\" /* name */,\n"
- "\t\t %s /* nick */,\n"
- "\t\t %s /* blurb */,\n"
- "\t\t %s /* object_type */,\n"
- "\t\t %s);\n",
- p->name,
- value_for_print (p->nick, "NULL"),
- value_for_print (p->blurb, "NULL"),
- type,
- flags->str);
- g_free (type);
- } else {
- error_printf (GOB_ERROR, p->line_no,
- "%s type is not supported by properties",
- p->gtktype);
+ g_string_free (flags, TRUE);
}
-
- s = g_strdup (p->name);
- gob_strup (s);
- out_printf (out, "\tg_object_class_install_property (g_object_class,\n"
- "\t\tPROP_%s,\n"
- "\t\tparam_spec);\n", s);
- g_free (s);
-
- g_string_free (flags, TRUE);
}
static void
out_printf(out, "\tg_object_class->get_property = ___object_get_property;\n");
if (set_properties > 0)
out_printf(out, "\tg_object_class->set_property = ___object_set_property;\n");
- out_printf (out, " {\n"
- "\tGParamSpec *param_spec;\n\n");
+ out_printf (out, " {\n");
+ for (li = c->nodes; li != NULL; li = li->next) {
+ Node *n = li->data;
+ if ((n->type == PROPERTY_NODE && ! ((Property *) n)->override)
+ || n->type == ARGUMENT_NODE) {
+ out_printf(out, "\tGParamSpec *param_spec;\n\n");
+ break;
+ }
+ }
for (li = c->nodes; li != NULL; li = li->next) {
Node *n = li->data;
if(v->initializer_line > 0)
out_addline_infile(out, v->initializer_line);
- out_printf(out, "\t%s->%s = %s;\n",
+ if (v->initializer_simple)
+ out_printf(out, "\t%s->%s = %s;\n",
root, v->id, v->initializer);
+ else
+ out_printf(out,v->initializer);
if(v->initializer_line > 0)
out_addline_outfile(out);
g_free(root);
}
+static void
+print_glade_widget(Method *m, Variable *v)
+{
+ char *root;
+ char *cast;
+
+ if(!v->glade_widget)
+ return;
+
+ if(v->scope == PRIVATE_SCOPE)
+ root = g_strconcat(((FuncArg *)m->args->data)->name,
+ "->_priv", NULL);
+ else
+ root = g_strdup(((FuncArg *)m->args->data)->name);
+
+ cast = get_type(v->vtype, FALSE);
+ out_printf(out, "\t%s->%s = (%s)glade_xml_get_widget(%s->_glade_xml, \"%s\");\n",
+ root, v->id, cast, root, v->id);
+
+ g_free(root);
+}
+
static void
print_destructor (Variable *v)
{
if(v->destructor_line > 0)
out_addline_infile(out, v->destructor_line);
- out_printf(out, "\tif(%s->%s) { "
- "((*(void (*)(void *))%s)) (%s->%s); "
- "%s->%s = NULL; }\n",
- root, v->id, v->destructor, root, v->id,
- root, v->id);
+ if (for_cpp) {
+ out_printf(out, "\tif(%s->%s) { "
+ "(reinterpret_cast<void (*)(void *)>(%s)) ((gpointer)%s->%s); "
+ "%s->%s = NULL; }\n",
+ root, v->id, v->destructor, root, v->id,
+ root, v->id);
+ } else {
+ out_printf(out, "\tif(%s->%s) { "
+ "%s ((gpointer) %s->%s); "
+ "%s->%s = NULL; }\n",
+ root, v->id, v->destructor, root, v->id,
+ root, v->id);
+ }
if(v->destructor_line > 0)
out_addline_outfile(out);
const char *unused = "";
if ( ! no_gnu)
unused = " G_GNUC_UNUSED";
- out_printf(out, "\t%s *self %s = %s (obj_self);\n",
+ out_printf(out, "\t%s *self%s = %s (obj_self);\n",
typebase, unused, macrobase);
}
if (privates > 0) {
- out_printf(out, "\tgpointer priv = self->_priv;\n");
+ const char *unused = "";
+ if ( ! no_gnu)
+ unused = " G_GNUC_UNUSED";
+ out_printf(out, "\tgpointer priv%s = self->_priv;\n",
+ unused);
}
if(finalize_handler) {
}
}
- if (privates > 0) {
- out_printf(out, "\tg_free (priv);\n");
- }
-
out_printf(out, "}\n"
"#undef __GOB_FUNCTION__\n\n");
}
out_printf(out, "{\n"
"#define __GOB_FUNCTION__ \"%s::init\"\n",
c->otype);
- if(privates > 0) {
+ if (privates > 0) {
out_printf(out, "\t%s->_priv = "
- "g_new0 (%sPrivate, 1);\n",
- ((FuncArg *)m->args->data)->name,
- typebase);
+ "G_TYPE_INSTANCE_GET_PRIVATE(%s,%s,%sPrivate);\n",
+ ((FuncArg *)m->args->data)->name,
+ ((FuncArg *)m->args->data)->name,
+ macrotype,
+ typebase);
} else if(always_private_struct) {
out_printf(out, "\t%s->_priv = NULL;\n",
((FuncArg *)m->args->data)->name);
print_initializer(m, v);
}
}
+ if(glade_widgets > 0) {
+ GList *li;
+ for(li = ((Class *)class)->nodes;
+ li != NULL;
+ li = li->next) {
+ Node *n = li->data;
+ Variable *v = (Variable *)n;
+ if(n->type != VARIABLE_NODE ||
+ v->scope == CLASS_SCOPE)
+ continue;
+ print_glade_widget(m, v);
+ }
+ }
} else if(m->method == CLASS_INIT_METHOD) {
gboolean did_base_obj = FALSE;
((FuncArg *)m->args->data)->name,
did_base_obj);
+ if (privates > 0)
+ out_printf (out,
+ "\n\tg_type_class_add_private(%s,sizeof(%sPrivate));\n",
+ ((FuncArg *)m->args->data)->name,
+ typebase);
+
if (initializers > 0) {
GList *li;
for(li = ((Class *)class)->nodes;
if ((privates > 0 || protecteds > 0 ||
private_header == PRIVATE_HEADER_ALWAYS) &&
- private_header != PRIVATE_HEADER_NEVER)
- outfileph = g_strconcat (fullfilebase, "-private.h", NULL);
- else
+ private_header != PRIVATE_HEADER_NEVER) {
+ char sep[2] = {0,0};
+ if (file_sep != 0)
+ sep[0] = file_sep;
+ outfileph = g_strconcat (fullfilebase, sep, "private.h", NULL);
+ } else {
outfileph = NULL;
+ }
if (no_write) {
char *s;
gboolean printed_private = FALSE;
+ if (c->glade_xml)
+ {
+ out_printf(outph ? outph : outh, "#include <gtk/gtk.h>\n");
+ out_printf(outph ? outph : outh, "#include <glade/glade-xml.h>\n\n");
+ }
+
if(any_special) {
out_printf(out, "/* utility types we may need */\n");
if(special_array[SPECIAL_2POINTER])
out_printf (outfp, "struct _%sPrivate {\n",
typebase);
- for(li=c->nodes; li; li=li->next) {
- Node *n = li->data;
- Variable *v = (Variable *)n;
- if(n->type == VARIABLE_NODE &&
- v->scope == PRIVATE_SCOPE) {
- out_addline_infile(outfp, v->line_no);
- put_variable(v, outfp);
+ if (privates > 0)
+ {
+ for(li=c->nodes; li; li=li->next) {
+ Node *n = li->data;
+ Variable *v = (Variable *)n;
+ if(n->type == VARIABLE_NODE &&
+ v->scope == PRIVATE_SCOPE) {
+ out_addline_infile(outfp, v->line_no);
+ put_variable(v, outfp);
+ }
}
+ out_addline_outfile(outfp);
}
- out_addline_outfile(outfp);
out_printf(outfp, "};\n");
}
no_gnu ? "" : " G_GNUC_UNUSED",
typebase, typebase, typebase, funcbase);
+ if (c->glade_xml)
+ {
+ out_printf (out, "/* a function to connect glade callback */\n");
+ out_printf (out,"static void\n"
+ "___glade_xml_connect_foreach(const gchar *handler_name,\n"
+ "GObject *object,\n"
+ "const gchar *signal_name,\n"
+ "const gchar *signal_data,\n"
+ "GObject *connect_object,\n"
+ "gboolean after,\n"
+ "gpointer user_data)\n"
+ "{\n"
+ "\tstatic GModule * allsymbols = NULL;\n"
+ " \n"
+ "\tif (!allsymbols) allsymbols = g_module_open(NULL, 0);\n"
+ "\tif (allsymbols) {\n"
+ "\t\tgchar * func_name = g_strdup_printf(\"%s_%%s\", handler_name);\n"
+ "\t\tGCallback func;\n"
+ "\n"
+ "\t\tif (!g_module_symbol(allsymbols, func_name, (gpointer)&func)){\n"
+ "\t\t\tif (!g_module_symbol(allsymbols, handler_name, (gpointer)&func)) {\n"
+ "\t\t\t\tg_warning(\"could not find signal handler '%%s'.\", func_name);\n"
+ "\t\t\t\tg_free(func_name);\n"
+ "\t\t\t\treturn;\n"
+ "\t\t\t}\n"
+ "\t\t}\n"
+ "\t\tif (after)\n"
+ "\t\t\tg_signal_connect_data(object, signal_name, func, user_data, NULL, G_CONNECT_AFTER | G_CONNECT_SWAPPED);\n"
+ "\t\telse\n"
+ "\t\t\tg_signal_connect_data(object, signal_name, func, user_data, NULL, G_CONNECT_SWAPPED);\n"
+ "\t\tg_free(func_name);\n"
+ "\t}\n"
+ "}\n"
+ "\n",
+ funcbase);
+ }
+
if (need_dispose)
add_dispose (c);
char *p;
/* We may need string.h for memset */
- if(destructors > 0 &&
- ! g_list_find_custom(include_files, "string.h", (GCompareFunc)strcmp)) {
+ if ( ! g_list_find_custom(include_files, "string.h", (GCompareFunc)strcmp)) {
out_printf(out, "#include <string.h> /* memset() */\n\n");
}
"aliases\n"
"\t--no-kill-underscores Ignored for compatibility\n"
"\t-o,--output-dir The directory where output "
- "should be placed\n");
+ "should be placed\n"
+ "\t--file-sep[=c] replace default \'-\' file "
+ "name separator\n");
}
static void
char *p = strchr (argv[i], '=');
g_assert (p != NULL);
output_dir = g_strdup (p+1);
+ } else if (strncmp (argv[i], "--file-sep=",
+ strlen ("--file-sep=")) == 0) {
+ char *p = strchr (argv[i], '=');
+ g_assert (p != NULL);
+ file_sep = *(p+1);
+ } else if (strncmp (argv[i], "--file-sep",
+ strlen ("--file-sep")) == 0) {
+ if (i+1 < argc) {
+ file_sep = (argv[i+1])[0];
+ i++;
+ } else {
+ file_sep = 0;
+ }
} else if(strcmp(argv[i], "--")==0) {
/*further arguments are files*/
no_opts = TRUE;
unreftors = count_unreftors ((Class *)class);
destructors = count_destructors ((Class *)class);
initializers = count_initializers ((Class *)class);
+ glade_widgets = count_glade_widgets ((Class *)class);
overrode_get_type = find_get_type ((Class *)class);
make_bases ();
projects / gob-dx.git / blobdiff