commit e1320b559d1ff8ccb5aa9a5f0e36ac019cab2d69 Author: Emmanuele Bassi Date: Mon Jul 12 21:31:15 2010 +0100 Release 1.3.8 NEWS | 42 +++++++++++++++++++++++++++++++++++++++++- configure.ac | 2 +- 2 files changed, 42 insertions(+), 2 deletions(-) commit 1eec056bfd29119a515be072f92807a9398a4a37 Merge: e2a553d 9d96c21 Author: Emmanuele Bassi Date: Mon Jul 12 21:25:25 2010 +0100 Merge remote branch 'elliot/cookbook-animation-inversion' * elliot/cookbook-animation-inversion: cookbook: Fixed invalid XML tag cookbook: Added "inverting an animation" recipe docs: Enabled animation section commit e2a553da86f3c62d167b9898e337ff10f43d3575 Merge: 2de61da 97ac28e Author: Emmanuele Bassi Date: Mon Jul 12 21:25:22 2010 +0100 Merge remote branch 'elliot/cookbook-animation-intro' * elliot/cookbook-animation-intro: cookbook: Added introduction for animations section docs: Enabled animation section commit 2de61da29661585274fd5e10c27110f7eb1fe6fc Merge: 25dd0ae 9e5a18f Author: Emmanuele Bassi Date: Mon Jul 12 21:20:30 2010 +0100 Merge remote branch 'elliot/cookbook-consistency' * elliot/cookbook-consistency: cookbook: Fixed typo cookbook: Fix build so CSS files get installed cookbook: Moved paragraph where it logically belongs cookbook: Added some judicious note elements cookbook: Added more information for contributors cookbook: Link out to docbook site cookbook: Made docbook element usage consistent cookbook: Additional selectors in CSS stylesheet cookbook: Copy the CSS file into the HTML build directory commit 25dd0ae356e7e0486e2a56c21f53e601ec54ab54 Author: Øyvind Kolås Date: Mon Jul 12 17:34:17 2010 +0100 state: swap clutter_state_set_state and clutter_state_warp_to_state Got the boolean arguments for the old clutter_state_change wrong, making the methods do the opposite of what they should. clutter/clutter-state.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 97ac28ee482a02e1309105171bfb8efdbf8be3c8 Author: Elliot Smith Date: Mon Jul 12 17:15:16 2010 +0100 cookbook: Added introduction for animations section Introduces basic concepts (timelines, alphas, frames) common to different parts of the Clutter animation API. Gives a high level overview of the three different approaches to animation (implicit, ClutterAnimator, ClutterState). doc/cookbook/animations.xml | 203 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 200 insertions(+), 3 deletions(-) commit 295a043194878e66072b619529355e3fc20c9821 Author: Elliot Smith Date: Fri Jul 9 11:27:57 2010 +0100 docs: Enabled animation section doc/cookbook/clutter-cookbook.xml.in | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit 9d96c21de6578efeb6099295da8c4cb1e189dad8 Author: Elliot Smith Date: Mon Jul 12 16:59:38 2010 +0100 cookbook: Fixed invalid XML tag doc/cookbook/animations.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 6a443a0cd3a7a661d3cf727f682d636c3dab08a1 Author: Elliot Smith Date: Mon Jul 12 15:34:23 2010 +0100 cookbook: Added "inverting an animation" recipe Added a new recipe (based on the skeleton in the animations section of the cookbook) about inverting an animation by reversing the direction of its timeline. Uses clutter_actor_animate() as the basic approach, but mentions ClutterState and ClutterAnimator as well. doc/cookbook/animations.xml | 149 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 146 insertions(+), 3 deletions(-) commit bfb51adf97e3a702c47d3c5d0b7c2a575caf8ddc Author: Elliot Smith Date: Fri Jul 9 11:27:57 2010 +0100 docs: Enabled animation section doc/cookbook/clutter-cookbook.xml.in | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit 90acc6a2a9a6563c60df5f9849a23c40c89a956f Author: Neil Roberts Date: Fri Jul 9 19:09:49 2010 +0100 Add the deprecated ref-counting for cogl_program cogl_program has always had cogl_program_ref and cogl_program_unref but this was missed from 89cb325fd4 so they got removed. clutter/cogl/cogl/driver/gl/cogl-program.c | 1 + clutter/cogl/cogl/driver/gles/cogl-program.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) commit 8a85088196809cac2b47a84be2d7f0a1e3c67701 Author: Neil Roberts Date: Fri Jul 9 18:46:31 2010 +0100 Don't define public cogl_is_* functions for internal types This adds a COGL_OBJECT_INTERNAL_DEFINE macro and friends that are the same as COGL_OBJECT_DEFINE except that they prefix the cogl_is_* function with an underscore so that it doesn't get exported in the shared library. clutter/cogl/cogl/cogl-atlas-texture.c | 2 +- clutter/cogl/cogl/cogl-clip-stack.c | 4 +- clutter/cogl/cogl/cogl-framebuffer.c | 8 ++-- clutter/cogl/cogl/cogl-material.c | 18 ++++--- clutter/cogl/cogl/cogl-object-private.h | 78 ++++++++++++++++++++-------- clutter/cogl/cogl/cogl-sub-texture.c | 4 +- clutter/cogl/cogl/cogl-texture-2d-sliced.c | 2 +- clutter/cogl/cogl/cogl-texture-2d.c | 4 +- clutter/cogl/cogl/cogl-texture-private.h | 6 ++ clutter/cogl/cogl/cogl-texture-rectangle.c | 2 +- 10 files changed, 87 insertions(+), 41 deletions(-) commit 0e839c37693339287232f0292283f92522fa3ca5 Author: Neil Roberts Date: Fri Jul 9 18:24:28 2010 +0100 Add cogl_vertex_buffer_is_indices to the public headers This function has always been defined in the shared library but it was missed from the public headers. clutter/cogl/cogl/cogl-vertex-buffer.h | 15 +++++++++++++++ doc/reference/cogl/cogl-sections.txt | 1 + 2 files changed, 16 insertions(+), 0 deletions(-) commit 89cb325fd4e921149fc9ad861d66ef1ed9acd3df Author: Neil Roberts Date: Fri Jul 9 17:59:16 2010 +0100 cogl: Don't define the deprecated ref/unref accessors for new types Previously COGL_OBJECT_DEFINE would always define deprecated cogl_$type_{ref,unref} functions even if the type is new or if the type is entirely internal. An application would still find it difficult to use these because they wouldn't be in the headers, but it still looks bad that they are exported from the shared library. This patch changes it so that the deprecated ref counting functions are defined using a separate macro and only the types that have these functions in the headers call this macro. clutter/cogl/cogl/cogl-framebuffer.c | 1 + clutter/cogl/cogl/cogl-material.c | 1 + clutter/cogl/cogl/cogl-object-private.h | 4 +++- clutter/cogl/cogl/cogl-vertex-buffer.c | 1 + clutter/cogl/cogl/driver/gl/cogl-shader.c | 1 + clutter/cogl/cogl/driver/gles/cogl-shader.c | 1 + 6 files changed, 8 insertions(+), 1 deletions(-) commit 903560c6c8c50c28959c2588d24d288bc2c4db26 Author: Emmanuele Bassi Date: Fri Jul 9 18:37:34 2010 +0100 text: Layouts for single-line-mode entries are boundless A PangoLayout for an editable, single-line text entry is by definition without a given width, since the actor will be clipped when being drawn. clutter/clutter-text.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) commit 1635a2db1256ec1df40a5b920e3afe6a9f9745d9 Author: Robert Bragg Date: Thu Jul 8 11:49:31 2010 +0100 material: use common node type for materials and layers Since 365605cf42, materials and layers are represented in a tree structure that allows traversing up through parents and iterating down through children. This re-works the related typedefs and reparenting code so that they can be shared. clutter/cogl/cogl/cogl-material-arbfp.c | 25 +- clutter/cogl/cogl/cogl-material-private.h | 109 ++++---- clutter/cogl/cogl/cogl-material.c | 479 +++++++++++++++-------------- 3 files changed, 326 insertions(+), 287 deletions(-) commit 9e82fe39444d4f69dc3ca920fdfd94d1ba000136 Author: Damien Lespiau Date: Fri Jul 9 17:55:31 2010 +0100 cogl-texture-pixmap-x11: This API is new in 1.4, not 1.2 CoglTexturePixmapX11 has been introduced in the 1.3 development cycle. A Stability: Unstable tag was missing too, so add it. clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.h | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) commit 892aa455138c692b464b3bce37a548e33d68e083 Author: Damien Lespiau Date: Fri Jul 9 15:59:14 2010 +0100 cogl: Add Stability tag to new experimental API Functions guarded with COGL_ENABLE_EXPERIMENTAL API should be also maked as being Unstable with the Stability gtk-doc tag. Fixes: http://bugzilla.clutter-project.org/show_bug.cgi?id=2175 clutter/cogl/cogl/cogl-material.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit b7f99ddd3c55f3d1356bb162114cbdf85ffb6101 Author: Emmanuele Bassi Date: Fri Jul 9 14:59:32 2010 +0100 script: Let ClutterActor parse behaviours Up until now, the "behaviours" member of an actor definition was parsed by the ClutterScript parser itself - even though it's not strictly necessary. In an effort to minimize the ad hoc code in the Script parser, we should let ClutterActor handle all the special cases that involve actor-specific members. clutter/clutter-actor.c | 66 ++++++++++++++++++++++++++++++ clutter/clutter-script-parser.c | 83 +------------------------------------- clutter/clutter-script-private.h | 1 - clutter/clutter-script.c | 3 - 4 files changed, 67 insertions(+), 86 deletions(-) commit fdc79427a6bf152b11831accbef5ca3b0165f71b Author: Emmanuele Bassi Date: Fri Jul 9 11:40:00 2010 +0100 Add new tests to the ignore files tests/conform/.gitignore | 1 + tests/interactive/.gitignore | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) commit a65429363e5c9dc03f84df3b8d4a95988b602dd1 Author: Neil Roberts Date: Thu Jul 8 18:37:01 2010 +0100 Use GL_MAX_TEXTURE_SIZE on GLES when checking supported tex size Under big GL, _cogl_texture_driver_size_supported uses the proxy texture to check whether the given texture size is supported. Proxy textures aren't available under GLES so previously this would just return TRUE to assume all texture sizes are supported. This patch makes it use glGetIntegerv with GL_MAX_TEXTURE_SIZE to give a second best guess. This fixes the sliced texture backend so that it will use slices when the texture is too big. .../cogl/cogl/driver/gles/cogl-texture-driver.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) commit eb24d2a252b33ce86f9bfa476b12c683d88a4776 Author: Neil Roberts Date: Thu Jul 8 18:33:45 2010 +0100 Fix cogl_texture_get_data when an intermediate buffer is used When an intermediate buffer is used for downloading texture data it was using the wrong byte length for a row so the copy back to the user's buffer would fail. clutter/cogl/cogl/cogl-texture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 9e1bb31922a53a7a27bf03ac92cb9a5cfa743770 Author: Neil Roberts Date: Thu Jul 8 18:31:29 2010 +0100 Use GL_NEAREST filter in the draw-and-read get_data texture fallback The fallback for when glGetTexImage is not available renders the texture to the framebuffer to read the data using glReadPixels. This patch just sets the COGL_MATERIAL_FILTER_NEAREST filter mode on the material before rendering to avoid linear filtering which would alter the texture data. clutter/cogl/cogl/cogl-texture.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 25cf5979e63e093397bad042e3953da7455d0491 Author: Neil Roberts Date: Thu Jul 8 18:29:12 2010 +0100 Use cogl_read_pixels in the cogl texture draw-and-read fallback The fallback for when glGetTexImage is not available draws parts of the texture to the framebuffer and uses glReadPixels to extract the data. However it was using cogl_rectangle to draw and then immediately using raw glReadPixels to fetch the data. This won't cause a journal flush so the rectangle won't necessarily have hit the framebuffer yet. Instead it now uses cogl_read_pixels which does flush the journal. clutter/cogl/cogl/cogl-texture.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) commit e454b9cadfd8393f65ad38030c5fe98a69be2904 Author: Neil Roberts Date: Thu Jul 8 18:28:11 2010 +0100 cogl-material: Fix some problems with flushing texture overrides There were a few problems flushing texture overrides so that sliced textures would not work: * In _cogl_material_set_layer_texture it ignored the 'overriden' parameter and always set texture_overridden to FALSE. * cogl_texture_get_gl_texture wasn't being called correctly in override_layer_texture_cb. It returns a gboolean to indicate the error status but this boolean was being assigned to gl_target. * _cogl_material_layer_texture_equal did not take into account the override. * _cogl_material_layer_get_texture_info did not return the overridden texture so it would always use the first texture slice. clutter/cogl/cogl/cogl-material.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) commit 8beb49164ffeffa867d52c9da89c6dbb6e754e4a Author: Neil Roberts Date: Thu Jul 8 15:15:22 2010 +0100 cogl-texture: Share the common code in the set_region virtual There was a lot of common code that was copied to all of the backends to convert the data to a suitable format and wrap it into a CoglBitmap so that it can be passed to _cogl_texture_driver_upload_subregion_to_gl. This patch moves the common code to cogl-texture.c so that the virtual just takes a CoglBitmap that is already in the right format. clutter/cogl/cogl/cogl-atlas-texture.c | 83 ++++--------------- clutter/cogl/cogl/cogl-sub-texture.c | 21 ++---- clutter/cogl/cogl/cogl-texture-2d-sliced.c | 57 +++----------- clutter/cogl/cogl/cogl-texture-2d.c | 58 +++----------- clutter/cogl/cogl/cogl-texture-private.h | 19 ++++- clutter/cogl/cogl/cogl-texture-rectangle.c | 58 +++----------- clutter/cogl/cogl/cogl-texture.c | 76 +++++++++++++++--- clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c | 6 +- 8 files changed, 136 insertions(+), 242 deletions(-) commit 972c0c24f012e09fd2ad47296f2eba15f8ff11da Author: Neil Roberts Date: Thu Jul 8 14:25:23 2010 +0100 Add a conformance test for cogl_texture_{get_data,set_region} This verifies that calling cogl_texture_get_data returns the same data uploaded to the texture. The bottom quarter of the texture is replaced using cogl_texture_set_region. It tries creating the texture with different sizes and flags in the hope that it will hit different texture backends. tests/conform/Makefile.am | 1 + tests/conform/test-cogl-texture-get-set-data.c | 131 ++++++++++++++++++++++++ tests/conform/test-conform-main.c | 1 + 3 files changed, 133 insertions(+), 0 deletions(-) commit 0577c81c3b2b76e97aeca672b2f39df42e03ad5d Author: Neil Roberts Date: Thu Jul 8 13:54:37 2010 +0100 cogl-texture: Share the common code in the get_data virtual Previously cogl_texture_get_data would pretty much directly pass on to the get_data texture virtual function. This ended up with a lot of common code that was copied to all of the backends. For example, the method is expected to return the required data size if the data pointer is NULL and to calculate its own rowstride if the rowstride is 0. Also it needs to convert the downloaded data if GL can't support that format directly. This patch moves the common code to cogl-texture.c so the virtual is always called with a format that can be downloaded directly by GL and with a valid rowstride. If the download fails then the virtual can return FALSE in which case cogl-texture will use the draw and read fallback. clutter/cogl/cogl/cogl-atlas-texture.c | 2 +- clutter/cogl/cogl/cogl-sub-texture.c | 26 +---- clutter/cogl/cogl/cogl-texture-2d-sliced.c | 93 ++--------------- clutter/cogl/cogl/cogl-texture-2d.c | 102 ++----------------- clutter/cogl/cogl/cogl-texture-private.h | 13 ++- clutter/cogl/cogl/cogl-texture-rectangle.c | 106 +++----------------- clutter/cogl/cogl/cogl-texture.c | 98 ++++++++++++++++++- clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c | 2 +- 8 files changed, 150 insertions(+), 292 deletions(-) commit 4ca1e491dae164559479c218f4118869d0fa9187 Author: Robert Bragg Date: Thu Jul 8 19:20:33 2010 +0100 tests: don't delay/skip frames due to glReadPixel concerns This greatly speeds up running all the conformance tests by no longer delaying many of the tests for a number of dummy frames to be painted. We used to skip frames because we thought there was a problem with the driver's glReadPixels implementation. Although we have seen driver issues at times the real reason the delay was needed was because resizing the stage usually happens asynchronously (because a non synchronous X request is used by clutter_stage_set_size()). We now force all X requests to be synchronized for the conformance tests so this is no longer a problem and we can avoid these hacks. tests/conform/test-cogl-blend-strings.c | 36 +----------- tests/conform/test-cogl-depth-test.c | 29 +-------- tests/conform/test-cogl-materials.c | 24 +-------- tests/conform/test-cogl-multitexture.c | 19 +----- tests/conform/test-cogl-npot-texture.c | 13 +--- tests/conform/test-cogl-pixel-buffer.c | 13 +--- tests/conform/test-cogl-premult.c | 59 ++++++-------------- tests/conform/test-cogl-sub-texture.c | 13 +--- tests/conform/test-cogl-texture-mipmaps.c | 13 +---- tests/conform/test-cogl-texture-rectangle.c | 17 +----- tests/conform/test-cogl-vertex-buffer-contiguous.c | 20 +----- tests/conform/test-cogl-vertex-buffer-interleved.c | 20 +----- tests/conform/test-cogl-vertex-buffer-mutability.c | 21 +------ tests/conform/test-cogl-wrap-modes.c | 17 +----- tests/conform/test-pick.c | 2 +- tests/conform/test-texture-fbo.c | 13 +--- 16 files changed, 63 insertions(+), 266 deletions(-) commit f47152c557c3d21ebacc7b774e94cfa4f6dcb3bc Author: Neil Roberts Date: Wed Apr 7 11:06:20 2010 +0100 cogl-vertex-buffer: Default to GL_CLAMP_TO_EDGE for point sprites For point sprites you are usually drawing the whole texture so you most often want GL_CLAMP_TO_EDGE. This patch removes the override for COGL_MATERIAL_WRAP_MODE_AUTOMATIC when point sprites are enabled for a layer so that it will clamp to edge. clutter/cogl/cogl/cogl-material.h | 6 ++- clutter/cogl/cogl/cogl-vertex-buffer.c | 57 +++++++++++++++++-------------- 2 files changed, 35 insertions(+), 28 deletions(-) commit ad6d597445f58b9ef55c7d3696935b35739957bd Author: Neil Roberts Date: Mon Mar 22 13:48:27 2010 +0000 Add an interactive test for cogl point sprites The test draws some fireworks with trailing sparks that fade out. http://bugzilla.openedhand.com/show_bug.cgi?id=2047 tests/interactive/Makefile.am | 3 +- tests/interactive/test-cogl-point-sprites.c | 280 +++++++++++++++++++++++++++ 2 files changed, 282 insertions(+), 1 deletions(-) commit ab05f6bfb1493bb1a6d17c79656c0efef21da5e1 Author: Neil Roberts Date: Mon Mar 22 13:33:55 2010 +0000 cogl-material: Add support for point sprites This adds a new API call to enable point sprite coordinate generation for a material layer: void cogl_material_set_layer_point_sprite_coords_enabled (CoglHandle material, int layer_index, gboolean enable); There is also a corresponding get function. Enabling point sprite coords simply sets the GL_COORD_REPLACE of the GL_POINT_SPRITE glTexEnv when flusing the material. There is no separate application control for glEnable(GL_POINT_SPRITE). Instead it is left permanently enabled under the assumption that it has no affect unless GL_COORD_REPLACE is enabled for a texture unit. http://bugzilla.openedhand.com/show_bug.cgi?id=2047 clutter/cogl/cogl/cogl-context.c | 14 ++ clutter/cogl/cogl/cogl-material-private.h | 12 +- clutter/cogl/cogl/cogl-material.c | 166 +++++++++++++++++++- clutter/cogl/cogl/cogl-material.h | 44 +++++ clutter/cogl/cogl/cogl-types.h | 5 +- .../cogl/cogl/driver/gl/cogl-feature-functions.h | 7 + clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c | 63 ++++++-- clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.h | 19 ++- clutter/cogl/cogl/driver/gles/cogl.c | 3 + doc/reference/cogl/cogl-sections.txt | 2 + 10 files changed, 305 insertions(+), 30 deletions(-) commit 73642ac9c435709e79c62973fd0523494b9b14fb Author: Neil Roberts Date: Mon Mar 22 09:32:17 2010 +0000 cogl-material: Add a property for setting the point size This adds cogl_material_{get,set}_point_size. If the point size is not 1.0f then glPointSize will be called when the material is flushed. http://bugzilla.openedhand.com/show_bug.cgi?id=2047 clutter/cogl/cogl/cogl-context.c | 2 + clutter/cogl/cogl/cogl-context.h | 2 + clutter/cogl/cogl/cogl-material-private.h | 10 ++- clutter/cogl/cogl/cogl-material.c | 72 ++++++++++++++++++++ clutter/cogl/cogl/cogl-material.h | 33 +++++++++ .../cogl/driver/gles/cogl-fixed-vertex-shader.glsl | 6 ++ clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c | 19 +++++ clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.h | 9 ++- doc/reference/cogl/cogl-sections.txt | 2 + 9 files changed, 151 insertions(+), 4 deletions(-) commit c76d53a9c4be0e7376392c0d9fb1d316aaeae69d Author: Neil Roberts Date: Thu Jul 8 15:28:37 2010 +0100 tests/accessibility: Fix the soname for libclutter The required .so file was named using @CLUTTER_WINSYS@ but since bf9d5f394997 the .so should be named with @CLUTTER_SONAME_INFIX@. This was breaking the build on eglx. tests/accessibility/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit b2decfe7627e605e8ac7de8b372d7e9d4df49a35 Author: Robert Bragg Date: Wed Jul 7 20:43:54 2010 +0100 material: support dumping layer state graph to dot file Recently I added a _cogl_debug_dump_materials_dot_file function for debugging the sparse material state. This extends the state dumped to include the graph of layer state also. clutter/cogl/cogl/cogl-material.c | 133 ++++++++++++++++++++++++++++++------- 1 files changed, 110 insertions(+), 23 deletions(-) commit 7eedf0f2342dc717f8a293627ab1dd13d17eda52 Author: Robert Bragg Date: Wed Jul 7 19:23:57 2010 +0100 material: set ->layer_index on new layers for unit0 We were mistakenly only initializing layer->layer_index for new layers associated with texture units > 0. This had gone unnoticed because normally layers associated with texture unit0 have a layer index of 0 too. Mutter was hitting this issue because it was initializing layer 1 before layer 0 for one of its materials so layer 1 was temporarily associated with texture unit 0. clutter/cogl/cogl/cogl-material.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 9e730727ca3318067164121b52ed62d164884649 Author: Øyvind Kolås Date: Wed Jul 7 18:14:43 2010 +0100 state: add clutter_state_set_state and clutter_state_warp_to_state Replaced clutter_state_change with a boolean argument for animating the transition or not with two separate argument-less methods. clutter/clutter-state.c | 61 +++++++++++++++++++-------- clutter/clutter-state.h | 7 ++- doc/reference/clutter/clutter-sections.txt | 3 +- tests/interactive/test-state-animator.c | 6 +- tests/interactive/test-state.c | 15 ++++--- 5 files changed, 60 insertions(+), 32 deletions(-) commit f87e4037a880b3bf180a547dea1713a99aa3398b Author: Emmanuele Bassi Date: Wed Jul 7 16:30:31 2010 +0100 build: Distcheck fixes after the Cally merge clutter/cally/Makefile.am | 4 +++- doc/reference/cally/Makefile.am | 4 ++-- tests/Makefile.am | 2 +- tests/accessibility/Makefile.am | 14 ++++++++------ 4 files changed, 14 insertions(+), 10 deletions(-) commit e3a8ece54d3a626f012b955a953d0ae69a22ad7a Merge: 175317a a3c69dc Author: Emmanuele Bassi Date: Wed Jul 7 16:06:30 2010 +0100 Merge branch 'cally-merge' * cally-merge: cally: Add introspection generation cally: Improving cally doc cally: Cleaning CallyText cally: Refactoring "window:create" and "window:destroy" emission code cally: Use proper backend information on CallyActor cally: Check HAVE_CONFIG_H on cally-util.c docs: Fix Cally documentation cally: Clean up the headers Add binaries of the Cally examples to the ignore file docs: Add Cally API reference Avoid to load cally module on a11y examples Add accessibility tests Initialize accessibility support on clutter_init Rename some methods and includes to avoid -Wshadow warnings Cally initialization code Add Cally commit 175317a75481b9d3e228258d86e17dfd12263551 Author: Robert Bragg Date: Wed Jul 7 15:58:02 2010 +0100 test-timeline: instantiate a stage so the master clock runs This makes test-timeline get the default stage so there is at least one stage instantiated. Without any stages the master clock will never run which was causing this test to fail. tests/conform/test-timeline.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commit a3c69dc27c5fc492184a2b6948f59ef27b60f10c Author: Emmanuele Bassi Date: Wed Jul 7 15:57:43 2010 +0100 cally: Add introspection generation Toolkits and applications not written in C might still need access to the Cally API to write accessibility extensions based on it for their own native elements. clutter/Makefile.am | 30 +++++++++++++++++++++++++++--- clutter/cally/Makefile.am | 6 ++---- clutter/cogl/cogl/Makefile.am | 2 +- 3 files changed, 30 insertions(+), 8 deletions(-) commit 7d1445afcaee17a341d3e206d7a38d2d3e555e27 Author: Emmanuele Bassi Date: Wed Jul 7 14:50:24 2010 +0100 Restore the report on the conformance test suite The report generation was broken by the split of the various test units; also, we were using GTest in a way that's not really sanctioned by upstream. This commit tries to re-use the targets from GLib's Makefile rules while compensating for our own set up. tests/conform/.gitignore | 4 + tests/conform/Makefile.am | 142 +++++++++++++++++++++++++++----------------- tests/conform/run-tests.sh | 4 +- 3 files changed, 92 insertions(+), 58 deletions(-) commit 608a5a8ae6951dc06c9fcb67b00491d2a60404c0 Author: Emmanuele Bassi Date: Wed Jul 7 14:49:28 2010 +0100 x11: Clean up NET_WM_STATE modifiers Use a separate function to avoid code duplication. clutter/x11/clutter-stage-x11.c | 44 ++++++++++++++++++++++++++++---------- 1 files changed, 32 insertions(+), 12 deletions(-) commit eca398f11309ff91c6a10d51e5358ed28f816397 Author: Emmanuele Bassi Date: Tue Jul 6 17:13:55 2010 +0100 x11: Do not swallow XSettings events We might want pieces higher in the stack (like Mx) to handle XSettings events as well, and swallowing them by removing them from the events queue would make it impossible. clutter/x11/clutter-backend-x11.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) commit a2f8ce175fed304b8e48304ff82703af58022bfb Author: Alejandro Piñeiro Date: Tue Jul 6 16:51:24 2010 +0200 cally: Improving cally doc * Add documentation for all undocumented symbols * Add an overview section clutter/cally/cally-actor.c | 2 +- clutter/cally/cally-actor.h | 8 ++-- clutter/cally/cally-clone.c | 11 ++++ clutter/cally/cally-factory.h | 26 ++++++++++ clutter/cally/cally-rectangle.c | 11 ++++ clutter/cally/cally-root.c | 11 ++++- clutter/cally/cally-stage.c | 65 +++++++++++++++++++++++++ clutter/cally/cally-text.c | 11 ++++ clutter/cally/cally-texture.c | 11 ++++ clutter/cally/cally.c | 11 ++++- doc/reference/cally/Makefile.am | 6 ++- doc/reference/cally/cally-docs.xml.in | 7 ++- doc/reference/cally/cally-overview.xml | 74 +++++++++++++++++++++++++++++ doc/reference/clutter/running-clutter.xml | 4 ++ 14 files changed, 248 insertions(+), 10 deletions(-) commit c931e11e3df98119f1d2c64abc64083453ad0ab4 Author: Alejandro Piñeiro Date: Tue Jul 6 13:28:38 2010 +0200 cally: Cleaning CallyText * Removing superfluous g_return_if_fail * Removing unused ClutterText::text-changed callback clutter/cally/cally-text.c | 18 ------------------ 1 files changed, 0 insertions(+), 18 deletions(-) commit 137790bec9d4c29a4e5504ea49623884e90e3cca Author: Alejandro Piñeiro Date: Tue Jul 6 13:25:44 2010 +0200 cally: Refactoring "window:create" and "window:destroy" emission code Previously "window:create" and "window:destroy" were emitted on CallyUtil. Although it works, and CallyUtil already have callbacks to stage_added/removed signals, I think that it is more tidy/clear to do that on CallyRoot: * CallyRoot already has code to manage ClutterStage addition/removal * In fact, we can see CallyRoot as the object exposing the a11y information from ClutterStageManager, so it fits better here. * CallyUtil callbacks these signals are related to key event listeners (key snooper simulation). One of the main CallyUtil responsabilities is managing event (connecting, emitting), so I would prefer to not start to add/mix more functionalities here. Ideally it would be better to emit all CallyStage methods from CallyStage, but it is clear that "create" and "destroy" are more easy to emit from a external object clutter/cally/cally-root.c | 2 ++ clutter/cally/cally-util.c | 10 ---------- 2 files changed, 2 insertions(+), 10 deletions(-) commit ffd1f125604a2a25015804bcf2b8ebb6503fdd77 Author: Alejandro Piñeiro Date: Tue Jul 6 13:36:48 2010 +0200 cally: Use proper backend information on CallyActor It uses HAVE_CLUTTER_GLX to check the current backend in use for some accessibility related methods. Fixes CB#2071 clutter/cally/cally-actor.c | 4 ++-- clutter/cally/cally-util.c | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) commit d45499f88b3b3fb4b7f5e95434677ad6710776ac Author: Alejandro Piñeiro Date: Wed Jul 7 14:05:27 2010 +0200 cally: Check HAVE_CONFIG_H on cally-util.c clutter/cally/cally-util.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) commit 1dd174add37f5b5e118d3c7ce84019d33dfc9e8f Author: Robert Bragg Date: Wed Jul 7 14:41:54 2010 +0100 framebuffer: Replace CoglHandle with CoglFramebuffer * One more object converted to stop using CoglHandle re:a8c8cbee513 clutter/cogl/cogl/cogl-clip-state.c | 16 ++-- clutter/cogl/cogl/cogl-framebuffer-private.h | 33 ++++---- clutter/cogl/cogl/cogl-framebuffer.c | 121 +++++++++++--------------- clutter/cogl/cogl/cogl-journal.c | 2 +- clutter/cogl/cogl/cogl-texture.c | 2 +- clutter/cogl/cogl/cogl.c | 2 +- clutter/cogl/cogl/cogl.h | 22 +++--- 7 files changed, 88 insertions(+), 110 deletions(-) commit 9b9e764dc1dcc2025e3cabb63ea118fa37ed373d Author: Robert Bragg Date: Tue Jul 6 20:18:26 2010 +0100 material: route fogging state through CoglMaterial Previously cogl_set_fog would cause a flush of the Cogl journal and would directly bang the GL state machine to setup fogging. As part of the ongoing effort to track most state in CoglMaterial to support renderlists this now adds an indirection so that cogl_set_fog now just updates ctx->legacy_fog_state. The fogging state then gets enabled as a legacy override similar to how the old depth testing API is handled. clutter/cogl/cogl/cogl-context.c | 3 +- clutter/cogl/cogl/cogl-context.h | 3 +- clutter/cogl/cogl/cogl-material-arbfp.c | 2 +- clutter/cogl/cogl/cogl-material-fixed.c | 48 ++++++++++++++++++++++ clutter/cogl/cogl/cogl-material-private.h | 20 ++++++++- clutter/cogl/cogl/cogl-material.c | 62 +++++++++++++++++++++++++++++ clutter/cogl/cogl/cogl.c | 54 +++++-------------------- 7 files changed, 143 insertions(+), 49 deletions(-) commit 279e68d8d9a84356c83e32502c5bc5af5160da08 Author: Robert Bragg Date: Tue Jul 6 16:47:09 2010 +0100 osx: explicitly request depth and stencil buffer bits This is a blind patch because I don't know enough about the osx backend and the osx backend probably doesn't even work these days anyway but since people have filed bugs specifically on OSX that imply they don't have a depth or stencil buffer this tries to fix that. Maybe someone will eventually pick up the osx backend again and verify if this helps. http://bugzilla.clutter-project.org/show_bug.cgi?id=1394 clutter/osx/clutter-backend-osx.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 2e0d2cf055050c0dd27841e639a4c98cd182919f Author: Robert Bragg Date: Tue Jul 6 01:21:43 2010 +0100 cogl-buffer: Move malloc fallback logic into CoglBuffer Since we'll want to share the fallback logic with CoglVertexArray this moves the malloc based fallback (for when OpenGL doesn't support vertex or pixel buffer objects) into cogl-buffer.c. clutter/cogl/cogl/cogl-buffer-private.h | 9 +- clutter/cogl/cogl/cogl-buffer.c | 201 ++++++++++++++++++++++++++----- clutter/cogl/cogl/cogl-pixel-array.c | 183 +--------------------------- 3 files changed, 182 insertions(+), 211 deletions(-) commit 2353aa56eacbe13f1024cc066a129615e10583d3 Author: Robert Bragg Date: Mon Jul 5 23:32:55 2010 +0100 cogl-buffer: consider it an error to free a mapped buffer Explicitly warn if we detect that a CoglBuffer is being freed while it is still mapped. Previously we silently unmapped the buffer, but it's not something we want to encourage. clutter/cogl/cogl/cogl-buffer.c | 3 +-- clutter/cogl/cogl/cogl-buffer.h | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) commit 429d7cf696a19181cfd7408344803b757b331b69 Author: Robert Bragg Date: Mon Jul 5 23:24:34 2010 +0100 cogl-buffer: Track the last used bind target in CoglBuffer This makes CoglBuffer track the last used bind target as a private property. This is later used when binding a buffer to map instead of always using the PIXEL_UNPACK target. This also adds some additional sanity checks that code doesn't try to nest binds to the same target or bind a buffer to multiple targets at the same time. clutter/cogl/cogl/cogl-buffer-private.h | 23 +++++++- clutter/cogl/cogl/cogl-buffer.c | 86 +++++++++++++++++++++----- clutter/cogl/cogl/cogl-context.c | 6 +- clutter/cogl/cogl/cogl-context.h | 4 +- clutter/cogl/cogl/cogl-pixel-array-private.h | 1 - clutter/cogl/cogl/cogl-pixel-array.c | 35 ++++++----- clutter/cogl/cogl/cogl-texture.c | 5 +- 7 files changed, 121 insertions(+), 39 deletions(-) commit 551945ce6cc1438eec0b304cb9dc0a1b730bdb7e Author: Robert Bragg Date: Wed Jul 7 13:38:10 2010 +0100 tests: Force X synchronization so the stage size is reliable Normally the asynchronous nature of X means that setting the clutter stage size may really happen an indefinite amount of time later but since the tests are so short lived and may only render a single frame this is not an acceptable semantic. This way we should be able to remove all the hacky sleeps and frame count delays from our tests. tests/conform/test-conform-common.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) commit b24c96189df25df19a164cd477ea634cf41b45d9 Author: Robert Bragg Date: Wed Jul 7 13:31:35 2010 +0100 tests: no longer clean up state between tests Since we now run every test in a separate process there is no need to try and avoid state leakage between tests. This removes the code to cleanup all children of the stage and disconnect handlers from the stage paint signal. We now explicitly print a warning if the users tries to run multiple tests in one process. tests/conform/test-conform-common.c | 43 +++++++--------------------------- 1 files changed, 9 insertions(+), 34 deletions(-) commit 3570852b02fb7a26919bf50cbad1bc76dd4d2be7 Author: Robert Bragg Date: Tue Jul 6 02:01:24 2010 +0100 cogl: expose the semantic differences of gl/gles2 npot textures This adds three new feature flags COGL_FEATURE_TEXTURE_NPOT_BASIC, COGL_FEATURE_TEXTURE_NPOT_MIPMAP and COGL_FEATURE_TEXTURE_NPOT_REPEAT that can tell you if your hardware supports non power of two textures, npot textures + mipmaps and npot textures + wrap modes other than CLAMP_TO_EDGE. The pre-existing COGL_FEATURE_TEXTURE_NPOT feature implies all of the above. By default GLES 2 core supports npot textures but mipmaps and repeat modes can only be used with power of two textures. This patch also makes GLES check for the GL_OES_texture_npot extension to determine if mipmaps and repeating are supported with npot textures. clutter/cogl/cogl/cogl-types.h | 21 ++++++++++++++++++- clutter/cogl/cogl/driver/gl/cogl.c | 5 +++- .../cogl/cogl/driver/gles/cogl-feature-functions.h | 10 +++++++++ clutter/cogl/cogl/driver/gles/cogl.c | 3 ++ 4 files changed, 36 insertions(+), 3 deletions(-) commit 9e5a18fea435a46dd57c53e8e8e0fab867a5bb92 Author: Elliot Smith Date: Tue Jul 6 17:14:22 2010 +0100 cookbook: Fixed typo Removed stray 'd' character. doc/cookbook/actors.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 7c67903a44d8bfdd188a1d8fddbfdd67025d2f48 Author: Elliot Smith Date: Tue Jul 6 16:22:47 2010 +0100 cookbook: Fix build so CSS files get installed I had changed the build so CSS files get put into the HTML build directory; but done it in such a way that they were then being ignored during install. Fixed this. doc/cookbook/Makefile.am | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit e566c56bd14157e496e741e095961ce2babaf6a2 Author: Elliot Smith Date: Tue Jul 6 16:11:46 2010 +0100 cookbook: Moved paragraph where it logically belongs There was a note about constants for keys and where they are defined in Clutter header files; but the sentence about where key modifiers are defined was outside the note. Logically, they belong together. doc/cookbook/events.xml | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) commit 03b19af38ecbf7f51188317c20a368ef24cb448f Author: Elliot Smith Date: Tue Jul 6 16:09:58 2010 +0100 cookbook: Added some judicious note elements In some cases, there were blocks of text which were really asides/interrupts to the flow, but which weren't explicitly marked as such. I fixed them by turning them into blocks. doc/cookbook/events.xml | 4 ++-- doc/cookbook/textures.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit 9a609cf629dd1251a9e995b02c43512dff2b5b39 Author: Elliot Smith Date: Tue Jul 6 16:08:43 2010 +0100 cookbook: Added more information for contributors Suggested use of element for adding detail or asides which would otherwise interrupt the flow of the recipe. doc/cookbook/clutter-cookbook.xml.in | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 15331d3a0106c8087ab2dceccb744b0857e91e09 Author: Elliot Smith Date: Tue Jul 6 16:04:46 2010 +0100 cookbook: Link out to docbook site Corrected the link on the word Docbook, as it was an internal rather than an external . doc/cookbook/clutter-cookbook.xml.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit c108a32c30b31790e92dde0bb9bd06c8ed8bc3d7 Author: Elliot Smith Date: Tue Jul 6 16:00:33 2010 +0100 cookbook: Made docbook element usage consistent Made usage of docbook elements consistent across recipes; to ensure the conventions are kept by others, added a section about how to write and style recipes. doc/cookbook/actors.xml | 22 ++++---- doc/cookbook/clutter-cookbook.xml.in | 57 +++++++++++++++++++- doc/cookbook/events.xml | 97 +++++++++++++++++++--------------- doc/cookbook/textures.xml | 93 ++++++++++++++++++--------------- 4 files changed, 172 insertions(+), 97 deletions(-) commit fe7385cb7d011ade2394b465a12fb4c89a98ad79 Author: Elliot Smith Date: Tue Jul 6 15:42:32 2010 +0100 cookbook: Additional selectors in CSS stylesheet Added some selectors for docbook element types [properties and types], so those elements can be used in recipes doc/common/style.css | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) commit dfe7c554fd6f8d5cf1d5217c7c67b17148e3f145 Author: Elliot Smith Date: Tue Jul 6 15:34:19 2010 +0100 cookbook: Copy the CSS file into the HTML build directory This makes local testing easier, as you can see what the cookbook will look like when installed. doc/cookbook/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit ced7915ea1977bd9d9aa2a70f54f1f2f774ed567 Author: Neil Roberts Date: Tue Jul 6 16:08:06 2010 +0100 cogl-vertex-buffer: Fix the #define for glDisableVertexAttribArray glDisableVertexAttribArray was defined to glEnableVertexAttribArray so it would probably cause crashes if it was ever used. Presumably nothing is using these yet because the generic attributes are not yet tied to shader attributes in a predictable way. clutter/cogl/cogl/cogl-vertex-buffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 6757f41c861481540cbea86dd624860645df0ff1 Author: Robert Bragg Date: Tue Jul 6 14:23:40 2010 +0100 configure: Improves GLES 1.x checks We now always aim to use pkg-config based configuration when possible, but when not configure.ac now knows the difference between GLES_CM libraries that contain EGL symbols (I.e. a separate EGL library doesn't need to be found) and GLESv1_CM libraries that don't contain EGL symbols. http://bugzilla.clutter-project.org/show_bug.cgi?id=2160 configure.ac | 92 +++++++++++++++++++++++++++++++-------------------------- 1 files changed, 50 insertions(+), 42 deletions(-) commit 5cb4e0c5d002809afbce93f477ba968979f0c5be Author: Øyvind Kolås Date: Tue Jul 6 14:26:07 2010 +0100 test-state: fix test for state count after state removal In the .json file used for the test, there is no null -> "base" transition defined only a "clicked" -> "base", when the "clicked" state is removed the "base" state will also disappear. tests/conform/test-state.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) commit 290038ee683d3672b68a063903483440f02407a8 Author: Øyvind Kolås Date: Tue Jul 6 13:38:16 2010 +0100 animator: fix removal of multiple keys When removing keys, sometimes a couple of keys would be remaining. clutter/clutter-animator.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) commit ec05230b97a9b683620af1c84c823eb7d161b64c Author: Øyvind Kolås Date: Tue Jul 6 13:47:49 2010 +0100 state: added clutter_state_key_get_property_type A function to retrieve the type of the value stored in a key, the equivalent already exists for ClutterAnimator. clutter/clutter-state.c | 22 ++++++++++++++++++++++ clutter/clutter-state.h | 1 + doc/reference/clutter/clutter-sections.txt | 17 +++++++++-------- 3 files changed, 32 insertions(+), 8 deletions(-) commit 6d1f697bc42d87e2cdbcdc3cfef91bf98a485b84 Author: Øyvind Kolås Date: Tue Jul 6 13:34:22 2010 +0100 state: automatically remove unused states When there is no further keys with a state as the target state, remove the state (and all transitions that used this state as a target) clutter/clutter-state.c | 24 ++++++++++++++---------- tests/conform/test-state.c | 22 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 10 deletions(-) commit 140f76abf44594dc6b004b381e3ec24b6ecdc208 Author: Alexandros Frantzis Date: Tue Jul 6 13:24:00 2010 +0100 build: Exclude built sources from the dist http://bugzilla.clutter-project.org/show_bug.cgi?id=2169 Signed-off-by: Emmanuele Bassi clutter/cogl/cogl/Makefile.am | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit 1860d45087f85a956e21ce69631b9a1cf0e7436f Author: Damien Lespiau Date: Sun Jun 6 22:47:02 2010 +0100 build: Allow to run the tests from any directory I was fed up to cd into the tests/conform or tests/interactive directories to launch a specific test. Now, with the power the abs_ variants of builddir and srcdir we can run specific test from any directory. http://bugzilla.clutter-project.org/show_bug.cgi?id=2159 configure.ac | 2 ++ tests/conform/.gitignore | 1 + tests/conform/Makefile.am | 6 ++++-- tests/conform/test-launcher.sh | 25 ------------------------- tests/conform/test-launcher.sh.in | 25 +++++++++++++++++++++++++ tests/interactive/.gitignore | 1 + tests/interactive/Makefile.am | 8 +++++--- tests/interactive/wrapper.sh | 15 --------------- tests/interactive/wrapper.sh.in | 15 +++++++++++++++ 9 files changed, 53 insertions(+), 45 deletions(-) commit 739240095ff62a69b6cb34cdee4243fa258e5382 Author: Robert Bragg Date: Tue Jul 6 01:30:25 2010 +0100 debug: Adds a COGL_DEBUG=disable-pbos debug option For testing purposes, either to identify bugs in Cogl or the driver or simulate lack of PBO support COGL_DEBUG=disable-pbos can be used to fallback to malloc instead. clutter/cogl/cogl/cogl-debug.c | 2 ++ clutter/cogl/cogl/cogl-debug.h | 9 +++++---- clutter/cogl/cogl/cogl.c | 3 +++ 3 files changed, 10 insertions(+), 4 deletions(-) commit b4b98358e191f31acb73d773fdd9a8a4b72f3292 Author: Robert Bragg Date: Sat Jul 3 19:05:04 2010 +0100 pango-render: set CLAMP_TO_EDGE wrap mode on glyph_material The pango renderer was causing lots of override materials to be allocated because the vertex_buffer API converts AUTOMATIC mode into REPEAT for backwards compatibility. By explicitly setting the wrap mode to CLAMP_TO_EDGE when creating the glyph_material then the vertex_buffer API will leave it untouched. clutter/cogl/pango/cogl-pango-render.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 82ba7220afcb03f87606a0a8800eb067f0962724 Author: Robert Bragg Date: Mon Jul 5 16:14:00 2010 +0100 pixel-array: Allow passing of hints to cogl_buffer_map This allows you to tell Cogl that you are planning to replace all the buffer's data once it is mapped with cogl_buffer_map. This means if the buffer is currently being accessed by the GPU then the driver doesn't have to stall and wait for it to finish before it can access it from the CPU and can instead potentially allocate a new buffer with undefined data and map that. clutter/cogl/cogl/cogl-buffer-private.h | 3 +- clutter/cogl/cogl/cogl-buffer.c | 8 ++++-- clutter/cogl/cogl/cogl-buffer.h | 36 ++++++++++++++++++++++++++++-- clutter/cogl/cogl/cogl-pixel-array.c | 9 +++++-- tests/conform/test-cogl-pixel-buffer.c | 4 ++- 5 files changed, 49 insertions(+), 11 deletions(-) commit 0273b13d757ad968e29579e283aaf5c54a0e016c Author: Robert Bragg Date: Mon Jul 5 19:49:35 2010 +0100 test-cogl-pixel-array: fix how data is initialized There was a missing '* 4' and '* i' in the for() loops that initialized the first test buffer, so it was containing uninitialized data causing the test to fail. tests/conform/test-cogl-pixel-buffer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit fb79b0c14e20849de5a5d95fd7eab45f763843ef Author: Emmanuele Bassi Date: Tue Jul 6 11:57:16 2010 +0100 moduleset: Update cairo and pixman versions The gtk+ we use for clutter-gtk depends on a new version of Cairo. build/clutter.modules | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) commit aa8ffef5439553f9e06e776285fc58e42d497c84 Author: Emmanuele Bassi Date: Tue Jul 6 11:42:08 2010 +0100 moduleset: Remove libXft The system one should be enough. build/clutter.modules | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit a63eb10855a94426ecd53cc9888f08b1ced1cede Author: Emmanuele Bassi Date: Mon Jul 5 15:10:42 2010 +0100 docs: Fix Cally documentation clutter/cally/cally-actor.c | 64 +++++++++++++++++++++++---------------- clutter/cally/cally-clone.c | 43 ++++++++++++++++++++++++-- clutter/cally/cally-group.c | 19 ++++++++++-- clutter/cally/cally-rectangle.c | 4 +- clutter/cally/cally-root.c | 11 +++---- clutter/cally/cally-stage.c | 5 ++- clutter/cally/cally-text.c | 4 +- clutter/cally/cally-texture.c | 5 ++- 8 files changed, 109 insertions(+), 46 deletions(-) commit 09c6553f0dd086413ce80c17eec05665a6ea03d3 Author: Emmanuele Bassi Date: Mon Jul 5 14:43:18 2010 +0100 cally: Clean up the headers Make Cally follow the single-include header file policy of Clutter and Cogl; this means making cally.h the single include header, and requires a new cally-main.h file for the functions defined by cally.h. Also: • clean up the licensing notice and remove the FSF address; • document the object structures (instance and class); • G_GNUC_CONST-ify the get_type() functions; • reduce the padding for CallyActor sub-classes; • reduce the amount of headers included. clutter/cally/Makefile.am | 3 +- clutter/cally/cally-actor-private.h | 11 ++++-- clutter/cally/cally-actor.c | 11 ++++--- clutter/cally/cally-actor.h | 45 +++++++++++++++++++++++------ clutter/cally/cally-clone.h | 35 ++++++++++++++++++----- clutter/cally/cally-group.h | 34 ++++++++++++++++++---- clutter/cally/cally-main.h | 39 +++++++++++++++++++++++++ clutter/cally/cally-rectangle.h | 35 ++++++++++++++++++----- clutter/cally/cally-root.h | 32 ++++++++++++++++---- clutter/cally/cally-stage.h | 34 ++++++++++++++++++---- clutter/cally/cally-text.c | 6 ++++ clutter/cally/cally-text.h | 53 +++++++++++++++++++++++----------- clutter/cally/cally-texture.h | 35 ++++++++++++++++++----- clutter/cally/cally-util.h | 31 ++++++++++++++++---- clutter/cally/cally.c | 7 ++++ clutter/cally/cally.h | 29 +++++++++++-------- clutter/cally/cally.pc.in | 8 ++-- doc/reference/cally/Makefile.am | 2 +- 18 files changed, 346 insertions(+), 104 deletions(-) commit da4dbbb9260fcbe3a142e0287a6b3b2ea90420ff Author: Emmanuele Bassi Date: Mon Jul 5 14:00:29 2010 +0100 Add binaries of the Cally examples to the ignore file tests/accessibility/.gitignore | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commit e0a1f20ca2a0c38015acde9d1e77fa8c3e484a6c Author: Emmanuele Bassi Date: Mon Jul 5 13:59:36 2010 +0100 docs: Add Cally API reference .gitignore | 14 +++ configure.ac | 2 + doc/reference/Makefile.am | 2 +- doc/reference/cally/Makefile.am | 87 ++++++++++++++++ doc/reference/cally/cally-docs.xml.in | 130 ++++++++++++++++++++++++ doc/reference/cally/cally-sections.txt | 174 ++++++++++++++++++++++++++++++++ doc/reference/cally/cally.types | 9 ++ doc/reference/clutter/Makefile.am | 3 +- 8 files changed, 419 insertions(+), 2 deletions(-) commit e110b3569446b3c950273c69651e9aaed21e28a1 Author: Alejandro Piñeiro Date: Tue Apr 27 12:08:42 2010 +0200 Avoid to load cally module on a11y examples As cally is being integrated on clutter is not required to load cally module anymore. Anyway, it is still required to load the atk bridge by hand. The current way to load it could change in the future, more information here: https://bugzilla.gnome.org/show_bug.cgi?id=612599 https://bugzilla.gnome.org/show_bug.cgi?id=619946 Part [4/4] of CB#2099 tests/accessibility/cally-examples-util.c | 80 +--------------------------- 1 files changed, 3 insertions(+), 77 deletions(-) commit 790d2165f3178cc947455acfd08d42dcafdbdd02 Author: Alejandro Piñeiro Date: Mon Apr 26 20:07:22 2010 +0200 Add accessibility tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2099 Signed-off-by: Emmanuele Bassi configure.ac | 1 + tests/Makefile.am | 2 +- tests/README | 3 + tests/accessibility/Makefile.am | 61 +++++ tests/accessibility/cally-atkcomponent-example.c | 102 ++++++++ .../accessibility/cally-atkeditabletext-example.c | 270 ++++++++++++++++++++ tests/accessibility/cally-atkevents-example.c | 180 +++++++++++++ tests/accessibility/cally-atktext-example.c | 212 +++++++++++++++ tests/accessibility/cally-clone-example.c | 112 ++++++++ tests/accessibility/cally-examples-util.c | 216 ++++++++++++++++ tests/accessibility/cally-examples-util.h | 24 ++ 11 files changed, 1182 insertions(+), 1 deletions(-) commit 8f8e88b692b04fc8cf1949fa1b98c7ae47846a90 Author: Alejandro Piñeiro Date: Mon Apr 26 19:33:49 2010 +0200 Initialize accessibility support on clutter_init Initialize the accessibility support calling cally_accessibility_init Take into account that this is required to at least be sure that CallyUtil class is available. It also modifies cally_accessibility_module_init in order to return if the initialization was fine (and the name, removing the module word). It also removes the gnome accessibility hooks, as it is not anymore module code. Solves CB#2098 clutter/cally/cally.c | 64 +++++++++++++++++++++++++---------------------- clutter/cally/cally.h | 11 ++------ clutter/clutter-main.c | 27 ++++++++++++++++++++ clutter/clutter-main.h | 1 + 4 files changed, 65 insertions(+), 38 deletions(-) commit 774541d71e2518f03bc4fdfb7ad481077a9b0dcb Author: Alejandro Piñeiro Date: Tue Jun 15 13:45:19 2010 +0200 Rename some methods and includes to avoid -Wshadow warnings http://bugzilla.clutter-project.org/show_bug.cgi?id=2097 clutter/cally/cally-actor.c | 5 ++--- clutter/cally/cally-util.c | 14 +++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) commit 72da871c0a918a33b742f3353c73c2e984c46f57 Author: Alejandro Piñeiro Date: Mon Jun 14 18:05:57 2010 +0200 Cally initialization code This commit includes a method to init the a11y support. Two main purposes: * Register the different Atk factories. * Ensure that there are a AtkUtil implementation class available. Part of CB#2097 clutter/cally/cally.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++ clutter/cally/cally.h | 40 +++++++++++++++++++++ 2 files changed, 133 insertions(+), 0 deletions(-) commit c0f753d108b7a2ad23dbf5a5b596f80175442927 Author: Alejandro Piñeiro Date: Mon Jun 14 13:38:25 2010 +0200 Add Cally The Clutter Accessibility Library is an implementation of the ATK, the Accessibility Toolkit, which exposes Clutter actors to accessibility tools. This allows not only writing accessible user interfaces, but also allows testing and verification frameworks based on A11Y technologies to inspect and test a Clutter scene graph. http://bugzilla.clutter-project.org/show_bug.cgi?id=2097 Signed-off-by: Emmanuele Bassi clutter/Makefile.am | 10 +- clutter/cally/Makefile.am | 79 ++ clutter/cally/cally-actor-private.h | 35 + clutter/cally/cally-actor.c | 1491 +++++++++++++++++++++++++++++++++++ clutter/cally/cally-actor.h | 108 +++ clutter/cally/cally-clone.c | 105 +++ clutter/cally/cally-clone.h | 63 ++ clutter/cally/cally-factory.h | 91 +++ clutter/cally/cally-group.c | 138 ++++ clutter/cally/cally-group.h | 65 ++ clutter/cally/cally-rectangle.c | 102 +++ clutter/cally/cally-rectangle.h | 63 ++ clutter/cally/cally-root.c | 273 +++++++ clutter/cally/cally-root.h | 64 ++ clutter/cally/cally-stage.c | 258 ++++++ clutter/cally/cally-stage.h | 62 ++ clutter/cally/cally-text.c | 1255 +++++++++++++++++++++++++++++ clutter/cally/cally-text.h | 63 ++ clutter/cally/cally-texture.c | 103 +++ clutter/cally/cally-texture.h | 63 ++ clutter/cally/cally-util.c | 557 +++++++++++++ clutter/cally/cally-util.h | 61 ++ clutter/cally/cally.pc.in | 18 + configure.ac | 2 + 24 files changed, 5126 insertions(+), 3 deletions(-) commit b9c65510cbae99598bec271e78be9ae737af8e0e Author: Emmanuele Bassi Date: Mon Jul 5 16:45:19 2010 +0100 Update conformance Git ignore file tests/conform/.gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit ae43fe9968d901524003b2d19e6d016d8715a6fd Author: Robert Bragg Date: Mon Jul 5 16:17:34 2010 +0100 conform: don't reference old test_cogl_pixel_buffer symbol Since CoglPixelBuffer was renamed to CoglPixelArray the test entry point was also renamed to test_cogl_pixel_array, but mistakenly the corresponding test-conform-main.c change wasn't pushed at the same time. tests/conform/test-conform-main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 3e03ba1e7e11d44f5afd290e0d6f1e7fe77f9786 Author: Robert Bragg Date: Sat Jul 3 21:11:33 2010 +0100 cogl-object: cogl_is_XYZ prototype should take void * This changes the cogl_is_XYZ function prototypes generated when using the COGL_OBJECT_DEFINE macro to take a void * argument instead of a CoglHandle argument. clutter/cogl/cogl/cogl-object-private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 8a5aed36fe8e9cd57c4644653a8e7103ca946bc3 Author: Robert Bragg Date: Sun Jul 4 00:49:31 2010 +0100 pixel-array: Only allow allocation of arrays with a 2D size This removes cogl_pixel_array_new which just took a size in bytes. Without the image size and pixel format then the driver often doesn't have enough information to allocate optimal GPU memory that can be textured from directly. This is because GPUs often have ways to spatially alter the layout of a texture to improve cache access patterns which may require special alignment and padding dependant in the images width, height and bpp. Although currently we are limited by OpenGL because it doesn't let us pass on the width and height when allocating a PBO, the hope is that we can define a better extension at some point. clutter/cogl/cogl/cogl-pixel-array.c | 6 ++-- clutter/cogl/cogl/cogl-pixel-array.h | 16 ------------- tests/conform/test-cogl-pixel-buffer.c | 38 +++++++++++++++++-------------- 3 files changed, 24 insertions(+), 36 deletions(-) commit cfef390d87076454195d6b2288cb7fa9c17acf4b Author: Robert Bragg Date: Sun Jul 4 00:45:12 2010 +0100 pixel-array: rename new_from_size to new_with_size It is more in keeping with other coding conventions in Cogl to use new "with" size instead of new "from" size. clutter/cogl/cogl/cogl-pixel-array.c | 8 ++++---- clutter/cogl/cogl/cogl-pixel-array.h | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) commit 8ae0478850461285fa8e2d493a79fccd6c94c7fb Author: Robert Bragg Date: Sun Jul 4 00:18:10 2010 +0100 cogl-buffer-private.h: cleanup up the coding style This file was following the Clutter coding style of arranging prototypes into columns which Cogl doesn't copy. clutter/cogl/cogl/cogl-buffer-private.h | 42 ++++++++++++++++++------------ 1 files changed, 25 insertions(+), 17 deletions(-) commit 54f4a3a7526bf0b0a188ae1c865ed64581395507 Author: Robert Bragg Date: Sat Jul 3 23:46:03 2010 +0100 rename CoglPixelBuffer to CoglPixelArray This renames CoglPixelBuffer to CoglPixelArray to be consistent with the new CoglVertexArray API. clutter/cogl/cogl/Makefile.am | 6 +- clutter/cogl/cogl/cogl-buffer.c | 2 +- clutter/cogl/cogl/cogl-pixel-array-private.h | 74 ++++++ clutter/cogl/cogl/cogl-pixel-array.c | 324 +++++++++++++++++++++++++ clutter/cogl/cogl/cogl-pixel-array.h | 147 +++++++++++ clutter/cogl/cogl/cogl-pixel-buffer-private.h | 73 ------ clutter/cogl/cogl/cogl-pixel-buffer.c | 323 ------------------------ clutter/cogl/cogl/cogl-pixel-buffer.h | 146 ----------- clutter/cogl/cogl/cogl-texture.c | 14 +- clutter/cogl/cogl/cogl.h | 2 +- tests/conform/test-cogl-pixel-buffer.c | 24 +- 11 files changed, 569 insertions(+), 566 deletions(-) commit 57341dbb607280410bcfaf19d09876570a966a3b Author: Robert Bragg Date: Sat Jul 3 21:30:33 2010 +0100 cogl-buffer: make the COGL_BUFFER_USAGE_HINT private The usage hint should be implied by the CoglBuffer subclass type so the public getter and setter APIs for manually changing the usage hint of a CoglBuffer have now been removed. clutter/cogl/cogl/cogl-buffer-private.h | 9 ++++++ clutter/cogl/cogl/cogl-buffer.c | 22 --------------- clutter/cogl/cogl/cogl-buffer.h | 44 ------------------------------- tests/conform/test-cogl-pixel-buffer.c | 5 --- 4 files changed, 9 insertions(+), 71 deletions(-) commit 7820842262a086d2075f7fc5c043a589a05e4825 Author: Robert Bragg Date: Sat Jul 3 23:56:44 2010 +0100 cogl-buffer: Handle subclass registration like cogl-texture Instead of having to extend cogl_is_buffer with new buffer types manually this now adds a new COGL_BUFFER_DEFINE macro to be used instead of COGL_OBJECT_DEFINE for CoglBuffer subclasses. This macro will automatically register the new type with ctx->buffer_types which will iterated by cogl_is_buffer. This is the same coding pattern used for CoglTexture. clutter/cogl/cogl/cogl-buffer-private.h | 12 ++++++++++++ clutter/cogl/cogl/cogl-buffer.c | 28 +++++++++++++++++++++++++--- clutter/cogl/cogl/cogl-context.c | 2 ++ clutter/cogl/cogl/cogl-context.h | 4 ++++ clutter/cogl/cogl/cogl-pixel-buffer.c | 2 +- 5 files changed, 44 insertions(+), 4 deletions(-) commit 90931e261fbfd75b52330817e5f28981303be3a6 Author: Robert Bragg Date: Sat Jul 3 20:24:36 2010 +0100 pixel-buffer: Replace CoglHandle with CoglPixelBuffer * One more file converted to stop using CoglHandle re:a8c8cbee513 clutter/cogl/cogl/cogl-buffer-private.h | 5 ++- clutter/cogl/cogl/cogl-pixel-buffer-private.h | 4 +- clutter/cogl/cogl/cogl-pixel-buffer.c | 26 ++++++++++++------------ clutter/cogl/cogl/cogl-pixel-buffer.h | 18 +++++++++------- 4 files changed, 28 insertions(+), 25 deletions(-) commit baacf2e707fced48d9dc658527f7b599ce609029 Author: Robert Bragg Date: Fri Jul 2 18:04:45 2010 +0100 cogl-material: Adds debug api to dump sparse material graph This adds a _cogl_debug_dump_materials_dot_file function that can be used to dump all the descendants of the default material to a file using the dot format which can then be converted to an image to visualize. clutter/cogl/cogl/cogl-material.c | 165 +++++++++++++++++++++++++++++++++++++ 1 files changed, 165 insertions(+), 0 deletions(-) commit f3b75541c7b5c286911c6761e902e74bb39c6ed7 Author: Robert Bragg Date: Sun Jul 4 02:44:37 2010 +0100 cogl-vertex-buffer.h: #include cogl-vertex-buffer.h was assuming that the platforms GL headers had already been included but that shouldn't have to be the case. clutter/cogl/cogl/cogl-vertex-buffer.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit ed232070837c77bfaf7c2c7f522bac73a80d2b63 Author: Robert Bragg Date: Sat Jul 3 21:10:05 2010 +0100 cogl-object-private.h: #include glib.h and cogl-types.h cogl-object-private.h was only working in places that had already included glib.h and cogl-types.h clutter/cogl/cogl/cogl-object-private.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit cf8e88768fcd98ccd9ebb9b080264eec882b2268 Author: Robert Bragg Date: Sat Jul 3 18:44:47 2010 +0100 material: don't keep extra ref on copy-on-write materials In _cogl_material_pre_change_notify if a material with descendants is modified then we create a new material that is a copy of the one being modified and reparent those descendants to the new material. This patch ensures we drop the reference we get from cogl_material_copy since we can rely on the descendants to keep the new material alive. clutter/cogl/cogl/cogl-material.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 70925a31949dee013a97ed6aff1f62e98b8f1076 Author: Robert Bragg Date: Fri Jul 2 01:07:36 2010 +0100 build: Fix GLES builds since the material backend split The commit to split the fragment processing backends out from cogl-material.c (3e1323a6362906a95) broke the GLES 1 and 2 builds the fix was to guard the code in each backend according to the COGL_MATERIAL_BACKEND_XYZ defines which are setup in cogl-material-private.h. clutter/cogl/cogl/cogl-material-arbfp.c | 7 ++++++- clutter/cogl/cogl/cogl-material-fixed.c | 7 ++++++- clutter/cogl/cogl/cogl-material-glsl.c | 7 ++++++- clutter/cogl/cogl/cogl-material-private.h | 2 ++ 4 files changed, 20 insertions(+), 3 deletions(-) commit 9313f44e67b131543e358fe8461e33a3d1210b2d Author: Emmanuele Bassi Date: Fri Jul 2 17:48:19 2010 +0100 docs: Add a cogl-paths section The path primitives have a specific section, now, and gtk-doc is loudly complaining about it being defined but not referenced. doc/reference/cogl/cogl-docs.xml.in | 1 + doc/reference/cogl/cogl-sections.txt | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) commit 38941372bf09e0d36752ab8e9be626dc744bf847 Author: Øyvind Kolås Date: Fri Jul 2 16:44:54 2010 +0100 state: rename property "target-state" to "state" This reduces the amount of typing, and should provide for more readable code for most uses of ClutterState. clutter/clutter-state.c | 80 ++++++++++++------------ clutter/clutter-state.h | 94 ++++++++++++++-------------- doc/reference/clutter/clutter-sections.txt | 2 +- tests/interactive/test-state.c | 4 +- 4 files changed, 89 insertions(+), 91 deletions(-) commit 25509e6a7b04be9b40c9fa0821901e88d4b7ec03 Author: Neil Roberts Date: Fri Jul 2 16:19:48 2010 +0100 Convert the ASCII art documentation in cogl-vertex-buffer to PNGs The documentation for cogl_vertex_buffer_indices_get_for_quads was using ugly ASCII art to draw the diagrams. These have now been replaced with PNG figures. clutter/cogl/cogl/cogl-vertex-buffer.h | 35 ++++++++++--------------- doc/reference/cogl/Makefile.am | 4 +++ doc/reference/cogl/quad-indices-order.png | Bin 0 -> 2620 bytes doc/reference/cogl/quad-indices-triangles.png | Bin 0 -> 8018 bytes 4 files changed, 18 insertions(+), 21 deletions(-) commit 86500cd3d5bda3025da90105fb80127069e4ddef Author: Neil Roberts Date: Fri Jul 2 13:49:34 2010 +0100 Add CoglMaterialWrapMode to the Cogl docs and fix docs for the getters CoglMaterialWrapMode was missing from the cogl-sections.txt file so it wasn't getting displayed. There were also no documented return values from the getters. clutter/cogl/cogl/cogl-material.h | 4 ++++ doc/reference/cogl/cogl-sections.txt | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) commit 9338df438c0e9683e4eb9387d0897fc638b91a19 Author: Emmanuele Bassi Date: Fri Jul 2 11:38:22 2010 +0100 align-constraint: Offset the position after the alignment factor Instead of aligning (pos + size), align on size alone, and then offset by pos. http://bugzilla.clutter-project.org/show_bug.cgi?id=2168 clutter/clutter-align-constraint.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit 884df17536a11c092880392232ecc7c5b71f39a7 Author: Neil Roberts Date: Thu Jul 1 20:34:59 2010 +0100 Fix building the tesselator code for GLES The tesselator code uses some defines that it expects to be in the GL headers such as GLAPI and GLAPIENTRY. These are used to mark the entry points as exportable on each platform. We don't really want the tesselator code to use these but we also don't want to modify the C files so instead they are #defined to be empty in the stub glu.h. That header is only included internally when building the tesselator/ files so it shouldn't affect the rest of Cogl. GLES also doesn't have a GLdouble type so we just #define this to be a regular double. clutter/cogl/cogl/cogl-path.c | 4 +- clutter/cogl/cogl/tesselator/GL/glu.h | 14 +++++++++++++ clutter/cogl/cogl/tesselator/tesselator.h | 30 ++++++++++++++-------------- 3 files changed, 31 insertions(+), 17 deletions(-) commit c019ff241d472edba3d54f8e698ea1f80c26a651 Author: Emmanuele Bassi Date: Thu Jul 1 16:05:41 2010 +0100 cookbook: Fix up the textures section doc/cookbook/textures.xml | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) commit da06f650df3366c3d342da32c4e04ac7c7efc66c Author: Emmanuele Bassi Date: Thu Jul 1 15:59:15 2010 +0100 cookbook: Fix examples doc/cookbook/actors.xml | 60 ++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 31 deletions(-) commit b74c722670bfa0e17c6fe9d51ec5afc614318a05 Author: Neil Roberts Date: Thu Jul 1 15:27:03 2010 +0100 cogl-material: Don't doubly ref the parent in cogl_material_copy cogl_material_copy was taking a reference on the original texture when making a copy. However it then calls _cogl_material_set_parent on the material which also takes a reference on the parent. The second reference is cleaned up whenever _cogl_material_unparent is called and this is also called by _cogl_material_free. However, it seems that nothing was cleaning up the first reference. I think the reference is entirely unnecessary so this patch removes it. clutter/cogl/cogl/cogl-material.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit daf19205e0fe367acb6b79f240c2123156a13348 Author: Emmanuele Bassi Date: Thu Jul 1 14:09:37 2010 +0100 align-constraint: Follow the position of the source The AlignConstraint update is using only the width/height of the source, but it should also take into account the position. Also, instead of using the ::notify signal, it should follow the BindConstraint, and switch to the ::allocation-changed signal, since it's less expensive (one emission instead of four notifications, one for each property we use). clutter/clutter-align-constraint.c | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) commit b625d94362b69fcd4dee6dfa621429c5b07ff0ea Author: Robert Bragg Date: Thu Jul 1 12:21:25 2010 +0100 cogl: don't include cogl-vector.h twice in cogl.h cogl-vector.h should only be included by cogl.h when COGL_ENABLE_EXPERIMENTAL_API is defined. This removes the unguarded duplicate include. clutter/cogl/cogl/cogl.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 5187804e13d43cc40cd255b58ef2425dbbba2b76 Author: Emmanuele Bassi Date: Thu Jul 1 12:17:01 2010 +0100 cookbook: Clean up build Create two HTML versions of the cookbook: • single page • multiple pages Use the online version of the DocBook XHTML XSL, and disable the PDF generation until we can restore it. .gitignore | 1 + doc/cookbook/Makefile.am | 28 ++++++++++++++++++---------- 2 files changed, 19 insertions(+), 10 deletions(-) commit 089b9b545e393848a0f8bce73d2a8468566d56c6 Author: Emmanuele Bassi Date: Thu Jul 1 11:29:46 2010 +0100 cookbook: Split the cookbook chapters Use separate files, to avoid making the XML too big and uneditable. This breaks the PDF build. doc/cookbook/Makefile.am | 13 +- doc/cookbook/actors.xml | 260 +++++++ doc/cookbook/animations.xml | 42 ++ doc/cookbook/clutter-cookbook.xml.in | 1255 +--------------------------------- doc/cookbook/events.xml | 337 +++++++++ doc/cookbook/introduction.xml | 103 +++ doc/cookbook/recipe-template.xml | 24 + doc/cookbook/textures.xml | 483 +++++++++++++ 8 files changed, 1270 insertions(+), 1247 deletions(-) commit 9c11538bee618c52809e936f7d218901a15d3d8b Author: Emmanuele Bassi Date: Thu Jul 1 11:08:51 2010 +0100 cookbook: Fix up the examples doc/cookbook/clutter-cookbook.xml.in | 56 +++++++++++++++++----------------- 1 files changed, 28 insertions(+), 28 deletions(-) commit 534472a0d46688b660bac41f0a0f3797059d2be9 Author: Robert Bragg Date: Wed Jun 30 18:06:04 2010 +0100 cogl: declare experimental symbols consistently We had several different ways of exposing experimental API, in one case the symbols had no special suffix, in two other ways the symbols were given an _EXP suffix but in different ways. This makes all experimental API have an _EXP suffix which is handled using #defines in the header so the prototypes in the .c and .h files don't have the suffix. The documented reason for the suffix is so that anyone watching Cogl for ABI changes who sees symbols disappear will hopefully understand what's going on. clutter/cogl/cogl/cogl-buffer.c | 32 ++++---- clutter/cogl/cogl/cogl-buffer.h | 67 ++++------------ clutter/cogl/cogl/cogl-pixel-buffer.c | 82 ++++---------------- clutter/cogl/cogl/cogl-pixel-buffer.h | 47 +++-------- clutter/cogl/cogl/cogl-vector.h | 22 +++++ clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.h | 56 ++++---------- 6 files changed, 96 insertions(+), 210 deletions(-) commit 06710027485f1b836a2d143cf86c743eb913d9c3 Author: Emmanuele Bassi Date: Wed Jun 30 17:26:34 2010 +0100 cookbook: Fix entity typo doc/cookbook/clutter-cookbook.xml.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 54aa553d0f691268346657fd661450ed9bf8845a Author: Emmanuele Bassi Date: Wed Jun 30 17:18:15 2010 +0100 cookbook: Re-style Use a modified version of the Poky Handbook CSS for the HTML version of the Cookbook. Promote Elliot as author. Re-license from the GPLv2.0 to the CC BY-NC-SA 2.0. doc/common/style.css | 992 +++++++++++++++++++++++++++++++--- doc/cookbook/Makefile.am | 6 +- doc/cookbook/clutter-cookbook.xml.in | 36 +- doc/cookbook/images/clutter-logo.png | Bin 0 -> 3270 bytes 4 files changed, 953 insertions(+), 81 deletions(-) commit 698743d4549660b1409e425ed9268a03df54650a Author: Neil Roberts Date: Wed Jun 30 15:51:52 2010 +0100 cogl/tesselator: Update to the latest code from GLU This grabs the latest code for libtess from git Mesa. This is mostly so that we can get the following commit which fixes a lot of compiler warnings in Clutter: commit 75acb896c6da758d03e86f8725d6ca0cb2c6ad82 Author: Neil Roberts Date: Wed Jun 30 12:41:11 2010 +0100 glu: Fix some compiler warnings in libtess When compiled with the more aggressive compiler warnings such as -Wshadow and -Wempty-body the libtess code gives a lot more warnings. This fixes the following issues: * The 'Swap' macro tries to combine multiple statements into one and then consume the trailing semicolon by using if(1){/*...*/}else. This gives warnings because the else part ends up with an empty statement. It also seems a bit dangerous because if the semicolon were missed then it would still be valid syntax but it would just ignore the following statement. This patch replaces it with the more common idiom do { /*...*/ } while(0). * 'free' was being used as a local variable name but this shadows the global function. This has been renamed to 'free_handle' * TRUE and FALSE were being unconditionally defined. Although this isn't currently a problem it seems better to guard them with #ifndef because it's quite common for them to be defined in other headers. https://bugs.freedesktop.org/show_bug.cgi?id=28845 clutter/cogl/cogl/tesselator/geom.c | 2 +- clutter/cogl/cogl/tesselator/mesh.c | 4 ++++ clutter/cogl/cogl/tesselator/normal.c | 4 ++++ clutter/cogl/cogl/tesselator/priorityq-heap.c | 22 +++++++++++++--------- clutter/cogl/cogl/tesselator/priorityq.c | 2 +- clutter/cogl/cogl/tesselator/render.c | 8 ++++++-- clutter/cogl/cogl/tesselator/sweep.c | 4 ++++ clutter/cogl/cogl/tesselator/tess.c | 4 ++++ 8 files changed, 37 insertions(+), 13 deletions(-) commit 4ed4e86e75a0837080324ecbb5022d49add74758 Author: Emmanuele Bassi Date: Wed Jun 30 15:50:47 2010 +0100 docs: Various fixes for gtk-doc clutter/clutter-alpha.c | 22 +++++++++++----------- clutter/clutter-animator.c | 8 ++++---- clutter/clutter-script.c | 20 ++++++++++---------- clutter/cogl/cogl/cogl.h | 10 +++++----- doc/reference/clutter/Makefile.am | 1 + doc/reference/cogl/Makefile.am | 12 ++++++------ 6 files changed, 37 insertions(+), 36 deletions(-) commit 005a99f346fa0f253ee82b17af656a7d3e8fbeb0 Author: Emmanuele Bassi Date: Wed Jun 30 15:00:01 2010 +0100 backend: Move one-off free in finalize() Instead of using dispose(). clutter/clutter-backend.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) commit 7ca340fade26643a17c5048022abc49ac8fcb782 Author: Emmanuele Bassi Date: Wed Jun 30 14:58:47 2010 +0100 docs: Avoid warnings from the g-ir-scanner The scanner has some issues when parsing valid gtk-doc annotations; we should make its (and, in return, ours) life easier. We still get warnings for code declared in sections, unfortunately. clutter/clutter-actor.c | 10 +++++----- clutter/clutter-align-constraint.c | 12 ++++++------ clutter/clutter-alpha.c | 3 +-- clutter/clutter-units.c | 2 +- 4 files changed, 13 insertions(+), 14 deletions(-) commit e32c6c123571de2e09d5f5bdb93c8666a93d6535 Author: Robert Bragg Date: Tue Jun 22 14:02:17 2010 +0100 material: Replace CoglHandle with CoglMaterial * As part of the ongoing effort to remove CoglHandle from the API this switches the cogl_material API to use a strongly typed CoglMaterial pointer instead of CoglHandle. clutter/cogl/cogl/cogl-context.h | 10 +- clutter/cogl/cogl/cogl-material-private.h | 46 ++-- clutter/cogl/cogl/cogl-material.c | 435 ++++++++++++----------------- clutter/cogl/cogl/cogl-material.h | 270 ++++++++++--------- 4 files changed, 349 insertions(+), 412 deletions(-) commit 3e1323a6362906a956131a1e4639b69776dbc188 Author: Robert Bragg Date: Tue Jun 15 16:44:52 2010 +0100 material: Split the fragment processing backends out This splits the fragment processing backends (glsl, arbfp and fixed) out from cogl-material.c into their own cogl-material-{glsl,arbfp,fixed}.c files in an effort to help and keep cogl-material.c maintainable. clutter/cogl/cogl/Makefile.am | 6 + clutter/cogl/cogl/cogl-material-arbfp-private.h | 36 + clutter/cogl/cogl/cogl-material-arbfp.c | 1029 ++++++++++++++++++ clutter/cogl/cogl/cogl-material-fixed-private.h | 36 + clutter/cogl/cogl/cogl-material-fixed.c | 201 ++++ clutter/cogl/cogl/cogl-material-glsl-private.h | 36 + clutter/cogl/cogl/cogl-material-glsl.c | 123 +++ clutter/cogl/cogl/cogl-material-private.h | 83 ++- clutter/cogl/cogl/cogl-material.c | 1309 +---------------------- 9 files changed, 1587 insertions(+), 1272 deletions(-) commit 411438f3099dc368bf17b517c970a03e11ffda44 Author: Robert Bragg Date: Wed Jun 30 03:31:37 2010 +0100 material: remove a duplicate gtk-doc "Since: 1.4" The cogl_material_get_depth_writing_enabled documentation had two "Since: 1.4" annotations which was confusing the gobject introspection scanner. clutter/cogl/cogl/cogl-material.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit f4e825b81da6dda14d5d4f4ea8501a2c25bf40f9 Author: Robert Bragg Date: Wed Jun 30 11:23:16 2010 +0100 backend: fix double free of priv->font_name If the backend was disposed then priv->font_name would be freed but not set to NULL and so if clutter_backend_get_font_name was then called it would double free priv->font_name. clutter/clutter-backend.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 268bfccd28b6ccca60c9505cd3ddc009549c7484 Author: Emmanuele Bassi Date: Wed Jun 30 13:26:32 2010 +0100 build: Redirect xsltproc to a directory Apparently, xsltproc recognizes a directory if it has a '/' at the end of its path, and not by doing the sensible thing and stat()'ing the argument for the --output option. doc/cookbook/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 40c45ef29b73a81046c2b5e2fee4687a63500256 Author: Emmanuele Bassi Date: Wed Jun 30 12:53:20 2010 +0100 Post-release version bump to 1.3.7 configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)