isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 20:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
b77e6f0c98
mutter/clutter/tests/interactive/test-actors.c

320 lines
8.0 KiB
C
Raw Normal View History

Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
#include <clutter/clutter.h>
2007-06-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-group.c: * clutter/clutter-label.c: * clutter/egl/clutter-stage-egl.c: * clutter/glx/clutter-stage-glx.c: * clutter/sdl/clutter-stage-sdl.c: Rename clutter_actor_allocate_coords -> clutter_actor_query_coords Change repaints to G_PRIORITY_DEFAULT + 10. (timelines are G_PRIORITY_DEFAULT + 30, events G_PRIORITY_DEFAULT) * clutter/glx/clutter-event-glx.c: Handle shift modifier in keycode -> keysym translation. * tests/test-actors.c: Remove (broken) screen saver code. Add scaling behaviour, clean code a little
2007-06-13 23:24:59 +00:00
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
#include <math.h>
2006-06-15 Matthew Allum <mallum@openedhand.com> * clutter/clutter-stage.c: * clutter/clutter-stage.h: Add clutter_stage_set_xwindow_foreign() call * clutter/clutter-util.c: * clutter/clutter-util.h: Add some X error traps * examples/super-oh.c: Toy with us of new clutter_stage_set_xwindow_foreign() for optional screensaver functionality.
2006-06-15 22:04:19 +00: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 21:27:53 +00:00
#include <glib.h>
Bug 1162 - Re-works the tests/ to use the glib-2.16 unit testing framework * configure.ac: * tests/*: The tests have been reorganised into different categories: conformance, interactive and micro benchmarks. - conformance tests can be run as part of automated tests - interactive tests are basically all the existing tests - micro benchmarks focus on a single performance metric I converted the timeline tests to conformance tests and also added some tests from Neil Roberts and Ebassi. Note: currently only the conformance tests use the glib test APIs, though the micro benchmarks should too. The other change is to make the unit tests link into monolithic binaries which makes the build time for unit tests considerably faster. To deal with the extra complexity this adds to debugging individual tests I have added some sugar to the makefiles so all the tests can be run directly via a symlink and when an individual test is run this way, then a note is printed to the terminal explaining exactly how that test may be debugged using GDB. There is a convenience make rule: 'make test-report', that will run all the conformance tests and hopefully even open the results in your web browser. It skips some of the slower timeline tests, but you can run those using 'make full-report'
2008-11-07 19:32:28 +00:00
#include <gmodule.h>
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
#define NHANDS 6
typedef struct SuperOH
{
Move tests to static colors where possible
2010-10-11 16:45:30 +00:00
ClutterActor **hand;
ClutterActor *bgtex;
Remove CloneTexture from the API ClutterClone supercedes ClutterCloneTexture, since it can clone every kind of actor -- including composite ones. This is another "brain surgery with a shotgun" kind of commit: it removes CloneTexture and updates every test case using CloneTexture to ClutterClone. The API fallout is minimal, luckily for us.
2009-01-27 15:18:45 +00:00
ClutterActor *real_hand;
ClutterActor *group;
ClutterActor *stage;
gint stage_width;
gint stage_height;
gfloat radius;
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
Remove CloneTexture from the API ClutterClone supercedes ClutterCloneTexture, since it can clone every kind of actor -- including composite ones. This is another "brain surgery with a shotgun" kind of commit: it removes CloneTexture and updates every test case using CloneTexture to ClutterClone. The API fallout is minimal, luckily for us.
2009-01-27 15:18:45 +00:00
ClutterBehaviour *scaler_1;
ClutterBehaviour *scaler_2;
ClutterTimeline *timeline;
2007-01-30 Tomas Frydrych <tf@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: Added new clutter_actor_move_anchor_point_ API. * clutter/clutter-behaviour-scale.c: * clutter/clutter-behaviour-scale.h: * clutter/clutter-effect.c: * clutter/clutter-effect.h: * tests/test-actors.c: * tests/test-effects.c: * tests/test-scale.c: Removed gravity from ClutterBehaviourScale.
2008-01-30 12:13:26 +00:00
} SuperOH;
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00: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 21:27:53 +00:00
static gint n_hands = NHANDS;
clutter/tests: Fix missing declaration warnings
2019-01-20 08:03:50 +00:00
int
test_actors_main (int argc, char *argv[]);
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 21:27:53 +00:00
static GOptionEntry super_oh_entries[] = {
{
"num-hands", 'n',
0,
G_OPTION_ARG_INT, &n_hands,
"Number of hands", "HANDS"
},
{ NULL }
};
test-actors: Clear the state on destroy The venerable test-actors used the default stage, which meant that closing the window just stopped the main loop but left the scene intact. This does not happen with a normal stage created through clutter_stage_new(). The change happened in 6ed6b2a54b5c8f44496399057ad5e58771bfc620, in an unhelpfully named commit that was just supposed to switch to static colors. My bad. Anyway, the change led to some assertion failures when closing the stage in the middle of an animation. The correct thing to do when using an actor from another object (a Timeline ::new-frame callback in this case) without owning the instance is to connect to the ::destroy signal and clean up the pointer to avoid calling an invalid actor.
2011-02-09 13:05:12 +00:00
static void
on_group_destroy (ClutterActor *actor,
SuperOH *oh)
{
oh->group = NULL;
}
static void
on_hand_destroy (ClutterActor *actor,
SuperOH *oh)
{
int i;
for (i = 0; i < n_hands; i++)
{
if (oh->hand[i] == actor)
oh->hand[i] = NULL;
}
}
2007-01-30 Tomas Frydrych <tf@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: Added new clutter_actor_move_anchor_point_ API. * clutter/clutter-behaviour-scale.c: * clutter/clutter-behaviour-scale.h: * clutter/clutter-effect.c: * clutter/clutter-effect.h: * tests/test-actors.c: * tests/test-effects.c: * tests/test-scale.c: Removed gravity from ClutterBehaviourScale.
2008-01-30 12:13:26 +00:00
static gboolean
[tests] Update test-actors (and clones) The test-actors test (and its clones, test-actor-clone and test-paint-wrapper) was written a long time ago for a different API and has been tweaked to bits. We should probably have something a little bit more complicated, but at least we should not use semantics and coding patterns from Clutter 0.2, otherwise we won't be testing anything except that Clutter 0.2 worked.
2009-06-11 15:23:26 +00:00
on_button_press_event (ClutterActor *actor,
ClutterEvent *event,
SuperOH *oh)
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
{
[tests] Update test-actors (and clones) The test-actors test (and its clones, test-actor-clone and test-paint-wrapper) was written a long time ago for a different API and has been tweaked to bits. We should probably have something a little bit more complicated, but at least we should not use semantics and coding patterns from Clutter 0.2, otherwise we won't be testing anything except that Clutter 0.2 worked.
2009-06-11 15:23:26 +00:00
gfloat x, y;
2008-06-06 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-texture.c: (clutter_texture_class_init): Do not unrealize on hide(), and do not realize() on show. By default, clutter_actor_show() will realize ourselves, and we don't want to unrealize when hidden to avoid paying the penalty of reading back the texture data from the video memory. * tests/test-actors.c: Show all textures again when pressing the 'r' key.
2008-06-06 16:22:55 +00:00
[tests] Update test-actors (and clones) The test-actors test (and its clones, test-actor-clone and test-paint-wrapper) was written a long time ago for a different API and has been tweaked to bits. We should probably have something a little bit more complicated, but at least we should not use semantics and coding patterns from Clutter 0.2, otherwise we won't be testing anything except that Clutter 0.2 worked.
2009-06-11 15:23:26 +00:00
clutter_event_get_coords (event, &x, &y);
2007-03-22 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-private.h: Remove inclusion of backend-specific headers; update the main context object; add the declarations for the event queue functions. * clutter/clutter-backend.[ch]: Add the abstract ClutterBackend object, which holds backend-specific settings, the main stage, and the event queue. Every backend must implement a subclass of ClutterBackend and ClutterStage. * clutter/clutter-feature.c: Protect the GLX specific calls behing #ifdef HAVE_CLUTTER_GLX. * clutter/clutter-actor.c: * clutter/clutter-group.c: * clutter/clutter-clone-texture.c: Include GL/gl.h * clutter/clutter-event.[ch]: Update public API and implement the event queue private API; hold a reference on the event objects; move out the keysym-to-unicode table; add the new event types. * clutter/clutter-color.h: Include clutter-fixed.h * clutter/clutter-main.c: Update API; get the main stage from the backend object; process the event received from the queue; lock/unlock the main mutex if we have one; move the initialisation process sooner in the init sequence, in order to have the backend object when we check for options; call the backed vfuncs in the pre/post parse hooks. * clutter/clutter-stage.c: Make ClutterStage and abstract class, implemented by the backends. * clutter/clutter/glx/clutter-glx.h: * clutter/clutter/glx/clutter-backend-glx.[ch]: * clutter/clutter/glx/clutter-event-glx.c: * clutter/clutter/glx/clutter-stage-glx.[ch]: * clutter/clutter/glx/Makefile.am: Add the GLX backend. * clutter/clutter/egl/clutter-backend-egl.[ch]: * clutter/clutter/egl/clutter-event-egl.c: * clutter/clutter/egl/clutter-stage-egl.[ch]: * clutter/clutter/egl/Makefile.am: Add the stub for a EGL backend. * examples/*.c: Update for the new API.
2007-03-22 18:21:59 +00:00
test-actors: Name all the actors Makes it easier to debug events.
2010-08-26 16:31:32 +00:00
g_print ("*** button press event (button:%d) at %.2f, %.2f on %s ***\n",
[tests] Update test-actors (and clones) The test-actors test (and its clones, test-actor-clone and test-paint-wrapper) was written a long time ago for a different API and has been tweaked to bits. We should probably have something a little bit more complicated, but at least we should not use semantics and coding patterns from Clutter 0.2, otherwise we won't be testing anything except that Clutter 0.2 worked.
2009-06-11 15:23:26 +00:00
clutter_event_get_button (event),
test-actors: Name all the actors Makes it easier to debug events.
2010-08-26 16:31:32 +00:00
x, y,
clutter_actor_get_name (actor));
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
[tests] Update test-actors (and clones) The test-actors test (and its clones, test-actor-clone and test-paint-wrapper) was written a long time ago for a different API and has been tweaked to bits. We should probably have something a little bit more complicated, but at least we should not use semantics and coding patterns from Clutter 0.2, otherwise we won't be testing anything except that Clutter 0.2 worked.
2009-06-11 15:23:26 +00: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 13:38:31 +00:00
[tests] Update test-actors (and clones) The test-actors test (and its clones, test-actor-clone and test-paint-wrapper) was written a long time ago for a different API and has been tweaked to bits. We should probably have something a little bit more complicated, but at least we should not use semantics and coding patterns from Clutter 0.2, otherwise we won't be testing anything except that Clutter 0.2 worked.
2009-06-11 15:23:26 +00:00
return TRUE;
}
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
[tests] Update test-actors (and clones) The test-actors test (and its clones, test-actor-clone and test-paint-wrapper) was written a long time ago for a different API and has been tweaked to bits. We should probably have something a little bit more complicated, but at least we should not use semantics and coding patterns from Clutter 0.2, otherwise we won't be testing anything except that Clutter 0.2 worked.
2009-06-11 15:23:26 +00: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 13:38:31 +00:00
{
g_print ("*** key press event (key:%c) ***\n",
introspection-friendly ClutterEvent accessors ClutterEvent is not really gobject-introspection friendly because of the whole discriminated union thing. In particular, if you get a ClutterEvent in a signal handler, you probably can't access the event-type-specific fields, and you probably can't call methods like clutter_key_event_symbol() either, because you can't cast the ClutterEvent to a ClutterKeyEvent. The cleanest solution is to turn every accessor into ClutterEvent methods, accepting a ClutterEvent* and internally checking the event type. Fixes bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1585
2009-06-06 14:27:37 +00:00
clutter_event_get_key_symbol (event));
2007-01-30 Tomas Frydrych <tf@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: Added new clutter_actor_move_anchor_point_ API. * clutter/clutter-behaviour-scale.c: * clutter/clutter-behaviour-scale.h: * clutter/clutter-effect.c: * clutter/clutter-effect.h: * tests/test-actors.c: * tests/test-effects.c: * tests/test-scale.c: Removed gravity from ClutterBehaviourScale.
2008-01-30 12:13:26 +00:00
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
if (clutter_event_get_key_symbol (event) == CLUTTER_KEY_q)
2008-01-18 Emmanuele Bassi <ebassi@openedhand.com> * tests/test-actors.c (input_cb): Fix the callback signature; hide the clicked actor only if it's a hand.
2008-01-18 18:11:33 +00:00
{
clutter_main_quit ();
[tests] Update test-actors (and clones) The test-actors test (and its clones, test-actor-clone and test-paint-wrapper) was written a long time ago for a different API and has been tweaked to bits. We should probably have something a little bit more complicated, but at least we should not use semantics and coding patterns from Clutter 0.2, otherwise we won't be testing anything except that Clutter 0.2 worked.
2009-06-11 15:23:26 +00:00
2008-01-18 Emmanuele Bassi <ebassi@openedhand.com> * tests/test-actors.c (input_cb): Fix the callback signature; hide the clicked actor only if it's a hand.
2008-01-18 18:11:33 +00:00
return TRUE;
}
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
else if (clutter_event_get_key_symbol (event) == CLUTTER_KEY_r)
2008-06-06 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-texture.c: (clutter_texture_class_init): Do not unrealize on hide(), and do not realize() on show. By default, clutter_actor_show() will realize ourselves, and we don't want to unrealize when hidden to avoid paying the penalty of reading back the texture data from the video memory. * tests/test-actors.c: Show all textures again when pressing the 'r' key.
2008-06-06 16:22:55 +00:00
{
gint i;
for (i = 0; i < n_hands; i++)
test-actors: Clear the state on destroy The venerable test-actors used the default stage, which meant that closing the window just stopped the main loop but left the scene intact. This does not happen with a normal stage created through clutter_stage_new(). The change happened in 6ed6b2a54b5c8f44496399057ad5e58771bfc620, in an unhelpfully named commit that was just supposed to switch to static colors. My bad. Anyway, the change led to some assertion failures when closing the stage in the middle of an animation. The correct thing to do when using an actor from another object (a Timeline ::new-frame callback in this case) without owning the instance is to connect to the ::destroy signal and clean up the pointer to avoid calling an invalid actor.
2011-02-09 13:05:12 +00:00
{
if (oh->hand[i] != NULL)
clutter_actor_show (oh->hand[i]);
}
2008-06-06 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-texture.c: (clutter_texture_class_init): Do not unrealize on hide(), and do not realize() on show. By default, clutter_actor_show() will realize ourselves, and we don't want to unrealize when hidden to avoid paying the penalty of reading back the texture data from the video memory. * tests/test-actors.c: Show all textures again when pressing the 'r' key.
2008-06-06 16:22:55 +00:00
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 13:38:31 +00:00
}
2008-01-18 Emmanuele Bassi <ebassi@openedhand.com> * tests/test-actors.c (input_cb): Fix the callback signature; hide the clicked actor only if it's a hand.
2008-01-18 18:11:33 +00:00
return FALSE;
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
}
/* Timeline handler */
2008-01-18 Emmanuele Bassi <ebassi@openedhand.com> * tests/test-actors.c (input_cb): Fix the callback signature; hide the clicked actor only if it's a hand.
2008-01-18 18:11:33 +00:00
static void
2007-01-30 Tomas Frydrych <tf@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: Added new clutter_actor_move_anchor_point_ API. * clutter/clutter-behaviour-scale.c: * clutter/clutter-behaviour-scale.h: * clutter/clutter-effect.c: * clutter/clutter-effect.h: * tests/test-actors.c: * tests/test-effects.c: * tests/test-scale.c: Removed gravity from ClutterBehaviourScale.
2008-01-30 12:13:26 +00:00
frame_cb (ClutterTimeline *timeline,
[timeline] Remove the concept of frames from timelines Timelines no longer work in terms of a frame rate and a number of frames but instead just have a duration in milliseconds. This better matches the working of the master clock where if any timelines are running it will redraw as fast as possible rather than limiting to the lowest rated timeline. Most applications will just create animations and expect them to finish in a certain amount of time without caring about how many frames are drawn. If a frame is going to be drawn it might as well update all of the animations to some fraction of the total animation rather than rounding to the nearest whole frame. The 'frame_num' parameter of the new-frame signal is now 'msecs' which is a number of milliseconds progressed along the timeline. Applications should use clutter_timeline_get_progress instead of the frame number. Markers can now only be attached at a time value. The position is stored in milliseconds rather than at a frame number. test-timeline-smoothness and test-timeline-dup-frames have been removed because they no longer make sense.
2009-06-04 12:05:12 +00:00
gint msecs,
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
gpointer data)
{
2008-06-06 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-texture.c: (clutter_texture_class_init): Do not unrealize on hide(), and do not realize() on show. By default, clutter_actor_show() will realize ourselves, and we don't want to unrealize when hidden to avoid paying the penalty of reading back the texture data from the video memory. * tests/test-actors.c: Show all textures again when pressing the 'r' key.
2008-06-06 16:22:55 +00:00
SuperOH *oh = data;
Remove CloneTexture from the API ClutterClone supercedes ClutterCloneTexture, since it can clone every kind of actor -- including composite ones. This is another "brain surgery with a shotgun" kind of commit: it removes CloneTexture and updates every test case using CloneTexture to ClutterClone. The API fallout is minimal, luckily for us.
2009-01-27 15:18:45 +00:00
gint i;
[timeline] Remove the concept of frames from timelines Timelines no longer work in terms of a frame rate and a number of frames but instead just have a duration in milliseconds. This better matches the working of the master clock where if any timelines are running it will redraw as fast as possible rather than limiting to the lowest rated timeline. Most applications will just create animations and expect them to finish in a certain amount of time without caring about how many frames are drawn. If a frame is going to be drawn it might as well update all of the animations to some fraction of the total animation rather than rounding to the nearest whole frame. The 'frame_num' parameter of the new-frame signal is now 'msecs' which is a number of milliseconds progressed along the timeline. Applications should use clutter_timeline_get_progress instead of the frame number. Markers can now only be attached at a time value. The position is stored in milliseconds rather than at a frame number. test-timeline-smoothness and test-timeline-dup-frames have been removed because they no longer make sense.
2009-06-04 12:05:12 +00:00
float rotation = clutter_timeline_get_progress (timeline) * 360.0f;
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
/* Rotate everything clockwise about stage center*/
test-actors: Clear the state on destroy The venerable test-actors used the default stage, which meant that closing the window just stopped the main loop but left the scene intact. This does not happen with a normal stage created through clutter_stage_new(). The change happened in 6ed6b2a54b5c8f44496399057ad5e58771bfc620, in an unhelpfully named commit that was just supposed to switch to static colors. My bad. Anyway, the change led to some assertion failures when closing the stage in the middle of an animation. The correct thing to do when using an actor from another object (a Timeline ::new-frame callback in this case) without owning the instance is to connect to the ::destroy signal and clean up the pointer to avoid calling an invalid actor.
2011-02-09 13:05:12 +00:00
if (oh->group != NULL)
clutter_actor_set_rotation (oh->group,
CLUTTER_Z_AXIS,
rotation,
oh->stage_width / 2,
oh->stage_height / 2,
0);
2007-06-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-group.c: * clutter/clutter-label.c: * clutter/egl/clutter-stage-egl.c: * clutter/glx/clutter-stage-glx.c: * clutter/sdl/clutter-stage-sdl.c: Rename clutter_actor_allocate_coords -> clutter_actor_query_coords Change repaints to G_PRIORITY_DEFAULT + 10. (timelines are G_PRIORITY_DEFAULT + 30, events G_PRIORITY_DEFAULT) * clutter/glx/clutter-event-glx.c: Handle shift modifier in keycode -> keysym translation. * tests/test-actors.c: Remove (broken) screen saver code. Add scaling behaviour, clean code a little
2007-06-13 23:24:59 +00: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 21:27:53 +00:00
for (i = 0; i < n_hands; i++)
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
{
2007-06-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-group.c: * clutter/clutter-label.c: * clutter/egl/clutter-stage-egl.c: * clutter/glx/clutter-stage-glx.c: * clutter/sdl/clutter-stage-sdl.c: Rename clutter_actor_allocate_coords -> clutter_actor_query_coords Change repaints to G_PRIORITY_DEFAULT + 10. (timelines are G_PRIORITY_DEFAULT + 30, events G_PRIORITY_DEFAULT) * clutter/glx/clutter-event-glx.c: Handle shift modifier in keycode -> keysym translation. * tests/test-actors.c: Remove (broken) screen saver code. Add scaling behaviour, clean code a little
2007-06-13 23:24:59 +00:00
/* Rotate each hand around there centers - to get this we need
* to take into account any scaling.
2008-02-07 Tomas Frydrych <tf@openedhand.com> * clutter/clutter-actor.c: (clutter_actor_set_property): Fixed handling of PROP_ROTATE_CENTER_Y, ROTATE_CENTER_Z * tests/test-actors.c: Adjusted to use anchor point for both group and hands.
2008-02-07 15:06:31 +00:00
*/
test-actors: Clear the state on destroy The venerable test-actors used the default stage, which meant that closing the window just stopped the main loop but left the scene intact. This does not happen with a normal stage created through clutter_stage_new(). The change happened in 6ed6b2a54b5c8f44496399057ad5e58771bfc620, in an unhelpfully named commit that was just supposed to switch to static colors. My bad. Anyway, the change led to some assertion failures when closing the stage in the middle of an animation. The correct thing to do when using an actor from another object (a Timeline ::new-frame callback in this case) without owning the instance is to connect to the ::destroy signal and clean up the pointer to avoid calling an invalid actor.
2011-02-09 13:05:12 +00:00
if (oh->hand[i] != NULL)
clutter_actor_set_rotation (oh->hand[i],
CLUTTER_Z_AXIS,
-6.0 * rotation,
0, 0, 0);
2007-06-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-group.c: * clutter/clutter-label.c: * clutter/egl/clutter-stage-egl.c: * clutter/glx/clutter-stage-glx.c: * clutter/sdl/clutter-stage-sdl.c: Rename clutter_actor_allocate_coords -> clutter_actor_query_coords Change repaints to G_PRIORITY_DEFAULT + 10. (timelines are G_PRIORITY_DEFAULT + 30, events G_PRIORITY_DEFAULT) * clutter/glx/clutter-event-glx.c: Handle shift modifier in keycode -> keysym translation. * tests/test-actors.c: Remove (broken) screen saver code. Add scaling behaviour, clean code a little
2007-06-13 23:24:59 +00:00
}
}
2006-06-15 Matthew Allum <mallum@openedhand.com> * clutter/clutter-stage.c: * clutter/clutter-stage.h: Add clutter_stage_set_xwindow_foreign() call * clutter/clutter-util.c: * clutter/clutter-util.h: Add some X error traps * examples/super-oh.c: Toy with us of new clutter_stage_set_xwindow_foreign() for optional screensaver functionality.
2006-06-15 22:04:19 +00:00
interactive/actors: Update the venerable test-actors
2012-01-20 18:05:53 +00:00
static void
stop_and_quit (ClutterActor *stage,
SuperOH *data)
{
clutter_timeline_stop (data->timeline);
clutter_main_quit ();
}
[animation] Move the alpha value to floating point The current Alpha value is an unsigned integer that can be used implicitly as a fixed point value. This makes writing an alpha function overshooting below and above the current range basically impossible without complicating an already complex code, and creating weird corner cases. For this reason, the Alpha value should be defined as a floating point normalized value, spanning a range between 0.0 and 1.0; in order to allow overshooting, the valid range is extended one unit below and one unit above, thus making it -1.0 .. 2.0. This commit updates the various users of the ClutterAlpha API and the tests cases. This commit also removes all the current alpha functions exposed in the public API.
2009-01-20 16:42:49 +00: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);
}
Bug 1162 - Re-works the tests/ to use the glib-2.16 unit testing framework * configure.ac: * tests/*: The tests have been reorganised into different categories: conformance, interactive and micro benchmarks. - conformance tests can be run as part of automated tests - interactive tests are basically all the existing tests - micro benchmarks focus on a single performance metric I converted the timeline tests to conformance tests and also added some tests from Neil Roberts and Ebassi. Note: currently only the conformance tests use the glib test APIs, though the micro benchmarks should too. The other change is to make the unit tests link into monolithic binaries which makes the build time for unit tests considerably faster. To deal with the extra complexity this adds to debugging individual tests I have added some sugar to the makefiles so all the tests can be run directly via a symlink and when an individual test is run this way, then a note is printed to the terminal explaining exactly how that test may be debugged using GDB. There is a convenience make rule: 'make test-report', that will run all the conformance tests and hopefully even open the results in your web browser. It skips some of the slower timeline tests, but you can run those using 'make full-report'
2008-11-07 19:32:28 +00:00
G_MODULE_EXPORT int
test_actors_main (int argc, char *argv[])
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
{
Remove CloneTexture from the API ClutterClone supercedes ClutterCloneTexture, since it can clone every kind of actor -- including composite ones. This is another "brain surgery with a shotgun" kind of commit: it removes CloneTexture and updates every test case using CloneTexture to ClutterClone. The API fallout is minimal, luckily for us.
2009-01-27 15:18:45 +00:00
ClutterAlpha *alpha;
SuperOH *oh;
gint i;
GError *error;
ClutterActor *real_hand;
tests: Clean up interactive test build The build for interactive tests creates symbolic links for the data under tests/data; it also uses symbolic links for creating "binaries" for each interactive test. This is less than ideal, though. Instead, the tests should build a path to the data files by using a pre-processor define like TESTS_DATADIR; both g_build_filename() and pre-processor string concatenation can be used to generate a valid file name with the full path to the files. The build system should also create wrapper scripts, just like we do inside the conformance test suite, to be able to launch single tests.
2009-11-05 17:30:33 +00: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 21:27:53 +00:00
error = NULL;
2007-06-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-group.c: * clutter/clutter-label.c: * clutter/egl/clutter-stage-egl.c: * clutter/glx/clutter-stage-glx.c: * clutter/sdl/clutter-stage-sdl.c: Rename clutter_actor_allocate_coords -> clutter_actor_query_coords Change repaints to G_PRIORITY_DEFAULT + 10. (timelines are G_PRIORITY_DEFAULT + 30, events G_PRIORITY_DEFAULT) * clutter/glx/clutter-event-glx.c: Handle shift modifier in keycode -> keysym translation. * tests/test-actors.c: Remove (broken) screen saver code. Add scaling behaviour, clean code a little
2007-06-13 23:24:59 +00:00
tests: Check return value of clutter_init_with_args instead of error Some of the tests were ignoring the return value of clutter_init_with_args and instead they would recognise an error by seeing whether the GError parameter was set. This patch changes it to check the return value so that it won't give a warning now that G_GNUC_WARN_UNUSED_RESULT is on that function. http://bugzilla.clutter-project.org/show_bug.cgi?id=2574
2011-02-22 12:53:15 +00:00
if (clutter_init_with_args (&argc, &argv,
NULL,
super_oh_entries,
NULL,
&error) != CLUTTER_INIT_SUCCESS)
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 21:27:53 +00:00
{
g_warning ("Unable to initialise Clutter:\n%s",
error->message);
g_error_free (error);
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
Remove CloneTexture from the API ClutterClone supercedes ClutterCloneTexture, since it can clone every kind of actor -- including composite ones. This is another "brain surgery with a shotgun" kind of commit: it removes CloneTexture and updates every test case using CloneTexture to ClutterClone. The API fallout is minimal, luckily for us.
2009-01-27 15:18:45 +00: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 21:27:53 +00:00
}
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
interactive/actors: Update the venerable test-actors
2012-01-20 18:05:53 +00:00
oh = g_new (SuperOH, 1);
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 13:38:31 +00:00
interactive/actors: Update the venerable test-actors
2012-01-20 18:05:53 +00:00
oh->stage = clutter_stage_new ();
clutter_actor_set_size (oh->stage, 800, 600);
clutter_actor_set_name (oh->stage, "Default Stage");
interactive/*: Update the API usage Drop some deprecated methods.
2012-02-13 16:47:17 +00:00
clutter_actor_set_background_color (oh->stage, CLUTTER_COLOR_LightSkyBlue);
interactive/actors: Update the venerable test-actors
2012-01-20 18:05:53 +00:00
g_signal_connect (oh->stage, "destroy", G_CALLBACK (stop_and_quit), oh);
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
interactive/actors: Update the venerable test-actors
2012-01-20 18:05:53 +00:00
clutter_stage_set_title (CLUTTER_STAGE (oh->stage), "Actors");
clutter_stage_set_user_resizable (CLUTTER_STAGE (oh->stage), TRUE);
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
2007-06-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-group.c: * clutter/clutter-label.c: * clutter/egl/clutter-stage-egl.c: * clutter/glx/clutter-stage-glx.c: * clutter/sdl/clutter-stage-sdl.c: Rename clutter_actor_allocate_coords -> clutter_actor_query_coords Change repaints to G_PRIORITY_DEFAULT + 10. (timelines are G_PRIORITY_DEFAULT + 30, events G_PRIORITY_DEFAULT) * clutter/glx/clutter-event-glx.c: Handle shift modifier in keycode -> keysym translation. * tests/test-actors.c: Remove (broken) screen saver code. Add scaling behaviour, clean code a little
2007-06-13 23:24:59 +00:00
/* Create a timeline to manage animation */
[timeline] Remove the concept of frames from timelines Timelines no longer work in terms of a frame rate and a number of frames but instead just have a duration in milliseconds. This better matches the working of the master clock where if any timelines are running it will redraw as fast as possible rather than limiting to the lowest rated timeline. Most applications will just create animations and expect them to finish in a certain amount of time without caring about how many frames are drawn. If a frame is going to be drawn it might as well update all of the animations to some fraction of the total animation rather than rounding to the nearest whole frame. The 'frame_num' parameter of the new-frame signal is now 'msecs' which is a number of milliseconds progressed along the timeline. Applications should use clutter_timeline_get_progress instead of the frame number. Markers can now only be attached at a time value. The position is stored in milliseconds rather than at a frame number. test-timeline-smoothness and test-timeline-dup-frames have been removed because they no longer make sense.
2009-06-04 12:05:12 +00:00
oh->timeline = clutter_timeline_new (6000);
interactive/*: Update the API usage Drop some deprecated methods.
2012-02-13 16:47:17 +00:00
clutter_timeline_set_repeat_count (oh->timeline, -1);
2007-06-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-group.c: * clutter/clutter-label.c: * clutter/egl/clutter-stage-egl.c: * clutter/glx/clutter-stage-glx.c: * clutter/sdl/clutter-stage-sdl.c: Rename clutter_actor_allocate_coords -> clutter_actor_query_coords Change repaints to G_PRIORITY_DEFAULT + 10. (timelines are G_PRIORITY_DEFAULT + 30, events G_PRIORITY_DEFAULT) * clutter/glx/clutter-event-glx.c: Handle shift modifier in keycode -> keysym translation. * tests/test-actors.c: Remove (broken) screen saver code. Add scaling behaviour, clean code a little
2007-06-13 23:24:59 +00:00
/* fire a callback for frame change */
Remove CloneTexture from the API ClutterClone supercedes ClutterCloneTexture, since it can clone every kind of actor -- including composite ones. This is another "brain surgery with a shotgun" kind of commit: it removes CloneTexture and updates every test case using CloneTexture to ClutterClone. The API fallout is minimal, luckily for us.
2009-01-27 15:18:45 +00:00
g_signal_connect (oh->timeline, "new-frame", G_CALLBACK (frame_cb), oh);
2007-06-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-group.c: * clutter/clutter-label.c: * clutter/egl/clutter-stage-egl.c: * clutter/glx/clutter-stage-glx.c: * clutter/sdl/clutter-stage-sdl.c: Rename clutter_actor_allocate_coords -> clutter_actor_query_coords Change repaints to G_PRIORITY_DEFAULT + 10. (timelines are G_PRIORITY_DEFAULT + 30, events G_PRIORITY_DEFAULT) * clutter/glx/clutter-event-glx.c: Handle shift modifier in keycode -> keysym translation. * tests/test-actors.c: Remove (broken) screen saver code. Add scaling behaviour, clean code a little
2007-06-13 23:24:59 +00:00
/* Set up some behaviours to handle scaling */
Merge branch 'generic-actor-clone' * generic-actor-clone: Remove CloneTexture from the API [tests] Clean up the Clone interactive test Rename ActorClone to Clone/2 Rename ActorClone to Clone/1 Improves the unit test to verify more awkward scaling and some corresponding fixes Implements a generic ClutterActorClone that doesn't need fbos.
2009-01-27 16:12:30 +00:00
alpha = clutter_alpha_new_with_func (oh->timeline, my_sine_wave, NULL, NULL);
2007-06-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-group.c: * clutter/clutter-label.c: * clutter/egl/clutter-stage-egl.c: * clutter/glx/clutter-stage-glx.c: * clutter/sdl/clutter-stage-sdl.c: Rename clutter_actor_allocate_coords -> clutter_actor_query_coords Change repaints to G_PRIORITY_DEFAULT + 10. (timelines are G_PRIORITY_DEFAULT + 30, events G_PRIORITY_DEFAULT) * clutter/glx/clutter-event-glx.c: Handle shift modifier in keycode -> keysym translation. * tests/test-actors.c: Remove (broken) screen saver code. Add scaling behaviour, clean code a little
2007-06-13 23:24:59 +00:00
Remove CloneTexture from the API ClutterClone supercedes ClutterCloneTexture, since it can clone every kind of actor -- including composite ones. This is another "brain surgery with a shotgun" kind of commit: it removes CloneTexture and updates every test case using CloneTexture to ClutterClone. The API fallout is minimal, luckily for us.
2009-01-27 15:18:45 +00: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-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-group.c: * clutter/clutter-label.c: * clutter/egl/clutter-stage-egl.c: * clutter/glx/clutter-stage-glx.c: * clutter/sdl/clutter-stage-sdl.c: Rename clutter_actor_allocate_coords -> clutter_actor_query_coords Change repaints to G_PRIORITY_DEFAULT + 10. (timelines are G_PRIORITY_DEFAULT + 30, events G_PRIORITY_DEFAULT) * clutter/glx/clutter-event-glx.c: Handle shift modifier in keycode -> keysym translation. * tests/test-actors.c: Remove (broken) screen saver code. Add scaling behaviour, clean code a little
2007-06-13 23:24:59 +00:00
tests: Clean up interactive test build The build for interactive tests creates symbolic links for the data under tests/data; it also uses symbolic links for creating "binaries" for each interactive test. This is less than ideal, though. Instead, the tests should build a path to the data files by using a pre-processor define like TESTS_DATADIR; both g_build_filename() and pre-processor string concatenation can be used to generate a valid file name with the full path to the files. The build system should also create wrapper scripts, just like we do inside the conformance test suite, to be able to launch single tests.
2009-11-05 17:30:33 +00:00
file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL);
real_hand = clutter_texture_new_from_file (file, &error);
Remove CloneTexture from the API ClutterClone supercedes ClutterCloneTexture, since it can clone every kind of actor -- including composite ones. This is another "brain surgery with a shotgun" kind of commit: it removes CloneTexture and updates every test case using CloneTexture to ClutterClone. The API fallout is minimal, luckily for us.
2009-01-27 15:18:45 +00:00
if (real_hand == NULL)
tests: Clean up interactive test build The build for interactive tests creates symbolic links for the data under tests/data; it also uses symbolic links for creating "binaries" for each interactive test. This is less than ideal, though. Instead, the tests should build a path to the data files by using a pre-processor define like TESTS_DATADIR; both g_build_filename() and pre-processor string concatenation can be used to generate a valid file name with the full path to the files. The build system should also create wrapper scripts, just like we do inside the conformance test suite, to be able to launch single tests.
2009-11-05 17:30:33 +00:00
g_error ("image load failed: %s", error->message);
g_free (file);
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
interactive/actors: Update the venerable test-actors
2012-01-20 18:05:53 +00:00
/* create a new actor to hold other actors */
interactive: Use ClutterActor instead of deprecated classes
2012-01-17 16:20:41 +00:00
oh->group = clutter_actor_new ();
interactive/actors: Update the venerable test-actors
2012-01-20 18:05:53 +00:00
clutter_actor_set_layout_manager (oh->group, clutter_fixed_layout_new ());
test-actors: Name all the actors Makes it easier to debug events.
2010-08-26 16:31:32 +00:00
clutter_actor_set_name (oh->group, "Group");
test-actors: Clear the state on destroy The venerable test-actors used the default stage, which meant that closing the window just stopped the main loop but left the scene intact. This does not happen with a normal stage created through clutter_stage_new(). The change happened in 6ed6b2a54b5c8f44496399057ad5e58771bfc620, in an unhelpfully named commit that was just supposed to switch to static colors. My bad. Anyway, the change led to some assertion failures when closing the stage in the middle of an animation. The correct thing to do when using an actor from another object (a Timeline ::new-frame callback in this case) without owning the instance is to connect to the ::destroy signal and clean up the pointer to avoid calling an invalid actor.
2011-02-09 13:05:12 +00:00
g_signal_connect (oh->group, "destroy", G_CALLBACK (on_group_destroy), oh);
interactive/actors: Update the venerable test-actors
2012-01-20 18:05:53 +00:00
clutter_actor_add_constraint (oh->group, clutter_align_constraint_new (oh->stage, CLUTTER_ALIGN_BOTH, 0.5));
clutter_actor_add_constraint (oh->group, clutter_bind_constraint_new (oh->stage, CLUTTER_BIND_SIZE, 0.0f));
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 21:27:53 +00:00
oh->hand = g_new (ClutterActor*, n_hands);
Remove CloneTexture from the API ClutterClone supercedes ClutterCloneTexture, since it can clone every kind of actor -- including composite ones. This is another "brain surgery with a shotgun" kind of commit: it removes CloneTexture and updates every test case using CloneTexture to ClutterClone. The API fallout is minimal, luckily for us.
2009-01-27 15:18:45 +00:00
interactive/actors: Update the venerable test-actors
2012-01-20 18:05:53 +00:00
oh->stage_width = clutter_actor_get_width (oh->stage);
oh->stage_height = clutter_actor_get_height (oh->stage);
Remove CloneTexture from the API ClutterClone supercedes ClutterCloneTexture, since it can clone every kind of actor -- including composite ones. This is another "brain surgery with a shotgun" kind of commit: it removes CloneTexture and updates every test case using CloneTexture to ClutterClone. The API fallout is minimal, luckily for us.
2009-01-27 15:18:45 +00:00
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 21:27:53 +00:00
for (i = 0; i < n_hands; i++)
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
{
gint x, y, w, h;
if (i == 0)
test-actors: Name all the actors Makes it easier to debug events.
2010-08-26 16:31:32 +00:00
{
oh->hand[i] = real_hand;
clutter_actor_set_name (oh->hand[i], "Real Hand");
}
2006-08-29 Matthew Allum <mallum@openedhand.com> * clutter/clutter-fixed.h: Add basic fixed point utility defines and type. * clutter/Makefile.am: * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-group.c: * clutter/clutter-stage.c: * examples/super-oh.c: (main): Add scale API and functionality. Rework group sizing. Now group size requests have no effect but can be scaled.
2006-08-29 19:09:43 +00:00
else
test-actors: Name all the actors Makes it easier to debug events.
2010-08-26 16:31:32 +00:00
{
oh->hand[i] = clutter_clone_new (real_hand);
clutter_actor_set_name (oh->hand[i], "Clone Hand");
}
Remove CloneTexture from the API ClutterClone supercedes ClutterCloneTexture, since it can clone every kind of actor -- including composite ones. This is another "brain surgery with a shotgun" kind of commit: it removes CloneTexture and updates every test case using CloneTexture to ClutterClone. The API fallout is minimal, luckily for us.
2009-01-27 15:18:45 +00:00
[tests] Update test-actors (and clones) The test-actors test (and its clones, test-actor-clone and test-paint-wrapper) was written a long time ago for a different API and has been tweaked to bits. We should probably have something a little bit more complicated, but at least we should not use semantics and coding patterns from Clutter 0.2, otherwise we won't be testing anything except that Clutter 0.2 worked.
2009-06-11 15:23:26 +00:00
clutter_actor_set_reactive (oh->hand[i], TRUE);
Remove CloneTexture from the API ClutterClone supercedes ClutterCloneTexture, since it can clone every kind of actor -- including composite ones. This is another "brain surgery with a shotgun" kind of commit: it removes CloneTexture and updates every test case using CloneTexture to ClutterClone. The API fallout is minimal, luckily for us.
2009-01-27 15:18:45 +00:00
clutter_actor_set_size (oh->hand[i], 200, 213);
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
/* Place around a circle */
Remove CloneTexture from the API ClutterClone supercedes ClutterCloneTexture, since it can clone every kind of actor -- including composite ones. This is another "brain surgery with a shotgun" kind of commit: it removes CloneTexture and updates every test case using CloneTexture to ClutterClone. The API fallout is minimal, luckily for us.
2009-01-27 15:18:45 +00:00
w = clutter_actor_get_width (oh->hand[i]);
h = clutter_actor_get_height (oh->hand[i]);
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
Remove CloneTexture from the API ClutterClone supercedes ClutterCloneTexture, since it can clone every kind of actor -- including composite ones. This is another "brain surgery with a shotgun" kind of commit: it removes CloneTexture and updates every test case using CloneTexture to ClutterClone. The API fallout is minimal, luckily for us.
2009-01-27 15:18:45 +00:00
x = oh->stage_width / 2
+ oh->radius
* cos (i * G_PI / (n_hands / 2))
2008-02-07 Tomas Frydrych <tf@openedhand.com> * tests/test-actors.c: Reverted previous change.
2008-02-07 17:04:43 +00:00
- w / 2;
Remove CloneTexture from the API ClutterClone supercedes ClutterCloneTexture, since it can clone every kind of actor -- including composite ones. This is another "brain surgery with a shotgun" kind of commit: it removes CloneTexture and updates every test case using CloneTexture to ClutterClone. The API fallout is minimal, luckily for us.
2009-01-27 15:18:45 +00:00
y = oh->stage_height / 2
+ oh->radius
* sin (i * G_PI / (n_hands / 2))
2008-02-07 Tomas Frydrych <tf@openedhand.com> * tests/test-actors.c: Reverted previous change.
2008-02-07 17:04:43 +00:00
- h / 2;
clutter_actor_set_position (oh->hand[i], x, y);
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
2008-02-07 Neil J. Patel <njp@o-hand.com> * tests/test-actors.c: (frame_cb), (main): Changed set_anchor to move_anchor. Changed clutter_actor_rotate x & y values to 0,0. Switched on scaling because it seems to work without drifting.
2008-02-07 15:01:03 +00:00
clutter_actor_move_anchor_point_from_gravity (oh->hand[i],
2007-01-30 Tomas Frydrych <tf@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: Added new clutter_actor_move_anchor_point_ API. * clutter/clutter-behaviour-scale.c: * clutter/clutter-behaviour-scale.h: * clutter/clutter-effect.c: * clutter/clutter-effect.h: * tests/test-actors.c: * tests/test-effects.c: * tests/test-scale.c: Removed gravity from ClutterBehaviourScale.
2008-01-30 12:13:26 +00:00
CLUTTER_GRAVITY_CENTER);
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
/* Add to our group group */
2007-06-07 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-container.[ch]: Add a generic actor container interface, for actors to implement without subclassing ClutterGroup. * clutter/clutter-group.[ch]: Make ClutterGroup implement the ClutterContainer interface, and deprecate the colliding methods. * clutter/clutter-layout.[ch]: Add extended layout interface. Actors and containers requiring or honouring complex layout management should implement this interface and provide at least one of the available layout types: width for height, height for width, natural size, iterative size request. * clutter/clutter-label.c: A ClutterLabel requires height for width layout management, so it implements the ClutterLayout interface. * clutter/Makefile.am: Add new files to the build. * tests/*.c: * examples/*.c: Update tests and examples code to use the new ClutterContainer API instead of ClutterGroup.
2007-06-07 14:41:35 +00:00
clutter_container_add_actor (CLUTTER_CONTAINER (oh->group), oh->hand[i]);
2006-10-03 Matthew Allum <mallum@openedhand.com> * configure.ac: * clutter/Makefile.am: * clutter/clutter-actor.c: * clutter/clutter-label.c: * clutter/clutter-label.h: * clutter/pango/Makefile.am: * clutter/pango/pangoclutter-font.c: * clutter/pango/pangoclutter-fontmap.c: * clutter/pango/pangoclutter-private.h: * clutter/pango/pangoclutter-render.c: * clutter/pango/pangoclutter.h: Add initial rough new pango renderer and clutter-label. * examples/super-oh.c: * examples/test.c: Minor fixups
2006-10-03 21:59:30 +00:00
[tests] Update test-actors (and clones) The test-actors test (and its clones, test-actor-clone and test-paint-wrapper) was written a long time ago for a different API and has been tweaked to bits. We should probably have something a little bit more complicated, but at least we should not use semantics and coding patterns from Clutter 0.2, otherwise we won't be testing anything except that Clutter 0.2 worked.
2009-06-11 15:23:26 +00:00
g_signal_connect (oh->hand[i], "button-press-event",
G_CALLBACK (on_button_press_event),
oh);
test-actors: Clear the state on destroy The venerable test-actors used the default stage, which meant that closing the window just stopped the main loop but left the scene intact. This does not happen with a normal stage created through clutter_stage_new(). The change happened in 6ed6b2a54b5c8f44496399057ad5e58771bfc620, in an unhelpfully named commit that was just supposed to switch to static colors. My bad. Anyway, the change led to some assertion failures when closing the stage in the middle of an animation. The correct thing to do when using an actor from another object (a Timeline ::new-frame callback in this case) without owning the instance is to connect to the ::destroy signal and clean up the pointer to avoid calling an invalid actor.
2011-02-09 13:05:12 +00:00
g_signal_connect (oh->hand[i], "destroy",
G_CALLBACK (on_hand_destroy),
oh);
2007-06-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-group.c: * clutter/clutter-label.c: * clutter/egl/clutter-stage-egl.c: * clutter/glx/clutter-stage-glx.c: * clutter/sdl/clutter-stage-sdl.c: Rename clutter_actor_allocate_coords -> clutter_actor_query_coords Change repaints to G_PRIORITY_DEFAULT + 10. (timelines are G_PRIORITY_DEFAULT + 30, events G_PRIORITY_DEFAULT) * clutter/glx/clutter-event-glx.c: Handle shift modifier in keycode -> keysym translation. * tests/test-actors.c: Remove (broken) screen saver code. Add scaling behaviour, clean code a little
2007-06-13 23:24:59 +00:00
if (i % 2)
Remove CloneTexture from the API ClutterClone supercedes ClutterCloneTexture, since it can clone every kind of actor -- including composite ones. This is another "brain surgery with a shotgun" kind of commit: it removes CloneTexture and updates every test case using CloneTexture to ClutterClone. The API fallout is minimal, luckily for us.
2009-01-27 15:18:45 +00:00
clutter_behaviour_apply (oh->scaler_1, oh->hand[i]);
2007-06-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-group.c: * clutter/clutter-label.c: * clutter/egl/clutter-stage-egl.c: * clutter/glx/clutter-stage-glx.c: * clutter/sdl/clutter-stage-sdl.c: Rename clutter_actor_allocate_coords -> clutter_actor_query_coords Change repaints to G_PRIORITY_DEFAULT + 10. (timelines are G_PRIORITY_DEFAULT + 30, events G_PRIORITY_DEFAULT) * clutter/glx/clutter-event-glx.c: Handle shift modifier in keycode -> keysym translation. * tests/test-actors.c: Remove (broken) screen saver code. Add scaling behaviour, clean code a little
2007-06-13 23:24:59 +00:00
else
Remove CloneTexture from the API ClutterClone supercedes ClutterCloneTexture, since it can clone every kind of actor -- including composite ones. This is another "brain surgery with a shotgun" kind of commit: it removes CloneTexture and updates every test case using CloneTexture to ClutterClone. The API fallout is minimal, luckily for us.
2009-01-27 15:18:45 +00:00
clutter_behaviour_apply (oh->scaler_2, oh->hand[i]);
2007-06-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-group.c: * clutter/clutter-label.c: * clutter/egl/clutter-stage-egl.c: * clutter/glx/clutter-stage-glx.c: * clutter/sdl/clutter-stage-sdl.c: Rename clutter_actor_allocate_coords -> clutter_actor_query_coords Change repaints to G_PRIORITY_DEFAULT + 10. (timelines are G_PRIORITY_DEFAULT + 30, events G_PRIORITY_DEFAULT) * clutter/glx/clutter-event-glx.c: Handle shift modifier in keycode -> keysym translation. * tests/test-actors.c: Remove (broken) screen saver code. Add scaling behaviour, clean code a little
2007-06-13 23:24:59 +00:00
}
2006-08-29 Matthew Allum <mallum@openedhand.com> * clutter/clutter-fixed.h: Add basic fixed point utility defines and type. * clutter/Makefile.am: * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-group.c: * clutter/clutter-stage.c: * examples/super-oh.c: (main): Add scale API and functionality. Rework group sizing. Now group size requests have no effect but can be scaled.
2006-08-29 19:09:43 +00:00
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
/* Add the group to the stage */
interactive/actors: Update the venerable test-actors
2012-01-20 18:05:53 +00:00
clutter_container_add_actor (CLUTTER_CONTAINER (oh->stage), oh->group);
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
Remove CloneTexture from the API ClutterClone supercedes ClutterCloneTexture, since it can clone every kind of actor -- including composite ones. This is another "brain surgery with a shotgun" kind of commit: it removes CloneTexture and updates every test case using CloneTexture to ClutterClone. The API fallout is minimal, luckily for us.
2009-01-27 15:18:45 +00:00
/* Show everying */
interactive/actors: Update the venerable test-actors
2012-01-20 18:05:53 +00:00
clutter_actor_show (oh->stage);
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
interactive/actors: Update the venerable test-actors
2012-01-20 18:05:53 +00:00
g_signal_connect (oh->stage, "key-release-event",
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 13:38:31 +00:00
G_CALLBACK (input_cb),
oh);
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
/* and start it */
Remove CloneTexture from the API ClutterClone supercedes ClutterCloneTexture, since it can clone every kind of actor -- including composite ones. This is another "brain surgery with a shotgun" kind of commit: it removes CloneTexture and updates every test case using CloneTexture to ClutterClone. The API fallout is minimal, luckily for us.
2009-01-27 15:18:45 +00:00
clutter_timeline_start (oh->timeline);
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
clutter_main ();
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
test-actors: Clear the state on destroy The venerable test-actors used the default stage, which meant that closing the window just stopped the main loop but left the scene intact. This does not happen with a normal stage created through clutter_stage_new(). The change happened in 6ed6b2a54b5c8f44496399057ad5e58771bfc620, in an unhelpfully named commit that was just supposed to switch to static colors. My bad. Anyway, the change led to some assertion failures when closing the stage in the middle of an animation. The correct thing to do when using an actor from another object (a Timeline ::new-frame callback in this case) without owning the instance is to connect to the ::destroy signal and clean up the pointer to avoid calling an invalid actor.
2011-02-09 13:05:12 +00:00
clutter_timeline_stop (oh->timeline);
Remove CloneTexture from the API ClutterClone supercedes ClutterCloneTexture, since it can clone every kind of actor -- including composite ones. This is another "brain surgery with a shotgun" kind of commit: it removes CloneTexture and updates every test case using CloneTexture to ClutterClone. The API fallout is minimal, luckily for us.
2009-01-27 15:18:45 +00: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 21:27:53 +00:00
g_free (oh->hand);
g_free (oh);
Remove CloneTexture from the API ClutterClone supercedes ClutterCloneTexture, since it can clone every kind of actor -- including composite ones. This is another "brain surgery with a shotgun" kind of commit: it removes CloneTexture and updates every test case using CloneTexture to ClutterClone. The API fallout is minimal, luckily for us.
2009-01-27 15:18:45 +00:00
return EXIT_SUCCESS;
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
}
Reference in New Issue Copy Permalink