commit b776f6b4fbe05b493d0b36619c95ece5443c443b Author: Emmanuele Bassi Date: Wed Sep 15 16:12:39 2010 +0100 Release Clutter 1.3.14 (developers snapshot) NEWS | 24 +++- configure.ac | 2 +- po/clutter-1.0.pot | 470 ++++++++++++++++++++++++------------------------ po/de.po | 501 +++++++++++++++++++++++++++------------------------- po/it.po | 468 ++++++++++++++++++++++++------------------------ po/pl.po | 468 ++++++++++++++++++++++++------------------------ po/zh_CN.po | 468 ++++++++++++++++++++++++------------------------ 7 files changed, 1218 insertions(+), 1183 deletions(-) commit 037a1b82cc19752d44121a530fac3516a6c25c71 Author: Emmanuele Bassi Date: Wed Sep 15 15:56:42 2010 +0100 build: Add cogl-debug-options.h clutter/cogl/cogl/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 7d2706e8ba09444572d9dcd122b466ff020849f9 Author: Emmanuele Bassi Date: Wed Sep 15 15:35:05 2010 +0100 docs: Fix the name of the parameters clutter/clutter-drag-action.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 73385414524fe03771d135cc3bd94a37b35def4b Author: Neil Roberts Date: Wed Sep 15 14:39:05 2010 +0100 cogl: Make cogl_util_next_p2 internal and fix the documentation cogl_util_next_p2 is declared in cogl-util.h which is a private header so it shouldn't be possible for an application to use it. It's probably not a function we'd like to export from Cogl so it seems better to keep it private. This patch renames it to _cogl_util_next_p2 so that it won't be exported from the shared library. The documentation for the function is also slightly wrong because it stated that the function returned the next power greater than 'a'. However the code would actually return 'a' if it's already a power of two. I think the actual behaviour is more useful so this patch changes the documentation rather than the code. clutter/cogl/cogl/cogl-texture-2d-sliced.c | 4 ++-- clutter/cogl/cogl/cogl-util.c | 11 ++++++----- clutter/cogl/cogl/cogl-util.h | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) commit 42dacf97f82ac506613db662a676df92a9cc4d3a Author: Neil Roberts Date: Wed Sep 15 14:07:30 2010 +0100 cogl-vertex-buffer: Don't always set COGL_MATERIAL_FLUSH_FALLBACK_MASK Previously CoglVertexBuffer would always set the flush options flags to at least contain COGL_MATERIAL_FLUSH_FALLBACK_MASK. The code then later checks whether any flags are set before deciding whether to copy the material to implement the overrides. This means that it would always end up copying the material even if there are no fallback layers. This patch changes it so that it only sets COGL_MATERIAL_FLUSH_FALLBACK_MASK if fallback_layers != 0. clutter/cogl/cogl/cogl-vertex-buffer.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) commit 8cfb158f63a1e1f4af614e17b0198850ff3bdbce Author: Robert Bragg Date: Tue Sep 14 20:25:23 2010 +0100 material-arbfp: fix updating params if sharing progs If a single arbfp program is being shared between multiple CoglMaterials then we need to make sure we update all program.local params when switching between materials. Previously we had a dirty flag to track when combine_constant params were changed but didn't take in to account that different materials sharing the same program may have different combine constants. clutter/cogl/cogl/cogl-material-arbfp.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) commit d87522596d5c2c1001716d6806684e1fa8580109 Author: Robert Bragg Date: Tue Sep 14 18:50:50 2010 +0100 material-arbfp: Another pass at simplifying the code Previously the backend private state was used to either link to an authority material or provide authoritative program state. The mechanism seemed overly complex and felt very fragile. I made a recent comment which added a lot of documentation to make it easier to understand but still it didn't feel very elegant. This patch takes a slightly different approach; we now have a ref-counted ArbfpProgramState object which encapsulates a single ARBfp program and the backend private state now just has a single member which is a pointer to one of these arbfp_program_state objects. We no longer need to cache pointers to our arbfp-authority and so we can get rid of a lot of awkward code that ensured these pointers were updated/invalidated at the right times. The program state objects are not tightly bound to a material so it will also allow us to later implement a cache mechanism that lets us share state outside a materials ancestry. This may help to optimize code not following the recommendations of deriving materials from templates, avoiding one-shot materials and not repeatedly modifying materials because even if a material's ancestry doesn't naturally lead us to shareable state we can fallback to searching for shareable state using central hash tables. clutter/cogl/cogl/cogl-material-arbfp.c | 600 +++++++++++++------------------ 1 files changed, 256 insertions(+), 344 deletions(-) commit f6dc3ddcbaf919e1ddcc218b6a1b7b570f4ff829 Author: Robert Bragg Date: Mon Jul 5 21:33:26 2010 +0100 material: Adds experimental cogl_material_foreach_layer API This adds a way to iterate the layer indices of the given material since cogl_material_get_layers has been deprecated. The user provides a callback to be called once for each layer. Because modification of layers in the callback may potentially invalidate any number of the internal CoglMaterialLayer structures and invalidate the material's layer cache this should be more robust than cogl_material_get_layers() which used to return a const GList * pointing directly to internal state. clutter/cogl/cogl/cogl-material-arbfp.c | 12 ++-- clutter/cogl/cogl/cogl-material-opengl.c | 18 +++--- clutter/cogl/cogl/cogl-material-private.h | 10 ++-- clutter/cogl/cogl/cogl-material.c | 108 ++++++++++++++++++++--------- clutter/cogl/cogl/cogl-material.h | 33 +++++++++ 5 files changed, 129 insertions(+), 52 deletions(-) commit d5eebedaa3c9e4ee54c7efffefd195c2e012c4d9 Author: Robert Bragg Date: Tue Sep 14 12:13:30 2010 +0100 material: don't declare backend vtables in headers This fixes the material backends to declare their constant vtable in the c file with a corresponding extern declaration in the header. This should fix complaints about duplicate symbols seen on OSX. clutter/cogl/cogl/cogl-material-arbfp-private.h | 2 +- clutter/cogl/cogl/cogl-material-arbfp.c | 2 ++ clutter/cogl/cogl/cogl-material-fixed-private.h | 2 +- clutter/cogl/cogl/cogl-material-fixed.c | 2 ++ clutter/cogl/cogl/cogl-material-glsl-private.h | 2 +- clutter/cogl/cogl/cogl-material-glsl.c | 2 ++ 6 files changed, 9 insertions(+), 3 deletions(-) commit 5583d9c12eb7b042a400b2d0e77f88fb06a414aa Author: Robert Bragg Date: Tue Sep 14 00:33:46 2010 +0100 material-arbfp: don't recompile for constant changes Instead of lazily incorporating combine constants as arbfp PARAM constants in the source directly we now use program.local parameters instead so we can avoid repeating codegen if a material's combine constant is updated. This should be a big win for applications animating a constant used for example in an animated interpolation, such as gnome-shell. http://bugzilla.clutter-project.org/show_bug.cgi?id=2280 clutter/cogl/cogl/cogl-material-arbfp.c | 68 ++++++++++++++++++++---------- 1 files changed, 45 insertions(+), 23 deletions(-) commit 2815cf471972cefded669bd4596d46f91178a049 Author: Robert Bragg Date: Tue Sep 14 00:27:57 2010 +0100 material-arbfp: don't redo codegen for texture changes This makes it so we don't consider LAYER_STATE_TEXTURE changes to affect the arbfp code. This should avoid a lot of unneeded passes of code generation for applications modifying the texture for a layer. clutter/cogl/cogl/cogl-material-arbfp.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) commit 3adeef6604966e4b61a6058eb6ae00629cfcf7c9 Author: Robert Bragg Date: Tue Sep 14 00:18:02 2010 +0100 material: make layer/material_pre_changes mutually exclusive This makes it so we only notify backends of either a single material change or a single layer change. Previously all material STATE_LAYERS changes would be followed by a more detailed layer change. For backends that perform code generation for fragment processing they typically need to understand the details of how layers get changed to determine if they need to repeat codegen. It doesn't help them to report a material STATE_LAYERS change for all layer changes since it's so broad, they really need to wait for the layer change to be notified. What does help though is to report a STATE_LAYERS change for a change in material->n_layers because they typically do need to repeat codegen in that case. clutter/cogl/cogl/cogl-material-arbfp.c | 7 +++++++ clutter/cogl/cogl/cogl-material.c | 22 +++++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletions(-) commit 16e9794318b9fe13126b0b19c77a54c4714262a2 Author: Robert Bragg Date: Mon Sep 13 23:52:18 2010 +0100 material-arbfp: fixes for how we track private state This fixes a number of issues relating to how we track the arbfp private state associated with CoglMaterials. At the same time it adds much more extensive code documentation to try and make it a bit more approachable. clutter/cogl/cogl/cogl-material-arbfp.c | 175 +++++++++++++++++++++++++------ 1 files changed, 143 insertions(+), 32 deletions(-) commit a114843f744cacc43a4bed4a7186f1746673f01a Author: Robert Bragg Date: Mon Sep 13 23:05:49 2010 +0100 material: pass material owner for layer pre changes When notifying a backend about a layer being modified we now pass the layers current owner for reference. NB: Although a layer can indirectly be referenced by multiple layers, a layer is considered immutable once it has dependants, so there is only ever one material associated with a layer being modified. Passing the material pointer to the backends layer_pre_change callback can be useful for backends that associate their private state with materials and may need to update that state in response to layer changes. clutter/cogl/cogl/cogl-material-arbfp.c | 11 ++++++++++- clutter/cogl/cogl/cogl-material-private.h | 3 ++- clutter/cogl/cogl/cogl-material.c | 7 ++++--- 3 files changed, 16 insertions(+), 5 deletions(-) commit d9a32f979c7fc2c3e7bd58c29b36208be1fd01c9 Author: Robert Bragg Date: Mon Sep 13 22:56:44 2010 +0100 arbfp: rename get_arbfp_authority clarifying semantics This renames the get_arbfp_authority function to get_arbfp_authority_no_check to clarify that the function doesn't validate that the authority cache is still valid by looking at the age of the referenced material. The function should only be used when we *know* the cache has already been checked. clutter/cogl/cogl/cogl-material-arbfp.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) commit ed1123a06b6afe3d98342f2550cb6f5cd248a578 Author: Robert Bragg Date: Mon Sep 13 21:26:31 2010 +0100 material: track if material change is layer change We now pass a boolean to _cogl_material_pre_change_notify to know when a material change is as a result of a layer change. We plan to use this information to avoid notifying the backends about material changes if they are as a result of layer changes. This will simplify the handling of state changes in the backends because they can assume that layer and material changes are mutually exclusive. clutter/cogl/cogl/cogl-material.c | 52 ++++++++++++++++++++---------------- 1 files changed, 29 insertions(+), 23 deletions(-) commit 53acf4d1b0ad372205c1b8f1dcecfef2777d13d5 Author: Robert Bragg Date: Mon Sep 13 21:21:09 2010 +0100 material: Adds _get_layer_combine_constant API This adds an internal _cogl_material_get_layer_combine_constant function so we can query the current layer combine constant back. We should probably make this a public property getter, but for now we just need this so we can read the constant in the arbfp backend. clutter/cogl/cogl/cogl-material-private.h | 5 +++++ clutter/cogl/cogl/cogl-material.c | 26 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) commit 7f95015c6d0f7e1652b88d8e534cee323eb408f4 Author: Robert Bragg Date: Mon Sep 13 21:17:30 2010 +0100 material: track unit state with arbfp private state We are going to start tracking more per-texture unit state with arbfp private state so this adds an internal UnitState type and we allocate an array of these when setting up a new private state structure. The first thing that has been moved into this is the sampled boolean to know when a particular texture unit gets sampled from in the generated arbfp code. clutter/cogl/cogl/cogl-material-arbfp.c | 36 +++++++++++++++++++++++------- 1 files changed, 27 insertions(+), 9 deletions(-) commit 98516061c328fd4306b2059cd6bc7d443d4900a3 Author: Emmanuele Bassi Date: Wed Sep 15 11:56:59 2010 +0100 Enumeration value should be on the same line The glib-mkenums script is not clever enough to deal with FLAGS_VALUE = FLAGS_A | FLAGS_B And since this breaks the enumeration GType and the introspection data, we cannot really wait for it to be fixed. See: https://bugzilla.gnome.org/show_bug.cgi?id=629741 http://bugzilla.clutter-project.org/show_bug.cgi?id=2238 clutter/cogl/cogl/cogl-buffer.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit d45c1671d12ad056362e7fb39a0ca8ca9a981660 Author: Robert Bragg Date: Wed Sep 1 15:15:20 2010 +0100 cogl-framebuffer: fix leak when popping framebuffer We were using g_slist_remove_link instead of g_slist_delete_link resulting in a memory leak. Thanks to Simon Lanzmich for reporting this bug. clutter/cogl/cogl/cogl-framebuffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 88023d438d3124792ba58ad624ba537b27568528 Author: Robert Bragg Date: Mon Aug 16 21:11:42 2010 +0100 Initialize the cogl uprof state in cogl_create_context This avoids the use of of gcc constructor and destructor attributes to initialize the cogl uprof context and optionally print a cogl uprof report at app exit. We now initialize the uprof context in cogl_context_create instead. clutter/cogl/cogl/cogl-context.c | 17 +++++++++++++++++ clutter/cogl/cogl/cogl-profile.c | 30 ++++++++++++++++-------------- clutter/cogl/cogl/cogl-profile.h | 3 +++ 3 files changed, 36 insertions(+), 14 deletions(-) commit d9ee3be835465650ea474b971f028b49321ca7e2 Author: Robert Bragg Date: Mon Jul 26 15:21:18 2010 +0100 journal: provide more detailed uprof instrumentation This adds more timing around key stages of the journal flushing process. clutter/cogl/cogl/cogl-journal.c | 39 ++++++++++++++++++++++++++++++++++++ clutter/cogl/cogl/cogl-material.c | 40 +++++++++++++++++++++++++----------- 2 files changed, 67 insertions(+), 12 deletions(-) commit fb7bf9ce0231ee4f54675ebe71b01b5e4bf98bc5 Author: Robert Bragg Date: Mon Jun 21 15:36:46 2010 +0100 profile: Update to uprof-0.3 dep for --enable-profile When building with --enable-profile we now depend on the uprof-0.3 developer release which brings a few improvements: » It lets us "fix" how we initialize uprof so that instead of using a shared object constructor/destructor (which was a hack used when first adding uprof support to Clutter) we can now initialize as part of clutter's normal initialization code. As a side note though, I found that the way Clutter initializes has some quite serious problems whenever it involves GOptionGroups. It is not able to guarantee the initialization of dependencies like uprof and Cogl. For this reason we still use the contructor/destructor approach to initialize uprof in Cogl. » uprof-0.3 provides a better API for adding custom columns when reporting timer and counter statistics which lets us remove quite a lot of manual report generation code in clutter-profile.c. » uprof-0.3 provides a shared context for tracking mainloop timer statistics. This means any mainloop based library following the same "Mainloop" timer naming convention can use the shared context and no matter who ends up owning the final mainloop the statistics will always be in the same place. This allows profiling of Clutter with an external mainloop such as with the Mutter compositor. » uprof-0.3 can export statistics over dbus and comes with an ncurses based ui to vizualize timer and counter stats live. The latest version of uprof can be cloned from: git://github.com/rib/UProf.git README | 2 +- clutter/clutter-debug.h | 65 ++++--- clutter/clutter-main.c | 45 +++- clutter/clutter-profile.c | 345 ++++++++++++++++++++------------ clutter/clutter-profile.h | 8 + clutter/cogl/cogl/cogl-debug-options.h | 145 +++++++++++++ clutter/cogl/cogl/cogl-debug.c | 37 +--- clutter/cogl/cogl/cogl-debug.h | 18 +- clutter/cogl/cogl/cogl-profile.c | 48 +++++ clutter/cogl/cogl/cogl-profile.h | 4 + clutter/cogl/cogl/cogl-texture-3d.c | 1 + configure.ac | 2 +- 12 files changed, 514 insertions(+), 206 deletions(-) commit a45f67bbdcd8cb53c2daebd11acebd906647eda3 Author: Neil Roberts Date: Mon Sep 6 17:18:11 2010 +0100 cogl-framebuffer: Clear the renderbuffer list on failure When try_creating_fbo fails it deletes any intermediate render buffers that were created. However it doesn't clear the list so I think if it failed a second time it would try to delete the render buffers again. This could potentially cause problems if a subsequent fbo is created because the destructor for the original might delete the renderbuffers of the new fbo. clutter/cogl/cogl/cogl-framebuffer.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 570fa3f0442d528af8aa50114fc79085c541b661 Author: Robert Bragg Date: Sat Sep 11 02:31:03 2010 +0100 clone: scale src with apply_transform not cogl_scale Since a ClutterClone may be allocated a different size than its source actor we need to apply a scale factor before painting the source actor. We were manually using cogl_scale to do this in clutter_clone_paint but really this kind of thing is best handled in an implementation of the apply_transform virtual so Clutter can be aware of the transform for other purposes, such as input transformations. Also we want to provide an implementation of the get_paint_volume virtual where Clutter will also expect to be able to use the apply_transform virtual to transform the volume into its parent's coordinate space. clutter/clutter-clone.c | 46 ++++++++++++++++++++++++++++++---------------- 1 files changed, 30 insertions(+), 16 deletions(-) commit ad398d583b7b5e2b3e3a0c00eda6b5eb358121d9 Author: Robert Bragg Date: Wed Sep 8 01:41:01 2010 +0100 glx: Mark stage clip initialized even for NULL user clip If a NULL clip is passed to clutter_stage_glx_add_redraw_clip then we update the redraw clip to have width of 0, but we weren't setting stage_glx->initialized_redraw_clip = TRUE. This could result in a full, unclipped stage redraw being reduced to a clipped redraw. clutter/glx/clutter-stage-glx.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) commit 8d2a3d608869ef09aff42db7bc537ae927f8d1c1 Author: Robert Bragg Date: Tue Sep 7 22:02:23 2010 +0100 actor: warn if allocating actor not descending from stage This adds a verbose warning that will be displayed if clutter_actor_allocate is passed an actor that isn't a descendent of a ClutterStage. Layouting should always bubble up from a stage so this condition is likely to indicate a buggy container that allocating a child that it has already unparented. clutter/clutter-actor.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) commit ff4c24f0a498e2922b20160482fa2c60ca8d9c40 Author: Robert Bragg Date: Tue Sep 7 17:00:49 2010 +0100 geometry: Adds a clutter_geometry_intersects API This adds a public function named clutter_geometry_intersects which determines if two geometries intersect or not returning TRUE if so else FALSE. clutter/clutter-actor.c | 26 ++++++++++++++++++++++++++ clutter/clutter-types.h | 8 +++++--- doc/reference/clutter/clutter-sections.txt | 1 + 3 files changed, 32 insertions(+), 3 deletions(-) commit 8a2e164354c36bc817f8d48d630808f00cb9d06f Author: Emmanuele Bassi Date: Mon Aug 16 16:02:53 2010 +0100 actor-box: Correctly clamp to pixel Use ceilf() to round up the right side of the actor's box, and floorf() to round down the left side. clutter/clutter-actor.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit f5f066df9ce7f7de19015371cf8399534661b959 Author: Robert Bragg Date: Tue Sep 7 13:10:55 2010 +0100 Try to clean up how we handle actor transformations When building actor relative transforms, instead of using the matrix stack to combine transformations and making assumptions about what is currently on the stack we now just explicitly initialize an identity matrix and apply transforms to that. This removes the full_vertex_t typedef for internal transformation code and we just use ClutterVertex. ClutterStage now implements apply_transform like any other actor now and the code we had in _cogl_setup_viewport has been moved to the stage's apply_transform instead. ClutterStage now tracks an explicit projection matrix and viewport geometry. The projection matrix is derived from the perspective whenever that changes, and the viewport is updated when the stage gets a new allocation. The SYNC_MATRICES mechanism has been removed in favour of _clutter_stage_dirty_viewport/projection() APIs that get used when switching between multiple stages to ensure cogl has the latest information about the onscreen framebuffer. clutter/clutter-actor.c | 752 +++++++++++------------------------ clutter/clutter-backend.c | 22 +- clutter/clutter-main.c | 28 -- clutter/clutter-private.h | 42 ++- clutter/clutter-stage.c | 288 +++++++++++++- clutter/clutter-texture.c | 18 +- clutter/osx/clutter-stage-osx.c | 7 - clutter/win32/clutter-stage-win32.c | 7 - clutter/x11/clutter-stage-x11.c | 41 +- doc/clutter-actor-invariants.txt | 5 - 10 files changed, 592 insertions(+), 618 deletions(-) commit ab008948cfdde8ca9a9842c2e9000db0d0f3ad49 Author: Robert Bragg Date: Tue Sep 7 11:55:23 2010 +0100 actor: Add _get_stage_internal to clutter-private.h This adds _clutter_actor_get_stage_internal to clutter-private.h since we plan to use it in clutter-offscreen-effect when preparing to redirect an actor offscreen. clutter/clutter-actor.c | 28 +++++++++++++--------------- clutter/clutter-private.h | 1 + 2 files changed, 14 insertions(+), 15 deletions(-) commit 64088ea4de6334e10ad99c0844ffab057f1557ab Merge: 28f28c0 e8e360e Author: Emmanuele Bassi Date: Mon Sep 13 15:51:18 2010 +0100 Merge remote branch 'elliot/cookbook-animations-reuse' * elliot/cookbook-animations-reuse: cookbook: Added a recipe for reusing a complex animation cookbook: Added id for section in "rotating an actor" recipe cookbook: Simplified and clarified example code cookbook: Cleaned up the "animations reuse" example cookbook: Refactored reusable animation example cookbook: Added example for animation reuse recipe commit 28f28c030994621d931a7ed61bd529644947f9c3 Author: Murray Cumming Date: Mon Sep 13 16:16:25 2010 +0200 Remove trailin enum commas, avoiding C++ warnings. http://bugzilla.clutter-project.org/show_bug.cgi?id=2314 clutter/clutter-align-constraint.h | 2 +- clutter/clutter-event.h | 4 ++-- clutter/clutter-types.h | 2 +- clutter/cogl/cogl/cogl-types.h | 2 +- clutter/cogl/cogl/cogl-vertex-buffer.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) commit e8e360eaa7207a677738ce15496499ac7196a5b5 Author: Elliot Smith Date: Mon Sep 13 14:29:37 2010 +0100 cookbook: Added a recipe for reusing a complex animation This recipe explains how to "reuse" the same animation definition for different actors, by creating a new instance of a "rig" (empty container) and animation for the rig each time the animation is required. An actor is then re-parented to the rig and animated using it, rather than being animated directly. JSON is used to define the rig + animator, to make creating new instances of them simpler. The recipe also discusses various caveats around using this approach, rather than directly animating an actor. doc/cookbook/Makefile.am | 1 + doc/cookbook/animations.xml | 378 ++++++++++++++++++++++++++++++ doc/cookbook/videos/animations-reuse.ogv | Bin 0 -> 60837 bytes 3 files changed, 379 insertions(+), 0 deletions(-) commit 6548bee56ca8401d2e9d31e33bf4fcd5a65b92f5 Author: Elliot Smith Date: Mon Sep 13 10:28:16 2010 +0100 cookbook: Added id for section in "rotating an actor" recipe Added an id to a section in the "rotating an actor" recipe, so that it can be referred to from the "reusing an animation" recipe. doc/cookbook/animations.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 82ab00930b63d3860f96ac99da9cdc8128de1aee Author: Elliot Smith Date: Thu Sep 9 12:02:02 2010 +0100 cookbook: Simplified and clarified example code Modified the "animation reuse" sample code to provide a simpler example to explain in the recipe. Also modified variable names to mirror the names used for the previous "complex animation" example and added some more comments, to further simplify and support the recipe. .../examples/animations-reuse-animation.json | 36 ++++--------------- doc/cookbook/examples/animations-reuse-ui.json | 37 +++++++++++++++++--- doc/cookbook/examples/animations-reuse.c | 20 ++++++++-- 3 files changed, 56 insertions(+), 37 deletions(-) commit d7a3e35f46593e04cf8cfe5eca18e3b2c06ff35b Author: Elliot Smith Date: Wed Sep 1 11:18:15 2010 +0100 cookbook: Cleaned up the "animations reuse" example With some help from pippin, moved variable declarations into more sensible positions within their functions, changed a function name, and found a better way to unref a script once its associated actor has been destroyed. .../examples/animations-reuse-animation.json | 1 - doc/cookbook/examples/animations-reuse.c | 30 +++++++++---------- 2 files changed, 14 insertions(+), 17 deletions(-) commit d4190cbf8ce8c667110744976c8cdd52ff3ede81 Author: Elliot Smith Date: Wed Sep 1 10:21:23 2010 +0100 cookbook: Refactored reusable animation example Extracted the animation into its own JSON definition, then create a new script and get the animation each time a rectangle is clicked. Removes the need to reparent onto the background and copy property values to the rectangle after the animation, and generally much cleaner. .../examples/animations-reuse-animation.json | 63 ++++++++++ doc/cookbook/examples/animations-reuse-ui.json | 53 +++++++++ doc/cookbook/examples/animations-reuse.c | 102 ++++++---------- doc/cookbook/examples/animations-reuse.json | 124 -------------------- 4 files changed, 155 insertions(+), 187 deletions(-) commit acc28cf60c482bf56bb298630a9d1b75f350d31b Author: Elliot Smith Date: Tue Aug 31 17:42:37 2010 +0100 cookbook: Added example for animation reuse recipe Added an example showing how to reuse a ClutterAnimator instance to animate multiple actors at different times using an animatable rig, combined with reparenting. doc/cookbook/examples/Makefile.am | 2 + doc/cookbook/examples/animations-reuse.c | 117 +++++++++++++++++++++++++ doc/cookbook/examples/animations-reuse.json | 124 +++++++++++++++++++++++++++ 3 files changed, 243 insertions(+), 0 deletions(-) commit 209bef6f8a4059d8cb7a6b4d3c64d25898f46047 Author: Alejandro Piñeiro Date: Thu Jul 22 13:19:34 2010 +0200 cally: fixing public headers Cally headers were including specific clutter object headers. This caused a problem including cally.h on a external program. http://bugzilla.clutter-project.org/show_bug.cgi?id=2234 clutter/cally/cally-actor.h | 2 +- clutter/cally/cally-clone.h | 2 +- clutter/cally/cally-group.h | 2 +- clutter/cally/cally-rectangle.h | 2 +- clutter/cally/cally-stage.h | 2 +- clutter/cally/cally-text.h | 2 +- clutter/cally/cally-texture.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) commit dec0863f58d7a67791d29cf0e53eb24ea09b222c Author: Emmanuele Bassi Date: Mon Sep 13 11:31:46 2010 +0100 build: Add tesselator to the include paths clutter/cogl/cogl/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 94e2c7a9495e61640f602e01c3d5adff9338affe Author: Emmanuele Bassi Date: Mon Sep 13 02:15:44 2010 +0100 build: Generate ClutterJson in the top directory Instead of doing the shlib trick, build ClutterJson (if needed) inside the top-level clutter/ directory - similar to a non-recursive layout. Hopefully, one day, we'll be able to do this with a real non-recursive layout. clutter/Makefile.am | 35 +++++++++++++++++++++++------------ clutter/json/Makefile.am | 30 ------------------------------ 2 files changed, 23 insertions(+), 42 deletions(-) commit 40af71fad72794af90cf6b11f15e5fa64bed188d Author: Emmanuele Bassi Date: Mon Sep 13 02:01:50 2010 +0100 build: List the units inside a file This avoids trying to run test-conformance -l multiple times. tests/conform/Makefile.am | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) commit c03458a86175075bf7a46d8e58f7e3db5bd74f76 Author: Emmanuele Bassi Date: Mon Sep 13 02:01:21 2010 +0100 build: Remove gir files from dist The introspection data is going to be generated, so it should never be in the dist. clutter/Makefile.am | 4 ++-- clutter/cogl/cogl/Makefile.am | 2 +- clutter/json/Makefile.am | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) commit 64924f0e98ed06924d8968d22e5ee257ee858db1 Author: Emmanuele Bassi Date: Sun Sep 12 19:25:47 2010 +0100 build: Do not build a noinst library for the tesselator Let's try to keep Cogl's build as non-recursive as possible, in the hope that one day we'll be able to make it fully non-recursive along with the rest of Clutter. clutter/cogl/cogl/Makefile.am | 59 +++++++++++++++++++++++++----- clutter/cogl/cogl/tesselator/Makefile.am | 41 --------------------- configure.ac | 1 - 3 files changed, 50 insertions(+), 51 deletions(-) commit 732eecf5c6c097b9f6ede3da376f61504e5cb48c Author: Emmanuele Bassi Date: Fri Sep 10 18:21:45 2010 +0100 cookbook: Use the new CLUTTER_KEY_* symbol constants Instead of the deprecated CLUTTER_* ones. doc/cookbook/events.xml | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) commit f2669df6b5c1c9c45c0694443f6748399d0a181c Author: Emmanuele Bassi Date: Fri Sep 10 18:21:19 2010 +0100 build: Disable deprecated API when building the cookbook examples Make sure we always use the latest API. doc/cookbook/examples/Makefile.am | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 4ee05f8e21db9d2262befdc9d07f462bbd95446d Author: Emmanuele Bassi Date: Fri Sep 10 13:41:49 2010 +0100 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. README | 5 + clutter/Makefile.am | 3 + clutter/clutter-keysyms-compat.h | 2208 +++++++++++++++ clutter/clutter-keysyms-update.pl | 216 ++ clutter/clutter-keysyms.h | 4193 +++++++++++++++------------- clutter/clutter-text.c | 46 +- doc/reference/clutter/Makefile.am | 1 + tests/conform/test-binding-pool.c | 30 +- tests/conform/test-clutter-text.c | 8 +- tests/interactive/Makefile.am | 4 +- tests/interactive/test-actor-clone.c | 4 +- tests/interactive/test-actors.c | 4 +- tests/interactive/test-binding-pool.c | 10 +- tests/interactive/test-box-layout.c | 14 +- tests/interactive/test-clip.c | 9 +- tests/interactive/test-cogl-shader-arbfp.c | 6 +- tests/interactive/test-cogl-shader-glsl.c | 6 +- tests/interactive/test-layout.c | 23 +- tests/interactive/test-paint-wrapper.c | 4 +- tests/interactive/test-pixmap.c | 6 +- tests/interactive/test-text-field.c | 12 +- tests/interactive/test-threads.c | 4 +- 22 files changed, 4725 insertions(+), 2091 deletions(-) commit 1447eff00fe70f16350ee16dd86f5f8758ff3065 Author: Lucas Rocha Date: Fri Sep 10 17:48:12 2010 +0100 introspection: Add full path for the Clutter-1.0 inclusion Signed-off-by: Emmanuele Bassi clutter/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit edb54574fa8ee8aaefd0f7021b7a5310b429f49b Author: Emmanuele Bassi Date: Fri Sep 10 14:27:56 2010 +0100 build: Disable deprecated API when building Clutter Make sure we don't use deprecated API internally by adding CLUTTER_DISABLE_DEPRECATED to the AM_CPPFLAGS. This requires adding -UCLUTTER_DISABLE_DEPRECATED to the introspection scanner CFLAGS, otherwise the deprecated API will never be introspected and the data generated will not be compatible. clutter/Makefile.am | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) commit d76f64a10cdfbfe44f5cf3f35351ae8f3307d7df Author: Emmanuele Bassi Date: Fri Sep 10 14:27:37 2010 +0100 Do not use deprecated API internally clutter/clutter-backend.c | 8 +++++++- clutter/clutter-main.c | 18 ++++++++++++++---- clutter/clutter-text.c | 32 ++++++++++++++++++++++++-------- 3 files changed, 45 insertions(+), 13 deletions(-) commit 0bd18fbcc9f9a01fe24945251a1a3e860b7c80a7 Author: Emmanuele Bassi Date: Fri Sep 10 12:24:37 2010 +0100 Update the NEWS NEWS | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) commit 01362effca53d0a3149e3f81f6374b1440cbe2cd Author: Emmanuele Bassi Date: Fri Sep 10 11:42:11 2010 +0100 actor: Add a method for querying key focus A simple convenience method on Clutter.Actor for checking whether it has key focus assigned on the Stage to which it belongs. clutter/clutter-actor.c | 24 ++++++++++++++++++++++++ clutter/clutter-actor.h | 2 ++ doc/reference/clutter/clutter-sections.txt | 1 + 3 files changed, 27 insertions(+), 0 deletions(-) commit 71a4db613569cd08572db517a045224161ba67d7 Author: Emmanuele Bassi Date: Fri Sep 10 11:18:53 2010 +0100 animation: Allow detaching an animation from an actor When animating an actor through clutter_actor_animate() and friends we might want forcibly detach the animation instance from the actor in order to start a new one - for instance, in response to user interaction. Currently, there is no way to do that except in a very convoluted way, by emitting the ::completed signal and adding a special case in the signal handlers; this is due to the fact that clutter_actor_animate() adds more logic than the one added by clutter_animation_set_object(), so calling set_object(NULL) or unreferencing the animation instance itself won't be enough. The right way to approach this is to add a new method to Clutter.Actor that detaches any eventual Animation currently referencing it. http://bugzilla.clutter-project.org/show_bug.cgi?id=2051 clutter/clutter-animation.c | 53 ++++++++++++++++++++++++++++ clutter/clutter-animation.h | 1 + doc/reference/clutter/clutter-sections.txt | 1 + 3 files changed, 55 insertions(+), 0 deletions(-) commit 3aa2d00c3bf034b478fcc040056c25ef6f46baa0 Author: Colin Walters Date: Thu Sep 9 23:01:40 2010 +0100 introspection: Don't look for installed Cogl-1.0.gir If we're depending on an uninstalled .gir, use --include-uninstalled. We need to explicitly specify Cogl to let the scanner know it's also uninstalled. Signed-off-by: Emmanuele Bassi clutter/Makefile.am | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) commit 5f5369990fec5bfc734604761ed4ea49e78e6aa3 Author: Colin Walters Date: Thu Sep 9 13:32:13 2010 -0400 introspection: Don't look for installed Clutter-1.0.gir If we're depending on an uninstalled .gir, use --include-uninstalled. clutter/Makefile.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 72a4fd9250564a75f9cef89a3070d5d0ab5a5c24 Author: Emmanuele Bassi Date: Thu Sep 9 16:45:51 2010 +0100 po: Update Polish localization po/pl.po | 174 +++++++++++++++++++++++++++++--------------------------------- 1 files changed, 82 insertions(+), 92 deletions(-) commit d86dc377dea38678efa1f8b8e3aa5759f37d01ac Author: Chris Kühl Date: Thu Sep 9 16:41:37 2010 +0200 Added documentation for alpha parameter in Behaviour constructors. http://bugzilla.clutter-project.org/show_bug.cgi?id=2304 Signed-off-by: Emmanuele Bassi clutter/clutter-behaviour-depth.c | 6 +++++- clutter/clutter-behaviour-ellipse.c | 6 +++++- clutter/clutter-behaviour-opacity.c | 10 +++++++--- clutter/clutter-behaviour-path.c | 18 +++++++++++++++--- clutter/clutter-behaviour-rotate.c | 6 +++++- clutter/clutter-behaviour-scale.c | 10 +++++++--- 6 files changed, 44 insertions(+), 12 deletions(-) commit 9e1cd15b48f4e6a9bb6928bf1218e7bea2b1b1ed Author: Neil Roberts Date: Thu Sep 9 12:15:59 2010 +0100 cogl-vertex-buffer: Flush the framebuffer state first Flushing the framebuffer state can cause some drawing to occur if the framebuffer has a clip stack which needs the stencil buffer. This was causing the array pointers set up by enable_state_for_drawing_buffer to get mangled so it would crash when it hits glDrawArrays. This patch moves the framebuffer state flush to before it sets up the array pointers. http://bugzilla.clutter-project.org/show_bug.cgi?id=2297 clutter/cogl/cogl/cogl-vertex-buffer.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) commit 0e325404aa50fcca400d0cb8020a36bcd81f4c37 Author: Emmanuele Bassi Date: Thu Sep 9 11:58:03 2010 +0100 build: Allow using gettext 0.17 This requires some autotools magic when setting up the environment through autogen.sh, because autoreconf does not do the right thing by default. The correct order for setting up localization is: ‣ autopoint ‣ aclocal ‣ ... otherwise aclocal will copy the system's gettext.m4 instead of honouring the version we specified with AM_GNU_GETTEXT_VERSION in configure.ac. autogen.sh | 124 +++++++++++++++++++++++++++++++++++++++++++++++++-------- configure.ac | 2 +- 2 files changed, 107 insertions(+), 19 deletions(-) commit cfab64c1db609d7fd4840dd83a161af7527c17ab Author: Emmanuele Bassi Date: Thu Sep 9 11:39:56 2010 +0100 po: Update German localization po/de.po | 325 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 166 insertions(+), 159 deletions(-) commit bcf20955d32b580195f45bf507a5970003f464cf Author: Robert Bragg Date: Wed Sep 8 23:33:45 2010 +0100 ClutterX11TexturePixmap: Fix unbalanced error trapping I think this is what commit 2cf140550635 intended to do since it specifically mentioned cleaning up the trap in clutter_x11_texture_pixmap_set_pixmap, but although it moved the untrap to only be done in the case where Pixmap != None it left the position of the trap itself unchanged. This meant the error trapping wouldn't be balanced if pixmap == None since the untrap wouldn't be done. We now only trap and untrap around the XGetGeometry call done when pixmap != None. http://bugzilla.clutter-project.org/show_bug.cgi?id=2303 clutter/x11/clutter-x11-texture-pixmap.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit 089a20e79d3f542ad74f34d7a318ef19718bdc40 Author: Emmanuele Bassi Date: Wed Sep 8 18:27:12 2010 +0100 build: Add ClutterX11 introspection generation clutter/Makefile.am | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) commit 32ea9702e664db8e0601362d2d1aae6c726f3c63 Author: Emmanuele Bassi Date: Wed Sep 8 17:50:38 2010 +0100 build: Add XML files to the ignore blacklist tests/conform/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit f8bd45dbcea77e19a6a7e37edad535f6d3edd7cd Author: Emmanuele Bassi Date: Wed Sep 8 17:39:04 2010 +0100 x11-texture-pixmap: Do not go through g_object_get() The pixmap width and height are stored in our own private data structure; going through g_object_get() is pointless overhead. clutter/x11/clutter-x11-texture-pixmap.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) commit 2cf14055063568038be607bd8f7ce3eea2285475 Author: Owen W. Taylor Date: Wed Sep 8 11:34:58 2010 -0400 Clean up CoglTexturePixmapX11 first With currently distributed versions of Mesa, calling XFreePixmap() before glxDestroyPixmap() will cause an X error from DRI. So, we need to make sure that we get rid of the CoglTexturePixmapX11 before we XFreePixmap(). clutter_x11_texture_pixmap_dispose(): Call clutter_x11_texture_pixmap_set_pixmap() instead of using XFreePixmap directly so that we leverage the text-clearing hack and destroy things in the right order. clutter_x11_texture_pixmap_set_pixmap(): Don't do a pointless roundtrip and trap a pointless error when setting pixmap to None. clutter_x11_texture_pixmap_set_pixmap(): Free damage resources when we are setting Pixmap to None. clutter_x11_texture_pixmap_set_window(): When setting a new window or setting the window to None, immedediately call cluter_x11_texture_pixmap_set_pixmap(). This means that set_window(None) immediately will free any referenced resources related to the window. http://bugzilla.clutter-project.org/show_bug.cgi?id=2303 clutter/x11/clutter-x11-texture-pixmap.c | 46 +++++++++++++++-------------- 1 files changed, 24 insertions(+), 22 deletions(-) commit ca8db4c2ee16e8c711baa40803c3dcd75ca2f382 Author: Emmanuele Bassi Date: Wed Sep 8 17:04:21 2010 +0100 Add caller-allocates annotations For ClutterColor, ClutterUnits, ClutterInterval and the Perspective accessor in ClutterStage. clutter/clutter-color.c | 18 +++++++++--------- clutter/clutter-fixed.c | 2 +- clutter/clutter-interval.c | 6 +++--- clutter/clutter-stage.c | 3 ++- clutter/clutter-units.c | 23 ++++++++++++----------- 5 files changed, 27 insertions(+), 25 deletions(-) commit 8a5686d83503d9b9a5c8e083d8613a8e9d1cf1f5 Author: Emmanuele Bassi Date: Wed Sep 8 16:41:47 2010 +0100 Further annotation fixes clutter/clutter-actor.c | 10 +++++----- clutter/clutter-animator.c | 2 +- clutter/clutter-behaviour.c | 2 +- clutter/clutter-color.c | 8 ++++---- clutter/clutter-container.c | 2 +- clutter/clutter-device-manager.c | 4 ++-- clutter/clutter-frame-source.c | 4 +++- clutter/clutter-layout-manager.c | 6 +++--- clutter/clutter-list-model.c | 2 +- clutter/clutter-main.c | 12 +++++++++--- clutter/clutter-model.c | 4 ++-- clutter/clutter-path.c | 3 ++- clutter/clutter-score.c | 10 +++++----- clutter/clutter-script.c | 7 ++++--- clutter/clutter-stage-manager.c | 4 ++-- clutter/clutter-stage-window.h | 16 ++++++++++++++++ clutter/clutter-state.c | 2 +- clutter/clutter-timeout-pool.h | 4 ++++ 18 files changed, 66 insertions(+), 36 deletions(-) commit f1c44a27a17c66c80ac92f7365b7fcc85c9f0847 Author: Owen W. Taylor Date: Wed Sep 8 10:37:58 2010 -0400 introspection: Add missing (out) annotations Comprehensively add (out) annotations to functions parameters returning int/float/double. Not handled here: structure out returns like ClutterColor or ClutterPerspective or GValue that should get (out caller-allocates). Not handled here: Cogl http://bugzilla.clutter-project.org/show_bug.cgi?id=2302 clutter/clutter-actor.c | 2 +- clutter/clutter-behaviour-depth.c | 4 ++-- clutter/clutter-behaviour-ellipse.c | 10 +++++----- clutter/clutter-behaviour-opacity.c | 4 ++-- clutter/clutter-behaviour-rotate.c | 6 +++--- clutter/clutter-behaviour-scale.c | 8 ++++---- clutter/clutter-cairo-texture.c | 4 ++-- clutter/clutter-color.c | 6 +++--- clutter/clutter-script-parser.c | 2 +- clutter/clutter-text.c | 6 +++--- 10 files changed, 26 insertions(+), 26 deletions(-) commit e4870ebaf461170e78f2ed6787beda541501d561 Author: Emmanuele Bassi Date: Wed Sep 8 15:15:57 2010 +0100 Constify Event accessors and copy method This is still C, but at least we can get some sort of safety net when using the API correctly. clutter/clutter-backend.c | 6 ++-- clutter/clutter-backend.h | 10 ++++---- clutter/clutter-event.c | 48 ++++++++++++++++++------------------ clutter/clutter-event.h | 48 ++++++++++++++++++------------------ clutter/clutter-private.h | 10 ++++---- clutter/x11/clutter-backend-x11.c | 6 ++-- 6 files changed, 64 insertions(+), 64 deletions(-) commit 8fb4c7b9a9f58a2137dfe981fac0001d4c64505c Author: Emmanuele Bassi Date: Wed Sep 8 14:48:40 2010 +0100 po: Rename the POT file configure.ac | 2 +- po/Makevars | 2 +- po/clutter-1.0.pot | 1828 ++++++++++++++++++++++++++++++++++++++++++++++++++++ po/clutter.pot | 1828 ---------------------------------------------------- 4 files changed, 1830 insertions(+), 1830 deletions(-) commit 144da2ae3b49715ea72052a3722e03872694aa92 Author: Emmanuele Bassi Date: Wed Sep 8 14:40:52 2010 +0100 po: Add clutter.pot to the repository Since we're not using intltool, and since we need to let people on Transifex generate their translations, we need to add the POT file to the repository. .gitignore | 1 - po/clutter.pot | 1828 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1828 insertions(+), 1 deletions(-) commit 82bef432ed095b031408d858c00bffc140b21ed1 Author: ElleUca Date: Wed Sep 8 12:44:43 2010 +0100 po: Add italian translation po/it.po | 1837 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 1837 insertions(+), 0 deletions(-) commit 33b0d5ddb5d6b056db8371717d1600ce7572a095 Author: Emmanuele Bassi Date: Wed Sep 8 12:25:25 2010 +0100 po: Update the translation files We are finally able to add the properties nicks and blurbs to the list of translatable strings, for UI builders to use. This means bumping the list of strings from 20-ish to a whopping 400. Whoopsie. po/de.po | 1852 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- po/pl.po | 1849 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- po/zh_CN.po | 1850 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 5369 insertions(+), 182 deletions(-) commit 948da3728d770c2c328286f3263322215aa76eec Author: Emmanuele Bassi Date: Wed Sep 8 12:25:02 2010 +0100 Add more /po files to the ignore list .gitignore | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 94c17dba51d9836c0add5f0b4bbd5b2306bfda8a Author: Emmanuele Bassi Date: Wed Sep 8 12:23:50 2010 +0100 build: Update autogen.sh Remove the fix-ups for shave and gtk-doc with libtool 1.5: we don't use shave any more, and we require libtool 2.2. Also remove the unnecessary autopoint: we use autoreconf, which calls it automatically. autogen.sh | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) commit dfca349bbe8219d03db16cf7bc2d7e39cd4275f2 Author: Emmanuele Bassi Date: Wed Sep 8 12:22:58 2010 +0100 build: Bump gettext version Apparently, gettext can only work with the same exact version it's autogenerated from. configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit dc8c7be7f0680095e6e507f05e01939d161e84e5 Author: Emmanuele Bassi Date: Wed Sep 8 11:56:06 2010 +0100 Ignore more files under /po .gitignore | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) commit 4fedbad24e4ec434236b7b6c7f73421bd59c2130 Author: Emmanuele Bassi Date: Wed Sep 8 11:53:07 2010 +0100 Update ignore files for m4 macros .gitignore | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit a9e29e6fbafd073e78e19a74577b0d3d631a2214 Author: Emmanuele Bassi Date: Wed Sep 8 11:50:09 2010 +0100 Add Makevars po/Makevars | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) commit 98cac30d82299b3739f3801f71b5e2e931eb2e8d Author: Javier Jardón Date: Wed Sep 8 00:35:06 2010 +0200 build: Use upstream gettext instead the glib one Fixes http://bugzilla.clutter-project.org/show_bug.cgi?id=2300 autogen.sh | 2 + clutter/Makefile.am | 1 + configure.ac | 5 +- po/Makefile.in.in | 264 --------------------------------------------------- 4 files changed, 6 insertions(+), 266 deletions(-) commit c4ca75350f54160482db2081219b9d8a77820f84 Author: Owen W. Taylor Date: Tue Sep 7 19:56:42 2010 -0400 introspection: Fix annotation for clutter_container_get_children() (element-type) should have a full name like Clutter.Actor rather than a non-namespaced name like Actor. gobject-introspection has become more strict about this with the recent scanner rewrite. http://bugzilla.clutter-project.org/show_bug.cgi?id=2301 clutter/clutter-container.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 5e57539f3bdcb4d6004c3bcc9177706b175c500d Author: Emmanuele Bassi Date: Tue Sep 7 21:10:40 2010 +0100 build: Update introspection.m4 build/autotools/introspection.m4 | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) commit e678c746daf0ccd740328cae01feb5efa53f012c Author: Emmanuele Bassi Date: Tue Sep 7 16:17:51 2010 +0100 build: Add escaping in AS_IF() Based on a patch by: Owen W. Taylor configure.ac | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) commit 287b3ba542080dd4466060d05ac153dbec8dcde6 Author: Emmanuele Bassi Date: Tue Sep 7 15:23:35 2010 +0100 Makefile.am.enums: Forgot an AM_V_GEN build/autotools/Makefile.am.enums | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 368b24b42054599e36c1e5125f84a2d032fd3377 Author: Emmanuele Bassi Date: Tue Sep 7 14:47:59 2010 +0100 build: Fix up rules for enums and marshallers • Use addprefix instead of manually concatenating $(srcdir) • Use AM_V_GEN instead of QUIET_GEN, to avoid inter-dependencies • Do basic checks on GLIB_MKENUMS and GLIB_GENMARSHAL being defined • Do checks on the required variables being defined build/autotools/Makefile.am.enums | 26 +++++++++++++++++--------- build/autotools/Makefile.am.marshal | 21 ++++++++++++++------- 2 files changed, 31 insertions(+), 16 deletions(-) commit d7e5e9247bd5af2267a52087b74bbf4d2e17974f Author: Damien Lespiau Date: Tue Sep 7 14:17:18 2010 +0100 build: Make the generated glib-mkenums c file depend on the headers What happens now if you rename an enum inside a header: • glib-mkenums generates the header file • a comparison is made with the previous version of the heade is made and no difference is found as you don't remove or create enums • the compilation of the generated mkenums c file fails because it has not been regenerated with the new, renamed, enum. That's why the generated clutter-enum-types.c needs to depend on the headers too. Of course such scenario should not happen in stable releases as enums are part of the API, but renaming enums happens in the development cycle and create compilation errors (very annoying when doing git bissects for instance). build/autotools/Makefile.am.enums | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 1eae9fcd7edd3f8e330cd4be691e62fe759b67ec Author: Henrik Hedberg Date: Fri Sep 3 20:00:40 2010 +0300 drag-action: Added x-drag-threshold and y-drag-threshold properties *** This is an API change *** Replaced the original drag-threshold property with two separate horizontal (x-drag-threshold) and vertical (y-drag-threshold) thresholds. It is some times necessary to have different drag thresholds for the horizontal and vertical axes. For example, when a draggable actor is inside a horizontal scrolling area, only vertical movement must begin dragging. That can be achieved by setting the x-drag-threshold to G_MAXUINT while y-drag-threshold is something usual, say, 20 pixels. This is different than drag axis, because after the threshold has been cleared by the pointer, the draggable actor can be dragged along both axes (if allowed by the drag-axis property). http://bugzilla.clutter-project.org/show_bug.cgi?id=2291 Signed-off-by: Emmanuele Bassi clutter/clutter-drag-action.c | 124 ++++++++++++++++++++++++++++++----------- clutter/clutter-drag-action.h | 7 ++- tests/interactive/test-drag.c | 19 +++++-- 3 files changed, 110 insertions(+), 40 deletions(-) commit ba9aa3b332cd8f6bd57983a5dfbb6a24e8fd8ad9 Author: Emmanuele Bassi Date: Mon Sep 6 18:08:44 2010 +0100 texture: Move the material unref() in ::dispose clutter/clutter-texture.c | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) commit 128e981f6cf6e9a5b32da1b908d83f6c01d384fa Author: Emmanuele Bassi Date: Mon Sep 6 17:50:57 2010 +0100 texture: Do some more validation in get_cogl_texture() Check the layer type, even though right now we only have one type available. clutter/clutter-texture.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) commit 7e56a98413817479d0501ce8af9fad3e6411104d Author: Emmanuele Bassi Date: Thu Sep 2 14:48:30 2010 +0100 texture: Use a base material for all instances Creating new materials for every Texture instance results in a lot of ARBfp programs being generated/compiled. Since most textures will just be similar we should create a template material for all of them, and then copy it in every instance. Cogl will try to optimize the generation of the program and, hopefully, will reuse the same program most of the time. With this change, a simple test shows that loading 48 textures will result in just two programs being compiled - with and without batching enabled. http://bugzilla.clutter-project.org/show_bug.cgi?id=2295 clutter/clutter-texture.c | 19 ++++++++++- tests/interactive/Makefile.am | 1 + tests/interactive/test-texture-material.c | 47 +++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 2 deletions(-) commit 283dce8e21b58bd769e923e9239d5607b820ddd9 Author: Emmanuele Bassi Date: Mon Sep 6 18:07:07 2010 +0100 material: Check before unreferencing a texture When disposing a material layer of type 'texture' we should check that the texture handle is still valid before calling cogl_handle_unref(). This avoids an assertion failure when disposing a ClutterTexture. clutter/cogl/cogl/cogl-material.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit b4120b81e4a472fff5f7388b4cfc8f717ecc23f0 Author: Emmanuele Bassi Date: Mon Sep 6 16:11:46 2010 +0100 Add some more introspection annotations clutter/clutter-main.c | 6 +++--- clutter/clutter-offscreen-effect.c | 4 +++- clutter/cogl/cogl/cogl-material.h | 2 +- clutter/cogl/cogl/cogl-offscreen.h | 11 ++++++----- clutter/cogl/cogl/cogl-types.h | 2 +- 5 files changed, 14 insertions(+), 11 deletions(-) commit 070e239b6d887d43ff57320b7e325c8d689ce0ef Author: Emmanuele Bassi Date: Fri Sep 3 17:15:22 2010 +0100 docs: Fix up the Cogl API reference build doc/reference/cogl/Makefile.am | 41 ++++++++++++++++++++-------------- doc/reference/cogl/cogl-docs.xml.in | 2 +- 2 files changed, 25 insertions(+), 18 deletions(-) commit 7abe63953ef95eb197fe8e0069b5ddeb078f2ffd Author: Emmanuele Bassi Date: Fri Sep 3 16:56:12 2010 +0100 cogl-shader: Add deprecation guards for cogl_program_uniform_* clutter/cogl/cogl/cogl-shader.h | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) commit abef73bb58aa69ec63ebe2dbaed959da7dec0bb5 Author: Emmanuele Bassi Date: Fri Sep 3 16:55:12 2010 +0100 Replace cogl_color_set_from_* with cogl_color_init_from_* The former is not yet "officially" deprecated by the latter, but it's confusing to have them both in the code base. clutter/clutter-deform-effect.c | 2 +- clutter/clutter-main.c | 2 +- clutter/clutter-offscreen-effect.c | 2 +- clutter/clutter-page-turn-effect.c | 2 +- clutter/clutter-stage.c | 36 +++++++++++------------ clutter/clutter-text.c | 10 +++--- clutter/clutter-texture.c | 12 ++++---- clutter/cogl/cogl/cogl-material.c | 4 +- clutter/cogl/cogl/cogl.c | 6 ++-- clutter/cogl/pango/cogl-pango-display-list.c | 10 +++--- clutter/cogl/pango/cogl-pango-render.c | 10 +++--- doc/cookbook/examples/text-shadow.c | 2 +- doc/cookbook/examples/textures-crossfade-cogl.c | 2 +- doc/cookbook/examples/textures-reflection.c | 4 +- doc/cookbook/textures.xml | 4 +- tests/conform/test-cogl-backface-culling.c | 2 +- tests/conform/test-cogl-blend-strings.c | 4 +- tests/conform/test-cogl-materials.c | 2 +- tests/conform/test-cogl-viewport.c | 2 +- tests/interactive/test-box-layout.c | 2 +- tests/interactive/test-cogl-tex-polygon.c | 10 +++--- 21 files changed, 64 insertions(+), 66 deletions(-) commit 0e2b0e496ee6b5f96e76e8dfa36dbf9a9b172de0 Author: Emmanuele Bassi Date: Fri Sep 3 16:52:06 2010 +0100 docs: Add annotation glossary to the Cogl API reference It's the only way to let gtk-doc know that we're using annotations in the comments. doc/reference/cogl/cogl-docs.xml.in | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit 0caef5c8aab1ad5b417375a8417cc26f40d4ac6f Author: Emmanuele Bassi Date: Fri Sep 3 16:10:44 2010 +0100 docs: Fixes for gtk-doc clutter/clutter-alpha.c | 4 ++-- clutter/clutter-interval.c | 2 +- clutter/cogl/cogl/cogl-matrix.h | 8 ++++---- doc/reference/clutter/clutter-sections.txt | 2 ++ 4 files changed, 9 insertions(+), 7 deletions(-) commit b06b7109d6498f6d9f4083fd2464aca9d1c443b2 Author: Emmanuele Bassi Date: Fri Sep 3 15:53:52 2010 +0100 docs: Update NEWS NEWS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 7fee8cf26a07a41910ca730a4c22b61ddbc1e372 Author: Emmanuele Bassi Date: Fri Sep 3 15:44:03 2010 +0100 cookbook: Add a short introduction for the Text chapter doc/cookbook/text.xml | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) commit 655c60aaa9d90aeed6869faf9c0209006aa0cd61 Author: Elliot Smith Date: Fri Sep 3 14:31:44 2010 +0100 cookbook: Added recipe for complex animation Uses ClutterAnimator to implement a reasonably complex animation of a single actor (movement along a path with simultaneous scaling). Provides a metaphor for thinking about ClutterAnimator animations (stage directions) and explains keys and key frames in some depth. Also compares ClutterAnimator with other possible approaches to this type of animation (implicit animations, ClutterState). doc/cookbook/Makefile.am | 1 + doc/cookbook/animations.xml | 427 ++++++++++++++++++++++++++++ doc/cookbook/videos/animations-complex.ogv | Bin 0 -> 34212 bytes 3 files changed, 428 insertions(+), 0 deletions(-) commit 60ff660d421fd5aeefd18978cecaac60b6c13d88 Author: Elliot Smith Date: Fri Sep 3 11:56:33 2010 +0100 cookbook: Added a second example to show "overlapping" transitions Added another JSON example to show how transitions can be easily overlapped when using ClutterAnimator (two sequences of 5 transitions, simultaneous with two sequences of 1 transition). Modified the C JSON loader program so it can be used with this example as well. .../examples/animations-complex-overlapping.json | 80 ++++++++++++++++++++ doc/cookbook/examples/animations-complex.c | 9 ++- 2 files changed, 87 insertions(+), 2 deletions(-) commit c0aa72a04259564d462ca4b80e080eacac885ecd Author: Elliot Smith Date: Wed Sep 1 18:02:07 2010 +0100 cookbook: Added complex animations example To support recipe about using ClutterAnimator to create complex animations. doc/cookbook/examples/Makefile.am | 2 + doc/cookbook/examples/animations-complex.c | 64 ++++++++++++++++++++ doc/cookbook/examples/animations-complex.json | 80 +++++++++++++++++++++++++ 3 files changed, 146 insertions(+), 0 deletions(-) commit 9210c46730fa839c0e050a8be4ff04979730932c Author: Emmanuele Bassi Date: Fri Sep 3 14:05:20 2010 +0100 docs: Update NEWS NEWS | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) commit 6c1559b6113d5eaa1f4b96110d365b7142d7de04 Author: Emmanuele Bassi Date: Fri Sep 3 13:55:07 2010 +0100 build: Allow disabling linking with -Bsymbolic Some debugging tools might require full visibility for the Clutter symbols; for this reason, and to match what the Clutter dependencies already allow, we should provide a configure switch to disable linking with the -Bsymbolic flag. README | 3 +++ configure.ac | 35 ++++++++++++++++++++++------------- 2 files changed, 25 insertions(+), 13 deletions(-) commit 3e74f42f07c0d4a5f830a49274cfe9a78268217f Author: Emmanuele Bassi Date: Fri Sep 3 12:14:50 2010 +0100 introspection: Add annotations Reduce the amount of warnings coming from g-ir-scanner. clutter/clutter-actor.c | 9 +++++---- clutter/clutter-alpha.c | 4 +++- clutter/clutter-animator.c | 4 +++- clutter/clutter-behaviour.c | 2 +- clutter/clutter-box.c | 4 +++- clutter/clutter-container.c | 4 ++-- clutter/clutter-event.c | 4 +++- clutter/clutter-interval.c | 4 ++-- clutter/clutter-layout-manager.c | 6 ++++-- clutter/clutter-main.c | 2 +- clutter/clutter-path.c | 2 +- clutter/clutter-script.c | 3 ++- clutter/clutter-shader.c | 12 +++++++++--- clutter/clutter-state.c | 12 ++++++++---- clutter/clutter-texture.c | 16 +++++++++------- clutter/clutter-timeline.c | 9 +++++---- 16 files changed, 61 insertions(+), 36 deletions(-) commit 67792b875038fbe4a4fbc339f463ee73ac811c40 Author: Emmanuele Bassi Date: Fri Sep 3 11:33:20 2010 +0100 docs: Update the dependencies We depend on G-I 0.9.5 after the latest slew of changes. We also depend on UProf 0.3. README | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 710c7aed400eb320581f160dc9cd0f4cba8676a8 Author: Emmanuele Bassi Date: Fri Sep 3 11:09:57 2010 +0100 build: Use Makefile.introspection Whenever possible, instead of writing our own rules for generating GIR files and typelibs. clutter/Makefile.am | 103 ++++++++++++++++------------------------- clutter/cogl/cogl/Makefile.am | 36 +++++++------- clutter/json/Makefile.am | 41 +++++++++------- configure.ac | 23 +++------ 4 files changed, 89 insertions(+), 114 deletions(-) commit f7854dd90ffe22a08b2e182e10484320f360b2c9 Author: Colin Walters Date: Thu Sep 2 11:45:42 2010 -0400 introspection: Build fixes This patch merges in substantial work from Emmanuele Bassi * Use new introspection --include-uninstalled API since we don't want to try to find the clutter-1.0.pc file before it's installed. * Use --pkg-export for Clutter-1.0.gir, since we want the .gir file to contain the associated pkg-config file. * Drop the use of --pkg for dependencies; those come from the associated .gir files. (Actually, --pkg is almost never needed) * Add --quiet http://bugzilla.clutter-project.org/show_bug.cgi?id=2292 clutter/Makefile.am | 34 +++++++++++++--------------------- clutter/cogl/cogl/Makefile.am | 2 +- clutter/json/Makefile.am | 3 +-- configure.ac | 2 +- 4 files changed, 16 insertions(+), 25 deletions(-) commit 24b12d626c3afdaa94b4119e218cf5b7436d0478 Author: Damien Lespiau Date: Thu Sep 2 16:22:45 2010 +0100 cex100: Remove C99-ism We were declaring a variable in the middle of the code. Blasphemy, for non-c99 compilers. clutter/egl/clutter-backend-cex100.c | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-) commit 0216f0b2810f6c3f7db2b7ad615a9e259ab7059f Author: Damien Lespiau Date: Thu Sep 2 16:20:10 2010 +0100 cex100: Use % not # to document constants gtk-doc contants should be prefixed by %, not # (types). clutter/egl/clutter-cex100.h.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 0a0a59cf7bdc5d4ee3639923f19cb57bf666815b Author: Damien Lespiau Date: Sat Aug 28 12:06:11 2010 +0100 cex100: Add an API to configure the buffering mode of the GDL plane GDL planes can be double or triple buffered. Let the user choose between the two modes befored initalizing Clutter. clutter/egl/clutter-backend-cex100.c | 21 +++++++++++---------- clutter/egl/clutter-cex100.h.in | 27 +++++++++++++++++++++++++++ doc/reference/clutter/clutter-sections.txt | 2 ++ 3 files changed, 40 insertions(+), 10 deletions(-) commit 01fcd11efd0f02833370901dc47d042dc067627a Author: Damien Lespiau Date: Sat Aug 28 10:43:39 2010 +0100 cex100: Add an API to configure the GDL plane to use Intel CE3100 and CE4100 have several planes (framebuffers) and a hardware blender to blend the planes togeteher to produce the final image. clutter_cex100_set_plane() lets you configure which framebuffer clutter will use for its rendering. .gitignore | 1 + clutter/egl/Makefile.am | 1 + clutter/egl/clutter-backend-cex100.c | 35 +++++++++++++++ clutter/egl/clutter-cex100.h.in | 64 ++++++++++++++++++++++++++++ configure.ac | 3 + doc/reference/clutter/Makefile.am | 2 + doc/reference/clutter/building-clutter.xml | 2 +- doc/reference/clutter/clutter-docs.xml.in | 1 + doc/reference/clutter/clutter-sections.txt | 6 +++ 9 files changed, 114 insertions(+), 1 deletions(-) commit 70dc3ecbd6986b0f9ded6ec9c7d4634dda5c5465 Author: Damien Lespiau Date: Fri Aug 27 16:19:00 2010 +0100 egl: Fix the installed headers • Use the public COGL_HAS_GLES[12] define instead of the HAVE_COGL_* ones which are private and defined in config.h, • Install clutter-egl-headers.h which is needed by clutter-egl.h, • Remove clutter-stage.h as it's uneeded and does not work since the single clutter.h include policy, • Install the egl headers into their own egl directory as the x11 and glx backends do. The include should then be , so document it. It does not really break anything as nobody could have used those broken headers. clutter/egl/Makefile.am | 4 ++-- clutter/egl/clutter-egl-headers.h | 12 +++++++----- clutter/egl/clutter-egl.h | 6 ++++-- 3 files changed, 13 insertions(+), 9 deletions(-) commit e1e5db00327db6d37850aaad7bb8fb42ffe29e57 Author: Damien Lespiau Date: Thu Aug 12 09:25:17 2010 -0400 cex100: Add a Clutter EGL backend for CE3100/CE4100 SoCs Intel CE3100 and CE4100 SoCs are designed for TVs. They have separate framebuffers that are blended together by a piece of hardware to make the final output. The library that allows you to initialize and configure those planes is called GDL. A EGL GDL winsys can then be use with those planes as NativeWindowType to select which plane to use. This patch adds a new ClutterBackendCex100 backend that can be selected at compile time with the new --with-flavour=cex100 option. clutter/cogl/cogl/Makefile.am | 4 + clutter/egl/Makefile.am | 3 + clutter/egl/clutter-backend-cex100.c | 332 ++++++++++++++++++++++++++++++++++ clutter/egl/clutter-backend-cex100.h | 60 ++++++ clutter/egl/clutter-backend-egl.c | 2 + configure.ac | 49 +++++- 6 files changed, 449 insertions(+), 1 deletions(-) commit af983faccd6fc91ea328d19ace2bb61df2c0f9fd Author: Damien Lespiau Date: Thu Aug 12 09:05:01 2010 -0400 egl: Fix compilation for EGL native Some minor fixes here and there: missing include, wrongly placed #endif, unused variable warning fixes, missing #ifdef. Make ClutterStageEGL a subclass of either ClutterStageX11 or GObject depending if you compile with X11 support (EGLX) or not (native). clutter/cogl/cogl/cogl-material-glsl.c | 1 + clutter/egl/clutter-backend-egl.c | 1 - clutter/egl/clutter-stage-egl.h | 18 +++++++++++++++--- 3 files changed, 16 insertions(+), 4 deletions(-) commit 12a5bf2e06114e60e8286ee7fd75e73ce16f487c Author: Emmanuele Bassi Date: Wed Sep 1 17:56:15 2010 +0100 offscreen-effect: Rename create_target to create_buffer *** This is an API change *** The create_target() virtual function should return a CoglHandle to a texture; clutter_offscreen_effect_get_target(), instead, returns a CoglMaterial to be painted in the implementation of the paint_target() virtual function. Instead of equating textures with materials, and confusing the user of the API, we should mark the difference more prominently. First of all, we should return a CoglMaterial* (now that we have that as a public type) in get_target(); having handles all over the place does not make it easier to distinguish the semantics of the virtual functions. Then we should rename create_target() to create_texture(), to make it clear that what should be returned is a texture that is used as the backing for the offscreen framebuffer. clutter/clutter-offscreen-effect.c | 45 +++++++++++++++------------- clutter/clutter-offscreen-effect.h | 14 ++++---- doc/reference/clutter/clutter-sections.txt | 2 +- 3 files changed, 32 insertions(+), 29 deletions(-) commit 6c40b100839e3597e9ab5f1d3e32c9d42d1af87c Author: Elliot Smith Date: Tue Aug 31 14:39:03 2010 +0100 cookbook: Added recipe for signal handling in ClutterScript Added a recipe explaining how to connect signals to handlers in the JSON definition used by ClutterScript; also shows how to connect the signals in code once the JSON has been loaded. Includes guidelines on writing handlers (i.e. need to use -export-dynamic and non-static functions) and example which connects a handler for motion events on a rectangle. doc/cookbook/script.xml | 266 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 266 insertions(+), 0 deletions(-) commit a67111a17cf5427096272276c2117c9f8d92a978 Author: Elliot Smith Date: Fri Aug 27 16:31:00 2010 +0100 cookbook: Added example of connecting signals in ClutterScript To support recipe about connecting signals in script. doc/cookbook/examples/Makefile.am | 2 + doc/cookbook/examples/script-signals.c | 91 +++++++++++++++++++++++++++++ doc/cookbook/examples/script-signals.json | 40 +++++++++++++ 3 files changed, 133 insertions(+), 0 deletions(-) commit b369cb51dc24801dc6e1dd4db54691ff859db93f Author: Emmanuele Bassi Date: Sat Aug 28 21:21:08 2010 +0100 docs: Pass -DCOGL_ENABLE_EXPERIMENTAL_API when scanning doc/reference/cogl/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit be9dd6e7dac5711bd5cf0f225c0d4b151b851868 Author: Emmanuele Bassi Date: Sat Aug 28 21:18:12 2010 +0100 docs: Split x11-texture-pixmap in its own section doc/reference/clutter/clutter-sections.txt | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) commit a0c700b8d074dc0581cb7889c98e63e77a98439f Author: Emmanuele Bassi Date: Sat Aug 28 21:17:52 2010 +0100 docs: Fix up the main index of the Clutter API reference doc/reference/clutter/clutter-docs.xml.in | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) commit ac6256ae604ad1da05e719f8623b4650402245fb Author: Emmanuele Bassi Date: Sat Aug 28 21:17:23 2010 +0100 docs: Add @Title to the X11TexturePixmap gtk-doc section clutter/x11/clutter-x11-texture-pixmap.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 79a4dbb32908043223e0d5a085214850166124f5 Author: Elliot Smith Date: Fri Aug 27 15:29:09 2010 +0100 cookbook: Use nicknames for enumeration values GEnum nicknames can be used to set properties in JSON definitions, so added a callout to the JSON example explaining this, and showing how to derive the nickname for an enumeration value. Modified the example code to use nicknames as well. doc/cookbook/examples/script-ui.json | 4 ++-- doc/cookbook/script.xml | 27 +++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 4 deletions(-) commit 2c3ca20cdc3299e239388f75b583e2afb7437b47 Author: Elliot Smith Date: Fri Aug 27 15:13:28 2010 +0100 cookbook: Don't use the default stage It's not necessary to use the default stage, so don't encourage this in the JSON example. doc/cookbook/examples/script-ui.json | 1 - doc/cookbook/script.xml | 6 ------ 2 files changed, 0 insertions(+), 7 deletions(-) commit 6db795baf634df0d5b8becc746c6c57c2ed0131a Author: Elliot Smith Date: Fri Aug 27 15:10:17 2010 +0100 cookbook: Mention nick names as possible values for enums As JSON can make use of nicknames for GEnum properties, mentioned this in the table mapping C property values to their JSON equivalents (as the nick name is a much shorter and cleaner way of setting a property in JSON). doc/cookbook/script.xml | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) commit b532f9591786f4b5381269718e7e0d479ad58c4d Author: Elliot Smith Date: Fri Aug 27 11:20:29 2010 +0100 cookbook: Added introduction to and recipe on ClutterScript Wrote an introduction to using ClutterScript with JSON. Focus is on explaining why you might want to use it, basic principles of operation (with annotated JSON sample), and how to map data types from C to JSON. Written simultaneously with a short recipe (uses the same sample code) showing how to load a JSON file and retrieve objects from it in code. doc/cookbook/script.xml | 394 ++++++++++++++++++++++++++++++++++++----------- 1 files changed, 303 insertions(+), 91 deletions(-) commit 7900ac4dc7fb204c9f8a957f20ec445ef19f655d Author: Elliot Smith Date: Thu Aug 26 17:07:21 2010 +0100 cookbook: Added comments to script example Commented the ClutterScript example so it can be used inline as part of the recipe, rather than as an example in the appendix (it's too simple to warrant a separate appendix). doc/cookbook/examples/script-ui.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 0fc1c8503b073491ca301c5551c515408a499052 Author: Elliot Smith Date: Thu Aug 26 12:51:33 2010 +0100 cookbook: Added first draft of script introduction New script chapter needs an introduction. While writing the introduction, also slightly changed the emphasis of the recipe (towards refactoring an existing application to use ClutterScript) and incorporated example code into documentation. doc/cookbook/script.xml | 205 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 196 insertions(+), 9 deletions(-) commit ce3a3d4404830cc951dc14660aa5c846ec3f8727 Author: Elliot Smith Date: Thu Aug 26 12:49:59 2010 +0100 cookbook: Use text for callouts in documentation Set a parameter on the XSLT transform so that callout elements are rendered as text rather than graphics (removes the need to add callout graphics to the build). doc/cookbook/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit fef53e1b287df0640e3395d082c7dcb84d8886b1 Author: Elliot Smith Date: Thu Aug 26 11:07:54 2010 +0100 cookbook: Added skeleton for script chapter of cookbook doc/cookbook/Makefile.am | 1 + doc/cookbook/clutter-cookbook.xml.in | 1 + doc/cookbook/script.xml | 45 ++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 0 deletions(-) commit 27d9825abe50d5fc38788c1c47f4a28b5225f098 Author: Elliot Smith Date: Thu Aug 26 10:52:12 2010 +0100 cookbook: Simplified ClutterScript example There was too much in the example code to cover in a single recipe, so I trimmed it down to demonstrate simple UI building (no constraints, effects, animations, or signals). doc/cookbook/examples/script-ui.c | 35 -------------- doc/cookbook/examples/script-ui.json | 85 +++------------------------------ 2 files changed, 8 insertions(+), 112 deletions(-) commit 4cba0cf3e82617e4cad0b4ab3813d5c6e6a5b715 Author: Elliot Smith Date: Wed Aug 25 17:53:46 2010 +0100 cookbook: Added ClutterScript example Added a simple script and program to load it, to support recipe on ClutterScript for UI definitions. Also amended the Makefile (following the pattern of the tests/interactive Makefile) to enable signal connection from ClutterScript by passing -export-dynamic to linker. doc/cookbook/examples/Makefile.am | 4 +- doc/cookbook/examples/script-ui.c | 69 ++++++++++++++++++++++ doc/cookbook/examples/script-ui.json | 104 ++++++++++++++++++++++++++++++++++ 3 files changed, 176 insertions(+), 1 deletions(-) commit 88b026fa72eddcd1e9da817ddd50be3f0e037f6a Author: Emmanuele Bassi Date: Thu Aug 26 17:31:32 2010 +0100 test-actors: Name all the actors Makes it easier to debug events. tests/interactive/test-actors.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) commit 36d45b660fc86619345bfe4f2837037f3a164d5d Author: Emmanuele Bassi Date: Thu Aug 26 16:36:59 2010 +0100 click-action: Add get_button() Allow retrieving the pointer button that caused the ::clicked signal to be emitted. http://bugzilla.clutter-project.org/show_bug.cgi?id=2287 clutter/clutter-click-action.c | 18 ++++++++++++++++++ clutter/clutter-click-action.h | 6 ++++-- doc/reference/clutter/clutter-sections.txt | 1 + 3 files changed, 23 insertions(+), 2 deletions(-) commit 550d5ab621379f732958dda99da130a25ea6aa15 Author: Emmanuele Bassi Date: Thu Aug 26 16:36:06 2010 +0100 click-action: Fix the release() method name Documented and declared as release(), it's implemented as force_release(). http://bugzilla.clutter-project.org/show_bug.cgi?id=2286 clutter/clutter-click-action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 870e7ddfadaff366ca02e28cc464e704b77b3430 Author: Bastian Winkler Date: Tue Aug 24 12:13:30 2010 +0200 test-script-parser: Add a second child to the container The script parser won't apply child and layout properties correctly with more than one children. http://bugzilla.clutter-project.org/show_bug.cgi?id=2285 Signed-off-by: Emmanuele Bassi tests/conform/test-script-parser.c | 27 ++++++++++++++++++++++----- tests/data/test-script-layout-property.json | 7 ++++++- 2 files changed, 28 insertions(+), 6 deletions(-) commit cb58f1f68cb3863a948f5e85db58d437d45ee091 Author: Bastian Winkler Date: Tue Aug 24 12:16:50 2010 +0200 script-parser: Apply child and layout properties to the right actor http://bugzilla.clutter-project.org/show_bug.cgi?id=2285 Signed-off-by: Emmanuele Bassi clutter/clutter-script-parser.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) commit 2e12768e3c84eb67948df1af1c89cb0011403d88 Author: Neil Roberts Date: Tue Aug 24 20:00:04 2010 +0100 win32: Fix the check for the 'IN_DESTRUCTION' flag Commit eae45619299 tried to clean how it checks for the private actor flags. However the check for the 'IN_DESTRUCTION' flag in the Win32 backend got inverted so it would always clear the current context. This was causing _cogl_check_driver_valid to fail later and then the realize would get stuck in a infinite loop. clutter/win32/clutter-backend-win32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 04d55107f380340ce22fbb56a3c87cf7576524db Author: Øyvind Kolås Date: Tue Aug 17 13:22:08 2010 +0100 state: clutter_state_remove_key_internal fix memory corruption When we free a state because there are no more keys with it as a target use a goto to re-initialize temporary variables that have become invalid. Fixing bug #2273 clutter/clutter-state.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) commit 66018a7035ccdc2422f8eef9a9523339fd6309be Author: Neil Roberts Date: Mon Aug 23 11:36:33 2010 +0100 Invert the check for whether to clip the pick In 965907deb3f9e the picking was changed to render the full stage instead of a single pixel whenever picking is performed more than once between paints. However the condition in the if-statement was backwards so it would end up always doing a full stage render. clutter/clutter-main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit ddd08ba72364d14c0ca291981a231f4add3d62a5 Author: Neil Roberts Date: Mon Aug 23 11:33:22 2010 +0100 Add some debugging notes for picking This adds a new CLUTTER_DEBUG option for picking. Currently this just reports the position for each pick and whether it is clipped or not. clutter/clutter-debug.h | 3 ++- clutter/clutter-main.c | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletions(-) commit 12e58c78132766ff4eb3e4c471a32d9e8ef95585 Author: Alexandros Frantzis Date: Fri Aug 13 17:48:30 2010 +0300 Hide internal glx and egl(x) backend symbols. The glx and egl(x) backends export some internal symbols. Hide these symbols (using '_' prefix) to reduce ABI differentiation between the glx and eglx flavours. http://bugzilla.clutter-project.org/show_bug.cgi?id=2267 Signed-off-by: Emmanuele Bassi clutter/egl/clutter-backend-egl.c | 22 +++++++++++----------- clutter/egl/clutter-backend-egl.h | 4 ++-- clutter/egl/clutter-stage-egl.c | 14 +++++++------- clutter/egl/clutter-stage-egl.h | 6 +++--- clutter/glx/clutter-backend-glx.c | 24 ++++++++++++------------ clutter/glx/clutter-backend-glx.h | 4 ++-- clutter/glx/clutter-event-glx.c | 2 +- clutter/glx/clutter-event-glx.h | 2 +- clutter/glx/clutter-stage-glx.c | 10 +++++----- clutter/glx/clutter-stage-glx.h | 6 +++--- 10 files changed, 47 insertions(+), 47 deletions(-) commit cda5afb41981e5402bfc4816e71f12b99eb820fc Author: Emmanuele Bassi Date: Fri Aug 20 17:03:06 2010 +0100 box-layout: Use the correct name for the arguments Since we're getting the preferred height for a given width, the width argument should be named "for_width" and not "for_height". clutter/clutter-box-layout.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 5f15a620a107847e0b26bab6cdd1c9d27cd3a243 Merge: 81481cd 444d315 Author: Emmanuele Bassi Date: Fri Aug 20 15:24:42 2010 +0100 Merge remote branch 'elliot/cookbook-textures-crossfade' * elliot/cookbook-textures-crossfade: cookbook: Use GdkPixbuf instead of getting data from a texture cookbook: Added a recipe for cross-fading between two images cookbook: Modified COGL example for consistency cookbook: Added video of two texture cross-fade cookbook: Removed unused constant cookbook: Renamed front/back to top/bottom in cross-fade example cookbook: Don't need to set keep-aspect-ratio for simple example cookbook: Modified ordering of statements in cross-fade example cookbook: Added a longer slideshow example cookbook: Made code examples more consistent cookbook: Added example code for texture cross-fading Post-release version bump to 1.3.13 Release Clutter 1.3.12 (developers snapshot) Conflicts: doc/cookbook/examples/Makefile.am commit 81481cd80342614d0fe57ffa6d2bd46103602952 Author: Elliot Smith Date: Fri Aug 20 13:54:04 2010 +0100 cookbook: Added recipe for handling pointer events on an actor Added a recipe about handling enter, leave, and motion events on an actor. Gives some pointers to data available from motion events, explains a bit about stage-relative and actor-relative coords, and covers how overlapping actors and reactivity of actors can affect events occurring. Examples include a simple scribble app showing how to integrate pointer events into a more useful context. doc/cookbook/Makefile.am | 1 + doc/cookbook/events.xml | 323 ++++++++++++++++++++ .../images/events-pointer-motion-stacking.png | Bin 0 -> 1063 bytes 3 files changed, 324 insertions(+), 0 deletions(-) commit c480e5ec00d52b176bdda1b26d1dfee8aea3384f Author: Elliot Smith Date: Fri Aug 20 12:38:35 2010 +0100 cookbook: Added example to show how stacking affects pointer events Added another example (used for a screenshot) to demonstrate how pointer events pass through non-reactive actors and how depth ordering affects whether an actor will emit a pointer motion signal. doc/cookbook/examples/Makefile.am | 2 + .../examples/events-pointer-motion-stacked.c | 90 ++++++++++++++++++++ 2 files changed, 92 insertions(+), 0 deletions(-) commit 526b438b3a4ebc446a1f986dcaeb759377462c18 Author: Elliot Smith Date: Fri Aug 20 11:25:40 2010 +0100 cookbook: Use get_coords rather than struct members Use clutter_event_get_coords() to get x and y position, rather than casting to the right event type then directly accessing members of the event struct. doc/cookbook/examples/events-pointer-motion.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) commit a4db7746f24280b26fed0b8caae0068cfe8d57b0 Author: Elliot Smith Date: Thu Aug 19 17:50:25 2010 +0100 cookbook: Made callback names more consistent Changed callback function names so they are more consistent within this recipe and with other callback names used in other recipes. .../examples/events-pointer-motion-crossing.c | 16 +++++----- .../examples/events-pointer-motion-scribbler.c | 28 ++++++++++---------- doc/cookbook/examples/events-pointer-motion.c | 8 +++--- 3 files changed, 26 insertions(+), 26 deletions(-) commit c1e2658104046d8895134df5b7519db26a491892 Author: Elliot Smith Date: Thu Aug 19 17:17:58 2010 +0100 cookbook: Added simple pointer motion example Added a simple pointer motion example which just reports on the stage and actor-relative coordinates of the pointer as it moves. doc/cookbook/examples/Makefile.am | 6 ++- doc/cookbook/examples/events-pointer-motion.c | 56 +++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) commit 7c196d31b4707322fc45b55106ded0e0daaacd40 Author: Elliot Smith Date: Thu Aug 19 16:53:27 2010 +0100 cookbook: Added scribble example for pointer motion recipe Simple scribbler application which demonstrates tracking mouse enter and motion events on a texture, drawing with COGL and ClutterPath as they occur. doc/cookbook/examples/Makefile.am | 2 + .../examples/events-pointer-motion-scribbler.c | 160 ++++++++++++++++++++ 2 files changed, 162 insertions(+), 0 deletions(-) commit b648bff10c0e2c48f0707bfecd7ea7ae1acab2eb Author: Elliot Smith Date: Thu Aug 19 16:48:59 2010 +0100 cookbook: Renamed example for pointer crossing Decided might be better to cover crossing and motion under a broader "pointer motion" recipe, so renamed the example (which only shows pointer crossing event handling). doc/cookbook/examples/Makefile.am | 4 +- doc/cookbook/examples/events-pointer-cross.c | 113 -------------------- .../examples/events-pointer-motion-crossing.c | 113 ++++++++++++++++++++ 3 files changed, 115 insertions(+), 115 deletions(-) commit 72ddd471f04f663ce52fdb36347688a595cfa940 Author: Elliot Smith Date: Thu Aug 19 10:32:28 2010 +0100 cookbook: Added example for pointer cross recipe Code example demonstrates detecting pointers entering/leaving an actor by implementing a (very) simple button with hover effect. doc/cookbook/examples/Makefile.am | 2 + doc/cookbook/examples/events-pointer-cross.c | 113 ++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 0 deletions(-) commit 213bd1eab4e0dfbb0c033c5d8d56eb6343e35876 Author: Emmanuele Bassi Date: Thu Aug 19 13:57:10 2010 +0100 debug: Add a macro for checking debug flags clutter/clutter-actor.c | 2 +- clutter/clutter-debug.h | 79 ++++++++++++++++++++++++---------------------- clutter/clutter-main.c | 2 +- 3 files changed, 43 insertions(+), 40 deletions(-) commit 459a6bb24c880c21f71c37e99f04e801d117705d Author: Emmanuele Bassi Date: Thu Aug 19 12:10:43 2010 +0100 click-action: Add a method to force a release It can be useful to be able to forcibly break the grab set up by the ClickAction. The newly added release() method provides a mechanism to release the grab and unset the :held state of the ClickAction. clutter/clutter-click-action.c | 30 ++++++++++++++++++++++++++++ clutter/clutter-click-action.h | 3 +- doc/reference/clutter/clutter-sections.txt | 1 + 3 files changed, 33 insertions(+), 1 deletions(-) commit db7d821ef6e435b02a7a99c6f7f02df9bd3565b5 Author: Emmanuele Bassi Date: Thu Aug 19 11:26:51 2010 +0100 click-action: Add attribution The ClickAction semantics were inspired by the StClickable widget in the GNOME Shell Toolkit (St). clutter/clutter-click-action.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 5ccaa61e4fcd527cfeeaded08a1e0311a5e6814e Author: Robert Bragg Date: Wed Aug 18 18:06:35 2010 +0100 docs: Clarifies that queue_redraw also applies to picking This clarifies the documentation for clutter_actor_queue_redraw to explain that custom actors should call this whenever some private state changes that affects painting *or* picking. clutter/clutter-actor.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit f8940e3c9a7d58df0a484d70d371983cc337bbec Author: Robert Bragg Date: Wed Aug 18 18:05:15 2010 +0100 clutter-texture: queue redraw when changing pick_with_alpha The expectation is that actors should call clutter_actor_queue_redraw when ever some private state changes that affects painting *or* picking. ClutterTexture was not doing this for pick_with_alpha property changes. clutter/clutter-texture.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commit 965907deb3f9e69cb459dd28af4074364a7b72f9 Author: Robert Bragg Date: Wed Aug 18 16:48:55 2010 +0100 Cache a full pick render if we have a static stage The idea is that if we see multiple picks per frame then that implies the visible scene has become static. In this case we can promote the next pick render to be unclipped so we have valid pick values for the entire stage. Now we can continue to read from this cached buffer until the stage contents do visibly change. Thanks to Luca Bruno on #clutter for this idea! clutter/clutter-actor.c | 12 +++++++++ clutter/clutter-main.c | 61 ++++++++++++++++++++++++++++++++++++++++++--- clutter/clutter-private.h | 3 ++ 3 files changed, 72 insertions(+), 4 deletions(-) commit c646a366c62ab6a07b8ae53c170db31ad5b3d7d3 Author: Emmanuele Bassi Date: Wed Aug 18 18:20:16 2010 +0100 actor: Ignore paint() on actors being destroyed OBVIOUS OPTIMIZATION IS OBVIOUS clutter/clutter-actor.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 56097df60cae9b665c9c6033bf7ad54751874e92 Author: Emmanuele Bassi Date: Wed Aug 18 18:20:04 2010 +0100 docs: Improve paint() documentation clutter/clutter-actor.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) commit 444d315078f41295c722bdf30c4b3ff92c89cf53 Author: Elliot Smith Date: Wed Aug 18 16:02:51 2010 +0100 cookbook: Use GdkPixbuf instead of getting data from a texture Rewrote example for single texture + COGL to use a GdkPixbuf to load images, rather than reading data out of another CoglTexture. The data is then loaded from the pixbuf to a region of the CoglTexture (as before). doc/cookbook/textures.xml | 165 +++++++++++++++++++++++---------------------- 1 files changed, 83 insertions(+), 82 deletions(-) commit c207820bef93bffede1733ef8c6586cda5095347 Author: Elliot Smith Date: Wed Aug 18 11:41:10 2010 +0100 cookbook: Added a recipe for cross-fading between two images The recipe covers a two texture approach (using the Clutter API) and a single texture approach (using COGL). It also discusses issues with cross-fading between images of different sizes with the COGL API, and gives a longer example of cycling through multiple images in a slideshow application. doc/cookbook/textures.xml | 535 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 535 insertions(+), 0 deletions(-) commit c492faecb2fda5619fa26b4eb84e6ced7a103833 Author: Elliot Smith Date: Tue Aug 17 15:47:59 2010 +0100 cookbook: Modified COGL example for consistency Changed the stage size so the COGL API example for cross-fade has a stage the same size as the two texture example. doc/cookbook/examples/textures-crossfade-cogl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e54d3e716b5f9a00d59a006e70926d5fe31fd4a3 Author: Elliot Smith Date: Tue Aug 17 15:46:48 2010 +0100 cookbook: Added video of two texture cross-fade Added a video showing the two texture cross-fade. Modified the example code to animate on key press, so this video could be captured. Also altered the stage size to minimise the video size. doc/cookbook/Makefile.am | 1 + doc/cookbook/examples/textures-crossfade.c | 21 ++++++++++++++++--- .../videos/textures-crossfade-two-textures.ogv | Bin 0 -> 81903 bytes 3 files changed, 18 insertions(+), 4 deletions(-) commit 0486c56a41870ac1ebb3a0200060fb80282a1f25 Author: Elliot Smith Date: Tue Aug 17 14:54:32 2010 +0100 cookbook: Removed unused constant doc/cookbook/examples/textures-crossfade.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit 8c0c2924ae467d265aabf7b7c472eb0474c459e7 Author: Elliot Smith Date: Tue Aug 17 11:51:33 2010 +0100 cookbook: Renamed front/back to top/bottom in cross-fade example Front/back seems like the wrong terminology when discussing actors arranged in layers. Top/bottom fits better with Clutter API function names and other recipes, so renamed variables. .../examples/textures-crossfade-slideshow.c | 44 ++++++++++---------- doc/cookbook/examples/textures-crossfade.c | 38 ++++++++-------- 2 files changed, 41 insertions(+), 41 deletions(-) commit 1e4578d1dd6dc7d638ac2d4902e303d07504039f Author: Elliot Smith Date: Tue Aug 17 11:20:20 2010 +0100 cookbook: Don't need to set keep-aspect-ratio for simple example doc/cookbook/examples/textures-crossfade.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) commit 1b2606a850288b2f8f943ae2e433b14e34a944f7 Author: Elliot Smith Date: Tue Aug 17 10:56:06 2010 +0100 cookbook: Modified ordering of statements in cross-fade example Changed the order of statements in the sample code to match the order they will be explained in the walk-through in the recipe. doc/cookbook/examples/textures-crossfade.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) commit e332236b87871b09922ab3ada1a2a5726d06130a Author: Elliot Smith Date: Mon Aug 16 16:39:13 2010 +0100 cookbook: Added a longer slideshow example Cross-fading between two images is straightforward, but cycling between more than two is more efficient if done by copying COGL textures between the two textures, rather than trying to reposition the textures. The example demonstrates how to reuse a pair of textures to cycle through multiple images. doc/cookbook/examples/Makefile.am | 2 + .../examples/textures-crossfade-slideshow.c | 182 ++++++++++++++++++++ 2 files changed, 184 insertions(+), 0 deletions(-) commit c230fd8dfdb43c98faa3147d2f669e0b5e44702b Author: Elliot Smith Date: Mon Aug 16 16:16:07 2010 +0100 cookbook: Made code examples more consistent Modified the code example for the Clutter API version of the cross-fade to use the same command line as the COGL version. This also simplifies the explanation in the recipe. Also made the COGL code sample more consistent with the Clutter API code sample. doc/cookbook/examples/textures-crossfade-cogl.c | 17 +-- doc/cookbook/examples/textures-crossfade.c | 184 +++++++++-------------- 2 files changed, 75 insertions(+), 126 deletions(-) commit 83a8d0b3bb2ad47db6afd32bd2aa503814486e07 Author: Elliot Smith Date: Thu Aug 12 17:39:59 2010 +0100 cookbook: Added example code for texture cross-fading Added simple image viewer which loads image file names from a directory, displays the first one, then displays the next in the list with each key press. Uses the primitive fade front in/fade back out approach. Also adapted Emmanuele's example code which uses Cogl to produce a similar effect, but within a single texture. This code loads two images specified on the command line and cross-fades between them. doc/cookbook/examples/Makefile.am | 4 + doc/cookbook/examples/textures-crossfade-cogl.c | 174 +++++++++++++++++++++++ doc/cookbook/examples/textures-crossfade.c | 174 +++++++++++++++++++++++ 3 files changed, 352 insertions(+), 0 deletions(-) commit dc7d62a42a9b111d03626a8bc72c956869f4b7b8 Author: Emmanuele Bassi Date: Mon Aug 16 13:37:57 2010 +0100 Post-release version bump to 1.3.13 configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 6d751bf9514683a893668bc3b3822e433277a377 Author: Emmanuele Bassi Date: Mon Aug 16 13:23:43 2010 +0100 Release Clutter 1.3.12 (developers snapshot) configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit ad0c36e1a1a0df5c0ff1f4449c54918e775e965d Author: Emmanuele Bassi Date: Tue Aug 17 14:54:20 2010 +0100 docs: Fixes to avoid gtk-doc warnings clutter/clutter-actor.c | 57 +++++++++------------------- clutter/clutter-actor.h | 4 +- clutter/clutter-behaviour-path.c | 6 +- clutter/clutter-colorize-effect.c | 2 +- clutter/clutter-drag-action.c | 2 +- clutter/clutter-script.c | 2 +- doc/reference/clutter/clutter-docs.xml.in | 7 +++- doc/reference/clutter/clutter-overview.xml | 23 ++++++++--- 8 files changed, 48 insertions(+), 55 deletions(-) commit 50f4bfd7f72eb10f05506b9932785b5cded42aa7 Author: Emmanuele Bassi Date: Tue Aug 17 11:34:35 2010 +0100 build: Remove dolt remnants We don't use Dolt any more, since we depend on libtool 2.2. .gitignore | 2 - Makefile.am | 2 +- build/autotools/Makefile.am | 1 - build/autotools/dolt.m4 | 178 ------------------------------------------- 4 files changed, 1 insertions(+), 182 deletions(-) commit 06ecaa98f1f993239eebb7b74b3fa2ab5929a622 Author: Emmanuele Bassi Date: Mon Aug 16 16:33:32 2010 +0100 docs: Add :keep-aspect-ratio behaviour to the notes README | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit 92b1a33eb313abdb9d84f6731deb84a12d61d5d0 Author: Emmanuele Bassi Date: Mon Aug 16 15:56:49 2010 +0100 texture: Default square textures to height-for-width Square textures should have a preferred geometry request set to height-for-width, as it is the default for Clutter itself. clutter/clutter-texture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit dc2aee43007bc4b154b5d819404071a35862c500 Author: Emmanuele Bassi Date: Mon Aug 16 13:37:57 2010 +0100 Post-release version bump to 1.3.13 configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)