commit 177d8e52d3823cd0af8fd0b7ab9bb4a7d67c27a8 Author: Emmanuele Bassi Date: Wed Aug 4 12:38:53 2010 +0100 Release 1.3.10 NEWS | 46 ++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 +- 2 files changed, 47 insertions(+), 1 deletions(-) commit 8668a019a0bde8a078f999cd5b960a1f63f700ec Author: Emmanuele Bassi Date: Thu Aug 5 11:41:25 2010 +0100 cookbook: Fix the text-shadow recipe Fill out the recipe and add more comments to the example code. doc/cookbook/examples/text-shadow.c | 10 +++- doc/cookbook/text.xml | 71 +++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 3 deletions(-) commit ea3af7bf334aa2949e9320d54f1a329e599fa587 Author: Emmanuele Bassi Date: Wed Aug 4 12:47:16 2010 +0100 po: Remove the requirement for LINGUAS and ChangeLog We don't use ChangeLogs and the LINGUAS file is replaced by the AS_ALL_LINGUAS m4 macro. po/Makefile.in.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 8326ea26f82dcb756e4717f5ed6b80ea8582b9f1 Author: Roman Kudiyarov Date: Tue Aug 3 21:12:12 2010 +0700 osx: Fixed stage resize policy Added initialization of minimum window size property on Cocoa side. This property works when user change window size by mouse dragging. But when size is changed by clutter_actor_set_size this property will not help and was added another check in clutter_stage_osx_resize. Also osx_get_geometry was refactoried because it returns incorrect values in many cases but now size is saved in [Window reshape] in requisition_width/height and this value will be returned in any case to frontend. clutter/osx/clutter-stage-osx.c | 71 ++++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 35 deletions(-) commit c1f0b59911fdc6096f070108d100ff14c2e25b29 Author: Roman Kudiyarov Date: Wed Aug 4 12:08:50 2010 +0700 test: Fixed test-rotate for osx platfom There was a bug in clutter-shader-effect. We have to set to zero new object of type GValue before we can use it in g_value_init. clutter/clutter-shader-effect.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 52b6a3cd49c4fd654bde0a03b8e57156e731076f Author: Roman Kudiyarov Date: Thu Jul 29 21:59:46 2010 +0700 osx: added resolution initialization in backend It's important step of initialization because all features calls from font rendering libs based on this parameter. By default it equals to -1 and test-text-cache test crashes in this case. clutter/osx/clutter-backend-osx.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) commit dc23b88de25d24b5b8efaf6ae7e84f3237c175eb Author: Roman Kudiyarov Date: Sat Jul 24 11:54:19 2010 +0700 osx: Fixed warnings in osx event implementation clutter/osx/clutter-event-osx.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) commit af8308295c95c8bef3538af85d308e7807a8ab22 Author: Roman Kudiyarov Date: Fri Jul 23 12:16:23 2010 +0700 Added willResize delegate for osx stage. By default a clutter stage is not user resizable and this delegate controls this option while resizing the stage. clutter/osx/clutter-stage-osx.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit 49b2b623118ab961c6ce15d7f26972391b9075e1 Author: Roman Kudiyarov Date: Fri Jul 23 11:25:40 2010 +0700 Fixed lack of reaction for keyboard events after showing stage on osx. Trick with hiding view while showing the stage affects on responder chain. The main view ceases to be first responder and we should manually set first responder. clutter/osx/clutter-stage-osx.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) commit e4c4ef679254b6407133333f9572442444709845 Author: Roman Kudiyarov Date: Thu Jul 22 13:51:37 2010 +0700 Fixed incorrect size return in osx stage if stage resizable by user. For some reasons width&height was equal to 1 if flag user-resizable was true. clutter/osx/clutter-stage-osx.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) commit 411b5a09bb11d2b8831d676298d4632ab47ecd21 Author: Roman Kudiyarov Date: Wed Jul 21 23:22:57 2010 +0700 osx: Added size initialization for stage After stage creation it's size can be changed by user and it should be taken into account in clutter_stage_osx_realize. clutter/osx/clutter-stage-osx.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) commit 5218da748f7d5c95d3aeff18c51f54361398748f Author: Roman Kudiyarov Date: Mon Jul 19 22:53:49 2010 +0700 test: fixed uninitialized variable in test-cogl-point-sprites tests/interactive/test-cogl-point-sprites.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 8e2b45648f14debe0039cfd32dddcf262b7f15ce Author: Roman Kudiyarov Date: Mon Jul 19 20:46:55 2010 +0700 osx: Fixed problem with freezing application while checking behaviour. Problem was in incorrect application initialization. [NSApplication sharedApplication] should be call in backend init(not in init stage). It doesn't require any data and only makes a connection to window server. clutter/osx/clutter-backend-osx.c | 13 +++++++++++++ clutter/osx/clutter-stage-osx.c | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) commit 8c69a639cbe39c3b006555c816f325b0cdb4b874 Author: Roman Kudiyarov Date: Fri Jul 16 19:46:17 2010 +0700 osx: Fixed bug with creating context twice. We should assign context and pixel_format vars to null to avoid multiple context creation. clutter/osx/clutter-backend-osx.c | 51 +++++++++++++++++++----------------- 1 files changed, 27 insertions(+), 24 deletions(-) commit 50793eac51d541648e023455f9d0cc94e8519423 Author: Roman Kudiyarov Date: Fri Jul 16 19:19:13 2010 +0700 osx: added create_context function in backend Cleanup clutter_backend_osx_post_parse function and move context initialization to clutter_backend_osx_create_context. The OpenGL pixel format attributes were taken as is. Also move bringing application to foreground in clutter_stage_osx_realize, it seems there is best place for it. clutter/osx/clutter-backend-osx.c | 92 +++++++++++++++---------------------- clutter/osx/clutter-stage-osx.c | 13 +++++ 2 files changed, 50 insertions(+), 55 deletions(-) commit 904f619419b414e5de86b4bca5cd0f811ef02c87 Author: Roman Kudiyarov Date: Thu Jul 15 19:04:28 2010 +0700 osx: Implemented hide cursor backend implementation Add implementation for hide cursor in stage. Also added using this feature in test-animator. clutter/osx/clutter-stage-osx.c | 5 ++++- tests/interactive/test-animator.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) commit f22b6a442cb901439d4b590b4f7a6bca4577b116 Author: Roman Kudiyarov Date: Thu Jul 15 16:32:59 2010 +0700 Added .DS_Store and test logs messages to git ignore .gitignore | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 12e50114883c21a2f9a0db48e53020532dffa936 Author: Roman Kudiyarov Date: Thu Jul 15 16:27:16 2010 +0700 osx: Added missed function declaration for stage Added empty functions for cursor and window resize functional with notes FIXME and also they are added to iface. clutter/osx/clutter-stage-osx.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) commit 01c9570d168bced1e9055f66016a875bcd86b81d Author: Roman Kudiyarov Date: Thu Jul 15 16:00:29 2010 +0700 osx: Remove drawing call while showing stage and add viewport init Viewport didn't initialized before OGL drawing and it causes crash on assert so added viewport initalization to clutter_stage_osx_realize. Also showing the stage causes drawing function but other part of the system(in particular conformance tests) don't expect it and aren't ready at this moment. clutter/osx/clutter-stage-osx.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) commit e3295050f59bcc026b8f0648e2ad2935d9911aed Author: Roman Kudiyarov Date: Thu Jul 15 15:46:04 2010 +0700 osx: Fixed crash while features initialization Clearing current context couses incorrect work of glGetString function and all next GL functions that use it work incorrectly. clutter/osx/clutter-backend-osx.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 24d1142ecf03cdeefb4b07cb4ac372d2f2b6b1bf Author: Emmanuele Bassi Date: Tue Aug 3 17:53:58 2010 +0100 glx: Add more debugging notes Should help debug the GLX visual selection. clutter/glx/clutter-backend-glx.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) commit fa54b7c60d52aaf75b1691586c9171b77280ae15 Author: Emmanuele Bassi Date: Tue Aug 3 16:48:53 2010 +0100 docs: Further clarifications Mention the XFixes extension for compositors using input regions to let events "pass through" the stage. Thanks to: Robert Bragg clutter/x11/clutter-backend-x11.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) commit da6b2660ba423924b5fd164fff3a5e05ca206971 Author: Emmanuele Bassi Date: Tue Aug 3 16:30:04 2010 +0100 docs: Clarify the event retrieval disable behaviour When we disable the event retrieval, we now just disable the X11 event source, not the event selection. We need to make that clear to applications, especially compositors, which might expect complete control over the selection. clutter/x11/clutter-backend-x11.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) commit 609560b1cb44f4d209de810cc9b94d8d49ba2db5 Author: Emmanuele Bassi Date: Tue Aug 3 16:11:52 2010 +0100 glx: Unconditionally select X11/GLX events Currently, we select input events and GLX events conditionally, depending on whether the user has disabled event retrieval. We should, instead, unconditionally select input events even with event retrieval disabled because we need to guarantee that the Clutter internal state is maintained when calling clutter_x11_handle_event() without requiring applications or embedding toolkits to select events themselves. If we did that, we'd have to document the events to be selected, and also update applications and embedding toolkits each time we added a new mask, or a new class of events - something that's clearly not possible. See: http://bugzilla.clutter-project.org/show_bug.cgi?id=998 for the rationale of why we did conditional selection. It is now clear that a compositor should clear out the input region, since it cannot assume a perfectly clean slate coming from us. See: http://bugzilla.clutter-project.org/show_bug.cgi?id=2228 for an example of things that break if we do conditional event selection on GLX events. In that specific case, the X11 server ≤ 1.8 always pushed GLX events on the queue, even without selecting them; this has been fixed in the X11 server ≥ 1.9, which means that applications like Mutter or toolkit integration libraries like Clutter-GTK would stop working on recent Intel drivers providing the GLX_INTEL_swap_event extension. This change has been tested with Mutter and Clutter-GTK. clutter/glx/clutter-stage-glx.c | 84 ++++++++++++++++++++++++--------------- 1 files changed, 52 insertions(+), 32 deletions(-) commit 142f288986dba5cdeef2fa2e24fd019ce61fa5b0 Merge: 10c5cb1 7ed3517 Author: Emmanuele Bassi Date: Tue Aug 3 15:44:46 2010 +0100 Merge remote branch 'elliot/cookbook-animations-rotating' * elliot/cookbook-animations-rotating: cookbook: Added recipe for animated rotation of an actor cookbook: Add explanation about including code samples cookbook: Make filename used in video example consistent cookbook: Add example code for animated rotation commit 10c5cb1800da3bdaf116197a096bf6396efa465f Author: Robert Bragg Date: Fri Jul 23 10:12:39 2010 +0100 cogl-program: gles2: bind programs lazily as for GL This makes the gles2 cogl_program_use consistent with the GL version by not binding the program immediately and instead leaving it to cogl-material.c to bind the program when actually drawing something. clutter/cogl/cogl/cogl-material-glsl.c | 3 -- clutter/cogl/cogl/cogl-material-opengl-private.h | 2 +- clutter/cogl/cogl/cogl-material-opengl.c | 34 +++++++++++++--------- clutter/cogl/cogl/driver/gl/cogl-program.c | 10 +++--- clutter/cogl/cogl/driver/gles/cogl-program.c | 3 -- 5 files changed, 26 insertions(+), 26 deletions(-) commit 4a9321b60cd443bec065bbc8a1c96bb38f8dab1e Author: Robert Bragg Date: Tue Jun 8 23:06:50 2010 +0100 gles2: Have CoglProgram track uniforms per program Previously custom uniforms were tracked in _CoglGles2Wrapper but as part of a process to consolidate the gl/gles2 shader code it seems to make sense for this state to be tracked in the CoglProgram object instead. http://bugzilla.o-hand.com/show_bug.cgi?id=2179 clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c | 41 ++++++++++---------- clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.h | 11 ++--- clutter/cogl/cogl/driver/gles/cogl-program.c | 38 ++++++++++++------ clutter/cogl/cogl/driver/gles/cogl-program.h | 11 +++++- 4 files changed, 61 insertions(+), 40 deletions(-) commit c26f4ffa228d40e8ef73c075d6e6003d9fcfde5b Author: Robert Bragg Date: Mon Aug 2 21:40:55 2010 +0100 cogl-shader: unifies the driver/{gl,gles} shader files The per driver implementations of cogl-shader.c had become almost identical we now have a single cogl/cogl-shader.c instead. clutter/cogl/cogl/Makefile.am | 2 + clutter/cogl/cogl/cogl-shader-private.h | 40 ++++ clutter/cogl/cogl/cogl-shader.c | 235 ++++++++++++++++++++ clutter/cogl/cogl/driver/gl/Makefile.am | 2 - clutter/cogl/cogl/driver/gl/cogl-shader-private.h | 40 ---- clutter/cogl/cogl/driver/gl/cogl-shader.c | 169 -------------- clutter/cogl/cogl/driver/gles/Makefile.am | 2 - .../cogl/cogl/driver/gles/cogl-shader-private.h | 40 ---- clutter/cogl/cogl/driver/gles/cogl-shader.c | 214 ------------------ 9 files changed, 277 insertions(+), 467 deletions(-) commit 8021d3e2ebeced1921a973b325275c3e000655a2 Author: Robert Bragg Date: Fri Jul 23 17:44:53 2010 +0100 cogl-shader: Store the CoglShaderType in CoglShader Instead of having to query GL and translate the GL enum into a CoglShaderType each time cogl_shader_get_type is called we now keep track of the type in CoglShader. clutter/cogl/cogl/driver/gl/cogl-shader-private.h | 1 + clutter/cogl/cogl/driver/gl/cogl-shader.c | 14 ++------------ clutter/cogl/cogl/driver/gles/cogl-shader.c | 13 +------------ 3 files changed, 4 insertions(+), 24 deletions(-) commit 467c33a3e37904cb29ea596caff6c70ae5eb503a Author: Robert Bragg Date: Sun Jul 25 21:36:41 2010 +0100 cogl: don't include cogl-debug.h in cogl.h or install cogl-debug.h is an internal header so it shouldn't have been included by cogl.h and the header shouldn't be installed either. clutter/cogl/cogl/Makefile.am | 2 +- clutter/cogl/cogl/cogl-atlas-texture.c | 1 + clutter/cogl/cogl/cogl-bitmap.c | 1 + clutter/cogl/cogl/cogl-framebuffer.c | 1 + clutter/cogl/cogl/cogl-journal.c | 1 + clutter/cogl/cogl/cogl-material-arbfp.c | 1 + clutter/cogl/cogl/cogl-material-opengl.c | 1 + clutter/cogl/cogl/cogl-material.c | 1 + clutter/cogl/cogl/cogl-matrix.c | 1 + clutter/cogl/cogl/cogl-primitives.c | 1 + clutter/cogl/cogl/cogl-texture-2d-sliced.c | 1 + clutter/cogl/cogl/cogl.h | 1 - clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c | 1 + clutter/cogl/pango/cogl-pango-render.c | 1 + 14 files changed, 13 insertions(+), 2 deletions(-) commit 8b914dfa307ef2e0b84ff7dc1632cb6ae29e7c3e Author: Robert Bragg Date: Fri Jul 23 21:37:22 2010 +0100 configure.ac: when checking for gl2ext.h include gl2.h This makes sure we include gl2.h when looking for gl2ext.h since gl2ext.h can't always be used standalone. configure.ac | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) commit c23b28396866cfcffa64e16d3d55075be04e0d4e Author: Emmanuele Bassi Date: Sat Jul 31 10:40:21 2010 +0100 animatable: Allow passing a NULL animation The Animatable interface was created specifically for the Animation class. It turns out that it might be fairly useful to others - such as ClutterAnimator and ClutterState. The newly-added API in this cycle for querying and accessing custom properties should not require that we pass a ClutterAnimation to the implementations: the Animatable itself should be enough. This is necessary to allow language bindings to wrap clutter_actor_animate() correctly and do type validation and demarshalling between native values and GValues; an Animation instance is not available until the animate() call returns, and validation must be performed before that happens. There is nothing we can do about the animate_property() virtual function - but in that case we might want to be able to access the animation from an Animatable implementation to get the Interval for the property, just like ClutterActor does in order to animate ClutterActorMeta objects. clutter/clutter-actor.c | 3 --- clutter/clutter-animatable.c | 15 +++------------ clutter/clutter-animatable.h | 6 ------ clutter/clutter-animation.c | 24 +++++------------------- 4 files changed, 8 insertions(+), 40 deletions(-) commit c65c0f08d8ea6532f873b09d45033a7e546e05be Author: Emmanuele Bassi Date: Sat Jul 31 10:39:53 2010 +0100 docs: Fix the BindConstraint example A constraint was created but not added to the actor. clutter/clutter-bind-constraint.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 00eb71b89a09efe4ccb44e55bdff7d2e4da4d26b Author: Emmanuele Bassi Date: Fri Jul 30 19:39:35 2010 +0100 conform: Move the Score test to the conformance suite The interactive test for ClutterScore is really meant to be run as part of the conformance test suite, so we should move it there. tests/conform/.gitignore | 1 + tests/conform/Makefile.am | 1 + tests/conform/test-conform-main.c | 2 + tests/conform/test-score.c | 119 ++++++++++++++++++++++++++++++++++ tests/interactive/.gitignore | 1 - tests/interactive/Makefile.am | 1 - tests/interactive/test-score.c | 127 ------------------------------------- 7 files changed, 123 insertions(+), 129 deletions(-) commit a20a509584c8f8982b6f2f5daf92d882f99e6d02 Author: Emmanuele Bassi Date: Thu Jul 29 17:18:25 2010 +0100 x11: Split out conditions and warnings XGetGeometry is a great piece of API, since it gets a lot of stuff that are moderately *not* geometry related - the root window, and the depth being two. Since we have multiple conditions depending on the result of that call we should split them up depending on the actual error - and each of them should have a separate error message. This makes debugging simpler. clutter/x11/clutter-stage-x11.c | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-) commit 0736cb73230c6f2e39b7186770f7405f4dda228e Author: Emmanuele Bassi Date: Thu Jul 29 17:00:24 2010 +0100 actor: Make set_flags() safe from unrefs It's possible - though not recommended - that user code causes the destruction of an actor in one of the notification handlers for flag-based properties. We should protect the multiple notification emission with g_object_ref/unref. clutter/clutter-actor.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 6f737a5f5a107cc728a9be59d79e9213dfffd026 Author: Emmanuele Bassi Date: Thu Jul 29 16:58:37 2010 +0100 Require g-i 0.6.14 The 0.6.14 is the last 0.6 release, before the format changes; we build with both 0.6 and 0.9, so we should depend to the former and not the latter. configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 7ed3517504754216304607136450ef8b718597f7 Author: Elliot Smith Date: Wed Jul 21 14:50:32 2010 +0100 cookbook: Added recipe for animated rotation of an actor New recipe covering how to animate rotation of an actor (in all axes). Covers various factors affecting rotation animation (like orientation of axes, parent rotation/orientation), as well as trying to make rotations easier to visualise (e.g. describing how rotation direction is affected by those factors, how a rotation can be expected to look when animated). Uses implicit animations for code examples. Also refers to a full code example which uses ClutterState. doc/cookbook/Makefile.am | 9 + doc/cookbook/animations.xml | 510 +++++++++++++++++++- ...tions-rotating-container-reverses-direction.ogv | Bin 0 -> 204262 bytes .../videos/animations-rotating-x-centered.ogv | Bin 0 -> 154165 bytes ...ations-rotating-x-minus-180-with-y-minus-96.ogv | Bin 0 -> 39584 bytes ...ations-rotating-x-minus-180-with-z-minus-96.ogv | Bin 0 -> 31171 bytes .../videos/animations-rotating-x-minus-45.ogv | Bin 0 -> 30059 bytes doc/cookbook/videos/animations-rotating-y-45.ogv | Bin 0 -> 34009 bytes .../videos/animations-rotating-y-centered.ogv | Bin 0 -> 150864 bytes doc/cookbook/videos/animations-rotating-z-90.ogv | Bin 0 -> 53592 bytes .../videos/animations-rotating-z-centered.ogv | Bin 0 -> 200166 bytes 11 files changed, 517 insertions(+), 2 deletions(-) commit 94fcbafe18b2e7079c79dde393de4b25fad02456 Author: Elliot Smith Date: Wed Jul 21 15:44:16 2010 +0100 cookbook: Add explanation about including code samples Updated the "Contributing" section to explain how to include a full code sample at the end of a recipe. doc/cookbook/clutter-cookbook.xml.in | 95 ++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) commit 9e29aac49a64adc3d1edcf54a473bbe2b074b98a Author: Elliot Smith Date: Wed Jul 21 14:42:31 2010 +0100 cookbook: Make filename used in video example consistent Fixed video filename in sample markup to match the guidelines given in the "Contributing" section. doc/cookbook/clutter-cookbook.xml.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 12ffe70a86440e04752d8dd18a1b8bc984a4e02b Author: Elliot Smith Date: Wed Jul 21 12:51:47 2010 +0100 cookbook: Add example code for animated rotation Add example code demonstrating how to rotate in the x,y,z axes using ClutterState. Integrated with build. doc/cookbook/examples/.gitignore | 1 + doc/cookbook/examples/Makefile.am | 3 + doc/cookbook/examples/animations-rotating.c | 136 +++++++++++++++++++++++++++ 3 files changed, 140 insertions(+), 0 deletions(-) commit 385ac8e1811c1ca485ed129d96b8368d48955748 Author: Emmanuele Bassi Date: Fri Jul 23 12:42:55 2010 +0100 modules: Bump cairo to 1.9.12 And add poppler. build/clutter.modules | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) commit 3d806f498f1c4a02b2a166bdd5e124e7e11239cd Author: Øyvind Kolås Date: Fri Jul 23 12:16:37 2010 +0100 effect: fix conversion from degrees to radians clutter/clutter-page-turn-effect.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit ec26466cdce5b701af7c82bce4588cb6f2e3180c Author: Neil Roberts Date: Wed Jul 14 19:39:24 2010 +0100 gles/cogl-shader.c: Store the shader type in CoglShader Nothing was storing the shader type when a shader was created so it would get confused about whether it was a custom vertex or fragment shader. Also the 'type' member of CoglShader was a GLenum but the only place that read it was treating it as if it was CoglShaderType. This changes it be CoglShaderType. .../cogl/cogl/driver/gles/cogl-shader-private.h | 2 +- clutter/cogl/cogl/driver/gles/cogl-shader.c | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) commit 616eccdad63ce35d5ce59094cf026970b799cf09 Author: Neil Roberts Date: Thu Jul 22 17:27:04 2010 +0100 test-shader: Unref the ClutterShader after setting it on an actor Otherwise the test leaks the shader object and the underlying GLSL program. tests/interactive/test-shader.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit a639ed6593fa64c83bc4c462d9c3eac9bf543485 Author: Neil Roberts Date: Thu Jul 22 16:58:23 2010 +0100 Plug the leaking CoglProgram and CoglShader _cogl_program_free and _cogl_shader_free never freed the struct their structs so it would end up leaking a little bit. clutter/cogl/cogl/driver/gl/cogl-program.c | 2 ++ clutter/cogl/cogl/driver/gl/cogl-shader.c | 2 ++ clutter/cogl/cogl/driver/gles/cogl-program.c | 2 ++ clutter/cogl/cogl/driver/gles/cogl-shader.c | 2 ++ 4 files changed, 8 insertions(+), 0 deletions(-) commit f17717717ab3266676053bc020f45b6bacdcee0f Author: Neil Roberts Date: Thu Jul 22 16:14:59 2010 +0100 configure.ac: Fix the missing COGL_HAS_GLES[12] defines In 7fae8ac051 the two cogl-defines.h files from GLES and GL were unified. However this missed out the COGL_HAS_GLES[12] defines from GLES. The configure.ac still made an AC_SUBST for the right version but the replacement was never put in any headers. This fixes it so that instead of directly calling AC_SUBST the value is now put into a variable which later gets added to COGL_DEFINES so that it will end up in cogl-defines.h configure.ac | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) commit d87b34f98283797a13e983f37ef9dd9f43407602 Author: Neil Roberts Date: Thu Jul 22 16:12:46 2010 +0100 Fix a small typo in configure.ac for the COGL_DEFINES variable There was an initializer for the COGL_DEFINES variable which sets it to the empty value before it is filled in. The name of the variable wasn't spelt right so it wouldn't work properly. This doesn't really matter because it would default to empty anyway. configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit a1c74209795c341dc89dbe2f6c3a91242a8c813c Author: Neil Roberts Date: Thu Jul 15 17:10:31 2010 +0100 test-shader: The tex_coord varying is now an array under GLES2 Since the GLES2 wrapper grew support for multi-texturing, the tex_coord varying variable defined in the vertex shader is actually an array of texture coordinates so it ought to match in the fragment shader in test-shader. This seemed to work anyway under Mesa/Intel but under NVidia it does not so I don't think it's safe to assume that linking a non-array varying with an array will work. tests/interactive/test-shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 488e376b7e356614494bee62ed0437ea721c2447 Author: Neil Roberts Date: Thu Jul 22 19:58:47 2010 +0100 cogl-bitmap-pixbuf: Avoid copying the buffer in more circumstances When loading an RGB image GdkPixbuf will pad the rowstride so that the beginning of each row is aligned to 4 bytes. This was causing us to fallback to the code that copies the buffer. It is probably safe to avoid copying the buffer if we can detect that the rowstride is simply an alignment of the packed rowstride. This also changes the copying fallback code so that it uses the aligned rowstride. However it is now extremely unlikely that the fallback code would ever be used. clutter/cogl/cogl/cogl-bitmap-pixbuf.c | 33 +++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 9 deletions(-) commit b9295bf0e5e103c2acd4b1c14d402780e824c69a Author: Neil Roberts Date: Thu Jul 22 19:15:44 2010 +0100 cogl-bitmap-pixbuf: Fix the rowstride used when copying a GdkPixbuf In commit b780413e5ae4b the GdkPixbuf loading code was changed so that if it needs to copy the pixbuf then it would tightly pack it. However it was still using the rowstride from the pixbuf so the image would end up skewed. This fixes it to use the real rowstride. http://bugzilla.clutter-project.org/show_bug.cgi?id=2235 clutter/cogl/cogl/cogl-bitmap-pixbuf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit bb1b1b151e28b87071cdc064af648f8c7d26b1e9 Author: Neil Roberts Date: Tue Jul 20 17:34:04 2010 +0100 cogl-material: Don't map the shininess value to [0,1] In OpenGL the 'shininess' lighting parameter is floating point value limited to the range 0.0→128.0. This number is used to affect the size of the specular highlight. Cogl materials used to only accept a number between 0.0 and 1.0 which then gets multiplied by 128.0 before sending to GL. I think the assumption was that this is just a weird GL quirk so we don't expose it. However the value is used as an exponent to raise the attenuation to a power so there is no conceptual limit to the value. This removes the mapping and changes some of the documentation. http://bugzilla.clutter-project.org/show_bug.cgi?id=2222 clutter/cogl/cogl/cogl-material-opengl.c | 6 ++---- clutter/cogl/cogl/cogl-material.c | 4 +++- clutter/cogl/cogl/cogl-material.h | 9 +++++---- 3 files changed, 10 insertions(+), 9 deletions(-) commit d76d82c88ffe8c1bdebef983716d8be77907e124 Author: Neil Roberts Date: Wed Jul 21 23:22:07 2010 +0100 cogl-material: Always reset the GLSL program to zero when flushing When flushing a fixed-function or arbfp material it would always call disable_glsl to try to get rid of the previous GLSL shader. This is needed even if current_use_program_type is not GLSL because if an application calls cogl_program_uniform then Cogl will have to bind the program to set the uniform. If this happens then it won't update current_use_program_type presumably because the enabled state of arbfp is still valid. The problem was that disable_glsl would only select program zero when the current_use_program_type is set to GLSL which wouldn't be the case if cogl_program_uniform was called. This patch changes it to just directly call _cogl_gl_use_program_wrapper(0) instead of having a separate disable_glsl function. The current program is cached in the cogl context anyway so it shouldn't cause any extra unnecessary GL calls. http://bugzilla.clutter-project.org/show_bug.cgi?id=2232 clutter/cogl/cogl/cogl-material-opengl.c | 15 ++------------- 1 files changed, 2 insertions(+), 13 deletions(-) commit ea255154f503112ee238b5c2c2b2ba1d3f77203f Author: Chris Leick Date: Thu Jul 22 11:40:57 2010 +0100 po: Add de.po Signed-off-by: Emmanuele Bassi po/de.po | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 104 insertions(+), 0 deletions(-) commit 24b9748f0a988110dfeda660d2f20df6e14cde3d Author: Chris Kühl Date: Thu Jul 22 11:21:21 2010 +0200 Fixed more set using *_get_* typos. http://bugzilla.clutter-project.org/show_bug.cgi?id=2233 clutter/clutter-texture.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 99d7d31318b44eacf8d8a64ee1bb92fc511ab8ce Author: Emmanuele Bassi Date: Thu Jul 22 10:48:21 2010 +0100 docs: Improve the text of X11 event-related functions We need to make sure that people disabling event handling in Clutter call clutter_x11_handle_event() to update Clutter's internal state. clutter/x11/clutter-backend-x11.c | 15 ++++++++++----- clutter/x11/clutter-event-x11.c | 8 ++++++-- 2 files changed, 16 insertions(+), 7 deletions(-) commit 1dee65770a7eba85c899890e652d4cf32744c71a Author: Neil Roberts Date: Thu Jul 22 10:04:06 2010 +0100 Minor fix to the documentation for clutter_texture_get_sync_size The documentation was recursively referring to itself causing a stack overflow in the reader's brain. http://bugzilla.clutter-project.org/show_bug.cgi?id=2233 clutter/clutter-texture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 706f42645a3436089ad33d9d07844cc4ae202b12 Author: Emmanuele Bassi Date: Wed Jul 21 17:25:15 2010 +0100 build: Depend on g-i 0.9.0 The introspection format changed, so we should depend on the new one. configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit eae4561929938057c398498267b7500796fa9d92 Author: Emmanuele Bassi Date: Wed Jul 21 16:10:46 2010 +0100 Clean up the private flags for ClutterActor Provide macros to quickly query a flag, and remove all namespacing except the initial 'CLUTTER'. clutter/clutter-actor.c | 109 +++++++++++++++----------------- clutter/clutter-backend.c | 2 +- clutter/clutter-cairo-texture.c | 2 +- clutter/clutter-main.c | 12 ++-- clutter/clutter-private.h | 34 ++++++---- clutter/clutter-stage.c | 16 ++--- clutter/egl/clutter-backend-egl.c | 2 +- clutter/glx/clutter-backend-glx.c | 2 +- clutter/osx/clutter-stage-osx.c | 6 +- clutter/win32/clutter-backend-win32.c | 2 +- clutter/win32/clutter-stage-win32.c | 6 +- clutter/x11/clutter-event-x11.c | 2 +- clutter/x11/clutter-stage-x11.c | 8 +-- 13 files changed, 97 insertions(+), 106 deletions(-) commit 0dfbf010b8d4a7ca877061134e3b02c362517cc3 Author: Emmanuele Bassi Date: Wed Jul 21 15:21:08 2010 +0100 x11: Add more checks to set_stage_foreign() Check all the pre-requisites to avoid segfaults later on. clutter/x11/clutter-stage-x11.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) commit 8538e1bf586464f841f8321aa313be4a372c8159 Author: Emmanuele Bassi Date: Wed Jul 21 15:14:36 2010 +0100 x11: Clean up TexturePixmap header and private data structure Align the header file and use bitfields instead of booleans. clutter/x11/clutter-x11-texture-pixmap.c | 22 ++++---- clutter/x11/clutter-x11-texture-pixmap.h | 84 ++++++++++++++--------------- 2 files changed, 52 insertions(+), 54 deletions(-) commit 0e80747a684339d116e7860b26a7049320525284 Author: Neil Roberts Date: Sat Jul 17 14:08:28 2010 +0100 cogl-material: Consider the shader when deciding if materials equate _cogl_material_equal was ignoring the user shader state so rectangles with different shaders would get batched together. http://bugzilla.clutter-project.org/show_bug.cgi?id=2220 clutter/cogl/cogl/cogl-material.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) commit f2d0f0ab5f120c514b82d75478aea1e17ad51ba7 Author: Emmanuele Bassi Date: Tue Jul 20 14:39:43 2010 +0100 stage: Ignore redraws on destroyed stages We might get requests to redraw even during destruction; we should ignore them and do some NULL checks instead of blindly invoking functions. clutter/clutter-stage.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) commit 7b6b2ea55b758486f7d0dbe6eb8fe0bd89610de8 Author: Emmanuele Bassi Date: Tue Jul 20 14:39:01 2010 +0100 stage-window: Add argument guards Validate the arguments passed to StageWindow's methods. clutter/clutter-stage-window.c | 35 ++++++++++++++++++++++++++--------- 1 files changed, 26 insertions(+), 9 deletions(-) commit a7adfd874524bd0e4b1d61c0e1714d0037ffa70f Author: Emmanuele Bassi Date: Mon Jul 19 16:03:35 2010 +0100 po: Re-sync Makefile.in.in Use the one that ships with gtk+. po/Makefile.in.in | 47 +++++++++++++++-------------------------------- 1 files changed, 15 insertions(+), 32 deletions(-) commit e45b8be71b6f5a0e95db2b6f1d4d92fbe59d2cdc Author: Elliot Smith Date: Mon Jul 19 12:52:00 2010 +0100 cookbook: Fix key press to examine modifers correctly The simple key press example in the cookbook used a brittle and incorrect switch statement to test modifier values. Instead, use logical "&" of the state with the modifiers we're interested in to check which keys were pressed. http://bugzilla.clutter-project.org/show_bug.cgi?id=2223 doc/cookbook/events.xml | 32 ++++++++++++++------------------ 1 files changed, 14 insertions(+), 18 deletions(-) commit 5865d2a4b393a86180a36505419f2502433ccc00 Author: Emmanuele Bassi Date: Sun Jul 18 22:53:56 2010 +0100 cookbook: Use TESTS_DATA_DIR We need the correct location for redhand.png if we want to load it in textures-reflection. doc/cookbook/examples/textures-reflection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit dc19e26073c52fd7810a3a7f2fd98be67d2bab3e Author: Emmanuele Bassi Date: Sun Jul 18 11:20:44 2010 +0100 cookbook: Add image and example for text-shadow doc/cookbook/text.xml | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) commit 0dac5e0557a637099bba873abba6068f4c45cefa Author: Emmanuele Bassi Date: Sun Jul 18 11:15:25 2010 +0100 cookbook: Include the textures-reflection example code Add a section at the end of the recipe containing the full code of the example. doc/cookbook/textures.xml | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) commit 76d8119a7fcdbd64566d8ef16f73e50b0ae28c7f Author: Neil Roberts Date: Sat Jul 17 12:40:19 2010 +0100 cogl-material-arbfp: Use separate buffers when calling g_ascii_dtostr g_ascii_dtostr was being used in four separate arguments to g_string_append_printf but all invocations of it were using the same buffer. This would end up with all of the arguments having the same value which would depend on whichever order the compiler evaluates them in. This patches changes it to use a multi-dimensional array and a loop to fill in the separate buffers. http://bugzilla.clutter-project.org/show_bug.cgi?id=2219 clutter/cogl/cogl/cogl-material-arbfp.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) commit 90b74458d2ac8fcedea8f9dc3e28a3e9d9455bc7 Author: Emmanuele Bassi Date: Sun Jul 18 10:56:35 2010 +0100 cookbook: Add an empty recipe for shadows under text Currently, it's just an example and an image, but it should be easy to flesh it out properly for the "Text" chapter. doc/cookbook/Makefile.am | 1 + doc/cookbook/clutter-cookbook.xml.in | 1 + doc/cookbook/examples/.gitignore | 1 + doc/cookbook/examples/Makefile.am | 3 ++ doc/cookbook/examples/text-shadow.c | 59 ++++++++++++++++++++++++++++++++++ doc/cookbook/images/text-shadow.png | Bin 0 -> 17618 bytes doc/cookbook/text.xml | 40 +++++++++++++++++++++++ 7 files changed, 105 insertions(+), 0 deletions(-) commit bb3dc013bffe387dd1532df4c0469a88ef54808a Author: Emmanuele Bassi Date: Sun Jul 18 10:53:06 2010 +0100 cookbook: Add example code The cookbook should also include fully functional code examples. We can even XInclude them into the docbook XML itself. The examples should be built with the coobook, so that we can always make sure they are up to date. configure.ac | 1 + doc/cookbook/Makefile.am | 4 + doc/cookbook/examples/.gitignore | 1 + doc/cookbook/examples/Makefile.am | 28 +++++++ doc/cookbook/examples/textures-reflection.c | 110 +++++++++++++++++++++++++++ 5 files changed, 144 insertions(+), 0 deletions(-) commit 5f4f2fa3c7e95d13664e40d3e238594170df1486 Author: Emmanuele Bassi Date: Sat Jul 17 10:23:57 2010 +0100 Add gmo files to the Git ignore list .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 6983429e4a937d6c64beb427b137290e16db4527 Author: Emmanuele Bassi Date: Fri Jul 16 23:37:59 2010 +0100 material-arbfp: Use locale-independent double to string conversion The ARBfp programs are created with a printf() wrapper, which usually fails in non-en locales as soon as you start throwing things like floating point values in the mix. We should use the g_ascii_dtostr() function which places a double into a string buffer in a locale-independent way. http://bugzilla.clutter-project.org/show_bug.cgi?id=2219 clutter/cogl/cogl/cogl-material-arbfp.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) commit 6f220399ae862f49f3f2aa54ec6681e159f0a934 Author: Emmanuele Bassi Date: Fri Jul 16 17:31:27 2010 +0100 cookbook: Use the right tag for the screenshot Screenshots should be using the tag, not the
one. doc/cookbook/textures.xml | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) commit 71dfdf92d74603d4e8fc48eeb9da4a6a051d45f3 Merge: af6f023 7be6ed3 Author: Emmanuele Bassi Date: Fri Jul 16 17:23:36 2010 +0100 Merge remote branch 'elliot/cookbook-actor-opacity' Conflicts: doc/cookbook/Makefile.am commit af6f023a80dd02c39f02bd0876714129809377ec Author: Emmanuele Bassi Date: Fri Jul 16 17:20:38 2010 +0100 cookbook: Add a missing image to the list doc/cookbook/Makefile.am | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) commit e92c8d72cc32a7403735138e723f18ae6ecee19c Merge: ad1613a 489799b Author: Emmanuele Bassi Date: Fri Jul 16 17:13:12 2010 +0100 Merge remote branch 'elliot/cookbook-include-videos' * elliot/cookbook-include-videos: cookbook: Tweak so that videos sit inside a paragraph for better spacing docs: Note the P_() macro in the HACKING file cookbook: Added support for inline video Conflicts: doc/cookbook/Makefile.am commit ad1613a93670fcdf1ca2e44d1435cf0655776c25 Merge: 4170eac da22150 Author: Emmanuele Bassi Date: Fri Jul 16 17:12:37 2010 +0100 Merge remote branch 'elliot/cookbook-animation-fading' * elliot/cookbook-animation-fading: cookbook: Minor modification to wording to improve clarity cookbook: Added recipe for fading actors in/out commit 4170eacd94e73de1e25a648b9f0d94868af743a0 Author: Emmanuele Bassi Date: Fri Jul 16 17:04:31 2010 +0100 cookbook: Add a recipe for texture reflection A common request: how to create a clone of a texture that looks like a reflection. doc/cookbook/images/textures-reflection.png | Bin 0 -> 23953 bytes doc/cookbook/textures.xml | 198 +++++++++++++++++++++++++++ 2 files changed, 198 insertions(+), 0 deletions(-) commit 7be6ed3334a55b7ba89d116905a603c625866c41 Author: Elliot Smith Date: Thu Jul 15 19:47:53 2010 +0100 cookbook: Added a recipe about making an actor transparent Explains how to make an actor transparent so that other actors are visible through it. Also explains a bit more generally about opacity and how it's computed from the actor, container, and color; and how actor visibility is affected by depth (fog) and depth order. doc/cookbook/Makefile.am | 5 +- doc/cookbook/actors.xml | 229 ++++++++++++++++++++ .../actors-opacity-container-affects-opacity.png | Bin 0 -> 5150 bytes doc/cookbook/images/actors-opacity.png | Bin 0 -> 5029 bytes 4 files changed, 233 insertions(+), 1 deletions(-) commit da2215049852e43e6ae42d4097d8a59825e31dab Author: Elliot Smith Date: Fri Jul 16 12:48:56 2010 +0100 cookbook: Minor modification to wording to improve clarity Text referred to three animation methods, but only provides examples for two of them; and in future there may be more/fewer than 3. So I reworded it. doc/cookbook/animations.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 962b3c68857813967c3f3fc62ca87e7e3bc9cf6d Author: Elliot Smith Date: Fri Jul 16 12:34:44 2010 +0100 cookbook: Added recipe for fading actors in/out Added a recipe showing how to fade actors in/out by animating their opacity property, using both implicit animations and ClutterState. doc/cookbook/Makefile.am | 4 + doc/cookbook/animations.xml | 128 +++++++++++++++++++- .../videos/animations-fading-in-then-out.ogv | Bin 0 -> 92403 bytes doc/cookbook/videos/animations-fading-out.ogv | Bin 0 -> 64464 bytes 4 files changed, 131 insertions(+), 1 deletions(-) commit 3aa3893a1100ec24f713f6ca8f4272e95b00e518 Author: Emmanuele Bassi Date: Fri Jul 16 12:01:42 2010 +0100 docbook: Add an introduction to the texture section doc/cookbook/textures.xml | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) commit e3de96c2043826f50380c7b10f7f8cbf9b1f55d1 Author: Emmanuele Bassi Date: Fri Jul 16 11:29:28 2010 +0100 po: Fix the LTR string translation po/zh_CN.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit a8595435b8b3e85b410abc46885402b8d34575b3 Author: Emmanuele Bassi Date: Fri Jul 16 11:23:01 2010 +0100 po: Remove unused LINGUAS file The ALL_LINGUAS variable is generated from the list of po files. po/LINGUAS | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit ec81e8d7388c3aa8ac6d5fcbff7f72deae0abe87 Author: raven Date: Fri Jul 16 11:18:02 2010 +0100 Add pl translations Signed-off-by: Emmanuele Bassi po/pl.po | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 117 insertions(+), 0 deletions(-) commit 9b7579d9161d0bd120bf5154a8c281ca068e97c2 Author: happyaron Date: Fri Jul 16 11:17:30 2010 +0100 Add zn_CN translations Signed-off-by: Emmanuele Bassi po/zh_CN.po | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 112 insertions(+), 0 deletions(-) commit 489799bb4d956c74c1a89d7ba5d82ce3a25e56f2 Author: Elliot Smith Date: Thu Jul 15 17:24:50 2010 +0100 cookbook: Tweak so that videos sit inside a paragraph for better spacing doc/common/cookbook.xsl | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) commit ec7b0b438962a60a5b269bd712724cc3e59b7795 Author: Emmanuele Bassi Date: Thu Jul 15 14:26:16 2010 +0100 docs: Note the P_() macro in the HACKING file doc/HACKING | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 1d9c64ff16cc3070405cd6a67221712cf0893b7e Author: Elliot Smith Date: Thu Jul 15 13:27:02 2010 +0100 cookbook: Added support for inline video Amended Makefile to copy content of videos directory into installation directories. Also copies videos and images into the html/ directory during the build, so that the built cookbook can be viewed locally (for testing without having to install). Added an XSLT template to transform Docbook elements into HTML 5