isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-29 19:40:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

2007-11-29 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* clutter/clutter-model.[ch]: Slight API change in the constructor
	functions for ClutterModel: clutter_model_new() now takes a list
	of GType/string pairs for both the column type and the column name.

	(clutter_model_set_n_columns),
	(clutter_model_set_names),
	(clutter_model_set_types): Subclasses of ClutterModel will be able
	to call clutter_model_set_types() and clutter_model_set_names() in
	any order, provided that they don't call each function more than
	once.

	* tests/test-model.c: Update the test case.
This commit is contained in:
Emmanuele Bassi 2007-11-29 15:01:21 +00:00
parent 9c77b0ab13
commit 687561dfe2
4 changed files with 122 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ChangeLog
View File

@ -1,7 +1,22 @@
2007-11-29 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-model.[ch]: Slight API change in the constructor
functions for ClutterModel: clutter_model_new() now takes a list
of GType/string pairs for both the column type and the column name.
(clutter_model_set_n_columns),
(clutter_model_set_names),
(clutter_model_set_types): Subclasses of ClutterModel will be able
to call clutter_model_set_types() and clutter_model_set_names() in
any order, provided that they don't call each function more than
once.
* tests/test-model.c: Update the test case.
2007-11-29 Tomas Frydrych <tf@openedhand.com> 2007-11-29 Tomas Frydrych <tf@openedhand.com>
* clutter/clutter-actor.h: * clutter/clutter-actor.h:
* clutter/clutter-actor.c: * clutter/clutter-actor.c:
Converted depth and rotation offsets to ClutterUnit. Converted depth and rotation offsets to ClutterUnit.
(clutter_actor_set_depthu): (clutter_actor_set_depthu):
@ -38,11 +53,11 @@
columns. columns.
(clutter_model_get_column_name), (clutter_model_get_column_name),
(_model_get_column_type): Add API for getting each column's name (_model_get_column_type): Add API for getting each column's name,
and the default implementation for ClutterModel. and the default implementation for ClutterModel.
(clutter_model_get_column_type), (clutter_model_get_column_type),
(_model_get_iter_at_row): Add API for getting each column's type (_model_get_iter_at_row): Add API for getting each column's type,
and the default implementation for ClutterModel. and the default implementation for ClutterModel.
* clutter.symbols: Add ClutterModel and ClutterModelIter symbols, * clutter.symbols: Add ClutterModel and ClutterModelIter symbols,

99
clutter/clutter-model.c
View File

