2006-05-29 04:59:36 -04:00
|
|
|
#include <clutter/clutter.h>
|
2007-06-13 19:24:59 -04:00
|
|
|
|
2006-05-29 04:59:36 -04:00
|
|
|
#include <math.h>
|
2006-06-15 18:04:19 -04:00
|
|
|
#include <errno.h>
|
|
|
|
#include <stdlib.h>
|
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com>
* configure.ac: Enable debug messages also when
--enable-debug is set to "minimum".
* clutter/Makefile.am:
* clutter/clutter-debug.h: Move all debugging macros inside
this private header; make all debug macros depend on the
CLUTTER_ENABLE_DEBUG compile time define, controlled by
the --enable-debug configure switch; add G_LOG_DOMAIN define.
* clutter/clutter-main.c: Clean up the debug stuff; add
command line argument parsing using GOption; the debug
messages now are triggered like this:
CLUTTER_DEBUG=section:section:... clutter-app
or like this:
clutter-app --clutter-debug=section:section:...
where "section" is one of the sections listed in clutter-main.c,
or "all", for all sections; each section is bound to a flag,
which can be used to define a domain when adding a debug note
using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is
just a wrapper around that, under the CLUTTER_DEBUG_MISC domain;
CLUTTER_NOTE() is used like this:
CLUTTER_NOTE (DOMAIN, log-function);
where log function is g_printerr(), g_message(), g_warning(),
g_critical() or directly g_log() - for instance:
CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph));
will print the warning only if the "pango" flag has been
set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug
command line argument.
similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps
command line switch; also, the --display and --screen command
line switches have been added: the first overrides the DISPLAY
envvar and the second controls the X screen used by Clutter to
get the root window on the display.
* clutter/clutter-main.h:
* clutter/clutter-main.c: Add extended support for GOption
in Clutter; use clutter_init_with_args() to let Clutter
parse your own command line arguments; use instead
clutter_get_option_group() to get the GOptionGroup used by
Clutter if you want to do the parsing yourself with
g_option_context_parse(). The init sequence has been verified,
updated and moved into common functions where possible.
* clutter/pango/pangoclutter-render.c:
* clutter/*.c: Include "clutter-debug.h" where needed; use
CLUTTER_NOTE() instead of CLUTTER_DBG().
* examples/super-oh.c: Use the new clutter_init_with_args()
function, and add a --num-hands command line switch to
the SuperOH example code controlling the number of hands at
runtime.
2006-11-21 16:27:53 -05:00
|
|
|
#include <glib.h>
|
2008-11-07 14:32:28 -05:00
|
|
|
#include <gmodule.h>
|
2006-05-29 04:59:36 -04:00
|
|
|
|
|
|
|
#define NHANDS 6
|
|
|
|
|
|
|
|
typedef struct SuperOH
|
|
|
|
{
|
2010-10-11 12:45:30 -04:00
|
|
|
ClutterActor **hand;
|
|
|
|
ClutterActor *bgtex;
|
2009-01-27 10:18:45 -05:00
|
|
|
ClutterActor *real_hand;
|
|
|
|
ClutterActor *group;
|
|
|
|
ClutterActor *stage;
|
|
|
|
|
|
|
|
gint stage_width;
|
|
|
|
gint stage_height;
|
|
|
|
gfloat radius;
|
2006-05-29 04:59:36 -04:00
|
|
|
|
2009-01-27 10:18:45 -05:00
|
|
|
ClutterBehaviour *scaler_1;
|
|
|
|
ClutterBehaviour *scaler_2;
|
|
|
|
ClutterTimeline *timeline;
|
2008-01-30 07:13:26 -05:00
|
|
|
} SuperOH;
|
2006-05-29 04:59:36 -04:00
|
|
|
|
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com>
* configure.ac: Enable debug messages also when
--enable-debug is set to "minimum".
* clutter/Makefile.am:
* clutter/clutter-debug.h: Move all debugging macros inside
this private header; make all debug macros depend on the
CLUTTER_ENABLE_DEBUG compile time define, controlled by
the --enable-debug configure switch; add G_LOG_DOMAIN define.
* clutter/clutter-main.c: Clean up the debug stuff; add
command line argument parsing using GOption; the debug
messages now are triggered like this:
CLUTTER_DEBUG=section:section:... clutter-app
or like this:
clutter-app --clutter-debug=section:section:...
where "section" is one of the sections listed in clutter-main.c,
or "all", for all sections; each section is bound to a flag,
which can be used to define a domain when adding a debug note
using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is
just a wrapper around that, under the CLUTTER_DEBUG_MISC domain;
CLUTTER_NOTE() is used like this:
CLUTTER_NOTE (DOMAIN, log-function);
where log function is g_printerr(), g_message(), g_warning(),
g_critical() or directly g_log() - for instance:
CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph));
will print the warning only if the "pango" flag has been
set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug
command line argument.
similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps
command line switch; also, the --display and --screen command
line switches have been added: the first overrides the DISPLAY
envvar and the second controls the X screen used by Clutter to
get the root window on the display.
* clutter/clutter-main.h:
* clutter/clutter-main.c: Add extended support for GOption
in Clutter; use clutter_init_with_args() to let Clutter
parse your own command line arguments; use instead
clutter_get_option_group() to get the GOptionGroup used by
Clutter if you want to do the parsing yourself with
g_option_context_parse(). The init sequence has been verified,
updated and moved into common functions where possible.
* clutter/pango/pangoclutter-render.c:
* clutter/*.c: Include "clutter-debug.h" where needed; use
CLUTTER_NOTE() instead of CLUTTER_DBG().
* examples/super-oh.c: Use the new clutter_init_with_args()
function, and add a --num-hands command line switch to
the SuperOH example code controlling the number of hands at
runtime.
2006-11-21 16:27:53 -05:00
|
|
|
static gint n_hands = NHANDS;
|
|
|
|
|
|
|
|
static GOptionEntry super_oh_entries[] = {
|
|
|
|
{
|
|
|
|
"num-hands", 'n',
|
|
|
|
0,
|
|
|
|
G_OPTION_ARG_INT, &n_hands,
|
|
|
|
"Number of hands", "HANDS"
|
|
|
|
},
|
|
|
|
{ NULL }
|
|
|
|
};
|
|
|
|
|
2008-01-30 07:13:26 -05:00
|
|
|
static gboolean
|
2009-06-11 11:23:26 -04:00
|
|
|
on_button_press_event (ClutterActor *actor,
|
|
|
|
ClutterEvent *event,
|
|
|
|
SuperOH *oh)
|
2006-05-29 04:59:36 -04:00
|
|
|
{
|
2009-06-11 11:23:26 -04:00
|
|
|
gfloat x, y;
|
2008-06-06 12:22:55 -04:00
|
|
|
|
2009-06-11 11:23:26 -04:00
|
|
|
clutter_event_get_coords (event, &x, &y);
|
2007-03-22 14:21:59 -04:00
|
|
|
|
2010-08-26 12:31:32 -04:00
|
|
|
g_print ("*** button press event (button:%d) at %.2f, %.2f on %s ***\n",
|
2009-06-11 11:23:26 -04:00
|
|
|
clutter_event_get_button (event),
|
2010-08-26 12:31:32 -04:00
|
|
|
x, y,
|
|
|
|
clutter_actor_get_name (actor));
|
2006-05-29 04:59:36 -04:00
|
|
|
|
2009-06-11 11:23:26 -04:00
|
|
|
clutter_actor_hide (actor);
|
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com>
* clutter-color.h:
* clutter-color.c: Reimplement ClutterColor as a boxed type;
add convenience API for color handling, like: add, subtract,
shade, HSL color-space conversion, packing and unpacking.
* clutter-private.h: Update ClutterMainContext, and export the
main context pointer here.
* clutter-rectangle.h:
* clutter-rectangle.c: Update the color-related code; make
clutter_rectangle_new() and empty constructor and provide
clutter_rectangle_new_with_color(); provide color setter
and getter API.
* clutter-label.h:
* clutter-label.c: Rename the "font" property to "font-name";
update the color-related code to the new ClutterColor object;
rename clutter_label_new() to clutter_label_new_with_text(),
and add setters and getters for the properties.
* clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers
generators.
* clutter-stage.h:
* clutter-stage.c: Rework the API: provide a default constructor
for a singleton object, named clutter_stage_get_default(), which
supercedes the clutter_stage() function in clutter-main; provide
new events: button-press-event, button-release-event,
key-press-event and key-release-event; update the color-related
code;
(clutter_stage_snapshot): Allow negative width and height when
taking a snapshot (meaning: use full width/height).
(clutter_stage_get_element_at_pos): Rename clutter_stage_pick().
* clutter-element.c (clutter_element_paint): Clean up the
stage and color related code.
* clutter-event.h:
* clutter-event.c: Add generic ClutterAnyEvent type; add
clutter_event_new(), clutter_event_copy() and clutter_event_free();
make ClutterEvent a boxed type.
* clutter-main.h:
* clutter-main.c: Remove clutter_stage(); add clutter_main_quit(),
for cleanly quitting from clutter_main(); add multiple mainloops
support; allocate the ClutterCntx instead of adding it to the
stack; re-work the ClutterEvent dispatching.
* clutter-group.c (clutter_group_add), (clutter_group_remove): Keep
a reference on the element when added to a ClutterGroup.
* examples/rects.py
* examples/test.c:
* examples/test-text.c:
* examples/video-cube.c:
* examples/super-oh.c:
* examples/test-video.c: Update.
2006-06-05 09:38:31 -04:00
|
|
|
|
2009-06-11 11:23:26 -04:00
|
|
|
return TRUE;
|
|
|
|
}
|
2006-05-29 04:59:36 -04:00
|
|
|
|
2009-06-11 11:23:26 -04:00
|
|
|
static gboolean
|
|
|
|
input_cb (ClutterActor *stage,
|
|
|
|
ClutterEvent *event,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
SuperOH *oh = data;
|
|
|
|
|
|
|
|
if (event->type == CLUTTER_KEY_RELEASE)
|
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com>
* clutter-color.h:
* clutter-color.c: Reimplement ClutterColor as a boxed type;
add convenience API for color handling, like: add, subtract,
shade, HSL color-space conversion, packing and unpacking.
* clutter-private.h: Update ClutterMainContext, and export the
main context pointer here.
* clutter-rectangle.h:
* clutter-rectangle.c: Update the color-related code; make
clutter_rectangle_new() and empty constructor and provide
clutter_rectangle_new_with_color(); provide color setter
and getter API.
* clutter-label.h:
* clutter-label.c: Rename the "font" property to "font-name";
update the color-related code to the new ClutterColor object;
rename clutter_label_new() to clutter_label_new_with_text(),
and add setters and getters for the properties.
* clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers
generators.
* clutter-stage.h:
* clutter-stage.c: Rework the API: provide a default constructor
for a singleton object, named clutter_stage_get_default(), which
supercedes the clutter_stage() function in clutter-main; provide
new events: button-press-event, button-release-event,
key-press-event and key-release-event; update the color-related
code;
(clutter_stage_snapshot): Allow negative width and height when
taking a snapshot (meaning: use full width/height).
(clutter_stage_get_element_at_pos): Rename clutter_stage_pick().
* clutter-element.c (clutter_element_paint): Clean up the
stage and color related code.
* clutter-event.h:
* clutter-event.c: Add generic ClutterAnyEvent type; add
clutter_event_new(), clutter_event_copy() and clutter_event_free();
make ClutterEvent a boxed type.
* clutter-main.h:
* clutter-main.c: Remove clutter_stage(); add clutter_main_quit(),
for cleanly quitting from clutter_main(); add multiple mainloops
support; allocate the ClutterCntx instead of adding it to the
stack; re-work the ClutterEvent dispatching.
* clutter-group.c (clutter_group_add), (clutter_group_remove): Keep
a reference on the element when added to a ClutterGroup.
* examples/rects.py
* examples/test.c:
* examples/test-text.c:
* examples/video-cube.c:
* examples/super-oh.c:
* examples/test-video.c: Update.
2006-06-05 09:38:31 -04:00
|
|
|
{
|
|
|
|
g_print ("*** key press event (key:%c) ***\n",
|
2009-06-06 10:27:37 -04:00
|
|
|
clutter_event_get_key_symbol (event));
|
2008-01-30 07:13:26 -05:00
|
|
|
|
2010-09-10 08:41:49 -04:00
|
|
|
if (clutter_event_get_key_symbol (event) == CLUTTER_KEY_q)
|
2008-01-18 13:11:33 -05:00
|
|
|
{
|
|
|
|
clutter_main_quit ();
|
2009-06-11 11:23:26 -04:00
|
|
|
|
2008-01-18 13:11:33 -05:00
|
|
|
return TRUE;
|
|
|
|
}
|
2010-09-10 08:41:49 -04:00
|
|
|
else if (clutter_event_get_key_symbol (event) == CLUTTER_KEY_r)
|
2008-06-06 12:22:55 -04:00
|
|
|
{
|
|
|
|
gint i;
|
|
|
|
|
|
|
|
for (i = 0; i < n_hands; i++)
|
|
|
|
clutter_actor_show (oh->hand[i]);
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com>
* clutter-color.h:
* clutter-color.c: Reimplement ClutterColor as a boxed type;
add convenience API for color handling, like: add, subtract,
shade, HSL color-space conversion, packing and unpacking.
* clutter-private.h: Update ClutterMainContext, and export the
main context pointer here.
* clutter-rectangle.h:
* clutter-rectangle.c: Update the color-related code; make
clutter_rectangle_new() and empty constructor and provide
clutter_rectangle_new_with_color(); provide color setter
and getter API.
* clutter-label.h:
* clutter-label.c: Rename the "font" property to "font-name";
update the color-related code to the new ClutterColor object;
rename clutter_label_new() to clutter_label_new_with_text(),
and add setters and getters for the properties.
* clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers
generators.
* clutter-stage.h:
* clutter-stage.c: Rework the API: provide a default constructor
for a singleton object, named clutter_stage_get_default(), which
supercedes the clutter_stage() function in clutter-main; provide
new events: button-press-event, button-release-event,
key-press-event and key-release-event; update the color-related
code;
(clutter_stage_snapshot): Allow negative width and height when
taking a snapshot (meaning: use full width/height).
(clutter_stage_get_element_at_pos): Rename clutter_stage_pick().
* clutter-element.c (clutter_element_paint): Clean up the
stage and color related code.
* clutter-event.h:
* clutter-event.c: Add generic ClutterAnyEvent type; add
clutter_event_new(), clutter_event_copy() and clutter_event_free();
make ClutterEvent a boxed type.
* clutter-main.h:
* clutter-main.c: Remove clutter_stage(); add clutter_main_quit(),
for cleanly quitting from clutter_main(); add multiple mainloops
support; allocate the ClutterCntx instead of adding it to the
stack; re-work the ClutterEvent dispatching.
* clutter-group.c (clutter_group_add), (clutter_group_remove): Keep
a reference on the element when added to a ClutterGroup.
* examples/rects.py
* examples/test.c:
* examples/test-text.c:
* examples/video-cube.c:
* examples/super-oh.c:
* examples/test-video.c: Update.
2006-06-05 09:38:31 -04:00
|
|
|
}
|
2008-01-18 13:11:33 -05:00
|
|
|
|
|
|
|
return FALSE;
|
2006-05-29 04:59:36 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Timeline handler */
|
2008-01-18 13:11:33 -05:00
|
|
|
static void
|
2008-01-30 07:13:26 -05:00
|
|
|
frame_cb (ClutterTimeline *timeline,
|
2009-06-04 08:05:12 -04:00
|
|
|
gint msecs,
|
2006-05-29 04:59:36 -04:00
|
|
|
gpointer data)
|
|
|
|
{
|
2008-06-06 12:22:55 -04:00
|
|
|
SuperOH *oh = data;
|
2009-01-27 10:18:45 -05:00
|
|
|
gint i;
|
2009-06-04 08:05:12 -04:00
|
|
|
float rotation = clutter_timeline_get_progress (timeline) * 360.0f;
|
2006-05-29 04:59:36 -04:00
|
|
|
|
|
|
|
/* Rotate everything clockwise about stage center*/
|
2008-02-07 10:06:31 -05:00
|
|
|
|
2009-01-27 10:18:45 -05:00
|
|
|
clutter_actor_set_rotation (oh->group,
|
2007-11-17 13:11:14 -05:00
|
|
|
CLUTTER_Z_AXIS,
|
2009-06-04 08:05:12 -04:00
|
|
|
rotation,
|
2009-01-27 10:18:45 -05:00
|
|
|
oh->stage_width / 2,
|
|
|
|
oh->stage_height / 2,
|
2008-02-07 12:04:43 -05:00
|
|
|
0);
|
2007-06-13 19:24:59 -04:00
|
|
|
|
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com>
* configure.ac: Enable debug messages also when
--enable-debug is set to "minimum".
* clutter/Makefile.am:
* clutter/clutter-debug.h: Move all debugging macros inside
this private header; make all debug macros depend on the
CLUTTER_ENABLE_DEBUG compile time define, controlled by
the --enable-debug configure switch; add G_LOG_DOMAIN define.
* clutter/clutter-main.c: Clean up the debug stuff; add
command line argument parsing using GOption; the debug
messages now are triggered like this:
CLUTTER_DEBUG=section:section:... clutter-app
or like this:
clutter-app --clutter-debug=section:section:...
where "section" is one of the sections listed in clutter-main.c,
or "all", for all sections; each section is bound to a flag,
which can be used to define a domain when adding a debug note
using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is
just a wrapper around that, under the CLUTTER_DEBUG_MISC domain;
CLUTTER_NOTE() is used like this:
CLUTTER_NOTE (DOMAIN, log-function);
where log function is g_printerr(), g_message(), g_warning(),
g_critical() or directly g_log() - for instance:
CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph));
will print the warning only if the "pango" flag has been
set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug
command line argument.
similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps
command line switch; also, the --display and --screen command
line switches have been added: the first overrides the DISPLAY
envvar and the second controls the X screen used by Clutter to
get the root window on the display.
* clutter/clutter-main.h:
* clutter/clutter-main.c: Add extended support for GOption
in Clutter; use clutter_init_with_args() to let Clutter
parse your own command line arguments; use instead
clutter_get_option_group() to get the GOptionGroup used by
Clutter if you want to do the parsing yourself with
g_option_context_parse(). The init sequence has been verified,
updated and moved into common functions where possible.
* clutter/pango/pangoclutter-render.c:
* clutter/*.c: Include "clutter-debug.h" where needed; use
CLUTTER_NOTE() instead of CLUTTER_DBG().
* examples/super-oh.c: Use the new clutter_init_with_args()
function, and add a --num-hands command line switch to
the SuperOH example code controlling the number of hands at
runtime.
2006-11-21 16:27:53 -05:00
|
|
|
for (i = 0; i < n_hands; i++)
|
2006-05-29 04:59:36 -04:00
|
|
|
{
|
2007-06-13 19:24:59 -04:00
|
|
|
/* Rotate each hand around there centers - to get this we need
|
|
|
|
* to take into account any scaling.
|
2008-02-07 10:06:31 -05:00
|
|
|
*/
|
2009-01-27 10:18:45 -05:00
|
|
|
clutter_actor_set_rotation (oh->hand[i],
|
|
|
|
CLUTTER_Z_AXIS,
|
2009-06-04 08:05:12 -04:00
|
|
|
-6.0 * rotation,
|
2009-01-27 10:18:45 -05:00
|
|
|
0, 0, 0);
|
2007-06-13 19:24:59 -04:00
|
|
|
}
|
|
|
|
}
|
2006-06-15 18:04:19 -04:00
|
|
|
|
2009-01-20 11:42:49 -05:00
|
|
|
static gdouble
|
|
|
|
my_sine_wave (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = clutter_alpha_get_timeline (alpha);
|
|
|
|
gdouble progress = clutter_timeline_get_progress (timeline);
|
|
|
|
|
|
|
|
return sin (progress * G_PI);
|
|
|
|
}
|
|
|
|
|
2008-11-07 14:32:28 -05:00
|
|
|
G_MODULE_EXPORT int
|
|
|
|
test_actors_main (int argc, char *argv[])
|
2006-05-29 04:59:36 -04:00
|
|
|
{
|
2009-01-27 10:18:45 -05:00
|
|
|
ClutterAlpha *alpha;
|
|
|
|
ClutterActor *stage;
|
|
|
|
SuperOH *oh;
|
|
|
|
gint i;
|
|
|
|
GError *error;
|
|
|
|
ClutterActor *real_hand;
|
2009-11-05 12:30:33 -05:00
|
|
|
gchar *file;
|
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com>
* configure.ac: Enable debug messages also when
--enable-debug is set to "minimum".
* clutter/Makefile.am:
* clutter/clutter-debug.h: Move all debugging macros inside
this private header; make all debug macros depend on the
CLUTTER_ENABLE_DEBUG compile time define, controlled by
the --enable-debug configure switch; add G_LOG_DOMAIN define.
* clutter/clutter-main.c: Clean up the debug stuff; add
command line argument parsing using GOption; the debug
messages now are triggered like this:
CLUTTER_DEBUG=section:section:... clutter-app
or like this:
clutter-app --clutter-debug=section:section:...
where "section" is one of the sections listed in clutter-main.c,
or "all", for all sections; each section is bound to a flag,
which can be used to define a domain when adding a debug note
using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is
just a wrapper around that, under the CLUTTER_DEBUG_MISC domain;
CLUTTER_NOTE() is used like this:
CLUTTER_NOTE (DOMAIN, log-function);
where log function is g_printerr(), g_message(), g_warning(),
g_critical() or directly g_log() - for instance:
CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph));
will print the warning only if the "pango" flag has been
set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug
command line argument.
similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps
command line switch; also, the --display and --screen command
line switches have been added: the first overrides the DISPLAY
envvar and the second controls the X screen used by Clutter to
get the root window on the display.
* clutter/clutter-main.h:
* clutter/clutter-main.c: Add extended support for GOption
in Clutter; use clutter_init_with_args() to let Clutter
parse your own command line arguments; use instead
clutter_get_option_group() to get the GOptionGroup used by
Clutter if you want to do the parsing yourself with
g_option_context_parse(). The init sequence has been verified,
updated and moved into common functions where possible.
* clutter/pango/pangoclutter-render.c:
* clutter/*.c: Include "clutter-debug.h" where needed; use
CLUTTER_NOTE() instead of CLUTTER_DBG().
* examples/super-oh.c: Use the new clutter_init_with_args()
function, and add a --num-hands command line switch to
the SuperOH example code controlling the number of hands at
runtime.
2006-11-21 16:27:53 -05:00
|
|
|
|
|
|
|
error = NULL;
|
2007-06-13 19:24:59 -04:00
|
|
|
|
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com>
* configure.ac: Enable debug messages also when
--enable-debug is set to "minimum".
* clutter/Makefile.am:
* clutter/clutter-debug.h: Move all debugging macros inside
this private header; make all debug macros depend on the
CLUTTER_ENABLE_DEBUG compile time define, controlled by
the --enable-debug configure switch; add G_LOG_DOMAIN define.
* clutter/clutter-main.c: Clean up the debug stuff; add
command line argument parsing using GOption; the debug
messages now are triggered like this:
CLUTTER_DEBUG=section:section:... clutter-app
or like this:
clutter-app --clutter-debug=section:section:...
where "section" is one of the sections listed in clutter-main.c,
or "all", for all sections; each section is bound to a flag,
which can be used to define a domain when adding a debug note
using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is
just a wrapper around that, under the CLUTTER_DEBUG_MISC domain;
CLUTTER_NOTE() is used like this:
CLUTTER_NOTE (DOMAIN, log-function);
where log function is g_printerr(), g_message(), g_warning(),
g_critical() or directly g_log() - for instance:
CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph));
will print the warning only if the "pango" flag has been
set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug
command line argument.
similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps
command line switch; also, the --display and --screen command
line switches have been added: the first overrides the DISPLAY
envvar and the second controls the X screen used by Clutter to
get the root window on the display.
* clutter/clutter-main.h:
* clutter/clutter-main.c: Add extended support for GOption
in Clutter; use clutter_init_with_args() to let Clutter
parse your own command line arguments; use instead
clutter_get_option_group() to get the GOptionGroup used by
Clutter if you want to do the parsing yourself with
g_option_context_parse(). The init sequence has been verified,
updated and moved into common functions where possible.
* clutter/pango/pangoclutter-render.c:
* clutter/*.c: Include "clutter-debug.h" where needed; use
CLUTTER_NOTE() instead of CLUTTER_DBG().
* examples/super-oh.c: Use the new clutter_init_with_args()
function, and add a --num-hands command line switch to
the SuperOH example code controlling the number of hands at
runtime.
2006-11-21 16:27:53 -05:00
|
|
|
clutter_init_with_args (&argc, &argv,
|
|
|
|
NULL,
|
|
|
|
super_oh_entries,
|
|
|
|
NULL,
|
|
|
|
&error);
|
|
|
|
if (error)
|
|
|
|
{
|
|
|
|
g_warning ("Unable to initialise Clutter:\n%s",
|
|
|
|
error->message);
|
|
|
|
g_error_free (error);
|
2006-05-29 04:59:36 -04:00
|
|
|
|
2009-01-27 10:18:45 -05:00
|
|
|
return EXIT_FAILURE;
|
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com>
* configure.ac: Enable debug messages also when
--enable-debug is set to "minimum".
* clutter/Makefile.am:
* clutter/clutter-debug.h: Move all debugging macros inside
this private header; make all debug macros depend on the
CLUTTER_ENABLE_DEBUG compile time define, controlled by
the --enable-debug configure switch; add G_LOG_DOMAIN define.
* clutter/clutter-main.c: Clean up the debug stuff; add
command line argument parsing using GOption; the debug
messages now are triggered like this:
CLUTTER_DEBUG=section:section:... clutter-app
or like this:
clutter-app --clutter-debug=section:section:...
where "section" is one of the sections listed in clutter-main.c,
or "all", for all sections; each section is bound to a flag,
which can be used to define a domain when adding a debug note
using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is
just a wrapper around that, under the CLUTTER_DEBUG_MISC domain;
CLUTTER_NOTE() is used like this:
CLUTTER_NOTE (DOMAIN, log-function);
where log function is g_printerr(), g_message(), g_warning(),
g_critical() or directly g_log() - for instance:
CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph));
will print the warning only if the "pango" flag has been
set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug
command line argument.
similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps
command line switch; also, the --display and --screen command
line switches have been added: the first overrides the DISPLAY
envvar and the second controls the X screen used by Clutter to
get the root window on the display.
* clutter/clutter-main.h:
* clutter/clutter-main.c: Add extended support for GOption
in Clutter; use clutter_init_with_args() to let Clutter
parse your own command line arguments; use instead
clutter_get_option_group() to get the GOptionGroup used by
Clutter if you want to do the parsing yourself with
g_option_context_parse(). The init sequence has been verified,
updated and moved into common functions where possible.
* clutter/pango/pangoclutter-render.c:
* clutter/*.c: Include "clutter-debug.h" where needed; use
CLUTTER_NOTE() instead of CLUTTER_DBG().
* examples/super-oh.c: Use the new clutter_init_with_args()
function, and add a --num-hands command line switch to
the SuperOH example code controlling the number of hands at
runtime.
2006-11-21 16:27:53 -05:00
|
|
|
}
|
2006-05-29 04:59:36 -04:00
|
|
|
|
2010-10-11 12:45:30 -04:00
|
|
|
stage = clutter_stage_new ();
|
2007-06-13 19:24:59 -04:00
|
|
|
clutter_actor_set_size (stage, 800, 600);
|
2010-08-26 12:31:32 -04:00
|
|
|
clutter_actor_set_name (stage, "Default Stage");
|
2010-10-11 12:45:30 -04:00
|
|
|
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
|
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com>
* clutter-color.h:
* clutter-color.c: Reimplement ClutterColor as a boxed type;
add convenience API for color handling, like: add, subtract,
shade, HSL color-space conversion, packing and unpacking.
* clutter-private.h: Update ClutterMainContext, and export the
main context pointer here.
* clutter-rectangle.h:
* clutter-rectangle.c: Update the color-related code; make
clutter_rectangle_new() and empty constructor and provide
clutter_rectangle_new_with_color(); provide color setter
and getter API.
* clutter-label.h:
* clutter-label.c: Rename the "font" property to "font-name";
update the color-related code to the new ClutterColor object;
rename clutter_label_new() to clutter_label_new_with_text(),
and add setters and getters for the properties.
* clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers
generators.
* clutter-stage.h:
* clutter-stage.c: Rework the API: provide a default constructor
for a singleton object, named clutter_stage_get_default(), which
supercedes the clutter_stage() function in clutter-main; provide
new events: button-press-event, button-release-event,
key-press-event and key-release-event; update the color-related
code;
(clutter_stage_snapshot): Allow negative width and height when
taking a snapshot (meaning: use full width/height).
(clutter_stage_get_element_at_pos): Rename clutter_stage_pick().
* clutter-element.c (clutter_element_paint): Clean up the
stage and color related code.
* clutter-event.h:
* clutter-event.c: Add generic ClutterAnyEvent type; add
clutter_event_new(), clutter_event_copy() and clutter_event_free();
make ClutterEvent a boxed type.
* clutter-main.h:
* clutter-main.c: Remove clutter_stage(); add clutter_main_quit(),
for cleanly quitting from clutter_main(); add multiple mainloops
support; allocate the ClutterCntx instead of adding it to the
stack; re-work the ClutterEvent dispatching.
* clutter-group.c (clutter_group_add), (clutter_group_remove): Keep
a reference on the element when added to a ClutterGroup.
* examples/rects.py
* examples/test.c:
* examples/test-text.c:
* examples/video-cube.c:
* examples/super-oh.c:
* examples/test-video.c: Update.
2006-06-05 09:38:31 -04:00
|
|
|
|
2010-10-11 12:45:30 -04:00
|
|
|
clutter_stage_set_title (CLUTTER_STAGE (stage), "Actors");
|
|
|
|
clutter_stage_set_color (CLUTTER_STAGE (stage), CLUTTER_COLOR_LightSkyBlue);
|
2009-10-05 07:24:19 -04:00
|
|
|
clutter_stage_set_user_resizable (CLUTTER_STAGE (stage), TRUE);
|
2006-05-29 04:59:36 -04:00
|
|
|
|
2009-01-27 10:18:45 -05:00
|
|
|
oh = g_new (SuperOH, 1);
|
|
|
|
oh->stage = stage;
|
2006-05-29 04:59:36 -04:00
|
|
|
|
2007-06-13 19:24:59 -04:00
|
|
|
/* Create a timeline to manage animation */
|
2009-06-04 08:05:12 -04:00
|
|
|
oh->timeline = clutter_timeline_new (6000);
|
2009-01-27 10:18:45 -05:00
|
|
|
clutter_timeline_set_loop (oh->timeline, TRUE);
|
2007-06-13 19:24:59 -04:00
|
|
|
|
|
|
|
/* fire a callback for frame change */
|
2009-01-27 10:18:45 -05:00
|
|
|
g_signal_connect (oh->timeline, "new-frame", G_CALLBACK (frame_cb), oh);
|
2007-06-13 19:24:59 -04:00
|
|
|
|
|
|
|
/* Set up some behaviours to handle scaling */
|
2009-01-27 11:12:30 -05:00
|
|
|
alpha = clutter_alpha_new_with_func (oh->timeline, my_sine_wave, NULL, NULL);
|
2007-06-13 19:24:59 -04:00
|
|
|
|
2009-01-27 10:18:45 -05:00
|
|
|
oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0);
|
|
|
|
oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5);
|
2007-06-13 19:24:59 -04:00
|
|
|
|
2009-11-05 12:30:33 -05:00
|
|
|
file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL);
|
|
|
|
real_hand = clutter_texture_new_from_file (file, &error);
|
2009-01-27 10:18:45 -05:00
|
|
|
if (real_hand == NULL)
|
2009-11-05 12:30:33 -05:00
|
|
|
g_error ("image load failed: %s", error->message);
|
|
|
|
|
|
|
|
g_free (file);
|
2006-05-29 04:59:36 -04:00
|
|
|
|
2006-06-13 09:17:45 -04:00
|
|
|
/* create a new group to hold multiple actors in a group */
|
2006-05-29 04:59:36 -04:00
|
|
|
oh->group = clutter_group_new();
|
2010-08-26 12:31:32 -04:00
|
|
|
clutter_actor_set_name (oh->group, "Group");
|
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com>
* configure.ac: Enable debug messages also when
--enable-debug is set to "minimum".
* clutter/Makefile.am:
* clutter/clutter-debug.h: Move all debugging macros inside
this private header; make all debug macros depend on the
CLUTTER_ENABLE_DEBUG compile time define, controlled by
the --enable-debug configure switch; add G_LOG_DOMAIN define.
* clutter/clutter-main.c: Clean up the debug stuff; add
command line argument parsing using GOption; the debug
messages now are triggered like this:
CLUTTER_DEBUG=section:section:... clutter-app
or like this:
clutter-app --clutter-debug=section:section:...
where "section" is one of the sections listed in clutter-main.c,
or "all", for all sections; each section is bound to a flag,
which can be used to define a domain when adding a debug note
using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is
just a wrapper around that, under the CLUTTER_DEBUG_MISC domain;
CLUTTER_NOTE() is used like this:
CLUTTER_NOTE (DOMAIN, log-function);
where log function is g_printerr(), g_message(), g_warning(),
g_critical() or directly g_log() - for instance:
CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph));
will print the warning only if the "pango" flag has been
set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug
command line argument.
similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps
command line switch; also, the --display and --screen command
line switches have been added: the first overrides the DISPLAY
envvar and the second controls the X screen used by Clutter to
get the root window on the display.
* clutter/clutter-main.h:
* clutter/clutter-main.c: Add extended support for GOption
in Clutter; use clutter_init_with_args() to let Clutter
parse your own command line arguments; use instead
clutter_get_option_group() to get the GOptionGroup used by
Clutter if you want to do the parsing yourself with
g_option_context_parse(). The init sequence has been verified,
updated and moved into common functions where possible.
* clutter/pango/pangoclutter-render.c:
* clutter/*.c: Include "clutter-debug.h" where needed; use
CLUTTER_NOTE() instead of CLUTTER_DBG().
* examples/super-oh.c: Use the new clutter_init_with_args()
function, and add a --num-hands command line switch to
the SuperOH example code controlling the number of hands at
runtime.
2006-11-21 16:27:53 -05:00
|
|
|
|
|
|
|
oh->hand = g_new (ClutterActor*, n_hands);
|
2009-01-27 10:18:45 -05:00
|
|
|
|
|
|
|
oh->stage_width = clutter_actor_get_width (stage);
|
|
|
|
oh->stage_height = clutter_actor_get_height (stage);
|
|
|
|
oh->radius = (oh->stage_width + oh->stage_height)
|
|
|
|
/ n_hands;
|
|
|
|
|
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com>
* configure.ac: Enable debug messages also when
--enable-debug is set to "minimum".
* clutter/Makefile.am:
* clutter/clutter-debug.h: Move all debugging macros inside
this private header; make all debug macros depend on the
CLUTTER_ENABLE_DEBUG compile time define, controlled by
the --enable-debug configure switch; add G_LOG_DOMAIN define.
* clutter/clutter-main.c: Clean up the debug stuff; add
command line argument parsing using GOption; the debug
messages now are triggered like this:
CLUTTER_DEBUG=section:section:... clutter-app
or like this:
clutter-app --clutter-debug=section:section:...
where "section" is one of the sections listed in clutter-main.c,
or "all", for all sections; each section is bound to a flag,
which can be used to define a domain when adding a debug note
using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is
just a wrapper around that, under the CLUTTER_DEBUG_MISC domain;
CLUTTER_NOTE() is used like this:
CLUTTER_NOTE (DOMAIN, log-function);
where log function is g_printerr(), g_message(), g_warning(),
g_critical() or directly g_log() - for instance:
CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph));
will print the warning only if the "pango" flag has been
set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug
command line argument.
similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps
command line switch; also, the --display and --screen command
line switches have been added: the first overrides the DISPLAY
envvar and the second controls the X screen used by Clutter to
get the root window on the display.
* clutter/clutter-main.h:
* clutter/clutter-main.c: Add extended support for GOption
in Clutter; use clutter_init_with_args() to let Clutter
parse your own command line arguments; use instead
clutter_get_option_group() to get the GOptionGroup used by
Clutter if you want to do the parsing yourself with
g_option_context_parse(). The init sequence has been verified,
updated and moved into common functions where possible.
* clutter/pango/pangoclutter-render.c:
* clutter/*.c: Include "clutter-debug.h" where needed; use
CLUTTER_NOTE() instead of CLUTTER_DBG().
* examples/super-oh.c: Use the new clutter_init_with_args()
function, and add a --num-hands command line switch to
the SuperOH example code controlling the number of hands at
runtime.
2006-11-21 16:27:53 -05:00
|
|
|
for (i = 0; i < n_hands; i++)
|
2006-05-29 04:59:36 -04:00
|
|
|
{
|
|
|
|
gint x, y, w, h;
|
|
|
|
|
|
|
|
if (i == 0)
|
2010-08-26 12:31:32 -04:00
|
|
|
{
|
|
|
|
oh->hand[i] = real_hand;
|
|
|
|
clutter_actor_set_name (oh->hand[i], "Real Hand");
|
|
|
|
}
|
2006-08-29 15:09:43 -04:00
|
|
|
else
|
2010-08-26 12:31:32 -04:00
|
|
|
{
|
|
|
|
oh->hand[i] = clutter_clone_new (real_hand);
|
|
|
|
clutter_actor_set_name (oh->hand[i], "Clone Hand");
|
|
|
|
}
|
2009-01-27 10:18:45 -05:00
|
|
|
|
2009-06-11 11:23:26 -04:00
|
|
|
clutter_actor_set_reactive (oh->hand[i], TRUE);
|
|
|
|
|
2009-01-27 10:18:45 -05:00
|
|
|
clutter_actor_set_size (oh->hand[i], 200, 213);
|
2006-05-29 04:59:36 -04:00
|
|
|
|
|
|
|
/* Place around a circle */
|
2009-01-27 10:18:45 -05:00
|
|
|
w = clutter_actor_get_width (oh->hand[i]);
|
|
|
|
h = clutter_actor_get_height (oh->hand[i]);
|
2006-05-29 04:59:36 -04:00
|
|
|
|
2009-01-27 10:18:45 -05:00
|
|
|
x = oh->stage_width / 2
|
|
|
|
+ oh->radius
|
|
|
|
* cos (i * G_PI / (n_hands / 2))
|
2008-02-07 12:04:43 -05:00
|
|
|
- w / 2;
|
|
|
|
|
2009-01-27 10:18:45 -05:00
|
|
|
y = oh->stage_height / 2
|
|
|
|
+ oh->radius
|
|
|
|
* sin (i * G_PI / (n_hands / 2))
|
2008-02-07 12:04:43 -05:00
|
|
|
- h / 2;
|
|
|
|
|
|
|
|
clutter_actor_set_position (oh->hand[i], x, y);
|
2006-05-29 04:59:36 -04:00
|
|
|
|
2008-02-07 10:01:03 -05:00
|
|
|
clutter_actor_move_anchor_point_from_gravity (oh->hand[i],
|
2008-01-30 07:13:26 -05:00
|
|
|
CLUTTER_GRAVITY_CENTER);
|
|
|
|
|
2006-05-29 04:59:36 -04:00
|
|
|
/* Add to our group group */
|
2007-06-07 10:41:35 -04:00
|
|
|
clutter_container_add_actor (CLUTTER_CONTAINER (oh->group), oh->hand[i]);
|
2006-10-03 17:59:30 -04:00
|
|
|
|
2009-06-11 11:23:26 -04:00
|
|
|
g_signal_connect (oh->hand[i], "button-press-event",
|
|
|
|
G_CALLBACK (on_button_press_event),
|
|
|
|
oh);
|
|
|
|
|
2007-06-13 19:24:59 -04:00
|
|
|
if (i % 2)
|
2009-01-27 10:18:45 -05:00
|
|
|
clutter_behaviour_apply (oh->scaler_1, oh->hand[i]);
|
2007-06-13 19:24:59 -04:00
|
|
|
else
|
2009-01-27 10:18:45 -05:00
|
|
|
clutter_behaviour_apply (oh->scaler_2, oh->hand[i]);
|
2007-06-13 19:24:59 -04:00
|
|
|
}
|
2006-08-29 15:09:43 -04:00
|
|
|
|
2006-05-29 04:59:36 -04:00
|
|
|
/* Add the group to the stage */
|
2009-01-27 10:18:45 -05:00
|
|
|
clutter_container_add_actor (CLUTTER_CONTAINER (stage), oh->group);
|
2006-05-29 04:59:36 -04:00
|
|
|
|
2009-01-27 10:18:45 -05:00
|
|
|
/* Show everying */
|
2008-04-04 09:20:02 -04:00
|
|
|
clutter_actor_show (stage);
|
2006-05-29 04:59:36 -04:00
|
|
|
|
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com>
* clutter-color.h:
* clutter-color.c: Reimplement ClutterColor as a boxed type;
add convenience API for color handling, like: add, subtract,
shade, HSL color-space conversion, packing and unpacking.
* clutter-private.h: Update ClutterMainContext, and export the
main context pointer here.
* clutter-rectangle.h:
* clutter-rectangle.c: Update the color-related code; make
clutter_rectangle_new() and empty constructor and provide
clutter_rectangle_new_with_color(); provide color setter
and getter API.
* clutter-label.h:
* clutter-label.c: Rename the "font" property to "font-name";
update the color-related code to the new ClutterColor object;
rename clutter_label_new() to clutter_label_new_with_text(),
and add setters and getters for the properties.
* clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers
generators.
* clutter-stage.h:
* clutter-stage.c: Rework the API: provide a default constructor
for a singleton object, named clutter_stage_get_default(), which
supercedes the clutter_stage() function in clutter-main; provide
new events: button-press-event, button-release-event,
key-press-event and key-release-event; update the color-related
code;
(clutter_stage_snapshot): Allow negative width and height when
taking a snapshot (meaning: use full width/height).
(clutter_stage_get_element_at_pos): Rename clutter_stage_pick().
* clutter-element.c (clutter_element_paint): Clean up the
stage and color related code.
* clutter-event.h:
* clutter-event.c: Add generic ClutterAnyEvent type; add
clutter_event_new(), clutter_event_copy() and clutter_event_free();
make ClutterEvent a boxed type.
* clutter-main.h:
* clutter-main.c: Remove clutter_stage(); add clutter_main_quit(),
for cleanly quitting from clutter_main(); add multiple mainloops
support; allocate the ClutterCntx instead of adding it to the
stack; re-work the ClutterEvent dispatching.
* clutter-group.c (clutter_group_add), (clutter_group_remove): Keep
a reference on the element when added to a ClutterGroup.
* examples/rects.py
* examples/test.c:
* examples/test-text.c:
* examples/video-cube.c:
* examples/super-oh.c:
* examples/test-video.c: Update.
2006-06-05 09:38:31 -04:00
|
|
|
g_signal_connect (stage, "key-release-event",
|
|
|
|
G_CALLBACK (input_cb),
|
|
|
|
oh);
|
2006-05-29 04:59:36 -04:00
|
|
|
|
|
|
|
/* and start it */
|
2009-01-27 10:18:45 -05:00
|
|
|
clutter_timeline_start (oh->timeline);
|
2006-05-29 04:59:36 -04:00
|
|
|
|
2007-08-08 06:20:14 -04:00
|
|
|
clutter_main ();
|
2006-05-29 04:59:36 -04:00
|
|
|
|
2009-01-27 10:18:45 -05:00
|
|
|
/* clean up */
|
|
|
|
g_object_unref (oh->scaler_1);
|
|
|
|
g_object_unref (oh->scaler_2);
|
|
|
|
g_object_unref (oh->timeline);
|
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com>
* configure.ac: Enable debug messages also when
--enable-debug is set to "minimum".
* clutter/Makefile.am:
* clutter/clutter-debug.h: Move all debugging macros inside
this private header; make all debug macros depend on the
CLUTTER_ENABLE_DEBUG compile time define, controlled by
the --enable-debug configure switch; add G_LOG_DOMAIN define.
* clutter/clutter-main.c: Clean up the debug stuff; add
command line argument parsing using GOption; the debug
messages now are triggered like this:
CLUTTER_DEBUG=section:section:... clutter-app
or like this:
clutter-app --clutter-debug=section:section:...
where "section" is one of the sections listed in clutter-main.c,
or "all", for all sections; each section is bound to a flag,
which can be used to define a domain when adding a debug note
using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is
just a wrapper around that, under the CLUTTER_DEBUG_MISC domain;
CLUTTER_NOTE() is used like this:
CLUTTER_NOTE (DOMAIN, log-function);
where log function is g_printerr(), g_message(), g_warning(),
g_critical() or directly g_log() - for instance:
CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph));
will print the warning only if the "pango" flag has been
set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug
command line argument.
similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps
command line switch; also, the --display and --screen command
line switches have been added: the first overrides the DISPLAY
envvar and the second controls the X screen used by Clutter to
get the root window on the display.
* clutter/clutter-main.h:
* clutter/clutter-main.c: Add extended support for GOption
in Clutter; use clutter_init_with_args() to let Clutter
parse your own command line arguments; use instead
clutter_get_option_group() to get the GOptionGroup used by
Clutter if you want to do the parsing yourself with
g_option_context_parse(). The init sequence has been verified,
updated and moved into common functions where possible.
* clutter/pango/pangoclutter-render.c:
* clutter/*.c: Include "clutter-debug.h" where needed; use
CLUTTER_NOTE() instead of CLUTTER_DBG().
* examples/super-oh.c: Use the new clutter_init_with_args()
function, and add a --num-hands command line switch to
the SuperOH example code controlling the number of hands at
runtime.
2006-11-21 16:27:53 -05:00
|
|
|
g_free (oh->hand);
|
|
|
|
g_free (oh);
|
|
|
|
|
2009-01-27 10:18:45 -05:00
|
|
|
return EXIT_SUCCESS;
|
2006-05-29 04:59:36 -04:00
|
|
|
}
|