@ -49,7 +49,9 @@
* ClutterModel *model; * ClutterModel *model;
* gint i; * gint i;
* *
* model = clutter_model_new (2, G_TYPE_INT, G_TYPE_STRING); * model = clutter_model_new (N_COLUMNS,
* G_TYPE_INT, "int",
* G_TYPE_STRING, "string");
* for (i = 0; i < 10; i++) * for (i = 0; i < 10; i++)
* { * {
* gchar *string = g_strdup_printf ("String %d", i); * gchar *string = g_strdup_printf ("String %d", i);
@ -79,6 +81,7 @@
* enum { * enum {
* COLUMN_INT, * COLUMN_INT,
* COLUMN_STRING. * COLUMN_STRING.
*
* N_COLUMNS * N_COLUMNS
* }; * };
* *
@ -86,10 +89,8 @@
* ClutterModel *model; * ClutterModel *model;
* ClutterModelIter *iter = NULL; * ClutterModelIter *iter = NULL;
* *
* model = clutter_model_new (2, G_TYPE_INT, G_TYPE_STRING);
*
* /<!-- -->* Fill the model *<!-- -->/ * /<!-- -->* Fill the model *<!-- -->/
* populate_model (model); * model = populate_model ();
* *
* /<!-- -->* Get the first iter *<!-- -->/ * /<!-- -->* Get the first iter *<!-- -->/
* iter = clutter_model_get_first_iter (model); * iter = clutter_model_get_first_iter (model);
@ -305,7 +306,7 @@ clutter_model_init (ClutterModel *self)
priv->sequence = g_sequence_new (NULL); priv->sequence = g_sequence_new (NULL);
priv->column_types = NULL; priv->column_types = NULL;
priv->n_columns = 0; priv->n_columns = -1;
priv->filter = NULL; priv->filter = NULL;
priv->filter_data = NULL; priv->filter_data = NULL;
@ -411,15 +412,26 @@ _model_filter (ClutterModel *model, ClutterModelIter *iter)
static void static void
clutter_model_set_n_columns (ClutterModel *model, clutter_model_set_n_columns (ClutterModel *model,
gint n_columns) gint n_columns,
gboolean set_types,
gboolean set_names)
{ {
ClutterModelPrivate *priv = model->priv; ClutterModelPrivate *priv = model->priv;
GType *new_columns; gboolean types_set, names_set;
new_columns = g_new0 (GType, n_columns); types_set = (priv->column_types != NULL);
names_set = (priv->column_names != NULL);
if (priv->n_columns > 0 && priv->n_columns != n_columns)
return;
priv->column_types = new_columns;
priv->n_columns = n_columns; priv->n_columns = n_columns;
if (set_types && !priv->column_types)
priv->column_types = g_new0 (GType, n_columns);
if (set_names && !priv->column_names)
priv->column_names = g_new0 (gchar*, n_columns + 1);
} }
static void static void
@ -432,16 +444,35 @@ clutter_model_set_column_type (ClutterModel *model,
priv->column_types[column] = type; priv->column_types[column] = type;
} }
static void
clutter_model_set_column_name (ClutterModel *model,
gint column,
const gchar *name)
{
ClutterModelPrivate *priv = model->priv;
priv->column_names[column] = g_strdup (name);
}
/** /**
* clutter_model_new: * clutter_model_new:
* @n_columns: number of columns in the model * @n_columns: number of columns in the model
* @Varargs: all #GType types for the columns, from first to last * @Varargs: @n_columns number of #GType and string pairs
* *
* Creates a new model with @n_columns columns with the types passed in. * Creates a new model with @n_columns columns with the types
* and names passed in.
* *
* For example, <literal>clutter_model_new (3, G_TYPE_INT, G_TYPE_STRING, * For example:
* GDK_TYPE_PIXBUF);</literal> will create a new #ClutterModel with three *
* columns of type int, string and #GdkPixbuf respectively. * <informalexample><programlisting>
* model = clutter_model_new (3,
* G_TYPE_INT, "int column",
* G_TYPE_STRING, "string column",
* GDK_TYPE_PIXBUF, "pixbuf column");
* </programlisting></informalexample>
*
* will create a new #ClutterModel with three columns of type int,
* string and #GdkPixbuf respectively.
* *
* Return value: a new #ClutterModel * Return value: a new #ClutterModel
* *
@ -458,13 +489,14 @@ clutter_model_new (guint n_columns,
g_return_val_if_fail (n_columns > 0, NULL); g_return_val_if_fail (n_columns > 0, NULL);
model = g_object_new (CLUTTER_TYPE_MODEL, NULL); model = g_object_new (CLUTTER_TYPE_MODEL, NULL);
clutter_model_set_n_columns (model, n_columns); clutter_model_set_n_columns (model, n_columns, TRUE, TRUE);
va_start (args, n_columns); va_start (args, n_columns);
for (i = 0; i < n_columns; i++) for (i = 0; i < n_columns; i++)
{ {
GType type = va_arg (args, GType); GType type = va_arg (args, GType);
const gchar *name = va_arg (args, gchar*);
if (!clutter_model_check_type (type)) if (!clutter_model_check_type (type))
{ {
@ -472,7 +504,9 @@ clutter_model_new (guint n_columns,
g_object_unref (model); g_object_unref (model);
return NULL; return NULL;
} }
clutter_model_set_column_type (model, i, type); clutter_model_set_column_type (model, i, type);
clutter_model_set_column_name (model, i, name);
} }
va_end (args); va_end (args);
@ -484,6 +518,7 @@ clutter_model_new (guint n_columns,
* clutter_model_newv: * clutter_model_newv:
* @n_columns: number of columns in the model * @n_columns: number of columns in the model
* @types: an array of #GType types for the columns, from first to last * @types: an array of #GType types for the columns, from first to last
* @names: an array of names for the columns, from first to last
* *
* Non-vararg creation function. Used primarily by language bindings. * Non-vararg creation function. Used primarily by language bindings.
* *
@ -492,8 +527,9 @@ clutter_model_new (guint n_columns,
* Since 0.6 * Since 0.6
*/ */
ClutterModel * ClutterModel *
clutter_model_newv (guint n_columns, clutter_model_newv (guint n_columns,
GType *types) GType *types,
const gchar * const names[])
{ {
ClutterModel *model; ClutterModel *model;
gint i; gint i;
@ -501,7 +537,7 @@ clutter_model_newv (guint n_columns,
g_return_val_if_fail (n_columns > 0, NULL); g_return_val_if_fail (n_columns > 0, NULL);
model = g_object_new (CLUTTER_TYPE_MODEL, NULL); model = g_object_new (CLUTTER_TYPE_MODEL, NULL);
clutter_model_set_n_columns (model, n_columns); clutter_model_set_n_columns (model, n_columns, TRUE, TRUE);
for (i = 0; i < n_columns; i++) for (i = 0; i < n_columns; i++)
{ {
@ -511,7 +547,9 @@ clutter_model_newv (guint n_columns,
g_object_unref (model); g_object_unref (model);
return NULL; return NULL;
} }
clutter_model_set_column_type (model, i, types[i]); clutter_model_set_column_type (model, i, types[i]);
clutter_model_set_column_name (model, i, names[i]);
} }
return model; return model;
@ -541,11 +579,13 @@ clutter_model_set_types (ClutterModel *model,
g_return_if_fail (CLUTTER_IS_MODEL (model)); g_return_if_fail (CLUTTER_IS_MODEL (model));
g_return_if_fail (n_columns > 0); g_return_if_fail (n_columns > 0);
priv = model->priv;
g_return_if_fail (priv->n_columns > 0);
clutter_model_set_n_columns (model, n_columns); priv = model->priv;
g_return_if_fail (priv->n_columns < 0 || priv->n_columns == n_columns);
g_return_if_fail (priv->column_types == NULL);
clutter_model_set_n_columns (model, n_columns, TRUE, FALSE);
for (i = 0; i < n_columns; i++) for (i = 0; i < n_columns; i++)
{ {
@ -554,6 +594,7 @@ clutter_model_set_types (ClutterModel *model,
g_warning ("%s: Invalid type %s\n", G_STRLOC, g_type_name (types[i])); g_warning ("%s: Invalid type %s\n", G_STRLOC, g_type_name (types[i]));
return; return;
} }
clutter_model_set_column_type (model, i, types[i]); clutter_model_set_column_type (model, i, types[i]);
} }
} }
@ -564,8 +605,11 @@ clutter_model_set_types (ClutterModel *model,
* @n_columns: the number of column names * @n_columns: the number of column names
* @names: an array of strings * @names: an array of strings
* *
* Assigns a name to the columns of a #ClutterModel. This function * Assigns a name to the columns of a #ClutterModel.
* cannot be called twice on the same model. *
* This function is meant primarily for #GObjects that inherit from
* #ClutterModel, and should only be used when contructing a #ClutterModel.
* It will not work after the initial creation of the #ClutterModel.
* *
* Since: 0.6 * Since: 0.6
*/ */
@ -582,12 +626,13 @@ clutter_model_set_names (ClutterModel *model,
priv = model->priv; priv = model->priv;
g_return_if_fail (priv->n_columns < 0 || priv->n_columns == n_columns);
g_return_if_fail (priv->column_names == NULL); g_return_if_fail (priv->column_names == NULL);
g_return_if_fail (n_columns <= priv->n_columns);
priv->column_names = g_new (gchar*, n_columns); clutter_model_set_n_columns (model, n_columns, FALSE, TRUE);
for (i = 0; i < n_columns; i++) for (i = 0; i < n_columns; i++)
priv->column_names[i] = g_strdup (names[i]); clutter_model_set_column_name (model, i, names[i]);
} }
/** /**

3
clutter/clutter-model.h
View File

@ -168,7 +168,8 @@ GType clutter_model_get_type (void) G_GNUC_CONST;
ClutterModel * clutter_model_new (guint n_columns, ClutterModel * clutter_model_new (guint n_columns,
...); ...);
ClutterModel * clutter_model_newv (guint n_columns, ClutterModel * clutter_model_newv (guint n_columns,
GType *types); GType *types,
const gchar * const names[]);
void clutter_model_set_types (ClutterModel *model, void clutter_model_set_types (ClutterModel *model,
guint n_columns, guint n_columns,
GType *types); GType *types);

40
tests/test-model.c
View File

@ -1,14 +1,29 @@
#include <clutter/clutter.h> #include <clutter/clutter.h>
#include <string.h> #include <string.h>
enum
{
COLUMN_FOO,
COLUMN_BAR,
N_COLUMNS
};
static void static void
print_iter (ClutterModelIter *iter, const gchar *text) print_iter (ClutterModelIter *iter, const gchar *text)
{ {
ClutterModel *model;
gint i; gint i;
gchar *string; gchar *string;
clutter_model_iter_get (iter, 0, &i, 1, &string, -1); model = clutter_model_iter_get_model (iter);
g_print ("%s: %d, %s\n", text, i, string); clutter_model_iter_get (iter, COLUMN_FOO, &i, COLUMN_BAR, &string, -1);
g_print ("%s: (%s: %d), (%s: %s)\n",
text,
clutter_model_get_column_name (model, COLUMN_FOO), i,
clutter_model_get_column_name (model, COLUMN_BAR), string);
g_free (string); g_free (string);
} }
@ -18,7 +33,7 @@ foreach_func (ClutterModel *model, ClutterModelIter *iter, gpointer null)
gint i; gint i;
gchar *string; gchar *string;
clutter_model_iter_get (iter, 0, &i, 1, &string, -1); clutter_model_iter_get (iter, COLUMN_FOO, &i, COLUMN_BAR, &string, -1);
g_print ("Foreach: %d: %s\n", i, string); g_print ("Foreach: %d: %s\n", i, string);
g_free (string); g_free (string);
@ -30,7 +45,7 @@ filter_func (ClutterModel *model, ClutterModelIter *iter, gpointer null)
{ {
gint i = 0; gint i = 0;
clutter_model_iter_get (iter, 0, &i, -1); clutter_model_iter_get (iter, COLUMN_FOO, &i, -1);
return !(i % 2); return !(i % 2);
} }
@ -66,14 +81,15 @@ filter_model (ClutterModel *model)
} }
g_object_unref (iter); g_object_unref (iter);
clutter_model_set_sort (model, 1, sort_func, NULL, NULL); clutter_model_set_sort (model, COLUMN_BAR, sort_func, NULL, NULL);
g_signal_connect (model, "row-changed", g_signal_connect (model, "row-changed",
G_CALLBACK (on_row_changed), NULL); G_CALLBACK (on_row_changed), NULL);
iter = clutter_model_get_iter_at_row (model, 0); iter = clutter_model_get_iter_at_row (model, 0);
clutter_model_iter_set (iter, 1, "Changed string of 0th row, automatically" clutter_model_iter_set (iter, COLUMN_BAR, "Changed string of 0th row, "
" gets sorted", -1); "automatically gets sorted",
-1);
g_object_unref (iter); g_object_unref (iter);
clutter_model_foreach (model, foreach_func, NULL); clutter_model_foreach (model, foreach_func, NULL);
@ -126,8 +142,8 @@ populate_model (ClutterModel *model)
gchar *string = g_strdup_printf ("String %d", i); gchar *string = g_strdup_printf ("String %d", i);
clutter_model_append (model, clutter_model_append (model,
0, i, COLUMN_FOO, i,
1, string, COLUMN_BAR, string,
-1); -1);
g_free (string); g_free (string);
} }
@ -144,7 +160,7 @@ on_row_added (ClutterModel *model, ClutterModelIter *iter, gpointer null)
gint i; gint i;
gchar *string; gchar *string;
clutter_model_iter_get (iter, 0, &i, 1, &string, -1); clutter_model_iter_get (iter, COLUMN_FOO, &i, COLUMN_BAR, &string, -1);
g_print ("Added: %d, %s\n", i, string); g_print ("Added: %d, %s\n", i, string);
@ -177,7 +193,9 @@ main (int argc, char *argv[])
clutter_init (&argc, &argv); clutter_init (&argc, &argv);
model = clutter_model_new (2, G_TYPE_INT, G_TYPE_STRING); model = clutter_model_new (N_COLUMNS,
G_TYPE_INT, "Foo",
G_TYPE_STRING, "Bar");
g_timeout_add (1000, (GSourceFunc)populate_model, model); g_timeout_add (1000, (GSourceFunc)populate_model, model);