1
# Generated by configure. Do no edit.
1
# Generated by configure. Do not edit.
3
commit 7b5692f8b362d8c39a165d7457fe4e88a67db9df
4
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5
Date: Mon Mar 15 16:25:46 2010 +0000
10
1 files changed, 2 insertions(+), 2 deletions(-)
12
commit 7a3fe4c056a64bcf04905b12cc35dd03f8c120fc
13
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14
Date: Mon Mar 15 16:04:34 2010 +0000
18
NEWS | 29 +++++++++++++++++++++++++++++
19
1 files changed, 29 insertions(+), 0 deletions(-)
21
commit 60d8369a1afaba4efdd64688e4157bc4b48b7525
22
Author: Colin Walters <walters@verbum.org>
23
Date: Fri Mar 12 17:39:27 2010 -0500
25
Return and warn if a handle's refcount is <= 0
27
This makes it more likely consumers notice invalid unreferences.
28
GObject has the same assertion.
30
http://bugzilla.openedhand.com/show_bug.cgi?id=2029
32
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
34
clutter/cogl/cogl/cogl-util.c | 1 +
35
1 files changed, 1 insertions(+), 0 deletions(-)
37
commit c274118a8f7ed18e5bc703e614a9ea0a7cdb553c
38
Author: Bastian Winkler <buz@netbuz.org>
39
Date: Tue Mar 2 09:26:57 2010 +0100
41
model: Use guint for the n_columns field
43
clutter_model_get_n_columns is supposed to return a guint, so the
44
n_columns field needs to be a guint with the initial value set to 0.
46
http://bugzilla.openedhand.com/show_bug.cgi?id=2017
48
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
50
clutter/clutter-model.c | 4 ++--
51
1 files changed, 2 insertions(+), 2 deletions(-)
53
commit c2faaa4f39d3ad69523e806bffe4651545c0bdea
54
Author: Neil Roberts <neil@linux.intel.com>
55
Date: Tue Mar 9 16:37:52 2010 -0800
57
cogl-texture-2d: Determine format before checking texture support
59
When entering cogl_texture_2d_new_from_bitmap the internal format can
60
be COGL_PIXEL_FORMAT_ANY. This was causing _cogl_texture_2d_can_create
61
to use an invalid GL format type. Mesa apparently ignores this but it
62
was causing errors when Cogl is compiled with debugging under NVidia.
64
http://bugzilla.openedhand.com/show_bug.cgi?id=2026
66
clutter/cogl/cogl/cogl-texture-2d.c | 3 +++
67
1 files changed, 3 insertions(+), 0 deletions(-)
69
commit a25885edf294be0bc4a6710cc3fd7dec4b3ef013
70
Author: Owen W. Taylor <otaylor@fishsoup.net>
71
Date: Mon Mar 1 16:49:04 2010 -0500
73
Fix checks for out-of-bounds coordinates and repeats
75
Add a return result from CoglTexture.transform_quad_coords_to_gl(),
76
so that we can properly determine the nature of repeats in
77
the face of GL_TEXTURE_RECTANGLE_ARB, where the returned
78
coordinates are not normalized.
80
The comment "We also work out whether any of the texture
81
coordinates are outside the range [0.0,1.0]. We need to do
82
this after calling transform_coords_to_gl in case the texture
83
backend is munging the coordinates (such as in the sub texture
84
backend)." is disregarded and removed, since it's actually
85
the virtual coordinates that determine whether we repeat,
86
not the GL coordinates.
88
Warnings about disregarded layers are used in all cases where
89
applicable, including for subtextures.
91
http://bugzilla.openedhand.com/show_bug.cgi?id=2016
93
Signed-off-by: Neil Roberts <neil@linux.intel.com>
95
clutter/cogl/cogl/cogl-atlas-texture.c | 2 +-
96
clutter/cogl/cogl/cogl-primitives.c | 40 ++++++++++------------------
97
clutter/cogl/cogl/cogl-sub-texture.c | 9 +++---
98
clutter/cogl/cogl/cogl-texture-2d-sliced.c | 22 +++++++++++++--
99
clutter/cogl/cogl/cogl-texture-2d.c | 15 ++++++++--
100
clutter/cogl/cogl/cogl-texture-private.h | 18 ++++++++++--
101
clutter/cogl/cogl/cogl-texture.c | 2 +-
102
7 files changed, 66 insertions(+), 42 deletions(-)
104
commit 382b38c0f7fa79ed1679875db4c7b10e26fff039
105
Author: Emmanuele Bassi <ebassi@linux.intel.com>
106
Date: Wed Mar 10 00:25:26 2010 +0000
108
test-paint-wrapper: Request ARGB visuals on GLX
110
If we are on GLX we have to request ARGB visuals, otherwise Clutter will
113
tests/interactive/test-paint-wrapper.c | 12 ++++++++++++
114
1 files changed, 12 insertions(+), 0 deletions(-)
116
commit 6bd1846d6c39d27863a6fc89356324c0cb3a57ce
117
Author: José Dapena Paz <jdapena@igalia.com>
118
Date: Mon Mar 8 15:37:36 2010 +0100
120
Fix argb initialisation.
122
Fix clutter initialisation if argb visuals are enabled, setting a border
123
color on creating the dummy window. This should avoid BadMatch happening
124
when the depth of the root window visual is not the same of the depth
127
http://bugzilla.openedhand.com/show_bug.cgi?id=2011
129
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
131
clutter/glx/clutter-backend-glx.c | 3 ++-
132
1 files changed, 2 insertions(+), 1 deletions(-)
134
commit 3d2d932835bd74d497fcbec6695208be155924d0
135
Author: Emmanuele Bassi <ebassi@linux.intel.com>
136
Date: Sun Mar 7 23:46:59 2010 +0000
138
actor: Remove some double indirection
140
Use an intermediate variable to avoid a double indirection when accessing
141
the instance private data structure.
143
clutter/clutter-actor.c | 44 ++++++++++++++++++++++++++++----------------
144
1 files changed, 28 insertions(+), 16 deletions(-)
146
commit 9ad1197cb21552cd0db03158eae0ce2742c52ede
147
Author: Emmanuele Bassi <ebassi@linux.intel.com>
148
Date: Sun Mar 7 20:54:33 2010 +0000
150
json: Improve strictness of the JSON parser
152
Backport of the upstream JSON-GLib commit that improved the strictness
155
The original upstream commit is:
157
29881f03468db08bfb404cfcd5b61b4cdc419a87
159
clutter/json/json-parser.c | 98 +++++++++++++++++++++++++++++++++++--------
160
1 files changed, 79 insertions(+), 19 deletions(-)
162
commit 7c6567704d0adc3a5456d5ac3bedb85fb6b55709
163
Author: Emmanuele Bassi <ebassi@linux.intel.com>
164
Date: Fri Mar 5 11:39:32 2010 +0000
166
Add test-cogl-texture-rectangle to the ignore file
169
1 files changed, 1 insertions(+), 0 deletions(-)
171
commit ac074bc0f06658a59f05d1e1d0b149ccf5117448
172
Author: Emmanuele Bassi <ebassi@linux.intel.com>
173
Date: Fri Mar 5 08:48:52 2010 +0000
175
eglnative: Connect StageWindow.show and .hide
177
The show() and hide() methods of the StageWindow interface are
178
implemented but not assigned when initializing the interface
181
clutter/eglnative/clutter-stage-egl.c | 2 ++
182
1 files changed, 2 insertions(+), 0 deletions(-)
184
commit dbe2acc2b1dcba44964f7fafcb242dd346de5f40
185
Author: Emmanuele Bassi <ebassi@linux.intel.com>
186
Date: Wed Mar 3 18:17:15 2010 +0000
188
docs: Update the HACKING.backends file
190
The create_context() and ensure_context() sections should be more clear
191
on the role of the functions, and their eventual caveats, like being
192
called multiple times.
194
doc/HACKING.backends | 9 ++++++++-
195
1 files changed, 8 insertions(+), 1 deletions(-)
197
commit c3a942abdec57583d0fc917b7578d574e5c1573d
198
Author: Neil Roberts <neil@linux.intel.com>
199
Date: Tue Mar 2 15:18:00 2010 +0000
201
Add a conformance test for rectangle textures
203
The test creates a GL_TEXTURE_RECTANGLE_ARB texture using
204
cogl_texture_new_from_foreign and confirms that rendering it works
205
correctly. If the rectangle texture extension isn't available then
206
this test always succeeds.
208
http://bugzilla.openedhand.com/show_bug.cgi?id=2015
210
tests/conform/Makefile.am | 1 +
211
tests/conform/test-cogl-texture-rectangle.c | 268 +++++++++++++++++++++++++++
212
tests/conform/test-conform-main.c | 1 +
213
3 files changed, 270 insertions(+), 0 deletions(-)
215
commit f13a42793a979cb514ea86121b3450e2e0a2e05e
216
Author: Owen W. Taylor <otaylor@fishsoup.net>
217
Date: Mon Mar 1 14:04:20 2010 -0500
219
CoglTexture2DSliced: Handle TEXTURE_RECTANGLE_ARB
221
In _cogl_texture_2d_sliced_foreach_sub_texture_in_region(), don't
222
assert that the target is GL_TEXTURE_2D; instead conditionalize
223
normalization on the target.
225
http://bugzilla.openedhand.com/show_bug.cgi?id=2015
227
clutter/cogl/cogl/cogl-texture-2d-sliced.c | 22 +++++++++++++---------
228
1 files changed, 13 insertions(+), 9 deletions(-)
230
commit 40b43fd64a7d5563d6b8b736c0ede625311934c2
231
Author: Neil Roberts <neil@linux.intel.com>
232
Date: Wed Mar 3 18:08:33 2010 +0000
234
eglnative: Don't create a context if there already is one
236
If the EGL context is already created then we shouldn't try to create
237
another one. This was causing problems where one context would be
238
created from calling _clutter_feature_init and the other was created
239
from _clutter_backend_get_features. Cogl would set up its state using
240
the first context and then assume the state was still valid when the
241
second context became used so blending was not working correctly.
243
http://bugzilla.openedhand.com/show_bug.cgi?id=2020
245
clutter/eglnative/clutter-backend-egl.c | 3 +++
246
1 files changed, 3 insertions(+), 0 deletions(-)
248
commit 169ce1508b29e7133f5033fa3f473b3d9ffdf577
249
Author: Emmanuele Bassi <ebassi@linux.intel.com>
250
Date: Wed Mar 3 17:46:53 2010 +0000
252
x11-texture-pixmap: Move signal handler override
254
The signal handling override for the ::queue-damage-redraw should be
255
done in the class initialization function, not in the instance one.
257
clutter/x11/clutter-x11-texture-pixmap.c | 31 ++++++++++++++---------------
258
1 files changed, 15 insertions(+), 16 deletions(-)
260
commit 1b57800208fe1f34640c5001127eb570a24491f9
261
Author: Emmanuele Bassi <ebassi@linux.intel.com>
262
Date: Wed Mar 3 17:02:51 2010 +0000
266
Upstream "released" 1.18.
268
clutter/cogl/cogl/stb_image.c | 1605 ++++++++++++++++++++++-------------------
269
1 files changed, 862 insertions(+), 743 deletions(-)
271
commit b19332a0bec7bb121ec62285b942ce880e547a95
272
Author: Øyvind Kolås <pippin@linux.intel.com>
273
Date: Wed Mar 3 15:45:43 2010 +0000
275
animator: compare floating point values with an epsilon
277
Direct comparisons with doubles are error prone.
279
clutter/clutter-animator.c | 9 ++++++---
280
1 files changed, 6 insertions(+), 3 deletions(-)
282
commit 4168b216a3c062cc9d038e6ab71db4452ec116e4
283
Author: Øyvind Kolås <pippin@linux.intel.com>
284
Date: Wed Mar 3 15:46:19 2010 +0000
286
animator: fix a crash in clutter_animator_compute_value
288
Fix a crasher when there is only one key in the animator.
290
clutter/clutter-animator.c | 3 +++
291
1 files changed, 3 insertions(+), 0 deletions(-)
293
commit 824cd9a7ff20a764a031982317f38beb6fe135c2
294
Author: Emmanuele Bassi <ebassi@linux.intel.com>
295
Date: Wed Mar 3 15:31:01 2010 +0000
297
eglnative: Compilation fixes
299
We should include <errno.h>, if we plan to use errno.
301
Why, yes: I am that stupid.
303
clutter/eglnative/clutter-backend-egl.c | 4 +++-
304
clutter/eglnative/clutter-backend-egl.h | 2 +-
305
clutter/eglnative/clutter-event-egl.c | 11 +++--------
306
3 files changed, 7 insertions(+), 10 deletions(-)
308
commit 52f8cd30cea1ac3b62c82d026a1d2d581c38e1c1
309
Author: Emmanuele Bassi <ebassi@linux.intel.com>
310
Date: Wed Mar 3 10:49:34 2010 +0000
312
docs: Fix gtk-doc annotation for ClutterStageManageClass
314
Remove the semi-colon and use a colon for declaring the type.
316
clutter/clutter-stage-manager.h | 2 +-
317
1 files changed, 1 insertions(+), 1 deletions(-)
319
commit a2f444ccbe4255e4386a9df40415a04637a296e2
320
Author: Emmanuele Bassi <ebassi@linux.intel.com>
321
Date: Wed Mar 3 10:47:42 2010 +0000
323
box: Fix allow-none annotation
325
The syntax for allowing NULL is "allow-none", not "allow none".
327
clutter/clutter-box.c | 4 ++--
328
1 files changed, 2 insertions(+), 2 deletions(-)
330
commit fa6070ec1a2bdbf5b5bd182b663ad5bdbdefb98d
331
Author: Emmanuele Bassi <ebassi@linux.intel.com>
332
Date: Tue Mar 2 19:41:44 2010 +0000
334
Post-release version bump to 1.2.1
336
configure.ac | 4 ++--
337
1 files changed, 2 insertions(+), 2 deletions(-)
339
commit ab6184298083541d37356f1f5656380d0cda047c
340
Author: Emmanuele Bassi <ebassi@linux.intel.com>
341
Date: Tue Mar 2 18:03:23 2010 +0000
343
Release 1.2.0 (stable)
345
configure.ac | 6 +++---
346
1 files changed, 3 insertions(+), 3 deletions(-)
348
commit 3c9a24f4a78cd676e635ad32df639b57e65e3be7
349
Author: Emmanuele Bassi <ebassi@linux.intel.com>
350
Date: Tue Mar 2 18:03:13 2010 +0000
354
NEWS | 42 ++++++++++++++++++++++++++++++++++++++++++
355
1 files changed, 42 insertions(+), 0 deletions(-)
357
commit 9e4c008117da6b36237608bd896fb164577ef314
358
Author: Emmanuele Bassi <ebassi@linux.intel.com>
359
Date: Tue Mar 2 19:17:28 2010 +0000
361
build: Include test-script-model.json
363
The Model conformance test for ClutterScript parsing requires the file
364
to be inside the dist.
366
tests/data/Makefile.am | 1 +
367
1 files changed, 1 insertions(+), 0 deletions(-)
369
commit 2d51432e52745d9484cf2d54567c2f95670ea5ae
370
Author: Emmanuele Bassi <ebassi@linux.intel.com>
371
Date: Tue Mar 2 19:29:22 2010 +0000
373
build: Add test-animator-3.json to EXTRA_DIST
375
tests/data/Makefile.am | 1 +
376
1 files changed, 1 insertions(+), 0 deletions(-)
378
commit 2f68949962d964e38a640581e232c4b673ce3023
379
Author: Emmanuele Bassi <ebassi@linux.intel.com>
380
Date: Tue Mar 2 19:09:20 2010 +0000
382
conformance: Use g_assert_no_error() if available
384
GLib 2.20 has a nice g_assert() wrapper which will print out the GError
387
tests/conform/test-animator.c | 15 +++++++++++++++
388
tests/conform/test-model.c | 5 +++++
389
tests/conform/test-script-parser.c | 30 ++++++++++++++++++++++++++++++
390
3 files changed, 50 insertions(+), 0 deletions(-)
392
commit 048fcea988446af1ce18356eb1718f85088e73c8
393
Author: Neil Roberts <neil@linux.intel.com>
394
Date: Tue Mar 2 18:30:31 2010 +0000
396
clutter-actor: Initialize with the identity matrix in get_transform
398
The documentation and name of the get_transformation_matrix function
399
implies that 'matrix' is purely an out parameter. However it wasn't
400
initializing the matrix before calling the 'apply_transform' virtual
401
so it was basically just a wrapper for the virtual. The virtual
402
assumes the matrix parameter is in/out and applies the actor's
403
transformation on top of any existing transformations. This causes
404
unexpected semantics that are inconsistent with the documentation.
406
clutter/clutter-actor.c | 2 ++
407
1 files changed, 2 insertions(+), 0 deletions(-)
409
commit e550755f3dc13f11a9d956bb9b52294ea33c8da6
410
Author: Emmanuele Bassi <ebassi@linux.intel.com>
411
Date: Tue Mar 2 17:47:13 2010 +0000
413
text-field: Cast GString->len to integer before printing
415
The compiler will warn on 64bit architectures when using %d for
416
printing a gsize field.
418
http://bugzilla.openedhand.com/show_bug.cgi?id=2019
420
tests/interactive/test-text-field.c | 5 ++++-
421
1 files changed, 4 insertions(+), 1 deletions(-)
423
commit 38a24144980bd0c6d717f39eb5d215d3abc30ef5
424
Author: Robert Bragg <robert@linux.intel.com>
425
Date: Tue Mar 2 14:04:54 2010 +0000
427
glx tfp: make clutter_glx_texture_pixmap_update_area cheap
429
This changes clutter_glx_texture_pixmap_update_area so it defers the
430
call to glXBindTexImageEXT until our pre "paint" signal handler which
431
makes clutter_glx_texture_pixmap_update_area cheap to call.
433
The hope is that mutter can switch to reporting raw damage updates to
434
ClutterGLXTexturePixmap and we can use these to queue clipped redraws.
436
clutter/glx/clutter-glx-texture-pixmap.c | 186 ++++++++++++++----------------
437
1 files changed, 89 insertions(+), 97 deletions(-)
439
commit c0d5af5de5bcc504abeb81a7f7a1ec0f696b574d
440
Author: Robert Bragg <robert@linux.intel.com>
441
Date: Mon Nov 30 17:47:55 2009 +0000
443
Adds initial clipped redraw support to Clutter
445
A new (internal only currently) API, _clutter_actor_queue_clipped_redraw
446
can be used to queue a redraw along with a clip rectangle in actor
447
coordinates. This clip rectangle propagates up to the stage and clutter
448
backend which may optionally use the information to optimize stage
449
redraws. The GLX backend in particular may scissor the next redraw to
450
the clip rectangle and use GLX_MESA_copy_sub_buffer to present the stage
453
The intention is that any actors that can naturally determine the bounds
454
of updates should queue clipped redraws to reduce the cost of updating
455
small regions of the screen.
458
» If GLX_MESA_copy_sub_buffer isn't available then the GLX backend
459
ignores any clip rectangles.
461
» queuing multiple clipped redraws will result in the bounding box of
462
each clip rectangle being used.
464
» If a clipped redraw has a height > 300 pixels then it's promoted into
465
a full stage redraw, so that the GPU doesn't end up blocking too long
466
waiting for the vsync to reach the optimal position to avoid tearing.
468
» Note: no empirical data was used to come up with this threshold so
469
we may need to tune this.
471
» Currently only ClutterX11TexturePixmap makes use of this new API. This
472
is done via a new "queue-damage-redraw" signal that is emitted when
473
the pixmap is updated. The default handler queues a clipped redraw
474
with the assumption that the pixmap is being painted as a rectangle
475
covering the actors transformed allocation. If you subclass
476
ClutterX11TexturePixmap and change how it's painted you now also
477
need to override the signal handler and queue your own redraw.
479
Technically this is a semantic break, but it's assumed that no one
480
is currently doing this.
482
This still leaves a few unsolved issues with regards to optimizing sub
483
stage redraws that need to be addressed in further work so this can only
484
be considered a stepping stone a this point:
486
» Because we have no reliable way to determine if the painting of any
487
given actor is being modified any optimizations implemented using
488
_clutter_actor_queue_redraw_with_clip must be overridable by a
489
subclass, and technically must be opt-in for existing classes to avoid
490
a change in semantics. E.g. consider that a user connects to the paint
491
signal for ClutterTexture and paints a circle instead of a rectangle.
492
In this case any original logic to queue clipped redraws would be
495
» Currently only the implementation of an actor has enough information
496
with which to queue clipped redraws. E.g. It is not possible for
497
generic code in clutter-actor.c to queue a clipped redraw when hiding
498
an actor because actors have no way to report a "paint box". (remember
499
actors can draw outside their allocation and actors with depth may
500
also be projected outside of their allocation)
502
» The current plan is to add a actor_class->get_paint_cuboid()
503
virtual so actors can report a bounding cube for everything they
504
would draw in their current state and use that to queue clipped
505
redraws against the stage by projecting the paint cube into stage
508
» Our heuristics for promoting clipped redraws into full redraws to
509
avoid blocking the GPU while we wait for the vsync need improving:
511
» vsync issues aren't relevant for redirected/composited applications
512
so they should use different heuristics. In this case we instead
513
need to trade off the cost of blitting when using glXCopySubBuffer
514
vs promoting to a full redraw and flipping instead.
516
clutter/clutter-actor.c | 402 ++++++++++++++++++++++------
517
clutter/clutter-actor.h | 20 ++
518
clutter/clutter-debug.h | 6 +-
519
clutter/clutter-main.c | 4 +-
520
clutter/clutter-private.h | 39 ++-
521
clutter/clutter-stage-window.c | 29 ++
522
clutter/clutter-stage-window.h | 82 ++++---
523
clutter/clutter-stage.c | 64 +++++
524
clutter/glx/clutter-backend-glx.c | 185 ++------------
525
clutter/glx/clutter-backend-glx.h | 5 +
526
clutter/glx/clutter-glx-texture-pixmap.c | 14 +-
527
clutter/glx/clutter-stage-glx.c | 426 ++++++++++++++++++++++++++++++
528
clutter/glx/clutter-stage-glx.h | 8 +-
529
clutter/x11/clutter-x11-texture-pixmap.c | 172 ++++++++++---
530
14 files changed, 1116 insertions(+), 340 deletions(-)
532
commit 09d8460a5c3f905573378172ed553fd57d49913e
533
Author: Øyvind Kolås <pippin@linux.intel.com>
534
Date: Tue Mar 2 17:03:03 2010 +0000
536
animator: s/clutter_animator_run/clutter_animator_start/
538
This is consistent with choice of words in clutter_timeline_start and
539
makes the API less surprising.
541
clutter/clutter-animator.c | 4 ++--
542
clutter/clutter-animator.h | 2 +-
543
doc/reference/clutter/clutter-sections.txt | 2 +-
544
tests/interactive/test-animator.c | 2 +-
545
4 files changed, 5 insertions(+), 5 deletions(-)
547
commit 9d1ea81dc51464e86d7a4eee27874136e9e34cad
548
Author: Robert Bragg <robert@linux.intel.com>
549
Date: Tue Mar 2 02:07:40 2010 +0000
551
cogl debug: Adds missing guards around debug cogl_args[]
553
commit 511e5ceb516dc accidentally removed the #ifdef COGL_ENABLE_DEBUG
554
guards around the "cogl-debug" and "cogl-no-debug" cogl_args[] which
557
clutter/cogl/cogl/cogl-debug.c | 2 ++
558
1 files changed, 2 insertions(+), 0 deletions(-)
560
commit aba6c5acc7f1cb15f92666d1681a95b5a805efaf
561
Author: Emmanuele Bassi <ebassi@linux.intel.com>
562
Date: Tue Mar 2 15:08:01 2010 +0000
564
flow-layout: Provide a preferred size
566
The FlowLayout fails to provide a preferred size in case no sizing is
567
specified on one axis. It should, instead, have the preferred size of
568
the sum of its children, depending on the orientation property.
570
http://bugzilla.openedhand.com/show_bug.cgi?id=2013
572
clutter/clutter-flow-layout.c | 92 ++++++++++++++++++++++++++--------
573
tests/interactive/test-flow-layout.c | 20 ++++---
574
2 files changed, 82 insertions(+), 30 deletions(-)
576
commit e3fba5f2e80a4c72cc4ef0c193a0b6569e1d8cbf
577
Author: Emmanuele Bassi <ebassi@linux.intel.com>
578
Date: Tue Mar 2 13:32:46 2010 +0000
580
build: Require libtool >= 2.2.6
582
Update the configure.ac to use the LT_INIT() instead of the deprecated
583
AC_PROG_LIBTOOL. This also allows us to depend on a specific libtool
584
version, namely one that doesn't thoroughly suck.
586
configure.ac | 6 ++++--
587
1 files changed, 4 insertions(+), 2 deletions(-)
589
commit 9a55ddc7c36185b31120b5c5275dac60f5926d8d
590
Author: Øyvind Kolås <pippin@linux.intel.com>
591
Date: Tue Mar 2 12:38:51 2010 +0000
593
animator: restore accidentally removed break
595
In 505e5966 a break statement was removed by accident, causing the
596
animator to enter infinite loops if no initial key is present.
598
clutter/clutter-animator.c | 2 ++
599
1 files changed, 2 insertions(+), 0 deletions(-)
601
commit 3a84af0106522e46d930fc81013c86465357dc89
602
Merge: 0baeabc a2573ad
603
Author: Emmanuele Bassi <ebassi@linux.intel.com>
604
Date: Tue Mar 2 12:25:45 2010 +0000
606
Merge branch 'eglnative-update'
609
eglnative: Add CLUTTER_FB_DEVICE
610
eglnative: Update implementation
612
commit a2573ad2ad39931d2a817d4585d87b70c3f86526
613
Author: Emmanuele Bassi <ebassi@linux.intel.com>
614
Date: Mon Mar 1 11:38:41 2010 +0000
616
eglnative: Add CLUTTER_FB_DEVICE
618
Some EGL drivers for embedded devices require a specific framebuffer
619
device to be opened and passed to eglCreateWindowSurface(). Since it's
620
optional, we can provide an environment variabled called
621
CLUTTER_FB_DEVICE that can be used to specify the path of the device
624
http://bugzilla.openedhand.com/show_bug.cgi?id=1997
626
clutter/eglnative/clutter-backend-egl.c | 59 ++++++++++++++++++++++++++++---
627
clutter/eglnative/clutter-backend-egl.h | 3 ++
628
2 files changed, 57 insertions(+), 5 deletions(-)
630
commit b4e9f40394fb2e4d63bccc9f9d932a5da87cc2a2
631
Author: Emmanuele Bassi <ebassi@linux.intel.com>
632
Date: Sat Feb 27 09:42:42 2010 +0000
634
eglnative: Update implementation
636
Update the EGL native framebuffer backend to be 1.2-ready:
638
» create the EGL context and the surface inside the create_context()
639
implementation so that a context is always available
641
» simplify the StageWindow implementation
645
http://bugzilla.openedhand.com/show_bug.cgi?id=1997
647
clutter/eglnative/clutter-backend-egl.c | 186 ++++++++++++++++++++--
648
clutter/eglnative/clutter-backend-egl.h | 20 ++-
649
clutter/eglnative/clutter-event-egl.c | 60 +++++---
650
clutter/eglnative/clutter-stage-egl.c | 259 ++++++------------------------
651
clutter/eglnative/clutter-stage-egl.h | 8 +-
652
5 files changed, 275 insertions(+), 258 deletions(-)
654
commit 0baeabc2aa1a4b2a1908b7acd15f947cb8b1eb4d
655
Author: Owen W. Taylor <otaylor@fishsoup.net>
656
Date: Mon Mar 1 13:54:03 2010 -0500
658
Fall back in _cogl_texture_2d_new_from_bitmap()
660
Just like _cogl_texture_2d_new_with_size(),
661
_cogl_texture_2d_new_from_bitmap() needs to check if an unsliced
662
texture can be created at the given size, or if hardware
663
limitations prevent this.
665
http://bugzilla.openedhand.com/show_bug.cgi?id=2014
667
Signed-off-by: Neil Roberts <neil@linux.intel.com>
669
clutter/cogl/cogl/cogl-texture-2d.c | 3 +++
670
1 files changed, 3 insertions(+), 0 deletions(-)
672
commit 74a27bbb1c0ae12ba937d215323d5a716781cb1b
673
Author: Emmanuele Bassi <ebassi@linux.intel.com>
674
Date: Tue Mar 2 09:53:55 2010 +0000
676
docs: Documentation fixes
678
Let's see if we can get a 100% coverage for Clutter too.
680
clutter/clutter-animatable.h | 9 +++++
681
clutter/clutter-animator.c | 5 ++-
682
clutter/clutter-box.c | 3 ++
683
clutter/clutter-box.h | 49 +++++++++++++++++++++++++
684
clutter/clutter-container.h | 9 +++++
685
clutter/clutter-device-manager.h | 13 ++++++-
686
clutter/clutter-media.h | 9 +++++
687
clutter/clutter-scriptable.h | 9 +++++
688
clutter/clutter-version.h.in | 38 ++++++++++++++++++++
689
clutter/eglnative/clutter-backend-egl.c | 7 ++++
690
clutter/glx/clutter-glx-texture-pixmap.c | 53 +++++++++++++--------------
691
clutter/glx/clutter-glx-texture-pixmap.h | 16 ++++++++
692
clutter/x11/clutter-backend-x11.c | 8 ++++
693
clutter/x11/clutter-x11-texture-pixmap.c | 36 ++++++++++++++-----
694
clutter/x11/clutter-x11-texture-pixmap.h | 20 ++++++++++-
695
clutter/x11/clutter-x11.h | 8 ++++-
696
doc/reference/clutter/Makefile.am | 4 --
697
doc/reference/clutter/clutter-sections.txt | 4 +-
698
18 files changed, 252 insertions(+), 48 deletions(-)
700
commit c0a553163b5e82cb70e956e802d7f9b61bb13948
701
Author: Neil Roberts <neil@linux.intel.com>
702
Date: Mon Mar 1 18:08:41 2010 +0000
704
cogl: Support any format in cogl_read_pixels
706
cogl_read_pixels() no longer asserts that the format passed in is
707
RGBA_8888 but instead accepts any format. The appropriate GL enums for
708
the format are passed to glReadPixels so OpenGL should be perform a
709
conversion if neccessary.
711
It currently assumes glReadPixels will always give us premultiplied
712
data. This will usually be correct because the result of the default
713
blending operations for Cogl ends up with premultiplied data in the
714
framebuffer. However it is possible for the framebuffer to be in
715
whatever format depending on what CoglMaterial is used to render to
716
it. Eventually we may want to add a way for an application to inform
717
Cogl that the framebuffer is not premultiplied in case it is being
718
used for some special purpose.
720
If the requested format is not premultiplied then Cogl will convert
721
it. The tests have been changed to read the data as premultiplied so
722
that they won't be affected by the conversion. Picking in Clutter has
723
been changed to use COGL_PIXEL_FORMAT_RGB_888 because it doesn't need
724
the alpha component. clutter_stage_read_pixels is left unchanged
725
because the application can't specify a format for that so it seems to
726
make most sense to store unpremultiplied values.
728
http://bugzilla.openedhand.com/show_bug.cgi?id=1959
730
clutter/clutter-main.c | 10 +-
731
clutter/cogl/cogl/cogl.c | 84 +++++++++++++------
732
clutter/cogl/cogl/cogl.h | 8 ++-
733
tests/conform/test-cogl-backface-culling.c | 2 +-
734
tests/conform/test-cogl-blend-strings.c | 4 +-
735
tests/conform/test-cogl-materials.c | 2 +-
736
tests/conform/test-cogl-multitexture.c | 2 +-
737
tests/conform/test-cogl-offscreen.c | 8 +-
738
tests/conform/test-cogl-premult.c | 2 +-
739
tests/conform/test-cogl-readpixels.c | 26 ++++++-
740
tests/conform/test-cogl-texture-mipmaps.c | 2 +-
741
tests/conform/test-cogl-vertex-buffer-contiguous.c | 10 +-
742
tests/conform/test-cogl-vertex-buffer-interleved.c | 2 +-
743
tests/conform/test-cogl-vertex-buffer-mutability.c | 4 +-
744
tests/conform/test-cogl-viewport.c | 2 +-
745
15 files changed, 113 insertions(+), 55 deletions(-)
747
commit 505e5966e4ee649b7528cdf0410a4e52d59a25ec
748
Author: Øyvind Kolås <pippin@linux.intel.com>
749
Date: Mon Mar 1 18:35:01 2010 +0000
751
Do not overwrite the initial key, making ease-in work as expected.
753
Fixes bug #2008, where a property with ease-in would jump instead of
754
start at the properties initial value.
756
clutter/clutter-animator.c | 9 ---------
757
1 files changed, 0 insertions(+), 9 deletions(-)
759
commit 7d0ad7ac1b8f6b8a92d0c97180d2885a3a18bcdd
760
Author: Bastian Winkler <buz@netbuz.org>
761
Date: Mon Mar 1 17:00:41 2010 +0100
763
animator: Remove redundant declaration in header file
765
clutter_animator_property_set_interpolation was declared twice in
768
http://bugzilla.openedhand.com/show_bug.cgi?id=2012
770
clutter/clutter-animator.h | 5 -----
771
1 files changed, 0 insertions(+), 5 deletions(-)
773
commit 53eecb8469855d17e863c2113a58f0b6e9c26729
774
Author: Emmanuele Bassi <ebassi@linux.intel.com>
775
Date: Mon Mar 1 17:47:52 2010 +0000
777
docs: Add Animator.compute_value()
779
The clutter_animator_compute_value() has been added to the API, but it
780
is missing from the API reference.
782
doc/reference/clutter/clutter-sections.txt | 1 +
783
1 files changed, 1 insertions(+), 0 deletions(-)
785
commit 1d9ddad9a3ee79d32091b12197bd18e0b283da22
786
Author: Emmanuele Bassi <ebassi@linux.intel.com>
787
Date: Mon Mar 1 17:45:00 2010 +0000
789
docs: Fix syntax error in Model's documentation
791
A missing opening quote sign is breaking gtk-doc for ClutterModel.
793
clutter/clutter-model.c | 2 +-
794
1 files changed, 1 insertions(+), 1 deletions(-)
796
commit 1777a69f2f036e2ead5986a5c91f18480a14e4fd
797
Merge: 8146d8d 7ffb62e
798
Author: Emmanuele Bassi <ebassi@linux.intel.com>
799
Date: Mon Mar 1 15:37:12 2010 +0000
801
Merge branch 'stage-min-size-rework'
803
* stage-min-size-rework:
804
docs: Update minimum size accessors
805
actor: Use the TOPLEVEL flag instead of a type check
806
[stage] Use min-width/height props for min size
808
commit 8146d8d08deafd6cf86238a4a8c2fa6149e5c691
809
Author: Robert Bragg <robert@linux.intel.com>
810
Date: Fri Feb 26 09:44:29 2010 +0000
812
profile: avoid segfault generating reports with no stats
814
The clutter-profile.c print_report() code would crash if no stats had
815
been gathered because uprof would return NULL for the "Redrawing" timer
816
which we then dereferenced.
818
This changes the code to start by checking for the "Mainloop",
819
"Redrawing" and "Do Pick" timers and if none are present it returns
820
immediately without generating any report.
822
clutter/clutter-profile.c | 18 +++++++++---------
823
1 files changed, 9 insertions(+), 9 deletions(-)
825
commit b9a91594f4b37388222b587eaea7618ea8c78381
826
Author: Robert Bragg <robert@linux.intel.com>
827
Date: Fri Feb 26 09:48:43 2010 +0000
829
build: Fixes out of tree builds
831
When building the gobject introspection data the build wasn't able to
832
find clutter/clutter-json.h so this adds $(top_builddir) to INCLUDES.
834
clutter/Makefile.am | 3 ++-
835
1 files changed, 2 insertions(+), 1 deletions(-)
837
commit 79acb088e7f6916fb77a6341c22f9022c0f50208
838
Author: Emmanuele Bassi <ebassi@linux.intel.com>
839
Date: Mon Mar 1 12:56:10 2010 +0000
841
Remove mentions of the FSF address
843
Since using addresses that might change is something that finally
844
the FSF acknowledge as a plausible scenario (after changing address
845
twice), the license blurb in the source files should use the URI
846
for getting the license in case the library did not come with it.
848
Not that URIs cannot possibly change, but at least it's easier to
849
set up a redirection at the same place.
851
As a side note: this commit closes the oldes bug in Clutter's bug
854
http://bugzilla.openedhand.com/show_bug.cgi?id=521
856
clutter/clutter-actor.c | 7 +++----
857
clutter/clutter-actor.h | 3 ++-
858
clutter/clutter-alpha.c | 6 ++----
859
clutter/clutter-backend.c | 11 ++++++-----
860
clutter/clutter-behaviour-depth.c | 4 +---
861
clutter/clutter-behaviour-ellipse.c | 10 +---------
862
clutter/clutter-behaviour-opacity.c | 4 +---
863
clutter/clutter-behaviour-path.c | 11 ++++++-----
864
clutter/clutter-behaviour-rotate.c | 4 +---
865
clutter/clutter-behaviour-scale.c | 4 +---
866
clutter/clutter-behaviour.c | 4 +---
867
clutter/clutter-bezier.c | 4 +---
868
clutter/clutter-cairo-texture.c | 6 ++----
869
clutter/clutter-cairo-texture.h | 7 +++----
870
clutter/clutter-child-meta.c | 4 +---
871
clutter/clutter-color.c | 4 +---
872
clutter/clutter-container.c | 6 +++---
873
clutter/clutter-event.c | 6 +++---
874
clutter/clutter-feature.c | 6 +++---
875
clutter/clutter-fixed.c | 6 +++---
876
clutter/clutter-frame-source.c | 6 +++---
877
clutter/clutter-group.c | 6 +++---
878
clutter/clutter-id-pool.c | 6 +++---
879
clutter/clutter-keysyms.h | 6 +++---
880
clutter/clutter-list-model.c | 6 +++---
881
clutter/clutter-main.c | 6 +++---
882
clutter/clutter-model.c | 6 +++---
883
clutter/clutter-private.h | 6 +++---
884
clutter/clutter-rectangle.c | 6 +++---
885
clutter/clutter-score.c | 6 +++---
886
clutter/clutter-script-parser.c | 6 +++---
887
clutter/clutter-script-private.h | 6 +++---
888
clutter/clutter-script.c | 6 +++---
889
clutter/clutter-scriptable.c | 6 +++---
890
clutter/clutter-shader-types.c | 6 +++---
891
clutter/clutter-shader.c | 6 +++---
892
clutter/clutter-stage.c | 6 +++---
893
clutter/clutter-texture.c | 6 +++---
894
clutter/clutter-timeline.c | 6 +++---
895
clutter/clutter-timeout-pool.c | 6 +++---
896
clutter/clutter-units.c | 6 +++---
897
clutter/clutter-util.c | 6 +++---
898
clutter/clutter-version.h.in | 6 +++---
899
clutter/clutter.h | 6 +++---
900
clutter/cogl/cogl/cogl-atlas-texture-private.h | 6 +++---
901
clutter/cogl/cogl/cogl-atlas-texture.c | 6 +++---
902
clutter/cogl/cogl/cogl-atlas.c | 6 +++---
903
clutter/cogl/cogl/cogl-atlas.h | 6 +++---
904
clutter/cogl/cogl/cogl-bitmap-fallback.c | 6 +++---
905
clutter/cogl/cogl/cogl-bitmap-pixbuf.c | 6 +++---
906
clutter/cogl/cogl/cogl-bitmap-private.h | 6 +++---
907
clutter/cogl/cogl/cogl-bitmap.c | 6 +++---
908
clutter/cogl/cogl/cogl-bitmap.h | 6 +++---
909
clutter/cogl/cogl/cogl-blend-string.c | 6 +++---
910
clutter/cogl/cogl/cogl-blend-string.h | 6 +++---
911
clutter/cogl/cogl/cogl-buffer-private.h | 6 +++---
912
clutter/cogl/cogl/cogl-buffer.c | 6 +++---
913
clutter/cogl/cogl/cogl-buffer.h | 6 +++---
914
clutter/cogl/cogl/cogl-clip-stack.c | 6 +++---
915
clutter/cogl/cogl/cogl-clip-stack.h | 6 +++---
916
clutter/cogl/cogl/cogl-color.c | 6 +++---
917
clutter/cogl/cogl/cogl-color.h | 6 +++---
918
clutter/cogl/cogl/cogl-context.c | 6 +++---
919
clutter/cogl/cogl/cogl-context.h | 6 +++---
920
clutter/cogl/cogl/cogl-debug.c | 6 +++---
921
clutter/cogl/cogl/cogl-debug.h | 6 +++---
922
clutter/cogl/cogl/cogl-deprecated.h | 6 +++---
923
clutter/cogl/cogl/cogl-feature-private.c | 6 +++---
924
clutter/cogl/cogl/cogl-feature-private.h | 6 +++---
925
clutter/cogl/cogl/cogl-fixed.c | 6 +++---
926
clutter/cogl/cogl/cogl-fixed.h | 6 +++---
927
clutter/cogl/cogl/cogl-framebuffer-private.h | 6 +++---
928
clutter/cogl/cogl/cogl-framebuffer.c | 6 +++---
929
clutter/cogl/cogl/cogl-handle.h | 6 +++---
930
clutter/cogl/cogl/cogl-internal.h | 6 +++---
931
clutter/cogl/cogl/cogl-journal-private.h | 6 +++---
932
clutter/cogl/cogl/cogl-journal.c | 6 +++---
933
clutter/cogl/cogl/cogl-material-private.h | 6 +++---
934
clutter/cogl/cogl/cogl-material.c | 6 +++---
935
clutter/cogl/cogl/cogl-material.h | 6 +++---
936
clutter/cogl/cogl/cogl-matrix-mesa.c | 6 +++---
937
clutter/cogl/cogl/cogl-matrix-mesa.h | 6 +++---
938
clutter/cogl/cogl/cogl-matrix-private.h | 6 +++---
939
clutter/cogl/cogl/cogl-matrix-stack.c | 6 +++---
940
clutter/cogl/cogl/cogl-matrix-stack.h | 6 +++---
941
clutter/cogl/cogl/cogl-matrix.c | 6 +++---
942
clutter/cogl/cogl/cogl-matrix.h | 6 +++---
943
clutter/cogl/cogl/cogl-offscreen.h | 6 +++---
944
clutter/cogl/cogl/cogl-path.c | 6 +++---
945
clutter/cogl/cogl/cogl-path.h | 6 +++---
946
clutter/cogl/cogl/cogl-pixel-buffer-private.h | 6 +++---
947
clutter/cogl/cogl/cogl-pixel-buffer.c | 6 +++---
948
clutter/cogl/cogl/cogl-pixel-buffer.h | 6 +++---
949
clutter/cogl/cogl/cogl-primitives.c | 6 +++---
950
clutter/cogl/cogl/cogl-primitives.h | 6 +++---
951
clutter/cogl/cogl/cogl-profile.h | 6 +++---
952
clutter/cogl/cogl/cogl-shader.h | 6 +++---
953
clutter/cogl/cogl/cogl-spans.c | 6 +++---
954
clutter/cogl/cogl/cogl-spans.h | 6 +++---
955
clutter/cogl/cogl/cogl-sub-texture-private.h | 6 +++---
956
clutter/cogl/cogl/cogl-sub-texture.c | 6 +++---
957
clutter/cogl/cogl/cogl-texture-2d-private.h | 6 +++---
958
clutter/cogl/cogl/cogl-texture-2d-sliced-private.h | 6 +++---
959
clutter/cogl/cogl/cogl-texture-2d-sliced.c | 6 +++---
960
clutter/cogl/cogl/cogl-texture-2d.c | 6 +++---
961
clutter/cogl/cogl/cogl-texture-driver.h | 6 +++---
962
clutter/cogl/cogl/cogl-texture-private.h | 6 +++---
963
clutter/cogl/cogl/cogl-texture.c | 6 +++---
964
clutter/cogl/cogl/cogl-texture.h | 6 +++---
965
clutter/cogl/cogl/cogl-types.h | 6 +++---
966
clutter/cogl/cogl/cogl-util.c | 6 +++---
967
clutter/cogl/cogl/cogl-util.h | 6 +++---
968
clutter/cogl/cogl/cogl-vertex-buffer-private.h | 6 +++---
969
clutter/cogl/cogl/cogl-vertex-buffer.c | 6 +++---
970
clutter/cogl/cogl/cogl-vertex-buffer.h | 6 +++---
971
clutter/cogl/cogl/cogl.c | 6 +++---
972
clutter/cogl/cogl/cogl.h | 6 +++---
973
clutter/cogl/cogl/driver/gl/cogl-context-driver.c | 6 +++---
974
clutter/cogl/cogl/driver/gl/cogl-context-driver.h | 6 +++---
975
clutter/cogl/cogl/driver/gl/cogl-defines.h.in | 6 +++---
976
.../cogl/cogl/driver/gl/cogl-feature-functions.h | 6 +++---
977
clutter/cogl/cogl/driver/gl/cogl-program.c | 6 +++---
978
clutter/cogl/cogl/driver/gl/cogl-program.h | 6 +++---
979
clutter/cogl/cogl/driver/gl/cogl-shader-private.h | 6 +++---
980
clutter/cogl/cogl/driver/gl/cogl-shader.c | 6 +++---
981
clutter/cogl/cogl/driver/gl/cogl-texture-driver.c | 6 +++---
982
clutter/cogl/cogl/driver/gl/cogl.c | 6 +++---
983
.../cogl/cogl/driver/gles/cogl-context-driver.c | 6 +++---
984
.../cogl/cogl/driver/gles/cogl-context-driver.h | 6 +++---
985
clutter/cogl/cogl/driver/gles/cogl-defines.h.in | 6 +++---
986
.../cogl/cogl/driver/gles/cogl-feature-functions.h | 6 +++---
987
clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c | 6 +++---
988
clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.h | 6 +++---
989
clutter/cogl/cogl/driver/gles/cogl-program.c | 6 +++---
990
clutter/cogl/cogl/driver/gles/cogl-program.h | 6 +++---
991
.../cogl/cogl/driver/gles/cogl-shader-private.h | 6 +++---
992
clutter/cogl/cogl/driver/gles/cogl-shader.c | 6 +++---
993
.../cogl/cogl/driver/gles/cogl-texture-driver.c | 6 +++---
994
clutter/cogl/cogl/driver/gles/cogl.c | 6 +++---
995
clutter/cogl/cogl/winsys/cogl-eglnative.c | 6 +++---
996
clutter/cogl/cogl/winsys/cogl-eglx.c | 6 +++---
997
clutter/cogl/cogl/winsys/cogl-fruity.c | 6 +++---
998
clutter/cogl/cogl/winsys/cogl-glx.c | 6 +++---
999
clutter/cogl/cogl/winsys/cogl-osx.c | 6 +++---
1000
clutter/cogl/cogl/winsys/cogl-sdl.c | 6 +++---
1001
clutter/cogl/cogl/winsys/cogl-win32.c | 6 +++---
1002
clutter/cogl/cogl/winsys/cogl-winsys.h | 6 +++---
1003
clutter/eglnative/clutter-backend-egl.h | 6 +++---
1004
clutter/eglnative/clutter-egl-headers.h | 6 +++---
1005
clutter/eglnative/clutter-egl.h | 6 +++---
1006
clutter/eglnative/clutter-event-egl.c | 6 +++---
1007
clutter/eglx/clutter-backend-egl.h | 6 +++---
1008
clutter/eglx/clutter-egl-headers.h | 6 +++---
1009
clutter/eglx/clutter-eglx.h | 6 +++---
1010
clutter/fruity/clutter-backend-fruity.h | 6 +++---
1011
clutter/fruity/clutter-fruity.h | 6 +++---
1012
clutter/glx/clutter-backend-glx.c | 6 +++---
1013
clutter/glx/clutter-backend-glx.h | 6 +++---
1014
clutter/glx/clutter-event-glx.c | 6 +++---
1015
clutter/glx/clutter-event-glx.h | 6 +++---
1016
clutter/glx/clutter-glx-texture-pixmap.c | 6 +++---
1017
clutter/glx/clutter-glx-texture-pixmap.h | 6 +++---
1018
clutter/glx/clutter-glx.h | 6 +++---
1019
clutter/glx/clutter-stage-glx.c | 6 +++---
1020
clutter/glx/clutter-stage-glx.h | 6 +++---
1021
clutter/osx/clutter-backend-osx.c | 6 +++---
1022
clutter/osx/clutter-backend-osx.h | 6 +++---
1023
clutter/osx/clutter-event-osx.c | 6 +++---
1024
clutter/osx/clutter-osx.h | 6 +++---
1025
clutter/osx/clutter-stage-osx.c | 6 +++---
1026
clutter/osx/clutter-stage-osx.h | 6 +++---
1027
clutter/win32/clutter-backend-win32.c | 6 +++---
1028
clutter/win32/clutter-backend-win32.h | 6 +++---
1029
clutter/win32/clutter-event-win32.c | 6 +++---
1030
clutter/win32/clutter-stage-win32.c | 6 +++---
1031
clutter/win32/clutter-stage-win32.h | 6 +++---
1032
clutter/win32/clutter-win32.h | 6 +++---
1033
clutter/x11/clutter-backend-x11-private.h | 6 +++---
1034
clutter/x11/clutter-backend-x11.c | 6 +++---
1035
clutter/x11/clutter-backend-x11.h | 6 +++---
1036
clutter/x11/clutter-event-x11.c | 6 +++---
1037
clutter/x11/clutter-stage-x11.c | 6 +++---
1038
clutter/x11/clutter-stage-x11.h | 6 +++---
1039
clutter/x11/clutter-x11-texture-pixmap.c | 6 +++---
1040
clutter/x11/clutter-x11-texture-pixmap.h | 6 +++---
1041
clutter/x11/clutter-x11.h | 6 +++---
1042
186 files changed, 543 insertions(+), 570 deletions(-)
1044
commit 23867875a14ab6d7288d6a67c67b20a1f136be94
1045
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1046
Date: Mon Mar 1 11:12:16 2010 +0000
1048
build: Remove unused checks on platform functions
1050
There is no need for us to check for low-level functions and header
1051
files, especially since we haven't been checking the results until
1052
now. This makes cross-compiling slightly more bearable.
1054
clutter/clutter-private.h | 8 ++------
1055
clutter/x11/clutter-backend-x11.c | 9 +++++----
1056
clutter/x11/clutter-stage-x11.c | 4 ++++
1057
configure.ac | 12 +++---------
1058
4 files changed, 14 insertions(+), 19 deletions(-)
1060
commit ce6a24eb2b5eaba4b60f82855af7a24d0f5afdad
1061
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1062
Date: Sun Feb 28 10:59:29 2010 +0000
1064
actor: Call unparent() in destroy
1066
If the actor is an internal child of another actor then we should call
1067
unparent() when destroying it, like clutter_actor_reparent() does;
1068
otherwise we'll leak the actor, since the parent holds a reference to
1071
http://bugzilla.openedhand.com/show_bug.cgi?id=2009
1073
clutter/clutter-actor.c | 4 ++--
1074
1 files changed, 2 insertions(+), 2 deletions(-)
1076
commit 7ffb62eab939de46b8234243cab6f6c4b40d60ec
1077
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1078
Date: Sat Feb 27 18:56:34 2010 +0000
1080
docs: Update minimum size accessors
1082
Expand the documentation for set_minimum_size() and get_minimum_size(),
1083
and add introspection annotations for get_minimum_size().
1085
clutter/clutter-stage.c | 41 +++++++++++++++++++++++++++++------------
1086
1 files changed, 29 insertions(+), 12 deletions(-)
1088
commit 52ba9a1800302f887ebe6d2e7aa7ab4503ea6e5e
1089
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1090
Date: Sat Feb 27 18:24:17 2010 +0000
1092
actor: Use the TOPLEVEL flag instead of a type check
1094
We can use the internal private CLUTTER_ACTOR_IS_TOPLEVEL flag, which is
1097
clutter/clutter-actor.c | 19 +++++++++++++++----
1098
1 files changed, 15 insertions(+), 4 deletions(-)
1100
commit cd62dfbd1419870fb6792bcab87ea8e7d0e760f5
1101
Author: Chris Lord <chris@linux.intel.com>
1102
Date: Fri Feb 26 18:36:38 2010 +0000
1104
[stage] Use min-width/height props for min size
1106
Instead of shadowing these properties with different properties with the
1107
same names on stage, actually use them. Behaviour should be identical,
1108
except the minimum stage size can now be enforced by setting the
1109
min-width/height properties as well as using the set_minimum_size
1112
clutter/clutter-actor.c | 13 ++++--
1113
clutter/clutter-stage.c | 102 +++++++++++++++++++++++++++++++----------------
1114
2 files changed, 77 insertions(+), 38 deletions(-)
1116
commit 9f67e4826c9880732e4f2a74ac42f729e7e80042
1117
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1118
Date: Fri Feb 26 16:43:02 2010 +0000
1120
docs: Update --enable-cogl-debug description
1122
The 'no' value is not the default any more. The 'minimum' value is
1123
always the default, regardless of the release status.
1126
1 files changed, 1 insertions(+), 2 deletions(-)
1128
commit 62f2961f8a9b2974e0a7a11ea534f0b14f8fef1a
1129
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1130
Date: Fri Feb 26 15:12:27 2010 +0000
1132
docs: Unicode-ify NEWS
1134
NEWS | 1302 +++++++++++++++++++++++++++++++++---------------------------------
1135
1 files changed, 651 insertions(+), 651 deletions(-)
1137
commit c8c62af0cf5d33f3fe3e4aab44ed49363263252c
1138
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1139
Date: Fri Feb 26 15:00:47 2010 +0000
1141
build: More options for Automake
1143
Require automake >= 1.10, and add the following options:
1145
» dist-bzip2: create a bz2 tarball in the dist process
1146
» check-news: check that we changed the NEWS file prior to dist,
1147
to avoid another release without NEWS updates, like 1.1.10
1150
1 files changed, 1 insertions(+), 1 deletions(-)
1152
commit e0f04efa411c0987db32c056958ad2c7cf5b6736
1153
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1154
Date: Fri Feb 26 10:36:17 2010 +0000
1156
device: When changing the stage, unset the pointer actor
1158
If we do not unset the Stage we will have stale data, and the Crossing
1159
event when re-entering a Stage will not be emitted, as the actor under
1160
the pointer might be the same as before.
1162
clutter/clutter-input-device.c | 14 ++++++++++++--
1163
1 files changed, 12 insertions(+), 2 deletions(-)
1165
commit 5d8346829585bb4b6d4617a232f87e3dab4eee5f
1166
Author: Neil Roberts <neil@linux.intel.com>
1167
Date: Tue Feb 23 14:45:44 2010 +0000
1169
cogl-vertex-buffer: Add support for unsigned int indices
1171
This adds a COGL_INDICES_TYPE_UNSIGNED_INT enum value so that unsigned
1172
ints can be used with cogl_vertex_buffer_indices_new. Unsigned ints
1173
are not supported in core on GLES so a feature flag has also been
1174
added to advertise this. GLES only sets the feature if the
1175
GL_OES_element_index_uint extension is available. It is an error to
1176
call indices_new() with unsigned ints unless the feature is
1179
http://bugzilla.openedhand.com/show_bug.cgi?id=1998
1181
clutter/cogl/cogl/cogl-types.h | 6 +++++-
1182
clutter/cogl/cogl/cogl-vertex-buffer.c | 17 ++++++++++++++++-
1183
clutter/cogl/cogl/cogl-vertex-buffer.h | 8 ++++++++
1184
clutter/cogl/cogl/driver/gl/cogl.c | 3 ++-
1185
.../cogl/cogl/driver/gles/cogl-feature-functions.h | 6 ++++++
1186
5 files changed, 37 insertions(+), 3 deletions(-)
1188
commit 67d9d928147aa59905960480a5d0b4c19c9d1920
1189
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1190
Date: Thu Feb 25 23:23:53 2010 +0000
1192
docs: Document the "columns" syntax for ClutterModel
1194
Like we do for other classes implementing custom properties, we should
1195
document the syntax of the "columns" scriptable property of ClutterModel.
1197
clutter/clutter-model.c | 24 ++++++++++++++++++++++++
1198
1 files changed, 24 insertions(+), 0 deletions(-)
1200
commit 70d7bad98ba50a657204ee356fd5ac5ccf4e8bea
1201
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1202
Date: Thu Feb 25 23:15:59 2010 +0000
1204
conformance: Use g_test_verbose() for logging
1206
Protect g_print() calls behind the g_test_verbose() check, to avoid
1207
unwanted output during the conformance test run.
1209
tests/conform/test-model.c | 9 ++++++++-
1210
1 files changed, 8 insertions(+), 1 deletions(-)
1212
commit 96c31bbf0ea14c7cb6eaa824a6d5cf66d58b8d5b
1213
Author: Bastian Winkler <buz@netbuz.org>
1214
Date: Thu Feb 25 23:47:49 2010 +0100
1216
model: Implement ClutterScriptable interface
1218
Allow a ClutterModel to be constructed through the ClutterScript API.
1219
Currently this allows a model to be generated like like this:
1222
"id" : "test-model",
1223
"type" : "ClutterListModel",
1225
[ "text-column", "gchararray" ],
1226
[ "int-column", "gint" ],
1227
[ "actor-column", "ClutterRectangle" ]
1231
where 'columns' is an array containing arrays of column-name,
1234
http://bugzilla.openedhand.com/show_bug.cgi?id=2007
1237
clutter/clutter-model.c | 105 ++++++++++++++++++++++++++++++++++++-
1238
tests/conform/test-conform-main.c | 1 +
1239
tests/conform/test-model.c | 34 ++++++++++++
1240
tests/data/test-script-model.json | 9 +++
1241
5 files changed, 149 insertions(+), 1 deletions(-)
1243
commit 63279f827e9d4e517c3dc88633a8b5ed47fbd74e
1244
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1245
Date: Thu Feb 25 22:50:38 2010 +0000
1247
docs: gtk-doc fixes for Animator
1251
→ enumeration values
1255
Also, fix the introspection annotations.
1257
clutter/clutter-animator.c | 40 +++++++++++++++++++++++++++-------------
1258
1 files changed, 27 insertions(+), 13 deletions(-)
1260
commit 9db135c4eff97a3d3520cc05c9c3e85c153e8cc4
1261
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1262
Date: Thu Feb 25 18:28:37 2010 +0000
1264
glx: Clean up sync-to-vblank mechanism discovery
1266
The code has gotten really complicated to follow.
1268
As soon as we have a sync-to-vblank mechanism we should just bail out.
1270
Also, __GL_SYNC_TO_VBLANK (which is used by nVidia) should be assumed
1271
equivalent to a CLUTTER_VBLANK_GLX_SWAP.
1273
clutter/glx/clutter-backend-glx.c | 169 ++++++++++++++++++++-----------------
1274
1 files changed, 92 insertions(+), 77 deletions(-)
1276
commit 655cb966c08b0ec3a0b73ed1b18fc9ebbe9a93b8
1277
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1278
Date: Thu Feb 25 17:09:55 2010 +0000
1280
docs: Add visual cue for Animator's key frames
1282
We should explain what a "key frame" is for ClutterAnimator, possibly
1283
with some sort of visual cue.
1285
This allows me to demonstrate my poor skills at using Inkscape, as well
1286
as my overall bad taste for graphics design.
1288
clutter/clutter-animator.c | 21 ++
1289
doc/reference/clutter/Makefile.am | 3 +
1290
doc/reference/clutter/animator-key-frames.png | Bin 0 -> 11936 bytes
1291
doc/reference/clutter/animator-key-frames.svg | 271 +++++++++++++++++++++++++
1292
4 files changed, 295 insertions(+), 0 deletions(-)
1294
commit d3d05261e6a394736757cebb5aad9b9267e7cf53
1295
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1296
Date: Thu Feb 25 14:22:08 2010 +0000
1298
script-parser: Remove top-level types list
1300
The top-level types list was comically out of date, and it was only
1301
determining whether the type we were constructing was initially unowned
1302
or a full object. We can safely replace it with a simple type check.
1304
clutter/clutter-script-parser.c | 36 ++++--------------------------------
1305
1 files changed, 4 insertions(+), 32 deletions(-)
1307
commit c0be19eff65c4c72aa5c934cee3b582903db40f6
1308
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1309
Date: Thu Feb 25 14:20:05 2010 +0000
1311
script-parser: Be more strict with "children" members
1313
The "children" member for Container definitions should only reference
1314
actors, and warn about any other type.
1316
clutter/clutter-script-parser.c | 12 ++++++++++++
1317
1 files changed, 12 insertions(+), 0 deletions(-)
1319
commit c291d5a660f4ebac3dc57acad79b8153686a47f0
1320
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1321
Date: Thu Feb 25 14:08:57 2010 +0000
1323
animator: Add a :timeline property
1325
It would be useful to be able to share the Timeline across different
1326
animator instances, or with different animation constructs. Also this
1327
allows sharing definitions of Timelines in ClutterScript.
1329
clutter/clutter-animator.c | 26 +++++++++++++++++++++++++-
1330
1 files changed, 25 insertions(+), 1 deletions(-)
1332
commit 641582533952c91576fb53724b70cbe6afb119db
1333
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1334
Date: Thu Feb 25 14:02:29 2010 +0000
1336
animator: Remove NULL check in remove_key()
1338
The arguments for remove_key() can be NULL, but there is an extraneous
1339
assertion that fails if they are. The pre-conditions should match the
1340
documentation, in this case.
1342
clutter/clutter-animator.c | 11 ++++++-----
1343
1 files changed, 6 insertions(+), 5 deletions(-)
1345
commit 4bc4c604e926b07af9ef4c02fd5f000fc939259b
1346
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1347
Date: Thu Feb 25 12:45:02 2010 +0000
1349
box: Let pack_at() create the ChildMeta, if any
1351
A sub-class of ClutterBox might add ChildMeta support, and since
1352
pack_at() does not go through clutter_container_add_actor(), we
1353
need to manually call the create_child_meta() ourselves.
1355
clutter/clutter-box.c | 5 +++++
1356
1 files changed, 5 insertions(+), 0 deletions(-)
1358
commit 543e2d3f0609864cebb1f1eaf258108abab50770
1359
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1360
Date: Thu Feb 25 12:39:24 2010 +0000
1362
container: Expose create and destroy ChildMeta methods
1364
It is conceivable that Container implementations might add children
1365
outside of the Container::add() implementation - e.g. for packing at
1366
a specific index. Since the addition (and removal) might happen outside
1367
the common path we need to expose all the API that is implicitly called
1368
by ClutterContainer when adding and removing a child - namely the
1369
ChildMeta creation and destruction.
1371
clutter/clutter-container.c | 44 ++++++++++++++++++++-------
1372
clutter/clutter-container.h | 4 ++
1373
doc/reference/clutter/clutter-sections.txt | 2 +
1374
3 files changed, 38 insertions(+), 12 deletions(-)
1376
commit 31b5856d69e8d53de17270da7ab59dd290e2868a
1377
Author: Neil Roberts <neil@linux.intel.com>
1378
Date: Wed Feb 24 23:04:39 2010 +0000
1380
test-cogl-blend-strings: Add some more tests
1382
The adds tests for the remaining layer combine functions, the 1 minus
1383
value operator and the TEXTURE_N source. Note however that Cogl
1384
currently fails when parsing a TEXTURE_N source so the test is
1387
tests/conform/test-cogl-blend-strings.c | 46 +++++++++++++++++++++++++++++++
1388
1 files changed, 46 insertions(+), 0 deletions(-)
1390
commit 14999bec5e6b3d0aab057ef544f233d968e5cf67
1391
Author: Neil Roberts <neil@linux.intel.com>
1392
Date: Wed Feb 24 11:13:55 2010 +0000
1394
gles2: Remove the special wrapper for glBindTexture
1396
Previously the GLES2 backend needed a special wrapper for
1397
glBindTexture because it needed to know the internal GL format of the
1398
texture in order to correctly implement the GL_MODULATE texture env
1399
mode. When GL_MODULATE is used then the RGB values are taken from the
1400
previous texture layer rather than being fetched from the
1401
texture. However since the material API was added Cogl no longer uses
1402
the GL_MODULATE texture env mode but instead always uses GL_COMBINE.
1404
Compiling the GLES2 backend broke since the more-texture-backends
1405
branch merge because the cogl_get_internal_gl_format function was
1406
removed and there was one place in GLES2 specific code that was using
1407
this to bind the texture.
1409
clutter/cogl/cogl/cogl-material.c | 10 ---------
1410
clutter/cogl/cogl/cogl-texture-2d-sliced.c | 5 +--
1411
clutter/cogl/cogl/cogl-texture-driver.h | 7 ------
1412
clutter/cogl/cogl/driver/gl/cogl-texture-driver.c | 12 ----------
1413
clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c | 22 --------------------
1414
clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.h | 12 ----------
1415
.../cogl/cogl/driver/gles/cogl-texture-driver.c | 13 -----------
1416
7 files changed, 2 insertions(+), 79 deletions(-)
1418
commit eba07020c549ff0ede9982c6d911d67e353ca5a3
1419
Author: Neil Roberts <neil@linux.intel.com>
1420
Date: Wed Feb 24 16:50:32 2010 +0000
1422
cogl-gles2-wrapper: Add support for the layer combine operations
1424
The texture layer combine functions are now hard coded to GL_COMBINE
1425
instead of GL_MODULATE. The combine function can be customized with
1426
all the parameters of GL_COMBINE. A shader is generated to implement
1427
the given parameters.
1429
Currently it will try to generate code for the constant color but it
1430
will use a uniform which does not exist.
1432
clutter/cogl/cogl/cogl-blend-string.c | 9 -
1433
clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c | 382 ++++++++++++++++++--
1434
clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.h | 16 +
1435
3 files changed, 371 insertions(+), 36 deletions(-)
1437
commit 02b952394ae9efe9e80b803e671bca1b1f711a9a
1438
Author: Neil Roberts <neil@linux.intel.com>
1439
Date: Wed Feb 24 10:42:59 2010 +0000
1441
gles2: Implement a wrapper for glGetIntegerv(GL_MAX_TEXTURE_UNITS)
1443
The GLES2 backend for Cogl is failing to compile because
1444
GL_MAX_TEXTURE_UNITS is not defined. Let's define it and provide a
1445
wrapper which uses GL_MAX_TEXTURE_IMAGE_UNITS or
1446
COGL_GLES2_MAX_TEXTURE_UNITS, whichever is the smallest.
1448
clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c | 6 ++++++
1449
clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.h | 2 ++
1450
2 files changed, 8 insertions(+), 0 deletions(-)
1452
commit 3bc0672feff7c58326c4d50612bedf15aa9c02cb
1453
Author: Øyvind Kolås <pippin@linux.intel.com>
1454
Date: Thu Feb 25 12:30:07 2010 +0000
1456
animator: handle no initial key
1458
Fixing the crasher reported in bug #1995.
1460
clutter/clutter-animator.c | 116 ++++++++++++++++++++++++++------------------
1461
1 files changed, 69 insertions(+), 47 deletions(-)
1463
commit d2db512788aac496a3741cb424caea41cf4357a1
1464
Author: Øyvind Kolås <pippin@linux.intel.com>
1465
Date: Thu Feb 25 11:48:44 2010 +0000
1467
animator: added clutter_animator_compute_value
1469
Allow querying the computed values of properties managed by a
1472
clutter/clutter-animator.c | 212 +++++++++++++++++++++++++++++++++++++++++---
1473
clutter/clutter-animator.h | 12 +++
1474
2 files changed, 211 insertions(+), 13 deletions(-)
1476
commit e8d32fd153268c653c1adc5c66f30f0ee624b432
1477
Author: Øyvind Kolås <pippin@linux.intel.com>
1478
Date: Thu Feb 25 11:28:32 2010 +0000
1480
animator: removed bogus arg in keys interpolation accessor
1482
A bogus ClutterInterpolation argument had been carried from
1483
clutter_animator_set_interpolation to clutter_animator_get_interpolation
1486
clutter/clutter-animator.c | 16 +++++++---------
1487
clutter/clutter-animator.h | 3 +--
1488
2 files changed, 8 insertions(+), 11 deletions(-)
1490
commit be8f53f229397e72fcf5a1bed245d555ea4747e9
1491
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1492
Date: Thu Feb 25 12:01:03 2010 +0000
1494
animation: Fix a typo
1496
This will teach me to check before compiling a version-dependent branch
1497
that I'm actually using my jhbuild environment and not the system
1500
clutter/clutter-animation.c | 2 +-
1501
1 files changed, 1 insertions(+), 1 deletions(-)
1503
commit 26e22b2ede0eb0fdfbe3d96189cb2aa196da83f8
1504
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1505
Date: Thu Feb 25 10:22:36 2010 +0000
1507
Conditionally use G_VALUE_COLLECT_INIT() macro
1509
GLib 2.24 (but starting from the 2.23.2 unstable release) added a new
1510
macro for collecting GValues from a va_list.
1512
The newly added G_VALUE_COLLECT_INIT() macro should be used in place
1513
of initializing the GValue and calling G_VALUE_COLLECT(), and improves
1514
the collection performances by avoiding multiple checks, free and
1515
initialization calls.
1517
clutter/clutter-animation.c | 8 ++++++++
1518
clutter/clutter-animator.c | 7 ++++++-
1519
clutter/clutter-box.c | 7 +++++++
1520
clutter/clutter-container.c | 7 +++++++
1521
clutter/clutter-interval.c | 10 ++++++++++
1522
clutter/clutter-layout-manager.c | 7 +++++++
1523
6 files changed, 45 insertions(+), 1 deletions(-)
1525
commit bd303d6efb7dfddbdf671f7c66ff5b73bb216f3f
1526
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1527
Date: Wed Feb 24 16:43:17 2010 +0000
1529
conform: Verify parsing of multiple properties
1531
The ClutterAnimator support for parsing multiple properties should be
1532
verified in the conformance test suite.
1534
http://bugzilla.openedhand.com/show_bug.cgi?id=2003
1537
tests/conform/test-animator.c | 98 +++++++++++++++++++++++++++++++++++++
1538
tests/conform/test-conform-main.c | 1 +
1539
tests/data/test-animator-3.json | 40 +++++++++++++++
1540
4 files changed, 140 insertions(+), 0 deletions(-)
1542
commit 59fd7e4a810f51bad31c2eafb609d545557ef264
1543
Author: Bastian Winkler <buz@netbuz.org>
1544
Date: Wed Feb 24 16:32:19 2010 +0100
1546
animator: Append parsed animator keys to previously parsed ones
1548
Reuse the GSList of the previously parsed property when building a
1549
ClutterAnimator from script, otherwise only the last used property will
1552
http://bugzilla.openedhand.com/show_bug.cgi?id=2003
1554
clutter/clutter-animator.c | 7 +++++--
1555
1 files changed, 5 insertions(+), 2 deletions(-)
1557
commit fd6f6707433a8ab57c8232afee65038213d4120c
1558
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1559
Date: Wed Feb 24 14:40:22 2010 +0000
1561
Post-release version bump to 1.1.15
1563
configure.ac | 4 ++--
1564
1 files changed, 2 insertions(+), 2 deletions(-)
1566
commit 18659b008c800b2dde6e5a2453fba04f5990f2b7
1567
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1568
Date: Wed Feb 24 14:26:46 2010 +0000
1572
configure.ac | 4 ++--
1573
1 files changed, 2 insertions(+), 2 deletions(-)
1575
commit ec0c7fcd9bb734c3fd488b4b3ec3d469ba5e967f
1576
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1577
Date: Wed Feb 24 14:23:58 2010 +0000
1579
build: Use the right headers when enumerating them
1581
The installed _HEADERS should be the public ones and the enumeration
1582
types; repeating clutter-x11-texture-pixmap.h breaks with automake 1.11
1583
and doesn't strictly make any sense.
1585
http://bugzilla.openedhand.com/show_bug.cgi?id=2002
1587
clutter/x11/Makefile.am | 2 +-
1588
1 files changed, 1 insertions(+), 1 deletions(-)
1590
commit 1370d72a7a1490c1ed60f02634f146995482116d
1591
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1592
Date: Wed Feb 24 14:20:14 2010 +0000
1596
NEWS | 44 ++++++++++++++++++++++++++++++++++++++++++++
1597
1 files changed, 44 insertions(+), 0 deletions(-)
1599
commit d1ca0e1b8f3dc6f5b5fec0ce3fba4702b9e75386
1600
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1601
Date: Wed Feb 24 12:23:46 2010 +0000
1603
fixed layout: Store a back pointer to the Container
1605
When set_container() is called with a NULL container we cannot use the
1606
passed pointer to unset the CLUTTER_ACTOR_NO_LAYOUT flag. We should
1607
store a back pointer to the container as object data (there's no need
1608
to add a Private data structure in this case) and unset the flag on the
1609
back pointer instead.
1611
clutter/clutter-fixed-layout.c | 14 ++++++++++++--
1612
1 files changed, 12 insertions(+), 2 deletions(-)
1614
commit 3a9d842164708baa8fe877d829f9e9cdcbde3831
1615
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1616
Date: Wed Feb 24 12:09:13 2010 +0000
1618
conformance: Show the Stage to test invariants
1620
We need to make the Stage set the MAPPED flag on itself if we want to
1621
verify the MAPPED state. That was always the case - it just worked
1622
before because the Stage was shown at least once.
1624
tests/conform/test-actor-invariants.c | 9 +++++++++
1625
1 files changed, 9 insertions(+), 0 deletions(-)
1627
commit aa8c8127059326c2d13d9f8dd6a294e787e3760e
1628
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1629
Date: Wed Feb 24 12:08:07 2010 +0000
1631
box: Do not short-circuit size negotiation for empty Boxes
1633
The LayoutManager used might decide to have a default allocation or a
1634
default preferred size when empty.
1636
clutter/clutter-box.c | 31 -------------------------------
1637
1 files changed, 0 insertions(+), 31 deletions(-)
1639
commit 523bab0868255e3f2b2910a60a868bffeb5bf64a
1640
Author: Robert Bragg <robert@linux.intel.com>
1641
Date: Thu Feb 11 11:45:36 2010 +0000
1643
layout: allow wider use of the CLUTTER_ACTOR_NO_LAYOUT flag
1645
Previously only ClutterGroup was able to set the CLUTTER_ACTOR_NO_LAYOUT
1646
flag which allows clutter-actor.c to avoid a relayout when showing or
1647
hiding fixed layout containers. Instead of it being the responsibility
1648
of the container to set this flag this patch makes the layout manager
1649
itself decide in the ::set_container method. This way both ClutterBox
1650
and ClutterGroup can take advantage of the optimization.
1652
clutter/clutter-fixed-layout.c | 17 +++++++++++++++++
1653
clutter/clutter-group.c | 8 +++-----
1654
2 files changed, 20 insertions(+), 5 deletions(-)
1656
commit f21e649c80a3e0db5db7dc1128f7828535dbebc2
1657
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1658
Date: Wed Feb 24 11:28:44 2010 +0000
1660
docs: Detail replacement for cogl_check_extension()
1662
The cogl_check_extension() function has been deprecated, but it's easily
1663
replaceable with a simple strstr() call.
1665
clutter/cogl/cogl/cogl.h | 13 ++++++++-----
1666
1 files changed, 8 insertions(+), 5 deletions(-)
1668
commit 829d3f4bc5d083320f7f1b70d25e0115e1b6512f
1669
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1670
Date: Wed Feb 24 11:27:51 2010 +0000
1672
docs: Update NEWS and README
1674
The NEWS file was not updated for the 1.1.12 release, so we need to
1677
The Release Notes section for Clutter and Cogl also needs some more
1678
entries that escaped previous releases.
1680
NEWS | 33 +++++++++++++++++++++++++++++++++
1681
README | 21 +++++++++++++++++++++
1682
2 files changed, 54 insertions(+), 0 deletions(-)
1684
commit d54af2363d390bf598aaa931821a46604d4f192a
1685
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1686
Date: Wed Feb 24 10:20:10 2010 +0000
1688
build: Use template for ClutterX11 enumerationt types
1690
Clutter and Cogl use the template Makefile.am.enums for building the
1691
enumeration GTypes from public headers, but ClutterX11 is not.
1693
.gitignore | 13 ++++----
1694
clutter/x11/Makefile.am | 77 +++++++++++++++++++----------------------------
1695
2 files changed, 37 insertions(+), 53 deletions(-)
1697
commit eb35c446b119274658ba45937e02b5cfd1ec27fe
1698
Author: Neil Roberts <neil@linux.intel.com>
1699
Date: Tue Feb 23 22:06:59 2010 +0000
1701
clutter-box: Layer new actors on top of all others at the same depth
1703
g_list_insert_sorted inserts the new actor before all others that
1704
compare equal so for the normal case when all actors have depth==0
1705
this has the surprising behaviour of layering the actors in reverse
1706
order. To fix this it now manually inserts the actor in the right
1707
place by searching until it finds an actor at a higher depth and
1708
inserting before that.
1710
http://bugzilla.openedhand.com/show_bug.cgi?id=1988
1712
clutter/clutter-box.c | 25 ++++++++++++++++++++++---
1713
1 files changed, 22 insertions(+), 3 deletions(-)
1715
commit da0315e4d666cc7cbfcfe7dab63d731df2a02338
1716
Author: Neil Roberts <neil@linux.intel.com>
1717
Date: Tue Feb 23 22:10:30 2010 +0000
1719
box: Revert "Tweak the depth sorting function"
1721
This reverts commit 939e56e2b12e5c96fa1173be33c2786ddfe57c25.
1723
Changing the depth sort function to have inconsistent behaviour for
1724
nodes that compare equal breaks the stability of g_list_sort. It ends
1725
up so that every time clutter_container_sort_depth_order is called the
1726
order of all actors with the same depth is reversed.
1728
http://bugzilla.openedhand.com/show_bug.cgi?id=1988
1730
clutter/clutter-box.c | 2 +-
1731
1 files changed, 1 insertions(+), 1 deletions(-)
1733
commit 1c65f2ee1e4595d3044d05cadb4f33fc2d03a6f3
1734
Author: Robert Bragg <robert@linux.intel.com>
1735
Date: Wed Feb 17 18:45:08 2010 +0000
1737
cogl debug: Adds glViewport call tracing
1739
To aid in the debugging of Clutter stage resize issues this adds a
1740
COGL_DEBUG=opengl option that will trace "some select OpenGL calls"
1741
(currently just glViewport calls)
1743
clutter/cogl/cogl/cogl-debug.c | 2 ++
1744
clutter/cogl/cogl/cogl-debug.h | 3 ++-
1745
clutter/cogl/cogl/cogl-framebuffer.c | 6 ++++++
1746
3 files changed, 10 insertions(+), 1 deletions(-)
1748
commit fa3830ff20962dc72b676a5411a7fa1829a870cd
1749
Author: Robert Bragg <robert@linux.intel.com>
1750
Date: Wed Feb 17 17:53:28 2010 +0000
1752
cogl debug: hint that all debugging paths are G_UNLIKELY
1754
Most Cogl debugging code conditions are marked as G_UNLIKELY with the
1755
intention of having the CPU branch prediction always assume the
1756
path is disabled so having debugging support in release binaries has
1757
negligible overhead.
1759
This patch simply fixes a few cases where we weren't using G_UNLIKELY.
1761
clutter/cogl/cogl/cogl-journal.c | 9 +++++----
1762
clutter/cogl/cogl/cogl.c | 2 +-
1763
2 files changed, 6 insertions(+), 5 deletions(-)
1765
commit a58d6e8ee5e26185ff090845df68b61076275c21
1766
Author: Robert Bragg <robert@linux.intel.com>
1767
Date: Wed Feb 17 17:40:57 2010 +0000
1769
cogl debug: Support "minimum" level debugging by default
1771
We basically want all Clutter applications out in the wild to at least
1772
have the basic set of COGL_DEBUG/--cogl-debug options available for
1773
investigating issues.
1775
configure.ac | 4 ++--
1776
1 files changed, 2 insertions(+), 2 deletions(-)
1778
commit 511e5ceb516dcbf2c406a7c2e8e0e56d2135fb0d
1779
Author: Robert Bragg <robert@linux.intel.com>
1780
Date: Wed Feb 17 14:38:11 2010 +0000
1782
cogl debug: Makes COGL_DEBUG=all|verbose|help more useful
1784
COGL_DEBUG=all wasn't previously useful as there are several options
1785
that change the behaviour of Cogl and all together wouldn't help anyone
1788
This patch makes it so COGL_DEBUG=all|verbose now only enables options
1789
that don't change the behaviour of Cogl, i.e. they only affect the
1790
amount of noise we'll print to a terminal.
1792
In addition to that this patch also improves the output from
1793
COGL_DEBUG=help so we now print a table of options including one liner
1794
descriptions of what each option enables.
1796
clutter/cogl/cogl/cogl-debug.c | 121 +++++++++++++++++++++-------
1797
clutter/cogl/cogl/cogl-debug.h | 37 ++++-----
1798
clutter/cogl/cogl/cogl-texture-2d-sliced.c | 2 +-
1799
3 files changed, 111 insertions(+), 49 deletions(-)
1801
commit 939e56e2b12e5c96fa1173be33c2786ddfe57c25
1802
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1803
Date: Tue Feb 23 17:59:09 2010 +0000
1805
box: Tweak the depth sorting function
1807
By changing the depth sorting function we can achieve the same effect as
1808
ClutterGroup but without the costly append+sort.
1810
http://bugzilla.openedhand.com/show_bug.cgi?id=1988
1812
clutter/clutter-box.c | 2 +-
1813
1 files changed, 1 insertions(+), 1 deletions(-)
1815
commit 95960ab902852e9c4830815b89d0a315fb9e4c50
1816
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1817
Date: Tue Feb 23 16:51:26 2010 +0000
1819
cogl: Add deprecation annotation to CoglMaterial ref/unref
1821
The G_GNUC_DEPRECATED annotation was missing from the material ref and
1824
clutter/cogl/cogl/cogl-material.h | 4 ++--
1825
1 files changed, 2 insertions(+), 2 deletions(-)
1827
commit a9941e94995d2701783f055e69fba52a64f609e0
1828
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1829
Date: Tue Feb 16 20:08:35 2010 +0000
1831
debug: Split debugging notes from behavioural modifiers
1833
Some of the ClutterDebugFlags are not meant as a logging facility: they
1834
actually change Clutter's behaviour at run-time.
1836
It would be useful to have this distinction ratified, and thus split
1837
ClutterDebugFlags into two: one DebugFlags for logging facilities and
1838
another set of flags for behavioural changes.
1840
This split is warranted because:
1842
• it should be possible to do "CLUTTER_DEBUG=all" and only have
1843
log messages on the output
1845
• it should be possible to use behavioural modifiers even on a
1846
Clutter that has been compiled without debugging messages
1849
The commit adds two new debugging flags:
1851
ClutterPickDebugFlags - controlled by the CLUTTER_PICK environment
1854
ClutterPaintDebugFlags - controlled by the CLUTTER_PAINT environment
1857
The PickDebugFlags are:
1862
While the PaintDebugFlags is:
1866
The mechanism is equivalent to the CLUTTER_DEBUG environment variable,
1867
but it does not depend on the debug level selected when configuring and
1868
compiling Clutter. The picking and painting debugging flags are
1869
initialized at clutter_init() time.
1871
http://bugzilla.openedhand.com/show_bug.cgi?id=1991
1873
clutter/clutter-debug.h | 14 ++++++++--
1874
clutter/clutter-main.c | 49 +++++++++++++++++++++++++++++-------
1875
clutter/glx/clutter-backend-glx.c | 6 +++-
1876
3 files changed, 54 insertions(+), 15 deletions(-)
1878
commit a9c307ff5d94489b30d7398ac80072fe7222a434
1879
Author: Neil Roberts <neil@linux.intel.com>
1880
Date: Wed Feb 17 22:16:17 2010 +0000
1882
cogl-vertex-buffer: Fix the malloc fallback for indices
1884
The size of the malloc'd buffer for indices when VBOs are not
1885
available was too small so memory corruption would result if it was
1888
http://bugzilla.o-hand.com/show_bug.cgi?id=1996
1890
clutter/cogl/cogl/cogl-vertex-buffer.c | 2 +-
1891
1 files changed, 1 insertions(+), 1 deletions(-)
1893
commit 14669657737cc1547fb0db261232e63bdd2755d9
1894
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1895
Date: Mon Feb 22 11:34:04 2010 +0000
1897
device: Motion events compression should honour the device
1899
The motion event compression should be affected by the device field of
1900
the event; that is: we should compress motion events coming from the
1903
clutter/clutter-stage.c | 29 ++++++++++++++++++++++-------
1904
1 files changed, 22 insertions(+), 7 deletions(-)
1906
commit 5ed4732737202c3051044455a91dc70c213fb800
1907
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1908
Date: Mon Feb 22 11:30:14 2010 +0000
1910
device: Force ENTER on Stage with overlapping Actors
1912
If an actor is on the boundary of a Stage and the pointer for a device
1913
enters the Stage over that actor, the sequence of events currently is:
1915
➔ ENTER (source: actor, related: NULL)
1918
Thus the Stage never gets an ENTER event. This is a regression from
1921
The correct sequence is:
1923
➔ ENTER (source: stage, related: NULL)
1924
➔ ENTER (source: actor, related: stage)
1927
This also maps to the sequence of events sythesized by Clutter when
1928
leaving the Stage through an actor overlapping the Stage boundary.
1930
http://bugzilla.moblin.org/show_bug.cgi?id=9781
1932
clutter/clutter-input-device.c | 27 +++++++++++++++++++++++----
1933
1 files changed, 23 insertions(+), 4 deletions(-)
1935
commit ee33357fd5d08be824a5ecb3161a79568afa4e5c
1936
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1937
Date: Thu Feb 18 16:58:29 2010 +0000
1939
stage: Only clutter_stage_get_default() creates the default stage
1941
The introduction of the StageManager in 0.8 implied that the first Stage
1942
instance to be created was automatically assigned the status of "default
1943
stage". This was all well and good, since the default stage was created
1944
behind the curtains by the initialization sequence.
1946
Now that the initialization sequence does not create a default stage any
1947
longer, it means that the first stage created using clutter_stage_new()
1948
gets to be the default, and all special and warm and fuzzy - which also
1949
means that the first stage created by clutter_stage_new() cannot be
1950
destroyed or handled as any other stage. Whoopsie.
1952
Let's go back to the old semantics: the stage created by the first
1953
invocation of clutter_stage_get_default() is the default stage, and
1954
nothing else can be set as default. One day we'll be able to break the
1955
API and the whole default stage business will be a thing of the past.
1957
clutter/clutter-private.h | 10 ++++++----
1958
clutter/clutter-stage-manager.c | 32 +++++++++++++++++++++++++-------
1959
clutter/clutter-stage.c | 1 +
1960
3 files changed, 32 insertions(+), 11 deletions(-)
1962
commit 9a6de8757f27ff8a8cf9f89209f9366e03b7aadf
1963
Author: Emmanuele Bassi <ebassi@linux.intel.com>
1964
Date: Thu Feb 18 11:34:06 2010 +0000
1966
docs: Document the InputDevice update method
1968
Embedding toolkits should benefit from a proper documentation of
1969
clutter_input_device_update_from_event(): its meaning, its use and
1970
the caveats for the "update_stage" argument.
1972
clutter/clutter-input-device.c | 49 ++++++++++++++++++++++++++++++++++++++++
1973
1 files changed, 49 insertions(+), 0 deletions(-)
1975
commit a2afc9d7ba0a80733044b97498a7df26de5a4ab2
1976
Author: Neil Roberts <neil@linux.intel.com>
1977
Date: Wed Feb 17 18:18:38 2010 +0000
1979
win32: Fixup compilation errors from b398292089b0f7
1981
That commit added some Win32 code which breaks compilation.
1983
Thanks to Samuel Degrande for help with this.
1985
clutter/win32/clutter-backend-win32.c | 5 ++---
1986
clutter/win32/clutter-device-manager-win32.c | 18 ++++++------------
1987
clutter/win32/clutter-event-win32.c | 2 +-
1988
3 files changed, 9 insertions(+), 16 deletions(-)
1990
commit 5de743de705ba9bb9a2061a66045b32091165ad5
1991
Author: Robert Bragg <robert@linux.intel.com>
1992
Date: Tue Feb 16 14:53:10 2010 +0000
1994
cogl_texture_new_from_foreign: improve docs
1996
Improve the explanation of what the x_pot_waste and y_pot_waste
1997
arguments can be used for.
1999
clutter/cogl/cogl/cogl-texture.h | 15 +++++++++++----
2000
1 files changed, 11 insertions(+), 4 deletions(-)
2002
commit 9c06c94374c61c019ca49fa6fd80679e6ad2f29a
2003
Author: Robert Bragg <robert@linux.intel.com>
2004
Date: Tue Feb 16 14:23:11 2010 +0000
2006
cogl-texture: for foreign textures; always trust user geom
2008
We now never query the width and height of the given texture object
2009
from OpenGL. The problem is that the user may be creating a Cogl
2010
texture from a texture_from_pixmap object where glTexImage2D was
2011
never called and the texture_from_pixmap spec doesn't clarify that
2012
it's reliable to query the width from OpenGL.
2014
This should address:
2015
http://bugzilla.openedhand.com/show_bug.cgi?id=1502
2017
Thanks to Johan Bilien for reporting
2019
clutter/cogl/cogl/cogl-texture-2d-sliced.c | 24 +++++++++---------------
2020
1 files changed, 9 insertions(+), 15 deletions(-)
2022
commit 8b040cac4dfaaa9d91635d31d93a79d00f637772
2023
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2024
Date: Wed Feb 17 19:02:43 2010 +0000
2026
docs: Fixes for DeviceManager
2028
clutter/clutter-device-manager.h | 12 ++++++------
2029
doc/reference/clutter/clutter-sections.txt | 6 ++++++
2030
2 files changed, 12 insertions(+), 6 deletions(-)
2032
commit 51a3e49c8228a22c1fbcd42971ad27d26d83991b
2033
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2034
Date: Wed Feb 17 18:21:50 2010 +0000
2036
device: Allow updating devices from embedding toolkits
2038
Embedding toolkits most likely will disable the event handling, so all
2039
the input device code will not be executed. Unfortunately, the newly
2040
added synthetic event generation of ENTER and LEAVE event pairs depends
2041
on having input devices.
2043
In order to unbreak things without reintroducing the madness of the
2044
previous code we should allow embedding toolkits to just update the
2045
state of an InputDevice by using the data contained inside the
2046
ClutterEvent. This strategy has two obvious reasons:
2048
• the embedding toolkit is creating a ClutterEvent by translating
2049
a toolkit-native event anyway
2051
• this is exactly what ClutterStage does when processing events
2053
We are, essentially, deferring input device handling to the embedding
2054
toolkits, just like we're deferring event handling to them.
2056
clutter/clutter-event.h | 2 -
2057
clutter/clutter-input-device.c | 59 ++++++++++++++++++++++++++++
2058
clutter/clutter-input-device.h | 5 ++
2059
clutter/clutter-types.h | 2 +
2060
doc/reference/clutter/clutter-sections.txt | 2 +
2061
5 files changed, 68 insertions(+), 2 deletions(-)
2063
commit b398292089b0f70b9457985426d6b962d9179fa7
2064
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2065
Date: Wed Feb 17 17:06:25 2010 +0000
2067
device: Impose per-backend DeviceManager
2069
The DeviceManager class should be abstract in Clutter, and implemented
2070
by each backend, as different backends will have different ways to
2071
detect, initialize and list devices; the X11 backend alone has *two*
2072
ways of dealing with devices.
2074
This commit makes DeviceManager an abstract class and delegates the
2075
device initialization and enumeration to per-backend sub-classes.
2077
The responsible for creating the device manager is, obviously, the
2080
The X11 and Win32 backends have been updated to the new layout; the
2081
Win32 backend has been updated blindly, so it might require additional
2084
clutter/clutter-backend.h | 38 ++--
2085
clutter/clutter-device-manager.c | 166 +++++++++----
2086
clutter/clutter-device-manager.h | 51 ++++-
2087
clutter/clutter-private.h | 7 -
2088
clutter/win32/Makefile.am | 2 +
2089
clutter/win32/clutter-backend-win32.c | 38 ++--
2090
clutter/win32/clutter-backend-win32.h | 3 +-
2091
clutter/win32/clutter-device-manager-win32.c | 173 +++++++++++++
2092
clutter/win32/clutter-device-manager-win32.h | 60 +++++
2093
clutter/win32/clutter-event-win32.c | 34 ++-
2094
clutter/x11/Makefile.am | 2 +
2095
clutter/x11/clutter-backend-x11.c | 168 +++----------
2096
clutter/x11/clutter-backend-x11.h | 3 +-
2097
clutter/x11/clutter-device-manager-x11.c | 349 ++++++++++++++++++++++++++
2098
clutter/x11/clutter-device-manager-x11.h | 68 +++++
2099
clutter/x11/clutter-event-x11.c | 14 +-
2100
16 files changed, 930 insertions(+), 246 deletions(-)
2102
commit 0bf6d57ab128f301588695d011a9ab5d1b1dce1a
2103
Author: Chris Lord <chris@linux.intel.com>
2104
Date: Wed Feb 17 16:56:30 2010 +0000
2106
[event-x11] Don't relayout on window move
2108
ConfigureNotify is delivered on window movements too, but there is no
2109
need to queue a relayout on these as the viewport hasn't changed size.
2110
Check for the window actually changing size on ConfigureNotify before
2111
queueing a relayout.
2113
This fixes laggy window movement when moving a window in response to
2114
Clutter mouse motion events.
2116
clutter/x11/clutter-event-x11.c | 26 ++++++++++++++++----------
2117
1 files changed, 16 insertions(+), 10 deletions(-)
2119
commit 05054bed87866d10c927642fe6273c5bd8f89a95
2120
Author: Neil Roberts <neil@linux.intel.com>
2121
Date: Wed Feb 17 15:58:32 2010 +0000
2123
cogl-clip-stack: Round the coords when clipping to a window rect
2125
The size and position of the window rectangle for clipping in
2126
try_pushing_rect_as_window_rect is calculated by projecting the
2127
rectangle coordinates. Due to rounding errors, this can end up with
2128
slightly off numbers like 34.999999. These were then being cast
2129
directly to an integer so it could end up off by one.
2131
This uses a new macro called COGL_UTIL_NEARBYINT which is a
2132
replacement for the C99 nearbyint function.
2134
clutter/cogl/cogl/cogl-clip-stack.c | 6 +++++-
2135
clutter/cogl/cogl/cogl-util.h | 8 ++++++++
2136
2 files changed, 13 insertions(+), 1 deletions(-)
2138
commit a726ef32aa4721070b57df2e08c304096cb24736
2139
Author: Neil Roberts <neil@linux.intel.com>
2140
Date: Wed Feb 17 14:38:45 2010 +0000
2142
test-cogl-vertex-buffer: Fix the maximum index number
2144
It was passing the number of vertices to
2145
cogl_vertex_buffer_draw_elements but instead it should take the
2146
maximum index which would be the number of vertices minus one. This
2147
was causing errors to be reported with the checks filterset of Bugle.
2149
tests/interactive/test-cogl-vertex-buffer.c | 2 +-
2150
1 files changed, 1 insertions(+), 1 deletions(-)
2152
commit fbcaf1e0b34f68934e0c84b01adfa5ea920c6c6a
2153
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2154
Date: Wed Feb 17 10:46:16 2010 +0000
2156
Improve LEAVE events for border actors
2158
If an actor is lying on the border of the Stage it might miss the LEAVE
2159
event when the pointer of a device leaves the Stage window. Since the
2160
backend is unsetting the Stage back pointer on the InputDevice we can
2161
queue the emission of a LEAVE event on the pointer actor as well.
2163
http://bugzilla.moblin.org/show_bug.cgi?id=9677
2165
clutter/clutter-input-device.c | 23 ++++++++++++++++++++++-
2166
tests/interactive/test-events.c | 22 +++++++++++++++++-----
2167
2 files changed, 39 insertions(+), 6 deletions(-)
2169
commit 719e314b8e364955b046c990ddc1c9f07b0cc55f
2170
Author: Chris Lord <chris@linux.intel.com>
2171
Date: Tue Feb 16 18:25:46 2010 +0000
2173
[stage-x11] Fix a warning due to a missing cast
2175
I stupidly forgot to cast a ClutterStage to a ClutterActor and somehow
2176
missed or didn't get the compiler warning. Fix.
2178
clutter/x11/clutter-stage-x11.c | 2 +-
2179
1 files changed, 1 insertions(+), 1 deletions(-)
2181
commit f9f03894a691cfb8f791f34c684d82f8a6d5b5b8
2182
Author: Chris Lord <chris@linux.intel.com>
2183
Date: Tue Feb 16 18:17:55 2010 +0000
2185
[stage-x11] Fix resizing for foreign windows
2187
As well as manually setting the geometry size, we needed to queue a
2188
relayout. This is what the ConfigureNotify handler would normally do,
2189
but we don't get this event when using a foreign window (obviously).
2191
This should fix resizing in things like gtk-clutter.
2193
clutter/x11/clutter-stage-x11.c | 5 +++++
2194
1 files changed, 5 insertions(+), 0 deletions(-)
2196
commit df6e7aee73a3c3818acab8218732659eb77a3cdc
2197
Author: Chris Lord <chris@linux.intel.com>
2198
Date: Tue Feb 16 17:46:52 2010 +0000
2200
[stage-x11] Set the geometry size for foreign wins
2202
If we get into the resize function and it's a foreign window, set the
2203
geometry size so that the allocate will set the backend size and call
2206
clutter/x11/clutter-stage-x11.c | 9 ++++++++-
2207
1 files changed, 8 insertions(+), 1 deletions(-)
2209
commit c2d016471258c529d7829ed807e76a4e029b614b
2210
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2211
Date: Tue Feb 16 16:31:20 2010 +0000
2213
Add test-stage-sizing to the ignore file
2216
1 files changed, 1 insertions(+), 0 deletions(-)
2218
commit d42f928c43994331017bca7145b7b06fd5848909
2219
Author: Chris Lord <chris@linux.intel.com>
2220
Date: Tue Feb 16 15:39:08 2010 +0000
2222
[test-interactive] Add a stage sizing test
2224
Add an interactive stage sizing test to test the interaction of
2225
fullscreening/resizing/expanding/shrinking a visible stage.
2227
tests/interactive/Makefile.am | 3 +-
2228
tests/interactive/test-stage-sizing.c | 113 +++++++++++++++++++++++++++++++++
2229
2 files changed, 115 insertions(+), 1 deletions(-)
2231
commit 1117b6a9ac974dd5855c5e76965c15329c608ff4
2232
Author: Chris Lord <chris@linux.intel.com>
2233
Date: Tue Feb 16 14:50:14 2010 +0000
2235
[stage-x11] Fix switching fullscreen mode
2237
Setting/unsetting fullscreen on a mapped or unmapped window now works
2240
If you unfullscreen a window that was initially full-screened, it will
2241
unset the fullscreen hint and the WM will likely push the size down to
2242
the largest valid size.
2244
If the window was previously un-fullscreened, Clutter will restore the
2247
Fullscreening also now works if the WM switches the hint without the
2248
application's knowledge (as happens when you resize a window to the size
2249
of the screen, for example, with stock metacity).
2251
clutter/clutter-stage.c | 3 +-
2252
clutter/x11/clutter-event-x11.c | 13 ++++++-
2253
clutter/x11/clutter-stage-x11.c | 71 ++++++++++++++++++++++-----------------
2254
clutter/x11/clutter-stage-x11.h | 2 +-
2255
4 files changed, 54 insertions(+), 35 deletions(-)
2257
commit dd36c3ad5c4f3d25d0286cf1c2a9a25abf7d2ea4
2258
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2259
Date: Tue Feb 16 12:32:37 2010 +0000
2261
Post-release version bump to 1.1.13
2263
configure.ac | 4 ++--
2264
1 files changed, 2 insertions(+), 2 deletions(-)
2266
commit 21354b2b7518c9518fa8405f07ed1f929736d4a2
2267
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2268
Date: Tue Feb 16 12:21:15 2010 +0000
2270
Release 1.1.12 (developers snapshot)
2272
configure.ac | 4 ++--
2273
1 files changed, 2 insertions(+), 2 deletions(-)
2275
commit 7a3eb452b802e5b38542d224da179c4267706e7b
2276
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2277
Date: Tue Feb 16 12:16:02 2010 +0000
2279
conform: Do not resize the stage
2281
Since all conformance tests share the same state we should not touch
2282
stuff like the stage size; sharing is already fairly complex and adds a
2283
lot of caveats on the implementation of a conformance test unit, and if
2284
we make tests influence later ones then we might slip in bugs or false
2285
negatives - thus defeating the whole point of a conformance test suite.
2287
tests/conform/test-cogl-offscreen.c | 1 -
2288
tests/conform/test-cogl-readpixels.c | 1 -
2289
tests/conform/test-cogl-viewport.c | 1 -
2290
tests/conform/test-pick.c | 1 -
2291
4 files changed, 0 insertions(+), 4 deletions(-)
2293
commit 4cadc7300504828fa0db8cb21e1b9d8e23be6319
2294
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2295
Date: Tue Feb 16 12:15:23 2010 +0000
2297
conform: Use a 640x480 stage in test-pick
2299
Do not resize the stage to a smaller size: the default size is perfectly
2302
tests/conform/test-pick.c | 4 ++--
2303
1 files changed, 2 insertions(+), 2 deletions(-)
2305
commit 958545aa70e526a12720bf2dd0d9b9a24d273b8d
2306
Author: Neil Roberts <neil@linux.intel.com>
2307
Date: Tue Feb 16 12:01:18 2010 +0000
2309
cogl-atlas-texture: Don't use the atlas if FBOs aren't supported
2311
If FBOs aren't supported then it will end up very slow to reorganize
2312
the atlas. Also currently the CoglTexture2D backend will refuse to
2313
create any textures anyway so the full atlas texture won't be created.
2315
clutter/cogl/cogl/cogl-atlas-texture.c | 8 +++++---
2316
1 files changed, 5 insertions(+), 3 deletions(-)
2318
commit a5021ba30f553d641399545d9777eb5b4b385ac1
2319
Author: Neil Roberts <neil@linux.intel.com>
2320
Date: Tue Feb 16 11:58:47 2010 +0000
2322
cogl-atlas-texture: Check for errors when creating the atlas texture
2324
cogl_texture_2d_new may fail in certain circumstances so
2325
cogl_atlas_texture_reserve_space should detect this and also
2326
fail. This will cause cogl_texture_new to fallback to a sliced
2329
Thanks to Vladimir Ivakin for reporting this problem.
2331
clutter/cogl/cogl/cogl-atlas-texture.c | 19 ++++++++++++-------
2332
1 files changed, 12 insertions(+), 7 deletions(-)
2334
commit e65bb38720c8990684ce24bda08b78d8da49cc1b
2335
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2336
Date: Tue Feb 16 11:38:51 2010 +0000
2338
conform: Use g_assert_cmpint() in cogl-readpixels test
2340
The g_assert_cmpint() macro prints out not just the assertion condition
2341
but also the assertion contents; this is useful to catch wrong values
2342
without incrementing the verbosity of the test itself.
2344
tests/conform/test-cogl-readpixels.c | 18 ++++++++----------
2345
1 files changed, 8 insertions(+), 10 deletions(-)
2347
commit 56f164f8a1c634e2d0ba6ffb5879672d456e1488
2348
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2349
Date: Mon Feb 15 19:03:37 2010 +0000
2351
docs: Document SWAP_EVENTS feature flag
2353
clutter/clutter-feature.h | 1 +
2354
1 files changed, 1 insertions(+), 0 deletions(-)
2356
commit 2fcb644e4fb02375bdf8b1f54677bcde7abdceba
2357
Author: Chris Lord <chris@linux.intel.com>
2358
Date: Mon Feb 15 18:53:58 2010 +0000
2360
[stage] Fix some races to do with window resizing
2362
When we resize, we relied on the stage's allocate to re-initialise the
2363
GL viewport. Unfortunately, if we resized within Clutter, the new size
2364
was cached before the window is actually resized, so glViewport wasn't
2365
being called after resizing (some of the time, it's a race condition).
2367
Change the way resizing works slightly so that we only resize when the
2368
geometry size doesn't match our preferred size, and queue a relayout on
2369
ConfigureNotify so the glViewport gets called.
2371
Also change window creation slightly so that setting the size of a
2372
window before it's realized works correctly.
2374
clutter/clutter-stage.c | 36 +++++++++++++++---------------------
2375
clutter/glx/clutter-stage-glx.c | 19 +++++++++++++++++--
2376
clutter/x11/clutter-event-x11.c | 13 +++++++++++++
2377
clutter/x11/clutter-stage-x11.c | 24 ++++++++++--------------
2378
4 files changed, 55 insertions(+), 37 deletions(-)
2380
commit 0d428655e23c18064176aa823db0d7165581ba02
2381
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2382
Date: Mon Feb 15 16:09:26 2010 +0000
2384
actor: Turn push/pop_internal into Actor methods
2386
Since the "internal" state is global, it will leak onto actors that you
2387
didn't intend for it to, because it applies not just to the actors you
2388
create, but also to any actors *they* create. Eg, if you have a dialog
2389
box class, you might push/pop_internal around creating its buttons, so
2390
that those buttons get marked as internal to the dialog box. But
2391
ctx->internal_child will still be set during the *button*'s constructor
2392
as well, and so, eg, the label and icon inside the button actor will
2393
*also* be marked as internal children, even if that isn't what the
2394
button class wanted.
2396
The least intrusive change at this point is to make push_internal() and
2397
pop_internal() two methods of the Actor class, and take a ClutterActor
2398
pointer as the argument - thus moving the locality of the internal_child
2399
counter to the Actor itself.
2401
http://bugzilla.openedhand.com/show_bug.cgi?id=1990
2403
clutter/clutter-actor.c | 31 ++++++++++++++++++-------------
2404
clutter/clutter-actor.h | 4 ++--
2405
clutter/clutter-private.h | 2 --
2406
tests/conform/test-actor-destroy.c | 4 ++--
2407
4 files changed, 22 insertions(+), 19 deletions(-)
2409
commit 2229cafc3833a017b3a107b4f6b207f0a95908f5
2410
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2411
Date: Mon Feb 15 12:04:50 2010 +0000
2413
stage: Add sanity checks for get_pending_swaps()
2415
The master clock might have a Stage during its destruction phase,
2416
without a StageWindow attached to it. If this happens and we try
2417
to dereference the StageWindow to get its class and call a virtual
2418
function we might experience some slight turbulence and... then...
2421
http://bugzilla.openedhand.com/show_bug.cgi?id=1987
2423
clutter/clutter-master-clock.c | 21 +++++++++++++--------
2424
clutter/clutter-stage.c | 10 +++++++++-
2425
2 files changed, 22 insertions(+), 9 deletions(-)
2427
commit fef82fae5c716f15cd345fcfbc37f01578a82580
2428
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2429
Date: Mon Feb 15 11:58:55 2010 +0000
2431
build: Enable experimental COGL API in tests/conform
2433
Enable the experimental API when building the conformance test suite.
2435
tests/conform/Makefile.am | 1 +
2436
tests/conform/test-cogl-pixel-buffer.c | 3 ---
2437
2 files changed, 1 insertions(+), 3 deletions(-)
2439
commit 032121ce17fb825592ba435cf260107b52f8196c
2440
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2441
Date: Mon Feb 15 11:57:48 2010 +0000
2443
build: Disable deprecated API in tests/conform
2445
We should not be using deprecated API in the conformance test suite.
2447
tests/conform/Makefile.am | 1 +
2448
1 files changed, 1 insertions(+), 0 deletions(-)
2450
commit c3354cb2c0acc7d80b2cea3f970a1d83a47d585c
2451
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2452
Date: Mon Feb 15 11:56:34 2010 +0000
2454
conform: Do not use deprecated API
2456
There is no more type-specific ref/unref pairs: it is all under
2459
tests/conform/test-cogl-blend-strings.c | 6 +++---
2460
tests/conform/test-cogl-multitexture.c | 2 +-
2461
tests/conform/test-cogl-texture-mipmaps.c | 2 +-
2462
3 files changed, 5 insertions(+), 5 deletions(-)
2464
commit d607400f01be1c1e26f54b3d83794e0d246e8db0
2465
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2466
Date: Mon Feb 15 11:45:35 2010 +0000
2468
x11: Do not set pid or title on foreign windows
2470
If a StageX11 is using a foreign window we should not need to set the
2471
_NET_WM_PID or the WM_TITLE properies.
2473
http://bugzilla.openedhand.com/show_bug.cgi?id=1989
2475
clutter/x11/clutter-stage-x11.c | 6 +++---
2476
1 files changed, 3 insertions(+), 3 deletions(-)
2478
commit 89191e8bbc591f33dd0f45e2317f31eeaa7d4023
2479
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2480
Date: Mon Feb 15 11:44:02 2010 +0000
2482
docs: Mention signal-swapped-after modifier
2484
The signal-swapped-after:: modifier for signal connection inside the
2485
clutter_actor_animate* variadic arguments functions is not mentioned in
2488
clutter/clutter-animation.c | 34 ++++++++++++++++++++++++----------
2489
1 files changed, 24 insertions(+), 10 deletions(-)
2491
commit 262782feae4e8130321be414f7aac9141ae22eab
2492
Author: Damien Lespiau <damien.lespiau@intel.com>
2493
Date: Mon Feb 8 19:18:36 2010 +0000
2495
docs: Add 2010 in COGL's Copyright notice
2497
While at it, fix the usage of <year> in <copyright> to let the
2498
stylesheet do the collation when having several years.
2500
doc/reference/clutter/clutter-docs.xml.in | 7 +++++--
2501
doc/reference/cogl/cogl-docs.xml.in | 1 +
2502
2 files changed, 6 insertions(+), 2 deletions(-)
2504
commit 01bf50905689b363877f85942403cdc947f8c82c
2505
Author: Damien Lespiau <damien.lespiau@intel.com>
2506
Date: Fri Feb 12 17:24:15 2010 +0000
2508
cogl-buffer: fix compilation for GL ES
2510
In the frenzy of the last 10mins before API freeze, I obviously forgot
2511
to update the OpenGL path for _cogl_buffer_hints_to_gl_enum(). This
2514
clutter/cogl/cogl/cogl-buffer.c | 15 +++++----------
2515
1 files changed, 5 insertions(+), 10 deletions(-)
2517
commit e668a2f228acb1f38853eea4245f87e10e82fe23
2518
Author: Neil Roberts <neil@linux.intel.com>
2519
Date: Fri Feb 12 15:33:56 2010 +0000
2521
cogl-atlas-texture: Flush the journal before adding a new texture
2523
When the atlas is reorganised we could potentially be moving around
2524
textures that are already referenced in the journal. We therefore need
2525
to flush the journal otherwise they will be rendered with incorrect
2526
texture coordinates. We also need to flush the journal even if we are
2527
not reorganizing so that we can rely on the old texture contents
2528
remaining in the atlas after migrating a texture out.
2530
clutter/cogl/cogl/cogl-atlas-texture.c | 26 +++++++++++++++++++++++++-
2531
1 files changed, 25 insertions(+), 1 deletions(-)
2533
commit 4be4f56bdf463ccac89c7068b47ba1450bee95ee
2534
Author: Neil Roberts <neil@linux.intel.com>
2535
Date: Fri Feb 12 10:08:51 2010 +0000
2537
cogl-sub-texture: Optimise taking a sub texture of a sub texture
2539
When creating a Cogl sub-texture, if the full texture is also a sub
2540
texture it will now just offset the x and y and reference the full
2541
texture instead. This avoids one level of indirection when rendering
2542
the texture which reduces the chances of getting rounding errors in
2545
clutter/cogl/cogl/cogl-sub-texture-private.h | 17 ++++-
2546
clutter/cogl/cogl/cogl-sub-texture.c | 29 +++++++--
2547
clutter/cogl/cogl/cogl-texture.h | 4 +
2548
tests/conform/test-cogl-sub-texture.c | 89 ++++++++++++++++---------
2549
4 files changed, 99 insertions(+), 40 deletions(-)
2551
commit 2018b5b16750b090c5592ebd5262fc66d809183e
2552
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2553
Date: Fri Feb 12 16:24:27 2010 +0000
2555
actor: Split get_paint_opacity() from the type check
2557
Since get_paint_opacity() recurses through the hierarchy it might lead
2558
to a lot of type checks while we walk the parent-child chain. We can
2559
split the recursive function from the public entry point and perform the
2560
type check just once.
2562
clutter/clutter-actor.c | 55 +++++++++++++++++++++++++++++-----------------
2563
1 files changed, 35 insertions(+), 20 deletions(-)
2565
commit 37d51cb78e41ea36f01c049eda6163bddc84ce33
2566
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2567
Date: Fri Feb 12 16:18:12 2010 +0000
2569
actor: Do not call get_opacity() from get_paint_opacity()
2571
We already have access to the opacity private field, there's no need to
2572
go through the public API.
2574
clutter/clutter-actor.c | 6 +++---
2575
1 files changed, 3 insertions(+), 3 deletions(-)
2577
commit 124f30cccef75feabb0933c074753b392f373e82
2578
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2579
Date: Fri Feb 12 15:52:07 2010 +0000
2581
docs: Fixes for Cogl
2583
clutter/cogl/cogl/cogl-material.h | 1 +
2584
clutter/cogl/cogl/cogl-pixel-buffer.h | 2 +-
2585
doc/reference/cogl/Makefile.am | 3 ++-
2586
doc/reference/cogl/cogl-sections.txt | 8 ++++----
2587
4 files changed, 8 insertions(+), 6 deletions(-)
2589
commit 27e6c3b1e0db6fcb36a8f7e44e457b672ee34565
2590
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2591
Date: Fri Feb 12 14:46:43 2010 +0000
2593
build: Use -Wuninitialized instead of -Wno-uninitialized
2595
We want to be warned about uninitialized variables.
2598
1 files changed, 1 insertions(+), 1 deletions(-)
2600
commit 00c4bfc3c69ba1c1c37852392b46c0fe601a98a1
2601
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2602
Date: Fri Feb 12 14:45:49 2010 +0000
2604
analysis: Interactive tests
2606
Abort if test-behave was passed the wrong type of behaviour to test.
2608
tests/interactive/test-behave.c | 4 ++++
2609
1 files changed, 4 insertions(+), 0 deletions(-)
2611
commit 46182233c031c480b5d4d1f6109ab28a6199d369
2612
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2613
Date: Fri Feb 12 14:45:04 2010 +0000
2615
analysis: Conformance tests
2617
Initialize ClutterPathNote members to 0 using "{ 0, }".
2619
tests/conform/test-path.c | 14 +++++++-------
2620
1 files changed, 7 insertions(+), 7 deletions(-)
2622
commit 78f1f508af88ccd9652d38811a4ebc6662c566dd
2623
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2624
Date: Thu Feb 11 15:24:41 2010 +0000
2626
analysis: x11: ClutterEvent
2628
Remove an unused variable.
2630
clutter/x11/clutter-event-x11.c | 3 ---
2631
1 files changed, 0 insertions(+), 3 deletions(-)
2633
commit 081696fdb5d83c41ed201277db272572eb534db2
2634
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2635
Date: Thu Feb 11 15:24:17 2010 +0000
2637
analysis: CoglPangoRenderer
2639
Remove unused variables.
2641
clutter/cogl/pango/cogl-pango-render.c | 17 +++++++----------
2642
1 files changed, 7 insertions(+), 10 deletions(-)
2644
commit 2d8bdf9e5ebd101b40854e0066b06037dd261ea5
2645
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2646
Date: Thu Feb 11 15:20:25 2010 +0000
2648
analysis: ClutterTimeoutPool
2650
Do not pre-initialize the list iterator, the for loop will do it for us.
2652
clutter/clutter-timeout-pool.c | 2 +-
2653
1 files changed, 1 insertions(+), 1 deletions(-)
2655
commit 9c8f8818784ba7c709c70ead6d8e103ee28d0c8c
2656
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2657
Date: Thu Feb 11 15:20:07 2010 +0000
2659
analysis: ClutterTimeline
2661
Remove an unused variable.
2663
clutter/clutter-timeline.c | 4 ----
2664
1 files changed, 0 insertions(+), 4 deletions(-)
2666
commit 65af411cb4675eab722fe16acc93fa6e7183e3c8
2667
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2668
Date: Thu Feb 11 15:19:46 2010 +0000
2670
analysis: ClutterTexture
2672
Remove unused variables.
2674
clutter/clutter-texture.c | 25 +++++++++----------------
2675
1 files changed, 9 insertions(+), 16 deletions(-)
2677
commit 09644e4bb6cff70d2c9a59bbe9b461b7e53676e2
2678
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2679
Date: Thu Feb 11 15:19:32 2010 +0000
2681
analysis: ClutterText
2683
Remove unused variables.
2685
clutter/clutter-text.c | 2 --
2686
1 files changed, 0 insertions(+), 2 deletions(-)
2688
commit c2d434e3af3d3b862866273a7dd15541ecbebcd5
2689
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2690
Date: Thu Feb 11 15:19:18 2010 +0000
2692
analysis: ClutterStage
2694
Remove unused variables.
2696
clutter/clutter-stage.c | 8 +-------
2697
1 files changed, 1 insertions(+), 7 deletions(-)
2699
commit 136e8c1acb15c078c0898a834f55666c6f0ef384
2700
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2701
Date: Thu Feb 11 15:17:53 2010 +0000
2703
analysis: ClutterScriptParser
2705
We parse a JSON value depending on the initial state of an uninitialized
2708
clutter/clutter-script-parser.c | 2 +-
2709
1 files changed, 1 insertions(+), 1 deletions(-)
2711
commit 4d9010dd5e9c5a69ba5f7a0c3969ce5ac337c08d
2712
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2713
Date: Thu Feb 11 15:17:32 2010 +0000
2715
analysis: ClutterRectangle
2717
Remove unused variables.
2719
clutter/clutter-rectangle.c | 10 +++-------
2720
1 files changed, 3 insertions(+), 7 deletions(-)
2722
commit 8ba65cfd4aba677530b25d9ab1323d2b1b281282
2723
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2724
Date: Thu Feb 11 15:17:07 2010 +0000
2726
analysis: ClutterModel
2728
Remove unused variables.
2730
clutter/clutter-model.c | 10 ----------
2731
1 files changed, 0 insertions(+), 10 deletions(-)
2733
commit bea1a0a6a22ecd0ed96720bcecb3919d3fbb2757
2734
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2735
Date: Thu Feb 11 15:13:40 2010 +0000
2737
analysis: ClutterMain
2739
• Remove unused variables.
2741
• Do not pre-initialize ClutterActor's GType; pre-emptive optimizations
2742
like these are more black magic than real optimization.
2744
clutter/clutter-main.c | 21 ++++++---------------
2745
1 files changed, 6 insertions(+), 15 deletions(-)
2747
commit 66920ea540834c0264434f64a0dcfae4150e625f
2748
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2749
Date: Thu Feb 11 15:13:20 2010 +0000
2751
analysis: ClutterInterval
2753
Remove unused variables.
2755
clutter/clutter-interval.c | 8 --------
2756
1 files changed, 0 insertions(+), 8 deletions(-)
2758
commit 853f9941da5f40b936307ce45f67265f978d9c2b
2759
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2760
Date: Thu Feb 11 15:11:51 2010 +0000
2762
analysis: ClutterBoxLayout
2764
Remove an useless assignment. The n_expand_children is not used outside
2765
the extra_space check, and if n_expand_children is 0 then the extra
2766
space we allocate is 0.
2768
clutter/clutter-box-layout.c | 5 +----
2769
1 files changed, 1 insertions(+), 4 deletions(-)
2771
commit cd058562538633962089cd30787b7a98d9733144
2772
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2773
Date: Thu Feb 11 15:11:25 2010 +0000
2775
analysis: ClutterBehaviour
2777
Remove an unused variable.
2779
clutter/clutter-behaviour.c | 5 +----
2780
1 files changed, 1 insertions(+), 4 deletions(-)
2782
commit 6dc0e9632cc2597240d9e42c98cd567dbcc1dbec
2783
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2784
Date: Thu Feb 11 15:09:51 2010 +0000
2786
analysis: ClutterAnimation
2788
• Remove one unused variable.
2790
• We ignore the result of get_timeline_internal() so we need to tell
2791
the compiler that - though a better solution would be to split the
2792
timeline implicit creation into its own function.
2794
clutter/clutter-animation.c | 10 ++++++----
2795
1 files changed, 6 insertions(+), 4 deletions(-)
2797
commit a287ca7a2824efef2608877555711c408122a400
2798
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2799
Date: Thu Feb 11 15:09:12 2010 +0000
2801
analysis: ClutterAnimator/2
2803
Clean up an unused variable.
2805
clutter/clutter-animator.c | 4 +---
2806
1 files changed, 1 insertions(+), 3 deletions(-)
2808
commit 667222c301ca0f19c570938055208e564e4d02ef
2809
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2810
Date: Thu Feb 11 15:08:19 2010 +0000
2812
analysis: ClutterAnimator/1
2814
Do not de-reference a void*; use a temporary variable -- after
2815
checking the contents of the pointer. This actually simplifies
2816
the readability and avoids pulling a Lisp with the parentheses.
2818
clutter/clutter-animator.c | 10 +++++++++-
2819
1 files changed, 9 insertions(+), 1 deletions(-)
2821
commit fcd3cfc0bfc656d63088a443355b30e7b50d2850
2822
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2823
Date: Thu Feb 11 15:07:38 2010 +0000
2825
analysis: ClutterAlpha
2827
Clean up unused variables.
2829
clutter/clutter-alpha.c | 12 ++----------
2830
1 files changed, 2 insertions(+), 10 deletions(-)
2832
commit aa6d7a30291c199fc1d26a93574d88c027367bf0
2833
Author: Emmanuele Bassi <ebassi@linux.intel.com>
2834
Date: Thu Feb 11 15:05:18 2010 +0000
2836
analysis: ClutterActor
2838
Clean up ClutterActor for unused variables.
2840
clutter/clutter-actor.c | 12 +-----------
2841
1 files changed, 1 insertions(+), 11 deletions(-)
2843
commit 7a372bc0011b6301cc8b46767493a23218a67cff
2844
Author: Neil Roberts <neil@linux.intel.com>
2845
Date: Fri Feb 12 14:26:33 2010 +0000
2847
cogl: Cache the value for GL_MAX_TEXTURE_UNITS
2849
The function _cogl_get_max_texture_units is called quite often while
2850
rendering and it returns a constant value so we might as well cache
2851
the result. Calling glGetInteger on Mesa can be expensive because it
2852
flushes a lot of state.
2854
clutter/cogl/cogl/cogl-context.c | 2 ++
2855
clutter/cogl/cogl/cogl-context.h | 4 ++++
2856
clutter/cogl/cogl/cogl.c | 12 +++++++++---
2857
3 files changed, 15 insertions(+), 3 deletions(-)
2859
commit 22c33b2fea1fd60239280aa1f4fd112f533688aa
2860
Author: Robert Bragg <robert@linux.intel.com>
2861
Date: Thu Feb 11 16:12:26 2010 +0000
2863
cogl: resolves some low hanging issues flagged by clang
2865
An initial pass over the Cogl source code using the Clang static
2866
analysis tool flagged a few low hanging issues such as un-used variables
2867
or redundant initializing of variables which this patch fixes.
2869
clutter/cogl/cogl/cogl-texture-2d-sliced.c | 9 ++-------
2870
clutter/cogl/cogl/cogl-texture.c | 8 ++++----
2871
2 files changed, 6 insertions(+), 11 deletions(-)
2873
commit 18305cbd98e02ab139beef769cbc90a2121bd1f5
2874
Author: Robert Bragg <robert@linux.intel.com>
2875
Date: Thu Feb 11 15:33:01 2010 +0000
2877
cogl_rectangle: avoid redundant copy of geometry
2879
All the cogl_rectangle* APIs normalize their input into into an array of
2880
_CoglMutiTexturedRect rectangles and pass these on to our work horse;
2881
_cogl_rectangles_with_multitexture_coords. The definition of
2882
_CoglMutiTexturedRect had 4 separate float members, x_1, y_1, x_2 and
2883
y_2 which meant for some common cases we were having to copy out from an
2884
array into these members. We are now able to simply point into the users
2885
array avoiding a copy which seems desirable when submiting lots of
2888
clutter/cogl/cogl/cogl-journal-private.h | 5 +-
2889
clutter/cogl/cogl/cogl-journal.c | 31 ++++---
2890
clutter/cogl/cogl/cogl-primitives.c | 135 ++++++++++++++++--------------
2891
3 files changed, 91 insertions(+), 80 deletions(-)
2893
commit 5f18fc928d85499d6ee2ac433dde247286e2de4e
2894
Author: Robert Bragg <robert@linux.intel.com>
2895
Date: Wed Feb 10 22:47:49 2010 +0000
2897
cogl: explicitly mark cogl_<object>_ref/unref APIs as deprecated
2899
This uses the G_GNUC_DEPRECATED macros to mark the
2900
cogl_{texture,vertex_buffer,shader}_ref and unref APIs as deprecated.
2901
Since this flagged that cogl-pango-display-list.c and
2902
clutter-glx-texture-pixmap.c were still using deprecated _ref/_unref
2903
APIs they have now been changed to use the cogl_handle_ref/unref API
2906
clutter/cogl/cogl/cogl-shader.h | 8 ++++++--
2907
clutter/cogl/cogl/cogl-texture.h | 4 ++--
2908
clutter/cogl/cogl/cogl-vertex-buffer.h | 4 ++--
2909
clutter/cogl/pango/cogl-pango-display-list.c | 8 ++++----
2910
clutter/glx/clutter-glx-texture-pixmap.c | 2 +-
2911
5 files changed, 15 insertions(+), 11 deletions(-)
2913
commit 48660349dbcabdde05fc9e1334734bcc62bb790e
2914
Author: Robert Bragg <robert@linux.intel.com>
2915
Date: Wed Feb 10 22:30:37 2010 +0000
2917
cogl: cleanly separate primitives + paths code
2919
The function prototypes for the primitives API were spread between
2920
cogl-path.h and cogl-texture.h and should have been in a
2923
As well as shuffling the prototypes around into more sensible places
2924
this commit splits the cogl-path API out from cogl-primitives.c into
2927
clutter/cogl/cogl/Makefile.am | 3 +
2928
clutter/cogl/cogl/cogl-internal.h | 28 +
2929
clutter/cogl/cogl/cogl-path.c | 1121 +++++++++++++++++++++++++++++++++++
2930
clutter/cogl/cogl/cogl-path.h | 35 +-
2931
clutter/cogl/cogl/cogl-primitives.c | 1078 ---------------------------------
2932
clutter/cogl/cogl/cogl-primitives.h | 188 +++++-
2933
clutter/cogl/cogl/cogl-texture.h | 133 -----
2934
clutter/cogl/cogl/cogl.h | 1 +
2935
8 files changed, 1317 insertions(+), 1270 deletions(-)
2937
commit 9f5a3e14451ed77f47260bbd6a1b2271e8003361
2938
Author: Robert Bragg <robert@linux.intel.com>
2939
Date: Wed Feb 10 18:18:30 2010 +0000
2941
cogl: remove redundant _cogl_journal_flush prototype
2943
There was a redundant _cogl_journal_flush function prototype in
2946
clutter/cogl/cogl/cogl-clip-stack.c | 1 +
2947
clutter/cogl/cogl/cogl-framebuffer.c | 1 +
2948
clutter/cogl/cogl/cogl-journal-private.h | 5 +++--
2949
clutter/cogl/cogl/cogl-material.c | 1 +
2950
clutter/cogl/cogl/cogl-primitives.h | 3 ---
2951
clutter/cogl/cogl/cogl-texture-2d-sliced.c | 1 +
2952
clutter/cogl/cogl/cogl-texture-2d.c | 1 +
2953
clutter/cogl/cogl/cogl-vertex-buffer.c | 1 +
2954
clutter/cogl/cogl/driver/gl/cogl-program.c | 1 +
2955
9 files changed, 10 insertions(+), 5 deletions(-)
2957
commit 7edcbaa1f9444848fcaac052557f7c444e3905e0
2958
Author: Robert Bragg <robert@linux.intel.com>
2959
Date: Wed Feb 10 01:57:32 2010 +0000
2961
cogl: improves header and coding style consistency
2963
We've had complaints that our Cogl code/headers are a bit "special" so
2964
this is a first pass at tidying things up by giving them some
2965
consistency. These changes are all consistent with how new code in Cogl
2966
is being written, but the style isn't consistently applied across all
2969
There are two parts to this patch; but since each one required a large
2970
amount of effort to maintain tidy indenting it made sense to combine the
2971
changes to reduce the time spent re indenting the same lines.
2973
The first change is to use a consistent style for declaring function
2974
prototypes in headers. Cogl headers now consistently use this style for
2978
cogl_function_name (CoglType arg0,
2981
Not everyone likes this style, but it seems that most of the currently
2982
active Cogl developers agree on it.
2984
The second change is to constrain the use of redundant glib data types
2985
in Cogl. Uses of gint, guint, gfloat, glong, gulong and gchar have all
2986
been replaced with int, unsigned int, float, long, unsigned long and char
2987
respectively. When talking about pixel data; use of guchar has been
2988
replaced with guint8, otherwise unsigned char can be used.
2990
The glib types that we continue to use for portability are gboolean,
2991
gint{8,16,32,64}, guint{8,16,32,64} and gsize.
2993
The general intention is that Cogl should look palatable to the widest
2994
range of C programmers including those outside the Gnome community so
2995
- especially for the public API - we want to minimize the number of
2996
foreign looking typedefs.
2998
clutter/cogl/cogl/cogl-atlas-texture.c | 52 ++--
2999
clutter/cogl/cogl/cogl-atlas.c | 22 +-
3000
clutter/cogl/cogl/cogl-atlas.h | 18 +-
3001
clutter/cogl/cogl/cogl-bitmap-fallback.c | 82 +++---
3002
clutter/cogl/cogl/cogl-bitmap-pixbuf.c | 60 ++--
3003
clutter/cogl/cogl/cogl-bitmap-private.h | 30 +-
3004
clutter/cogl/cogl/cogl-bitmap.c | 34 +-
3005
clutter/cogl/cogl/cogl-bitmap.h | 15 +-
3006
clutter/cogl/cogl/cogl-blend-string.c | 12 +-
3007
clutter/cogl/cogl/cogl-blend-string.h | 4 +-
3008
clutter/cogl/cogl/cogl-buffer-private.h | 14 +-
3009
clutter/cogl/cogl/cogl-buffer.c | 8 +-
3010
clutter/cogl/cogl/cogl-buffer.h | 26 +-
3011
clutter/cogl/cogl/cogl-clip-stack.c | 16 +-
3012
clutter/cogl/cogl/cogl-clip-stack.h | 14 +-
3013
clutter/cogl/cogl/cogl-color.h | 75 +++--
3014
clutter/cogl/cogl/cogl-context.c | 2 +-
3015
clutter/cogl/cogl/cogl-context.h | 10 +-
3016
clutter/cogl/cogl/cogl-debug.c | 8 +-
3017
clutter/cogl/cogl/cogl-debug.h | 4 +-
3018
clutter/cogl/cogl/cogl-feature-private.c | 19 +-
3019
clutter/cogl/cogl/cogl-feature-private.h | 14 +-
3020
clutter/cogl/cogl/cogl-fixed.c | 24 +-
3021
clutter/cogl/cogl/cogl-fixed.h | 72 +++--
3022
clutter/cogl/cogl/cogl-handle.h | 2 +-
3023
clutter/cogl/cogl/cogl-internal.h | 32 ++-
3024
clutter/cogl/cogl/cogl-journal.c | 26 +-
3025
clutter/cogl/cogl/cogl-material-private.h | 67 +++--
3026
clutter/cogl/cogl/cogl-material.c | 22 +-
3027
clutter/cogl/cogl/cogl-material.h | 175 +++++++-----
3028
clutter/cogl/cogl/cogl-matrix.h | 110 ++++---
3029
clutter/cogl/cogl/cogl-path.h | 138 +++++----
3030
clutter/cogl/cogl/cogl-pixel-buffer-private.h | 9 +-
3031
clutter/cogl/cogl/cogl-pixel-buffer.c | 53 ++--
3032
clutter/cogl/cogl/cogl-pixel-buffer.h | 46 ++--
3033
clutter/cogl/cogl/cogl-primitives.c | 48 ++--
3034
clutter/cogl/cogl/cogl-primitives.h | 13 +-
3035
clutter/cogl/cogl/cogl-shader.h | 96 ++++---
3036
clutter/cogl/cogl/cogl-sub-texture-private.h | 14 +-
3037
clutter/cogl/cogl/cogl-sub-texture.c | 70 +++---
3038
clutter/cogl/cogl/cogl-texture-2d-private.h | 4 +-
3039
clutter/cogl/cogl/cogl-texture-2d-sliced-private.h | 6 +-
3040
clutter/cogl/cogl/cogl-texture-2d-sliced.c | 163 +++++-----
3041
clutter/cogl/cogl/cogl-texture-2d.c | 34 ++-
3042
clutter/cogl/cogl/cogl-texture-private.h | 6 +-
3043
clutter/cogl/cogl/cogl-texture.c | 106 ++++----
3044
clutter/cogl/cogl/cogl-texture.h | 220 ++++++++-------
3045
clutter/cogl/cogl/cogl-types.h | 15 +-
3046
clutter/cogl/cogl/cogl-util.c | 30 +-
3047
clutter/cogl/cogl/cogl-vertex-buffer-private.h | 2 +-
3048
clutter/cogl/cogl/cogl-vertex-buffer.c | 18 +-
3049
clutter/cogl/cogl/cogl-vertex-buffer.h | 6 +-
3050
clutter/cogl/cogl/cogl.c | 52 ++--
3051
clutter/cogl/cogl/cogl.h | 310 ++++++++++++--------
3052
clutter/cogl/cogl/driver/gl/cogl-program.c | 18 +-
3053
clutter/cogl/cogl/driver/gl/cogl-shader.c | 2 +-
3054
clutter/cogl/cogl/driver/gl/cogl-texture-driver.c | 2 +-
3055
clutter/cogl/cogl/driver/gl/cogl.c | 8 +-
3056
clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c | 6 +-
3057
clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.h | 12 +-
3058
clutter/cogl/cogl/driver/gles/cogl-program.c | 42 ++--
3059
clutter/cogl/cogl/driver/gles/cogl-shader.c | 4 +-
3060
.../cogl/cogl/driver/gles/cogl-texture-driver.c | 4 +-
3061
clutter/cogl/doc/CODING_STYLE | 49 +++
3062
64 files changed, 1491 insertions(+), 1184 deletions(-)
3064
commit 8c9472bc4c0350bc28f6ca152e82a0a507063d19
3065
Author: Robert Bragg <robert@linux.intel.com>
3066
Date: Fri Feb 5 16:32:19 2010 +0000
3068
cogl: deprecates cogl_check_extension
3070
OpenGL is an implementation detail for Cogl so it's not appropriate to
3071
expose OpenGL extensions through the Cogl API.
3073
Note: Clutter is currently still using this API, because it is still
3074
doing raw GL calls in ClutterGLXTexturePixmap, so this introduces a
3075
couple of (legitimate) build warnings while compiling Clutter.
3077
clutter/cogl/cogl/cogl-feature-private.c | 4 +-
3078
clutter/cogl/cogl/cogl-internal.h | 1 +
3079
clutter/cogl/cogl/cogl.c | 32 ++++++++++++++++++++++++++++++
3080
clutter/cogl/cogl/cogl.h | 11 +++++++++-
3081
clutter/cogl/cogl/driver/gl/cogl.c | 31 ++--------------------------
3082
clutter/cogl/cogl/driver/gles/cogl.c | 25 -----------------------
3083
clutter/glx/clutter-backend-glx.c | 6 ++--
3084
clutter/glx/clutter-glx-texture-pixmap.c | 5 ++-
3085
8 files changed, 54 insertions(+), 61 deletions(-)
3087
commit b898f0e227aeabeb0513d1228a8f432c467d95b9
3088
Author: Robert Bragg <robert@linux.intel.com>
3089
Date: Tue Feb 9 19:34:32 2010 +0000
3091
never presume queuing redraws on invisible actors is redundant
3093
This replaces code like this:
3094
if (CLUTTER_ACTOR_IS_VISIBLE (self))
3095
clutter_actor_queue_redraw (self);
3097
clutter_actor_queue_redraw (self);
3099
clutter_actor_queue_redraw internally knows what can be optimized when
3100
the actor is not visible, but it also knows that the queue_redraw signal
3101
must always be sent in case a ClutterClone is cloning a hidden actor.
3103
clutter/clutter-actor.c | 11 ++++-------
3104
clutter/clutter-group.c | 12 ++++--------
3105
clutter/clutter-rectangle.c | 9 +++------
3106
clutter/clutter-stage.c | 8 +++-----
3107
clutter/clutter-text.c | 30 ++++++++++--------------------
3108
clutter/clutter-texture.c | 9 +++------
3109
6 files changed, 27 insertions(+), 52 deletions(-)
3111
commit bfb271b40332240f40c79dabf8f78f7a68293286
3112
Author: Robert Bragg <robert@linux.intel.com>
3113
Date: Tue Feb 9 19:19:44 2010 +0000
3115
box: port a ClutterGroup::foreach fix to ClutterBox
3117
ClutterGroup::foreach was recently changed (ref: ce030a3fce) to use
3118
g_list_foreach() to iterate the children instead of manually iterating
3119
the list so it would safely handle calls like:
3121
clutter_container_foreach (container, clutter_actor_destroy);
3123
(In this example clutter_actor_destroy will result in the current
3124
list item being iterated being freed.)
3126
clutter/clutter-box.c | 7 +++++--
3127
1 files changed, 5 insertions(+), 2 deletions(-)
3129
commit 60a4664d6e4f67b5e527cc2ecd190a538ed994ec
3130
Author: Robert Bragg <robert@linux.intel.com>
3131
Date: Tue Feb 9 19:06:59 2010 +0000
3133
box: Adds missing copyright header
3135
Adds a Copyright (C) 2009,2010 Intel Corporation header
3137
clutter/clutter-box.c | 21 +++++++++++++++++++++
3138
1 files changed, 21 insertions(+), 0 deletions(-)
3140
commit 4355621aebb075bc34b50a89f8ba99e8b8e12ff7
3141
Author: Robert Bragg <robert@linux.intel.com>
3142
Date: Tue Feb 9 18:54:28 2010 +0000
3144
group: make it comparable to ClutterBox
3146
There is a lot of duplication between ClutterGroup and ClutterBox so
3147
this makes the two files diff-able so that new fixes can easily be
3148
ported to both and bug fixes missing in one or the other can be spotted
3149
more easily. This doesn't change the behaviour of either actor; it's
3150
really just a shuffle around of code and normalizes the coding style to
3151
make the files comparable.
3153
This has already uncovered one bug in ClutterBox, and also highlights
3154
a bug in ClutterGroup + many other actors:
3156
1) ClutterGroup::real_foreach was recently changed to use
3157
g_list_foreach instead of manually iterating the child list so it can
3158
safely handle calls like:
3159
clutter_container_foreach (container, clutter_actor_destroy);
3160
ClutterBox is still manually iterating the list.
3162
2) In ClutterGroup we guard _queue_redraw() calls like this:
3163
if (CLUTTER_ACTOR_IS_VISIBLE (container))
3164
clutter_actor_queue_redraw (CLUTTER_ACTOR (container));
3165
In ClutterBox we don't:
3166
I think ClutterBox is correct here because
3167
clutter_actor_queue_redraw already optimizes the case where the
3168
actor's not visible, but it also considers that the actor may be
3169
cloned and so the guard in ClutterGroup could break clones. This
3170
actually highlights a wider clutter bug since the same kinds of
3171
guards can be found in all other clutter actors.
3173
clutter/clutter-box.c | 1 -
3174
clutter/clutter-group.c | 366 +++++++++++++++++++++-------------------------
3175
2 files changed, 167 insertions(+), 200 deletions(-)
3177
commit 34c7611407154fcbb61c82c959c2a38972c2534f
3178
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3179
Date: Fri Feb 12 11:38:47 2010 +0000
3181
docs: Update the backend HACKING file
3183
Clarify the Backend::create_context() vfunc role, and the
3184
Stage::realize() vfunc with regards to creating the GL/GLES
3187
doc/HACKING.backends | 12 ++++++------
3188
1 files changed, 6 insertions(+), 6 deletions(-)
3190
commit 44818a48273baa7dabfbb9370ac218ae8b0cf38e
3191
Author: Neil Roberts <neil@linux.intel.com>
3192
Date: Thu Feb 11 14:20:48 2010 +0000
3194
cogl: Add a fallback for when the signbit macro is missing
3196
The signbit macro is defined in C99 so it should be available but some
3197
versions of GCC don't appear to define it by default. If it's not
3198
available we can use a hack to test the bit directly.
3200
clutter/cogl/cogl/cogl-sub-texture.c | 2 +-
3201
clutter/cogl/cogl/cogl-texture-2d.c | 2 +-
3202
clutter/cogl/cogl/cogl-util.h | 27 ++++++++++++++++++++++++++-
3203
3 files changed, 28 insertions(+), 3 deletions(-)
3205
commit 59463c2213b79a553d3d7999bb56106fb7c5a4ad
3206
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3207
Date: Wed Feb 10 17:20:31 2010 +0000
3209
Do a sanity check on _clutter_do_pick() arguments
3211
We should check that the passed ClutterStage pointer is indeed: a) still
3212
valid and b) a Stage.
3214
clutter/clutter-main.c | 1 +
3215
1 files changed, 1 insertions(+), 0 deletions(-)
3217
commit d0734bc4741d77e7c239cf860b73b49e9564aa91
3218
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3219
Date: Wed Feb 10 17:12:27 2010 +0000
3221
input-device: Do not pick() on NULL stages
3223
If the stage associated to the InputDevice is not set we should
3224
short-circuit out and return NULL. This will result in a pick()
3225
done on the event's stage - if applicable.
3227
http://bugzilla.moblin.org/show_bug.cgi?id=9602
3229
clutter/clutter-input-device.c | 6 ++++--
3230
1 files changed, 4 insertions(+), 2 deletions(-)
3232
commit 4208169ab48795ca8f10287bd67031e161bf1f82
3233
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3234
Date: Wed Feb 10 15:38:41 2010 +0000
3236
text: Bump up the preferred height
3238
Instead of returning a sub-pixel height round up the preferred height to
3239
the nearest integral value that is not less than the size reported by
3240
Pango, once converted in pixels.
3242
clutter/clutter-text.c | 2 +-
3243
1 files changed, 1 insertions(+), 1 deletions(-)
3245
commit f54b29a0c0c182f1396abd9df7d46d99b81a133d
3246
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3247
Date: Wed Feb 10 15:38:07 2010 +0000
3249
test-text-field: Tone down the border
3251
Use a low opacity for the text field border.
3253
tests/interactive/test-text-field.c | 2 +-
3254
1 files changed, 1 insertions(+), 1 deletions(-)
3256
commit 2670fc58710b1d9d1ad5afae7b6ac397e1dc54dd
3257
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3258
Date: Wed Feb 10 15:37:26 2010 +0000
3260
test-text-field: Use ActorBox methods for the border
3262
Clamp to pixel and use get_size() when painting the border of the text
3265
tests/interactive/test-text-field.c | 4 ++--
3266
1 files changed, 2 insertions(+), 2 deletions(-)
3268
commit 3fdb0a59509aeaeb07c276ebd09df355626cfb92
3269
Author: Robert Bragg <robert@linux.intel.com>
3270
Date: Wed Feb 10 11:57:58 2010 +0000
3272
uprof: make the Redrawing timer a child of the Master Clock
3274
Previously it was a child of the Mainloop, but it's more closely
3275
a child of the Master Clock.
3277
clutter/clutter-backend.c | 2 +-
3278
1 files changed, 1 insertions(+), 1 deletions(-)
3280
commit 1899dbdc270e0bd494d174dd6bfbb9c5d18e174f
3281
Author: Robert Bragg <robert@linux.intel.com>
3282
Date: Wed Feb 10 12:18:41 2010 +0000
3284
backend-glx: Fix glXQueryVersion test
3286
This fixes some backwards logic for asserting that we have a GLX major
3287
version == 1 and a minor version >= 2. (NB: Although we technically
3288
depend on GLX 1.3 features, we still have to support drivers that report
3289
GLX 1.2 because there are a lot of mesa drivers out there incorrectly
3290
report GLX 1.2 even though they export extensions that depend on GLX
3293
clutter/glx/clutter-backend-glx.c | 2 +-
3294
1 files changed, 1 insertions(+), 1 deletions(-)
3296
commit ce1bb3d858fd02d6bcfb94b2b8999cfd7d0a4535
3297
Author: Neil Roberts <neil@linux.intel.com>
3298
Date: Wed Feb 10 12:41:09 2010 +0000
3300
cogl-material: Layers are not equal if the filters aren't equal
3302
A material layer can not be considered equal if it is using different
3303
texture filtering modes. This was causing problems where rectangles
3304
with different filters would end up batched together and then rendered
3305
with the wrong filter mode.
3307
clutter/cogl/cogl/cogl-material.c | 5 +++++
3308
1 files changed, 5 insertions(+), 0 deletions(-)
3310
commit b61c2b510b5f5a72ae6181cdce646d7018fbd996
3311
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3312
Date: Wed Feb 10 10:58:14 2010 +0000
3314
build: Tweak internal defines for building Clutter
3316
When building Clutter we should:
3318
• disable Cogl deprecated API;
3319
• enable experimental API.
3321
clutter/Makefile.am | 2 ++
3322
1 files changed, 2 insertions(+), 0 deletions(-)
3324
commit 4a9f08639f7127719f5b59ee9287641ba4912063
3325
Author: Robert Bragg <robert@linux.intel.com>
3326
Date: Wed Jan 20 18:53:36 2010 +0000
3328
debug: Adds CLUTTER_DEBUG=disable-swap-events option
3330
This allows us to forcibly disable the use of the GLX_INTEL_swap_events
3331
extension for testing or debugging purposes.
3333
clutter/clutter-debug.h | 37 +++++++++++++++++++------------------
3334
clutter/clutter-main.c | 3 ++-
3335
clutter/glx/clutter-backend-glx.c | 3 ++-
3336
3 files changed, 23 insertions(+), 20 deletions(-)
3338
commit 5d702853b814445590aafe448bfc8f7993b06638
3339
Author: Robert Bragg <robert@linux.intel.com>
3340
Date: Thu Nov 12 20:37:01 2009 +0000
3342
glx backend: Adds support for GLX_INTEL_swap_event
3344
If your OpenGL driver supports GLX_INTEL_swap_event that means when
3345
glXSwapBuffers is called it returns immediatly and an XEvent is sent when
3346
the actual swap has finished.
3348
Clutter can use the events that notify swap completion as a means to
3349
throttle rendering in the master clock without blocking the CPU and so it
3350
should help improve the performance of CPU bound applications.
3352
clutter/clutter-feature.h | 3 +-
3353
clutter/clutter-master-clock.c | 72 ++++++++++++++++++++++++----
3354
clutter/clutter-private.h | 2 +
3355
clutter/clutter-stage-window.c | 13 +++++
3356
clutter/clutter-stage-window.h | 3 +
3357
clutter/clutter-stage.c | 8 +++
3358
clutter/glx/Makefile.am | 2 +
3359
clutter/glx/clutter-backend-glx.c | 56 +++++++++++++++++----
3360
clutter/glx/clutter-backend-glx.h | 3 +
3361
clutter/glx/clutter-event-glx.c | 96 +++++++++++++++++++++++++++++++++++++
3362
clutter/glx/clutter-event-glx.h | 38 +++++++++++++++
3363
clutter/glx/clutter-stage-glx.c | 21 ++++++++
3364
clutter/glx/clutter-stage-glx.h | 2 +
3365
clutter/x11/clutter-backend-x11.c | 10 ++++
3366
clutter/x11/clutter-backend-x11.h | 7 +++
3367
clutter/x11/clutter-event-x11.c | 5 ++
3368
doc/HACKING.backends | 8 +++
3369
17 files changed, 327 insertions(+), 22 deletions(-)
3371
commit 848db1ee4cc910542435bbcd3a57933bdf70269e
3372
Author: Robert Bragg <robert@linux.intel.com>
3373
Date: Thu Jan 14 14:03:23 2010 +0000
3375
glx backend: when running with GLX 1.3 then create GLXWindows for stages
3377
Some extensions only support GLX versions > 1.3 and may not support
3378
old style X Windows as GLXDrawables, so we now create GLXWindows for
3379
stages when possible.
3381
clutter/glx/clutter-backend-glx.c | 72 ++++++++++++++++++++++++++++--------
3382
clutter/glx/clutter-backend-glx.h | 1 +
3383
clutter/glx/clutter-stage-glx.c | 28 ++++++++++++++
3384
clutter/glx/clutter-stage-glx.h | 1 +
3385
4 files changed, 86 insertions(+), 16 deletions(-)
3387
commit ca3ab41a1b12f661fe6eecddfaf5e03b0d94d682
3388
Author: Neil Roberts <neil@linux.intel.com>
3389
Date: Tue Feb 9 18:33:09 2010 +0000
3391
clutter-backend: Fix the error check in _clutter_backend_create_stage
3393
Commit d2bdd3cb62 fixed some compiler warnings but also broke the
3394
ability to create a stage. Although not having warnings from the
3395
compiler is nice, it is also nice to be able to create a stage so lets
3396
not invert the meaning of the error check.
3398
clutter/clutter-backend.c | 2 +-
3399
1 files changed, 1 insertions(+), 1 deletions(-)
3401
commit 7b1925df82fa92fd68623c9a999ece6bf4ddfde3
3402
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3403
Date: Tue Feb 9 17:07:08 2010 +0000
3405
cogl: Move material_copy() out of the deprecated section
3407
We strongly suggest people should be using cogl_material_copy(), but it
3408
was hidden behind the deprecation guards.
3410
clutter/cogl/cogl/cogl-material.h | 4 ++--
3411
1 files changed, 2 insertions(+), 2 deletions(-)
3413
commit d2bdd3cb62c1cba24619ae843cf087709a02643d
3414
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3415
Date: Tue Feb 9 16:57:14 2010 +0000
3417
Fix some compiler warnings
3419
GCC complains that some variable might be used uninitialized.
3421
clutter/clutter-backend.c | 6 ++++--
3422
clutter/clutter-bin-layout.c | 1 +
3423
clutter/clutter-flow-layout.c | 6 ++++++
3424
clutter/clutter-text.c | 6 ++----
3425
clutter/cogl/cogl/cogl-matrix-stack.c | 6 +++++-
3426
5 files changed, 18 insertions(+), 7 deletions(-)
3428
commit 193c477495488446d2f3d8ab0184f882f3255f48
3429
Author: Neil Roberts <neil@linux.intel.com>
3430
Date: Tue Feb 9 16:30:28 2010 +0000
3432
cogl-bitmap: Remove const from premult_alpha_last_four_pixels_sse2
3434
The function modifies the pixels pointed by p in-place so the pointer
3435
can not be constant. The compiler was accepting this because the
3436
modification is done from inline assembler.
3438
clutter/cogl/cogl/cogl-bitmap-fallback.c | 2 +-
3439
1 files changed, 1 insertions(+), 1 deletions(-)
3441
commit f5d2f58b03bf03b69f6cb92b3bdddb92b8a8ecc2
3442
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3443
Date: Tue Feb 9 15:29:29 2010 +0000
3445
docs: Clean up the unused symbols for Cogl
3447
Gtk-doc is reporting a lot of false positives in the unused text file,
3448
mostly because of new private files that have been added to Cogl but not
3449
to the gtk-doc ignore list for the Cogl API reference.
3451
Once the false positives have been removed we have a couple of really
3452
missing symbols that should be added to the cogl-sections.txt file.
3454
doc/reference/cogl/Makefile.am | 54 +++++++++++++++++++---------------
3455
doc/reference/cogl/cogl-sections.txt | 7 ++++
3456
2 files changed, 37 insertions(+), 24 deletions(-)
3458
commit ecc5ffe91ace38c9d288251807e721a4cd71b052
3459
Author: Bastian Winkler <buz@netbuz.org>
3460
Date: Tue Feb 9 15:19:03 2010 +0100
3462
cogl-buffer: Use correct argument types in cogl_buffer_set_data_EXP
3464
offset and size arguments are gsize in cogl-buffer.h
3466
http://bugzilla.openedhand.com/show_bug.cgi?id=1980
3468
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
3470
clutter/cogl/cogl/cogl-buffer.c | 4 ++--
3471
1 files changed, 2 insertions(+), 2 deletions(-)
3473
commit 9aac36b47e43e95d12c8d28bd3671e6f5e000d32
3474
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3475
Date: Tue Feb 9 14:48:11 2010 +0000
3477
docs: Move some Cogl defines in the private section
3479
The PixelFormat bit and mask #defines should not be used and are there
3480
mostly for convenience, so we can push them to the "private" sub-section
3481
of the API reference.
3483
This pushed Cogl's API reference coverage to 100%.
3485
doc/reference/cogl/cogl-sections.txt | 16 ++++++++--------
3486
1 files changed, 8 insertions(+), 8 deletions(-)
3488
commit 7ebb1e7157ab5d3efbeb37d7879d851adc7da40e
3489
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3490
Date: Tue Feb 9 14:41:37 2010 +0000
3492
docs: Fixes for Cogl API reference
3494
98% symbol docs coverage.
3495
335 symbols documented.
3496
0 symbols incomplete.
3499
Not bad, if I may say so.
3501
clutter/cogl/cogl/cogl-buffer.h | 12 ++++++--
3502
clutter/cogl/cogl/cogl-color.h | 41 +++++++++++++++++++++++++++++
3503
clutter/cogl/cogl/cogl-fixed.h | 2 +-
3504
clutter/cogl/cogl/cogl-material-private.h | 2 +-
3505
clutter/cogl/cogl/cogl-matrix.h | 3 +-
3506
clutter/cogl/cogl/cogl-types.h | 23 +++++++++++++++-
3507
doc/reference/cogl/cogl-sections.txt | 16 +++--------
3508
7 files changed, 80 insertions(+), 19 deletions(-)
3510
commit 1d28ed035f360b14cfbf5b01db4ffe2979172cf0
3511
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3512
Date: Tue Feb 9 13:39:08 2010 +0000
3514
Post-release bump to 1.1.11
3516
configure.ac | 4 ++--
3517
1 files changed, 2 insertions(+), 2 deletions(-)
3519
commit a24d4d21a0eeca771476705ef407d55fdb32e68f
3520
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3521
Date: Tue Feb 9 12:31:42 2010 +0000
3525
Brown paper bag release.
3527
configure.ac | 4 ++--
3528
1 files changed, 2 insertions(+), 2 deletions(-)
3530
commit 738e73873dd0c05a44f7cb0ad40c8a854e0c75a6
3531
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3532
Date: Tue Feb 9 12:59:18 2010 +0000
3536
NEWS | 19 +++++++++++++++++++
3537
1 files changed, 19 insertions(+), 0 deletions(-)
3539
commit cccf23caa481a239b747d1fdd5e0ca5ae7f6682c
3540
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3541
Date: Tue Feb 9 11:29:39 2010 +0000
3543
build: Always build conformance tests with debug symbols
3545
Having the conformance test suite build without debug symbols doesn't
3548
tests/conform/Makefile.am | 2 +-
3549
1 files changed, 1 insertions(+), 1 deletions(-)
3551
commit e46db37c03b6adae1594729c2c5c86e65701d95b
3552
Author: Robert Bragg <robert@linux.intel.com>
3553
Date: Tue Feb 9 13:00:39 2010 +0000
3555
conform: fix stack corruption in test-behaviours.c
3557
The test was calling g_object_get to fetch the "opacity-start" property
3558
(unsigned int) into a guint8 local variable. It's a bit of a mean trap
3559
given that the getter function returns guint8 values so this also adds a
3560
comment explaining what's going on.
3562
tests/conform/test-behaviours.c | 11 +++++++----
3563
1 files changed, 7 insertions(+), 4 deletions(-)
3565
commit a02253f19a722dcfbf0a32543dd563127dd7b80e
3566
Author: Neil Roberts <neil@linux.intel.com>
3567
Date: Tue Feb 9 12:21:10 2010 +0000
3569
cogl-texture-2d: Use _cogl_texture_driver_gen to generate the GL tex
3571
_cogl_texture_driver_gen is needed to set the texture minification
3572
mode to Cogl's default of GL_LINEAR. There was also a line to set this
3573
in _cogl_texture_2d_new_with_size but it wasn't working because it was
3574
called *before* the texture was bound. If the texture was later
3575
rendered with the default material it then it would end up with GL's
3576
default mipmap filtering mode but without mipmaps so it would render
3577
white squares instead.
3579
clutter/cogl/cogl/cogl-texture-2d.c | 3 +--
3580
1 files changed, 1 insertions(+), 2 deletions(-)
3582
commit 1b2ff7eff7e97d8542e35514bfa010be706973ee
3583
Author: Neil Roberts <neil@linux.intel.com>
3584
Date: Fri Dec 18 21:17:21 2009 +0000
3586
cogl: Use SSE2 when possible for premultiplying
3588
This adds a fast path for premultiplying an RGBA image using SSE2
3589
instructions. SSE registers are 128-bit and we need at least 16-bits
3590
per component for the intermediate result of the multiplication so we
3591
can do two pixels in parallel with one register. The function
3592
interleaves 2 SSE registers to multiply 4 pixels in one function call
3593
with the hope that this will pipeline better.
3595
http://bugzilla.openedhand.com/show_bug.cgi?id=1939
3596
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
3598
clutter/cogl/cogl/cogl-bitmap-fallback.c | 104 +++++++++++++++++++++++++++++-
3599
1 files changed, 103 insertions(+), 1 deletions(-)
3601
commit bbb058df40a5e1acf7b8e42049c3cd5d966f762d
3602
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3603
Date: Tue Feb 9 10:34:41 2010 +0000
3605
actor: Improve readability of raise/lower warnings
3607
• Add the function name in the warning, since the text is the same in
3608
both clutter_actor_raise() and clutter_actor_lower().
3610
• If an actor has a name then prefer it to the type name.
3612
clutter/clutter-actor.c | 46 +++++++++++++++++++++++++++++-----------------
3613
1 files changed, 29 insertions(+), 17 deletions(-)
3615
commit 7664568fff63501339d2cb1682ae1a9f1c27e068
3616
Author: Halton Huo <halton.huo@gmail.com>
3617
Date: Tue Feb 9 10:21:37 2010 +0000
3619
Remove return from void functions
3621
This patch fixes compilation on suncc.
3623
http://bugzilla.openedhand.com/show_bug.cgi?id=1978
3625
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
3627
clutter/cogl/cogl/cogl-buffer.c | 2 +-
3628
clutter/cogl/cogl/cogl-sub-texture.c | 2 +-
3629
clutter/cogl/cogl/cogl-texture.c | 2 +-
3630
3 files changed, 3 insertions(+), 3 deletions(-)
3632
commit a23ce8606860075e35fca28eb82e57e340f2b9b9
3633
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3634
Date: Mon Feb 8 18:09:14 2010 +0000
3636
Post-release bump to 1.1.9
3639
1 files changed, 1 insertions(+), 1 deletions(-)
3641
commit a2889ed0772503dce504ab260fbbf662a0ad25d8
3642
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3643
Date: Mon Feb 8 17:57:48 2010 +0000
3645
Release Clutter 1.1.8
3648
1 files changed, 1 insertions(+), 1 deletions(-)
3650
commit a139bf9c40f88b46055e4cd9754ba51acca97c87
3651
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3652
Date: Mon Feb 8 17:56:35 2010 +0000
3654
test-animator: Do not use mid-function blocks
3656
The test_animator_properties unit is so small that declaring a
3657
mid-function block for two variables is not that clever.
3659
tests/conform/test-animator.c | 57 ++++++++++++++++++++---------------------
3660
1 files changed, 28 insertions(+), 29 deletions(-)
3662
commit 4d9327bbe14c2771896999844df3eac28da75347
3663
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3664
Date: Mon Feb 8 17:55:29 2010 +0000
3666
animator: Zero the AnimatorKey:value member
3668
The test suite is showing random segfaults because the GValue member of
3669
AnimatorKey is not zero-ed on creation.
3671
clutter/clutter-animator.c | 6 +++---
3672
1 files changed, 3 insertions(+), 3 deletions(-)
3674
commit d62ddc374f88448fbde6db11ed4b10a594ecc5c4
3675
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3676
Date: Mon Feb 8 17:37:00 2010 +0000
3678
docs: Fixes for ClutterAnimator
3680
clutter/clutter-animator.c | 2 +-
3681
clutter/clutter-animator.h | 16 ++++++++--------
3682
doc/reference/clutter/clutter-sections.txt | 1 +
3683
3 files changed, 10 insertions(+), 9 deletions(-)
3685
commit 9806f78905eea6e7c3b5b1f35b35650a823cb295
3686
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3687
Date: Mon Feb 8 17:34:11 2010 +0000
3692
1 files changed, 4 insertions(+), 0 deletions(-)
3694
commit 814d3acd0730f2e418ccc44d550e1fa369c142fe
3695
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3696
Date: Mon Feb 8 17:27:20 2010 +0000
3700
NEWS | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
3701
1 files changed, 53 insertions(+), 0 deletions(-)
3703
commit 419afc01e8f2c96f7cf5c0962e5c421f8f3a476f
3704
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3705
Date: Mon Feb 8 17:27:13 2010 +0000
3707
docs: Update the release notes
3710
1 files changed, 6 insertions(+), 0 deletions(-)
3712
commit c02dded0f6793ad377b566360371c23dbe61b4bc
3713
Author: Damien Lespiau <damien.lespiau@intel.com>
3714
Date: Mon Feb 8 17:11:43 2010 +0000
3716
cogl-buffer: Use TEXTURE as the only value for CoglBufferUsageHint
3718
We should try to use more explicit defines than GL for our hints. For
3719
now we only support using a CoglBuffer to generate textures.
3721
clutter/cogl/cogl/cogl-buffer.c | 38 +++++++------------------------
3722
clutter/cogl/cogl/cogl-buffer.h | 12 ++-------
3723
clutter/cogl/cogl/cogl-pixel-buffer.c | 2 +-
3724
tests/conform/test-cogl-pixel-buffer.c | 12 +++++-----
3725
4 files changed, 19 insertions(+), 45 deletions(-)
3727
commit 54a6df22b038b047931dc108df35bc9e097d4e5e
3728
Author: Damien Lespiau <damien.lespiau@intel.com>
3729
Date: Tue Feb 2 16:44:16 2010 +0000
3731
cogl-buffer: make sure the code compiles on GL ES
3733
OpenGL ES has no PBO extension, so we fallback to using a malloc'ed
3734
buffer. Make sure the OpenGL-only defines don't leak into the OpenGL ES
3737
clutter/cogl/cogl/cogl-buffer.c | 28 ++++++++++++++++++++++++++++
3738
clutter/cogl/cogl/cogl-pixel-buffer.c | 7 +++++++
3739
clutter/cogl/cogl/cogl-texture.c | 5 ++++-
3740
3 files changed, 39 insertions(+), 1 deletions(-)
3742
commit d0fe4795368ddc55411fb081832bfcdfdfeb4314
3743
Author: Damien Lespiau <damien.lespiau@intel.com>
3744
Date: Tue Feb 2 12:59:51 2010 +0000
3746
cogl-pixel-buffer: Add a fallback path
3748
First, let's add a new public feature called, surprisingly,
3749
COGL_FEATURE_PBOS to check the availability of PBOs and provide a
3750
fallback path when running on older GL implementations or on OpenGL ES
3752
In case the underlying OpenGL implementation does not provide PBOs, we
3753
need a fallback path (a malloc'ed buffer). The CoglPixelBufer
3754
constructors will instanciate a subclass of CoglBuffer that handles
3755
map/unmap and set_data() with a malloc'ed buffer.
3757
The public feature is useful to check before using set_data() on a
3758
buffer as it will mean doing a memcpy() when not supporting PBOs (in
3759
that case, it's better to create the texture directly instead of using a
3762
clutter/cogl/cogl/cogl-pixel-buffer.c | 56 ++++++++++++++++++-
3763
clutter/cogl/cogl/cogl-texture.c | 38 +++++++++----
3764
clutter/cogl/cogl/cogl-types.h | 4 +-
3765
.../cogl/cogl/driver/gl/cogl-feature-functions.h | 5 ++
3766
4 files changed, 88 insertions(+), 15 deletions(-)
3768
commit b5d5821304e8ca15ee4411bf7ff8f26a6a23c855
3769
Author: Damien Lespiau <damien.lespiau@intel.com>
3770
Date: Fri Jan 22 15:38:31 2010 +0000
3772
tests: Add a test for CoglPixelBuffers
3774
Exercise the whole public CoglBuffer / CoglPixelBuffer and
3775
cogl_texture_new_from_buffer API.
3778
tests/conform/Makefile.am | 1 +
3779
tests/conform/test-cogl-pixel-buffer.c | 337 ++++++++++++++++++++++++++++++++
3780
tests/conform/test-conform-main.c | 3 +
3781
4 files changed, 342 insertions(+), 0 deletions(-)
3783
commit b7f049495b527547d093ca337588ceb289c9cb2b
3784
Author: Damien Lespiau <damien.lespiau@intel.com>
3785
Date: Fri Jan 22 15:07:27 2010 +0000
3787
cogl-texture: Add a new constructor to turn CoglBuffers into textures
3789
The only goal of using COGL buffers is to use them to create
3790
textures. cogl_texture_new_from_buffer() is the new symbol to create
3791
textures out of buffers.
3793
clutter/cogl/cogl/cogl-texture.c | 55 +++++++++++++++++++++++++++++++
3794
clutter/cogl/cogl/cogl-texture.h | 60 ++++++++++++++++++++++++++++++++++
3795
doc/reference/cogl/cogl-sections.txt | 3 ++
3796
3 files changed, 118 insertions(+), 0 deletions(-)
3798
commit abbb668163537598790cb3eca564ea19b1e010ad
3799
Author: Damien Lespiau <damien.lespiau@intel.com>
3800
Date: Sun Jan 10 18:04:29 2010 +0000
3802
cogl-pixel-buffer: add a pixel buffer object class
3804
This subclass of CoglBuffer aims at wrapping PBOs or other system
3805
surfaces like DRM buffer objects. Two constructors are available:
3807
cogl_pixel_buffer_new() with a size when you only care about the size of
3808
the buffer (such a buffer can be used to store several texture data such
3809
as the three planes of a I420 frame).
3811
cogl_pixel_buffer_new_full() is more a 1:1 mapping between the data and
3812
an underlying surface, with the possibility of having access to a low
3813
level memory buffer that may have a stride.
3815
clutter/cogl/cogl/Makefile.am | 3 +
3816
clutter/cogl/cogl/cogl-pixel-buffer-private.h | 72 ++++++
3817
clutter/cogl/cogl/cogl-pixel-buffer.c | 317 +++++++++++++++++++++++++
3818
clutter/cogl/cogl/cogl-pixel-buffer.h | 165 +++++++++++++
3819
clutter/cogl/cogl/cogl.h | 1 +
3820
doc/reference/cogl/cogl-sections.txt | 6 +
3821
6 files changed, 564 insertions(+), 0 deletions(-)
3823
commit b5e9710cdf5795f532fe46b9dfcc704a07d99ac9
3824
Author: Damien Lespiau <damien.lespiau@intel.com>
3825
Date: Sun Jan 10 17:28:24 2010 +0000
3827
cogl-buffer: add an abstract class around openGL's buffer objects
3829
Buffer objects are cool! This abstracts the buffer API first introduced
3830
by GL_ARB_vertex_buffer_object and then extended to other objects.
3832
The coglBuffer abstract class is intended to be the base class of all
3833
the buffer objects, letting the user map() buffers. If the underlying
3834
implementation does not support buffer objects (or only support VBO but
3835
not FBO for instance), fallback paths should be provided.
3837
clutter/cogl/cogl/Makefile.am | 3 +
3838
clutter/cogl/cogl/cogl-buffer-private.h | 102 +++++++++++
3839
clutter/cogl/cogl/cogl-buffer.c | 282 ++++++++++++++++++++++++++++++
3840
clutter/cogl/cogl/cogl-buffer.h | 287 +++++++++++++++++++++++++++++++
3841
clutter/cogl/cogl/cogl-context.c | 2 +
3842
clutter/cogl/cogl/cogl-context.h | 5 +
3843
clutter/cogl/cogl/cogl.h | 4 +
3844
doc/reference/cogl/cogl-docs.xml.in | 21 +++
3845
doc/reference/cogl/cogl-sections.txt | 17 ++
3846
9 files changed, 723 insertions(+), 0 deletions(-)
3848
commit de8a6314f12854e748de515afb487af56eaac845
3849
Author: Damien Lespiau <damien.lespiau@intel.com>
3850
Date: Mon Jan 25 11:21:05 2010 +0000
3852
cogl: new textures sould have GL_TEXTURE_MIN_FILTER set to GL_LINEAR
3854
The only way the user has to set the mipmap filters is through the
3855
material/layer API. This API defaults to GL_LINEAR/GL_LINEAR for the max
3856
and min filters. With the main use case of cogl being 2D interfaces, it
3857
makes sense do default to GL_LINEAR for the min filter.
3859
When creating new textures, we did not set any filter on them, using
3860
OpenGL defaults': GL_NEAREST_MIPMAP_LINEAR for the min filter and
3861
GL_LINEAR for the max filter. This will make the driver allocate memory
3862
for the mipmap tree, memory that will not be used in the nominal case
3863
(as the material API defaults to GL_LINEAR).
3865
This patch tries to ensure that the min filter is set to GL_LINEAR
3866
before any glTexImage*() call is done on the texture by setting the
3867
filter when generating new OpenGL handles.
3869
clutter/cogl/cogl/cogl-texture-2d-sliced.c | 9 +++---
3870
clutter/cogl/cogl/cogl-texture-2d.c | 9 +++---
3871
clutter/cogl/cogl/cogl-texture-driver.h | 9 ++++++
3872
clutter/cogl/cogl/driver/gl/cogl-texture-driver.c | 27 ++++++++++++++++++++
3873
.../cogl/cogl/driver/gles/cogl-texture-driver.c | 27 ++++++++++++++++++++
3874
5 files changed, 72 insertions(+), 9 deletions(-)
3876
commit c0f65212baee25dd4e66f4366a54bd847c782eb3
3877
Author: Damien Lespiau <damien.lespiau@intel.com>
3878
Date: Mon Jan 11 00:15:25 2010 +0000
3880
cogl: Introduce the GE_RET() debug macro
3882
Some GL functions have a return value that the GE() macro is not able to
3883
handle. Let's define a new Ge_RET() macro which will be able to handle
3884
functions such as glMapBuffer().
3886
While at it, removed the unused variadic dots to the GE() macro.
3888
clutter/cogl/cogl/cogl-internal.h | 14 +++++++++++++-
3889
1 files changed, 13 insertions(+), 1 deletions(-)
3891
commit 069ba6daf9d39b471eb5c1de6e621f1343d5f00c
3892
Merge: cc6aefa 6ab9089
3893
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3894
Date: Mon Feb 8 16:53:11 2010 +0000
3896
Merge branch 'animator-parser'
3899
docs: Describe the Animation definition syntax
3900
animator: Provide a ClutterScript parser
3901
animator: Allow retrieving type property type from a key
3902
script: Use a node when resolving an animation mode
3904
commit 6ab90899badf7820ffc4f40f23bf18c979762577
3905
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3906
Date: Mon Feb 8 16:50:29 2010 +0000
3908
docs: Describe the Animation definition syntax
3910
The ClutterAnimator documentation needs a section on the syntax of its
3911
ClutterScript definition, possibly with an example.
3913
clutter/clutter-animator.c | 59 ++++++++++++++++++++++++++++++++++++++++++++
3914
1 files changed, 59 insertions(+), 0 deletions(-)
3916
commit 4dd11d6915f75ba62b8292c3138d4cc11a28fb21
3917
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3918
Date: Mon Feb 8 15:52:18 2010 +0000
3920
animator: Provide a ClutterScript parser
3922
The whole point of having the Animator class is that the developer can
3923
describe a complex animation using ClutterScript. Hence, ClutterAnimator
3924
should hook into the Script machinery and parse a specific description
3925
format for its keys.
3928
clutter/clutter-animator.c | 303 ++++++++++++++++++++++++++++++++++---
3929
tests/conform/Makefile.am | 1 +
3930
tests/conform/test-animator.c | 88 +++++++++++
3931
tests/conform/test-conform-main.c | 2 +
3932
tests/data/Makefile.am | 2 +
3933
tests/data/test-animator-1.json | 5 +
3934
tests/data/test-animator-2.json | 29 ++++
3935
8 files changed, 409 insertions(+), 23 deletions(-)
3937
commit 790a13c0d9d2249747cfb81dcb13f83c6cc2cec1
3938
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3939
Date: Mon Feb 8 15:47:46 2010 +0000
3941
animator: Allow retrieving type property type from a key
3943
When asking a key for its target value we also ask the developer to pass
3944
in an initialized GValue - but we don't make it easy to know the type of
3945
the GValue. A developer has to ask the GObject class for the GParamSpec
3946
and then initialize the GValue, instead.
3948
Since we know the type of the GValue we should provide a getter for it.
3950
We should also allow developers to throw at us GValue with compatible and
3951
transformable types.
3953
Finally, all the accessors should be constified.
3955
clutter/clutter-animator.c | 93 ++++++++++++++++++++++++++++++++------------
3956
clutter/clutter-animator.h | 13 +++---
3957
2 files changed, 75 insertions(+), 31 deletions(-)
3959
commit 09f91ff6eab3d617be88e11bd17c226fa4d23aed
3960
Author: Emmanuele Bassi <ebassi@linux.intel.com>
3961
Date: Mon Feb 8 15:45:43 2010 +0000
3963
script: Use a node when resolving an animation mode
3965
Instead of taking a string and duplicating the "is it a string or an
3966
integer" check in both Alpha and Animation, the function in
3967
ClutterScript that resolves the animation mode values should take a
3968
JsonNode and do all the checks it needs.
3970
clutter/clutter-alpha.c | 21 ++++-------------
3971
clutter/clutter-animation.c | 25 ++++----------------
3972
clutter/clutter-script-parser.c | 47 ++++++++++++++++++++++++-------------
3973
clutter/clutter-script-private.h | 2 +-
3974
4 files changed, 41 insertions(+), 54 deletions(-)
3976
commit cc6aefad345f4490f59f33eaef6f7589de1f3f9b
3977
Author: Robert Bragg <robert@linux.intel.com>
3978
Date: Thu Jan 14 18:11:57 2010 +0000
3980
cogl path: make sure marking the clip state dirty takes affect
3982
When we trashed the contents of the stencil buffer during
3983
_cogl_path_fill_nodes we marked the clip stack state as dirty and expected
3984
the clip stack code would clean up our glStencilFunc state.
3986
The problem is that we only try and update the clip state during
3987
_cogl_journal_init (when we flush the framebuffer state) which is only
3988
called when the journal first gets something logged in it.
3990
To make sure the stencil state is cleaned up we now also flush the journal
3991
so _cogl_journal_init will be called for the next logged rectangle.
3993
clutter/cogl/cogl/cogl-primitives.c | 9 ++++++++-
3994
1 files changed, 8 insertions(+), 1 deletions(-)
3996
commit 24338a7511cd09298695f0a0b51ea6a97fa6786a
3997
Author: Neil Roberts <neil@linux.intel.com>
3998
Date: Fri Feb 5 21:56:31 2010 +0000
4000
clutter-master-clock: Don't wait for a frame if time goes backwards
4002
If we aren't syncing to vblank or if the last dispatch didn't cause a
4003
redraw then the master clock will try to wait at least a small amount
4004
of time before dispatching again. However if time goes backwards then
4005
it would not do a dispatch until time catches up again. To fix this it
4006
know just runs a dispatch immediately if time goes backwards.
4008
This is related to Moblin bug #3839. There was a similar fix for this
4009
in 9dc012c07, however that only fixed the case where timelines
4010
wouldn't update. If there are no animations running then the master
4011
clock won't even try updating timelines until time catches up.
4013
http://bugzilla.o-hand.com/show_bug.cgi?id=1974
4015
clutter/clutter-master-clock.c | 11 +++++++++++
4016
1 files changed, 11 insertions(+), 0 deletions(-)
4018
commit 8ac27e60707b2dfd13ba978b81421423e37ebf98
4019
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4020
Date: Mon Feb 8 10:40:39 2010 +0000
4022
test-flow-layout: Remove unneeded Stage sizing
4024
The bug with resizable stages getting a 1, 1 window on X11 has been
4027
tests/interactive/test-flow-layout.c | 1 -
4028
1 files changed, 0 insertions(+), 1 deletions(-)
4030
commit 6106010b6f20980fc51d1431b623567eed10853d
4031
Merge: 4cc269a c82c94e
4032
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4033
Date: Mon Feb 8 10:34:22 2010 +0000
4035
Merge remote branch 'origin/cwiiis-stage-resize'
4037
* origin/cwiiis-stage-resize:
4038
[stage-x11] Set the default size differently
4039
[stage] Set default size correctly
4040
Revert "[x11] Don't set actor size on ConfigureNotify"
4041
[x11] Don't set actor size on ConfigureNotify
4042
[stage] Now that get_geometry works, use it
4043
[stage-x11] make get_geometry always get geometry
4044
[stage] Get the current size correctly
4045
[stage] Set minimum width/height to 1x1
4046
[stage] Add set/get_minumum_size
4048
commit 4cc269a4687f6ca4fcd88ada134cfa00e2b13a1a
4049
Author: Øyvind Kolås <pippin@linux.intel.com>
4050
Date: Fri Feb 5 12:32:00 2010 +0000
4054
ClutterAnimator is a class for managing the animation of multiple
4055
properties of multiple actors over time with keyframing of values.
4057
The Animator class is meant to be used to effectively describe
4058
animations using the ClutterScript definition format, and to construct
4059
complex implicit animations from the ground up.
4061
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
4064
clutter/Makefile.am | 2 +
4065
clutter/clutter-animator.c | 1435 ++++++++++++++++++++++++++++
4066
clutter/clutter-animator.h | 166 ++++
4067
clutter/clutter-types.h | 1 +
4068
clutter/clutter.h | 1 +
4069
doc/reference/clutter/clutter-docs.xml.in | 4 +-
4070
doc/reference/clutter/clutter-sections.txt | 48 +
4071
doc/reference/clutter/clutter.types | 1 +
4072
tests/interactive/Makefile.am | 1 +
4073
tests/interactive/test-animator.c | 134 +++
4074
11 files changed, 1793 insertions(+), 1 deletions(-)
4076
commit c82c94e6205eda962faf5a51e663680c313be062
4077
Author: Chris Lord <chris@linux.intel.com>
4078
Date: Sun Feb 7 19:17:43 2010 +0100
4080
[stage-x11] Set the default size differently
4082
We want to set the default size without triggering the layout machinary,
4083
so change the window creation process slightly so we start with a
4086
clutter/clutter-stage.c | 3 ---
4087
clutter/glx/clutter-stage-glx.c | 4 +++-
4088
clutter/x11/clutter-stage-x11.c | 4 ++--
4089
3 files changed, 5 insertions(+), 6 deletions(-)
4091
commit b968defae92f3fbd5a4a762b4c817ab58989ee82
4092
Author: Chris Lord <chris@linux.intel.com>
4093
Date: Sun Feb 7 14:18:14 2010 +0100
4095
[stage] Set default size correctly
4097
Due to the way the new sizing works, clutter stage must set its size in
4098
init (to maintain old behaviour) and the properties on the X11 stage
4099
must be initialised to 1x1 so that it actually goes ahead with the
4102
Fixes stages that aren't user resizable and have no size set from
4105
clutter/clutter-stage.c | 3 +++
4106
clutter/x11/clutter-stage-x11.c | 4 ++--
4107
2 files changed, 5 insertions(+), 2 deletions(-)
4109
commit 8083dc418b3c2b069a9b0db9323650050a3f63b1
4110
Author: Chris Lord <chris@linux.intel.com>
4111
Date: Sat Feb 6 16:57:37 2010 +0100
4113
Revert "[x11] Don't set actor size on ConfigureNotify"
4115
This reverts commit 29cc027f069c9ad900b9044cd40075c2d17be736.
4117
I misunderstood the problem, this commit breaks resizes coming from
4120
clutter/x11/clutter-event-x11.c | 4 ++++
4121
clutter/x11/clutter-stage-x11.c | 5 +----
4122
clutter/x11/clutter-stage-x11.h | 1 -
4123
3 files changed, 5 insertions(+), 5 deletions(-)
4125
commit 29cc027f069c9ad900b9044cd40075c2d17be736
4126
Author: Chris Lord <chris@linux.intel.com>
4127
Date: Sat Feb 6 16:47:22 2010 +0100
4129
[x11] Don't set actor size on ConfigureNotify
4131
Calling clutter_actor_set_size in response to ConfigureNotify makes
4132
setting the size of the stage racy - the most common result of which
4133
seems to be that you can't set the stage dimensions to anything less
4136
Instead, add a first_allocation bit to the private structure of the X11
4137
stage and force the first resize (necessary or the default stage will be
4140
clutter/x11/clutter-event-x11.c | 4 ----
4141
clutter/x11/clutter-stage-x11.c | 5 ++++-
4142
clutter/x11/clutter-stage-x11.h | 1 +
4143
3 files changed, 5 insertions(+), 5 deletions(-)
4145
commit cea9de7f047cb8c2b1d54f41ca1d77c3aff882e0
4146
Author: Chris Lord <chris@linux.intel.com>
4147
Date: Sat Feb 6 15:41:01 2010 +0100
4149
[stage] Now that get_geometry works, use it
4151
We want the actual window geometry in clutter_stage_set_minimum_size,
4152
not the set size. Now that the geometry function has been changed to do
4153
what it says, use it.
4155
clutter/clutter-stage.c | 14 ++++++--------
4156
1 files changed, 6 insertions(+), 8 deletions(-)
4158
commit 4887707bb34faca0d7ad92f6628d18345163f5e0
4159
Author: Chris Lord <chris@linux.intel.com>
4160
Date: Sat Feb 6 15:34:55 2010 +0100
4162
[stage-x11] make get_geometry always get geometry
4164
Now that we have a minimum size getter on the stage object, change
4165
get_geometry to actually always return the geometry. This fixes stages
4166
that are set as user-resizable appearing at 1x1 size.
4168
This will need changing in other back-ends too.
4170
clutter/x11/clutter-stage-x11.c | 57 +++++++++++++++-----------------------
4171
1 files changed, 23 insertions(+), 34 deletions(-)
4173
commit 27e33aa14ff5d14f6066da74922c960a037b5089
4174
Author: Chris Lord <chris@linux.intel.com>
4175
Date: Sat Feb 6 14:59:51 2010 +0100
4177
[stage] Get the current size correctly
4179
Get the current size of the stage correctly in
4180
clutter_stage_set_minimum_size. The get_geometry StageWindow function is
4181
not equivalent of the current size, use clutter_actor_get_size().
4183
clutter/clutter-stage.c | 14 ++++++++------
4184
1 files changed, 8 insertions(+), 6 deletions(-)
4186
commit be11564b556a1b1c08b7b9e7a0a94bc00c4e6550
4187
Author: Chris Lord <chris@linux.intel.com>
4188
Date: Sat Feb 6 14:04:47 2010 +0100
4190
[stage] Set minimum width/height to 1x1
4192
Whoops, to maintain the old behaviour, make sure the default minimum
4193
width/height are 1x1.
4195
clutter/clutter-stage.c | 4 ++--
4196
1 files changed, 2 insertions(+), 2 deletions(-)
4198
commit fd11d3098f0182f24666ed77973269111cb0a8f5
4199
Author: Chris Lord <chris@linux.intel.com>
4200
Date: Sat Feb 6 11:23:37 2010 +0000
4202
[stage] Add set/get_minumum_size
4204
Add two functions to set/get the minimum stage size. This takes effect
4205
when a stage is set to user resizable.
4207
clutter/clutter-stage.c | 75 ++++++++++++++++++++++++++++
4208
clutter/clutter-stage.h | 7 +++
4209
clutter/x11/clutter-stage-x11.c | 6 +-
4210
doc/reference/clutter/clutter-sections.txt | 2 +
4211
4 files changed, 87 insertions(+), 3 deletions(-)
4213
commit f973b73208bad266a2362e22e5aed1a0780d096d
4214
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4215
Date: Sat Feb 6 11:00:50 2010 +0000
4217
Add cogl-subtexture test to the Git ignore file
4220
1 files changed, 2 insertions(+), 1 deletions(-)
4222
commit e55966d675e57d516ea5aff36b03fde63d4839d3
4223
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4224
Date: Fri Feb 5 16:22:09 2010 +0000
4226
Deprecate clutter_util_next_p2()
4228
The next_p2() function should have never been publicly exposed by
4231
clutter/clutter-util.c | 15 ++++++++-------
4232
clutter/clutter-util.h | 9 ++++++---
4233
tests/interactive/test-shader.c | 19 +++++++++++++++++--
4234
3 files changed, 31 insertions(+), 12 deletions(-)
4236
commit bbaf6b233d0120e3199d779eeb2829e56ecc279b
4237
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4238
Date: Fri Feb 5 15:31:18 2010 +0000
4240
docs: Fix whitespace in the App manual stub
4242
doc/manual/clutter-manual.xml.in | 185 +++++++++++++++++---------------------
4243
1 files changed, 81 insertions(+), 104 deletions(-)
4245
commit dcdb97006b563407d43f19779ac47f0330052541
4246
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4247
Date: Fri Feb 5 14:47:39 2010 +0000
4249
build: Add suppressions file to EXTRA_DIST
4251
tests/data/Makefile.am | 2 +-
4252
1 files changed, 1 insertions(+), 1 deletions(-)
4254
commit 830f2402d4f49b7173eb7fa0bda5762a4c430c9a
4255
Merge: 1bdc3db 6b1b27d
4256
Author: Neil Roberts <neil@linux.intel.com>
4257
Date: Sat Feb 6 00:20:07 2010 +0000
4259
Merge branch 'more-texture-backends'
4261
This adds three new texture backends.
4263
- CoglTexture2D: This is a trimmed down version of CoglTexture2DSliced
4264
which only supports a single texture and only works with the
4265
GL_TEXTURE_2D target. The code is a lot simpler so it has a less
4266
overheads than dealing with slices. Cogl will use this wherever
4269
- CoglSubTexture: This is used to get a CoglHandle to represent a
4270
subregion of another texture. The texture can be used as if it was a
4271
standalone texture but it does not need to copy the resources.
4273
- CoglAtlasTexture: This collects RGB and RGBA textures into a single
4274
GL texture with the aim of reducing texture state changes and
4275
increasing batching. The backend will try to manage the atlas and
4276
may move the textures around to close gaps in the texture. By
4277
default all textures will be placed in the atlas.
4279
commit 6b1b27d4f894cbefc90601eaf6214b55a71834b7
4280
Author: Neil Roberts <neil@linux.intel.com>
4281
Date: Sat Feb 6 00:12:10 2010 +0000
4283
cogl-bitmap: Update the format after (un)premultiplying
4285
The pixel format of the bitmap needs to have its premult flag cleared
4286
or set after the premult conversion otherwise it may get converted
4289
clutter/cogl/cogl/cogl-bitmap-fallback.c | 4 ++++
4290
clutter/cogl/cogl/cogl-texture.c | 3 +--
4291
2 files changed, 5 insertions(+), 2 deletions(-)
4293
commit 191d20eb56f31786660cd04aacc710344eb8df7a
4294
Author: Neil Roberts <neil@linux.intel.com>
4295
Date: Fri Feb 5 17:03:04 2010 +0000
4297
cogl-atlas-texture: Fix a cut and paste error when getting the height
4299
There was a typo in getting the height of the full texture to check
4300
whether the sub region fits so that it was using the width
4301
instead. This was causing crashes when debugging is enabled for some
4304
clutter/cogl/cogl/cogl-sub-texture.c | 2 +-
4305
1 files changed, 1 insertions(+), 1 deletions(-)
4307
commit 1bdc3db9ab54316f5f313dc3e991f3a621e83586
4308
Author: Damien Lespiau <damien.lespiau@intel.com>
4309
Date: Thu Feb 4 21:10:02 2010 +0000
4311
docs: Use % for defines not #
4313
Some links to defines in the gtk-doc annotations were using '#' instead
4316
clutter/clutter-actor.c | 4 ++--
4317
clutter/clutter-path.c | 10 +++++-----
4318
clutter/cogl/cogl/cogl-fixed.c | 4 ++--
4319
3 files changed, 9 insertions(+), 9 deletions(-)
4321
commit 1b94cc9268e57cc49e3bac914c4b979aec955f77
4322
Author: Damien Lespiau <damien.lespiau@intel.com>
4323
Date: Wed Jan 27 16:03:28 2010 +0000
4325
docs: fix new line in the cogl xml top level document
4327
A comma in the FSF address is wrong. Supreme Offence.
4329
doc/reference/cogl/cogl-docs.xml.in | 3 +--
4330
1 files changed, 1 insertions(+), 2 deletions(-)
4332
commit 0ea25d661b887c27beaf0bd848dfda994d88782f
4333
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4334
Date: Thu Feb 4 18:29:47 2010 +0000
4336
event: Do not generate click count for SCROLL events
4338
The ClutterScrollEvent structure does not have a click count field,
4339
so Clutter should not generate the click count for events of type
4342
clutter/clutter-main.c | 7 +++++--
4343
1 files changed, 5 insertions(+), 2 deletions(-)
4345
commit 15c6fef7e3e426764bafc316794a195a086e0d03
4346
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4347
Date: Thu Feb 4 16:49:06 2010 +0000
4349
tests: Add a Valgrind suppression file
4351
When running tests under Valgrind it would be useful to pass a
4352
suppression file for the known one-off allocations done by Clutter
4353
and by its dependencies. This trims the output of Valgrind and
4354
improves the ability to actually spot leaks.
4356
tests/README | 35 ++++++-
4357
tests/data/clutter-1.0.suppressions | 173 +++++++++++++++++++++++++++++++++++
4358
2 files changed, 203 insertions(+), 5 deletions(-)
4360
commit 1f70da62a73e3a10fe1ceb33d11f79fc29586fcf
4361
Author: Neil Roberts <neil@linux.intel.com>
4362
Date: Thu Feb 4 16:28:29 2010 +0000
4364
glx: Create a colormap for the dummy window
4366
Otherwise X will fail to create the window and throw a BadMatch error
4369
clutter/glx/clutter-backend-glx.c | 7 ++++++-
4370
1 files changed, 6 insertions(+), 1 deletions(-)
4372
commit 466b00a8064ad09f0574f8f46c6df0390d7c7d00
4373
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4374
Date: Thu Feb 4 13:59:39 2010 +0000
4376
glx: Clarify *why* we need the dummy window
4378
The reason why we have a dummy, offscreen Window when we create the
4379
GLX context is that GLX does not like it when you ask the context for
4380
features if it's not made current to a Drawable. Maybe in the future
4381
it will allow us to do so, but right now we have to make do with what
4384
clutter/glx/clutter-backend-glx.c | 6 ++++++
4385
1 files changed, 6 insertions(+), 0 deletions(-)
4387
commit ea5e33cf3a38edddef88ec30131c35bb8ab4bfaf
4388
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4389
Date: Thu Feb 4 13:56:33 2010 +0000
4391
glx: Do not leak a XVisualInfo
4393
The XVisualInfo we retrieve for the dummy window should be freed after
4396
clutter/glx/clutter-backend-glx.c | 2 ++
4397
1 files changed, 2 insertions(+), 0 deletions(-)
4399
commit e6a3b6ebe75a2c0c3709fbe12cf04c4357b54fdd
4400
Author: Neil Roberts <neil@linux.intel.com>
4401
Date: Wed Feb 3 23:08:30 2010 +0000
4403
cogl-texture: Avoid copying the bitmap when premultiplying from a file
4405
In cogl_texture_new_from_file we create and own a temporary
4406
bitmap. There's no need to copy this data if we need to do a premult
4407
conversion so instead it just does conversion before passing it on to
4408
cogl_texture_new_from_bitmap.
4410
clutter/cogl/cogl/cogl-texture.c | 23 ++++++++++++++++++-----
4411
1 files changed, 18 insertions(+), 5 deletions(-)
4413
commit 59198b8ab8a6a7c1c3dbfa5c72abf36f8d66c543
4414
Author: Neil Roberts <neil@linux.intel.com>
4415
Date: Wed Feb 3 22:54:44 2010 +0000
4417
cogl-texture: Split out _cogl_texture_prepare_for_upload
4419
The Cogl atlas code was using _cogl_texture_prepare_for_upload with a
4420
NULL pointer for the dst_bmp to determine the internal format of the
4421
texture without converting the bitmap. It needs to do this to decide
4422
whether the texture will go in the atlas before wasting time on the
4423
conversion. This use of the function is a little confusing so that
4424
part of it has been split out into a new function called
4425
_cogl_texture_determine_internal_format. The code to decide whether a
4426
premult conversion is needed has also been split out.
4428
clutter/cogl/cogl/cogl-atlas-texture.c | 11 +---
4429
clutter/cogl/cogl/cogl-texture-private.h | 7 +++
4430
clutter/cogl/cogl/cogl-texture.c | 81 ++++++++++++++++++------------
4431
3 files changed, 57 insertions(+), 42 deletions(-)
4433
commit 5063f4669c2c94d7288405005f4df14e73a4f578
4434
Author: Neil Roberts <neil@linux.intel.com>
4435
Date: Wed Feb 3 19:54:12 2010 +0000
4437
cogl-atlas: Make the cogl_atlas_* API internal
4439
This just adds an underscore to every entry point for the CoglAtlas
4440
API so that it's not exported.
4442
clutter/cogl/cogl/cogl-atlas-texture.c | 89 ++++++++++----------
4443
clutter/cogl/cogl/cogl-atlas.c | 140 ++++++++++++++++----------------
4444
clutter/cogl/cogl/cogl-atlas.h | 32 ++++----
4445
clutter/cogl/cogl/cogl-context.c | 2 +-
4446
4 files changed, 132 insertions(+), 131 deletions(-)
4448
commit cd3c5155d879782a6e6e1d7fa56043e03712b727
4449
Author: Jussi Kukkonen <jku@linux.intel.com>
4450
Date: Wed Feb 3 17:04:38 2010 +0000
4452
text: implement del_word_next/del_word_prev()
4454
Bind ctrl-backspace and ctrl-del to functions that delete a word before
4455
or after the cursor, respectively.
4457
Selection does not affect the deletion, but current selection is
4458
preserved. This mimicks GTK+ functionality in GtkTextView and GtkEntry.
4460
http://bugzilla.openedhand.com/show_bug.cgi?id=1767
4462
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
4464
clutter/clutter-text.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++
4465
1 files changed, 95 insertions(+), 0 deletions(-)
4467
commit d8d728a8d7ac4bc56f058379d76f4539d01189de
4468
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4469
Date: Wed Dec 9 00:50:33 2009 +0000
4471
Remove the SDL backend
4473
The SDL API is far too limited for the windowing system needs of
4474
Clutter; the status of the SDL backend was always experimental, and
4475
since the Windows platform is supported by a native backend there is
4476
no point in having the SDL backend around any more.
4479
clutter/Makefile.am | 2 +-
4480
clutter/sdl/Makefile.am | 26 ---
4481
clutter/sdl/clutter-backend-sdl.c | 207 --------------------
4482
clutter/sdl/clutter-backend-sdl.h | 70 -------
4483
clutter/sdl/clutter-event-sdl.c | 377 -------------------------------------
4484
clutter/sdl/clutter-sdl.h | 39 ----
4485
clutter/sdl/clutter-stage-sdl.c | 197 -------------------
4486
clutter/sdl/clutter-stage-sdl.h | 34 ----
4487
configure.ac | 41 +----
4488
10 files changed, 5 insertions(+), 996 deletions(-)
4490
commit ae188d203c63d680dc58ba1e19f333719a6916d4
4491
Author: Neil Roberts <neil@linux.intel.com>
4492
Date: Wed Jan 20 16:41:25 2010 +0000
4494
win32: Use a dummy window to support delayed stage creation
4496
The Win32 backend now implements the create_context method which
4497
creates a context and binds it to a 1x1 invisible window. That way
4498
there will always be a context bound and the features can be retrieved
4499
without creating the default stage. This reflects the changes in
4500
1c6ffc8..b245d55 to the GLX backend.
4502
clutter/win32/clutter-backend-win32.c | 194 +++++++++++++++++++++++++++++++--
4503
clutter/win32/clutter-backend-win32.h | 2 +
4504
clutter/win32/clutter-stage-win32.c | 84 ++------------
4505
3 files changed, 198 insertions(+), 82 deletions(-)
4507
commit 479fdffc7d4f37f9ff104403dd7de685df97e0d5
4508
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4509
Date: Sun Dec 6 18:56:14 2009 +0000
4511
glx: Fix error messages and debug notes
4513
Instead of using g_critical() inside the create_context() implementation
4514
of the ClutterBackendGLX we should use the passed GError, so that the
4515
error message can bubble up to the caller.
4517
clutter/glx/clutter-backend-glx.c | 31 +++++++++++++++++++------------
4518
1 files changed, 19 insertions(+), 12 deletions(-)
4520
commit ede2cbfab05035247b2a6a2ca837cb8f71871c5d
4521
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4522
Date: Thu Dec 3 21:07:45 2009 +0000
4524
stage: Create the default stage on demand
4526
Instead of creating the default stage during initialization we can
4527
now safely create it whenever clutter_stage_get_default() is called.
4529
To maintain the invariant, the default stage is immediately realized
4532
clutter/clutter-main.c | 28 ----------------------------
4533
clutter/clutter-stage.c | 15 ++++++++++-----
4534
2 files changed, 10 insertions(+), 33 deletions(-)
4536
commit d2c091e62d4b9e897e8f8ef5de99f20417cc6682
4537
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4538
Date: Thu Dec 3 20:49:54 2009 +0000
4540
glx: Create the dummy Window with the GLX context
4542
Since we must guarantee that Cogl has a GL context to query, it is too
4543
late to use the "dummy Window" trick from within the get_features()
4544
virtual function implementation.
4546
Instead, we can create a dummy Window from create_context() itself and
4547
leave it around - basically trading a default stage with a dummy X
4550
We need to have the dummy X window around all the time so that the
4551
GLX context can be selected and made current.
4553
clutter/clutter-main.c | 16 ++--
4554
clutter/glx/clutter-backend-glx.c | 169 ++++++++++++++++++-------------------
4555
clutter/glx/clutter-backend-glx.h | 1 +
4556
3 files changed, 95 insertions(+), 91 deletions(-)
4558
commit 5eb6fb74b660d22e7f31867b16997ee9f63bef4b
4559
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4560
Date: Thu Dec 3 20:48:55 2009 +0000
4562
feature: Make sure we have a GL context
4564
Before asking Cogl and ClutterBackend for the list of features we must
4565
have a GL backend ready.
4567
clutter/clutter-feature.c | 3 +++
4568
1 files changed, 3 insertions(+), 0 deletions(-)
4570
commit a8daaa8222c9b4aaf7e46b1bb13a2ce8097153f1
4571
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4572
Date: Thu Dec 3 20:47:48 2009 +0000
4574
stage: Move default title in Stage.init
4576
The default title should be set from within clutter_stage_init(); at
4577
that point clutter_init() must have been called.
4579
clutter/clutter-main.c | 2 --
4580
clutter/clutter-stage.c | 1 +
4581
2 files changed, 1 insertions(+), 2 deletions(-)
4583
commit 38f26634eec3c81d61bb3b88b24563d7e4719f67
4584
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4585
Date: Thu Dec 3 17:36:03 2009 +0000
4587
Lazily create the Pango fontmap
4589
The Pango fontmap needed by Clutter should be initialized the first
4590
time we need a PangoContext, not on initialization.
4592
clutter/clutter-main.c | 35 ++++++++++++++++-------------------
4593
1 files changed, 16 insertions(+), 19 deletions(-)
4595
commit 6fbed66add4b8c03a0ba0f4edc1c2f0044608998
4596
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4597
Date: Thu Dec 3 17:13:44 2009 +0000
4599
Delay default stage creation
4601
The default stage creation should be delayed as much as possible,
4602
ideally at the end of the init() process.
4604
clutter/clutter-backend.c | 8 +++
4605
clutter/clutter-main.c | 67 ++++++++++++-------------
4606
clutter/clutter-stage.c | 6 +-
4607
clutter/cogl/cogl/cogl-journal.c | 3 +
4608
clutter/glx/clutter-backend-glx.c | 98 ++++++++++++++++++++++++++++---------
4609
clutter/glx/clutter-stage-glx.c | 5 ++
4610
6 files changed, 126 insertions(+), 61 deletions(-)
4612
commit 3191ea1195d5e1d55facc147760b273efca76867
4613
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4614
Date: Thu Dec 3 17:35:19 2009 +0000
4616
cogl-debug: Remove redundant newlines
4618
The debugging notes wrapping g_debug() already have an implicit newline
4619
at the end of the passed message.
4621
clutter/cogl/cogl/cogl-handle.h | 8 ++++----
4622
1 files changed, 4 insertions(+), 4 deletions(-)
4624
commit 16a5911cff90a2bba1b283ccd9a9ce6d0f435924
4625
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4626
Date: Wed Feb 3 15:05:37 2010 +0000
4628
tests: Clean up the cairo-flowers interactive test
4630
tests/interactive/test-clutter-cairo-flowers.c | 14 ++++++--------
4631
1 files changed, 6 insertions(+), 8 deletions(-)
4633
commit cb52581a24c157e2bedb74c32d522dc56d9a91a2
4634
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4635
Date: Wed Feb 3 14:35:45 2010 +0000
4637
text: Add :font-description
4639
High level toolkits might wish to construct a PangoFontDescription and
4640
then set it directly on a ClutterText actor proxy or sub-class.
4641
ClutterText should have a :font-description property to set (and get)
4642
the PangoFontDescription.
4644
http://bugzilla.openedhand.com/show_bug.cgi?id=1960
4646
clutter/clutter-text.c | 131 +++++++++++++++--
4647
clutter/clutter-text.h | 225 ++++++++++++++--------------
4648
doc/reference/clutter/clutter-sections.txt | 2 +
4649
3 files changed, 234 insertions(+), 124 deletions(-)
4651
commit 74c0170ccc80504018f2aab849a6a311c64052a6
4652
Author: Neil Roberts <neil@linux.intel.com>
4653
Date: Wed Feb 3 14:31:12 2010 +0000
4655
cogl-vertex-buffer: Refix disabling texture coord arrays
4657
Commit 92a375ab4 changed the initial value of max_texcoord_attrib_unit
4658
to -1 so that it could disable the texture coord array for the first
4659
texture unit when there are no texture coords used in the vbo. However
4660
max_texcoord_attrib_unit was an unsigned value so this actually became
4661
G_MAXUINT. The disabling loop at the bottom still worked because
4662
G_MAXUINT+1==0 but the check for whether any texture unit is greater
4663
than max_texcoord_attrib_unit was failing so it would always end up
4664
disabling all texture units. This is now fixed by changing
4665
max_texcoord_attrib_unit to be signed.
4667
clutter/cogl/cogl/cogl-vertex-buffer.c | 2 +-
4668
1 files changed, 1 insertions(+), 1 deletions(-)
4670
commit 301863d43bc79e792f8fe3ea5e9185d87cb74069
4671
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4672
Date: Tue Feb 2 17:07:22 2010 +0000
4674
text: Fixes for selection bound
4676
The commit ecbb7ce41a1a759e246fce07f146b8bed5e3d730 exposed some issues
4677
when positioning the cursor with the mouse pointer: the selection is
4678
not moved along with the cursor when inserting a single character or a
4681
Also, some freeze_notify() are called too early, leading to decoupling
4682
from their respective thaw_notify().
4684
http://bugzilla.openedhand.com/show_bug.cgi?id=1955
4686
clutter/clutter-text.c | 44 +++++++++++++++++++-------------------------
4687
1 files changed, 19 insertions(+), 25 deletions(-)
4689
commit 5bec49aea931e6835b97e549e23458a6214548ce
4690
Author: Kristian Høgsberg <krh@bitplanet.net>
4691
Date: Wed Jan 27 12:55:18 2010 -0500
4693
Use ClutterTimeline in test-clutter-cairo-flowers.c
4695
http://bugzilla.openedhand.com/show_bug.cgi?id=1969
4696
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
4698
tests/interactive/test-clutter-cairo-flowers.c | 24 +++++++++++++++++-------
4699
1 files changed, 17 insertions(+), 7 deletions(-)
4701
commit c9a6e63fa4d1d710d9efeb850f3fc336933ee2a8
4702
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4703
Date: Tue Feb 2 14:50:03 2010 +0000
4705
docs: Clarify Group's sizing semantics
4707
The documentation for ClutterGroup behaviour when setting an explicit
4708
size is not accurate - or, actually, it was accurate by the time
4709
ClutterGroup was first written but has been neglected in the following
4712
To avoid confusion for new users of Clutter the documentation should be
4713
slightly expanded, mentioning the exact semantics of ClutterGroup with
4714
regards to: preferred size, explicitly set size and how to constrain the
4715
visible area of a ClutterGroup to an explicitly set size.
4717
Based on a patch by: Neil Roberts <neil@linux.intel.com>
4719
clutter/clutter-group.c | 16 ++++++++++++----
4720
1 files changed, 12 insertions(+), 4 deletions(-)
4722
commit 12b004b0e7e13ca64d7d35cd3fe083f582b7aa09
4723
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4724
Date: Tue Feb 2 12:56:04 2010 +0000
4726
tests: Add an initial Behaviour conformance suite
4728
The coverage of the Behaviour sub-classes is currently abysmal. An
4729
initial test suite for Behaviours should at least verify that the
4730
accessors and the constructors are doing the right thing.
4732
This initial test suite just verifies the BehaviourOpacity sub-class,
4733
but it already bumps up the overall coverage by 2%.
4736
tests/conform/Makefile.am | 1 +
4737
tests/conform/test-behaviours.c | 87 +++++++++++++++++++++++++++++++++++++
4738
tests/conform/test-conform-main.c | 2 +
4739
4 files changed, 91 insertions(+), 0 deletions(-)
4741
commit f94e6911510b5376dd490c1f8724e616aaf2e5dc
4742
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4743
Date: Tue Feb 2 12:54:51 2010 +0000
4745
behaviour: Clean up BehaviourOpacity
4747
• Use a consistent coding style
4749
• Call set_bounds() from set_property(), because we need proper
4750
notification on the modified property
4752
clutter/clutter-behaviour-opacity.c | 56 ++++++++++++++++++++---------------
4753
1 files changed, 32 insertions(+), 24 deletions(-)
4755
commit 521d71d4bc4ca4b06343365c71c9520b1ebfdc7f
4756
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4757
Date: Mon Feb 1 15:47:50 2010 +0000
4759
event: Unify the off-stage motion events delivery behaviour
4761
When we disable the per-actor events delivery Clutter replicates the X11
4762
implicit soft grab for motion events with off-stage. The implicit grab
4763
is done whenever the pointer of a device leaves a window with a button
4764
still pressed; with the implicit grab in place the window still receives
4765
motion events even after the LeaveNotify - until the button is released.
4767
The implicit grab is not honoured in the per-actor event deliver case,
4768
though, so we have a mismatch between two in theory equivalent cases.
4770
Luckily, the fix is pretty trivial: when we check for a motion event
4771
with a stage set but without an actor set, and that has off-stage
4772
coordinates, we arbitrarily set the source to be the stage of the event
4773
and emit the pointer event.
4775
clutter/clutter-main.c | 40 ++++++++++++++++++++++++++++++++++------
4776
1 files changed, 34 insertions(+), 6 deletions(-)
4778
commit 46d6697b9170ba110439cbf61d152890b35a3837
4779
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4780
Date: Mon Feb 1 14:53:13 2010 +0000
4782
build: -Wformat is required for -Wformat-security
4784
GCC will ignore -Wformat-security without -Wformat on the same compiler
4787
configure.ac | 4 ++--
4788
1 files changed, 2 insertions(+), 2 deletions(-)
4790
commit 157a0cf9364a9e60b29e5e88ca1783d9e174a635
4791
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4792
Date: Mon Feb 1 14:48:50 2010 +0000
4794
build: Retrieve X11 cflags and libraries
4796
When using pkg-config to check for the x11 package compiler flags and
4797
libraries we actually need to retrieve those values from the pc file.
4799
This should also fix the issue with non-canonical installations of the
4800
X11 headers and shared objects.
4802
http://bugzilla.openedhand.com/show_bug.cgi?id=1966
4804
configure.ac | 5 +++++
4805
1 files changed, 5 insertions(+), 0 deletions(-)
4807
commit 145cc9d3dfd1dc51f254eefde35042fc20a6375e
4808
Merge: aa6731e 5f1c8a1
4809
Author: Neil Roberts <neil@linux.intel.com>
4810
Date: Mon Feb 1 13:37:19 2010 +0000
4812
Merge remote branch 'master' into texture-debugging
4815
clutter/cogl/cogl/cogl-context.h
4817
commit aa6731e338a88d03e718980604ac8f2393391a9f
4818
Author: Neil Roberts <neil@linux.intel.com>
4819
Date: Mon Feb 1 13:25:19 2010 +0000
4821
cogl-material: Compare GL texture numbers for material layer textures
4823
When deciding if a material layer is equal it now compares the GL
4824
target and texture number if the textures are not sliced. This is
4825
needed to get batching across atlased textures.
4827
clutter/cogl/cogl/cogl-material.c | 25 ++++++++++++++++++++++++-
4828
1 files changed, 24 insertions(+), 1 deletions(-)
4830
commit abe91784c4ba98417eabe0649bf73381afbd6fc7
4831
Author: Neil Roberts <neil@linux.intel.com>
4832
Date: Mon Feb 1 12:11:58 2010 +0000
4834
cogl: Let GL do the format conversion when uploading texture data
4836
Cogl accepts a pixel format for both the data in memory and the
4837
internal format to be used for the texture. If they do not match then
4838
it would convert them using the CoglBitmap functions before uploading
4839
the data. However, GL also lets you specify both formats so it makes
4840
more sense to let GL do the conversion. The driver may need the
4841
texture in a specific format so it may end up being converted anyway.
4843
The cogl_texture_upload_data functions have been removed and replaced
4844
with a single function to prepare the bitmap. This will only do the
4845
premultiplication conversion because that is the only part that GL
4848
clutter/cogl/cogl/cogl-atlas-texture.c | 111 +++++++-------
4849
clutter/cogl/cogl/cogl-texture-2d-sliced.c | 220 +++++++++++++++-------------
4850
clutter/cogl/cogl/cogl-texture-2d.c | 92 +++++-------
4851
clutter/cogl/cogl/cogl-texture-private.h | 44 ++----
4852
clutter/cogl/cogl/cogl-texture.c | 134 ++++++++---------
4853
5 files changed, 289 insertions(+), 312 deletions(-)
4855
commit e83ffb1fa3436bf1506c32856b2a3ba23254e068
4856
Author: Neil Roberts <neil@linux.intel.com>
4857
Date: Fri Jan 29 15:15:08 2010 +0000
4859
cogl: Do the premult conversion in-place rather than copying to a new buffer
4861
The premult part of _cogl_convert_premult has now been split out as
4862
_cogl_convert_premult_status. _cogl_convert_premult has been renamed
4863
to _cogl_convert_format to make it less confusing. The premult
4864
conversion is now done in-place instead of copying the
4865
buffer. Previously it was copying the buffer once for the format
4866
conversion and then copying it again for the premult conversion. The
4867
premult conversion never changes the size of the buffer so it's quite
4868
easy to do in place. We can also use the separated out function
4871
clutter/cogl/cogl/cogl-atlas-texture.c | 6 +-
4872
clutter/cogl/cogl/cogl-bitmap-fallback.c | 142 +++++++++++-----------------
4873
clutter/cogl/cogl/cogl-bitmap-pixbuf.c | 6 +-
4874
clutter/cogl/cogl/cogl-bitmap-private.h | 22 ++--
4875
clutter/cogl/cogl/cogl-bitmap.c | 102 ++++++++-------------
4876
clutter/cogl/cogl/cogl-texture-2d-sliced.c | 12 +-
4877
clutter/cogl/cogl/cogl-texture-2d.c | 12 +-
4878
clutter/cogl/cogl/cogl-texture.c | 6 +-
4879
8 files changed, 123 insertions(+), 185 deletions(-)
4881
commit 72fba19eac68ffa30c3f60aeecfdbfa6a2da7bd4
4882
Author: Neil Roberts <neil@linux.intel.com>
4883
Date: Fri Jan 29 12:19:42 2010 +0000
4885
cogl-atlas-texture: Use a single atlas for both RGB and RGBA textures
4887
The internal format of the atlas texture is still set to the
4888
appropriate format so Cogl will disable blending for textures that are
4889
intended to be RGB. This should end up ignoring the alpha channel from
4890
the texture in the atlas. This makes the code slightly easier to
4891
maintain and should also improve the chances of batching.
4893
clutter/cogl/cogl/cogl-atlas-texture.c | 134 ++++++++++++--------------------
4894
clutter/cogl/cogl/cogl-context.c | 18 ++---
4895
clutter/cogl/cogl/cogl-context.h | 8 +--
4896
3 files changed, 57 insertions(+), 103 deletions(-)
4898
commit ad6bd2ee88770c2ce86f81f7a64b6b121c3418d6
4899
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4900
Date: Mon Feb 1 12:18:10 2010 +0000
4902
actor: Reword the allocation cycle warning
4904
Since we're allowing allocation cycles saying that calling
4905
queue_relayout() inside an allocation cycle "is not allowed" is kind of
4906
confusing. We should say that "it is not recommended".
4908
clutter/clutter-actor.c | 2 +-
4909
1 files changed, 1 insertions(+), 1 deletions(-)
4911
commit 5f1c8a17e4f81ead1747b47939d593c80246bf06
4912
Merge: ecbb7ce 8a4b647
4913
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4914
Date: Mon Feb 1 11:26:56 2010 +0000
4916
Merge branch 'device-manager'
4918
* device-manager: (37 commits)
4919
x11: Re-enable XI1 extension keyboards
4920
x11: Always handle core device events before XI events
4921
docs: Documentation fixes for DeviceManager
4922
device-manager: Fix the signals definition
4923
docs: Add sections for InputDevice and DeviceManager
4924
docs: Add clutter_input_device_get_device_name()
4925
tests: Print out the device details on motion
4926
Always register core devices
4927
device: Remove unused is_default member
4928
win32: Experimental implementation of device support
4929
tests: Print the device name, as well as its Id
4930
x11: Fill out the :name property of the InputDevices
4931
device: Add the :name property to InputDevice
4932
x11: Store core devices on the X11 Backend singleton
4933
device: Unset the cursor actor when leaving the stage
4934
device: Add pointer actor getter
4935
x11: Discard the LeaveNotify for off-stage ButtonRelease
4936
device: Do not overwrite the stage for an InputDevice
4937
event: Off-stage button releases have a click count of 1
4938
event: Scroll events do not have click count
4941
commit ecbb7ce41a1a759e246fce07f146b8bed5e3d730
4942
Author: Alejandro Piñeiro <apinheiro@igalia.com>
4943
Date: Mon Jan 25 16:13:58 2010 +0100
4945
Fix problems with "position" and "selection-bound" change notification
4947
Added a "selection-bound" notify on clutter_text_clear_selection as it
4950
Added utility function clutter_text_set_positions, in order to
4951
change both cursor position and selection bound inside a
4952
g_object_[freeze/thaw]_notify block
4954
Added g_object_[freeze/thaw]_notify in other functions that changes
4955
both cursor position and selection bound
4957
Solves http://bugzilla.openedhand.com/show_bug.cgi?id=1955
4959
clutter/clutter-text.c | 77 +++++++++++++++++++++++++++++++++---------------
4960
1 files changed, 53 insertions(+), 24 deletions(-)
4962
commit 579a9a2665b402405820585dacba137984700110
4963
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4964
Date: Mon Feb 1 11:04:59 2010 +0000
4966
stage: Add :key-focus property
4968
ClutterStage has both set_key_focus() and get_key_focus() methods, but
4969
there is no :key-focus property. This means that it is not possible to
4970
get notifications when the key-focus has changes except by connecting to
4971
both the ::key-focus-in and ::key-focus-out signals and do additional
4974
http://bugzilla.openedhand.com/show_bug.cgi?id=1956
4976
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
4978
clutter/clutter-stage.c | 30 +++++++++++++++++++++++++++++-
4979
1 files changed, 29 insertions(+), 1 deletions(-)
4981
commit 95712f9897db7f06a6ca34661f20b388dd5a5f77
4982
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4983
Date: Fri Jan 29 10:13:57 2010 +0000
4985
docs: Update the README
4987
Clean up the grammar and some wrinkles in the text.
4989
README | 91 ++++++++++++++++++++++++++++++++++++++++-----------------------
4990
1 files changed, 58 insertions(+), 33 deletions(-)
4992
commit 5b9259ba807f4151d08bf2ea868c2cdeed97e975
4993
Author: Emmanuele Bassi <ebassi@linux.intel.com>
4994
Date: Fri Jan 29 09:31:13 2010 +0000
4996
docs: Update the configure switches in the README
4998
README | 13 ++++++++++++-
4999
1 files changed, 12 insertions(+), 1 deletions(-)
5001
commit 763fcabd8b287445d32eadb6086b0438e3962294
5002
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5003
Date: Fri Jan 29 09:29:53 2010 +0000
5005
build: Warn with --disable-conformance and --enable-gcov
5007
When building Clutter without conformance test suite we ought to warn
5008
the user that the coverage report is not going to be accurate.
5010
configure.ac | 9 +++++++--
5011
1 files changed, 7 insertions(+), 2 deletions(-)
5013
commit 21d21adbc45a6e0023e4a21b357fbf392b469fb2
5014
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5015
Date: Fri Jan 29 09:29:37 2010 +0000
5017
Remove tabs from configure.ac
5019
configure.ac | 51 ++++++++++++++++++++++++++++-----------------------
5020
1 files changed, 28 insertions(+), 23 deletions(-)
5022
commit 5f5f6d825f6460f532f0c0448fc403cdb95e4697
5023
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5024
Date: Fri Jan 29 09:26:47 2010 +0000
5026
build: Allow disabling the conformance test suite
5028
When building Clutter for packaging on headless boxes it's pointless to
5029
allow building the conformance test to be built (and run on 'make
5032
configure.ac | 14 +++++++++++++-
5033
tests/Makefile.am | 25 ++++++++++++++++++++-----
5034
2 files changed, 33 insertions(+), 6 deletions(-)
5036
commit 7a1ebcbced45c21937c4407e28274fdb4a92af52
5037
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5038
Date: Wed Jan 27 21:26:26 2010 +0000
5040
Whitespace fixes in cogl-util
5042
clutter/cogl/cogl/cogl-util.c | 6 +++---
5043
1 files changed, 3 insertions(+), 3 deletions(-)
5045
commit 578e83e463d4d681de27f1b4e5d64dea8161f0f7
5046
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5047
Date: Wed Jan 27 21:16:28 2010 +0000
5051
clutter/clutter-frame-source.c | 3 +-
5052
clutter/clutter-timeout-interval.c | 38 +++++++++++++++++++++--------------
5053
clutter/clutter-timeout-pool.c | 5 ++-
5054
3 files changed, 28 insertions(+), 18 deletions(-)
5056
commit 2d5eeba5d89c129f991f367f0e80c3a152f19e52
5057
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5058
Date: Wed Jan 27 21:14:43 2010 +0000
5060
docs: Fixes for TimeoutPool and Frame sources
5062
The TimeoutPool is not used by ClutterTimeline any more, so we need to
5063
remove a sentence from its description. We also need to fix the gtk-doc
5066
clutter/clutter-frame-source.c | 25 +++++++++++++------------
5067
clutter/clutter-timeout-pool.c | 8 +-------
5068
2 files changed, 14 insertions(+), 19 deletions(-)
5070
commit 046a4b80476794bebdfd9005c826a64b7c8c9f81
5071
Author: Neil Roberts <neil@linux.intel.com>
5072
Date: Fri Jan 22 18:14:57 2010 +0000
5074
cogl: Use the colours of COGL_DEBUG=rectangles to debug batching
5076
Instead of assigning a new colour to each quad of a batch, the
5077
rectangle debugging code now assigns a new colour to each batch so
5078
that it can be used to visually see what is being batched. The colour
5079
is stored in a global variable that is reset during cogl_clear. This
5080
improves the chances that the same colour will be used for a batch in
5081
the next frames to avoid flickering.
5083
clutter/cogl/cogl/cogl-context.h | 6 ++++
5084
clutter/cogl/cogl/cogl-journal.c | 54 ++++++++++++++++++++++++++------------
5085
clutter/cogl/cogl/cogl.c | 11 +++++++
5086
3 files changed, 54 insertions(+), 17 deletions(-)
5088
commit 92a375ab47296a81d739ca29b0972c7abe6eda16
5089
Author: Neil Roberts <neil@linux.intel.com>
5090
Date: Tue Jan 26 13:46:27 2010 +0000
5092
cogl-vertex-buffer: Fix disabling the texture arrays from previous prim
5094
When setting up the state for the vertex buffer,
5095
enable_state_for_drawing_buffer tries to keep track of the highest
5096
numbered texture unit in use. It then disables any texture arrays for
5097
units that were previously enabled if they are greater than that
5098
number. However if there is no texturing in the VBO then the max used
5099
unit would be left at 0 which it would later think meant unit 0 is
5100
still in use so it wouldn't disable it. To fix this it now initialises
5101
the max used unit to -1 which it should interpret as ‘no units are in
5102
use’ so it will later disable the arrays for all units.
5104
Thanks to Jon Mayo for reporting the bug.
5106
http://bugzilla.openedhand.com/show_bug.cgi?id=1957
5108
clutter/cogl/cogl/cogl-vertex-buffer.c | 2 +-
5109
1 files changed, 1 insertions(+), 1 deletions(-)
5111
commit f288eae0fc454876c2beb87b1205681a338d7f65
5112
Author: Neil Roberts <neil@linux.intel.com>
5113
Date: Wed Jan 27 12:06:22 2010 +0000
5115
docs: Add some notes about the CoglPixelFormat enums
5117
The pixel format enums didn't explain what order in memory the
5118
components should be so it was difficult to use them.
5120
clutter/cogl/cogl/cogl-types.h | 22 +++++++++++++++++++---
5121
1 files changed, 19 insertions(+), 3 deletions(-)
5123
commit da392e24a55ad34bdc8fe9ac0841eca574f76194
5124
Author: Neil Roberts <neil@linux.intel.com>
5125
Date: Wed Jan 27 11:02:34 2010 +0000
5127
docs: Fix some of the examples for the animation docs
5129
In the example for clutter_actor_animate the "x" and "y" properties
5130
are floats so they need to be passed float values in the var args
5131
otherwise it will crash. There was also a missing comma.
5133
There were some other minor problems with the behaviours example which
5134
would cause it not to compile.
5136
.../clutter/clutter-animation-tutorial.xml | 11 +++++------
5137
1 files changed, 5 insertions(+), 6 deletions(-)
5139
commit 52cb54f5fa665fdf06270fc58121617b44877639
5140
Author: Damien Lespiau <damien.lespiau@intel.com>
5141
Date: Tue Jan 26 18:47:25 2010 +0000
5143
cogl: Fix checks of the number of available texture units
5145
We were checking the number of texture units against the GL enum that is
5146
used in glGetInteger() to query that number. Let's abstract this in a
5149
Took the opportunity to dig a bit on the usage of GL limits for the
5150
number of texture (image) units and document our use of them. We'll need
5151
something finer grained if we want to fully exploit texture image units
5152
with a programmable pipeline.
5154
clutter/cogl/cogl/cogl-internal.h | 2 ++
5155
clutter/cogl/cogl/cogl-material.c | 10 ++--------
5156
clutter/cogl/cogl/cogl.c | 30 ++++++++++++++++++++++++++++++
5157
3 files changed, 34 insertions(+), 8 deletions(-)
5159
commit 87d19b8d182c2524a5d3c30921fe2c3d4d120606
5160
Author: Damien Lespiau <damien.lespiau@intel.com>
5161
Date: Sun Nov 15 20:17:47 2009 +0000
5163
cogl: Fix gl equivalent of blend string
5165
An example of what could be the equivalent of
5166
"RBG = REPLACE(TEXTURE)
5167
A = MODULATE(PREVIOUS,TEXTURE)"
5168
using the ARB_texture_env_combine extension was given, but it seems that
5169
a few typo were left:
5170
* remove a spurius GL_COMBINE_ALPHA
5171
* use the _ALPHA variant of SRCN and OPERANDN when setting up the
5174
doc/reference/cogl/blend-strings.xml | 9 ++++-----
5175
1 files changed, 4 insertions(+), 5 deletions(-)
5177
commit afb30f4013fdcb58ee35af919fdb739ab587683c
5178
Author: Damien Lespiau <damien.lespiau@intel.com>
5179
Date: Wed Nov 18 01:13:11 2009 +0000
5181
tests: blend-string: use g_assert_cmpint
5183
It's very useful to see the actual number the reference value is
5184
compared too when the test fails. GTest has g_assert_cmp$type()
5185
functions for that, so make good use of them.
5187
tests/conform/test-cogl-blend-strings.c | 6 +++---
5188
1 files changed, 3 insertions(+), 3 deletions(-)
5190
commit de31cbf4f7932f8d48583a476c5af9f6eed6adbd
5191
Author: Damien Lespiau <damien.lespiau@intel.com>
5192
Date: Tue Jan 26 16:59:50 2010 +0000
5194
test-cogl-multitexture: use several materials with texture matrices
5196
A small doubt has risen about the use of CoglTextureUnit in materials:
5197
will texture matrices still work if we have several materials, each of
5198
them having at texture on the same texture unit? The answer is yes!
5200
test-cogl-multitexture has been extended to use 2 materials with about
5201
the same setup except a little difference: the texture matrices for the
5202
lightmaps rotate in opposite directions.
5204
While at it, changed the rotation behaviour by an implicit animation
5205
with a small additional bonus bling.
5207
tests/interactive/test-cogl-multitexture.c | 143 ++++++++++++++++++++--------
5208
1 files changed, 102 insertions(+), 41 deletions(-)
5210
commit 06d8ebb0ba2d468d492eeb94dede095a14eec909
5211
Author: Damien Lespiau <damien.lespiau@intel.com>
5212
Date: Sun Nov 15 19:54:17 2009 +0000
5214
cogl: Create CoglTextureUnit with its associated unit number
5216
The index field of CoglTextureUnit was never set, leading to the
5217
creation of units with index set to 0. When trying to retrieve a texture
5218
unit by its index (!= 0) with _cogl_get_texture_unit(), a new one was
5219
created as it could not find it back in the list of textures units:
5222
http://bugzilla.openedhand.com/show_bug.cgi?id=1958
5224
clutter/cogl/cogl/cogl.c | 5 +++--
5225
1 files changed, 3 insertions(+), 2 deletions(-)
5227
commit 8fc07c51a9c71aec77e4b76416ffedc72da309e2
5228
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5229
Date: Thu Jan 21 17:41:10 2010 +0000
5231
actor: Use GParamSpecUint for :opacity
5233
The :opacity property is defined using a GParamSpecUchar. This usually
5234
leads to issues with language bindings that don't have an 'unsigned
5235
char' type and that need to explicitly handle the conversion between
5236
G_TYPE_UCHAR and G_TYPE_INT or G_TYPE_UINT.
5238
The property definition already specifies an interval size of [0, 255]
5239
on the values; more importantly, GObject already implicitly transforms
5240
between G_TYPE_UCHAR and G_TYPE_UINT (the GValue transformation
5241
functions are registered at type system initialization time) so
5242
switching between a GParamSpecUchar and a GParamSpecUint should not be
5245
I have tested a simple program using the opacity property before and
5246
after the change and I cannot see any run-time warnings related to this
5249
clutter/clutter-actor.c | 18 +++++++++---------
5250
1 files changed, 9 insertions(+), 9 deletions(-)
5252
commit d0f7debfba4879c3df20c0067789b063e18d93ce
5253
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5254
Date: Fri Jan 22 21:44:28 2010 +0000
5256
test-easing: Do not reconnect signals multiple times
5258
The test should keep track of the last animation and avoid reconnecting
5259
signals to the same instance in case the -r argument has been passed.
5261
tests/interactive/test-easing.c | 6 +++++-
5262
1 files changed, 5 insertions(+), 1 deletions(-)
5264
commit 7073e69b4e504ddbaffad4a6139e93ddbd40b9f8
5265
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5266
Date: Fri Jan 22 21:42:55 2010 +0000
5268
animation: Verify internal state
5270
Be more drastic if the internal state is broken, and assert() if the
5271
expected Alpha and Timeline instances we need are not valid. This
5272
usually implies a library bug or a massive heap corruption.
5274
clutter/clutter-animation.c | 4 ++++
5275
1 files changed, 4 insertions(+), 0 deletions(-)
5277
commit 8daa3035e563870fc614813fd6329c63542b129e
5278
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5279
Date: Fri Jan 22 21:42:10 2010 +0000
5281
docs: Fix the Animation:object property
5283
There is a typo in the Animation:object property gtk-doc declaration.
5285
clutter/clutter-animation.c | 2 +-
5286
1 files changed, 1 insertions(+), 1 deletions(-)
5288
commit 0788aa43b29454efed3f60160b87881a1c84f603
5289
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5290
Date: Fri Jan 22 21:41:33 2010 +0000
5292
animation: Add more debug annotations
5294
We need some better tracking of the Animation's lifetime.
5296
clutter/clutter-animation.c | 16 ++++++++++++++--
5297
1 files changed, 14 insertions(+), 2 deletions(-)
5299
commit 7fa7c4a1b621eff0533ff70b1b6c9be001f62e2a
5300
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5301
Date: Fri Jan 22 21:36:41 2010 +0000
5303
animation: Transform if necessary
5305
The Animation code does transformation of values between type A and A'
5306
after checking for compatibility using g_value_type_compatible(). This
5307
is incorrect: compatibility means that the two types can be copied. The
5308
correct conversion should follow:
5310
if (compatible (type (A), type (A')))
5313
if (transformable (type (A), type (A')))
5316
error("Unable to trasform type A in A'");
5318
The transformation might still fail, so we need to check for errors
5319
there as well as a fall-through case.
5321
clutter/clutter-animation.c | 42 ++++++++++++++++++++++--------------------
5322
1 files changed, 22 insertions(+), 20 deletions(-)
5324
commit 94249efff7ec46bbeaac04800d5a9a30c05dcde3
5325
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5326
Date: Fri Jan 22 21:33:28 2010 +0000
5328
animation: Check for value transformability
5330
We should not just check for compatibility, but also for the ability to
5331
transform a GValue of type A into another of type A'.
5333
Usually compatibility is enough, especially if types can be
5334
introspected beforehand; some times, though, we also need to check for
5335
transformability as a type can provide the transformation functions
5336
necessary for the operation.
5338
clutter/clutter-animation.c | 29 ++++++++++++++++++++---------
5339
1 files changed, 20 insertions(+), 9 deletions(-)
5341
commit 996614cfaf582bbfbf86874a95b4a7eef3c50630
5342
Author: Neil Roberts <neil@linux.intel.com>
5343
Date: Thu Jan 21 15:34:19 2010 +0000
5345
cogl-atlas-texture: Add a debug option to disable the atlas
5347
If the user specifies the 'disable-atlas' debug option then no texture
5348
will be put in the atlas.
5350
clutter/cogl/cogl/cogl-atlas-texture.c | 5 +++++
5351
clutter/cogl/cogl/cogl-debug.c | 3 ++-
5352
clutter/cogl/cogl/cogl-debug.h | 3 ++-
5353
3 files changed, 9 insertions(+), 2 deletions(-)
5355
commit 4695383281d4b74baa10d78253a27b2eb541eef3
5356
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5357
Date: Fri Jan 22 00:06:17 2010 +0000
5359
build: Use no-define
5361
We don't need the PACKAGE and VERSION defines in the config.h.
5364
1 files changed, 1 insertions(+), 1 deletions(-)
5366
commit f7e7985344420caf4897777ced6f04cddb7052ee
5367
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5368
Date: Thu Jan 21 23:57:38 2010 +0000
5370
build: Add no-portability option to automake
5372
We require the GNU version of make for some of our rules, and it's been
5376
1 files changed, 1 insertions(+), 1 deletions(-)
5378
commit a545f66a5c34b66d1a31387105d114ca3edd3a46
5379
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5380
Date: Thu Jan 21 23:41:18 2010 +0000
5382
master clock: Improve the timeline advancement protection
5384
The commit 1c69c61745ed510f0b6ab16cb963ca01994cb9fc which improved the
5385
protection against timeline removals during the master clock advancement
5386
was only doing half the job - and actually broke the chaining of
5387
animations inside the ::completed signal.
5389
We cannot simply take a reference on the timelines and still use the list
5390
held by the master clock because the do_tick() might result in the
5391
creation of a new timeline, which gets added at the end of the list with
5392
no reference increase and thus gets disposed at the end of the iteration.
5394
We also cannot steal the master clock timelines list because a timeline
5395
might be removed as the direct result of do_tick() and remove_timeline()
5396
would not find the timeline, failing and leaving a dangling pointer
5399
For this reason we copy the list of timelines out of the one that the
5400
Master Clock holds, take a reference on each timeline, advance them all,
5401
release the reference and free the list.
5403
clutter/clutter-master-clock.c | 39 +++++++++++++++++++++++++++------------
5404
1 files changed, 27 insertions(+), 12 deletions(-)
5406
commit 8a4b64715486699dd8d0ea2146d0adea37d2a6c7
5407
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5408
Date: Wed Jan 20 19:40:58 2010 +0000
5410
x11: Re-enable XI1 extension keyboards
5412
The extension keyboard support in XInput 1.x is hopelessly broken.
5414
Nevertheless, it's possible to use some bits of it, as we prefer the
5415
core keyboard events to the XInput events, thus at least having proper
5416
handling for X11 key events on the Stage window.
5418
clutter/x11/clutter-backend-x11.c | 2 --
5419
clutter/x11/clutter-event-x11.c | 28 ++++++++++++++++++++++++++--
5420
clutter/x11/clutter-input-device-x11.c | 21 ++++++++++++++-------
5421
tests/interactive/test-devices.c | 12 +++++++-----
5422
4 files changed, 47 insertions(+), 16 deletions(-)
5424
commit 94f9f3bd9345d8eb1551c429615473134e3f4e8f
5425
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5426
Date: Fri Jan 15 16:28:00 2010 +0000
5428
x11: Always handle core device events before XI events
5430
The XI 1.0 layer is complementary to the X11 core devices handling; this
5431
means that core events will still be emitted for the core pointer and
5432
keyboard devices, and that secondary (floating) devices should be
5433
handled on top of that.
5435
Thus, the XI event handling code should be executed (if explicitly
5436
compiled in and enabled) if the core device events have not been parsed.
5438
Note: this is going away with XI2, which completely replaces both core and
5441
clutter/x11/clutter-event-x11.c | 499 ++++++++++++++++++---------------------
5442
1 files changed, 224 insertions(+), 275 deletions(-)
5444
commit dc39e9eff9de0797086ea1a505855724296981f7
5445
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5446
Date: Fri Jan 15 15:29:52 2010 +0000
5448
docs: Documentation fixes for DeviceManager
5450
clutter/clutter-device-manager.c | 7 ++++++-
5451
doc/reference/clutter/clutter-sections.txt | 2 --
5452
doc/reference/clutter/clutter.types | 2 ++
5453
3 files changed, 8 insertions(+), 3 deletions(-)
5455
commit 65c7ff7d05389a10eed1d881ca572082f03932fe
5456
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5457
Date: Fri Jan 15 15:29:14 2010 +0000
5459
device-manager: Fix the signals definition
5461
Add documentation for the signals, as well as using the correct type for
5464
clutter/clutter-device-manager.c | 24 ++++++++++++++++++++++--
5465
1 files changed, 22 insertions(+), 2 deletions(-)
5467
commit 0b47acf60b46b64ae838471765d86e1c65c01cc0
5468
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5469
Date: Fri Jan 15 14:56:43 2010 +0000
5471
docs: Add sections for InputDevice and DeviceManager
5473
doc/reference/clutter/clutter-docs.xml.in | 2 ++
5474
1 files changed, 2 insertions(+), 0 deletions(-)
5476
commit 8ead5abba0ebe9c5b5c1b749bb28f7879d63aa49
5477
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5478
Date: Fri Jan 15 14:42:19 2010 +0000
5480
docs: Add clutter_input_device_get_device_name()
5482
doc/reference/clutter/clutter-sections.txt | 1 +
5483
1 files changed, 1 insertions(+), 0 deletions(-)
5485
commit 1f5a7b61b761bf8426b1229c481574c273a5964f
5486
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5487
Date: Fri Jan 15 12:24:21 2010 +0000
5489
tests: Print out the device details on motion
5491
The test-device interactive test should print out the device name and id
5492
when it detects a motion event.
5494
tests/interactive/test-devices.c | 31 ++++++++++++++++++++++++++++++-
5495
1 files changed, 30 insertions(+), 1 deletions(-)
5497
commit d8e167f1519499a27ee04a9a0d167b5ffed3ce8e
5498
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5499
Date: Fri Jan 15 12:22:29 2010 +0000
5501
Always register core devices
5503
Even with XInput support we should always register core devices. This
5504
allows us to handle enter and leave events correctly on the Stage and
5505
to have a working XInput 1.x support in Clutter.
5507
clutter/x11/clutter-backend-x11.c | 87 ++++++++++---------------------
5508
clutter/x11/clutter-backend-x11.h | 1 +
5509
clutter/x11/clutter-event-x11.c | 47 +++++++++++++++++-
5510
clutter/x11/clutter-input-device-x11.c | 14 +++---
5511
4 files changed, 82 insertions(+), 67 deletions(-)
5513
commit e0b8d631593c0539c47de0158d5425391d7cdbc0
5514
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5515
Date: Fri Jan 15 11:52:27 2010 +0000
5517
device: Remove unused is_default member
5519
The is_default member of the InputDevice structure was not used
5522
clutter/clutter-private.h | 2 --
5523
clutter/x11/clutter-backend-x11.c | 11 ++---------
5524
2 files changed, 2 insertions(+), 11 deletions(-)
5526
commit 74dbcede25c9dee5b40cb057a26263d580800e7e
5527
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5528
Date: Fri Jan 15 11:47:05 2010 +0000
5530
win32: Experimental implementation of device support
5532
Mostly lifted from the core pointer and keyboard X11 backend support.
5534
The win32 backend registers two devices (a core pointer and a core
5535
keyboard) and assigns them to the event structure when doing the
5536
translation from native events to Clutter events.
5538
Thanks to: Samuel Degrande <Samuel.Degrande@lifl.fr> for testing this
5541
clutter/win32/clutter-backend-win32.c | 23 ++++++++++++++
5542
clutter/win32/clutter-backend-win32.h | 3 ++
5543
clutter/win32/clutter-event-win32.c | 55 +++++++++++++++++++++------------
5544
3 files changed, 61 insertions(+), 20 deletions(-)
5546
commit 850dd5a38fe17e82b16e19144db4ac516e349dbb
5547
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5548
Date: Fri Jan 15 11:40:01 2010 +0000
5550
tests: Print the device name, as well as its Id
5552
The test-devices interactive test should display the device name along
5555
tests/interactive/test-devices.c | 3 ++-
5556
1 files changed, 2 insertions(+), 1 deletions(-)
5558
commit 66740e8000ea92b04da663a0d2ce890271d2af2f
5559
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5560
Date: Fri Jan 15 11:38:58 2010 +0000
5562
x11: Fill out the :name property of the InputDevices
5564
For the core pointer and keyboard we assign the names ourselves; for
5565
devices coming from XI we can use the XDeviceInfo.name member.
5567
clutter/x11/clutter-backend-x11.c | 5 ++++-
5568
clutter/x11/clutter-event-x11.c | 9 ++++++---
5569
2 files changed, 10 insertions(+), 4 deletions(-)
5571
commit cf4e05930a1243f9b58617a4a50833d5bab705b1
5572
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5573
Date: Fri Jan 15 11:37:43 2010 +0000
5575
device: Add the :name property to InputDevice
5577
The InputDevice should have a name, possibly user readable, coming from
5580
clutter/clutter-input-device.c | 46 +++++++++++++++++++++++++++++++++++++++-
5581
clutter/clutter-input-device.h | 6 ++--
5582
clutter/clutter-private.h | 9 +++++++
5583
3 files changed, 57 insertions(+), 4 deletions(-)
5585
commit 79ad2b6a72bd91273e139e72af36d9b6db264001
5586
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5587
Date: Fri Jan 15 11:21:52 2010 +0000
5589
x11: Store core devices on the X11 Backend singleton
5591
Instead of overloading the device id of 0 and 1 we should treat the core
5592
devices as special, and have a pointer inside the X11 backend singleton
5593
structure, for fast access.
5595
clutter/x11/clutter-backend-x11.c | 8 +++-
5596
clutter/x11/clutter-backend-x11.h | 3 ++
5597
clutter/x11/clutter-event-x11.c | 13 +++----
5598
clutter/x11/clutter-input-device-x11.c | 63 ++++++++++++++++++++++++++++++++
5599
4 files changed, 77 insertions(+), 10 deletions(-)
5601
commit 8a579838d54d2b6f552fd32d9772f6e04f178179
5602
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5603
Date: Thu Jan 14 17:14:33 2010 +0000
5605
device: Unset the cursor actor when leaving the stage
5607
When an InputDevice leaves a stage we set the stage member of
5608
InputDevice to NULL. We should also unset the cursor_actor (as the
5609
device is obviously not on an actor any more).
5611
When the device re-enters the Stage the ENTER/LEAVE event generation
5612
machinery will then be able to emit the ENTER event on the Stage.
5614
clutter/clutter-input-device.c | 43 ++++++++++++++++++++++++++--------------
5615
1 files changed, 28 insertions(+), 15 deletions(-)
5617
commit 55e4315aa5889185a055f3ab2d5b5d4c9cae4dc4
5618
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5619
Date: Tue Jan 12 11:53:12 2010 +0000
5621
device: Add pointer actor getter
5623
ClutterInputDevice should have a getter method for retrieving the
5624
reactive actor underneath the pointer.
5626
clutter/clutter-input-device.c | 37 ++++++++++++++++++++++++++++
5627
clutter/clutter-input-device.h | 3 +-
5628
doc/reference/clutter/clutter-sections.txt | 1 +
5629
3 files changed, 40 insertions(+), 1 deletions(-)
5631
commit 25c6ebbb2c70af7f268036b10dcd8d4a965c34c3
5632
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5633
Date: Wed Dec 9 00:03:13 2009 +0000
5635
x11: Discard the LeaveNotify for off-stage ButtonRelease
5637
If the user presses a button on a pointer device and then moves out the
5638
Stage X11 will emit the following events:
5640
LeaveNotify ➔ MotionNotify ... ➔ ButtonRelease ➔ LeaveNotify
5642
The second LeaveNotify differs from the first by the state field.
5644
Unfortunately, ClutterCrossingEvent doesn't have a modifier_state field
5645
like other events, so we cannot provide a way for programmatically
5646
distinguishing them from a Clutter perspective. This is also an X11-ism
5647
we might not even want to replicate on every backend with sane
5648
enter/leave semantics.
5650
For this reason we should check inside the X11 event processing if the
5651
pointer device has already left the Stage and ignore the second
5654
clutter/x11/clutter-event-x11.c | 58 +++++++++++++++++++++++----------------
5655
1 files changed, 34 insertions(+), 24 deletions(-)
5657
commit 8736b53d7cc6fd2b53649c076ef09cb69f9b37d6
5658
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5659
Date: Wed Dec 9 00:01:50 2009 +0000
5661
device: Do not overwrite the stage for an InputDevice
5663
The Stage field of an InputDevice is set by the backend, whenever the
5664
pointer enters or leaves the Stage. The Stage should not overwrite the
5665
stage field for every event it processes.
5667
clutter/clutter-stage.c | 1 -
5668
1 files changed, 0 insertions(+), 1 deletions(-)
5670
commit cf287db2048eae5eaa58a9cbffd42c703f345ff5
5671
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5672
Date: Wed Dec 9 00:00:49 2009 +0000
5674
event: Off-stage button releases have a click count of 1
5676
The ButtonRelease off-stage should not have a click count of 0 but a
5677
click count initialized to 1.
5679
clutter/clutter-main.c | 1 +
5680
1 files changed, 1 insertions(+), 0 deletions(-)
5682
commit bddabf6d2ca100f4d91461129d4bb097c59ac666
5683
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5684
Date: Tue Dec 8 23:59:56 2009 +0000
5686
event: Scroll events do not have click count
5688
Remove the unneeded CLUTTER_SCROLL case from the click count checks.
5690
clutter/clutter-main.c | 1 -
5691
1 files changed, 0 insertions(+), 1 deletions(-)
5693
commit e30856a54d5d1e012cd2de30e519a487fd0b4f46
5694
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5695
Date: Tue Dec 8 18:33:01 2009 +0000
5697
Whitespace and indentation fixes
5699
clutter/x11/clutter-event-x11.c | 24 ++++++++++++------------
5700
1 files changed, 12 insertions(+), 12 deletions(-)
5702
commit 0f9cfd9911c21933b34c07a9616f79022bcc01e3
5703
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5704
Date: Mon Dec 7 23:13:52 2009 +0000
5706
event: Clean up click-count detection
5708
Avoid a few indirections and direct access to the Event and InputDevice
5711
clutter/clutter-main.c | 65 +++++++++++++++++++++++++++++++++--------------
5712
1 files changed, 45 insertions(+), 20 deletions(-)
5714
commit cf8a06f0186e44b3437b06c56c088e8dc465402b
5715
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5716
Date: Mon Dec 7 23:05:20 2009 +0000
5718
device: Store the current state, not the previous
5720
The previous state for the device is used by the click count machinery
5721
and we should not be overwriting it at every event; instead, we should
5722
use a parallel storage for the current state coming from the windowing
5725
clutter/clutter-input-device.c | 34 +++++++++++++++++-----------------
5726
clutter/clutter-private.h | 7 +++++++
5727
2 files changed, 24 insertions(+), 17 deletions(-)
5729
commit 68b47e3ed479242a94f7a8d302a2900f7e28c840
5730
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5731
Date: Mon Dec 7 23:02:48 2009 +0000
5733
tests: Fix test-events output
5735
• The enter/leave event line should take into account the case where
5736
the related field is set to NULL (meaning entering from off-stage
5737
and leaving the stage).
5739
• The ButtonRelease line shows the click count but uses the button; the
5740
button *and* the click count should be displayed for both ButtonPress
5741
and ButtonRelease, to verify they match.
5743
tests/interactive/test-events.c | 16 +++++++++++-----
5744
1 files changed, 11 insertions(+), 5 deletions(-)
5746
commit b3a42c3b09e256732395f7c63c4a39956d32d3da
5747
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5748
Date: Mon Dec 7 18:38:18 2009 +0000
5750
docs: Update the API reference
5752
Add the new symbols for InputDevice and DeviceManager
5754
clutter/clutter-device-manager.c | 2 +-
5755
clutter/clutter-device-manager.h | 2 +-
5756
clutter/clutter-main.c | 4 +-
5757
doc/reference/clutter/clutter-sections.txt | 49 +++++++++++++++++++++++++--
5758
4 files changed, 49 insertions(+), 8 deletions(-)
5760
commit 130286979d04128b51fa8662aa13b6bbd1867ca2
5761
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5762
Date: Tue Nov 24 17:54:02 2009 +0000
5764
Do not pick when motion event delivery is disabled
5766
The device manager does not need to update the state of the devices
5767
when the user has disabled the delivery of motion events to actors:
5768
the events will always be delivered as they are to the stage.
5770
clutter/clutter-device-manager.c | 7 +++++++
5771
1 files changed, 7 insertions(+), 0 deletions(-)
5773
commit 687c70dffa70a3256e9f734b090cb4a088e97bb1
5774
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5775
Date: Tue Nov 24 16:33:03 2009 +0000
5777
Rework the emission of LEAVE/ENTER event pairs
5779
The LEAVE/ENTER event pairs should be queued during the InputDevice
5780
update process, when we change the actor under the device pointer.
5782
This commit cleans up the event emission code inside clutter-main.c
5783
and the logic of the event processing.
5785
clutter/clutter-device-manager.c | 4 +-
5786
clutter/clutter-input-device.c | 81 +++++++++++++++-
5787
clutter/clutter-main.c | 190 ++++++--------------------------------
5788
clutter/clutter-private.h | 2 -
5789
4 files changed, 104 insertions(+), 173 deletions(-)
5791
commit 75f05646fa117b8096e033f9fad0ba9de1ee01ac
5792
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5793
Date: Tue Nov 24 16:31:14 2009 +0000
5795
tests: Clean up test-events
5797
The output of test-events is a bit of a mess; this patch should clean
5798
it up a little bit - at least enough for it to be useful again during
5801
tests/interactive/test-events.c | 101 +++++++++++++++++++++++----------------
5802
1 files changed, 60 insertions(+), 41 deletions(-)
5804
commit a056ae716442e07e50ebd07cbca030776a5b3c28
5805
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5806
Date: Tue Nov 24 16:22:44 2009 +0000
5808
Add docs and licensing notices
5810
clutter/clutter-device-manager.c | 125 +++++++++++++++++++++++++++++++++++++-
5811
clutter/clutter-device-manager.h | 29 +++++++++
5812
clutter/clutter-input-device.c | 109 ++++++++++++++++++++++++++++++++-
5813
clutter/clutter-input-device.h | 31 +++++++++
5814
4 files changed, 288 insertions(+), 6 deletions(-)
5816
commit 9506510d1cf794ef530f6c4db45103efb60cca63
5817
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5818
Date: Fri Jan 8 17:51:00 2010 +0000
5820
Move all picking-related operations inside InputDevice
5822
The InputDevice objects stores pointer coordinates, state, stage and
5823
the actor under the cursor, so if the current backend provides us with
5824
one attached to the Event structure then we want the InputDevice itself
5825
to update its state and give us the ClutterActor underneath the
5828
clutter/clutter-device-manager.c | 24 ++++++++++
5829
clutter/clutter-event.c | 36 ---------------
5830
clutter/clutter-input-device.c | 91 ++++++++++++++++++++++++++++++++++++--
5831
clutter/clutter-input-device.h | 7 ++-
5832
clutter/clutter-main.c | 60 ++++++++++++++----------
5833
clutter/clutter-master-clock.c | 7 +--
5834
clutter/clutter-private.h | 36 ++++++++++-----
5835
clutter/clutter-stage.c | 28 ++++++++++--
5836
clutter/x11/clutter-event-x11.c | 36 ++++++++++-----
5837
9 files changed, 225 insertions(+), 100 deletions(-)
5839
commit 1f87cac0695dc95be4ed0219752d454d9a285e50
5840
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5841
Date: Tue Nov 24 12:53:57 2009 +0000
5843
actor: Add :has-pointer property
5845
ClutterActor should be able to tell whether a pointer is within
5848
clutter/clutter-actor.c | 60 ++++++++++++++++++++++++++++++++++++++++++++-
5849
clutter/clutter-actor.h | 1 +
5850
clutter/clutter-private.h | 3 ++
5851
3 files changed, 63 insertions(+), 1 deletions(-)
5853
commit d23dd9af6bf48c3c02f685505a5a34b477d4d2b3
5854
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5855
Date: Mon Nov 23 16:07:16 2009 +0000
5857
device: Make InputDevice an object and subclass it for X11
5859
ClutterInputDevice should be a type that we can subclass per-backend
5860
to add functionality.
5862
clutter/Makefile.am | 2 +
5863
clutter/clutter-event.h | 35 +------
5864
clutter/clutter-input-device.c | 175 ++++++++++++++++++++++++++++++++
5865
clutter/clutter-input-device.h | 64 ++++++++++++
5866
clutter/clutter-main.c | 34 +++---
5867
clutter/clutter-private.h | 19 +++-
5868
clutter/clutter.h | 1 +
5869
clutter/x11/Makefile.am | 2 +
5870
clutter/x11/clutter-backend-x11.c | 141 ++++++--------------------
5871
clutter/x11/clutter-input-device-x11.c | 151 +++++++++++++++++++++++++++
5872
clutter/x11/clutter-input-device-x11.h | 25 +++++
5873
11 files changed, 484 insertions(+), 165 deletions(-)
5875
commit d5331bfb5786b496cfcab925319711853db2f1d3
5876
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5877
Date: Fri Nov 20 16:37:58 2009 +0000
5879
tests: Update the devices test
5881
Use the DeviceManager API instead of the X11 specific API.
5883
tests/interactive/test-devices.c | 8 +++++---
5884
1 files changed, 5 insertions(+), 3 deletions(-)
5886
commit 157da20e86f88bf906f0b59bafbea171a2e5e678
5887
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5888
Date: Fri Nov 20 16:24:16 2009 +0000
5890
x11: Always assign a device to pointer and key events
5892
Even when we are not using XInput we now have fallback devices; the
5893
X11 backend should always assign the default devices when translating
5894
the X events to Clutter events.
5896
clutter/x11/clutter-event-x11.c | 37 ++++++++++++++++++++++++++++---------
5897
1 files changed, 28 insertions(+), 9 deletions(-)
5899
commit ca16446319b6281cf63edf3b1b6d7d4f8d41e499
5900
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5901
Date: Fri Nov 20 15:43:50 2009 +0000
5903
Add :is-default flag to InputDevice
5905
clutter/clutter-private.h | 2 ++
5906
clutter/x11/clutter-backend-x11.c | 9 ++++++++-
5907
2 files changed, 10 insertions(+), 1 deletions(-)
5909
commit 3027d4327ae0c5d9bb7cc831f24d5ee5e8fb107f
5910
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5911
Date: Fri Nov 20 15:36:43 2009 +0000
5913
Port the X11 backend to the Device Manager
5915
Use the device manager to store the input devices. Also, provide
5916
two fallback devices when initializing the X11 backend: device 0
5917
for the pointer and device 1 for the keyboard.
5919
clutter/clutter-private.h | 3 -
5920
clutter/x11/clutter-backend-x11.c | 514 ++++++++++++++++++-------------------
5921
clutter/x11/clutter-backend-x11.h | 6 -
5922
clutter/x11/clutter-event-x11.c | 5 +-
5923
clutter/x11/clutter-x11.h | 2 +
5924
5 files changed, 256 insertions(+), 274 deletions(-)
5926
commit d34f1aa775e8a66bd0e599b32c761869b319c639
5927
Author: Emmanuele Bassi <ebassi@linux.intel.com>
5928
Date: Fri Nov 20 15:35:40 2009 +0000
5930
Add ClutterDeviceManager
5932
The ClutterDeviceManager is a singleton object that behaves like the
5933
StageManager: it holds all input devices and notifies on addition and
5936
clutter/Makefile.am | 6 +-
5937
clutter/clutter-device-manager.c | 146 ++++++++++++++++++++++++++++++++++++++
5938
clutter/clutter-device-manager.h | 30 ++++++++
5939
clutter/clutter-main.c | 30 ++++----
5940
clutter/clutter-marshal.list | 1 +
5941
clutter/clutter-private.h | 43 +++++++----
5942
clutter/clutter.h | 1 +
5943
7 files changed, 224 insertions(+), 33 deletions(-)
5945
commit 1ef40b882349820d5edb2f1ed8885c3386d2cdf7
5946
Author: Neil Roberts <neil@linux.intel.com>
5947
Date: Tue Jan 19 17:14:58 2010 +0000
5949
test-cogl-npot-texture: Use the COGL_TEXTURE_NO_ATLAS flag
5951
If the texture is put in the atlas it won't be sliced whatever size it
5952
is so it negates the test. We can avoid this with the NO_ATLAS flag.
5954
tests/conform/test-cogl-npot-texture.c | 2 +-
5955
1 files changed, 1 insertions(+), 1 deletions(-)
5957
commit 08b8b2791f91770d1a6e7aff163167d003b0fad3
5958
Author: Neil Roberts <neil@linux.intel.com>
5959
Date: Tue Jan 19 17:06:28 2010 +0000
5961
cogl-atlas-texture: Don't create atlas textures with the premult bit
5963
Previously the atlas textures were being created with whatever format
5964
the first sub texture is in. Only three formats are supported so this
5965
only matters if the first texture is a premultiplied alpha
5966
texture. Instead it now masks out the premultiplied bit so that the
5967
textures are always either RGB_888 or RGBA_8888.
5969
clutter/cogl/cogl/cogl-atlas-texture.c | 3 ++-
5970
1 files changed, 2 insertions(+), 1 deletions(-)
5972
commit 14a28620ae13ef041696e2e3747ec00738cfd2bd
5973
Author: Neil Roberts <neil@linux.intel.com>
5974
Date: Fri Jan 15 22:56:37 2010 +0000
5976
win32: Use an invisible cursor when cursor-visible is FALSE
5978
The win32 backend now handles the WM_SETCURSOR message and sets a
5979
fully transparent cursor if the cursor-visible property has been
5980
cleared on the stage. The icon is stored in the library via a resource
5981
file. The instance handle for the DLL is needed to load the resource
5982
so there is now a DllMain function to grab the handle.
5984
clutter/Makefile.am | 21 +++++++++++++++-
5985
clutter/win32/Makefile.am | 2 +-
5986
clutter/win32/clutter-backend-win32.c | 25 ++++++++++++++++++
5987
clutter/win32/clutter-backend-win32.h | 4 +++
5988
clutter/win32/clutter-event-win32.c | 14 ++++++++++
5989
clutter/win32/clutter-stage-win32.c | 44 +++++++++++++++++++++++++++++---
5990
clutter/win32/clutter-stage-win32.h | 2 +
5991
clutter/win32/invisible-cursor.cur | Bin 0 -> 86 bytes
5992
clutter/win32/resources.rc | 1 +
5993
configure.ac | 7 +++++
5994
10 files changed, 113 insertions(+), 7 deletions(-)
5996
commit 4db89759a0aa91b353ac0bb41562addfff6d76c9
5997
Author: Neil Roberts <neil@linux.intel.com>
5998
Date: Mon Jan 18 17:33:08 2010 +0000
6000
Post-release version bump to 1.1.7
6003
1 files changed, 1 insertions(+), 1 deletions(-)
6005
commit 07ff8d26f8097a00757e6e3cfcd587bce188ae0d
6006
Author: Neil Roberts <neil@linux.intel.com>
6007
Date: Mon Jan 18 15:44:58 2010 +0000
6009
Release Clutter 1.1.6
6011
NEWS | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
6013
2 files changed, 50 insertions(+), 1 deletions(-)
6015
commit 8daff42b3bcc9d59d7c87801b3926d8ed7c105a4
6016
Author: Neil Roberts <neil@linux.intel.com>
6017
Date: Mon Jan 18 15:43:25 2010 +0000
6019
README: Clarify the required OpenGL version
6021
Cogl will not allow OpenGL 1.2 if it doesn't have the multitexturing
6022
extension so we should make this clear in the README.
6025
1 files changed, 6 insertions(+), 1 deletions(-)
6027
commit fa51ff25d3555ce938922d7bbd64acb12140a774
6028
Author: Neil Roberts <neil@linux.intel.com>
6029
Date: Mon Jan 18 13:56:56 2010 +0000
6031
Add build/mingw/{README,mingw-cross-compile.sh} to the dist tarball
6033
It's quite difficult to get git working on Windows so it makes sense
6034
to put the build instructions somewhere accessible.
6036
build/Makefile.am | 2 +-
6037
build/mingw/Makefile.am | 1 +
6039
3 files changed, 3 insertions(+), 1 deletions(-)
6041
commit ff1d9cf090aef74efa1ec04b8cd490a45b148ae4
6042
Author: Neil Roberts <neil@linux.intel.com>
6043
Date: Mon Jan 18 12:42:20 2010 +0000
6045
test-texture-fbo: Disconnect the paint handler for the stage
6047
Otherwise the paint handler will still be run for the subsequent
6048
tests. This ends up writing to the ‘state’ variable which used to be
6049
on the stack so it will end up corrupting some stack variable. This
6050
was causing test-cogl-premult to fail.
6052
tests/conform/test-texture-fbo.c | 6 +++++-
6053
1 files changed, 5 insertions(+), 1 deletions(-)
6055
commit ce030a3fce362cf4238d361743aaf9027ceed95a
6056
Author: Neil Roberts <neil@linux.intel.com>
6057
Date: Mon Jan 18 12:35:05 2010 +0000
6059
clutter-group: Use g_list_foreach in clutter_group_real_foreach
6061
g_list_foreach has better protection against the current node being
6062
removed. This will happen for example if someone calls
6063
clutter_container_foreach(container, clutter_actor_destroy). This was
6064
causing valgrind errors for the conformance tests which do just that.
6066
clutter/clutter-group.c | 8 +++++---
6067
1 files changed, 5 insertions(+), 3 deletions(-)
6069
commit c4adefffd34d91fdf72365a6d11641f3c9f751cc
6070
Author: Neil Roberts <neil@linux.intel.com>
6071
Date: Mon Jan 18 10:53:00 2010 +0000
6073
cogl-atlas-texture: Fix premultiplied texture formats
6075
When uploading texture data it was just calling cogl_texture_set_data
6076
on the large texture. This would attempt to convert the data to the
6077
format of the large texture. All of the textures with alpha channels
6078
are stored together regardless of whether they are premultiplied so
6079
this was causing premultiplied textures to be unpremultiplied
6080
again. It now just uploads the data ignoring the premult bit of the
6081
format so that it only gets converted once.
6083
clutter/cogl/cogl/cogl-atlas-texture.c | 232 ++++++++++++++++++++++----------
6084
1 files changed, 158 insertions(+), 74 deletions(-)
6086
commit b78024bd2dbf39cb86a1c1458e477af9c9353d9e
6087
Author: Neil Roberts <neil@linux.intel.com>
6088
Date: Thu Jan 14 17:57:43 2010 +0000
6090
cogl-primitives: Ensure the mipmaps for a layer before logging quads
6092
With the atlas texture backend ensuring the mipmaps can make it become
6093
a completely different texture which will have different texture
6094
coordinates or may even be sliced. Therefore we need to ensure the
6095
mipmaps before deciding which quads to log in the journal. This adds a
6096
new private function to cogl-material which ensures the mipmaps if
6099
clutter/cogl/cogl/cogl-material-private.h | 6 ++++++
6100
clutter/cogl/cogl/cogl-material.c | 19 +++++++++++++++----
6101
clutter/cogl/cogl/cogl-primitives.c | 6 ++++++
6102
3 files changed, 27 insertions(+), 4 deletions(-)
6104
commit 36f18e5ac57e068c3987d5b705f68fcc6f18d472
6105
Author: Neil Roberts <neil@linux.intel.com>
6106
Date: Mon Jan 18 09:22:04 2010 +0000
6108
cogl: Make CoglSubTexture only work for quad rendering
6110
The sub texture backend doesn't work well as a completely general
6111
texture backend because for example when rendering with cogl_polygon
6112
it needs to be able to tranform arbitrary texture coordinates without
6113
reference to the other coordintes. This can't be done when the texture
6114
coordinates are a multiple of one because sometimes the coordinate
6115
should represent the left or top edge and sometimes it should
6116
represent the bottom or top edge. For example if the s coordinates are
6117
0 and 1 then 1 represents the right edge but if they are 1 and 2 then
6118
1 represents the left edge.
6120
Instead the sub-textures are now documented not to support coordinates
6121
outside the range [0,1]. The coordinates for the sub-region are now
6122
represented as integers as this helps avoid rounding issues. The
6123
region can no longer be a super-region of the texture as this
6124
simplifies the code quite a lot.
6126
There are two new texture virtual functions:
6128
transform_quad_coords_to_gl - This transforms two pairs of coordinates
6129
representing a quad. It will return FALSE if the coordinates can
6130
not be transformed. The sub texture backend uses this to detect
6131
coordinates that require repeating which causes cogl-primitives
6132
to use manual repeating.
6134
ensure_non_quad_rendering - This is used in cogl_polygon and
6135
cogl_vertex_buffer to inform the texture backend that
6136
transform_quad_to_gl is going to be used. The atlas backend
6137
migrates the texture out of the atlas when it hits this.
6139
clutter/cogl/cogl/cogl-atlas-texture.c | 57 +++-
6140
clutter/cogl/cogl/cogl-primitives.c | 21 +-
6141
clutter/cogl/cogl/cogl-sub-texture-private.h | 15 +-
6142
clutter/cogl/cogl/cogl-sub-texture.c | 498 +++++++++-----------------
6143
clutter/cogl/cogl/cogl-texture-2d-sliced.c | 21 ++
6144
clutter/cogl/cogl/cogl-texture-2d.c | 17 +
6145
clutter/cogl/cogl/cogl-texture-private.h | 10 +
6146
clutter/cogl/cogl/cogl-texture.c | 33 ++-
6147
clutter/cogl/cogl/cogl-texture.h | 22 +-
6148
clutter/cogl/cogl/cogl-vertex-buffer.c | 5 +
6149
tests/conform/test-cogl-sub-texture.c | 81 ++---
6150
tests/conform/test-conform-main.c | 2 +-
6151
12 files changed, 348 insertions(+), 434 deletions(-)
6153
commit 3d373c7278c47b18576edc8c8a0074654ce4a60e
6154
Author: Samuel Degrande <Samuel.Degrande@lifl.fr>
6155
Date: Fri Nov 27 16:53:50 2009 +0100
6157
win32: Fix computation of the fullscreen size during stage realization
6159
http://bugzilla.openedhand.com/show_bug.cgi?id=1905
6161
Signed-off-by: Neil Roberts <neil@linux.intel.com>
6163
clutter/win32/clutter-stage-win32.c | 2 +-
6164
1 files changed, 1 insertions(+), 1 deletions(-)
6166
commit 12a9150f5b455e5700c745de4ad1ac5f2e43631f
6167
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6168
Date: Fri Jan 15 17:32:46 2010 +0000
6170
docs: Clarify usage of UTF-8 or ASCII art in commit messages
6173
1 files changed, 1 insertions(+), 1 deletions(-)
6175
commit ea662b9ecaf1dd956f0cdc79ce04880270bf99de
6176
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6177
Date: Fri Jan 15 17:06:56 2010 +0000
6179
docs: Display the features section
6181
The features section of the API reference is built but not used, and it
6182
has some copy-and-paste errors.
6184
clutter/clutter-feature.c | 11 +++++++++--
6185
clutter/clutter-feature.h | 8 --------
6186
doc/reference/clutter/clutter-docs.xml.in | 1 +
6187
doc/reference/clutter/clutter-sections.txt | 2 +-
6188
4 files changed, 11 insertions(+), 11 deletions(-)
6190
commit cdfd9eb212829df0408431673bedfbe6b566fefe
6191
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6192
Date: Fri Jan 15 14:50:06 2010 +0000
6194
Add test-cogl-texture-mipmaps to the Git ignore file
6197
1 files changed, 1 insertions(+), 0 deletions(-)
6199
commit e019547e8c7d110332a9ba071737736a059f5b4b
6200
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6201
Date: Fri Jan 15 14:48:42 2010 +0000
6203
x11: Fix typo in clutter_x11_set_use_argb_visual() declaration
6205
The function should have a lowercase x11, not an uppercase X11 in its
6208
clutter/x11/clutter-x11.h | 2 +-
6209
1 files changed, 1 insertions(+), 1 deletions(-)
6211
commit 148145ea1ad24fb1ceca3229c4cae9c7c5755f75
6212
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6213
Date: Fri Jan 15 14:47:20 2010 +0000
6215
docs: Ignore clutter-profile.h
6217
doc/reference/clutter/Makefile.am | 57 +++++++++++++++++++------------------
6218
1 files changed, 29 insertions(+), 28 deletions(-)
6220
commit b844653c649277eed63b6a85d29b84aab8abe641
6221
Author: Neil Roberts <neil@linux.intel.com>
6222
Date: Mon Jan 11 16:23:38 2010 +0000
6224
cogl-texture: Fix manual repeating for negative coordinates
6226
When calculating the next integer position for negative coordinates it
6227
would not increment if the position is already a multiple of one so we
6228
need to manually add one.
6230
clutter/cogl/cogl/cogl-texture.c | 5 +++--
6231
1 files changed, 3 insertions(+), 2 deletions(-)
6233
commit a01b4eefceb1d490d918eba1729c87354695d1ca
6234
Author: Neil Roberts <neil@linux.intel.com>
6235
Date: Mon Jan 11 16:21:56 2010 +0000
6237
cogl-texture-2d: Fix the coordinate wrapping for negative coordinates
6239
The formula to wrap the coordinates to the [0,1] range was broken when
6240
the coordinates were negative.
6242
clutter/cogl/cogl/cogl-texture-2d.c | 4 ++--
6243
1 files changed, 2 insertions(+), 2 deletions(-)
6245
commit ead43995364bb8865ca5bab15d1bfd295578fff4
6246
Merge: 34b5093 a70ebe4
6247
Author: Neil Roberts <neil@linux.intel.com>
6248
Date: Fri Jan 15 12:15:46 2010 +0000
6250
Merge branch 'master' into more-texture-backends
6252
commit a70ebe4f52e192c11f8db6a4fa1f419a5b175ab3
6253
Author: Neil Roberts <neil@linux.intel.com>
6254
Date: Fri Jan 15 12:02:09 2010 +0000
6256
tests: Add a simple conformance test for texture mipmaps
6258
This adds a test which renders a texture into a 1x1 pixel quad with
6259
and without filters that use mipmaps. The pixel without mipmaps will
6260
be one of the colors from the texture and the one with will be the
6261
average of all the pixels in the texture.
6263
tests/conform/Makefile.am | 1 +
6264
tests/conform/test-cogl-texture-mipmaps.c | 147 +++++++++++++++++++++++++++++
6265
tests/conform/test-conform-main.c | 1 +
6266
3 files changed, 149 insertions(+), 0 deletions(-)
6268
commit ba4622ff8bd1abde577fa26637fd1afec1b3abd6
6269
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6270
Date: Thu Jan 14 15:23:41 2010 +0000
6272
Add a notice of deprecation in the pre-Git ChangeLog
6274
ChangeLog.pre-git-import | 6 ++++++
6275
1 files changed, 6 insertions(+), 0 deletions(-)
6277
commit 8247bdf4f9b940fe69165ae6556511fcc9ca3a5d
6278
Author: Neil Roberts <neil@linux.intel.com>
6279
Date: Tue Jan 12 21:44:40 2010 +0000
6281
cogl-framebuffer: Return gboolean from try_creating_fbo
6283
When try_creating_fbo fails it returns 0 to report the error and if it
6284
succeeds it returns ‘flags’. However cogl_offscreen_new_to_texture
6285
also passes in 0 for the flags as the last fallback to create the fbo
6286
with nothing but the color buffer. In that case it will return 0
6287
regardless of whether it succeeded so the last fallback will always be
6288
considered a failure.
6290
To fix this it now just returns a gboolean to indicate whether it
6291
succeeded and the flags used for each attempt is assigned when passing
6292
the argument rather than from the return value of the function.
6294
Also if the only configuration that succeeded was with flags==0 then
6295
it would always try all combinations because last_working_flags would
6296
also be zero. To avoid this it now uses a separate gboolean to mark
6297
whether we found a successful set of flags.
6299
http://bugzilla.openedhand.com/show_bug.cgi?id=1873
6301
clutter/cogl/cogl/cogl-framebuffer.c | 56 +++++++++++++++++-----------------
6302
1 files changed, 28 insertions(+), 28 deletions(-)
6304
commit c6ce9c338966188248c3c1ae7b10480205fe20bf
6305
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6306
Date: Thu Jan 14 14:07:04 2010 +0000
6308
conform: Add operators tests for ClutterColor
6310
The clutter_color_add() and clutter_color_subtract() functions are
6311
lacking unit testing to catch eventual regressions.
6314
tests/conform/test-color.c | 57 +++++++++++++++++++++++++++++++++++++
6315
tests/conform/test-conform-main.c | 1 +
6316
3 files changed, 59 insertions(+), 0 deletions(-)
6318
commit 4388509a1589dbac7aae0ebe5995ca0e06f7c70c
6319
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6320
Date: Thu Jan 14 12:28:07 2010 +0000
6322
master-clock: Add profiling timers
6324
Use the newly-added profiling timers inside the master clock dispatch
6325
function to see how much time we spend:
6327
• in the whole function
6328
• in the event processing for each stage
6329
• in the timeline advancement
6331
clutter/clutter-master-clock.c | 31 +++++++++++++++++++++++++++++++
6332
1 files changed, 31 insertions(+), 0 deletions(-)
6334
commit 6e82d11daf8b1d7259c26e6a0816392a71c726f3
6335
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6336
Date: Wed Jan 13 17:31:13 2010 +0000
6338
units: Improve coverage of clutter_units_from_string()
6340
Add a unit for an empty string as well as units for the missing unit
6341
types like cm, mm and px.
6343
tests/conform/test-clutter-units.c | 11 +++++++++++
6344
1 files changed, 11 insertions(+), 0 deletions(-)
6346
commit ed735ae730ea2140ef4d1be9d1947dbdce8b1f28
6347
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6348
Date: Wed Jan 13 16:57:55 2010 +0000
6350
Add test-cogl-multitexture to the Git ignore file
6353
1 files changed, 1 insertions(+), 0 deletions(-)
6355
commit a076e0e11d222ca17dbdbadb3aa2c762d32a5730
6356
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6357
Date: Wed Jan 13 16:35:53 2010 +0000
6359
build: Add a script to format gcov report lines
6361
Instead of using echo let's try Perl and the format() built-in.
6363
build/Makefile.am | 2 +
6364
build/autotools/Makefile.am.gcov | 2 +-
6365
build/gen-gcov.pl | 44 ++++++++++++++++++++++++++++++++++++++
6366
3 files changed, 47 insertions(+), 1 deletions(-)
6368
commit 948db40c875f8eb7032582a32515737be6587067
6369
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6370
Date: Mon Jan 4 14:53:03 2010 +0000
6372
Add gcov support to the build
6374
Using gcov it's possible to get a coverage report, that is a break down
6375
of how much the exposed API is exercised by the conformance test suite.
6379
build/autotools/Makefile.am | 1 +
6380
build/autotools/Makefile.am.gcov | 33 +++++++++++++++++++++++++++++++++
6381
clutter/Makefile.am | 20 +++++++++++---------
6382
configure.ac | 26 ++++++++++++++++++++++++++
6383
6 files changed, 76 insertions(+), 9 deletions(-)
6385
commit 5322546a4e2100bcec8aba651f8de7d849d67711
6386
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6387
Date: Wed Jan 13 15:40:36 2010 +0000
6389
build: Clean up COGL build flags
6391
clutter/cogl/cogl/Makefile.am | 53 ++++++++++++++++++++---------------------
6392
1 files changed, 26 insertions(+), 27 deletions(-)
6394
commit 18d96005ec4d1395d70d71f2bef6cc378f4afb43
6395
Author: Damien Lespiau <damien.lespiau@intel.com>
6396
Date: Mon Nov 2 17:08:55 2009 +0000
6398
texture: Remove reading the texture data back in ::unrealize()
6400
Reading back the texture data in unrealize does not seem like a
6401
desirable feature any more, clutter has evolved a lot since it was
6404
What's wrong with it now:
6406
* It takes *a lot* of time to read the data back with glReadPixel(),
6407
* When several textures share the same CoglTexture, the same data can
6408
be read back multiple times,
6409
* If the underlying material uses multiple texture units, only the
6410
first one was copied back,
6411
* In ClutterCairoTexture, we end up having two separate copies of the
6413
* GL actually manages texture memory accross system/video memory
6416
For all the reasons above, let's get rid of the glReadPixel() in
6417
Texture::unrealize()
6421
clutter/clutter-texture.c | 163 ++------------------------------------------
6422
1 files changed, 8 insertions(+), 155 deletions(-)
6424
commit 778e08e4e24822b0875e6aeaf168cb5cecfc8a7f
6425
Author: Neil Roberts <neil@linux.intel.com>
6426
Date: Tue Jan 12 14:49:55 2010 +0000
6428
cogl-framebuffer: Add some missing GL defines
6430
Since 755cce33a7 the framebuffer code is using the GL enums
6431
GL_DEPTH_ATTACHMENT and GL_DEPTH_COMPONENT16. These aren't available
6432
directly under GLES except with the OES suffix so we need to define
6433
them manually as we do with the other framebuffer constants.
6435
clutter/cogl/cogl/cogl-framebuffer.c | 6 ++++++
6436
1 files changed, 6 insertions(+), 0 deletions(-)
6438
commit bb8352ca95f18ca5582abb97e20e78f69300adde
6439
Author: Neil Roberts <neil@linux.intel.com>
6440
Date: Tue Jan 12 14:43:36 2010 +0000
6442
cogl: Remove the CGL_* defines
6444
These macros used to define Cogl wrappers for the GLenum values. There are
6445
now Cogl enums everywhere in the API where these were required so we
6446
shouldn't need them anymore. They were in the public headers but as
6447
they are not neccessary and were not in the API docs for Clutter 1.0
6448
it should be safe to remove them.
6450
clutter/cogl/cogl/cogl-material.c | 10 +-
6451
clutter/cogl/cogl/cogl-primitives.c | 2 +-
6452
clutter/cogl/cogl/cogl-shader.h | 2 +-
6453
clutter/cogl/cogl/cogl-texture.h | 7 +-
6454
clutter/cogl/cogl/driver/gl/cogl-defines.h.in | 655 --------------------
6455
clutter/cogl/cogl/driver/gl/cogl-texture-driver.c | 2 +-
6456
clutter/cogl/cogl/driver/gles/cogl-defines.h.in | 597 ------------------
6457
clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c | 4 +-
6458
clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.h | 65 +-
6459
clutter/glx/clutter-glx-texture-pixmap.c | 8 +-
6460
10 files changed, 55 insertions(+), 1297 deletions(-)
6462
commit 1c6ffc8a238e5e7de429f35f7653695d91d9d26d
6463
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6464
Date: Tue Jan 12 15:44:28 2010 +0000
6466
stage: Add the delete-event signal
6468
Using the ::event signal to match the CLUTTER_DELETE event type (and
6469
block the stage destruction) can be costly, since it means checking
6472
The ::delete-event signal is similar in spirit to any other specialized
6473
signal handler dealing with events, and retains the same semantics.
6475
clutter/clutter-main.c | 9 +-------
6476
clutter/clutter-stage.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++-
6477
clutter/clutter-stage.h | 6 ++++-
6478
3 files changed, 54 insertions(+), 10 deletions(-)
6480
commit 8b950bdc87fae2626af8a96916b7f51fdea40a17
6481
Author: Robert Bragg <robert@linux.intel.com>
6482
Date: Tue Jan 12 11:02:09 2010 +0000
6484
journal: Fixes logging of multiple sets of texture coordinates
6486
If a user supplied multiple groups of texture coordinates with
6487
cogl_rectangle_with_multitexture_coords() then we would repeatedly log only
6488
the first group in the journal. This fixes that bug and adds a conformance
6489
test to verify the fix.
6491
Thanks to Gord Allott for reporting this bug.
6493
clutter/cogl/cogl/cogl-journal.c | 8 +-
6494
tests/conform/Makefile.am | 1 +
6495
tests/conform/test-cogl-multitexture.c | 209 ++++++++++++++++++++++++++++++++
6496
tests/conform/test-conform-main.c | 1 +
6497
4 files changed, 215 insertions(+), 4 deletions(-)
6499
commit bc8a80fee53c9eed17fab6d821846c1a0fa3460f
6500
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6501
Date: Mon Jan 11 17:08:42 2010 +0000
6503
text: Zero out the cursor_pos member
6505
Do not trust the zero-ing done by GObject on the private data structure,
6506
and use memset() instead to zero the ClutterGeometry structure.
6508
clutter/clutter-text.c | 1 +
6509
1 files changed, 1 insertions(+), 0 deletions(-)
6511
commit 5c14538c1406b1358a2747428c73fe0cf1198e94
6512
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6513
Date: Mon Jan 11 17:06:52 2010 +0000
6515
Remove obsolete code from test-text
6517
The test-text "fake scrolling" code stopped working somewhere between
6518
0.8 and 0.9, with the new layout code. Instead of the ::cursor-event
6519
signal it should use an approach similar to the Scrollable interface in
6520
the Moblin User Experience toolkit.
6522
Right now, it makes sense to ignore this code entirely.
6524
tests/interactive/test-text.c | 26 ++------------------------
6525
1 files changed, 2 insertions(+), 24 deletions(-)
6527
commit 755cce33a729817aebe4cf5c08d97c31a327c863
6528
Author: Robert Bragg <robert@linux.intel.com>
6529
Date: Mon Nov 30 20:04:41 2009 +0000
6531
cogl: Support multiple fallbacks in cogl_offscreen_new_to_texture()
6533
The Intel drivers in Mesa 7.6 (and possibly earlier versions) don't
6534
support creating FBOs with a stencil buffer but without a depth
6535
buffer. This reworks framebuffer allocation so that we try a number
6536
of fallback options before failing.
6538
The options we try in order are:
6539
- the same options that were sucessful last time if available
6540
- combined depth and stencil
6541
- separate depth and stencil
6542
- just stencil, no depth
6543
- just depth, no stencil
6544
- neither depth or stencil
6546
clutter/cogl/cogl/cogl-framebuffer-private.h | 2 +-
6547
clutter/cogl/cogl/cogl-framebuffer.c | 238 +++++++++++++++++---------
6548
2 files changed, 156 insertions(+), 84 deletions(-)
6550
commit 4c1231c7fe545a7764d06754d7d6be0906686e0a
6551
Author: Damien Lespiau <damien.lespiau@intel.com>
6552
Date: Wed Jan 6 11:48:46 2010 +0000
6554
media: Add an API to specify which font should be used for subtitles
6556
Allow the user of the ClutterMedia interface to specify a Pango font
6557
description to display subtitles. Even if the underlying implementation
6558
of the interface does not natively use Pange, it must be capable of
6559
parsing the grammar that pango_font_description_from_string() accepts.
6561
clutter/clutter-media.c | 64 ++++++++++++++++++++++++++++
6562
clutter/clutter-media.h | 45 ++++++++++---------
6563
doc/reference/clutter/clutter-sections.txt | 2 +
6564
3 files changed, 90 insertions(+), 21 deletions(-)
6566
commit 8e9f56c41160452166be68202227b206a690472d
6567
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6568
Date: Sun Jan 10 11:35:26 2010 +0000
6570
build: Clean up private header/source files
6572
Some source files should not be passed through the introspection parser,
6573
as they are fully private and do not expose any valuable API.
6575
Also the clutter-profile.h header is private and should not be
6578
clutter/Makefile.am | 12 ++++++++----
6579
1 files changed, 8 insertions(+), 4 deletions(-)
6581
commit d9b91d61f5730e9ce29627f467c89070b78fb6b6
6582
Author: Robert Bragg <robert@linux.intel.com>
6583
Date: Wed Nov 25 14:26:32 2009 +0000
6585
framebuffers: cogl_offscreen_new_to_texture should take a ref on the texture
6587
We weren't taking a reference on the texture to be used as the color buffer
6588
for offscreen rendering, so it was possible to free the texture leaving the
6589
framebuffer in an inconsistent state.
6591
clutter/cogl/cogl/cogl-framebuffer-private.h | 1 +
6592
clutter/cogl/cogl/cogl-framebuffer.c | 3 +++
6593
2 files changed, 4 insertions(+), 0 deletions(-)
6595
commit 30b557c4653d15eeb1311b516ab1f4c0035a5e83
6596
Author: Robert Bragg <robert@linux.intel.com>
6597
Date: Fri Jul 3 16:22:35 2009 +0100
6599
profiling: Adds initial UProf accounting to Cogl
6601
This adds gives Cogl a dedicated UProf context which will be linked together
6602
with Clutter's context during clutter_init_real().
6604
Initial timers cover _cogl_journal_flush and _cogl_journal_log_quad
6606
You can explicitly ask for a report of Cogl statistics by exporting
6607
COGL_PROFILE_OUTPUT_REPORT=1 but since the context is linked with Clutter's
6608
the statisitcs will also be shown in the automatic Clutter reports.
6610
clutter/clutter-main.c | 7 +++++
6611
clutter/cogl/cogl/Makefile.am | 2 +
6612
clutter/cogl/cogl/cogl-journal.c | 19 +++++++++++++
6613
clutter/cogl/cogl/cogl-profile.c | 30 +++++++++++++++++++++
6614
clutter/cogl/cogl/cogl-profile.h | 54 ++++++++++++++++++++++++++++++++++++++
6616
6 files changed, 113 insertions(+), 1 deletions(-)
6618
commit 0b6515a1d53571fea13417d47e7bf0f4749321f8
6619
Author: Robert Bragg <robert@linux.intel.com>
6620
Date: Fri Apr 17 12:15:56 2009 +0100
6622
profiling: Allow limiting statisics just to picking
6624
This suspends and resumes all uprof timers and counters except while dealing
6625
with picking, so as to give more focused statistics.
6627
Be aware that there are still some issues with this profile option since
6628
there are a few special case counters and timers that shouldn't be
6629
suspended; noteably the frame counters are incorrect so the per frame stats
6632
clutter/clutter-main.c | 22 ++++++++++++++++++++--
6633
clutter/clutter-profile.c | 29 +++++++++++++++++++++++++++++
6634
clutter/clutter-profile.h | 9 +++++++++
6635
3 files changed, 58 insertions(+), 2 deletions(-)
6637
commit 9cb530d42e7860d1a44f441b97910fd3903480f1
6638
Author: Robert Bragg <robert@linux.intel.com>
6639
Date: Wed Jan 6 18:15:13 2010 +0000
6641
profiling: Parse --clutter-profile and CLUTTER_PROFILE= options
6643
As we have for debugging, this adds the ability to control profiling flags
6644
either via the command line or an environment variable.
6646
The first option added is CLUTTER_PROFILE=disable-report
6648
This also changes the reporting to be opt-out so you don't need to export
6649
CLUTTER_PROFILE_OUTPUT_REPORT=1 to see a report but you can use
6650
CLUTTER_PROFILE=disable-report to disable it if desired.
6652
clutter/clutter-main.c | 51 +++++++++++++++++++++++++++++++++++++++++++++
6653
clutter/clutter-profile.c | 2 +-
6654
clutter/clutter-profile.h | 8 +++++++
6655
3 files changed, 60 insertions(+), 1 deletions(-)
6657
commit 00577558540db2c9f7bf24e870ff6231abb2b99d
6658
Author: Robert Bragg <robert@linux.intel.com>
6659
Date: Mon Mar 30 16:41:02 2009 +0100
6661
profiling: Adds initial UProf support across clutter
6663
UProf is a small library that aims to help applications/libraries provide
6664
domain specific reports about performance. It currently provides high
6665
precision timer primitives (rdtsc on x86) and simple counters, the ability
6666
to link statistics between optional components at runtime and makes report
6669
This adds initial accounting for:
6670
- Total mainloop time
6676
The timing done by uprof is of wall clock time. It's not based on stochastic
6677
samples we simply sample a counter at the start and end. When dealing with
6678
the complexities of GPU drivers and with various kinds of IO this form of
6679
profiling can be quite enlightening as it will be able to represent where
6680
your application is blocking unlike tools such as sysprof.
6682
To enable uprof accounting you must configure Clutter with --enable-profile
6683
and have uprof-0.2 installed from git://git.moblin.org/uprof
6685
If you want to see a report of statistics when Clutter applications exit you
6686
should export CLUTTER_PROFILE_OUTPUT_REPORT=1 before running them.
6688
Just a final word of caution; this stuff is new and the manual nature of
6689
adding uprof instrumentation means it is prone to some errors when modifying
6690
code. This just means that when you question strange results don't rule out
6691
a mistake in the instrumentation. Obviously though we hope the benfits out
6692
weigh e.g. by focusing on very key stats and by having automatic reporting.
6694
clutter/Makefile.am | 2 +
6695
clutter/clutter-actor.c | 14 +++
6696
clutter/clutter-backend.c | 15 +++
6697
clutter/clutter-main.c | 94 ++++++++++++++++++++-
6698
clutter/clutter-profile.c | 170 +++++++++++++++++++++++++++++++++++++
6699
clutter/clutter-profile.h | 57 ++++++++++++
6700
clutter/clutter-stage.c | 9 ++
6701
clutter/glx/clutter-backend-glx.c | 17 ++++
6702
8 files changed, 376 insertions(+), 2 deletions(-)
6704
commit bd41db7c00fc54aa8077f53177ff33bd33a19c83
6705
Author: Robert Bragg <robert@linux.intel.com>
6706
Date: Tue Mar 17 13:07:46 2009 +0000
6708
Adds a --enable-profile option to configure.ac
6710
There is nothing else hooked up to this option so far
6713
configure.ac | 58 +++++++++++++++++++++++++++++++++++++++++++++-------------
6714
2 files changed, 49 insertions(+), 13 deletions(-)
6716
commit 5157da9fc8340cebdd29989a4ea02ccf607d3c52
6717
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6718
Date: Fri Jan 8 15:04:56 2010 +0000
6720
x11: Switch back to RGB visuals by default
6722
Since asking for ARGB by default is still somewhat experimental on X11
6723
and not every toolkit or complex widgets (like WebKit) still do not like
6724
dealing with ARGB visuals, we should switch back to RGB by default - now
6725
that at least we know it works.
6727
For applications (and toolkit integration libraries) that want to enable
6728
the ClutterStage:use-alpha property there is a new function:
6730
void clutter_x11_set_use_argb_visual (gboolean use_argb);
6732
which needs to be called before clutter_init().
6734
The CLUTTER_DISABLE_ARGB_VISUAL environment variable can still be used
6735
to force this value off at run-time.
6737
clutter/glx/clutter-backend-glx.c | 2 +-
6738
clutter/x11/clutter-backend-x11.c | 70 +++++++++++++++++++++++++++-
6739
clutter/x11/clutter-stage-x11.c | 6 ++-
6740
clutter/x11/clutter-x11.h | 9 +++-
6741
doc/reference/clutter/clutter-sections.txt | 3 +
6742
5 files changed, 83 insertions(+), 7 deletions(-)
6744
commit 9599adbd820db7526d77790d8b611a6b61cb2dc7
6745
Author: Damien Lespiau <damien.lespiau@intel.com>
6746
Date: Wed Jan 6 00:44:24 2010 +0000
6748
doc: Fix media::{get,set}_subtitle_uri() symbol names
6750
At first, those symbols were called {get,set}_subtitles_uri() but were
6751
renamed to {get,set}_subtitle_uri() without updating the
6752
clutter-section.txt file.
6754
This fix makes gtk-doc document those symbols again.
6756
doc/reference/clutter/clutter-sections.txt | 4 ++--
6757
1 files changed, 2 insertions(+), 2 deletions(-)
6759
commit bf4818bd759f612a9cec62c2e072544d54cc104c
6760
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6761
Date: Thu Jan 7 11:08:52 2010 +0000
6763
actor: Just emit a relayout cycle warning
6765
Currently, ClutterActor detects a relayout cycle (an actor causing a
6766
relayout to be queued from within an allocate() function) and aborts
6767
after printing out a warning. This might be a little bit too anal
6768
retentive, and it currently breaks GTK+ embedding inside clutter-gtk
6769
so we should probably relax the behaviour a bit. Now we just emit the
6770
warning but we still go ahead with the relayout.
6772
clutter/clutter-actor.c | 1 -
6773
1 files changed, 0 insertions(+), 1 deletions(-)
6775
commit 821e622de671ad4e18a55e9dbd33aee004e822df
6776
Author: Neil Roberts <neil@linux.intel.com>
6777
Date: Thu Jan 7 15:58:53 2010 +0000
6779
Don't set the GLX_TRANSPARENT_TYPE attribute to choose an FBConfig
6781
When Clutter tries to pick an ARGB visual it tried to set the
6782
GLX_TRANSPARENT_TYPE attribute of the FBConfig to
6783
GLX_TRANSPARENT_RGB. However the code to do this was broken so that it
6784
was actually trying to set the non-existant attribute number 0x8008
6785
instead. Mesa silently ignored this so it appeared as if it was
6786
working but the Nvidia drivers do not like it.
6788
It appears that the TRANSPARENT_TYPE attribute is not neccessary for
6789
getting an ARGB visual anyway and instead it is intended to support
6790
color-key transparency. Therefore we can just remove it and get all of
6791
the FBConfigs. Then if we need an ARGB visual we can just walk the
6792
list to look for one with depth == 32.
6794
The fbconfig is now stored in a single variable instead of having a
6795
separate variable for the rgb and rgba configs because the old code
6796
only ever retrieved one of them anyway.
6798
clutter/glx/clutter-backend-glx.c | 145 ++++++++++++++-----------------------
6799
clutter/glx/clutter-backend-glx.h | 5 +-
6800
2 files changed, 57 insertions(+), 93 deletions(-)
6802
commit 8b59573190907da97c2af5a5be2e563fc66f8d51
6803
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6804
Date: Tue Jan 5 18:02:29 2010 +0000
6806
Covert stb_image.c to Unix format
6808
The file is still in DOS format (CRLF instead of LF) and this confuses
6809
the hell out of some versions of Git.
6811
clutter/cogl/cogl/stb_image.c | 7544 ++++++++++++++++++++--------------------
6812
1 files changed, 3772 insertions(+), 3772 deletions(-)
6814
commit 58b5a46e0e6b263bd32808e4a9a46bbdd81eedfe
6815
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6816
Date: Tue Jan 5 17:54:45 2010 +0000
6818
Include cogl-defines.h before using GL types
6820
If we are using GL* types we should also be including cogl-defines.h, as
6821
that will include the right GL header.
6823
clutter/cogl/cogl/cogl-shader.h | 1 +
6824
clutter/cogl/cogl/cogl-texture.h | 1 +
6825
2 files changed, 2 insertions(+), 0 deletions(-)
6827
commit 793fec8138b478ba1f1ea419f9ef8bed4f453e77
6828
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6829
Date: Tue Jan 5 16:11:45 2010 +0000
6831
cogl: Fix array annotations
6833
The arrays in the cogl_program_set_uniform_* API should be marked as
6834
such, and have their length arguments specified.
6836
clutter/cogl/cogl/cogl-shader.h | 16 ++++++++--------
6837
1 files changed, 8 insertions(+), 8 deletions(-)
6839
commit 59105341bce12b2ec009ff953facbb7f7b10e85f
6840
Author: Neil Roberts <neil@linux.intel.com>
6841
Date: Tue Jan 5 11:58:12 2010 +0000
6843
text: Store the markup attributes separately
6845
Previously when the markup property is set it would generate an
6846
attribute list from the markup and then merge it with the attributes
6847
from the attribute property and store it as the effective
6848
attributes. The markup attributes and the marked up text would then be
6849
forgotten. This breaks if the application then later changes the
6850
attributes property because it would try to regenerate the effective
6851
attributes from the markup text but the stored text no longer contains
6852
any markup. If the original markup text happened to contain entities
6853
like '<' they would end up causing parse errors because they would
6854
be converted to the actual symbols.
6856
To fix this the attributes from the markup are now stored
6857
independently from the effective attributes. The effective attributes
6858
are now regenerated if either set of attributes changes right before a
6861
http://bugzilla.openedhand.com/show_bug.cgi?id=1940
6863
clutter/clutter-text.c | 134 +++++++++++++++++++++++++++++-------------------
6864
1 files changed, 82 insertions(+), 52 deletions(-)
6866
commit 32b456fc8c4e8743c1b2c32164f7e9f67188a60e
6867
Author: Neil Roberts <neil@linux.intel.com>
6868
Date: Tue Jan 5 11:44:17 2010 +0000
6870
text: Free the Pango attribute list resources
6872
The ClutterText owns three PangoAttrList resources which were not
6873
being unref'd. This adds the unref calls to the finalize method.
6875
clutter/clutter-text.c | 7 +++++++
6876
1 files changed, 7 insertions(+), 0 deletions(-)
6878
commit 64c1294cc26e034fbf8a9a05b4413f63b9cd882d
6879
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6880
Date: Tue Jan 5 14:10:19 2010 +0000
6882
x11 tfp: Plug a leak
6884
Destroy the dummy XImage we create even on success.
6886
http://bugzilla.openedhand.com/show_bug.cgi?id=1918
6888
Based on a patch by: Carlos Martín Nieto <carlos@cmartin.tk>
6890
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
6892
clutter/x11/clutter-x11-texture-pixmap.c | 22 +++++++++++++---------
6893
1 files changed, 13 insertions(+), 9 deletions(-)
6895
commit fa298b45b530c6b6821e73b011c3c7d226950ce0
6896
Merge: 4207524 4adc2c2
6897
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6898
Date: Tue Jan 5 11:04:50 2010 +0000
6900
Merge branch 'matrix-mode'
6903
build: Move CoglMatrixMode to cogl-matrix-stack.h
6905
commit 4207524e950efd3f1fa5334f6d0b9b374a0b3f93
6906
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6907
Date: Tue Jan 5 11:02:39 2010 +0000
6909
Remove trailing comma from test UI definition
6911
The animation definition test has a trailing comma at the end of an
6914
tests/data/test-script-animation.json | 2 +-
6915
1 files changed, 1 insertions(+), 1 deletions(-)
6917
commit 2aa9d7bdc78703fc9a6354d2e54f880fde96db39
6918
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6919
Date: Tue Jan 5 10:55:28 2010 +0000
6921
script: Copy the JSON node in PropertyInfo
6923
PropertyInfo should store a copy of the JsonNodes it references, so
6924
that property_info_free() can safely dispose them, and we can reference
6925
values across different UI definition data.
6927
The implicit timeline parsing code is not copying the JsonNode; this
6928
leads to a double free in some cases, which is masked by the GSlice
6929
allocator and produces a heap corruption later on.
6931
clutter/clutter-script-parser.c | 2 +-
6932
1 files changed, 1 insertions(+), 1 deletions(-)
6934
commit 10963d1ae03920e202ccbd0107854f489117f89b
6935
Author: Damien Lespiau <damien.lespiau@intel.com>
6936
Date: Mon Dec 28 17:52:43 2009 +0100
6938
[media] Add an API to play a subtitle file along with the media
6940
Allow the user of the ClutterMedia interface to specify an external (as
6941
in not multiplexed with the audio/video streams) location of a subtitle
6944
clutter/clutter-media.c | 55 ++++++++++++++++++++++++++++
6945
clutter/clutter-media.h | 3 ++
6946
doc/reference/clutter/clutter-sections.txt | 2 +
6947
3 files changed, 60 insertions(+), 0 deletions(-)
6949
commit 5d5c7142f7fa2447e13bcb80a272b0d9dfc28f06
6950
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6951
Date: Mon Jan 4 12:03:47 2010 +0000
6953
text: Use G_SIGNAL_ACTION for ::insert-text and ::delete-text
6955
Both the ::insert-text and ::delete-text are "action" signals, that is
6956
signals that are safe to (and should) be emitted using g_signal_emit()
6959
clutter/clutter-text.c | 4 ++--
6960
1 files changed, 2 insertions(+), 2 deletions(-)
6962
commit bf43cb6cdc84e646add7adc592487274331d4930
6963
Author: Alejandro Piñeiro <apinheiro@igalia.com>
6964
Date: Fri Nov 20 15:17:41 2009 +0100
6966
Added ClutterText::insert-text and ClutterText::delete-text signals
6968
* clutter/clutter-marshal.list: added new marshaller
6969
* clutter/clutter-text.c
6970
(clutter_text_class_init): added insert-text and delete-text signals
6971
(clutter_text_insert_unichar): emits insert-text signal
6972
(clutter_text_insert_text): emits insert-text signal
6973
(clutter_text_delete_text): emits delete-text signal
6974
(clutter_text_delete_chars): emits delete-text signal
6975
(clutter_text_set_markup_internal): emits delete-text and insert-text signals
6976
(clutter_text_set_text): emits delete-text and insert-text signals
6978
http://bugzilla.openedhand.com/show_bug.cgi?id=1894
6980
clutter/clutter-marshal.list | 1 +
6981
clutter/clutter-text.c | 87 ++++++++++++++++++++++++++++++++++++++++--
6982
2 files changed, 84 insertions(+), 4 deletions(-)
6984
commit 4adc2c2d839c42eccc7187735ddcce061d25f14b
6985
Author: Emmanuele Bassi <ebassi@linux.intel.com>
6986
Date: Mon Jan 4 11:58:32 2010 +0000
6988
build: Move CoglMatrixMode to cogl-matrix-stack.h
6990
This avoids a redeclaration of _cogl_matrix_stack_flush_to_gl() from
6991
using GLenum to CoglMatrixMode.
6993
http://bugzilla.openedhand.com/show_bug.cgi?id=1928
6995
clutter/cogl/cogl/cogl-internal.h | 7 -------
6996
clutter/cogl/cogl/cogl-matrix-stack.h | 9 +++++++--
6997
2 files changed, 7 insertions(+), 9 deletions(-)
6999
commit eb9029504124daf4c032f027c2f068ec25548f3f
7000
Author: Halton Huo <halton.huo@sun.com>
7001
Date: Mon Jan 4 11:49:50 2010 +0000
7003
cogl-texture: Remove return in void functions
7005
http://bugzilla.o-hand.com/show_bug.cgi?id=1929
7007
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
7009
clutter/cogl/cogl/cogl-texture.c | 8 +++-----
7010
1 files changed, 3 insertions(+), 5 deletions(-)
7012
commit b98d486fc99fd46626877be728961190dbf831dc
7013
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7014
Date: Mon Jan 4 11:49:13 2010 +0000
7016
build: Maintainer cflags go in the _CFLAGS target
7018
The maintainer compiler flags are not pre-processor flags.
7020
clutter/cogl/cogl/Makefile.am | 3 +--
7021
1 files changed, 1 insertions(+), 2 deletions(-)
7023
commit 0fb51658fdba886fd5d9cb53cfca6df13aa1f7a0
7024
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7025
Date: Mon Jan 4 11:43:00 2010 +0000
7027
cogl: Const-ify vertices in cogl_polygon()
7029
The CoglTextureVertex array passed to cogl_polygon() is a pure
7030
in-argument and should be const-ified.
7032
http://bugzilla.openedhand.com/show_bug.cgi?id=1917
7034
clutter/cogl/cogl/cogl-primitives.c | 27 ++++++++++++++-------------
7035
clutter/cogl/cogl/cogl-texture.h | 6 +++---
7036
2 files changed, 17 insertions(+), 16 deletions(-)
7038
commit 1c69c61745ed510f0b6ab16cb963ca01994cb9fc
7039
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7040
Date: Wed Nov 11 11:00:29 2009 +0000
7042
master-clock: Take a reference before advancing timelines
7044
A timeline advancement might cause another timeline to be
7045
destroyed, which will likely lead to a segmentation fault.
7047
Before advancing the timelines we should take a reference
7048
on them - just like we do for the stages before doing
7049
event processing. This will prevent dispose() from running
7050
until the end of the advancement.
7052
http://bugzilla.openedhand.com/show_bug.cgi?id=1854
7054
clutter/clutter-master-clock.c | 7 +++++++
7055
1 files changed, 7 insertions(+), 0 deletions(-)
7057
commit 5ae88f5777c5ed0663937f990350f145b254692c
7058
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7059
Date: Sun Jan 3 20:41:17 2010 +0000
7061
Post-release version bump to 1.1.5
7064
1 files changed, 1 insertions(+), 1 deletions(-)
7066
commit 6d7e1e5434d3da27cf23a9c16f9990523eedba4e
7067
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7068
Date: Sun Jan 3 20:11:43 2010 +0000
7070
Release Clutter 1.1.4
7072
NEWS | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
7073
configure.ac | 4 ++--
7074
2 files changed, 58 insertions(+), 2 deletions(-)
7076
commit 3355c2ab2518711d7ab79f3ffe1f4a8ce105af84
7077
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7078
Date: Sun Jan 3 20:24:39 2010 +0000
7080
build: Remove dist rule for non-existing image files
7082
doc/cookbook/Makefile.am | 2 +-
7083
1 files changed, 1 insertions(+), 1 deletions(-)
7085
commit 8d40cb947031f90a7b8cf459720278c6a6fe295d
7086
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7087
Date: Sun Jan 3 20:12:49 2010 +0000
7089
Disable g_set_prgname()
7091
Apparently, calling g_set_prgname() multiple times is not allowed
7092
anymore, and hence clutter_init_* calls should not do that. Though this
7093
is really GLib's fault - and a massive nuisance for us - we should
7094
prolly comply to avoid the test suite dying on us.
7096
clutter/clutter-main.c | 4 ++++
7097
1 files changed, 4 insertions(+), 0 deletions(-)
7099
commit 3d350078a8aa6f1bdf38c12de62e2708c5369247
7100
Merge: a09ac0b 934eee1
7101
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7102
Date: Wed Dec 23 10:38:02 2009 +0000
7104
Merge branch 'animate-layout-manager' into ebassi-next
7106
* animate-layout-manager:
7107
layout-manager: Document the animation support
7108
layout-manager: Rewind the timeline in begin_animation()
7109
box-layout: Remove the allocations hash table
7110
docs: Clean up the README file
7111
layout: Let begin_animation() return the Alpha
7112
box-layout: Add knobs for controlling animations
7113
box-layout: Animate layout properties
7114
layout: Add animation support to LayoutManager
7115
Add ActorBox animation methods
7117
commit 934eee17ae34098773ff5876747061b5a1d1f1a5
7118
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7119
Date: Wed Dec 23 10:35:16 2009 +0000
7121
layout-manager: Document the animation support
7123
Add a section inside the LayoutManager class API reference documenting,
7124
with examples, how to implement animation support inside a layout
7127
clutter/clutter-layout-manager.c | 213 +++++++++++++++++++++++++++++++++----
7128
1 files changed, 190 insertions(+), 23 deletions(-)
7130
commit 713c2952410e99e681825dac51da3e0b575ef2cf
7131
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7132
Date: Wed Dec 23 08:39:16 2009 +0000
7134
layout-manager: Rewind the timeline in begin_animation()
7136
If the default implementation begin_animation() is called twice then we
7137
should rewind the timeline, as well as updating its duration and the
7138
easing mode of the alpha.
7140
clutter/clutter-layout-manager.c | 8 ++++++--
7141
1 files changed, 6 insertions(+), 2 deletions(-)
7143
commit b9c1de0ec7001ce6a6b62dbd8d1fd9ee15539093
7144
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7145
Date: Wed Dec 23 08:34:08 2009 +0000
7147
box-layout: Remove the allocations hash table
7149
The BoxLayout uses a HashTable to map the latest stable allocation of
7150
each child, in order to use that as the initial value during an
7151
animation; this in spite of already having a perfectly valid per-child
7152
storage as part of the layout manager: ClutterBoxChild.
7154
The last stable allocation should be stored inside the ClutterBoxChild
7155
instead of having it in the private data for ClutterBoxLayout. The
7156
access remains O(1), since there is a 1:1 mapping between child and
7157
BoxChild instances, but we save a little bit of memory and we avoid
7158
keeping aroud allocations for old children.
7160
clutter/clutter-box-layout.c | 47 ++++++++++++++++++-----------------------
7161
1 files changed, 21 insertions(+), 26 deletions(-)
7163
commit c8c5e0ee39626d434c2d3e5486c6520eff17f519
7164
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7165
Date: Tue Dec 22 18:10:39 2009 +0000
7167
docs: Clean up the README file
7169
README | 137 ++++++++++++++++++++++++++++++++++++++-------------------------
7170
1 files changed, 83 insertions(+), 54 deletions(-)
7172
commit a09ac0b27ccb4a9c08a4e42e00776bf627f0e163
7173
Merge: b6bd8be 3491337
7174
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7175
Date: Sun Dec 20 17:39:12 2009 +0000
7177
Merge branch 'stage-use-alpha' into ebassi-next
7180
tests: Use accessor methods for :use-alpha
7181
stage: Add accessors for :use-alpha
7182
tests: Allow setting the stage opacity in test-paint-wrapper
7183
stage: Premultiply the stage color
7184
stage: Composite the opacity with the alpha channel
7185
glx: Always request an ARGB visual
7186
stage: Add :use-alpha property
7187
materials: Get the right blend function for alpha
7189
commit b6bd8be6cb0fabf2ddf3eedadce68c8d3a60c3d9
7190
Merge: 7b53aa7 c7e8ddb
7191
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7192
Date: Sun Dec 20 17:33:51 2009 +0000
7194
Merge branch 'internal-flag' into ebassi-next
7197
conform: Add test unit for the destruction of Containers
7198
actor: Add internal child flag
7199
Clean up whitespace, indentation and comments
7201
commit c7e8ddb7a60dd76d5f62027383693575f30e2473
7202
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7203
Date: Fri Dec 18 23:29:11 2009 +0000
7205
conform: Add test unit for the destruction of Containers
7207
Verify that internal children do not go through the remove()
7208
implementation, and that non-internal children do.
7211
tests/conform/Makefile.am | 1 +
7212
tests/conform/test-actor-destroy.c | 168 ++++++++++++++++++++++++++++++++++++
7213
tests/conform/test-conform-main.c | 1 +
7214
4 files changed, 171 insertions(+), 0 deletions(-)
7216
commit 1520ba6190165dc8902b622833efbccf23716751
7217
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7218
Date: Fri Dec 18 23:20:04 2009 +0000
7220
actor: Add internal child flag
7222
ClutterActor checks, when destroying and reparenting, if the parent
7223
actor implements the Container interface, and automatically calls the
7224
remove() method to perform a clean removal.
7226
Actors implementing Container, though, might have internal children;
7227
that is, children that are not added through the Container API. It is
7228
already possible to iterate through them using the Container API to
7229
avoid breaking invariants - but calling clutter_actor_destroy() on
7230
these children (even from the Container implementation, and thus outside
7231
of Clutter's control) will either lead to leaks or to segmentation
7234
Clutter needs a way to distinguish a clutter_actor_set_parent() done on
7235
an internal child from one done on a "public" child; for this reason, a
7236
push/pop pair of functions should be available to Actor implementations
7237
to mark the section where they wish to add internal children:
7239
➔ clutter_actor_push_internal ();
7241
clutter_actor_set_parent (child1, parent);
7242
clutter_actor_set_parent (child2, parent);
7244
➔ clutter_actor_pop_internal ();
7246
The set_parent() call will automatically set the newly added
7247
INTERNAL_CHILD private flag on each child, and both
7248
clutter_actor_destroy() and clutter_actor_unparent() will check for the
7249
flag before deciding whether to call the Container's remove method.
7251
clutter/clutter-actor.c | 110 ++++++++++++++++++++++++++-
7252
clutter/clutter-actor.h | 3 +
7253
clutter/clutter-private.h | 29 ++++++--
7254
doc/reference/clutter/clutter-sections.txt | 2 +
7255
4 files changed, 132 insertions(+), 12 deletions(-)
7257
commit 4a21425f4837798d01f4435b68582faf9029c61c
7258
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7259
Date: Sun Dec 13 01:23:54 2009 +0000
7261
layout: Let begin_animation() return the Alpha
7263
When beginning a new animation for a LayoutManager, the implementation
7264
should return the ClutterAlpha used. This allows controlling the
7265
timeline and/or modifying the animation parameters on the fly.
7267
clutter/clutter-box-layout.c | 5 +++--
7268
clutter/clutter-layout-manager.c | 30 ++++++++++++++++++++++--------
7269
clutter/clutter-layout-manager.h | 5 +++--
7270
3 files changed, 28 insertions(+), 12 deletions(-)
7272
commit 2e6397c39132007e79f5f87743fe9378fd8d5387
7273
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7274
Date: Sun Dec 13 01:07:44 2009 +0000
7276
box-layout: Add knobs for controlling animations
7278
ClutterLayoutManager does not have any state associated with it, and
7279
defers all the state to its sub-classes.
7281
The BoxLayout is thus in charge of controlling:
7283
• whether or not animations should be used
7284
• the duration of the animation
7285
• the easing mode of the animation
7287
By adding three new properties:
7289
• ClutterBoxLayout:use-animations
7290
• ClutterBoxLayout:easing-duration
7291
• ClutterBoxLayout:easing-mode
7293
And their relative accessors pairs we can make BoxLayout decide whether
7294
or not, and with which parameters, call the begin_animation() method of
7295
ClutterLayoutManager.
7297
The test-box-layout has been modified to reflect this new functionality,
7298
by checking the key-press event for the 'a' key symbol to toggle the use
7301
clutter/clutter-box-layout.c | 320 ++++++++++++++++++++++++++--
7302
clutter/clutter-box-layout.h | 90 +++++----
7303
doc/reference/clutter/clutter-sections.txt | 8 +
7304
tests/interactive/test-box-layout.c | 6 +
7305
4 files changed, 370 insertions(+), 54 deletions(-)
7307
commit 3c2e91aef586de5521aa9674b80d449cf96da0e1
7308
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7309
Date: Sat Dec 12 00:13:05 2009 +0000
7311
box-layout: Animate layout properties
7313
Use the newly added animation support inside LayoutManager to animate
7314
between state changes of the BoxLayout properties.
7316
The implementation is based on equivalent code from Mx, written by:
7318
Thomas Wood <thomas.wood@intel.com>
7320
clutter/clutter-box-layout.c | 130 ++++++++++++++++++++++++++++++++++++------
7321
1 files changed, 113 insertions(+), 17 deletions(-)
7323
commit f94a903d9ebdbc055010bb4a4c6fe7e76f418bd8
7324
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7325
Date: Sat Dec 12 00:02:43 2009 +0000
7327
layout: Add animation support to LayoutManager
7329
In order to animate a fluid layout we cannot use the common animation
7330
code paths as they will override the size request and allocation paths
7331
that are handled by the layout manager itself.
7333
One way to introduce animations in the allocation sequence is to use a
7334
Timeline and an Alpha to compute a progress value and then use that
7335
value to interpolate an ActorBox between the initial and final states of
7336
the animation - with the initial state being the last allocation of the
7337
child prior to the animation start, and the final state the allocation
7338
of the child at the end; for every frame of the Timeline we then queue a
7339
relayout on the layout manager's container, which will result in an
7342
ClutterLayoutManager is the most likely place to add a generic API for
7343
beginning and ending an animation, as well as the place to provide a
7344
default code path to create the ancillary Timeline and Alpha instances
7345
needed to drive the animation.
7347
A LayoutManager sub-class will need to:
7349
• call clutter_layout_manager_begin_animation() whenever it should
7350
animate between two states, for instance: whenever a layout property
7352
• eventually override begin_animation() and end_animation() in case
7353
further state needs to be set up, and then chain up to the default
7354
implementation provided by LayoutManager;
7355
• if a completely different implementation is required, the layout
7356
manager sub-class should override begin_animation(), end_animation()
7357
and get_animation_progress().
7359
Inside the allocate() implementation the sub-class should also
7360
interpolate between the last known allocation of a child and the newly
7361
computed allocation.
7363
clutter/clutter-layout-manager.c | 159 +++++++++++++++++++++++++++-
7364
clutter/clutter-layout-manager.h | 68 ++++++++----
7365
doc/reference/clutter/clutter-sections.txt | 5 +
7366
3 files changed, 207 insertions(+), 25 deletions(-)
7368
commit 999359d64ccfbdbcc952662c14fa47441d6a5225
7369
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7370
Date: Fri Dec 11 23:48:58 2009 +0000
7372
Add ActorBox animation methods
7374
ClutterActorBox should have an interpolate() method that allows to
7375
compute the intermediate values between two states, given a progress
7378
clutter_actor_box_interpolate (start, end, alpha, &result);
7380
Another utility method, useful for layout managers, is a modifier
7381
that clamps the members of the actor box to the nearest integer
7384
clutter/clutter-actor.c | 47 ++++++++++++++++++++++++++++
7385
clutter/clutter-types.h | 5 +++
7386
doc/reference/clutter/clutter-sections.txt | 2 +
7387
3 files changed, 54 insertions(+), 0 deletions(-)
7389
commit d2ea7cd6a8a1eb4ff04f11cb53aa387458a8e128
7390
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7391
Date: Fri Dec 11 20:17:58 2009 +0000
7393
Clean up whitespace, indentation and comments
7395
clutter/clutter-main.c | 70 ++++++++++++++++++++++++-----------------------
7396
1 files changed, 36 insertions(+), 34 deletions(-)
7398
commit 7b53aa7510adc60d3287740772ec97117ce78ab9
7399
Merge: 60a6bff 1374b5a
7400
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7401
Date: Thu Dec 10 23:36:04 2009 +0000
7403
Merge branch 'get-current-event' into ebassi-next
7405
* get-current-event:
7406
Add clutter_get_current_event
7408
commit 1374b5aac9398852cf3f3482fdf925b52aa31338
7409
Author: Colin Walters <walters@verbum.org>
7410
Date: Thu Nov 12 17:33:15 2009 -0500
7412
Add clutter_get_current_event
7414
When getting signals from higher level toolkits, occasionally
7415
one wants access to the underlying event; say for a Button
7416
widget's "clicked" signal, to get the keyboard state.
7418
Rather than having all of the highlevel widgets emit
7419
ClutterEvent just for the more unusual use cases,
7420
add a global function to access the event state.
7422
http://bugzilla.openedhand.com/show_bug.cgi?id=1888
7424
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
7426
clutter/clutter-event.c | 23 ++++++++++
7427
clutter/clutter-event.h | 1 +
7428
clutter/clutter-main.c | 62 ++++++++++++++++------------
7429
clutter/clutter-private.h | 1 +
7430
doc/reference/clutter/clutter-sections.txt | 1 +
7431
5 files changed, 61 insertions(+), 27 deletions(-)
7433
commit 60a6bff3136c21c5ff6d4c5bb6614716853620f0
7434
Merge: dc47550 c4f27b1
7435
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7436
Date: Wed Dec 9 23:32:41 2009 +0000
7438
Merge branch 'no-layout-flag' into ebassi-next
7441
actor: Add a NO_LAYOUT flag for actors
7443
commit dc47550bc8eabc2c6e6e99364c1cb536a9adc973
7444
Merge: 86ce92e b33b628
7445
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7446
Date: Wed Dec 9 23:32:18 2009 +0000
7448
Merge branch 'size-cache' into ebassi-next
7451
tests: Clean up the BoxLayout interactive test
7452
actor: Add debugging notes for size cache
7453
Add a cache of size requests
7455
commit 86ce92eec14aa1aaf7c9ab14a520b66690488213
7456
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7457
Date: Wed Dec 9 18:46:25 2009 +0000
7459
x11: Emulate XKB's detectable key auto-repeat
7461
Old-style X11 terminals require that even modern X11 send KeyPress
7462
and KeyRelease pairs when auto-repeating. For this reason modern(-ish)
7463
API like XKB has a way to detect auto-repeat and do a single KeyRelease
7464
at the end of a KeyPress sequence.
7466
The newly added check emulates XKB's detectable auto-repeat by peeking
7467
the next event after a KeyRelease and checking if it's a KeyPress for
7468
the same key and timestamp - and then ignoring the KeyRelease if it
7471
clutter/x11/clutter-event-x11.c | 26 ++++++++++++++++++++++++++
7472
1 files changed, 26 insertions(+), 0 deletions(-)
7474
commit 9242d6b934710ca4001e8dc2a0f1f4bc4a738a63
7475
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7476
Date: Wed Dec 9 18:10:52 2009 +0000
7478
docs: Move RELEASING under docs/
7480
RELEASING | 56 --------------------------------------------------------
7481
doc/RELEASING | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
7482
2 files changed, 56 insertions(+), 56 deletions(-)
7484
commit 1ffd2ccb87a570733647e655e5e608ee05661c74
7485
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7486
Date: Wed Dec 9 01:52:09 2009 +0000
7488
stage: Deprecate default stage size macros
7490
The macros for getting the size of the default stage are a relic of the
7491
past and they should be deprecated.
7493
clutter/clutter-stage.h | 36 ++++++++++++++----------------------
7494
1 files changed, 14 insertions(+), 22 deletions(-)
7496
commit 34913378fb7aa84874bfda63648e9e0e02e40d8c
7497
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7498
Date: Wed Dec 9 17:17:33 2009 +0000
7500
tests: Use accessor methods for :use-alpha
7502
Instead of using g_object_set().
7504
tests/interactive/test-paint-wrapper.c | 6 ++----
7505
1 files changed, 2 insertions(+), 4 deletions(-)
7507
commit 1208e47198ea981b644bca2ce9beab3b59f05d0b
7508
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7509
Date: Wed Dec 9 02:04:56 2009 +0000
7511
stage: Add accessors for :use-alpha
7513
Use real accessors for the :use-alpha property.
7515
clutter/clutter-stage.c | 53 ++++++++++++++++++++++++++-
7516
clutter/clutter-stage.h | 4 ++
7517
doc/reference/clutter/clutter-sections.txt | 2 +
7518
3 files changed, 57 insertions(+), 2 deletions(-)
7520
commit 3b075b6dc4197ed78f6386ee7e9a6e307839590f
7521
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7522
Date: Wed Dec 9 01:46:52 2009 +0000
7524
tests: Allow setting the stage opacity in test-paint-wrapper
7526
This allows testing the Stage:use-alpha property and the blending done
7529
tests/interactive/test-paint-wrapper.c | 15 +++++++++++++++
7530
1 files changed, 15 insertions(+), 0 deletions(-)
7532
commit 3a3c815286daa55761787a49d7a33c6eb8c3d74d
7533
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7534
Date: Wed Dec 9 01:46:09 2009 +0000
7536
stage: Premultiply the stage color
7538
In case we are using Stage:use-alpha then we need to premultiply the
7539
stage color to get the correct blending from the compositor.
7541
clutter/clutter-stage.c | 1 +
7542
1 files changed, 1 insertions(+), 0 deletions(-)
7544
commit e957e277b8a4893ce8c99e94402036d42a8b3748
7545
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7546
Date: Tue Dec 8 18:24:30 2009 +0000
7548
x11: Do not manage a foreign window
7550
If a Stage has been set to use a foreign Window then Clutter should not
7551
be managing it; calling XWithdrawWindow and XMapWindow should be
7552
reserved to the windows we manage ourselves.
7554
clutter/x11/clutter-stage-x11.c | 23 ++++++++++++++---------
7555
1 files changed, 14 insertions(+), 9 deletions(-)
7557
commit 28cb2cdab588ac361544538d4bb70a3e9bf24c81
7558
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7559
Date: Mon Dec 7 19:00:55 2009 +0000
7561
Remove clutter_set_default_text_direction()
7563
Setting the default text direction programmatically is wrong: it is a
7564
value dependent on the locale or by the environment.
7566
clutter/clutter-actor.c | 3 +-
7567
clutter/clutter-main.c | 32 ++++++++++++---------------
7568
clutter/clutter-main.h | 1 -
7569
doc/reference/clutter/clutter-sections.txt | 1 -
7570
4 files changed, 16 insertions(+), 21 deletions(-)
7572
commit 3b9575baf8d254b7ba8b5faf56b14fbc6c3fde74
7573
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7574
Date: Mon Dec 7 18:41:15 2009 +0000
7576
Queue a relayout when the default text direction changes
7578
We need a relayout cycle if the default direction for the text changes
7579
while the main loop is running.
7581
clutter/clutter-main.c | 8 +++++++-
7582
1 files changed, 7 insertions(+), 1 deletions(-)
7584
commit 6a3f6a460e730b0067adfa1eac455246c8d6e8d8
7585
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7586
Date: Mon Dec 7 17:35:17 2009 +0000
7588
stage: Composite the opacity with the alpha channel
7590
The Stage's opacity should be composited with the alpha component of the
7591
Stage's background color.
7593
clutter/clutter-stage.c | 20 +++++++++++---------
7594
1 files changed, 11 insertions(+), 9 deletions(-)
7596
commit c4f27b1556b65464fd1f53749d32db9adab97942
7597
Author: Emmanuele Bassi <ebassi@gnome.org>
7598
Date: Wed Oct 7 16:41:25 2009 +0100
7600
actor: Add a NO_LAYOUT flag for actors
7602
Some actor implementation might avoid imposing any layout on their
7603
children. The Actor base class usually assumes some sort of layout
7604
management is in place, so it will queue relayouts when, for instance,
7605
an actor is shown or is hidden. If the parent of the actor does not
7606
impose any layout, though, showing or hiding one of its children will
7607
not affect the layout of the others.
7609
An example of this kind of container is ClutterGroup.
7611
By adding a new Actor flag, CLUTTER_ACTOR_NO_LAYOUT, and by making
7612
the Group actor set it on itself, the Actor base class can now decide
7613
whether or not to queue a relayout. The flag is not meant to be used
7614
by application code, and should only be set when implementing a new
7617
http://bugzilla.openedhand.com/show_bug.cgi?id=1838
7619
clutter/clutter-actor.c | 37 +++++++++++++++++++++++++++----------
7620
clutter/clutter-actor.h | 15 ++++++++++-----
7621
clutter/clutter-group.c | 6 ++++++
7622
3 files changed, 43 insertions(+), 15 deletions(-)
7624
commit 34b50934be581cde0ef2eba75f45aa36b1add14d
7625
Author: Neil Roberts <neil@linux.intel.com>
7626
Date: Sat Dec 5 14:20:00 2009 +0000
7628
cogl-material: Ensure mipmaps before doing anything else on a texture
7630
When the texture is in the atlas, ensuring the mipmaps can effectively
7631
make it become a completely different texture so we should do this
7632
before getting the GL handle.
7634
clutter/cogl/cogl/cogl-material.c | 19 +++++++++++--------
7635
1 files changed, 11 insertions(+), 8 deletions(-)
7637
commit 231cfffa1871806713928f7b4c599d904a813fb9
7638
Author: Neil Roberts <neil@linux.intel.com>
7639
Date: Sat Dec 5 13:48:03 2009 +0000
7641
cogl-atlas-texture: Remove textures from the atlas when mipmapping is required
7643
Mipmaps don't work very well in the current atlas because there is not
7644
enough padding between the textures. If ensure_mipmaps is called it
7645
will now create a new texture and migrate the atlased texture to
7646
it. It will use the same blit mechanism as when migrating so it will
7647
try to use an FBO for a fast blit. However if this is not possible it
7648
will end up downloading the data for the entire atlas which is not
7651
clutter/cogl/cogl/cogl-atlas-texture.c | 66 +++++++++++++++++++++++++++----
7652
1 files changed, 57 insertions(+), 9 deletions(-)
7654
commit 6cf5ee2cbdad4bb71a065bb7e49a534ca7ba78ac
7655
Author: Neil Roberts <neil@linux.intel.com>
7656
Date: Sat Dec 5 13:24:01 2009 +0000
7658
cogl-atlas-texture: Try to do texture blits using an FBO
7660
When reorganizing the textures, we can avoid downloading the entire
7661
texture data if we bind the source texture in a framebuffer object and
7662
copy the destination using glCopyTexSubImage2D. This is also
7663
implemented using a much faster path in Mesa.
7665
Currently it is calling the GL framebuffer API directly but ideally it
7666
would use the Cogl offscreen API. However there is no way to tell Cogl
7667
not to create a stencil renderbuffer which seems like a waste in this
7670
If FBOs are not available it will fallback to reading back the entire
7671
texture data as before.
7673
clutter/cogl/cogl/cogl-atlas-texture.c | 198 +++++++++++++++++++++++++++-----
7674
1 files changed, 168 insertions(+), 30 deletions(-)
7676
commit c51a31a2fc3f0f087a44cbccf1726c40fa581746
7677
Author: Neil Roberts <neil@linux.intel.com>
7678
Date: Fri Dec 4 19:43:39 2009 +0000
7680
cogl-atlas: Add a debug option to visualize the atlas
7682
This adds a 'dump-atlas-image' debug category. When enabled, CoglAtlas
7683
will use Cairo to create a png which visualizes the leaf rectangles of
7686
clutter/cogl/cogl/cogl-atlas.c | 76 ++++++++++++++++++++++++++++++++++++++++
7687
clutter/cogl/cogl/cogl-debug.c | 3 +-
7688
clutter/cogl/cogl/cogl-debug.h | 3 +-
7689
3 files changed, 80 insertions(+), 2 deletions(-)
7691
commit 032d6e8aa00cd04a8084303a4942760ef5651a0c
7692
Author: Neil Roberts <neil@linux.intel.com>
7693
Date: Fri Dec 4 18:55:53 2009 +0000
7695
cogl-texture-atlas: Add some debugging notes
7697
This adds an 'atlas' category to the COGL_DEBUG environment
7698
variable. When enabled Cogl will display messages when textures are
7699
added to the atlas and when the atlas is reorganized.
7701
clutter/cogl/cogl/cogl-atlas-texture.c | 62 ++++++++++++++++++++++++++++---
7702
clutter/cogl/cogl/cogl-debug.c | 3 +-
7703
clutter/cogl/cogl/cogl-debug.h | 3 +-
7704
3 files changed, 60 insertions(+), 8 deletions(-)
7706
commit bc845e26d9cab75ecba69d12a937cf7d42bcaf71
7707
Author: Neil Roberts <neil@linux.intel.com>
7708
Date: Fri Dec 4 18:24:15 2009 +0000
7710
cogl-atlas-texture: Support reorganizing the atlas when it is full
7712
When space can't be found in the atlas for a new texture it will now
7713
try to reorganize the atlas to make space. A new CoglAtlas is created
7714
and all of the textures are readded in decreasing size order. If the
7715
textures still don't fit then the size of the atlas is doubled until
7716
either we find a space or we reach the texture size limits. If we
7717
successfully find an organization that fits then all of the textures
7718
will be migrated to a new texture. This involves copying the texture
7719
data into CPU memory and then uploading it again. Potentially it could
7720
eventually use a PBO or an FBO to transfer the image without going
7723
The algorithm for laying out the textures works a lot better if the
7724
rectangles are added in order so we might eventually want some API for
7725
creating multiple textures in one go to avoid reorganizing the atlas
7728
clutter/cogl/cogl/cogl-atlas-texture.c | 315 ++++++++++++++++++++++++++++----
7729
1 files changed, 280 insertions(+), 35 deletions(-)
7731
commit 1fb32167ec37f7b3bc8193258faa5963fe49569e
7732
Author: Neil Roberts <neil@linux.intel.com>
7733
Date: Fri Dec 4 13:06:32 2009 +0000
7735
cogl: Add an atlased texture backend
7737
This adds a CoglAtlas type which is a data structure that keeps track
7738
of unused sub rectangles of a larger rectangle. There is a new atlased
7739
texture backend which uses this to put multiple textures into a single
7742
Currently the atlas is always sized 256x256 and the textures are never
7743
moved once they are put in. Eventually it needs to be able to
7744
reorganise the atlas and grow it if necessary. It also needs to
7745
migrate the textures out of the atlas if mipmaps are required.
7747
clutter/cogl/cogl/Makefile.am | 4 +
7748
clutter/cogl/cogl/cogl-atlas-texture-private.h | 64 +++
7749
clutter/cogl/cogl/cogl-atlas-texture.c | 488 ++++++++++++++++++++++
7750
clutter/cogl/cogl/cogl-atlas.c | 520 ++++++++++++++++++++++++
7751
clutter/cogl/cogl/cogl-atlas.h | 76 ++++
7752
clutter/cogl/cogl/cogl-context.c | 14 +
7753
clutter/cogl/cogl/cogl-context.h | 8 +
7754
clutter/cogl/cogl/cogl-texture.c | 30 +-
7755
clutter/cogl/cogl/cogl-types.h | 3 +-
7756
9 files changed, 1194 insertions(+), 13 deletions(-)
7758
commit b33b6287a1d3d3b07bbb845e79dfc4e2162c5c77
7759
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7760
Date: Fri Dec 4 17:39:04 2009 +0000
7762
tests: Clean up the BoxLayout interactive test
7764
tests/interactive/test-box-layout.c | 27 ++++++++++++++++-----------
7765
1 files changed, 16 insertions(+), 11 deletions(-)
7767
commit cf62b8fe4ab0d7cca360077843a9e213540e2c4d
7768
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7769
Date: Fri Dec 4 17:38:26 2009 +0000
7771
actor: Add debugging notes for size cache
7773
Add a note for cache hits, and another one for cache misses.
7775
clutter/clutter-actor.c | 3 +++
7776
1 files changed, 3 insertions(+), 0 deletions(-)
7778
commit 9ccdf2eb02a0d0155e27d5f9270bca6b72c08359
7779
Author: Emmanuele Bassi <ebassi@linux.intel.com>
7780
Date: Fri Dec 4 16:54:22 2009 +0000
7782
box: Add relative packing methods
7784
ClutterBox should provide some convenience functions to pack a new child
7785
at a given position, either an absolute index or relative to a sibling.
7787
clutter/clutter-box.c | 221 +++++++++++++++++++++++-----
7788
clutter/clutter-box.h | 16 ++
7789
doc/reference/clutter/clutter-sections.txt | 3 +
7790
tests/interactive/test-bin-layout.c | 1 -
7791
4 files changed, 203 insertions(+), 38 deletions(-)
7793
commit c9b7efec96636e9368a8dfb76440d1b89c618c99
7794
Author: Johan Bilien <jobi@via.ecp.fr>
7795
Date: Wed Nov 11 20:40:57 2009 -0500
7797
Add a cache of size requests
7799
clutter_actor_get_preferred_width/height currently caches only one size
7800
requests, for a given height / width.
7802
It's common for a layout manager to call get_preferred_width with 2
7803
different heights during the same allocation cycle. Typically once in
7804
the size request, once in the allocation. If
7805
clutter_actor_get_preferred_width is called
7806
alternatively with 2 different for_height, the cache is totally
7807
inefficient, and we end up always querying the actor size even
7808
when the actor does not need a re-allocation.
7810
http://bugzilla.openedhand.com/show_bug.cgi?id=1876
7812
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
7814
clutter/clutter-actor.c | 137 ++++++++++++++++++++++++++++++++++++++++-------
7815
1 files changed, 117 insertions(+), 20 deletions(-)
7817
commit 18860eb16f36eb62b94aee353b4e2ace76e2fffa
7818
Author: Bastian Winkler <buz@netbuz.org>
7819
Date: Thu Dec 3 15:38:05 2009 +0000
7821
flow-layout: Use the natural size
7823
Fix a copy-and-paste thinko where the cell size was computed using the
7824
minimum size instead of the natural size. For actors with a minimum size
7825
of zero, like Textures, this implied always a zero allocation.
7827
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
7829
clutter/clutter-flow-layout.c | 4 ++--
7830
1 files changed, 2 insertions(+), 2 deletions(-)
7832
commit 6c3e1989e47b17f826d25704b2433ffecc6e83b9
7833
Author: Neil Roberts <neil@linux.intel.com>
7834
Date: Thu Dec 3 14:46:20 2009 +0000
7836
cogl-sub-texture: Fix the height of sub textures
7838
The code which is used to get the texture height was accidentally
7839
using the width due to a cut-and-paste fail.
7841
clutter/cogl/cogl/cogl-sub-texture.c | 6 +++---
7842
1 files changed, 3 insertions(+), 3 deletions(-)
7844
commit 97f8eed11917fa0d545dcb08d20841f6b501c878
7845
Author: Neil Roberts <neil@linux.intel.com>
7846
Date: Fri Nov 27 18:45:36 2009 +0000
7848
cogl: Add a CoglTexture2D backend
7850
This is an optimised version of CoglTexture2DSliced that always deals
7851
with a single texture and always uses the GL_TEXTURE_2D
7852
target. cogl_texture_new_from_bitmap now tries to use this backend
7853
first. If it can't create a texture with that size then it falls back
7856
cogl_texture_upload_data_prepare has been split into two functions
7857
because the sliced backend needs to know the real internal format
7858
before the conversion is performed. Otherwise the converted bitmap
7859
will be wasted if the backend can't support the size.
7861
clutter/cogl/cogl/Makefile.am | 2 +
7862
clutter/cogl/cogl/cogl-texture-2d-private.h | 69 +++
7863
clutter/cogl/cogl/cogl-texture-2d.c | 623 +++++++++++++++++++++++++++
7864
clutter/cogl/cogl/cogl-texture-private.h | 9 +
7865
clutter/cogl/cogl/cogl-texture.c | 75 +++-
7866
5 files changed, 755 insertions(+), 23 deletions(-)
7868
commit f3df76d5129ba0ed7014c6aa52be7bee67c3f7aa
7869
Author: Neil Roberts <neil@linux.intel.com>
7870
Date: Mon Nov 30 12:15:05 2009 +0000
7872
cogl: Add _cogl_texture_driver_upload_to_gl
7874
This provides a way to upload the entire data for a texture without
7875
having to first call glTexImage and then glTexSubImage. This should be
7876
faster especially with indirect rendering where it would needlessy
7877
send the data for the texture twice.
7879
clutter/cogl/cogl/cogl-texture-driver.h | 14 ++++++
7880
clutter/cogl/cogl/driver/gl/cogl-texture-driver.c | 26 +++++++++++
7881
.../cogl/cogl/driver/gles/cogl-texture-driver.c | 47 ++++++++++++++++++++
7882
3 files changed, 87 insertions(+), 0 deletions(-)
7884
commit 19a19579ba72ea9ca4f6d406c035c3ad074fd442
7885
Author: Neil Roberts <neil@linux.intel.com>
7886
Date: Fri Nov 27 16:59:51 2009 +0000
7888
cogl: Move some of the texture_2d_sliced_new_* functions into cogl-texture
7890
new_from_data and new_from_file can be implemented in terms of
7891
new_from_bitmap so it makes sense to move these to cogl-texture rather
7892
than having to implement them in every texture backend.
7894
clutter/cogl/cogl/cogl-texture-2d-sliced-private.h | 16 ----
7895
clutter/cogl/cogl/cogl-texture-2d-sliced.c | 84 --------------------
7896
clutter/cogl/cogl/cogl-texture.c | 44 ++++++++---
7897
3 files changed, 33 insertions(+), 111 deletions(-)
7899
commit 27c4eb483d0ce219d80000613357c20fc25724e3
7900
Author: Neil Roberts <neil@linux.intel.com>
7901
Date: Fri Nov 27 16:40:31 2009 +0000
7903
cogl: Add a conformance test for sub textures
7905
This tests creating a sub texture from a larger texture using various
7906
different texture coordinates. It also tries to read back the texture
7907
data using cogl_texture_get_data.
7909
tests/conform/Makefile.am | 1 +
7910
tests/conform/test-cogl-sub-texture.c | 388 +++++++++++++++++++++++++++++++++
7911
tests/conform/test-conform-main.c | 1 +
7912
3 files changed, 390 insertions(+), 0 deletions(-)
7914
commit 9752493272b39e6a8aeb1b8d667667d53de439fb
7915
Author: Neil Roberts <neil@linux.intel.com>
7916
Date: Fri Nov 27 16:39:16 2009 +0000
7918
cogl: Add a sub texture backend
7920
This adds a new texture backend which represents a sub texture of a
7921
larger texture. The texture is created with a reference to the full
7922
texture and a set of coordinates describing the region. The backend
7923
simply defers to the full texture for all operations and maps the
7924
coordinates to the other range. You can also use coordinates outside
7925
the range [0,1] to create a repeated version of the full texture.
7927
A new public API function called cogl_texture_new_from_sub_texture is
7928
available to create the sub texture.
7930
clutter/cogl/cogl/Makefile.am | 2 +
7931
clutter/cogl/cogl/cogl-sub-texture-private.h | 56 ++
7932
clutter/cogl/cogl/cogl-sub-texture.c | 699 ++++++++++++++++++++++++++
7933
clutter/cogl/cogl/cogl-texture.c | 15 +-
7934
clutter/cogl/cogl/cogl-texture.h | 27 +
7935
doc/reference/cogl/cogl-sections.txt | 1 +
7936
6 files changed, 798 insertions(+), 2 deletions(-)
7938
commit 070a91f31176eb304031fc6dc2c374ef25f92a92
7939
Author: Neil Roberts <neil@linux.intel.com>
7940
Date: Wed Dec 2 17:17:24 2009 +0000
7942
cogl: Make the callback for foreach_sub_texture_in_region use const
7944
The CoglTextureSliceCallback function pointer now takes const pointers
7945
for the texture coordinates. This makes it clearer that the callback
7946
should not modify the array and therefore the backend can use the same
7947
array for both sets of coords.
7949
clutter/cogl/cogl/cogl-journal-private.h | 2 +-
7950
clutter/cogl/cogl/cogl-journal.c | 2 +-
7951
clutter/cogl/cogl/cogl-primitives.c | 14 +++++++-------
7952
clutter/cogl/cogl/cogl-texture-private.h | 4 ++--
7953
4 files changed, 11 insertions(+), 11 deletions(-)
7955
commit 1a1de0e278de7c06b528ae74a31580dfd576d041
7956
Author: Neil Roberts <neil@linux.intel.com>
7957
Date: Wed Dec 2 13:41:49 2009 +0000
7959
cogl: Add a texture utility function for manually repeating
7961
Given a region of texture coordinates this utility invokes a callback
7962
enough times to cover the region with a subregion that spans the
7963
texture at most once. Eg, if called with tx1 and tx2 as 0.5 and 3.0 it
7964
it would invoke the callback with:
7966
0.5,1.0 1.0,2.0 2.0,3.0
7968
Manual repeating is needed by all texture backends regardless of
7969
whether they can support hardware repeating because when Cogl calls
7970
the foreach_sub_texture_in_region method then it sets the wrap mode to
7971
GL_CLAMP_TO_EDGE and no hardware repeating is possible.
7973
clutter/cogl/cogl/cogl-texture-private.h | 14 ++++
7974
clutter/cogl/cogl/cogl-texture.c | 102 ++++++++++++++++++++++++++++++
7975
2 files changed, 116 insertions(+), 0 deletions(-)
7977
commit 5fcb29c91695bdbb2aec418ba1d2956ff23612a0
7978
Author: Neil Roberts <neil@linux.intel.com>
7979
Date: Fri Nov 27 15:47:22 2009 +0000
7981
cogl-primitives: Check for repeating after the coordinate transform
7983
In _cogl_multitexture_quad_single_primitive we use a wrap mode of
7984
GL_CLAMP_TO_EDGE if the texture coordinates are all in the range [0,1]
7985
or GL_REPEAT otherwise. This is to avoid pulling in pixels from either
7986
side when using GL_LINEAR filter mode and rendering the entire
7987
texture. Previously it was checking using the unconverted texture
7988
coordinates. This is ok unless the texture backend is radically
7989
transforming the texture coordinates, such as in the sub texture
7990
backend where the coordinates may map to something completely
7991
different. We now check whether the coordinates are in range after
7994
clutter/cogl/cogl/cogl-primitives.c | 87 +++++++++++++++--------------------
7995
1 files changed, 37 insertions(+), 50 deletions(-)
7997
commit 812d4d25bb28d8512c101701cf7cd06dc2dd95eb
7998
Author: Neil Roberts <neil@linux.intel.com>
7999
Date: Thu Nov 26 18:58:17 2009 +0000
8001
cogl: Move all of the fields from CoglTexture to CoglTexture2DSliced
8003
Most of the fields that were previously in CoglTexture are specific to
8004
the implementation of CoglTexture2DSliced so they should be placed
8005
there instead. For example, the 'mipmaps_dirty' flag is an
8006
implementation detail of the ensure_mipmaps function so it doesn't
8007
make sense to force all texture backends to have this function.
8009
Other fields such as width, height, gl_format and format may make
8010
sense for all textures but I've added them as virtual functions
8011
instead. This may make more sense for a sub-texture backend for
8012
example where it can calculate these based on the full texture.
8014
clutter/cogl/cogl/cogl-texture-2d-sliced-private.h | 25 ++-
8015
clutter/cogl/cogl/cogl-texture-2d-sliced.c | 204 +++++++++++---------
8016
clutter/cogl/cogl/cogl-texture-private.h | 21 +--
8017
clutter/cogl/cogl/cogl-texture.c | 19 +--
8018
4 files changed, 149 insertions(+), 120 deletions(-)
8020
commit 071dea2fbc307eca949f5f44c4ccb6c4dd73f789
8021
Author: Neil Roberts <neil@linux.intel.com>
8022
Date: Thu Nov 26 17:32:52 2009 +0000
8024
cogl: Move data only used for upload out of CoglTexture
8026
The CoglTexture struct previously contained some fields which are only
8027
used to upload data such as the CoglBitmap and the source GL
8028
format. These are now moved to a separate CoglTextureUploadData struct
8029
which only exists for the duration of one of the cogl_texture_*_new
8030
functions. In cogl-texture there are utility functions which operate
8031
on this new struct rather than on CoglTexture directly.
8033
Some of the fields that were previously stored in the CoglBitmap
8034
struct are now copied to the CoglTexture such as the width, height,
8035
format and internal GL format.
8037
The rowstride was previously stored in CoglTexture and this was
8038
publicly accessible with the cogl_texture_get_rowstride
8039
function. However this doesn't seem to be a useful function because
8040
there is no need to use the same rowstride again when uploading or
8041
downloading new data. Instead cogl_texture_get_rowstride now just
8042
calculates a suitable rowstride from the format and width of the
8045
clutter/cogl/cogl/cogl-texture-2d-sliced.c | 344 ++++++++++----------
8046
clutter/cogl/cogl/cogl-texture-driver.h | 6 +-
8047
clutter/cogl/cogl/cogl-texture-private.h | 51 ++-
8048
clutter/cogl/cogl/cogl-texture.c | 93 +++---
8049
clutter/cogl/cogl/driver/gl/cogl-texture-driver.c | 14 +-
8050
.../cogl/cogl/driver/gles/cogl-texture-driver.c | 16 +-
8051
6 files changed, 262 insertions(+), 262 deletions(-)
8053
commit 7f58c14dcdbb5a6a24f17aacb784702dbaa468fb
8054
Author: Neil Roberts <neil@linux.intel.com>
8055
Date: Wed Dec 2 21:54:22 2009 +0000
8057
cogl: Use #ifdef GL around GL_TEXTURE_RECTANGLE_ARB
8059
Commit 558b17ee1e added support for rectangle textures to the
8060
framebuffer code. Under GLES there is no GL_TEXTURE_RECTANGLE_ARB
8061
definition so this was breaking the build. The rest of Cogl uses
8062
ifdef's around that constant so we should do the same here.
8064
clutter/cogl/cogl/cogl-framebuffer.c | 7 +++++--
8065
1 files changed, 5 insertions(+), 2 deletions(-)
8067
commit 59d84f7806e16b3d1fea5eed44a5d06d9772be23
8068
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8069
Date: Wed Dec 2 16:03:55 2009 +0000
8071
build: Fix CPP and LD flags
8073
• The debug flags are pre-processor ones, so they should be listed
8076
• Clutter's publicly exported symbols match the following regular
8079
^(clutter|cogl|json)_*
8081
The old one also listed "pango" as a possible prefix, but the
8082
Pango API is now under the Cogl namespace.
8084
clutter/Makefile.am | 5 +++--
8085
1 files changed, 3 insertions(+), 2 deletions(-)
8087
commit 17e3b526d569b6c8f33cd050acce107d5f1b057b
8088
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8089
Date: Wed Dec 2 14:15:43 2009 +0000
8091
docs: Document Clutter's threading model
8093
Be explicit on how to deal with threads and Clutter.
8095
clutter/clutter-main.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++
8096
1 files changed, 56 insertions(+), 0 deletions(-)
8098
commit fc7bbf1abf732ba37fee8f12b5ed36e0b9a5fb95
8099
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8100
Date: Wed Dec 2 14:15:19 2009 +0000
8102
docs: Fix docbook syntax
8104
The <variablename> tag is really called <varname> in DocBook.
8106
clutter/clutter-layout-manager.c | 9 ++++-----
8107
1 files changed, 4 insertions(+), 5 deletions(-)
8109
commit 3c08c411d2ccd1523439c4f35427d266d1ef67dd
8110
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8111
Date: Wed Dec 2 11:38:04 2009 +0000
8113
docs: Annotate StageManager
8115
The ClutterStageManager instance structure is private, so we need a
8116
"floating" annotation.
8118
clutter/clutter-stage-manager.h | 8 ++++++++
8119
1 files changed, 8 insertions(+), 0 deletions(-)
8121
commit 7a33b706a40719e1d123ccfa71c3d5c5d864fdea
8122
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8123
Date: Wed Dec 2 11:37:13 2009 +0000
8125
Remove a gtk-doc annotation
8127
The Mesa matrix code still has a comment that looks like a gtk-doc
8130
clutter/cogl/cogl/cogl-matrix-mesa.c | 2 +-
8131
1 files changed, 1 insertions(+), 1 deletions(-)
8133
commit 0270313121e9a02cb1f59de134ed724e6f8c0ae6
8134
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8135
Date: Wed Dec 2 11:36:25 2009 +0000
8137
layout: Add padding to LayoutMeta
8139
Add some padding to the LayoutMeta and LayoutMetaClass structures.
8141
clutter/clutter-layout-meta.h | 18 +++++++++++++++++-
8142
1 files changed, 17 insertions(+), 1 deletions(-)
8144
commit 02398c0cf13f8326a8fadf0536ce1ac1994901ee
8145
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8146
Date: Tue Dec 1 18:16:48 2009 +0000
8148
Remove unused variable 'lang'
8150
Fix a compiler warning.
8152
clutter/clutter-main.c | 1 -
8153
1 files changed, 0 insertions(+), 1 deletions(-)
8155
commit cdba8cc220a8ef026ade2dfaa542ff94c92cd5ef
8156
Author: Rob Bradford <rob@linux.intel.com>
8157
Date: Tue Dec 1 17:44:42 2009 +0000
8159
flow-layout: Include the first line when calculating number of lines
8161
This ensures that the preferred height / width height takes into consideration
8162
the correct amount of padding
8164
clutter/clutter-flow-layout.c | 6 ++++++
8165
1 files changed, 6 insertions(+), 0 deletions(-)
8167
commit c564303601f6cabdc3314070d225f74a3c6df174
8168
Author: Rob Bradford <rob@linux.intel.com>
8169
Date: Tue Dec 1 17:11:08 2009 +0000
8171
flow-layout: Respect row-spacing/col-spacine in horizontal/vertical flows
8173
We need to add the row-spacing value when calculating the y position for lines
8174
of actors in horizontal flowing layouts.
8176
Similarly we need to add the col-spacing value when calculating the x posution
8177
for actors in vertical flowing layouts.
8179
clutter/clutter-flow-layout.c | 6 ++++++
8180
1 files changed, 6 insertions(+), 0 deletions(-)
8182
commit e6ca2d891a2c48c91db45a0c2f5ce84d5e6621e1
8183
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8184
Date: Tue Dec 1 16:18:39 2009 +0000
8186
glx: Always request an ARGB visual
8188
When requesting the GLXFBConfig for creating the GLX context, we should
8189
always request one that links to an ARGB visual instead of a plain RGB
8192
By using an ARGB visual we allow the ClutterStage:use-alpha property to
8193
work as intended when running Clutter under a compositing manager.
8195
The default behaviour of requesting an ARGB visual can be disabled by
8198
CLUTTER_DISABLE_ARGB_VISUAL
8200
Environment variable.
8202
clutter/glx/clutter-backend-glx.c | 128 +++++++++++++++++++++++++++++-------
8203
clutter/glx/clutter-backend-glx.h | 5 +-
8204
clutter/glx/clutter-glx.h | 5 --
8205
clutter/glx/clutter-stage-glx.c | 13 +---
8206
clutter/x11/clutter-backend-x11.c | 15 ++++-
8207
clutter/x11/clutter-x11.h | 2 +
8208
6 files changed, 125 insertions(+), 43 deletions(-)
8210
commit 2f7ff4d3e363a0568e4051ab67c0df6f745d06d2
8211
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8212
Date: Tue Dec 1 16:16:18 2009 +0000
8214
stage: Add :use-alpha property
8216
The ClutterStage:use-alpha property is used to let a stage know that it
8217
should honour the alpha component of the ClutterStage:color property.
8219
If :use-alpha is set to FALSE the stage always uses the full opacity
8220
when clearing itself before a paint(); otherwise, the alpha value is
8223
clutter/clutter-stage.c | 38 +++++++++++++++++++++++++++++++++++---
8224
1 files changed, 35 insertions(+), 3 deletions(-)
8226
commit 1d87ecc6a1be73e7d72c8c5ecb2b8268d5a0cd5e
8227
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8228
Date: Tue Dec 1 16:22:45 2009 +0000
8230
materials: Get the right blend function for alpha
8232
The correct blend function for the alpha channel is:
8234
GL_ONE, GL_ONE_MINUS_SRC_ALPHA
8236
As per bug 1406. This fix was dropped when the switch to premultiplied
8239
clutter/cogl/cogl/cogl-material.c | 2 +-
8240
1 files changed, 1 insertions(+), 1 deletions(-)
8242
commit b43e804c078578e54b0ef9680a5d7b4bf53cafe8
8243
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8244
Date: Tue Dec 1 16:06:57 2009 +0000
8246
actor: Fix a pre-condition check in set_text_direction()
8248
The check is failing because the condition should be:
8250
text_dir != CLUTTER_TEXT_DIRECTION_DEFAULT
8252
clutter/clutter-actor.c | 2 +-
8253
1 files changed, 1 insertions(+), 1 deletions(-)
8255
commit 3e034cda58776a0fbc6812cd8d859ad58b5cab54
8256
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8257
Date: Tue Dec 1 15:17:49 2009 +0000
8259
build: More cleanups for the configure summary
8261
Document each section, and add some more items to the summary like what
8262
JSON-GLib are we using, and which version of the GLES API is COGL
8265
configure.ac | 27 ++++++++++++++++++++++-----
8266
1 files changed, 22 insertions(+), 5 deletions(-)
8268
commit e3b409529e9000cff6aabac8efdaccc0eaecf83f
8269
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8270
Date: Tue Dec 1 15:17:16 2009 +0000
8272
build: Require a stable JSON-GLib version
8274
The 0.7 version is the development cycle for JSON-GLib 0.8.
8276
configure.ac | 8 ++++----
8277
1 files changed, 4 insertions(+), 4 deletions(-)
8279
commit 1c47638db4ac741f4bae9ede860d16b4e1693a36
8280
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8281
Date: Tue Dec 1 14:59:44 2009 +0000
8283
docs: Add missing symbols to clutter-sections.txt
8285
doc/reference/clutter/clutter-sections.txt | 8 ++++++++
8286
1 files changed, 8 insertions(+), 0 deletions(-)
8288
commit 586750751a60b76e2f398be28d596009b6587c52
8289
Merge: c2332a5 6e99c1a
8290
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8291
Date: Tue Dec 1 14:55:19 2009 +0000
8293
Merge branch 'text-direction'
8296
docs: Add text-direction accessors
8297
Set the default language on the Pango context
8298
actor: Set text direction on parenting
8299
tests: Display the index inside text-box-layout
8300
box-layout: Honour :text-direction
8301
text: Dirty layout cache on text direction changes
8302
actor: Add :text-direction property
8303
Use the newly added ClutterTextDirection enumeration
8304
Add ClutterTextDirection enumeration
8306
commit 6e99c1aefe8f76cb3004a8cc89ae6f8b95d1f597
8307
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8308
Date: Tue Dec 1 14:55:01 2009 +0000
8310
docs: Add text-direction accessors
8312
doc/reference/clutter/clutter-sections.txt | 4 ++++
8313
1 files changed, 4 insertions(+), 0 deletions(-)
8315
commit c2332a5d26d854dcb4223088904305988b35a906
8316
Author: Bastian Winkler <buz@netbuz.org>
8317
Date: Tue Dec 1 12:31:07 2009 +0000
8319
build: Fix the SUBDIRS ordering
8321
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
8323
Makefile.am | 4 +---
8324
1 files changed, 1 insertions(+), 3 deletions(-)
8326
commit 220a8fbfda5bda38e6c7689176fd876c57074ab5
8327
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8328
Date: Tue Dec 1 10:16:25 2009 +0000
8330
docs: Move documentation under doc/
8332
Clean up the root directory of the project and try to keep the
8333
documentation all together.
8335
CODING_STYLE | 379 --------------------------------------------------
8336
HACKING | 89 ------------
8337
HACKING.backends | 160 ---------------------
8339
doc/CODING_STYLE | 379 ++++++++++++++++++++++++++++++++++++++++++++++++++
8340
doc/HACKING | 89 ++++++++++++
8341
doc/HACKING.backends | 160 +++++++++++++++++++++
8342
doc/Makefile.am | 5 +
8343
8 files changed, 633 insertions(+), 631 deletions(-)
8345
commit 348f5bfec8b8c0c682384001ac39b4e656b9c526
8346
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8347
Date: Tue Dec 1 10:11:33 2009 +0000
8349
cookbook: Clean up the text
8351
• Remove the empty sections.
8353
• Add the description for the "overriding the paint sequence" recipe.
8355
doc/cookbook/clutter-cookbook.xml.in | 124 +++++++++++++++++++++++----------
8356
1 files changed, 86 insertions(+), 38 deletions(-)
8358
commit 52db14b78d848f0f876d4721895ccc2c83e06aba
8359
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8360
Date: Mon Nov 30 21:51:46 2009 +0000
8362
docs: Fix recursion into doc/ directory
8364
We should always recurse into the doc/ directory; whether we should then
8365
recurse into reference/, cookbook/ and manual/ is a matter of specific
8366
configure-time flags.
8368
Makefile.am | 6 +-----
8369
doc/Makefile.am | 6 +++++-
8370
2 files changed, 6 insertions(+), 6 deletions(-)
8372
commit 5e1ccaeb603fb9f9b2b11cad13bbcf8682b33504
8373
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8374
Date: Thu Sep 3 13:04:59 2009 +0100
8376
docs: Clean up the additional documentation build
8378
• Make the manual a DevHelp book
8380
• Make the generation of PDFs of the cookbook and the manual optional
8382
• Consequently, make the hard dependency on jw optional
8384
• Clean up the checks and build for the additional documentation
8387
configure.ac | 41 ++--
8388
doc/Makefile.am | 8 +-
8389
doc/common/Makefile.am | 9 +
8390
doc/common/common.xsl | 19 ++
8391
doc/common/devhelp.xsl | 154 ++++++++++++
8392
doc/common/html.xsl | 285 +++++++++++++++++++++
8393
doc/common/ref-html-style.xsl | 54 ++++
8394
doc/common/style.css | 97 +++++++
8395
doc/cookbook/Makefile.am | 30 +--
8396
doc/cookbook/clutter-cookbook.xml | 456 ---------------------------------
8397
doc/cookbook/clutter-cookbook.xml.in | 457 ++++++++++++++++++++++++++++++++++
8398
doc/cookbook/common.xsl | 19 --
8399
doc/cookbook/cookbook.xsl | 14 -
8400
doc/cookbook/devhelp.xsl | 154 ------------
8401
doc/cookbook/html.xsl | 285 ---------------------
8402
doc/cookbook/ref-html-style.xsl | 54 ----
8403
doc/cookbook/style.css | 97 -------
8404
doc/manual/Makefile.am | 84 ++++---
8405
doc/manual/clutter-manual.xml.in | 9 +-
8406
20 files changed, 1174 insertions(+), 1161 deletions(-)
8408
commit ee9d358c452c8da879e7f40e4a2e701472067c04
8409
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8410
Date: Wed Sep 2 18:11:06 2009 +0100
8412
[cookbook] Build the Cookbook as a devhelp document
8414
Instead of creating stand-alone HTML files, use XSLT to transform the
8415
DocBook into a DevHelp file, so that we can read the Cookbook inside
8416
DevHelp -- just like the API reference.
8419
doc/cookbook/Makefile.am | 83 ++++++-----
8420
doc/cookbook/common.xsl | 19 +++
8421
doc/cookbook/devhelp.xsl | 154 +++++++++++++++++++++
8422
doc/cookbook/html.xsl | 285 +++++++++++++++++++++++++++++++++++++++
8423
doc/cookbook/ref-html-style.xsl | 54 ++++++++
8424
6 files changed, 564 insertions(+), 40 deletions(-)
8426
commit 9485ef81a61d8950b7f04e01c749964c6a64922c
8427
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8428
Date: Wed Sep 2 13:13:44 2009 +0100
8430
[cookbook] Fix folds
8432
doc/cookbook/clutter-cookbook.xml | 5 +++--
8433
1 files changed, 3 insertions(+), 2 deletions(-)
8435
commit 2675b829990eb0b6fb9bae848bd64fc4461324d2
8436
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8437
Date: Thu Dec 11 17:03:10 2008 +0000
8439
Update the ignore file
8441
Add the temporary and output files of the cookbook.
8443
.gitignore | 5 +++++
8444
1 files changed, 5 insertions(+), 0 deletions(-)
8446
commit a7f7bfbc876a256f40fc0c3a43691b07bffeae96
8447
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8448
Date: Thu Dec 11 17:02:05 2008 +0000
8450
Add the secon recipe to the Actors chapter
8452
The second recipe shows how to use the ::paint signal to override
8453
the paint sequence of a pre-existing actor.
8455
doc/cookbook/clutter-cookbook.xml | 153 +++++++++++++++++++++++++++++--------
8456
1 files changed, 122 insertions(+), 31 deletions(-)
8458
commit 26b35e657f3fcf3ae8b919c4c315337f2261003f
8459
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8460
Date: Thu Dec 11 17:00:16 2008 +0000
8462
Add the first recipe to the Actors chapter
8464
The first recipe shows how to be notified when the relative position
8465
and size of an actor changes using the notify:: signal on the actor's
8466
dimensional and positional properties.
8468
doc/cookbook/clutter-cookbook.xml | 128 ++++++++++++++++++++++++++++++++++--
8469
1 files changed, 120 insertions(+), 8 deletions(-)
8471
commit 135cb5c6e21200162939dc5a42f0a34c4daf8a39
8472
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8473
Date: Thu Dec 11 16:58:07 2008 +0000
8475
Add a preface instead of an introduction
8477
Make the Cookbook look more like a book than a tutorial.
8479
doc/cookbook/clutter-cookbook.xml | 64 +++++++++++++++++++++++++++++++++---
8480
1 files changed, 58 insertions(+), 6 deletions(-)
8482
commit 35627f240fa498656492e437c130ffe34674ca54
8483
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8484
Date: Thu Dec 11 16:57:46 2008 +0000
8486
Add the Clutter Cookbook to the build
8488
The "Clutter Cookbook" is a document designed to contain solutions
8489
to common problems applications developers might encounter when using
8490
Clutter. It is meant as a companion to the API reference but it
8491
requires knowledge of the Clutter API and framework.
8495
doc/cookbook/Makefile.am | 71 +++++++++++++
8496
doc/cookbook/clutter-cookbook.xml | 200 +++++++++++++++++++++++++++++++++++++
8497
doc/cookbook/cookbook.xsl | 14 +++
8498
doc/cookbook/style.css | 97 ++++++++++++++++++
8499
doc/cookbook/version.xml.in | 1 +
8500
7 files changed, 386 insertions(+), 0 deletions(-)
8502
commit 15a04a1dd39fd19f28132cbd3c22b49c05c0773b
8503
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8504
Date: Mon Nov 30 19:03:11 2009 +0000
8506
layout-manager: Create LayoutMeta on demand
8508
The ClutterLayoutMeta instances should be created on demand, whenever
8509
the layout manager needs them - if the layout manager supports layout
8512
This removes the requirement to call add_child_meta() and
8513
remove_child_meta() on add and remove respectively; it also simplifies
8514
the implementation of LayoutManager sub-classes since we can add
8515
fallback code in the base abstract class.
8517
Eventually, this will also lead to an easier to implement ClutterScript
8518
parser for layout properties.
8520
With the new scheme, the ClutterLayoutMeta instance is created whenever
8521
the layout manager tries to access it; if there isn't an instance
8522
already attached to the container's child, one is created -- assuming
8523
that the LayoutManager sub-class has overridden the
8524
get_child_meta_type() virtual function and it's returning a valid GType.
8526
We can also provide a default implementation for create_child_meta(),
8527
by getting the GType and instantiating a ClutterLayoutMeta with all the
8528
fields already set. If the layout manager requires more work then it can
8529
obviously override the default implementation (and even chain up to it).
8531
The ClutterBox actor has been updated, as well as the ClutterBoxLayout
8532
layout manager, to take advantage of the changes of LayoutManager.
8534
clutter/clutter-box-layout.c | 13 --
8535
clutter/clutter-box.c | 10 --
8536
clutter/clutter-layout-manager.c | 221 +++++++++-------------------
8537
clutter/clutter-layout-manager.h | 8 +-
8538
doc/reference/clutter/clutter-sections.txt | 2 -
8539
5 files changed, 70 insertions(+), 184 deletions(-)
8541
commit 7d842079ca7521332b98e7cc06480a3f7e23110f
8542
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8543
Date: Mon Nov 30 18:22:26 2009 +0000
8545
conform: Add named object property unit for ClutterScript
8547
We should exercise the resolution of the object properties containing a
8548
string pointing to an object previously defined using ClutterScript.
8551
tests/conform/test-conform-main.c | 1 +
8552
tests/conform/test-script-parser.c | 28 ++++++++++++++++++++++++++++
8553
tests/data/Makefile.am | 18 ++++++++++++++----
8554
tests/data/test-script-named-object.json | 22 ++++++++++++++++++++++
8555
5 files changed, 66 insertions(+), 4 deletions(-)
8557
commit c3e640e6e36d3d3c72c1e340efa78817308a4283
8558
Author: Neil Roberts <neil@linux.intel.com>
8559
Date: Mon Nov 30 19:06:05 2009 +0000
8561
Use the correct colour when clearing the stage for picking
8563
The colour test for the stage in _clutter_do_pick checks for white to
8564
determine whether the stage was picked but since 47db7af4d we were
8565
setting the colur to black. This usually worked because the id of the
8566
default stage ends up being 0 which equates to black. However if a
8567
second stage is created then it will always end up picking the first
8570
clutter/clutter-main.c | 2 +-
8571
1 files changed, 1 insertions(+), 1 deletions(-)
8573
commit 1bb034fbd75bb7153f35c88b05ed0fb9544d0c8b
8574
Author: Neil Roberts <neil@linux.intel.com>
8575
Date: Sun Nov 29 20:06:36 2009 +0000
8577
cogl: Enable blending if a lighting colour is semi-transparent
8579
We currently enable blending if the material colour has
8580
transparency. This patch makes it also enable blending if any of the
8581
lighting colours have transparency. Arguably this isn't neccessary
8582
because we don't expose any API to enable lighting so there is no
8583
bug. However it is currently possible to enable lighting with a direct
8584
call to glEnable and this otherwise works so it is a shame not to have
8587
http://bugzilla.openedhand.com/show_bug.cgi?id=1907
8589
clutter/cogl/cogl/cogl-material.c | 14 +++++++++++++-
8590
1 files changed, 13 insertions(+), 1 deletions(-)
8592
commit 3cb974ee8be182944848b5e64dd4724f118bc8fa
8593
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8594
Date: Mon Nov 30 16:15:19 2009 +0000
8596
Set the default language on the Pango context
8598
When creating the Pango context we should also set the language
8599
to be the default Pango language.
8601
clutter/clutter-main.c | 2 ++
8602
1 files changed, 2 insertions(+), 0 deletions(-)
8604
commit daeb3b2fecb3d740b6d84215928fc4477396dc71
8605
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8606
Date: Mon Nov 30 16:14:09 2009 +0000
8608
actor: Set text direction on parenting
8610
When setting the parent on an actor we should set the text direction to
8611
be the same as the parent's.
8613
clutter/clutter-actor.c | 12 ++++++++----
8614
1 files changed, 8 insertions(+), 4 deletions(-)
8616
commit 0ce5c7d350c8b904ed8cc15c911e6433619c6a2d
8617
Author: Damien Lespiau <damien.lespiau@intel.com>
8618
Date: Mon Nov 30 13:26:45 2009 +0100
8620
gitignore: update gitignore files to match the latest cogl tests
8622
Some cogl tests were renamed in c1247066 to have 'cogl' in their names.
8623
It's a good excuse to merge .gitigore and tests/.gitignore.
8625
.gitignore | 21 +++++++++++++--------
8626
tests/.gitignore | 52 ----------------------------------------------------
8627
2 files changed, 13 insertions(+), 60 deletions(-)
8629
commit 4f06d035a2895b2839ba0e97109e8a44c1ad07e2
8630
Author: Damien Lespiau <damien.lespiau@intel.com>
8631
Date: Wed Nov 25 13:29:26 2009 +0100
8633
tests: fix argument parsing of test-texture-quality
8635
This test did not open redhand.png as argc/argv should be handled
8636
normally (argv[0] being the name of the exectutable).
8638
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
8640
tests/interactive/test-texture-quality.c | 4 ++--
8641
1 files changed, 2 insertions(+), 2 deletions(-)
8643
commit e4180b283836ccd665d23d1e19d35a8911c40436
8644
Author: Damien Lespiau <damien.lespiau@intel.com>
8645
Date: Wed Nov 25 13:25:14 2009 +0100
8647
tests: give all the arguments to the wrapper
8649
Some tests can be given extra arguments. The test-interactive dispatch
8650
mechanism handles that but the small shell scripts around the wrapper
8651
do not forward the arguments to the wrapper.
8653
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
8655
tests/interactive/Makefile.am | 5 +++--
8656
1 files changed, 3 insertions(+), 2 deletions(-)
8658
commit 934eb5d251ad9d9987d0ff1f0f9878fffc2484f1
8659
Author: Robert Bragg <robert@linux.intel.com>
8660
Date: Fri Nov 27 15:24:09 2009 +0000
8662
primitives: Don't use dynamic arrays since VS2008 can't cope with them :-(
8664
This changes _cogl_path_fill_nodes_scanlines to use g_alloca instead of
8665
using a variable to declare an array length.
8667
clutter/cogl/cogl/cogl-primitives.c | 2 +-
8668
1 files changed, 1 insertions(+), 1 deletions(-)
8670
commit 47db7af4d3001387a3c7adc60f6c3166c149ab5d
8671
Author: Robert Bragg <robert@linux.intel.com>
8672
Date: Wed Nov 25 20:37:01 2009 +0000
8674
picking: avoid redundant picking geometry for the stage.
8676
The stage's pick id can be written to the framebuffer when we call
8677
cogl_clear so there's no need for the stage to also chain up in it's pick
8678
function resulting in clutter-actor.c also emitting a rectangle for the
8681
clutter/clutter-main.c | 6 +++---
8682
clutter/clutter-stage.c | 12 +++++++-----
8683
2 files changed, 10 insertions(+), 8 deletions(-)
8685
commit c12470666e6bd63024437a389cd2c1202df93c33
8686
Author: Robert Bragg <robert@linux.intel.com>
8687
Date: Fri Nov 27 00:28:39 2009 +0000
8689
tests: rename cogl conformance tests so they can be clearly identified
8691
All Cogl conformance tests are now prefixed 'test-cogl-'
8693
tests/conform/Makefile.am | 24 +-
8694
tests/conform/test-backface-culling.c | 339 ----------------
8695
tests/conform/test-blend-strings.c | 416 --------------------
8696
tests/conform/test-clutter-fixed.c | 18 -
8697
tests/conform/test-cogl-backface-culling.c | 339 ++++++++++++++++
8698
tests/conform/test-cogl-blend-strings.c | 416 ++++++++++++++++++++
8699
tests/conform/test-cogl-fixed.c | 18 +
8700
tests/conform/test-cogl-materials.c | 195 +++++++++
8701
tests/conform/test-cogl-npot-texture.c | 230 +++++++++++
8702
tests/conform/test-cogl-premult.c | 390 ++++++++++++++++++
8703
tests/conform/test-cogl-vertex-buffer-contiguous.c | 269 +++++++++++++
8704
tests/conform/test-cogl-vertex-buffer-interleved.c | 174 ++++++++
8705
tests/conform/test-cogl-vertex-buffer-mutability.c | 211 ++++++++++
8706
tests/conform/test-conform-main.c | 34 +-
8707
tests/conform/test-materials.c | 195 ---------
8708
tests/conform/test-npot-texture.c | 230 -----------
8709
tests/conform/test-premult.c | 390 ------------------
8710
tests/conform/test-vertex-buffer-contiguous.c | 269 -------------
8711
tests/conform/test-vertex-buffer-interleved.c | 174 --------
8712
tests/conform/test-vertex-buffer-mutability.c | 211 ----------
8713
20 files changed, 2272 insertions(+), 2270 deletions(-)
8715
commit 439f8c62b0e2651b9afeb08cb5166ed9e7f49521
8716
Author: Robert Bragg <robert@linux.intel.com>
8717
Date: Thu Nov 26 19:06:35 2009 +0000
8719
cogl: deprecate cogl_draw_buffer API and replace with a cogl_framebuffer API
8721
cogl_push_draw_buffer, cogl_set_draw_buffer and cogl_pop_draw_buffer are now
8722
deprecated and new code should use the new cogl_framebuffer_* API instead.
8724
Code that previously did:
8725
cogl_push_draw_buffer ();
8726
cogl_set_draw_buffer (COGL_OFFSCREEN_BUFFER, buffer);
8728
cogl_pop_draw_buffer ();
8729
should now be re-written as:
8730
cogl_push_framebuffer (buffer);
8732
cogl_pop_framebuffer ();
8734
As can be seen from the example above the rename has been used as an
8735
opportunity to remove the redundant target argument from
8736
cogl_set_draw_buffer; it now only takes one call to redirect to an offscreen
8737
buffer, and finally the term framebuffer may be a bit more familiar to
8738
anyone coming from an OpenGL background.
8741
clutter/clutter-texture.c | 15 +-
8742
clutter/cogl/cogl/Makefile.am | 4 +-
8743
clutter/cogl/cogl/cogl-clip-stack.c | 74 ++--
8744
clutter/cogl/cogl/cogl-context.c | 13 +-
8745
clutter/cogl/cogl/cogl-context.h | 4 +-
8746
clutter/cogl/cogl/cogl-draw-buffer-private.h | 133 ------
8747
clutter/cogl/cogl/cogl-draw-buffer.c | 603 -------------------------
8748
clutter/cogl/cogl/cogl-framebuffer-private.h | 124 +++++
8749
clutter/cogl/cogl/cogl-framebuffer.c | 618 ++++++++++++++++++++++++++
8750
clutter/cogl/cogl/cogl-journal.c | 12 +-
8751
clutter/cogl/cogl/cogl-matrix-stack.c | 6 +-
8752
clutter/cogl/cogl/cogl-primitives.c | 30 +-
8753
clutter/cogl/cogl/cogl-texture.c | 12 +-
8754
clutter/cogl/cogl/cogl-vertex-buffer.c | 6 +-
8755
clutter/cogl/cogl/cogl.c | 80 ++--
8756
clutter/cogl/cogl/cogl.h | 73 +++-
8757
doc/reference/cogl/cogl-sections.txt | 3 +
8758
tests/conform/test-backface-culling.c | 7 +-
8759
tests/conform/test-cogl-offscreen.c | 33 +-
8760
tests/conform/test-cogl-readpixels.c | 45 +-
8761
tests/conform/test-cogl-viewport.c | 90 ++--
8762
tests/interactive/test-cogl-offscreen.c | 4 +-
8763
23 files changed, 1035 insertions(+), 967 deletions(-)
8765
commit b598210e011f6711848e649217ac7a35770bfe8e
8766
Author: Robert Bragg <robert@linux.intel.com>
8767
Date: Thu Nov 26 17:47:17 2009 +0000
8769
cogl_offscreen: deprecate cogl_offscreen_ref/unref.
8771
New code should use cogl_handle_ref/unref
8773
clutter/cogl/cogl/cogl-offscreen.h | 34 +++++++++++++++++++++-------------
8774
1 files changed, 21 insertions(+), 13 deletions(-)
8776
commit e12a691187a7dbbcfe5b46b94fe2975fd0927966
8777
Author: Neil Roberts <neil@linux.intel.com>
8778
Date: Wed Nov 25 13:39:45 2009 +0000
8780
cogl: Use a vtable for the texture backends instead of a type and switch
8782
Instead of storing an enum with the backend type for each texture and
8783
then using a switch statement to decide which function to call, we
8784
should store pointers to all of the functions in a struct and have
8785
each texture point to that struct. This is potentially slightly faster
8786
when there are more backends and it makes implementing new backends
8787
easier because it's more obvious which functions have to be
8790
clutter/cogl/cogl/cogl-texture-2d-sliced-private.h | 62 ----------
8791
clutter/cogl/cogl/cogl-texture-2d-sliced.c | 122 +++++++++-----------
8792
clutter/cogl/cogl/cogl-texture-private.h | 97 ++++++++++++----
8793
clutter/cogl/cogl/cogl-texture.c | 124 ++++----------------
8794
4 files changed, 154 insertions(+), 251 deletions(-)
8796
commit 558b17ee1e71fb0fe7aea35e13cd5a73b18130dc
8797
Author: Robert Bragg <robert@linux.intel.com>
8798
Date: Wed Nov 25 02:47:52 2009 +0000
8800
offscreen: cogl_offscreen_new_to_texture now supports GL_TEXTURE_RECTANGLE_ARB
8802
cogl_offscreen_new_to_texture previously bailed out if the given texture's
8803
GL target was anything but GL_TEXTURE_2D, but it now also allows
8804
foreign GL_TEXTURE_RECTANGLE_ARB textures.
8806
Thanks to Owen for reporting this issue, ref:
8807
https://bugzilla.gnome.org/show_bug.cgi?id=601032
8809
clutter/cogl/cogl/cogl-draw-buffer.c | 3 ++-
8810
1 files changed, 2 insertions(+), 1 deletions(-)
8812
commit d3a01e0c96237ca060e3451d2b80e692dfb3b8f6
8813
Author: Robert Bragg <robert@linux.intel.com>
8814
Date: Tue Nov 24 18:24:07 2009 +0000
8816
debug: remove the COGL_DEBUG=client-side-matrices option
8818
Cogl only supports client side matrices so this debug option is no longer
8821
clutter/cogl/cogl/cogl-debug.c | 1 -
8822
clutter/cogl/cogl/cogl-debug.h | 13 ++++++-------
8823
2 files changed, 6 insertions(+), 8 deletions(-)
8825
commit b38c6b420f0ae1f118189bd0a8994fce479aef7b
8826
Author: Robert Bragg <robert@linux.intel.com>
8827
Date: Wed Nov 11 12:50:48 2009 +0000
8829
[cogl-material] Adds cogl_material_copy() API
8831
cogl_material_copy can be used to create a new CoglHandle referencing a copy
8832
of some given material.
8834
From now on we will advise that developers always aim to use this function
8835
instead of cogl_material_new() when creating a material that is in any way
8836
derived from another.
8838
By using cogl_material_copy, Cogl can maintain an ancestry for each material
8839
and keep track of "similar" materials. The plan is that Cogl will use this
8840
information to minimize the cost of GPU state transitions.
8843
clutter/cogl/cogl/cogl-context.c | 13 ++++--
8844
clutter/cogl/cogl/cogl-context.h | 4 +-
8845
clutter/cogl/cogl/cogl-material-private.h | 9 ++++
8846
clutter/cogl/cogl/cogl-material.c | 62 ++++++++++++++++++++++++----
8847
clutter/cogl/cogl/cogl-material.h | 18 ++++++++
8848
clutter/cogl/cogl/cogl.c | 6 +-
8849
7 files changed, 100 insertions(+), 17 deletions(-)
8851
commit 70ca3bfe4173aabd352fd0aed484c0bab57a8d02
8852
Author: Robert Bragg <robert@linux.intel.com>
8853
Date: Wed Nov 11 12:52:08 2009 +0000
8855
[cogl] remove unused gles/cogl-utils.[c,h]
8857
The only function in gles/cogl-utils.c was cogl_util_next_p2() and it's
8858
redundant since we also have a cogl/cogl-utils.[c,h]
8860
clutter/cogl/cogl/driver/gles/cogl-util.c | 49 -----------------------------
8861
clutter/cogl/cogl/driver/gles/cogl-util.h | 30 -----------------
8862
2 files changed, 0 insertions(+), 79 deletions(-)
8864
commit 4a63af0c631cd9391a6b3cef6fdb545e36a68730
8865
Author: Robert Bragg <robert@linux.intel.com>
8866
Date: Mon Nov 23 11:30:32 2009 +0000
8868
docs: Don't document cogl_flush_gl_state as public API
8870
This function was #if 0'd before we released Clutter 1.0 so there's no
8871
implementation of it. At some point we thought it might assist with
8872
developers breaking out into raw OpenGL. Breaking out to raw GL is a
8873
difficult problem though so we decided instead we will wait for a specific
8874
use case to arrise before trying to support it.
8876
clutter/cogl/cogl/cogl.c | 8 --------
8877
clutter/cogl/cogl/cogl.h | 22 ----------------------
8878
doc/reference/cogl/cogl-sections.txt | 1 -
8879
3 files changed, 0 insertions(+), 31 deletions(-)
8881
commit 328ce370e7a7f155f63ee8206e8b6cd4e66a6c94
8882
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8883
Date: Tue Nov 24 16:59:24 2009 +0000
8885
animation: Keep a weak reference on actors
8887
Actors, unlike objects, can effectively go away whilst being
8888
animated - usually because of an explicit destoy().
8890
The Animation created by clutter_actor_animate() and friends
8891
should keep a weak reference on the actor and eventually
8892
get rid of the animation itself in case the actor goes away
8893
whilst being animated.
8895
clutter/clutter-animation.c | 13 +++++++++++++
8896
1 files changed, 13 insertions(+), 0 deletions(-)
8898
commit 1107fa8797b0d2475097c20b50065dbc3ae014a1
8899
Author: Neil Roberts <neil@linux.intel.com>
8900
Date: Thu Nov 19 16:07:38 2009 +0000
8902
Minor fix to cogl material
8904
_cogl_material_get_layer expects a CoglMaterial* pointer but it was
8905
being called with a CoglHandle. This doesn't matter because the
8906
CoglHandle is actually just the CoglMaterial* pointer anyway but it
8907
breaks the ability to change the _cogl_material_pointer_from_handle
8910
clutter/cogl/cogl/cogl-material.c | 2 +-
8911
1 files changed, 1 insertions(+), 1 deletions(-)
8913
commit 6fd80ffbd926318413296112871891706867cd78
8914
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8915
Date: Thu Nov 19 14:30:01 2009 +0000
8917
docs: Add indices to the Cogl API reference
8919
The Clutter API reference has an index of the symbols for each minor
8920
version, and a list of deprecated symbols. The Cogl API reference
8921
should have the same layout.
8923
doc/reference/cogl/cogl-docs.xml.in | 23 ++++++++++++++++++++++-
8924
1 files changed, 22 insertions(+), 1 deletions(-)
8926
commit 8d64c4641dbf9dfb09d2719872911263d2b758dc
8927
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8928
Date: Thu Nov 19 13:55:10 2009 +0000
8930
docs: Increase consistency in Cogl documentation
8932
clutter/cogl/cogl/cogl-texture.h | 66 +++++++++-------
8933
clutter/cogl/cogl/cogl-vertex-buffer.h | 134 +++++++++++++++++---------------
8934
clutter/cogl/cogl/cogl.h | 90 +++++++++++----------
8935
3 files changed, 157 insertions(+), 133 deletions(-)
8937
commit 550c14449e090f7921cdddc6acedb1bd72552663
8938
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8939
Date: Thu Nov 19 13:33:26 2009 +0000
8941
docs: Documentation fixes for CoglMatrix
8943
Clean up the references, the docbook tags, and the style to fit in
8944
with the rest of the API references for Cogl and Clutter.
8946
clutter/cogl/cogl/cogl-matrix.h | 136 +++++++++++++++++++-------------------
8947
1 files changed, 68 insertions(+), 68 deletions(-)
8949
commit 056cfcffc312f9508f07c82e41d96c606559db97
8950
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8951
Date: Thu Nov 19 13:33:08 2009 +0000
8953
Whitespace fix for cogl-color.h
8955
clutter/cogl/cogl/cogl-color.h | 3 ++-
8956
1 files changed, 2 insertions(+), 1 deletions(-)
8958
commit 851d628cf8fe89ab28d66f790ad98db766831e37
8959
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8960
Date: Thu Nov 19 13:31:38 2009 +0000
8962
docs: Documentation fixes for CoglMaterial
8964
Clean up the references, the docbook tags, and the style to fit in
8965
with the rest of the API references for Cogl and Clutter.
8967
clutter/cogl/cogl/cogl-material.h | 404 +++++++++++++++++++------------------
8968
1 files changed, 205 insertions(+), 199 deletions(-)
8970
commit fe804f1d023b50801d400971bf311545727921e9
8971
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8972
Date: Thu Nov 19 13:29:02 2009 +0000
8974
docs: Documentation fixes for CoglBitmap
8976
• Use the same style for the Cogl API reference as the one used for
8977
the Clutter API reference.
8979
• Fix the introspection annotations for cogl_bitmap_get_size_from_file()
8981
clutter/cogl/cogl/cogl-bitmap.h | 25 +++++++++++++------------
8982
1 files changed, 13 insertions(+), 12 deletions(-)
8984
commit 1bf8db9e75c6155bb852980cb40a9117c6190500
8985
Author: Emmanuele Bassi <ebassi@linux.intel.com>
8986
Date: Thu Nov 19 12:34:06 2009 +0000
8988
docs: Fix Cogl API reference build
8990
• Ignore all the private header files
8992
• Add all missing/unused symbols
8994
• Remove deprecated symbols from 0.*
8996
doc/reference/cogl/Makefile.am | 30 ++++++++++++++++++++++--------
8997
doc/reference/cogl/cogl-sections.txt | 29 ++++++++++++++++++++++++-----
8998
2 files changed, 46 insertions(+), 13 deletions(-)
9000
commit 05a5a7e759455a98233ea86016edf86d6d17be36
9001
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9002
Date: Thu Nov 19 12:32:59 2009 +0000
9004
docs: Remove non-gtk-doc annotations
9006
The imported Mesa matrix code has some documentation annotations
9007
that make gtk-doc very angry. Since it's all private anyway we
9008
can safely make gtk-doc ignore the offending stuff.
9010
clutter/cogl/cogl/cogl-matrix-mesa.c | 136 +++++++++++++++++-----------------
9011
clutter/cogl/cogl/cogl-matrix-mesa.h | 12 ++--
9012
2 files changed, 74 insertions(+), 74 deletions(-)
9014
commit 7a011af97406c0075cc32eb2fbe4a07dc3d828c2
9015
Author: Neil Roberts <neil@linux.intel.com>
9016
Date: Thu Nov 19 11:51:21 2009 +0000
9018
docs: Fix the 'Since' annotation for some functions
9020
The 'Since' annotation needs to have a colon after it or gtk-doc won't
9023
clutter/clutter-behaviour-path.h | 2 +-
9024
clutter/clutter-text.c | 2 +-
9025
clutter/cogl/cogl/cogl-material.h | 40 +++++++++++++++---------------
9026
clutter/cogl/cogl/cogl-texture.h | 6 ++--
9027
clutter/cogl/cogl/cogl.h | 4 +-
9028
clutter/x11/clutter-x11-texture-pixmap.c | 4 +-
9029
6 files changed, 29 insertions(+), 29 deletions(-)
9031
commit 8ef57898ad66af345946a1f69172fc8be7038def
9032
Author: Neil Roberts <neil@linux.intel.com>
9033
Date: Wed Nov 18 19:09:10 2009 +0000
9035
cogl: Use APIENTRY for GL function pointer declarations
9037
This matters for platforms such as Windows that use a different
9038
calling covention from the default for GL functions.
9040
clutter/cogl/cogl/driver/gl/cogl-context-driver.h | 6 +++++-
9041
.../cogl/cogl/driver/gles/cogl-context-driver.h | 6 +++++-
9042
2 files changed, 10 insertions(+), 2 deletions(-)
9044
commit be58e5261f3b0c6a760577f67f2859511d6e52f2
9045
Author: Neil Roberts <neil@linux.intel.com>
9046
Date: Wed Nov 18 19:23:57 2009 +0000
9048
build: Fix out-of-tree builds for cogl-defines.h
9050
$(COGL_DRIVER)/cogl-defines.h is generated in the configure script so
9051
it ends up in the build directory. Therefore the build rule for
9052
cogl/cogl-defines.h should depend on the file in $(builddir) not
9055
clutter/cogl/cogl/Makefile.am | 4 ++--
9056
1 files changed, 2 insertions(+), 2 deletions(-)
9058
commit 19e485325faa59d44556dd6dac9543fb616e680b
9059
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9060
Date: Wed Nov 18 18:04:13 2009 +0000
9062
docs: Clean up deprecation notices
9064
The deprecation notices in gtk-doc should also refer to the
9065
release that added the deprecation, and if the deprecated
9066
symbol has been replaced by something else then the new symbol
9067
should be correctly referenced.
9069
clutter/cogl/cogl/cogl.h | 46 +++++++++++++++++++++++-----------------------
9070
1 files changed, 23 insertions(+), 23 deletions(-)
9072
commit 5f28c8b654094e27112426c206cf8294428515f9
9073
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9074
Date: Wed Nov 18 17:35:07 2009 +0000
9076
build: Make cogl.h not conditional on driver defines
9078
The main COGL header cogl.h is currently created at configure time
9079
because it conditionally includes the driver-dependent defines. This
9080
sometimes leads to a stale cogl.h with old definitions which can
9081
break the build until you clean out the whole tree and start from
9084
We can generate a stable cogl-defines.h at build time from the
9085
equivalent driver-dependent header and let cogl.h include that
9089
clutter/cogl/cogl/Makefile.am | 18 +-
9090
clutter/cogl/cogl/cogl.h | 991 +++++++++++++++++++++++++++++++++++++++++
9091
clutter/cogl/cogl/cogl.h.in | 991 -----------------------------------------
9093
5 files changed, 1008 insertions(+), 1004 deletions(-)
9095
commit b869e87c86b73a8c09c5f509955a120978da7604
9096
Author: Neil Roberts <neil@linux.intel.com>
9097
Date: Wed Nov 18 17:16:38 2009 +0000
9099
test-npot-texture: Add some verbose notes
9101
This just adds some verbose output stating whether Cogl thinks that
9102
NPOT textures are supported.
9104
tests/conform/test-npot-texture.c | 16 ++++++++++++++++
9105
1 files changed, 16 insertions(+), 0 deletions(-)
9107
commit 8f1edcb6eda89405286b7b1cdab3b8d8b899a778
9108
Author: Neil Roberts <neil@linux.intel.com>
9109
Date: Wed Nov 18 14:21:22 2009 +0000
9111
disable-npots: Don't allow the GL version to be 2.0
9113
Cogl now assumes non-power-of-two textures are supported if the GL
9114
version is >= 2.0 so the disable-npots utility should also change the
9117
tests/tools/disable-npots.c | 79 +++++++++++++++++++++++++++++++++++++++----
9118
1 files changed, 72 insertions(+), 7 deletions(-)
9120
commit e80030755e37df28b30903bad63dc776b546abc3
9121
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9122
Date: Wed Nov 18 15:21:09 2009 +0000
9124
build: Fix EXTRA_DIST and MAINTAINERCLEANFILES rules
9126
Makefile.am | 19 +++++++------------
9127
1 files changed, 7 insertions(+), 12 deletions(-)
9129
commit ed4f0beac944a036839cd860f8aad223ffc101f2
9130
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9131
Date: Wed Nov 18 15:11:56 2009 +0000
9135
README | 36 ++++++++++++++++++------------------
9136
1 files changed, 18 insertions(+), 18 deletions(-)
9138
commit 44f926556d98737fd10b18fdb6951a41672c46db
9139
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9140
Date: Wed Nov 18 15:06:37 2009 +0000
9142
docs: Update the "writing a backend" documentation
9144
The documentation on how a ClutterBackend and stage are implemented
9145
is a wee bit out of date.
9147
HACKING.backends | 39 +++++++++++++++++++++++----------------
9148
1 files changed, 23 insertions(+), 16 deletions(-)
9150
commit f8e4e6727290aa63d2ec7dc30ca46913c98cb7ea
9151
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9152
Date: Wed Nov 18 14:56:59 2009 +0000
9154
Remove clutter.symbols
9156
The symbols file is unused since Clutter 0.6, and the win32 backend
9157
does not depend on it anymore.
9159
clutter.symbols | 611 -------------------------------------------------------
9160
1 files changed, 0 insertions(+), 611 deletions(-)
9162
commit a4f1d1d6cc12b7007ac467673cf8d98dba132c87
9163
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9164
Date: Wed Nov 18 14:56:25 2009 +0000
9166
Rename ChangeLog.SVN
9168
ChangeLog.SVN |15737 ----------------------------------------------
9169
ChangeLog.pre-git-import |15737 ++++++++++++++++++++++++++++++++++++++++++++++
9170
2 files changed, 15737 insertions(+), 15737 deletions(-)
9172
commit 60fae6a92eff5b61e4074f40161aa7b0b40bf2b9
9173
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9174
Date: Wed Nov 18 14:37:43 2009 +0000
9176
build: Add cogl-matrix-private.h to the dist
9178
clutter/cogl/cogl/Makefile.am | 1 +
9179
1 files changed, 1 insertions(+), 0 deletions(-)
9181
commit 425f3b466041f46d1faed06da1cc46665bad60c6
9182
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9183
Date: Wed Nov 18 14:34:33 2009 +0000
9185
build: Add cogl-feature-functions.h to the dist
9187
clutter/cogl/cogl/driver/gl/Makefile.am | 1 +
9188
clutter/cogl/cogl/driver/gles/Makefile.am | 3 ++-
9189
2 files changed, 3 insertions(+), 1 deletions(-)
9191
commit d11343532d813cf9b16e5c1ac92c0f0bc56e8850
9192
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9193
Date: Wed Nov 18 14:21:08 2009 +0000
9195
build: Generate per-cycle ChangeLog files
9197
We should generate a ChangeLog for each minor version cycle, starting
9198
from the Git import date (since before that we used ChangeLog-style
9199
commit messages that don't really look good with the Git ones).
9201
For this reason we can take Cairo's Makefile.am.changelog file and,
9202
after tweaking it to fit our use case, let it generate the correct
9207
build/autotools/Makefile.am.changelog | 91 +++++++++++++++++++++++++++------
9208
configure.ac | 8 ++-
9209
4 files changed, 82 insertions(+), 25 deletions(-)
9211
commit 18e9d0db6fc9e120a63485d1ecbc8b5514d66c77
9212
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9213
Date: Wed Nov 18 12:20:53 2009 +0000
9215
build: Move ChangeLog rules in a separate file
9217
The ChangeLog creation rules should be moved to their own file, to
9218
make it easier to fix or change them in the future.
9220
Makefile.am | 20 +-------------------
9221
build/autotools/Makefile.am | 1 +
9222
build/autotools/Makefile.am.changelog | 19 +++++++++++++++++++
9223
3 files changed, 21 insertions(+), 19 deletions(-)
9225
commit 142305b1d51e9a3c69e8e2e224480297e43f79ea
9226
Author: Neil Roberts <neil@linux.intel.com>
9227
Date: Wed Nov 18 13:23:10 2009 +0000
9229
cogl: Add the missing terminators for the arrays of feature functions
9231
_cogl_feature_check expects the array of function names to be
9232
terminated with a NULL pointer but I forgot to add this. This was
9233
causing crashes depending on what happened to be in memory after the
9236
clutter/cogl/cogl/driver/gl/cogl.c | 1 +
9237
clutter/cogl/cogl/driver/gles/cogl.c | 1 +
9238
2 files changed, 2 insertions(+), 0 deletions(-)
9240
commit 70aeb1c64216d75ba63f1cbae1c824b69305bd73
9241
Author: Christian Persch <chpe@gnome.org>
9242
Date: Tue Nov 17 20:43:39 2009 +0100
9244
Pass the interned string value to the binding callback
9246
http://bugzilla.openedhand.com/show_bug.cgi?id=1891
9248
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
9250
clutter/clutter-binding-pool.c | 2 +-
9251
1 files changed, 1 insertions(+), 1 deletions(-)
9253
commit 2832940603733873a76cb4c890f4a3d656d07112
9254
Author: Neil Roberts <neil@linux.intel.com>
9255
Date: Tue Nov 17 18:06:31 2009 +0000
9257
cogl: Use the GL_EXT_blend_{func,equation}_separate extensions
9259
We should use these extensions to check for glBlendFuncSeparate and
9260
glBlendEquationSeparate as well as checking the GL version number.
9262
.../cogl/cogl/driver/gl/cogl-feature-functions.h | 12 ++++++------
9263
1 files changed, 6 insertions(+), 6 deletions(-)
9265
commit 6e0877507e00016cac1136c4e0dbab67e6a3e9ba
9266
Author: Neil Roberts <neil@linux.intel.com>
9267
Date: Tue Nov 17 17:22:22 2009 +0000
9269
cogl: Don't bother checking for NPOTs or VBOs on later GLs
9271
For VBOs, we don't need to check for the extension if the GL version
9272
is greater than 1.5. Non-power-of-two textures are given in 2.0.
9274
We could also assume shader support in GL 2.0 except that the function
9275
names are different from those in the extension so it wouldn't work
9276
well with the current mechanism.
9278
.../cogl/cogl/driver/gl/cogl-feature-functions.h | 4 +++-
9279
clutter/cogl/cogl/driver/gl/cogl.c | 3 ++-
9280
2 files changed, 5 insertions(+), 2 deletions(-)
9282
commit 4a8c1ff8fa6244cad0b0e770ab6f68e319271675
9283
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9284
Date: Tue Nov 17 15:32:00 2009 +0000
9286
build: Clean up the configure summary
9288
Split out into section the configuration report, and clean
9289
up the reported settings - including when experimental features
9292
configure.ac | 97 ++++++++++++++++++++++++++++++++++++++--------------------
9293
1 files changed, 64 insertions(+), 33 deletions(-)
9295
commit 91cde78a7023d728ebb33c73684fc3702ad87963
9296
Author: Neil Roberts <neil@linux.intel.com>
9297
Date: Tue Nov 17 13:52:40 2009 +0000
9299
cogl: Make it easier to add checks for GL extensions
9301
Previously if you need to depend on a new GL feature you had to:
9303
- Add typedefs for all of the functions in cogl-defines.h.in
9305
- Add function pointers for each of the functions in
9306
cogl-context-driver.h
9308
- Add an initializer for the function pointers in
9309
cogl-context-driver.c
9311
- Add a check for the extension and all of the functions in
9312
cogl_features_init. If the extension is available under multiple
9313
names then you have to duplicate the checks.
9315
This is quite tedious and error prone. This patch moves all of the
9316
features and their functions into a list of macro invocations in
9317
cogl-feature-functions.h. The macros can be redefined to implement all
9318
of the above tasks from the same header.
9320
The features are described in a struct with a pointer to a table of
9321
functions. A new function takes the feature description from this
9322
struct and checks for its availability. The feature can take a list of
9323
extension names with a list of alternate namespaces (such as "EXT" or
9324
"ARB"). It can also detect the feature from a particular version of
9327
The typedefs are now gone and instead the function pointer in the Cogl
9328
context just directly contains the type.
9330
Some of the functions in the context were previously declared with the
9331
'ARB' extension. This has been removed so that now all the functions
9332
have no suffix. This makes more sense when the extension could
9333
potentially be merged into GL core as well.
9335
clutter/cogl/cogl/Makefile.am | 2 +
9336
clutter/cogl/cogl/cogl-feature-private.c | 141 ++++++++
9337
clutter/cogl/cogl/cogl-feature-private.h | 71 ++++
9338
clutter/cogl/cogl/cogl-journal.c | 10 +-
9339
clutter/cogl/cogl/cogl-vertex-buffer.c | 21 +-
9340
clutter/cogl/cogl/driver/gl/cogl-context-driver.c | 58 +---
9341
clutter/cogl/cogl/driver/gl/cogl-context-driver.h | 81 +----
9342
clutter/cogl/cogl/driver/gl/cogl-defines.h.in | 361 -------------------
9343
.../cogl/cogl/driver/gl/cogl-feature-functions.h | 326 +++++++++++++++++
9344
clutter/cogl/cogl/driver/gl/cogl-program.c | 89 +++---
9345
clutter/cogl/cogl/driver/gl/cogl-shader.c | 27 +-
9346
clutter/cogl/cogl/driver/gl/cogl.c | 369 ++------------------
9347
.../cogl/cogl/driver/gles/cogl-context-driver.c | 19 +-
9348
.../cogl/cogl/driver/gles/cogl-context-driver.h | 25 +-
9349
clutter/cogl/cogl/driver/gles/cogl-defines.h.in | 70 ----
9350
.../cogl/cogl/driver/gles/cogl-feature-functions.h | 72 ++++
9351
clutter/cogl/cogl/driver/gles/cogl.c | 82 ++---
9352
17 files changed, 794 insertions(+), 1030 deletions(-)
9354
commit 4734b7be418274cf00390c805b472b9493100157
9355
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9356
Date: Sat Nov 14 13:03:59 2009 +0000
9358
docs: Detail the Clutter debugging flags
9360
doc/reference/clutter/running-clutter.xml | 56 +++++++++++++++++++++++++++++
9361
1 files changed, 56 insertions(+), 0 deletions(-)
9363
commit 037192552ed126c35e430c11f030f16e984ac0b4
9364
Author: Neil Roberts <neil@linux.intel.com>
9365
Date: Fri Nov 13 17:23:13 2009 +0000
9367
win32: Remove the check for GL 1.2
9369
Since 568c29ba4 the GL version is now validated further up in
9370
ClutterStage via Cogl so there is no need for the Win32 backend to do
9373
clutter/win32/clutter-stage-win32.c | 42 -----------------------------------
9374
1 files changed, 0 insertions(+), 42 deletions(-)
9376
commit 62a37d8e538abc6d0c67bd69b4eb2a724668cce0
9377
Author: Neil Roberts <neil@linux.intel.com>
9378
Date: Wed Nov 11 16:42:53 2009 +0000
9380
Use the GL_ARB_multitexture extension on GL 1.2
9382
Cogl requires multi-texturing support. This is only available as an
9383
extension in GL 1.2 so we should check for it before accepting the
9386
http://bugzilla.openedhand.com/show_bug.cgi?id=1875
9388
clutter/cogl/cogl/driver/gl/cogl.c | 46 ++++++++++++++++++++++++++++++-----
9389
1 files changed, 39 insertions(+), 7 deletions(-)
9391
commit 2e99b276a4d312d6123426e2c88adf621a427c86
9392
Author: Neil Roberts <neil@linux.intel.com>
9393
Date: Wed Nov 11 13:38:52 2009 +0000
9395
cogl-material: Fallback to BlendFunc if BlendFuncSeparate is unavailable
9397
glBlendFuncSeparate is only available in OpenGL 1.4. If we
9398
conditionally check for this then Clutter will work with OpenGL 1.2.
9400
http://bugzilla.openedhand.com/show_bug.cgi?id=1875
9402
clutter/cogl/cogl/cogl-material.c | 11 ++++++++---
9403
1 files changed, 8 insertions(+), 3 deletions(-)
9405
commit 568c29ba491e4a6b3bef426be528d7246110011c
9406
Author: Neil Roberts <neil@linux.intel.com>
9407
Date: Wed Nov 11 13:26:54 2009 +0000
9409
Validate that the GL version is >= 1.2
9411
There is a new internal Cogl function called _cogl_check_driver_valid
9412
which looks at the value of the GL_VERSION string to determine whether
9413
the driver is supported. Clutter now calls this after the stage is
9414
realized. If it fails then the stage is marked as unrealized and a
9417
_cogl_features_init now also checks the version number before getting
9418
the function pointers for glBlendFuncSeparate and
9419
glBlendEquationSeparate. It is not safe to just check for the presence
9420
of the functions because some drivers may define the function without
9421
fully implementing the spec.
9423
The GLES version of _cogl_check_driver_valid just always returns TRUE
9424
because there are no version requirements yet.
9426
Eventually the function could also check for mandatory extensions if
9429
http://bugzilla.openedhand.com/show_bug.cgi?id=1875
9431
clutter/clutter-backend.c | 14 ++++--
9432
clutter/clutter-private.h | 3 +
9433
clutter/clutter-stage.c | 22 ++++++++-
9434
clutter/cogl/cogl/cogl.c | 5 ++
9435
clutter/cogl/cogl/cogl.h.in | 9 ++++
9436
clutter/cogl/cogl/driver/gl/cogl.c | 87 +++++++++++++++++++++++++++++++---
9437
clutter/cogl/cogl/driver/gles/cogl.c | 6 ++
9438
7 files changed, 133 insertions(+), 13 deletions(-)
9440
commit 677ff9fb30a99b850eb1b41c34f80e5e01f8e43e
9441
Author: Samuel Degrande <Samuel.Degrande@lifl.fr>
9442
Date: Tue Oct 27 11:18:49 2009 +0100
9444
Can no more include clutter-stage.h inside clutter-win32.h
9446
http://bugzilla.openedhand.com/show_bug.cgi?id=1847
9448
Signed-off-by: Neil Roberts <neil@linux.intel.com>
9450
clutter/win32/clutter-win32.h | 2 +-
9451
1 files changed, 1 insertions(+), 1 deletions(-)
9453
commit 26ce94eda071cc133ab2b469cae0b19aae727279
9454
Author: Samuel Degrande <Samuel.Degrande@lifl.fr>
9455
Date: Mon Oct 26 16:28:36 2009 +0100
9457
Adapt win32 backend to the semantic change of StageWindow
9459
http://bugzilla.openedhand.com/show_bug.cgi?id=1847
9461
Signed-off-by: Neil Roberts <neil@linux.intel.com>
9463
clutter/win32/clutter-backend-win32.c | 34 ++--
9464
clutter/win32/clutter-stage-win32.c | 345 +++++++++++++++++----------------
9465
clutter/win32/clutter-stage-win32.h | 2 +
9466
3 files changed, 194 insertions(+), 187 deletions(-)
9468
commit b69ee0989b3ec4b588a1e80ea933b3b8997f6898
9469
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9470
Date: Fri Nov 13 15:27:18 2009 +0000
9472
tests: Add instructions to test-box-layout
9474
tests/interactive/test-box-layout.c | 17 ++++++++++++++++-
9475
1 files changed, 16 insertions(+), 1 deletions(-)
9477
commit 568ad044eba38198ecdb32f671047bffa27353a9
9478
Author: Neil Roberts <neil@linux.intel.com>
9479
Date: Fri Nov 13 13:39:24 2009 +0000
9481
Clear pending events for a stage when it is destroyed
9483
We can not process events for a stage that has been destroyed so we
9484
should make sure that the events for the stage are removed from the
9485
global event queue during dispose.
9487
http://bugzilla.openedhand.com/show_bug.cgi?id=1882
9489
clutter/clutter-stage.c | 18 ++++++++++++++++++
9490
1 files changed, 18 insertions(+), 0 deletions(-)
9492
commit 49cd887aabf7ff8cbfb147ceacfc82e3c75c0c9b
9493
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9494
Date: Fri Nov 13 14:43:57 2009 +0000
9496
docs: Document the AnimationMode definition
9498
Both ClutterAlpha:mode and ClutterAnimation:mode can be defined using:
9501
• the "nick" field of the AnimationMode GEnumValue
9502
• a custom, tweener-like string
9504
All these methods should be documented.
9506
clutter/clutter-alpha.c | 8 ++++-
9507
clutter/clutter-animation.c | 61 +++++++++++++++++++++++++++++++++++++++++++
9508
2 files changed, 67 insertions(+), 2 deletions(-)
9510
commit c8d57037882729a7ea0117726f2e8e48b10416ac
9511
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9512
Date: Fri Nov 13 14:10:29 2009 +0000
9514
tests: Add unit for Animation definitions
9516
Verify that an Animation can be defined using ClutterScript.
9518
No initial/final state of the animation, yet.
9521
tests/conform/test-conform-main.c | 1 +
9522
tests/conform/test-script-parser.c | 22 ++++++++++++++++++++++
9523
tests/data/test-script-animation.json | 14 ++++++++++++++
9524
4 files changed, 38 insertions(+), 0 deletions(-)
9526
commit d54f4e944c8725c84a5534d519fb3f9de7b95430
9527
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9528
Date: Fri Nov 13 14:08:49 2009 +0000
9532
clutter/clutter-animation.c | 7 +++----
9533
clutter/clutter-script-parser.c | 3 +--
9534
2 files changed, 4 insertions(+), 6 deletions(-)
9536
commit 95b55588ad6c57cbeb7cda50886e709aa1ae1c00
9537
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9538
Date: Fri Nov 13 14:07:25 2009 +0000
9540
tests: Print out parser errors if present
9542
If the conformance test for the Script parser throws an error
9543
and we've enabled verbosity then we should print out the error
9544
message before aborting.
9546
tests/conform/test-script-parser.c | 10 ++++++++--
9547
1 files changed, 8 insertions(+), 2 deletions(-)
9549
commit 9bae5535646b64e7c43f3a628942531d14e5a0f1
9550
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9551
Date: Fri Nov 13 13:21:47 2009 +0000
9553
animation: Override parsing :mode
9555
Like in ClutterAlpha, ClutterAnimation:mode must be overridden when
9556
parsing a Script definition, as we accept both a numeric id and the
9557
string id for easing modes.
9559
clutter/clutter-animation.c | 51 ++++++++++++++++++++++++++++++++++++++++++-
9560
1 files changed, 50 insertions(+), 1 deletions(-)
9562
commit dab1da20ae144afe56f48c0a3be5865d84245658
9563
Author: Neil Roberts <neil@linux.intel.com>
9564
Date: Mon Oct 5 13:37:11 2009 +0100
9566
[cogl-primitives] Don't clear the whole stencil buffer
9568
When _cogl_add_path_to_stencil_buffer is used to draw a path we don't
9569
need to clear the entire stencil buffer. Instead it can clear just the
9570
bounding box of the path. This adds an extra parameter called
9571
'need_clear' which is only set if the stencil buffer is being used for
9574
http://bugzilla.openedhand.com/show_bug.cgi?id=1829
9576
clutter/cogl/cogl/cogl-clip-stack.c | 6 +++-
9577
clutter/cogl/cogl/cogl-primitives.c | 37 ++++++++++++++++++++++++++++------
9578
2 files changed, 34 insertions(+), 9 deletions(-)
9580
commit bc8faf52f4a817d7d023f554dcd7ace0efac9942
9581
Author: Neil Roberts <neil@linux.intel.com>
9582
Date: Thu Nov 12 17:00:15 2009 +0000
9584
Remove _cogl_flush_matrix_stacks from cogl-internal.h
9586
The definition for this function was removed in f7d64e5abvoid so it
9587
should be removed from the header too.
9589
clutter/cogl/cogl/cogl-internal.h | 2 --
9590
1 files changed, 0 insertions(+), 2 deletions(-)
9592
commit 9fa562ad216d516d1cd66f72aa39eaad0a5c40b9
9593
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9594
Date: Wed Nov 11 10:32:39 2009 +0000
9596
cogl: Declare cogl_is_bitmap()
9598
The function is automatically defined by the CoglHandle type
9599
definition macro, but it still requires to be declared in the
9600
header file to be used.
9602
clutter/cogl/cogl/cogl-bitmap.h | 13 +++++++++++++
9603
1 files changed, 13 insertions(+), 0 deletions(-)
9605
commit 482e4e8d111fa76194a20ccd120eac41afa277d8
9606
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9607
Date: Tue Nov 10 12:21:26 2009 +0000
9609
tests: Display the index inside text-box-layout
9611
Since the rectangles packed inside the BoxLayout interactive test
9612
have random colors it's not easy to verify the ordering. By using
9613
the CoglPango API to print out the index in the middle of each
9616
tests/interactive/test-box-layout.c | 41 ++++++++++++++++++++++++++++++++--
9617
1 files changed, 38 insertions(+), 3 deletions(-)
9619
commit 4bc3d02ebd928b4bc7c59811b9e90aae36750cfb
9620
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9621
Date: Tue Nov 10 12:20:14 2009 +0000
9623
box-layout: Honour :text-direction
9625
During size request and allocation a ClutterBoxLayout should honour
9626
the ClutterActor:text-direction property, and change the order of
9629
clutter/clutter-box-layout.c | 206 +++++++++++++++++++++++++++++-------------
9630
1 files changed, 142 insertions(+), 64 deletions(-)
9632
commit adab87b520699892e012d601821a5aee11410125
9633
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9634
Date: Tue Nov 10 12:18:32 2009 +0000
9636
text: Dirty layout cache on text direction changes
9638
When the text direction changes we should evict the cached layouts
9639
to avoid stale entries in case the direction change produces a layout
9642
clutter/clutter-text.c | 23 +++++++++++++++++++++++
9643
1 files changed, 23 insertions(+), 0 deletions(-)
9645
commit f94f7692a6836ed4a5f039e4c2a44966b47c77fc
9646
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9647
Date: Fri Nov 6 16:55:46 2009 +0000
9649
actor: Add :text-direction property
9651
Every actor should have a property for retrieving (and setting) the
9654
The text direction is used to provide a consisten behaviour in both
9655
left-to-right and right-to-left languages. For instance, ClutterText
9656
should perform key navigation following text direction. Layout
9657
managers should also take into account text direction to derive the
9658
right packing order for their children.
9660
clutter/clutter-actor.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++-
9661
clutter/clutter-actor.h | 4 ++
9662
2 files changed, 119 insertions(+), 1 deletions(-)
9664
commit 53a9d0c637ee1ef07e9251b77f86f0cd42ab611e
9665
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9666
Date: Fri Nov 6 16:50:53 2009 +0000
9668
Use the newly added ClutterTextDirection enumeration
9670
Instead of using PangoDirection directly we should use the
9671
ClutterTextDirection enumeration.
9673
We also need a pair of accessor functions for setting and
9674
getting the default text direction.
9676
clutter/clutter-main.c | 43 +++++++++++++++++++++++++++++++++----------
9677
clutter/clutter-main.h | 3 +++
9678
2 files changed, 36 insertions(+), 10 deletions(-)
9680
commit 3958df4ff9b3aa800df2e0f1695fd143439d870a
9681
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9682
Date: Fri Nov 6 16:49:55 2009 +0000
9684
Add ClutterTextDirection enumeration
9686
The ClutterTextDirection is composed of three values:
9688
DEFAULT: a flag for returning the default text direction
9692
clutter/clutter-types.h | 17 +++++++++++++++++
9693
1 files changed, 17 insertions(+), 0 deletions(-)
9695
commit 2671c425894c89a4afd415b70e8ebbc4f057e02b
9696
Author: Neil Roberts <neil@linux.intel.com>
9697
Date: Mon Nov 9 12:12:27 2009 +0000
9699
Revert changes to test-cogl-primitives.c from 272e227109
9701
These changes caused the test to try to load redhand.png but this no
9702
longer works since the TESTS_DATADIR changes in 0b4899ef23. The only
9703
use of the hand is commented out anyway so it looks like the changes
9704
were intended for temporary debugging.
9706
tests/interactive/test-cogl-primitives.c | 14 --------------
9707
1 files changed, 0 insertions(+), 14 deletions(-)
9709
commit ac9f65cb92196e2eafd4b1e25dabd9cb6a428db3
9710
Author: Damien Lespiau <damien.lespiau@intel.com>
9711
Date: Mon Nov 9 13:05:40 2009 +0000
9713
build: Make the glib-mkenums generated files depend on their templates
9715
With this, if one changes the underlying template files, we run
9716
glib-mkenums again to generate updated glib_enum_[ch] files.
9718
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
9720
build/autotools/Makefile.am.enums | 4 ++--
9721
1 files changed, 2 insertions(+), 2 deletions(-)
9723
commit 1be23c0cc9741cbe68a54cd84de772bd120254b6
9724
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9725
Date: Mon Nov 9 16:44:34 2009 +0000
9727
build: Fix --with-imagebackend configure switch
9729
An overeager search and replace broke the image backend command
9730
line switch for the configure script.
9733
1 files changed, 1 insertions(+), 1 deletions(-)
9735
commit 1ce25ffbb2561ab5eb3f6b07b74ec49587f44d32
9736
Author: Neil Roberts <neil@linux.intel.com>
9737
Date: Mon Nov 9 11:50:16 2009 +0000
9739
cogl: Add an initialiser for enable_flags in cogl_begin_gl
9741
This fixes a warning about an uninitialised value. It could also
9742
potentially fix some crashes for example if the enable_flags value
9743
happened to include a bit for enabling a vertex array if no vertex
9744
buffer pointer was set.
9746
clutter/cogl/cogl/cogl.c | 2 +-
9747
1 files changed, 1 insertions(+), 1 deletions(-)
9749
commit 09c04d4c67ea8d3ebeb3ee5adfc3752562cae3cc
9750
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9751
Date: Mon Nov 9 11:07:27 2009 +0000
9753
text: Add a NULL preedit string check
9755
This commit avoids a critical warning introduced by commit
9756
bc51b8ca47ac90e52ab6a27ff791ea97d53f4648
9758
clutter/clutter-text.c | 4 +++-
9759
1 files changed, 3 insertions(+), 1 deletions(-)
9761
commit bc51b8ca47ac90e52ab6a27ff791ea97d53f4648
9762
Author: Raymond Liu <raymond.liu@intel.com>
9763
Date: Mon Nov 9 16:42:15 2009 +0800
9765
Fix cursor position in preedit status
9767
http://bugzilla.openedhand.com/show_bug.cgi?id=1871
9769
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
9771
clutter/clutter-text.c | 14 ++++++++++++--
9772
1 files changed, 12 insertions(+), 2 deletions(-)
9774
commit 7e17822cfd860fd694735fbf550013f7f8b7a915
9775
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9776
Date: Fri Nov 6 15:06:39 2009 +0000
9778
Clean up cogl.h template
9780
The inclusion order is mostly random, and it should really be
9781
in alphabetic order, just like clutter.h.
9783
Also, cogl-vertex-buffer.h is included twice.
9785
clutter/cogl/cogl/cogl.h.in | 17 +++++++++--------
9786
1 files changed, 9 insertions(+), 8 deletions(-)
9788
commit fcd8237ac5f5dc7bc485b8b5726824129215beea
9789
Author: Tim Horton <hortont424@gmail.com>
9790
Date: Fri Nov 6 11:57:43 2009 +0000
9792
osx: CGBitmapContextCreate can't make 24bpp, alphaless offscreen pixmaps
9794
While loading a JPEG from disk (with clutter_texture_new_from_file),
9795
I got the following:
9797
<Error>: CGBitmapContextCreate: unsupported parameter combination: 8
9798
integer bits/component; 24 bits/pixel; 3-component colorspace;
9799
kCGImageAlphaNone; 3072 bytes/row.
9800
<Error>: CGContextDrawImage: invalid context
9802
Looking around, I found that CGBitmapContextCreate can't make 24bpp
9803
offscreen pixmaps without an alpha channel...
9805
This fixes the bug, and seems to not break other things...
9807
http://bugzilla.openedhand.com/show_bug.cgi?id=1159
9809
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
9811
clutter/cogl/cogl/cogl-bitmap-pixbuf.c | 18 +++---------------
9812
1 files changed, 3 insertions(+), 15 deletions(-)
9814
commit 5c67e8e0c09c83c470f999c86091181cc373d5b6
9815
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9816
Date: Fri Nov 6 14:07:46 2009 +0000
9818
script: Coding style clean-ups
9820
clutter/clutter-script.c | 38 +++++++++++++++++++-------------------
9821
1 files changed, 19 insertions(+), 19 deletions(-)
9823
commit 179a66c922f85fdfc8968f7f60a5b76154696ad4
9824
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9825
Date: Fri Nov 6 14:07:26 2009 +0000
9827
script: Document private functions
9829
clutter/clutter-script.c | 71 +++++++++++++++++++++++++++++++++++++++++++--
9830
1 files changed, 67 insertions(+), 4 deletions(-)
9832
commit 30bc36082e2922b11b98907fde12f64fd4f7399d
9833
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9834
Date: Fri Nov 6 14:04:36 2009 +0000
9836
Do not pass flags to g_module_open(NULL)
9838
The flags are ignored when opening the main module, so we
9839
should pass 0 to avoid confusion when reading the source.
9841
clutter/clutter-alpha.c | 2 +-
9842
clutter/clutter-script-parser.c | 6 +++---
9843
clutter/clutter-script.c | 2 +-
9844
clutter/cogl/cogl/cogl.c | 4 ++--
9845
4 files changed, 7 insertions(+), 7 deletions(-)
9847
commit 4262f79f34c35a8eb620fb82eb0e36d5ac191600
9848
Merge: b9e519c 031d4d6
9849
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9850
Date: Fri Nov 6 11:50:22 2009 +0000
9852
Merge branch 'josh-osx-fixes'
9855
osx: Fix a warning on Snow Leopard
9856
docs: Fix OS X docs to install Ports in correct order
9857
osx: Implement the updated ClutterStageWindow interface
9859
commit b9e519c3b2bc5fc01743568a2a37029c61fdf6ef
9860
Author: Joshua Lock <josh@linux.intel.com>
9861
Date: Thu Nov 5 15:50:21 2009 +0000
9863
tests: Remove a spurious #include
9865
The test-backface-culling has what looks like a stray #include in which
9866
stops the test compiling for backends without GdkPixbuf. Remove it.
9868
http://bugzilla.openedhand.com/show_bug.cgi?id=1867
9870
tests/conform/test-backface-culling.c | 2 --
9871
1 files changed, 0 insertions(+), 2 deletions(-)
9873
commit 031d4d6203f007fea2b95ca883c7113d0160372d
9874
Author: Joshua Lock <josh@linux.intel.com>
9875
Date: Thu Nov 5 15:48:25 2009 +0000
9877
osx: Fix a warning on Snow Leopard
9879
Apple where nice and changed API between releases. This patch checks the
9880
version of the compilation environment and tries to use the right parameter
9883
http://bugzilla.openedhand.com/show_bug.cgi?id=1866
9885
clutter/osx/clutter-backend-osx.c | 8 ++++++--
9886
1 files changed, 6 insertions(+), 2 deletions(-)
9888
commit 58f1dfcf35626b8b1ea896dfbd27623b15779fce
9889
Author: Joshua Lock <josh@linux.intel.com>
9890
Date: Thu Nov 5 15:31:56 2009 +0000
9892
docs: Fix OS X docs to install Ports in correct order
9894
The order in which the MacPorts are installed is important otherwise we open
9895
the user up to a world of pain.
9896
This patch also tweaks the OS X docs to follow the formatting of the rest of
9897
the docs and to discuss the option of GtkDoc.
9899
http://bugzilla.openedhand.com/show_bug.cgi?id=1865
9901
doc/reference/clutter/building-clutter.xml | 67 +++++++++++++++------------
9902
1 files changed, 37 insertions(+), 30 deletions(-)
9904
commit 4533e37744f8751e254741104d27b7b37e2fdfd7
9905
Author: Joshua Lock <josh@linux.intel.com>
9906
Date: Thu Nov 5 15:44:32 2009 +0000
9908
osx: Implement the updated ClutterStageWindow interface
9910
In the new Clutter world backend stage implementations should be lightweight
9911
objects implementing the ClutterStageWindow interface and not ClutterActor
9914
This patch performs various cut-n-pastes to acheive that for the OSX backend
9916
http://bugzilla.openedhand.com/show_bug.cgi?id=1864
9918
clutter/osx/clutter-backend-osx.c | 4 +-
9919
clutter/osx/clutter-stage-osx.c | 196 ++++++++++++++++---------------------
9920
clutter/osx/clutter-stage-osx.h | 8 +-
9921
3 files changed, 89 insertions(+), 119 deletions(-)
9923
commit cb60c038acb0de9178d0aee22e3a9847653c9627
9924
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9925
Date: Fri Nov 6 11:33:32 2009 +0000
9927
behaviour: Implement the implicit alpha parsing
9929
ClutterBehaviour should implement the Scriptable interface
9930
and parse ClutterAlpha when implicitly defined, instead of
9931
having this ad hoc code inside ClutterScriptParser itself.
9933
After all, only ClutterBehaviour supports Alpha defined
9936
clutter/clutter-behaviour.c | 46 +++++++++++++++++++++++++++++++++----
9937
clutter/clutter-script-parser.c | 19 +--------------
9938
clutter/clutter-script-private.h | 4 +-
9939
3 files changed, 45 insertions(+), 24 deletions(-)
9941
commit f1ed8be066a7c5f16e2e876cc76ef1f5348bc14e
9942
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9943
Date: Fri Nov 6 11:32:28 2009 +0000
9945
conform: Add unit for properties holding objects
9947
Exercise the definition of GObjects for properties defined using
9951
tests/conform/test-conform-main.c | 1 +
9952
tests/conform/test-script-parser.c | 25 +++++++++++++++++++++++++
9953
tests/data/test-script-object-property.json | 13 +++++++++++++
9954
4 files changed, 40 insertions(+), 0 deletions(-)
9956
commit 7279afd28c1bc47e1b47f0c2f8d53e5ea75df832
9957
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9958
Date: Fri Nov 6 11:17:42 2009 +0000
9960
script: Generic assignment of properties requiring objects
9962
The ClutterScriptParser should do most of the heavy-lifting for
9963
parsing a JSON object member defining another JSON object into
9964
a GObject property defined using a GParamSpecObject.
9966
clutter/clutter-script-parser.c | 62 ++++++++++++++++++++++++++++++++------
9967
1 files changed, 52 insertions(+), 10 deletions(-)
9969
commit 185107c6cfe174ed829ce26241bf0e2f532a4394
9970
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9971
Date: Fri Nov 6 10:53:43 2009 +0000
9973
conformance: Add unit on the implicit alpha definition
9975
Exercise the implicit alpha and timeline definition to catch
9976
regressions in the ClutterScript parser code.
9979
tests/conform/test-conform-main.c | 1 +
9980
tests/conform/test-script-parser.c | 32 ++++++++++++++++++++++++++++
9981
tests/data/test-script-implicit-alpha.json | 8 +++++++
9982
4 files changed, 42 insertions(+), 0 deletions(-)
9984
commit f9581ca5ce87437df40e27bc0228fdb6c6897619
9985
Author: Emmanuele Bassi <ebassi@linux.intel.com>
9986
Date: Fri Nov 6 10:17:30 2009 +0000
9988
script: Apply properties when constructing implicit timelines
9990
The object construction is done in two passes, now, so we must do both
9991
passes when parsing implicit timelines from a fake ObjectInfo.
9993
clutter/clutter-script-parser.c | 1 +
9994
1 files changed, 1 insertions(+), 0 deletions(-)
9996
commit abae6013e10e08cc67be53d5d067ca5ed4ad7ee3
9997
Author: Robert Bragg <robert@linux.intel.com>
9998
Date: Thu Nov 5 16:50:24 2009 +0000
10000
Remove all internal use of deprecated cogl_clip_* API
10002
cogl_clip_push, and cogl_clip_push_window_rect which are now deprecated were
10003
used in various places internally so this just switches to using the
10004
replacement functions.
10006
clutter/clutter-actor.c | 10 +++++-----
10007
clutter/clutter-main.c | 2 +-
10008
clutter/clutter-text.c | 6 +++---
10009
tests/conform/test-cogl-viewport.c | 10 ++++++----
10010
tests/interactive/test-clip.c | 8 ++++----
10011
5 files changed, 19 insertions(+), 17 deletions(-)
10013
commit c1d9e09d38bcf61eb7e6f88f5a052870d8abdc5e
10014
Author: Robert Bragg <robert@linux.intel.com>
10015
Date: Thu Nov 5 10:56:24 2009 +0000
10017
[clip-stack] stop using deprecated cogl_clip_push_window_rect API
10019
try_pushing_rect_as_window_rect now uses the new
10020
cogl_clip_push_window_rectangle API.
10022
clutter/cogl/cogl/cogl-clip-stack.c | 2 +-
10023
1 files changed, 1 insertions(+), 1 deletions(-)
10025
commit 272e227109387c9287081e9dad467290e4e93faf
10026
Author: Robert Bragg <robert@linux.intel.com>
10027
Date: Wed Nov 4 19:31:43 2009 +0000
10029
[cogl-clip] deprecate parts and cleanup the API
10031
cogl_clip_push() which accepts a rectangle in model space shouldn't have
10032
been defined to take x,y,width,height arguments because this isn't consistant
10033
with other Cogl API dealing with model space rectangles. If you are using a
10034
coordinate system with the origin at the center and the y+ extending up,
10035
then x,y,width,height isn't as natural as (x0,y0)(x1,y1). This API has
10036
now been replace with cogl_clip_push_rectangle()
10038
(As a general note: the Cogl API should only use the x,y,width,height style
10039
when the appropriate coordinate space is defined by Cogl to have a top left
10040
origin. E.g. window coordinates, or potentially texture coordinates)
10042
cogl_clip_push_window_rect() shouldn't have been defined to take float
10043
arguments since we only clip with integral pixel precision. We also
10044
shouldn't have abbreviated "rectangle". This API has been replaced with
10045
cogl_clip_push_window_rectangle()
10047
cogl_clip_ensure() wasn't documented at all in Clutter 1.0 and probably
10048
no one even knew it existed. This API isn't useful, and so it's now
10049
deprecated. If no one complains we may remove the API altogether for
10052
cogl_clip_stack_save() and cogl_clip_stack_restore() were originally added
10053
to allow us to save/restore the clip when switching to/from offscreen
10054
rendering. Now that offscreen draw buffers are defined to own their clip
10055
state and the state will be automatically saved and restored this API is now
10056
redundant and so deprecated.
10059
clutter/cogl/cogl/cogl-clip-stack.c | 44 ++++++++-------
10060
clutter/cogl/cogl/cogl.h.in | 92 ++++++++++++++++++++++++++++--
10061
doc/reference/cogl/cogl-sections.txt | 9 ++-
10062
tests/interactive/test-cogl-primitives.c | 14 +++++
10063
5 files changed, 144 insertions(+), 28 deletions(-)
10065
commit 6cd49fdd40bd20716365e399c3dfa039e3b6f377
10066
Author: Robert Bragg <robert@linux.intel.com>
10067
Date: Wed Nov 4 20:17:56 2009 +0000
10069
[clip-stack] Internally track model space clip rects as (x0,y0)(x1,y1) pairs
10071
Don't track the rectangles as x0,y0,width,height. This is in preparation
10072
for some API tidy up.
10074
clutter/cogl/cogl/cogl-clip-stack.c | 113 ++++++++++++++++++-----------------
10075
1 files changed, 59 insertions(+), 54 deletions(-)
10077
commit 7752ed98f1eafa9bd65fbdd2e018b0026430b579
10078
Author: Robert Bragg <robert@linux.intel.com>
10079
Date: Wed Nov 4 19:42:17 2009 +0000
10081
[clip-stack] move lots of supporting code from cogl.c to cogl-clip-stack.c
10083
There was quite a bit of code in cogl.c that was only used to support
10084
cogl-clip-stack.c, so this has now been moved to cogl-clip-stack.c
10086
clutter/cogl/cogl/cogl-clip-stack.c | 277 +++++++++++++++++++++++++++++++----
10087
clutter/cogl/cogl/cogl.c | 237 ------------------------------
10088
2 files changed, 250 insertions(+), 264 deletions(-)
10090
commit 864e12df056ccbd116eb0a0992a82e5194c26787
10091
Author: Robert Bragg <robert@linux.intel.com>
10092
Date: Wed Nov 4 16:55:18 2009 +0000
10094
[debug] Adds a COGL_DEBUG=force-scanline-paths
10096
For a long time now the GLES driver for Cogl has supported a fallback
10097
scanline rasterizer for filling paths when no stencil buffer is available,
10098
but now that we build the same cogl-primitives code for GL and GLES I
10099
thought it may sometimes be useful for debugging to force Cogl to use the
10100
scanline rasterizer instead of the current stencil buffer approach.
10102
clutter/cogl/cogl/cogl-debug.c | 3 ++-
10103
clutter/cogl/cogl/cogl-debug.h | 3 ++-
10104
clutter/cogl/cogl/cogl-primitives.c | 3 ++-
10105
3 files changed, 6 insertions(+), 3 deletions(-)
10107
commit 0b4899ef23e4979326439613dfba814bd49aeb2e
10108
Author: Emmanuele Bassi <ebassi@linux.intel.com>
10109
Date: Thu Nov 5 17:30:33 2009 +0000
10111
tests: Clean up interactive test build
10113
The build for interactive tests creates symbolic links for the data
10114
under tests/data; it also uses symbolic links for creating "binaries"
10115
for each interactive test. This is less than ideal, though.
10117
Instead, the tests should build a path to the data files by using
10118
a pre-processor define like TESTS_DATADIR; both g_build_filename() and
10119
pre-processor string concatenation can be used to generate a valid
10120
file name with the full path to the files.
10122
The build system should also create wrapper scripts, just like we
10123
do inside the conformance test suite, to be able to launch single
10127
tests/interactive/Makefile.am | 59 +++++++++++--------
10128
tests/interactive/test-actor-clone.c | 27 +++++----
10129
tests/interactive/test-actors.c | 11 ++--
10130
tests/interactive/test-behave.c | 14 +++--
10131
tests/interactive/test-bin-layout.c | 6 ++-
10132
tests/interactive/test-clip.c | 5 +-
10133
tests/interactive/test-cogl-multitexture.c | 15 ++++-
10134
tests/interactive/test-cogl-offscreen.c | 6 ++-
10135
tests/interactive/test-cogl-tex-convert.c | 28 ++++++---
10136
tests/interactive/test-cogl-tex-getset.c | 12 +++-
10137
tests/interactive/test-cogl-tex-polygon.c | 9 ++-
10138
tests/interactive/test-cogl-tex-tile.c | 6 ++-
10139
tests/interactive/test-depth.c | 5 +-
10140
tests/interactive/test-devices.c | 5 +-
10141
tests/interactive/test-fbo.c | 11 +++-
10142
tests/interactive/test-layout.c | 5 +-
10143
tests/interactive/test-multistage.c | 5 +-
10144
tests/interactive/test-paint-wrapper.c | 5 +-
10145
tests/interactive/test-pixmap.c | 2 +-
10146
tests/interactive/test-rotate.c | 8 ++-
10147
tests/interactive/test-script.c | 9 ++-
10148
tests/interactive/test-shader.c | 84 +++++++++++++++-------------
10149
tests/interactive/test-texture-async.c | 57 ++++++++-----------
10150
tests/interactive/test-texture-quality.c | 15 ++++-
10151
tests/interactive/test-viewport.c | 8 ++-
10152
tests/interactive/wrapper.sh | 4 +-
10153
27 files changed, 260 insertions(+), 162 deletions(-)
10155
commit c3368c0d157c5fa28a4e29e6caaed4323e82990d
10156
Author: Emmanuele Bassi <ebassi@linux.intel.com>
10157
Date: Thu Nov 5 12:24:37 2009 +0000
10159
layout: Add layout properties introspection
10161
In order to know if a layout property exists and retrieve its
10162
description in form of a GParamSpec, we need a wrapper API inside
10163
ClutterLayoutManager. This allows introspecting a LayoutManager
10164
sub-class and eventually serialize and deserialize it.
10166
clutter/clutter-layout-manager.c | 76 ++++++++++++++++++++++++++++
10167
clutter/clutter-layout-manager.h | 103 ++++++++++++++++++++------------------
10168
2 files changed, 130 insertions(+), 49 deletions(-)
10170
commit b0c9de273096d8949c8eafa3d5da017bb551e3f0
10171
Author: Emmanuele Bassi <ebassi@linux.intel.com>
10172
Date: Thu Nov 5 12:23:49 2009 +0000
10174
box-layout: Add get_child_meta_type() override
10176
Return the GType of ClutterBoxChild.
10178
clutter/clutter-box-layout.c | 8 ++++++++
10179
1 files changed, 8 insertions(+), 0 deletions(-)
10181
commit eea00d280549641403dbaae27e370e16fe9f975b
10182
Author: Emmanuele Bassi <ebassi@linux.intel.com>
10183
Date: Thu Nov 5 12:23:22 2009 +0000
10185
bin-layout: Add get_child_meta_type() override
10187
Return the GType of ClutterBinLayer.
10189
clutter/clutter-bin-layout.c | 8 ++++++++
10190
1 files changed, 8 insertions(+), 0 deletions(-)
10192
commit e6dff59b27d7eb6d9fca51f6ddf74fcb7d8253e3
10193
Author: Emmanuele Bassi <ebassi@linux.intel.com>
10194
Date: Thu Nov 5 11:57:06 2009 +0000
10196
layout: Add LayoutManager::get_child_meta_type()
10198
In order to inspect a LayoutManager using LayoutMeta we need a
10199
virtual function that returns the GType of the LayoutMeta used.
10201
clutter/clutter-layout-manager.c | 7 +++++++
10202
clutter/clutter-layout-manager.h | 3 +++
10203
2 files changed, 10 insertions(+), 0 deletions(-)
10205
commit 95d78acb4ca72951fc9552c9fcffa645b1be739a
10206
Author: Emmanuele Bassi <ebassi@linux.intel.com>
10207
Date: Wed Nov 4 16:45:44 2009 +0000
10209
script: Allow parsing child properties
10211
The ClutterScript parser needs to be extended to parse child properties
10212
and apply them after an actor has been added to a container. In order to
10213
distinguish child properties from regular GObject properties we can use
10214
the "child::" prefix, e.g.:
10217
"type" : "ClutterRectangle",
10219
"child::has-focus" : true,
10223
Parsing child properties can be deferred to the ClutterScriptable
10224
interface, just like regular properties.
10227
clutter/clutter-script-parser.c | 115 ++++++++++++++++++++++++++-
10228
clutter/clutter-script-private.h | 2 +
10229
tests/conform/Makefile.am | 2 +
10230
tests/conform/test-conform-main.c | 1 +
10231
tests/conform/test-script-parser.c | 156 ++++++++++++++++++++++++++++++++++++
10232
tests/data/test-script-child.json | 21 +++++
10233
7 files changed, 297 insertions(+), 1 deletions(-)
10235
commit c52d8780325a0077f7fc6e898d902462ffbe3c8c
10236
Author: Robert Bragg <robert@linux.intel.com>
10237
Date: Sat Oct 17 04:06:56 2009 +0100
10239
[cogl-primitives] Get rid of driver specific cogl-primitives code
10241
These files were practically identical, except the gles code had additional
10242
support for filling paths without a stencil buffer. All the driver code has
10243
now been moved into cogl/cogl-primitives.c
10245
clutter/cogl/cogl/cogl-primitives.c | 488 +++++++++++++++++++++-
10246
clutter/cogl/cogl/driver/gl/Makefile.am | 1 -
10247
clutter/cogl/cogl/driver/gl/cogl-primitives.c | 313 --------------
10248
clutter/cogl/cogl/driver/gles/Makefile.am | 1 -
10249
clutter/cogl/cogl/driver/gles/cogl-primitives.c | 516 -----------------------
10250
5 files changed, 482 insertions(+), 837 deletions(-)
10252
commit 8ba13d6495d00885380db3a23f552633c5c43c0a
10253
Author: Emmanuele Bassi <ebassi@linux.intel.com>
10254
Date: Wed Nov 4 15:21:03 2009 +0000
10256
script: Clean up Color parsing rules
10258
All the ClutterColor parsing rules should be coalesced inside
10259
clutter_script_parse_color(): object, array and string notations
10260
are the canonical ways of defining a ClutterColor inside a
10261
ClutterScript definition. Having a single function in charge of
10262
the parsing cleans up the code.
10264
clutter/clutter-script-parser.c | 17 +++++++----------
10265
tests/conform/test-script-parser.c | 6 ++++++
10266
2 files changed, 13 insertions(+), 10 deletions(-)
10268
commit 3e815de32b2aa525365b80fb7d2f5d5dc9d2fb72
10269
Author: Emmanuele Bassi <ebassi@linux.intel.com>
10270
Date: Wed Nov 4 15:20:12 2009 +0000
10272
script: Simplify boxed types parsing
10274
We should use the typed accessors for complex JSON types, and
10275
be more liberal in what we accept.
10277
clutter/clutter-script-parser.c | 147 +++++++++++++++------------------------
10278
1 files changed, 57 insertions(+), 90 deletions(-)
10280
commit 4df59d330ca4ba7ffcff830001ddbc4fe64167ee
10281
Author: Emmanuele Bassi <ebassi@linux.intel.com>
10282
Date: Wed Nov 4 14:05:13 2009 +0000
10284
script: Separate construction from properties application
10286
Currently, ClutterScriptParser will construct the object (using the
10287
construct-only and construct parameters), apply the properties from
10288
the ClutterScript definition, and eventuall will add children and
10291
The construction phase should be more compartimentalized: the objects
10292
should be constructed first and eventual children and behaviours
10293
added. Then, once an object is requested or when the parsing process
10294
has terminated, all the properties should be applied.
10296
This change allows us to set up the actors before setting their
10297
non-construct properties.
10299
clutter/clutter-script-parser.c | 137 ++++++++++++++++++--------------------
10300
clutter/clutter-script-private.h | 8 ++-
10301
clutter/clutter-script.c | 22 +++++-
10302
3 files changed, 88 insertions(+), 79 deletions(-)
10304
commit 31e5dadb68cf285d57935573e16713201f24503e
10305
Author: Emmanuele Bassi <ebassi@linux.intel.com>
10306
Date: Wed Nov 4 13:32:26 2009 +0000
10308
script: Move all parser code inside ClutterScriptParser
10310
ClutterScript is currently a mix of parser-related code and
10311
the ClutterScript object. All the parser-related code should
10312
be moved inside a private class, ClutterScriptParser, inheriting
10315
clutter/clutter-script-parser.c | 1288 +++++++++++++++++++++++++++++++++-
10316
clutter/clutter-script-private.h | 38 +-
10317
clutter/clutter-script.c | 1485 +++-----------------------------------
10318
3 files changed, 1438 insertions(+), 1373 deletions(-)
10320
commit d7cfa158513263a5f75934a8f9ddceea9a6b8800
10321
Author: Emmanuele Bassi <ebassi@linux.intel.com>
10322
Date: Wed Nov 4 11:50:45 2009 +0000
10324
conform: Add the beginnings of a ClutterScript test suite
10326
ClutterScript is a very complicated piece of machinery, with a
10327
parser that has custom variations on top of the basic JSON
10328
format; it could also be extended in the future, so if we don't
10329
want to introduce regressions or break existing ClutterScript
10330
definitions, we'd better have a conformance test suite.
10333
tests/conform/Makefile.am | 1 +
10334
tests/conform/test-conform-main.c | 2 ++
10335
tests/conform/test-script-parser.c | 33 +++++++++++++++++++++++++++++++++
10336
tests/data/Makefile.am | 13 ++++++++-----
10337
tests/data/test-script-single.json | 10 ++++++++++
10338
6 files changed, 55 insertions(+), 5 deletions(-)
10340
commit 7d891d9dd4acbaedc5b2a2f95445a1e93fd1529f
10341
Author: Emmanuele Bassi <ebassi@linux.intel.com>
10342
Date: Wed Nov 4 11:47:09 2009 +0000
10344
tests: Allow getting data files from the tests/data directory
10346
The units under the conformance test suite should be able to use
10347
external files. Linking the files in tests/conform like the
10348
interactive tests do seems like a hack piled on top of a hack, so
10349
instead we should provide a programmatic way for a conformance
10350
test unit to get the full path of a file, regardless of where the
10351
tests/data directory is.
10353
We can use a define to get the full path of tests/data and then
10354
a function using g_build_filename() to construct the path to the
10357
tests/conform/Makefile.am | 14 +++++++++-----
10358
tests/conform/test-conform-common.h | 1 +
10359
tests/conform/test-conform-main.c | 6 ++++++
10360
3 files changed, 16 insertions(+), 5 deletions(-)
10362
commit 3e20468c6bd982eb8be0e3cbf9c9b72df38eaeeb
10363
Author: Emmanuele Bassi <ebassi@linux.intel.com>
10364
Date: Wed Nov 4 11:05:25 2009 +0000
10366
Add new conformance tests to the ignore list
10369
1 files changed, 3 insertions(+), 0 deletions(-)
10371
commit 6e571928a49641f353f31e1f69328e1466b6ac66
10372
Author: Emmanuele Bassi <ebassi@linux.intel.com>
10373
Date: Tue Nov 3 18:30:28 2009 +0000
10375
script: Take a copy of property nodes
10377
Instead of counting on a JsonNode pointer to survive we should take
10378
a copy. This allows keeping unresolved properties across different
10379
ClutterScript passes.
10381
clutter/clutter-script.c | 5 ++++-
10382
1 files changed, 4 insertions(+), 1 deletions(-)
10384
commit 4ad57aa3e4caedd89e9c60c60aadbc239290cfe3
10385
Author: Emmanuele Bassi <ebassi@linux.intel.com>
10386
Date: Tue Nov 3 18:29:52 2009 +0000
10388
script: Use JsonObject direct accessors
10390
Instead of getting the JsonNode for a member of which we mandate
10391
the type we can use the typed accessors of JsonObject.
10393
clutter/clutter-script.c | 16 ++++++++++------
10394
1 files changed, 10 insertions(+), 6 deletions(-)
10396
commit 0ff420fab59221fccf711893c363145607b40898
10397
Merge: f6e0e48 4258214
10398
Author: Robert Bragg <robert@linux.intel.com>
10399
Date: Wed Nov 4 03:46:45 2009 +0000
10401
Merge commit 'cogl-reorg-draw-buffers'
10403
* cogl-reorg-draw-buffers: (38 commits)
10404
[test-fbo] greatly simplify the test
10405
[tests] test-backface-culling: test culling with offscreen rendering
10406
[tests] Adds test-cogl-readpixels.c for very basic cogl_read_pixels testing
10407
[tests] Adds test-cogl-offscreen to validate offscreen draw buffer
10408
[tests] test-cogl-viewport tests semantics of over/under size viewports
10409
[test-texture-fbo] comment the colors defined in corner_colors
10410
Add a conformance test for clutter_texture_new_from_actor
10411
[cogl-texture-2d-sliced] allow COGL_FORMAT_ANY with _new_with_size()
10412
[texture] fix rounding when calculating update_fbo viewport offset
10413
[texture] switch to a new design for handling offscreen rendering
10414
[texture] split out fbo update code from cluter_texture_paint
10415
[texture] push/pop draw buffer when painting actors to a texture
10416
[texture] Avoid redundant use of cogl_clip_stack_save when drawing offscreen
10417
[cogl-draw-buffer] fix Cogl -> GL viewport coord conversion
10418
[cogl_clip_push_window_rect] fix Cogl -> GL coordinate conversion
10419
[matrix] Adds cogl_matrix_get_inverse API
10420
[debug] Adds a COGL_DEBUG=matrices debug option
10421
[cogl-matrix] Import Mesa's matrix manipulation code
10422
[cogl] avoid any state changes when cogl_set_backface_culling_enable is a nop
10423
[cogl] Use clockwise face winding for offscreen buffers with culling enabled
10426
commit 4258214e509edbc4ff82de418ffc9662088fa835
10427
Author: Robert Bragg <robert@linux.intel.com>
10428
Date: Wed Oct 7 10:40:15 2009 +0100
10430
[test-fbo] greatly simplify the test
10432
This test tried to do too much, and I can't remember the last time I saw this
10435
It no longer tries to create a texture from an offscreen actor and it no
10436
longer tries to use shaders.
10438
It does though show that chaining of clutter_texture_new_from_actor now
10439
works, and that animating the source actor is reflected in textures created
10442
When run you should see three actors:
10443
- on the left is the pristine source actor rotating around the y-axis
10444
- in the middle is the first texture created from the source actor
10445
- and on the right a texture created from the middle actor
10447
Note: the somewhat strange bobbing of the middle and right textures is
10448
actually correct given how it was decided long ago to map the transformed
10449
(to screen space) allocation of the source actor to the texture. When the
10450
hand spins around the perspective projection of the top of the hand results
10451
in the origin of the texture bobbing up to a higher stage position, but the
10452
position of the textures is fixed. This design also means we end up
10453
reallocating our offscreen draw buffer every frame that the actors
10454
transformed size changes, which isn't ideal.
10456
tests/interactive/test-fbo.c | 192 ++++++++----------------------------------
10457
1 files changed, 34 insertions(+), 158 deletions(-)
10459
commit ffb592de5908d844b527cb4fe75b7195eb0dc55d
10460
Author: Robert Bragg <robert@linux.intel.com>
10461
Date: Thu Oct 22 19:01:27 2009 +0100
10463
[tests] test-backface-culling: test culling with offscreen rendering
10465
Since offscreen rendering is internally forced to be upside down Cogl
10466
needs to reverse the glFrontFace winding order so as not to interfere
10467
with the use of cogl_set_backface_culling_enabled()
10469
This ensures we test that mechanism.
10471
tests/conform/test-backface-culling.c | 172 +++++++++++++++++++++------------
10472
1 files changed, 111 insertions(+), 61 deletions(-)
10474
commit 60b642f5d6aada0d237cfb7d81f6b78299c29e73
10475
Author: Robert Bragg <robert@linux.intel.com>
10476
Date: Thu Oct 22 16:56:01 2009 +0100
10478
[tests] Adds test-cogl-readpixels.c for very basic cogl_read_pixels testing
10480
Mostly this was written to verify that we don't flip the data read back from
10481
an offscreen draw buffer. (since all offscreen rendering is done upside
10484
tests/conform/Makefile.am | 1 +
10485
tests/conform/test-cogl-readpixels.c | 153 ++++++++++++++++++++++++++++++++++
10486
tests/conform/test-conform-main.c | 1 +
10487
3 files changed, 155 insertions(+), 0 deletions(-)
10489
commit 2ff7f2d287f8dc80f0e6e02bdc388d4fee99d878
10490
Author: Robert Bragg <robert@linux.intel.com>
10491
Date: Thu Oct 22 12:36:17 2009 +0100
10493
[tests] Adds test-cogl-offscreen to validate offscreen draw buffer
10495
This adds a basic test to check that rendering a few colored rectangles
10496
offscreen works and that the modelview gets restored when switching back to
10497
the previous buffer.
10499
tests/conform/Makefile.am | 1 +
10500
tests/conform/test-cogl-offscreen.c | 169 +++++++++++++++++++++++++++++++++++
10501
tests/conform/test-conform-main.c | 1 +
10502
3 files changed, 171 insertions(+), 0 deletions(-)
10504
commit 369e68630daf7f833da986a19ad17043b43d61e3
10505
Author: Robert Bragg <robert@linux.intel.com>
10506
Date: Wed Oct 21 16:06:43 2009 +0100
10508
[tests] test-cogl-viewport tests semantics of over/under size viewports
10510
Unlike OpenGL Cogl puts the origin of windows/viewports at the top left
10511
instead of bottom left. This test verifies that we correctly translate Cogl
10512
viewports to OpenGL viewports for the awkward cases where the given viewport
10513
has an offset and/or the viewport has a different size to the current draw
10516
tests/conform/Makefile.am | 1 +
10517
tests/conform/test-cogl-viewport.c | 417 ++++++++++++++++++++++++++++++++++++
10518
tests/conform/test-conform-main.c | 2 +
10519
3 files changed, 420 insertions(+), 0 deletions(-)
10521
commit bc24190b9ac32405d4be24d84968357921c7f7e2
10522
Author: Robert Bragg <robert@linux.intel.com>
10523
Date: Mon Nov 2 01:23:25 2009 +0000
10525
[test-texture-fbo] comment the colors defined in corner_colors
10527
It helps to be able to quickly glance at the definition to see which
10528
quadrant of the test actor should be which color, so when debugging a
10529
problem and looking at the visual output you can easily verify if it's being
10530
flipped upside down/left to right.
10532
tests/conform/test-texture-fbo.c | 8 ++++----
10533
1 files changed, 4 insertions(+), 4 deletions(-)
10535
commit b41a81fb0868e51bf03d25446f8cc9748fcd6bc7
10536
Author: Neil Roberts <neil@linux.intel.com>
10537
Date: Thu Sep 17 14:25:29 2009 +0100
10539
Add a conformance test for clutter_texture_new_from_actor
10541
This contains four tests :-
10543
- A regular onscreen source with a clone next to it
10545
- An offscreen source with a clone. This is currently commented out
10546
because it no longer works.
10548
- An onscreen source with a rectangular clip and a clone.
10550
- An onscreen source with a clip from a path and a clone.
10552
The sources are all a 2x2 grid of colors. Each clone is tested that it
10553
either contains the color that should be at that grid position or that
10554
the stage color is showing through if the source is clipped.
10556
tests/conform/Makefile.am | 1 +
10557
tests/conform/test-conform-main.c | 1 +
10558
tests/conform/test-texture-fbo.c | 255 +++++++++++++++++++++++++++++++++++++
10559
3 files changed, 257 insertions(+), 0 deletions(-)
10561
commit fec13f6202067f0700514db6676d3984b78a26df
10562
Author: Robert Bragg <robert@linux.intel.com>
10563
Date: Sat Oct 31 00:01:44 2009 +0000
10565
[cogl-texture-2d-sliced] allow COGL_FORMAT_ANY with _new_with_size()
10567
It's useful when initialzing offscreen draw buffers to be able to ask
10568
Cogl to create a texture of a given size and with the default internal
10571
clutter/cogl/cogl/cogl-texture-2d-sliced.c | 2 +-
10572
1 files changed, 1 insertions(+), 1 deletions(-)
10574
commit ae57c30e937d90eb1e541edd36ae9f81aedc2854
10575
Author: Robert Bragg <robert@linux.intel.com>
10576
Date: Sun Nov 1 23:56:03 2009 +0000
10578
[texture] fix rounding when calculating update_fbo viewport offset
10580
When rendering to an fbo for supporting clutter_texture_new_from_actor we
10581
render to an fbo with the same size as the source actor, but with a viewport
10582
the same size as the stage. We offset the viewport so when we render the
10583
source actor in its normal transformed stage position it lands on the fbo.
10584
Previously we were rounding the transformed position given as a float by
10585
truncating the fraction (just using a C cast) but that resulted in an
10586
incorrect pixel offset when rendering offscreen depending on the source
10589
We now simply + 0.5 before casting (or -0.5 for negative numbers)
10591
clutter/clutter-texture.c | 14 +++++++++++++-
10592
1 files changed, 13 insertions(+), 1 deletions(-)
10594
commit 309f852efbde6a3e025225d01293509c28989d0c
10595
Author: Robert Bragg <robert@linux.intel.com>
10596
Date: Mon Nov 2 01:14:50 2009 +0000
10598
[texture] switch to a new design for handling offscreen rendering
10600
For supporting clutter_texture_new_from_actor(): when updating a
10601
ClutterTexture's fbo we previously set up an offset frustum in the
10602
perspective matrix before rendering source actors to an offscreen draw
10603
buffer so as to give a perspective as if it were being drawn at its
10604
original stage location.
10606
Now that Cogl supports offset viewports there is a simpler way...
10608
When we come to render the source actor to our offscreen draw buffer we
10609
now copy the projection matrix from the stage; we create a viewport
10610
that's also the same size as the stage (though larger than the offscreen
10611
draw buffer) and as before we apply the modelview transformations of
10612
the source actors ancestry before painting it.
10614
The only trick we need now is to offset the viewport according to the
10615
transformed (to screen space) allocation of the source actor (something we
10616
required previously too). We negatively offset the stage sized viewport
10617
such that the smaller offscreen draw buffer is positioned to sit underneath
10618
the source actor in stage coordinates.
10620
clutter/clutter-texture.c | 100 ++++++++++++++++-----------------------------
10621
1 files changed, 35 insertions(+), 65 deletions(-)
10623
commit 94a6028358caed32dba7ba37db9784c95d4690f2
10624
Author: Robert Bragg <robert@linux.intel.com>
10625
Date: Thu Sep 24 14:34:09 2009 +0100
10627
[texture] split out fbo update code from cluter_texture_paint
10629
To help keep clutter_texture_paint maintainable this splits out a big
10630
chunk of standalone code that's responsible for updating the fbo when
10631
clutter_texture_new_from_actor has been used.
10633
clutter/clutter-texture.c | 156 +++++++++++++++++++++++----------------------
10634
1 files changed, 81 insertions(+), 75 deletions(-)
10636
commit 2762e6d9b90731fd05b46aac407cebd3ba372027
10637
Author: Robert Bragg <robert@linux.intel.com>
10638
Date: Tue Oct 13 22:22:39 2009 +0100
10640
[texture] push/pop draw buffer when painting actors to a texture
10642
When updating the FBO for a source actor (to support
10643
clutter_texture_new_from_actor()) we used to simply set an offscreen draw
10644
buffer to be current, paint the source actor and then explicitly set the
10645
window to be current again. This precluded chaining texture_new_from_actor
10646
though because updating another FBO associated with a source actor would end
10647
up restoring the window as the current buffer instead of the previous
10648
offscreen buffer. Now that we use Cogl's draw buffer stack; chaining
10649
clutter_texture_new_from_actor() should be possible.
10651
clutter/clutter-texture.c | 5 +++--
10652
1 files changed, 3 insertions(+), 2 deletions(-)
10654
commit c7d229585f2e8dec30162cbad955230c25e16718
10655
Author: Robert Bragg <robert@linux.intel.com>
10656
Date: Fri Oct 23 00:16:30 2009 +0100
10658
[texture] Avoid redundant use of cogl_clip_stack_save when drawing offscreen
10660
Since cogl draw buffers now own their clip state the stage's clip state will
10661
automatically be saved and restored via the cogl_set_draw_buffer API.
10663
clutter/clutter-texture.c | 6 ------
10664
1 files changed, 0 insertions(+), 6 deletions(-)
10666
commit 90dbae5aa9a31688f2dd73b75df67607795fa60e
10667
Author: Robert Bragg <robert@linux.intel.com>
10668
Date: Sat Oct 31 00:00:33 2009 +0000
10670
[cogl-draw-buffer] fix Cogl -> GL viewport coord conversion
10672
Before we call glViewport we need to convert Cogl viewport coordinates
10673
(where the origin is defined to be top left) to OpenGL coordinates
10674
(where the origin is defined to be bottom left)
10676
We weren't considering that offscreen rendering is always upside down
10677
and in this case Cogl coordinates == OpenGL coordinates.
10679
clutter/cogl/cogl/cogl-draw-buffer.c | 15 +++++++++++----
10680
1 files changed, 11 insertions(+), 4 deletions(-)
10682
commit 149e3e168a14049bb496a6438b711caa1fbe8129
10683
Author: Robert Bragg <robert@linux.intel.com>
10684
Date: Fri Oct 30 23:57:56 2009 +0000
10686
[cogl_clip_push_window_rect] fix Cogl -> GL coordinate conversion
10688
Firstly this now uses the draw buffer height not the viewport height
10689
when we need to perform a y = height - y conversion, since (as the
10690
name suggests) we are dealing with window coordinates not viewport
10693
Secondly this skips any conversion when the current draw buffer is an
10694
offscreen draw buffer since offscreen rendering is always forced to be
10695
upside down and in this case Cogl window coordinates == GL window
10698
clutter/cogl/cogl/cogl-clip-stack.c | 32 ++++++++++++++++++++++++++------
10699
1 files changed, 26 insertions(+), 6 deletions(-)
10701
commit 0369a1b84d725c6dbd90f9a9dd1753bea1f9c3e1
10702
Author: Robert Bragg <robert@linux.intel.com>
10703
Date: Mon Oct 26 17:51:34 2009 +0000
10705
[matrix] Adds cogl_matrix_get_inverse API
10707
This new API takes advantage of the recently imported Mesa code to support
10708
inverse matrix calculation. The matrix code keeps track (via internal
10709
flags) of the transformations a matrix represents so that it can select an
10710
optimized inversion function.
10712
Note: although other aspects of the Cogl matrix API have followed a similar
10713
style to Cairo's matrix API we haven't added a cogl_matrix_invert API
10714
because the inverse of a CoglMatrix is actually cached as part of the
10715
CoglMatrix structure meaning a destructive API like cogl_matrix_invert
10716
doesn't let users take advantage of this caching design.
10718
clutter/cogl/cogl/cogl-context.h | 3 --
10719
clutter/cogl/cogl/cogl-matrix-stack.c | 11 +++++++
10720
clutter/cogl/cogl/cogl-matrix-stack.h | 3 ++
10721
clutter/cogl/cogl/cogl-matrix.c | 33 ++++++++++++++--------
10722
clutter/cogl/cogl/cogl-matrix.h | 21 ++++++++++++++
10723
clutter/cogl/cogl/cogl.c | 47 ++++++--------------------------
10724
6 files changed, 65 insertions(+), 53 deletions(-)
10726
commit 8051596e96a296cf30887f6e522a288895b628f8
10727
Author: Robert Bragg <robert@linux.intel.com>
10728
Date: Mon Oct 26 11:01:33 2009 +0000
10730
[debug] Adds a COGL_DEBUG=matrices debug option
10732
This adds a COGL_DEBUG=matrices debug option that can be used to trace all
10733
matrix manipulation done using the Cogl API. This can be handy when you
10734
break something in such a way that a trace is still comparable with a
10735
previous working version since you can simply diff a log of the broken
10736
version vs the working version to home in on the bug.
10738
clutter/cogl/cogl/cogl-debug.c | 3 +-
10739
clutter/cogl/cogl/cogl-debug.h | 3 +-
10740
clutter/cogl/cogl/cogl-matrix-private.h | 47 +++++++++++++++++++++++++++++++
10741
clutter/cogl/cogl/cogl-matrix.c | 20 +++++++++++++
10742
clutter/cogl/cogl/cogl.c | 5 +++
10743
5 files changed, 76 insertions(+), 2 deletions(-)
10745
commit eb438dd499c002a7d770d5e3d0c1fb1c84da933e
10746
Author: Robert Bragg <robert@linux.intel.com>
10747
Date: Mon Oct 26 08:23:21 2009 +0000
10749
[cogl-matrix] Import Mesa's matrix manipulation code
10751
This pulls in code from Mesa to improve our matrix manipulation support. It
10752
includes support for calculating the inverse of matrices based on top of a
10753
matrix categorizing system that allows optimizing certain matrix types.
10754
(the main thing we were after) but also adds some optimisations for
10757
Changes compared to the original code from Mesa:
10759
- Coding style is consistent with the rest of Cogl
10760
- Instead of allocating matrix->m and matrix->inv using malloc, our public
10761
CoglMatrix typedef is large enough to directly contain the matrix, its
10762
inverse, a type and a set of flags.
10763
- Instead of having a _math_matrix_analyse which updates the type, flags and
10764
inverse, we have _math_matrix_update_inverse which essentially does the
10765
same thing (internally making use of _math_matrix_update_type_and_flags())
10766
but with additional guards in place to bail out when the inverse matrix is
10768
- When initializing a matrix with the identity matrix we don't immediately
10769
initialize the inverse matrix; rather we just set the dirty flag for the
10770
inverse (since it's likely the user won't request the inverse of the
10773
clutter/cogl/cogl/Makefile.am | 2 +
10774
clutter/cogl/cogl/cogl-matrix-mesa.c | 1698 ++++++++++++++++++++++++++++++++++
10775
clutter/cogl/cogl/cogl-matrix-mesa.h | 226 +++++
10776
clutter/cogl/cogl/cogl-matrix.c | 39 +-
10777
clutter/cogl/cogl/cogl-matrix.h | 6 +-
10778
5 files changed, 1967 insertions(+), 4 deletions(-)
10780
commit d38d888f786f3be03778bcc10f20389e6c7ff1ff
10781
Author: Robert Bragg <robert@linux.intel.com>
10782
Date: Thu Oct 22 19:09:20 2009 +0100
10784
[cogl] avoid any state changes when cogl_set_backface_culling_enable is a nop
10786
This is a simple optimization to bail out of cogl_set_backface_culling_enable
10787
if it's not resulting in a change of state.
10789
clutter/cogl/cogl/cogl.c | 3 +++
10790
1 files changed, 3 insertions(+), 0 deletions(-)
10792
commit 764cca75b4ee6bb269097445cb5220f0e044a57c
10793
Author: Robert Bragg <robert@linux.intel.com>
10794
Date: Thu Oct 22 19:01:52 2009 +0100
10796
[cogl] Use clockwise face winding for offscreen buffers with culling enabled
10798
Because Cogl defines the origin for texture as top left and offscreen draw
10799
buffers can be used to render to textures, we (internally) force all
10800
offscreen rendering to be upside down. (because OpenGL defines the origin
10803
By forcing the users scene to be rendered upside down though we also reverse
10804
the winding order of all the drawn triangles which may interfere with the
10805
users use of backface culling. This patch ensures that we reverse the
10806
winding order for a front face (if culling is in use) while rendering
10807
offscreen so we don't conflict with the users back face culling.
10809
clutter/cogl/cogl/cogl-context.c | 2 +
10810
clutter/cogl/cogl/cogl-context.h | 1 +
10811
clutter/cogl/cogl/cogl-internal.h | 9 ++++++++
10812
clutter/cogl/cogl/cogl-journal.c | 1 +
10813
clutter/cogl/cogl/cogl-primitives.c | 1 +
10814
clutter/cogl/cogl/cogl-vertex-buffer.c | 1 +
10815
clutter/cogl/cogl/cogl.c | 33 ++++++++++++++++++++++++++++++++
10816
7 files changed, 48 insertions(+), 0 deletions(-)
10818
commit b2ebb7db485d0a58bcb642fe9e4584c85ac9a503
10819
Author: Robert Bragg <robert@linux.intel.com>
10820
Date: Fri Oct 30 23:54:13 2009 +0000
10822
[main] Use cogl_read_pixels not glReadPixels in clutter-main.c
10824
The debugging function read_pixels_to_file() and _clutter_do_pick were both
10825
directly calling glReadPixels, but we don't wan't Clutter making direct
10826
OpenGL calls and Cogl provides a suitable alternative. It also means
10827
read_pixels_to_file() doesn't need to manually flip the data read due to
10828
differences in Clutter/Cogl coordinate systems.
10830
clutter/clutter-main.c | 31 +++++++++++++++----------------
10831
1 files changed, 15 insertions(+), 16 deletions(-)
10833
commit 40b8399d49f6b0383b9eebcdf1ca501b5edb4f39
10834
Author: Robert Bragg <robert@linux.intel.com>
10835
Date: Tue Nov 3 12:54:45 2009 +0000
10837
[cogl_read_pixels] don't force a 4 byte pack alignment
10839
Technically this change shouldn't make a difference since we are
10840
calling glReadPixels with GL_RGBA GL_UNSIGNED_BYTE which is a 4
10841
byte format and it should always result in the same value according
10842
to how OpenGL calculates the location of sequential rows.
10844
i.e. k = a/s * ceil(snl/a) where:
10846
s = component size (1)
10847
n = number of components per pixel (4)
10848
l = number of pixels in a row
10850
k = 4/1 * ceil(4l/4) and k = 1/1 * ceil(4l/1) which are equivalent
10852
I'm changing it because I've seen i915 driver code that bails out of
10853
hardware accelerated paths if the alignment isn't 1, and because
10854
conceptually we have no alignment constraints here so even if the current
10855
value has no effect, when we start reading back other formats it may upset
10858
clutter/cogl/cogl/cogl.c | 10 +++++-----
10859
1 files changed, 5 insertions(+), 5 deletions(-)
10861
commit a222ee22f9dd35c5e0671914206759699e63750d
10862
Author: Robert Bragg <robert@linux.intel.com>
10863
Date: Mon Nov 2 01:11:21 2009 +0000
10865
[cogl_read_pixels] call cogl_flush() before changing glPixelStore state
10867
We were previously calling cogl_flush() after setting up the glPixelStore
10868
state for calling glReadPixels, but flushing the journal could itself
10869
change the glPixelStore state.
10871
clutter/cogl/cogl/cogl.c | 8 ++++----
10872
1 files changed, 4 insertions(+), 4 deletions(-)
10874
commit ed431a3c65507b3e3da4760eae6e2b22be1f27f5
10875
Author: Robert Bragg <robert@linux.intel.com>
10876
Date: Mon Nov 2 01:10:02 2009 +0000
10878
[cogl_read_pixels] ensure we flush the current draw buffer state before reading
10880
Make sure we call _cogl_draw_buffer_flush_state() before glReadPixels() to
10881
be sure we have bound the correct framebuffer.
10883
clutter/cogl/cogl/cogl.c | 3 +++
10884
1 files changed, 3 insertions(+), 0 deletions(-)
10886
commit b47404c91d6fac264840a0dafb5dd2dd5567c6a9
10887
Author: Robert Bragg <robert@linux.intel.com>
10888
Date: Mon Nov 2 01:12:10 2009 +0000
10890
[cogl_read_pixels] fixes for calculating the y offset when rendering offscreen
10892
Since offscreen rendering is forced to be upside down we don't need to do
10893
any conversion of the users coordinates to go from Cogl window coordinates
10894
to OpenGL window coordinates.
10896
clutter/cogl/cogl/cogl.c | 9 +++++++--
10897
1 files changed, 7 insertions(+), 2 deletions(-)
10899
commit 426197f51da9c4351b36812276f0caee06965cb1
10900
Author: Robert Bragg <robert@linux.intel.com>
10901
Date: Thu Oct 22 16:55:07 2009 +0100
10903
[read-pixels] don't flip data when reading from offscreen draw buffers
10905
Since we do all offscreen rendering upside down (so that we can have the
10906
origin for texture coordinates be the top left of textures for the cases
10907
where offscreen draw buffers are bound to textures) we don't need to flip
10908
data read back from an offscreen framebuffer before we we return it to the
10911
clutter/cogl/cogl/cogl.c | 9 ++++++++-
10912
1 files changed, 8 insertions(+), 1 deletions(-)
10914
commit 21322848e0094a025dc0b5461eff30e0d66542da
10915
Author: Robert Bragg <robert@linux.intel.com>
10916
Date: Wed Oct 21 23:22:45 2009 +0100
10918
[clip-stack] tidy up transform_point() code
10920
I was originally expecting the code not to handle offset viewports or
10921
viewports with a different size to the framebuffer, but it turns out the
10922
code worked fine. In the process though I think I made the code slightly
10925
clutter/cogl/cogl/cogl-clip-stack.c | 32 +++++++++++++++++++++-----------
10926
1 files changed, 21 insertions(+), 11 deletions(-)
10928
commit 8c3a132ecb3ce805c45dad70c05417713ed9d05d
10929
Author: Robert Bragg <robert@linux.intel.com>
10930
Date: Tue Nov 3 13:26:58 2009 +0000
10932
[cogl] deprecate cogl_viewport() in favour of cogl_set_viewport()
10934
cogl_viewport only accepted a viewport width and height, but there are times
10935
when it's also desireable to have a viewport offset so that a scene can be
10936
translated after projection but before hitting the framebuffer.
10939
clutter/clutter-texture.c | 2 +-
10940
clutter/cogl/cogl/cogl.c | 12 ++++++------
10941
clutter/cogl/cogl/cogl.h.in | 22 +++++++++++++++++++++-
10942
4 files changed, 34 insertions(+), 8 deletions(-)
10944
commit 1e2d88e7891a02b26d0143e28788072e8731be6b
10945
Author: Robert Bragg <robert@linux.intel.com>
10946
Date: Wed Oct 21 23:24:28 2009 +0100
10948
[cogl_read_pixels] use buffer not viewport height to calculate y offset
10950
glReadPixel takes window coordinates not viewport coordinates so we
10951
shouldn't have been assuming that the viewport height == window height.
10953
clutter/cogl/cogl/cogl.c | 8 +++-----
10954
1 files changed, 3 insertions(+), 5 deletions(-)
10956
commit e1630be35a912125b1f493c7d1007b65eaecd048
10957
Author: Robert Bragg <robert@linux.intel.com>
10958
Date: Wed Oct 21 23:20:44 2009 +0100
10960
[draw-buffer] Adds cogl_draw_buffer_get_{width,height} API
10962
Simply adds missing API to query the width and height of any Cogl draw buffer.
10964
clutter/cogl/cogl/cogl-draw-buffer-private.h | 4 ++++
10965
clutter/cogl/cogl/cogl-draw-buffer.c | 14 ++++++++++++++
10966
2 files changed, 18 insertions(+), 0 deletions(-)
10968
commit 12af2751392ea53959fa41dd7cb19e07358655f2
10969
Author: Robert Bragg <robert@linux.intel.com>
10970
Date: Wed Oct 21 23:24:49 2009 +0100
10972
[cogl] Make sure Cogl always knows the current window geometry
10974
Because Cogl defines the origin of viewport and window coordinates to be
10975
top-left it always needs to know the size of the current window so that Cogl
10976
window/viewport coordinates can be transformed into OpenGL coordinates.
10978
This also fixes cogl_read_pixels to use the current draw buffer height
10979
instead of the viewport height to determine the OpenGL y coordinate to use
10982
clutter/clutter-backend.c | 19 +++++++++++++++++-
10983
clutter/clutter-stage.c | 8 +++++++
10984
clutter/cogl/cogl/cogl-context.c | 2 +-
10985
clutter/cogl/cogl/cogl-context.h | 2 +-
10986
clutter/cogl/cogl/cogl-draw-buffer.c | 36 +++++++++++++++++++++++++++++----
10987
clutter/cogl/cogl/cogl.h.in | 3 ++
10988
6 files changed, 62 insertions(+), 8 deletions(-)
10990
commit e3391b0173479b9ba3b01321ab606d83999bee1a
10991
Author: Robert Bragg <robert@linux.intel.com>
10992
Date: Thu Oct 22 16:13:01 2009 +0100
10994
[cogl] Make sure we draw upside down to offscreen draw buffers
10996
First a few notes about Cogl coordinate systems:
10997
- Cogl defines the window origin, viewport origin and texture coordinates
10998
origin to be top left unlike OpenGL which defines them as bottom left.
10999
- Cogl defines the modelview and projection identity matrices in exactly the
11000
same way as OpenGL.
11001
- I.e. we believe that for 2D centric constructs: windows/framebuffers,
11002
viewports and textures developers are more used to dealing with a top left
11003
origin, but when modeling objects in 3D; an origin at the center with y
11004
going up is quite natural.
11006
The way Cogl handles textures is by uploading data upside down in OpenGL
11007
terms so that bottom left becomes top left. (Note: This also has the
11008
benefit that we don't need to flip the data we get from image decoding
11009
libraries since they typically also consider top left to be the image
11012
The viewport and window coords are mostly handled with various y =
11013
height - y tweaks before we pass y coordinates to OpenGL.
11015
Generally speaking though the handling of coordinate spaces in Cogl is a bit
11016
fragile. I guess partly because none of it was design to be, it just
11017
evolved from how Clutter defines its coordinates without much consideration
11018
or testing. I hope to improve this over a number of commits; starting here.
11020
This commit deals with the fact that offscreen draw buffers may be bound to
11021
textures but we don't "upload" the texture data upside down, and so if you
11022
texture from an offscreen draw buffer you need to manually flip the texture
11023
coordinates to get it the right way around. We now force offscreen
11024
rendering to be flipped upside down by tweaking the projection matrix right
11025
before we submit it to OpenGL to scale y by -1. The tweak is entirely
11026
hidden from the user such that if you call cogl_get_projection you will not
11029
clutter/cogl/cogl/cogl-context.c | 4 +++
11030
clutter/cogl/cogl/cogl-context.h | 4 +++
11031
clutter/cogl/cogl/cogl-draw-buffer-private.h | 3 ++
11032
clutter/cogl/cogl/cogl-matrix-stack.c | 36 ++++++++++++++++++-------
11033
4 files changed, 37 insertions(+), 10 deletions(-)
11035
commit 8b4c496f2a0291eb202d775e210b5901b6b73940
11036
Author: Robert Bragg <robert@linux.intel.com>
11037
Date: Thu Oct 22 12:35:33 2009 +0100
11039
[cogl] Ensure features are initialized first in cogl_create_context
11041
Previously some context initializing was being done without valid feature
11044
clutter/cogl/cogl/cogl-context.c | 10 +++++-----
11045
1 files changed, 5 insertions(+), 5 deletions(-)
11047
commit 419db4dcfbef74475e155f8dd060bc1c526d5643
11048
Author: Robert Bragg <robert@linux.intel.com>
11049
Date: Sat Oct 17 00:31:26 2009 +0100
11051
[clip-stack] Handle flipped rectangles in try_pushing_rect_as_window_rect()
11053
We were ignoring the possibility that the current modelview matrix may flip
11054
the incoming rectangle in which case we didn't calculate a valid scissor
11055
rectangle for clipping.
11057
This fixes: http://bugzilla.o-hand.com/show_bug.cgi?id=1809
11058
(Clipping doesn't work within an FBO)
11060
clutter/cogl/cogl/cogl-clip-stack.c | 18 ++++++++++++++++++
11061
1 files changed, 18 insertions(+), 0 deletions(-)
11063
commit f7d64e5abd5717bb522d28b7565ecccae63271fc
11064
Author: Robert Bragg <robert@linux.intel.com>
11065
Date: Fri Sep 25 14:34:34 2009 +0100
11067
[draw-buffers] First pass at overhauling Cogl's framebuffer management
11069
Cogl's support for offscreen rendering was originally written just to support
11070
the clutter_texture_new_from_actor API and due to lack of documentation and
11071
several confusing - non orthogonal - side effects of using the API it wasn't
11072
really possible to use directly.
11074
This commit does a number of things:
11075
- It removes {gl,gles}/cogl-fbo.{c,h} and adds shared cogl-draw-buffer.{c,h}
11076
files instead which should be easier to maintain.
11077
- internally CoglFbo objects are now called CoglDrawBuffers. A
11078
CoglDrawBuffer is an abstract base class that is inherited from to
11079
implement CoglOnscreen and CoglOffscreen draw buffers. CoglOffscreen draw
11080
buffers will initially be used to support the
11081
cogl_offscreen_new_to_texture API, and CoglOnscreen draw buffers will
11082
start to be used internally to represent windows as we aim to migrate some
11083
of Clutter's backend code to Cogl.
11084
- It makes draw buffer objects the owners of the following state:
11086
- projection matrix stack
11087
- modelview matrix stack
11089
(This means when you switch between draw buffers you will automatically be
11090
switching to their associated viewport, matrix and clip state)
11092
Aside from hopefully making cogl_offscreen_new_to_texture be more useful
11093
short term by having simpler and well defined semantics for
11094
cogl_set_draw_buffer, as mentioned above this is the first step for a couple
11096
- Its a step toward moving ownership for windows down from Clutter backends
11097
into Cogl, by (internally at least) introducing the CoglOnscreen draw
11098
buffer. Note: the plan is that cogl_set_draw_buffer will accept on or
11099
offscreen draw buffer handles, and the "target" argument will become
11100
redundant since we will instead query the type of the given draw buffer
11102
- Because we have a common type for on and offscreen framebuffers we can
11103
provide a unified API for framebuffer management. Things like:
11104
- blitting between buffers
11105
- managing ancillary buffers (e.g. attaching depth and stencil buffers)
11109
clutter/clutter-main.c | 5 +-
11110
clutter/cogl/cogl/Makefile.am | 2 +
11111
clutter/cogl/cogl/cogl-clip-stack.c | 199 +++++--
11112
clutter/cogl/cogl/cogl-clip-stack.h | 9 +-
11113
clutter/cogl/cogl/cogl-context.c | 34 +-
11114
clutter/cogl/cogl/cogl-context.h | 20 +-
11115
clutter/cogl/cogl/cogl-draw-buffer-private.h | 126 +++++
11116
clutter/cogl/cogl/cogl-draw-buffer.c | 555 ++++++++++++++++++++
11117
clutter/cogl/cogl/cogl-journal.c | 33 +-
11118
clutter/cogl/cogl/cogl-primitives.c | 19 +-
11119
clutter/cogl/cogl/cogl-texture.c | 19 +-
11120
clutter/cogl/cogl/cogl-vertex-buffer.c | 14 +-
11121
clutter/cogl/cogl/cogl.c | 220 +++++---
11122
clutter/cogl/cogl/cogl.h.in | 1 +
11123
clutter/cogl/cogl/driver/gl/Makefile.am | 2 -
11124
clutter/cogl/cogl/driver/gl/cogl-context-driver.c | 19 +-
11125
clutter/cogl/cogl/driver/gl/cogl-context-driver.h | 23 +-
11126
clutter/cogl/cogl/driver/gl/cogl-defines.h.in | 28 +-
11127
clutter/cogl/cogl/driver/gl/cogl-fbo.c | 315 -----------
11128
clutter/cogl/cogl/driver/gl/cogl-fbo.h | 39 --
11129
clutter/cogl/cogl/driver/gl/cogl-primitives.c | 99 +++-
11130
clutter/cogl/cogl/driver/gl/cogl-texture-driver.c | 2 +-
11131
clutter/cogl/cogl/driver/gl/cogl.c | 114 ++--
11132
clutter/cogl/cogl/driver/gles/Makefile.am | 2 -
11133
.../cogl/cogl/driver/gles/cogl-context-driver.c | 10 +
11134
.../cogl/cogl/driver/gles/cogl-context-driver.h | 17 +-
11135
clutter/cogl/cogl/driver/gles/cogl-defines.h.in | 70 +++
11136
clutter/cogl/cogl/driver/gles/cogl-fbo.c | 328 ------------
11137
clutter/cogl/cogl/driver/gles/cogl-fbo.h | 39 --
11138
clutter/cogl/cogl/driver/gles/cogl-primitives.c | 121 ++++-
11139
clutter/cogl/cogl/driver/gles/cogl.c | 75 +++
11140
31 files changed, 1471 insertions(+), 1088 deletions(-)
11142
commit f8f8873714043efbcbf92718493a94ac9ddf303f
11143
Author: Robert Bragg <robert@linux.intel.com>
11144
Date: Tue Oct 20 16:55:10 2009 +0100
11146
[stage-x11] Ensure viewport is initialized before first stage paint
11148
This ensures that glViewport is called before the first stage paint.
11149
Previously _clutter_stage_maybe_setup_viewport (which is done before we
11150
start painting) was bailing out without calling cogl_setup_viewport because
11151
the CLUTTER_STAGE_IN_RESIZE flag may be set if the stage was resized before
11152
the first paint. (NB: The CLUTTER_STAGE_IN_RESIZE flag isn't removed until
11153
we get an explicit event back from the X server since the window manager may
11154
choose to deny/alter the resize.)
11156
We now special case the first resize - where the viewport hasn't previously
11157
been initialized and use the requested geometry to initialize the
11158
glViewport without waiting for a reply from the server.
11160
clutter/x11/clutter-stage-x11.c | 18 ++++++++++++++++++
11161
clutter/x11/clutter-stage-x11.h | 7 ++++---
11162
2 files changed, 22 insertions(+), 3 deletions(-)
11164
commit ad98e96d977e43a882b8a2f680e59ed281c90baf
11165
Author: Robert Bragg <robert@linux.intel.com>
11166
Date: Tue Sep 15 22:19:01 2009 +0100
11168
[cogl-fbo] Bring the gles code more in line with gl code
11170
Over time the two cogl-fbo.c files have needlessly diverged as bug fixes or
11171
cleanups went into one version but not the other. This tries to bring them
11172
back in line with each other. It should actually be simple enough to move
11173
cogl-fbo.c to be a common file, and simply not build it for GLES 1.1, so
11174
maybe I'll follow up with such a patch soon.
11176
clutter/cogl/cogl/driver/gles/cogl-fbo.c | 8 ++++++++
11177
1 files changed, 8 insertions(+), 0 deletions(-)
11179
commit 613977f7108efb8897bffb2e47bfcf29bce29ddc
11180
Author: Robert Bragg <robert@linux.intel.com>
11181
Date: Tue Sep 15 22:15:03 2009 +0100
11183
[cogl-fbo] Remove poorly documented workaround for unknown driver/hardware
11185
The comment just said: "Some implementation require a clear before drawing
11186
to an fbo. Luckily it is affected by scissor test." and did a scissored
11187
clear, which is clearly a driver bug workaround, but for what driver? The
11188
fact that it was copied into the gles backend (or vica versa is also
11189
suspicious since it seems unlikely that the workaround is necessary for both
11192
We can easily restore the workaround with a better comment if this problem
11193
really still exists on current drivers, but for now I'd rather minimize
11194
hand-wavey workaround code that can't be tested.
11196
clutter/cogl/cogl/driver/gl/cogl-fbo.c | 10 ----------
11197
clutter/cogl/cogl/driver/gles/cogl-fbo.c | 19 -------------------
11198
2 files changed, 0 insertions(+), 29 deletions(-)
11200
commit 0599d12ec94344174c947310bddb5658f1b9db58
11201
Author: Damien Lespiau <damien.lespiau@gmail.com>
11202
Date: Sun Nov 1 14:36:05 2009 +0000
11204
texture: Don't compare fbo_source with COGL_INVALID_HANDLE
11206
fbo_source is a ClutterActor, it should be compared to NULL instead of
11207
COGL_INVALID_HANDLE.
11209
clutter/clutter-texture.c | 2 +-
11210
1 files changed, 1 insertions(+), 1 deletions(-)
11212
commit f6e0e48ac613d10d02d27182ebd48be1aeb8b474
11213
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11214
Date: Fri Oct 30 12:11:19 2009 +0000
11216
build: Add missing gles/cogl-context-driver.h to dist
11218
The gles/cogl-context-driver.h header file is missing from the
11219
dist target, which means it's not in the tarballs.
11221
clutter/cogl/cogl/driver/gles/Makefile.am | 1 +
11222
1 files changed, 1 insertions(+), 0 deletions(-)
11224
commit f551cbfb61adb1c454fa36477ad5847b6238e17b
11225
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11226
Date: Fri Oct 30 11:02:35 2009 +0000
11228
Add run-time version checks
11230
Just like CLUTTER_CHECK_VERSION does version checking at compile
11231
time, we need a way to verify the version of the library that we
11232
are linking against. This is mostly needed for language bindings
11233
and for run-time loadable modules -- when we'll get those.
11235
clutter/clutter-main.c | 34 ++++++++++++++++++++++++++++
11236
clutter/clutter-version.h.in | 15 +++++++++++-
11237
doc/reference/clutter/clutter-sections.txt | 7 +++++
11238
3 files changed, 55 insertions(+), 1 deletions(-)
11240
commit f8e6727e74c80b80bba3ccb9201e1afd23349c35
11241
Author: Neil Roberts <neil@linux.intel.com>
11242
Date: Tue Oct 27 13:18:51 2009 +0000
11244
[cogl_polygon] Enable COGL_ENABLE_BLEND when use_color is set
11246
Otherwise you can't use the alpha channel of the vertex colors unless
11247
the material has a texture with alpha or the material's color has
11248
alpha less than 255.
11250
clutter/cogl/cogl/cogl-primitives.c | 2 +-
11251
1 files changed, 1 insertions(+), 1 deletions(-)
11253
commit 0c32573ffa980fffc966cf35768233a3ff1ed076
11254
Author: Neil Roberts <neil@linux.intel.com>
11255
Date: Tue Oct 27 12:38:10 2009 +0000
11257
build: Add $(top_buiddir)/clutter/cogl to the include path in clutter/cogl/cogl
11259
Some files try to include "cogl/cogl-defines-gl.h" so
11260
$(top_builddir)/clutter/cogl needs to be in the include path for out of
11261
tree builds to work.
11263
clutter/cogl/cogl/Makefile.am | 1 +
11264
1 files changed, 1 insertions(+), 0 deletions(-)
11266
commit c387513a5fd5293cb8cf60e9c1334ceeff905852
11267
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11268
Date: Mon Oct 26 16:29:31 2009 +0000
11270
color: Fix HLS-to-RGB conversion
11272
Apparently, on 64bit systems the floating point noise is enough
11273
to screw up the float-to-int truncation.
11275
The solution is to round up by 0.5 and then use floorf(). This
11276
gives predictable and correct results on both 32bit and 64bit
11279
clutter/clutter-color.c | 8 +++++---
11280
1 files changed, 5 insertions(+), 3 deletions(-)
11282
commit 5a14db50891196a9d17a0df49bf0858551e5a0af
11283
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11284
Date: Mon Oct 26 16:02:06 2009 +0000
11286
layout: Do not create a LayoutMeta on remove
11288
When calling remove_child_meta() we check if there is a LayoutMeta
11289
already attached to the Actor, and if that LayoutMeta matches the
11290
(manager, container, actor) tuple. If the LayoutMeta does not match,
11291
though, we create a new LayoutMeta instance -- in order to remove it
11294
Instead of doing this, we can simply check for a matching LayoutMeta
11295
and if present, remove it.
11297
In case of an existing, non-matching LayoutMeta, we're left with a
11298
dangling instance, but it does not matter: the removal happens in the
11299
unparenting phase of a ClutterContainer, so either the Actor will be
11300
destroyed and thus the LayoutMeta will be disposed along with it; or
11301
it will be parented to another container, and thus the LayoutMeta
11304
clutter/clutter-layout-manager.c | 23 ++++++++++++++++++++++-
11305
1 files changed, 22 insertions(+), 1 deletions(-)
11307
commit 5a63e8af8f715c3fe6ded8a9432c999aab73311a
11308
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11309
Date: Mon Oct 26 15:10:20 2009 +0000
11311
tests: Use the right key symbol for adding children
11313
The test-box-layout should be using CLUTTER_plus instead of a
11316
tests/interactive/test-box-layout.c | 2 +-
11317
1 files changed, 1 insertions(+), 1 deletions(-)
11319
commit a5a0171cb02dcbd67efbf87480aa5cea215c128d
11320
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11321
Date: Mon Oct 26 15:09:07 2009 +0000
11323
box: Depth level changes should queue a relayout
11325
ClutterBox is not ClutterGroup: a change in the level of an actor
11326
through raise, lower or depth sorting must trigger a relayout.
11328
clutter/clutter-box.c | 6 +++---
11329
1 files changed, 3 insertions(+), 3 deletions(-)
11331
commit 2cad7e24f00e2f8fccfdc75086dd9e1071d71c18
11332
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11333
Date: Mon Oct 26 15:08:03 2009 +0000
11335
box: Check before using the LayoutManager instance
11337
A ClutterBox might not have a ClutterLayoutManager instance
11338
associated -- for instance, during destruction. We should check
11339
for one before calling methods on it.
11341
clutter/clutter-box.c | 23 +++++++++++++----------
11342
1 files changed, 13 insertions(+), 10 deletions(-)
11344
commit 81c8cf3e6d839b13e106ab346feaccf1f2f9d3fd
11345
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11346
Date: Mon Oct 26 11:51:30 2009 +0000
11348
texture: Error handling fix
11350
When cogl_texture_new_from_data() fails in clutter_texture_set_from_data()
11351
and no GError is provided, the clutter app will segfault when dereferencing
11352
the GError ** and emitting LOAD_FINISHED signal.
11354
Based on a patch by: Haakon Sporsheim <haakon.sporsheim@gmail.com>
11356
http://bugzilla.openedhand.com/show_bug.cgi?id=1806
11358
clutter/clutter-texture.c | 12 +++++++++---
11359
1 files changed, 9 insertions(+), 3 deletions(-)
11361
commit 00748f66560f3105ff9c636cd01428d8b5e30e9e
11362
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11363
Date: Mon Oct 26 11:42:16 2009 +0000
11365
tests: Print out the captured event type
11367
The ::captured-event signal on the Stage is not printing out the
11370
tests/interactive/test-events.c | 31 ++++++++++++++++++++++++++++++-
11371
1 files changed, 30 insertions(+), 1 deletions(-)
11373
commit f0b434918bcdb0d77467d66d28448672940f6a90
11374
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11375
Date: Fri Oct 23 17:32:18 2009 +0100
11377
docs: Add images for layout managers
11379
It's easier to show the layout manager policy with a simple
11380
screen shot coming from our interactive tests.
11382
clutter/clutter-bin-layout.c | 10 ++++++++++
11383
clutter/clutter-box-layout.c | 7 +++++++
11384
clutter/clutter-flow-layout.c | 16 ++++++++++++++++
11385
doc/reference/clutter/Makefile.am | 8 ++++++++
11386
doc/reference/clutter/bin-layout.png | Bin 0 -> 12890 bytes
11387
doc/reference/clutter/box-layout.png | Bin 0 -> 5119 bytes
11388
doc/reference/clutter/flow-layout-horizontal.png | Bin 0 -> 5888 bytes
11389
doc/reference/clutter/flow-layout-vertical.png | Bin 0 -> 5333 bytes
11390
8 files changed, 41 insertions(+), 0 deletions(-)
11392
commit 924780ce3511ba9bc9e2a6b955836eaaa4d0a216
11393
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11394
Date: Fri Oct 23 16:44:28 2009 +0100
11396
cogl: Avoid C99-isms
11398
Do not declare variables after statements.
11400
clutter/cogl/cogl/cogl.c | 4 ++--
11401
1 files changed, 2 insertions(+), 2 deletions(-)
11403
commit b56b26cc62a851ee4a851a27ce0d6b76936afc6a
11404
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11405
Date: Fri Oct 23 15:46:25 2009 +0100
11407
cogl: Remove cogl-current-matrix.c
11409
The cogl-current-matrix.c file is unused since commit
11410
5e5d94dfbed18bf2b4c8c7a7ff9847952b2c4ae2 and it's not compiled
11411
or distributed anymore.
11413
clutter/cogl/cogl/cogl-current-matrix.c | 409 -------------------------------
11414
1 files changed, 0 insertions(+), 409 deletions(-)
11416
commit 1c43c195098b4705b59891b6b98bc24407cb3264
11417
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11418
Date: Fri Oct 23 14:30:15 2009 +0100
11420
Update Git ignore rules
11422
.gitignore | 4 ++--
11423
1 files changed, 2 insertions(+), 2 deletions(-)
11425
commit 0d5af4c24932b5e468fa21e8ddd1c85d9c807320
11426
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11427
Date: Fri Oct 23 13:55:50 2009 +0100
11429
Post-release bump to 1.1.3
11431
configure.ac | 4 ++--
11432
1 files changed, 2 insertions(+), 2 deletions(-)
11434
commit dec06979b911ca410cc289f12e053a2d49c49abb
11435
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11436
Date: Fri Oct 23 13:38:28 2009 +0100
11438
Release 1.1.2 developers snapshot
11441
NEWS | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
11443
configure.ac | 2 +-
11444
4 files changed, 105 insertions(+), 2 deletions(-)
11446
commit 24594bcde40cc282efa94f9076a1b687c9e9827e
11447
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11448
Date: Fri Oct 23 12:15:25 2009 +0100
11450
build: Make COGL pass distcheck
11452
Some changes to make COGL pass distcheck with Automake 1.11 and
11453
anal-retentiveness turned up to 11.
11455
The "major" change is the flattening of the winsys/ part of COGL,
11456
which is built directly inside libclutter-cogl.la instead of an
11457
intermediate libclutter-cogl-winsys.la object.
11459
Ideally, the whole COGL should be flattened out using a
11460
quasi-non-recursive Automake layout; unfortunately, the driver/
11461
sub-section ships with identical targets and Automake cannot
11462
distinguish GL and GLES objects.
11464
clutter/cogl/cogl/Makefile.am | 196 +++++++++++++++++-----------------
11465
clutter/cogl/cogl/winsys/Makefile.am | 43 --------
11467
3 files changed, 98 insertions(+), 142 deletions(-)
11469
commit c882893e91b1b3ec42be8d790a8210c17de58666
11470
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11471
Date: Fri Oct 23 10:17:40 2009 +0100
11473
actor: Identify allocation cycles
11475
If an actor calls directly or indirectly clutter_actor_queue_relayout()
11476
on itself from within the allocate() implementation it will cause a
11477
relayout cycle. This is usually a condition that should be checked by
11478
ClutterActor and we should emit a warning if it is verified.
11480
clutter/clutter-actor.c | 15 +++++++++++++++
11481
1 files changed, 15 insertions(+), 0 deletions(-)
11483
commit ca15143d1fbb09d5dbe0daeb09d7765b7cf0dfe3
11484
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11485
Date: Fri Oct 23 10:08:02 2009 +0100
11487
actor: Add checks for IN_DESTRUCTION flag
11489
ClutterActor should check whether the current instance is being
11490
destroyed and avoid performing operations like:
11493
• queueing relayouts
11495
It should also warn if the actor is being parented to an actor
11496
currently being destroyed.
11498
clutter/clutter-actor.c | 28 ++++++++++++++++++++++++----
11499
1 files changed, 24 insertions(+), 4 deletions(-)
11501
commit 7de47e74bda68c5d4dde82f2cbba6782fcf69d27
11502
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11503
Date: Fri Oct 23 09:48:35 2009 +0100
11505
actor: Show actor name or type in the state checks warnings
11507
When showing a warning in the state checks we perform to verify that
11508
the invariants are maintained when showing, mapping and realizing, we
11509
should also print out the name of the actor failing the checks. If the
11510
actor has no name, the GType name should be used as a fallback.
11512
clutter/clutter-actor.c | 69 ++++++++++++++++++++++++++++++++---------------
11513
1 files changed, 47 insertions(+), 22 deletions(-)
11515
commit f02874470682f819766055f3976a2d6c74988dc7
11516
Author: Neil Roberts <neil@linux.intel.com>
11517
Date: Thu Oct 22 16:55:29 2009 +0100
11519
Fix some compilation errors in cogl-gles2-wrapper.c
11521
The changes in 74f2122b6 introduced some syntax errors which were
11522
preventing the GLES2 backend from compiling.
11524
clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c | 27 +++++++++-----------
11525
1 files changed, 12 insertions(+), 15 deletions(-)
11527
commit 8727c3127cc049bf22e3b7cb89041b104ae4fea7
11528
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11529
Date: Thu Oct 22 13:48:49 2009 +0100
11531
clone: Set :source as CONSTRUCT
11533
The :source property for ClutterClone is a constructor property, but
11534
it most definitely is not a constructor-only one.
11536
clutter/clutter-clone.c | 2 +-
11537
1 files changed, 1 insertions(+), 1 deletions(-)
11539
commit b82f874b464b252c5f3bbb5e903197a048034430
11540
Author: Neil Roberts <neil@linux.intel.com>
11541
Date: Thu Oct 22 15:39:30 2009 +0100
11543
Remove cogl/{gl,gles}/Makefile.am
11545
These are no longer used anywhere.
11547
clutter/cogl/gl/Makefile.am | 62 -----------------------------
11548
clutter/cogl/gles/Makefile.am | 88 -----------------------------------------
11549
2 files changed, 0 insertions(+), 150 deletions(-)
11551
commit bd809f690a447c813bba02d83ba3c8b22a825b38
11552
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11553
Date: Wed Oct 21 17:44:44 2009 +0100
11555
docs: Close the right tag to avoid XML errors
11557
clutter/clutter-alpha.c | 2 +-
11558
1 files changed, 1 insertions(+), 1 deletions(-)
11560
commit 4996b2224a54efeddce776cade725ec1cd7fca69
11561
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11562
Date: Wed Oct 21 17:43:34 2009 +0100
11564
docs: Rename the Shader and StageManager sections
11566
doc/reference/clutter/clutter-sections.txt | 4 ++--
11567
1 files changed, 2 insertions(+), 2 deletions(-)
11569
commit 673199b6e0399e8f1fcd52662429287f92cb95e9
11570
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11571
Date: Wed Oct 21 16:15:18 2009 +0100
11573
tests: Update test-script
11575
Use explicit alpha definition and custom alpha functions.
11577
tests/interactive/test-script.c | 41 +++++++++++++++++++++++++++++++++-----
11578
1 files changed, 35 insertions(+), 6 deletions(-)
11580
commit 7a52fddcd673c4aa14faf2396a0a74db644ba64d
11581
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11582
Date: Wed Oct 21 16:04:12 2009 +0100
11584
alpha: Manually parse the :mode property in ClutterScript
11586
The :mode property for a ClutterAlpha can either be an integer, for
11587
an easing mode logical id, or a string for the easing mode "nickname".
11589
clutter/clutter-alpha.c | 33 ++++++++++++++++++++++++++++++++-
11590
clutter/clutter-script-private.h | 2 ++
11591
clutter/clutter-script.c | 12 +++++++++---
11592
3 files changed, 43 insertions(+), 4 deletions(-)
11594
commit 01bc3fa2c80e9c965222b88ad20b470ae00028ec
11595
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11596
Date: Wed Oct 21 15:43:01 2009 +0100
11598
script, docs: Update documentation for alphas
11600
It is now possible to have Alpha instances defined explicitly for
11601
behaviours, so we need to fix the documentation.
11603
clutter/clutter-script.c | 40 +++++++++++++++++++++++++++++++---------
11604
1 files changed, 31 insertions(+), 9 deletions(-)
11606
commit f0ed71c77dd94e6bf644aba84f2e1cdc2d874fc1
11607
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11608
Date: Wed Oct 21 15:29:25 2009 +0100
11610
alpha: Allow setting the function in ClutterScript
11612
When defining an Alpha in ClutterScript we should allow setting
11613
the alpha function by using a custom property. This makes it
11614
possible to have both:
11617
"id" : "behaviour-1",
11618
"type" : "ClutterBehaviourDepth",
11619
"alpha" : { "timeline" : "timeline-1", "function" : "alpha_func" },
11627
"type" : "ClutterAlpha",
11628
"timeline" : "timeline-1",
11629
"function" : "alpha_func"
11632
"id" : "behaviour-1",
11633
"type" : "ClutterBehaviourDepth",
11634
"alpha" : "alpha-1",
11638
The latter allows defining a single alpha function for multiple
11641
clutter/clutter-alpha.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++-
11642
1 files changed, 101 insertions(+), 1 deletions(-)
11644
commit 50aec3c540d6609d9980fab6a26ba14869982c8b
11645
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11646
Date: Wed Oct 21 15:17:50 2009 +0100
11648
script: Always allow setting object properties by id reference
11650
The block that allows setting a GObject property holding an object
11651
instance is conditionally depending on the USE_PIXBUF define. This
11652
makes it impossible to reference an object inside ClutterScript on
11653
platforms not using GdkPixbuf.
11655
clutter/clutter-script.c | 25 +++++++++++++++----------
11656
1 files changed, 15 insertions(+), 10 deletions(-)
11658
commit ef8ae7d72f752e10552e254c1ff9e76d19430aac
11659
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11660
Date: Wed Oct 21 15:16:43 2009 +0100
11662
behaviour: Notify changes of the :alpha property
11664
The set_alpha() setter of ClutterBehaviour is not emitting notifications
11665
for the alpha property.
11667
clutter/clutter-behaviour.c | 12 +++++++-----
11668
1 files changed, 7 insertions(+), 5 deletions(-)
11670
commit c13701052497b4cdb009f95ad8ccce9f4a7d825e
11671
Author: Owen W. Taylor <otaylor@fishsoup.net>
11672
Date: Mon Oct 5 23:20:07 2009 -0400
11674
Force a relayout when showing an actor
11676
When an actor is hidden, the parent actor is not required to
11677
size request or allocate it. (ClutterGroup does, but, for example,
11678
NbtkBoxLayout doesn't.) This means that the
11679
needs_width_request/needs_height_request/needs_allocate can be
11680
stale when we go to show it again - they are set for the actor
11681
but not the parent. Explicitly setting them to FALSE avoids
11682
clutter_actor_relayout() improperly short-circuiting.
11684
http://bugzilla.openedhand.com/show_bug.cgi?id=1831
11686
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
11688
clutter/clutter-actor.c | 9 +++++++++
11689
1 files changed, 9 insertions(+), 0 deletions(-)
11691
commit 571df43b6d2348fd4db4b0275c8ed55e760ab353
11692
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11693
Date: Tue Oct 20 22:05:04 2009 +0100
11695
text: Invalidate caches and sizes in set_text_internal()
11697
The change in commit 3bbc96e17e5a03ba931c86a5cd2a0ecaa2a3b77b moved the
11698
:text property setter to use set_text_internal(); this function does not
11699
invalidate the Layout cache and does not queue a relayout, thus breaking
11700
the behaviour of ClutterText when setting the contents of the actor using
11703
http://bugzilla.openedhand.com/show_bug.cgi?id=1851
11705
clutter/clutter-text.c | 12 ++++--------
11706
1 files changed, 4 insertions(+), 8 deletions(-)
11708
commit 91c38f877fe0a6224c648ec9f6ecbab8190b536e
11709
Author: Robert Bragg <robert@linux.intel.com>
11710
Date: Tue Oct 20 14:57:40 2009 +0100
11712
[group] Fix copy & paste error from 857b0239e (Use FixedLayout inside Group)
11714
clutter_group_get_preferred_height was calling
11715
clutter_layout_manager_get_preferred_width which e.g. broke
11718
clutter/clutter-group.c | 8 ++++----
11719
1 files changed, 4 insertions(+), 4 deletions(-)
11721
commit 74f2122b68547ac6228c1a8d49765aa71638fa1b
11722
Author: Robert Bragg <robert@linux.intel.com>
11723
Date: Tue Sep 29 02:56:23 2009 +0100
11725
[gles2] remove lots of redundant matrix stack code
11727
Since we no longer depend on the GL matrix API in Cogl we can remove a lot
11728
of wrapper code from the GLES 2 backend. This is particularly nice given
11729
that there was no code shared between the cogl-matrix-stack API and gles2
11730
wrappers so we had a lot of duplicated logic.
11732
clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c | 287 ++-----------------
11733
clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.h | 9 +-
11734
2 files changed, 34 insertions(+), 262 deletions(-)
11736
commit 5e5d94dfbed18bf2b4c8c7a7ff9847952b2c4ae2
11737
Author: Robert Bragg <robert@linux.intel.com>
11738
Date: Tue Oct 13 23:09:42 2009 +0100
11740
[cogl] Removes the cogl-current-matrix abstraction
11742
The indirection through this API isn't necessary since we no longer
11743
arbitrate between the OpenGL matrix API and Cogl's client side API. Also it
11744
doesn't help to maintain an OpenGL style matrix mode API for internal use
11745
since it's awkward to keep restoring the MODELVIEW mode and easy enough to
11746
directly work with the matrix stacks of interest.
11748
This replaces use of the _cogl_current_matrix API with direct use of the
11749
_cogl_matrix_stack API. All the unused cogl_current_matrix API is removed
11750
and the matrix utility code left in cogl-current-matrix.c was moved to
11753
clutter/cogl/cogl/Makefile.am | 2 -
11754
clutter/cogl/cogl/cogl-clip-stack.c | 15 +-
11755
clutter/cogl/cogl/cogl-context.c | 8 +-
11756
clutter/cogl/cogl/cogl-context.h | 4 +-
11757
clutter/cogl/cogl/cogl-current-matrix.h | 95 ----------
11758
clutter/cogl/cogl/cogl-internal.h | 14 +-
11759
clutter/cogl/cogl/cogl-material.c | 2 +
11760
clutter/cogl/cogl/cogl-texture.c | 28 ++--
11761
clutter/cogl/cogl/cogl-util.c | 1 -
11762
clutter/cogl/cogl/cogl.c | 228 +++++++++++++++++++----
11763
clutter/cogl/cogl/driver/gl/cogl-fbo.c | 26 +--
11764
clutter/cogl/cogl/driver/gl/cogl-primitives.c | 24 +--
11765
clutter/cogl/cogl/driver/gles/cogl-fbo.c | 27 +--
11766
clutter/cogl/cogl/driver/gles/cogl-primitives.c | 24 +--
11767
doc/reference/cogl/Makefile.am | 1 -
11768
15 files changed, 271 insertions(+), 228 deletions(-)
11770
commit 9f7bf9fb4d234a25aba03266a286bc8c2d41f3fd
11771
Author: Robert Bragg <robert@linux.intel.com>
11772
Date: Wed Oct 14 10:53:48 2009 +0100
11774
[matrix-stack] Adds ctx->flushed_matrix_mode to cache the gl matrix mode
11776
This cache of the gl matrix mode lets us avoid repeat calls to glMatrixMode
11777
in _cogl_matrix_stack_flush_to_gl when we have lots of sequential modelview
11778
matrix modifications.
11780
clutter/cogl/cogl/cogl-context.c | 1 +
11781
clutter/cogl/cogl/cogl-context.h | 1 +
11782
clutter/cogl/cogl/cogl-matrix-stack.c | 30 ++++++++++++++++++------------
11783
3 files changed, 20 insertions(+), 12 deletions(-)
11785
commit b1f9f0a97d1abd4465ed7c7bed1da4ed366491ad
11786
Author: Robert Bragg <robert@linux.intel.com>
11787
Date: Tue Oct 6 12:36:32 2009 +0100
11789
matrix-stack: more optimization for load_identity case
11791
This goes a bit further than the previous patch, and as a special case
11792
we now simply represent identity matrices using a boolean, and only
11793
lazily initialize them when they need to be modified.
11795
clutter/cogl/cogl/cogl-matrix-stack.c | 82 ++++++++++++++++++++++++++++----
11796
1 files changed, 71 insertions(+), 11 deletions(-)
11798
commit 460025d60348e3346cfd864b81d9867ea8474eee
11799
Author: Robert Bragg <robert@linux.intel.com>
11800
Date: Tue Oct 6 10:52:07 2009 +0100
11802
[matrix-stack] avoid redundant clearing of matrix when using load_identity
11804
The journal always uses an identity matrix since it uses software
11805
transformation. Currently it manually uses glLoadMatrix since previous
11806
experimentation showed that the cogl-matrix-stack gave bad performance, but
11807
it would be nice to fix performance so we only have to care about one path
11808
for loading matrices.
11810
For the common case where we do:
11811
cogl_matrix_stack_push()
11812
cogl_matrix_stack_load_identity()
11813
we were effectively initializing the matrix 3 times. Once due to use of
11814
g_slice_new0, then we had a cogl_matrix_init_identity in
11815
_cogl_matrix_state_new for good measure, and then finally in
11816
cogl_matrix_stack_load_identity we did another cogl_matrix_init_identity.
11818
We don't use g_slice_new0 anymore, _cogl_matrix_state_new is documented as
11819
not initializing the matrix (instead _cogl_matrix_stack_top_mutable now
11820
takes a boolean to choose if new stack entries should be initialised) and so
11821
we now only initialize once in cogl_matrix_stack_load_identity.
11823
clutter/cogl/cogl/cogl-matrix-stack.c | 54 ++++++++++++++++-----------------
11824
1 files changed, 26 insertions(+), 28 deletions(-)
11826
commit 2656b569b9911b8aa427a5a02c8b1f4095de6ed7
11827
Author: Robert Bragg <robert@linux.intel.com>
11828
Date: Tue Sep 29 02:58:27 2009 +0100
11830
[current-matrix] Adds texture matrix stacks + removes GL matrix API usage
11832
This relates back to an earlier commitment to stop using the OpenGL matrix
11833
API which is considered deprecated. (ref 54159f5a1d029db)
11835
The new texture matrix stacks are hung from a list of (internal only)
11836
CoglTextureUnit structures which the CoglMaterial code internally references
11837
via _cogl_get_texure_unit ().
11839
So we would be left with only the cogl-matrix-stack code being responsible
11840
for glMatrixMode, glLoadMatrix and glLoadIdentity this commit updates the
11841
journal code so it now uses the matrix-stack API instead of GL directly.
11843
clutter/cogl/cogl/cogl-context.c | 4 +
11844
clutter/cogl/cogl/cogl-context.h | 5 +-
11845
clutter/cogl/cogl/cogl-current-matrix.c | 236 +++++++------------------------
11846
clutter/cogl/cogl/cogl-internal.h | 12 ++
11847
clutter/cogl/cogl/cogl-journal.c | 33 +++--
11848
clutter/cogl/cogl/cogl-material.c | 22 ++-
11849
clutter/cogl/cogl/cogl-matrix-stack.c | 15 ++-
11850
clutter/cogl/cogl/cogl.c | 59 ++++++++
11851
8 files changed, 174 insertions(+), 212 deletions(-)
11853
commit 473f7ee31ebd6d52126978ba4e155a3bebc4cac1
11854
Author: Emmanuele Bassi <ebassi@linux.intel.com>
11855
Date: Mon Oct 19 15:31:29 2009 +0100
11857
text: Take pre-edit cursor position into account
11859
When determining the cursor position we also need to take into account
11860
the pre-edit cursor position as set by the set_preedit_string()
11863
clutter/clutter-text.c | 16 ++++++++++++++--
11864
1 files changed, 14 insertions(+), 2 deletions(-)
11866
commit 23cd0b79254acd2b97467a62010244328e210a87
11867
Author: Emmanuele Bassi <ebassi@gnome.org>
11868
Date: Mon Oct 19 12:01:38 2009 +0100
11870
docs: Documentation fixes
11872
• Fix list_stages() and peek_stages() documentation
11874
• Fix clutter_text_set_preedit_string() arguments in the header
11875
to match source and documentation
11877
• Add clutter_units_cm() to the private section for Units
11879
• Rename the LayoutManager section
11881
• Add FlowLayout:homogeneous accessors
11883
clutter/clutter-stage-manager.c | 4 ++--
11884
clutter/clutter-text.h | 4 ++--
11885
doc/reference/clutter/clutter-sections.txt | 9 ++++++---
11886
3 files changed, 10 insertions(+), 7 deletions(-)
11888
commit ba25571c8e34593f99ba302edf381a0151c98bbb
11889
Merge: 936779f 8ce8b91
11890
Author: Emmanuele Bassi <ebassi@gnome.org>
11891
Date: Mon Oct 19 11:45:15 2009 +0100
11893
Merge branch 'layout-manager'
11895
* layout-manager: (50 commits)
11896
docs: Reword a link
11897
layout, docs: Add more documentation to LayoutManager
11898
layout, docs: Fix description of Bin properties
11899
layout, bin: Use ceilf() instead of casting to int
11900
layout, docs: Add long description for FlowLayout
11901
layout, box: Clean up
11902
layout, box: Write long description for Box
11903
layout, docs: Remove unused functions
11904
layout: Document BoxLayout
11905
layout: Add BoxLayout, a single line layout manager
11906
layout: Report the correct size of FlowLayout
11907
layout: Resizing the stage resizes the FlowLayout box
11908
layout: Use the get_request_mode() getter in BinLayout
11909
layout: Change the request-mode along with the orientation
11910
actor: Add set_request_mode() method
11911
[layout] Remove FlowLayout:wrap
11912
[layout] Rename BinLayout and FlowLayout interactive tests
11913
[layout] Skip invisible children in FlowLayout
11914
[layout] Clean up and document FlowLayout
11915
[layout] Snap children of FlowLayout to column/row
11918
commit 8ce8b91383390482efe56d982d945a384766ca8c
11919
Author: Emmanuele Bassi <ebassi@gnome.org>
11920
Date: Mon Oct 19 11:44:29 2009 +0100
11922
docs: Reword a link
11924
clutter/clutter-layout-manager.c | 3 ++-
11925
1 files changed, 2 insertions(+), 1 deletions(-)
11927
commit cd3c85f7ba9094a250ec03f0380428fadafef0df
11928
Author: Emmanuele Bassi <ebassi@gnome.org>
11929
Date: Mon Oct 19 11:00:23 2009 +0100
11931
layout, docs: Add more documentation to LayoutManager
11933
The layout manager reference should have some documentation on how
11934
to use a LayoutManager object inside a container and how to implement
11935
a LayoutManager sub-class correctly.
11937
clutter/clutter-layout-manager.c | 41 ++++++++++++++++++++++++++++++++++++++
11938
1 files changed, 41 insertions(+), 0 deletions(-)
11940
commit 936779fd96cc0d8d6713c5cb4c5dc9240cc04d97
11941
Author: Emmanuele Bassi <ebassi@gnome.org>
11942
Date: Sun Oct 18 17:49:00 2009 +0100
11944
build: Add back QUIET_GEN to the GIR generation
11946
clutter/Makefile.am | 2 +-
11947
1 files changed, 1 insertions(+), 1 deletions(-)
11949
commit bc8a7bd5b4c70247e4bc8cccc194c12e5b6a9a2f
11950
Author: Emmanuele Bassi <ebassi@gnome.org>
11951
Date: Sun Oct 18 17:15:04 2009 +0100
11955
.gitignore | 13 ++++++-------
11956
1 files changed, 6 insertions(+), 7 deletions(-)
11958
commit ab376d961fee066f809169f32946a32700ea0e53
11959
Author: Emmanuele Bassi <ebassi@gnome.org>
11960
Date: Sun Oct 18 17:12:12 2009 +0100
11962
build: De-nest the JSON from the introspection rules
11964
The JSON conditional rules can be moved outside the introspection
11965
conditional ones to avoid a nested check, as all the JSON rules do
11966
is setting up variables that may or may not be used.
11968
clutter/Makefile.am | 26 ++++++++++++--------------
11969
1 files changed, 12 insertions(+), 14 deletions(-)
11971
commit 5c162d904bbbbd5ae0f66885497dd0658d27e87f
11972
Author: Emmanuele Bassi <ebassi@gnome.org>
11973
Date: Sun Oct 18 17:11:42 2009 +0100
11975
build: Use QUIET_GEN when building ClutterJson GIR
11977
clutter/json/Makefile.am | 5 ++++-
11978
1 files changed, 4 insertions(+), 1 deletions(-)
11980
commit 8f11b3ca48fde34f5bc214f1ff122e5ed6298eac
11981
Author: Emmanuele Bassi <ebassi@gnome.org>
11982
Date: Sun Oct 18 17:00:24 2009 +0100
11984
build: Fix up the GIR generation rules
11986
The rules for generating Clutter's introspection data are
11987
still referencing the old COGL layout.
11989
clutter/Makefile.am | 9 ++++++---
11990
1 files changed, 6 insertions(+), 3 deletions(-)
11992
commit ad5c0af6399353ad49663954c6abd7305ecc9ad6
11993
Author: Emmanuele Bassi <ebassi@gnome.org>
11994
Date: Sat Oct 17 00:30:37 2009 +0100
11996
build: Add CPPFLAGS for the g-ir-scanner command line
11998
When I moved all CPP flags to AM_CPPFLAGS from the INCLUDES directive
11999
I forgot that g-ir-scanner needs those defines as well.
12001
clutter/Makefile.am | 1 +
12002
1 files changed, 1 insertions(+), 0 deletions(-)
12004
commit ef9ea9e2377f63e8bbf22f4829b8a51953a434ef
12005
Author: Robert Bragg <robert@linux.intel.com>
12006
Date: Wed Sep 16 14:01:57 2009 +0100
12008
[cogl-primitives] Split the journal out from cogl-primitives.c
12010
The Journal can be considered a standalone component, so even though
12011
it's currently only used to log quads, it seems better to split it
12012
out into its own file.
12014
clutter/cogl/cogl/Makefile.am | 2 +
12015
clutter/cogl/cogl/cogl-context.c | 1 +
12016
clutter/cogl/cogl/cogl-journal-private.h | 57 +++
12017
clutter/cogl/cogl/cogl-journal.c | 744 ++++++++++++++++++++++++++++++
12018
clutter/cogl/cogl/cogl-primitives.c | 705 +----------------------------
12019
clutter/cogl/cogl/cogl-texture-private.h | 14 -
12020
6 files changed, 805 insertions(+), 718 deletions(-)
12022
commit 8790306629f8186bba7998b5567c2a45aafb87d9
12023
Author: Robert Bragg <robert@linux.intel.com>
12024
Date: Sun Sep 6 21:47:46 2009 +0100
12026
[test-backface-culling] Check that inverted tex coords don't affect culling
12028
The additional check draws another front facing rectangle but this time with
12029
the texture coords flipped on the x axis. The code that handles sliced
12030
textures in cogl-primitives.c makes some suspicious changes to the geometry
12031
when the texture coords are inverted.
12033
tests/conform/test-backface-culling.c | 28 ++++++++++++++++++++--------
12034
1 files changed, 20 insertions(+), 8 deletions(-)
12036
commit 2f628b1a8a405d2e4c08f2b2d125002ded0d8981
12037
Author: Robert Bragg <robert@linux.intel.com>
12038
Date: Wed Sep 23 15:11:55 2009 +0100
12040
[cogl-spans] split out cogl-spans code from cogl-texture-2d-sliced
12042
When we implement atlas textures we will probably want to use the spans API
12043
to handle texture repeating so it doesn't make sense to leave the code in
12044
cogl-texture-2d-sliced.c. Since it's a standalone set of data structures
12045
and algorithms it also seems reasonable to split out from cogl-texture.
12047
clutter/cogl/cogl/Makefile.am | 2 +
12048
clutter/cogl/cogl/cogl-spans.c | 132 +++++++++++++
12049
clutter/cogl/cogl/cogl-spans.h | 70 +++++++
12050
clutter/cogl/cogl/cogl-texture-2d-sliced-private.h | 27 ---
12051
clutter/cogl/cogl/cogl-texture-2d-sliced.c | 195 +++++---------------
12052
5 files changed, 248 insertions(+), 178 deletions(-)
12054
commit 568d6841871bdfea5d49d2a8143a49a0a7664a7b
12055
Author: Vladimir Nadvornik <nadvornik@suse.cz>
12056
Date: Sun Aug 30 12:36:11 2009 +0200
12058
[cogl-texture] Split CoglTexture into an abstract class + CoglTexture2dSliced
12060
cogl-texture-2d-sliced provides an implementation of CoglTexture and this
12061
seperation lays the foundation for potentially supporting atlas textures,
12062
pixmap textures (as in GLX_EXT_texture_from_pixmap) and fast-path
12063
GL_TEXTURE_{1D,2D,3D,RECTANGLE} textures in a maintainable fashion.
12065
clutter/cogl/cogl/Makefile.am | 2 +
12066
clutter/cogl/cogl/cogl-context.c | 2 +
12067
clutter/cogl/cogl/cogl-context.h | 2 +
12068
clutter/cogl/cogl/cogl-handle.h | 4 +-
12069
clutter/cogl/cogl/cogl-texture-2d-sliced-private.h | 191 ++
12070
clutter/cogl/cogl/cogl-texture-2d-sliced.c | 1871 +++++++++++++++++++
12071
clutter/cogl/cogl/cogl-texture-driver.h | 12 +
12072
clutter/cogl/cogl/cogl-texture-private.h | 80 +-
12073
clutter/cogl/cogl/cogl-texture.c | 1926 +++++---------------
12074
clutter/cogl/cogl/driver/gl/cogl-texture-driver.c | 97 +-
12075
.../cogl/cogl/driver/gles/cogl-context-driver.c | 2 -
12076
.../cogl/cogl/driver/gles/cogl-context-driver.h | 2 -
12077
.../cogl/cogl/driver/gles/cogl-texture-driver.c | 217 +---
12078
13 files changed, 2551 insertions(+), 1857 deletions(-)
12080
commit 9da26fc1ca820d12d325df400e6e02d7cd25423a
12081
Author: Robert Bragg <robert@linux.intel.com>
12082
Date: Wed Sep 16 11:56:17 2009 +0100
12084
[cogl-texture] Seal CoglTexture internals from cogl-primitives.c
12086
cogl-primitives.c was previously digging right into CoglTextures so it could
12087
manually iterate the texture slices for texturing quads and polygons and
12088
because we were missing some state getters we were lazily just poking into
12089
the structures directly.
12091
This adds some extra state getter functions, and adds a higher level
12092
_cogl_texture_foreach_slice () API that hopefully simplifies the way in
12093
which sliced textures may be used to render primitives. This lets you
12094
specify a rectangle in "virtual" texture coords and it will call a given
12095
callback for each slice that intersects that rectangle giving the virtual
12096
coords of the current slice and corresponding "real" texture coordinates for
12097
the underlying gl texture.
12099
At the same time a noteable bug in how we previously iterated sliced
12100
textures was fixed, whereby we weren't correctly handling inverted texture
12101
coordinates. E.g. with the previous code if you supplied texture coords of
12102
tx1=100,ty1=0,tx2=0,ty2=100 (inverted along y axis) that would result in a
12103
back-facing quad, which could be discarded if using back-face culling.
12105
clutter/cogl/cogl/cogl-material.c | 9 +-
12106
clutter/cogl/cogl/cogl-primitives.c | 736 ++++++++++++++----------------
12107
clutter/cogl/cogl/cogl-texture-private.h | 47 ++-
12108
clutter/cogl/cogl/cogl-texture.c | 239 +++++++++-
12109
clutter/cogl/cogl/cogl-vertex-buffer.c | 6 +-
12110
clutter/cogl/cogl/driver/gl/cogl-fbo.c | 29 +-
12111
clutter/cogl/cogl/driver/gles/cogl-fbo.c | 29 +-
12112
7 files changed, 640 insertions(+), 455 deletions(-)
12114
commit 52cecd50ec87b617cc20dbc3ba4f843340fb5d63
12115
Author: Robert Bragg <robert@linux.intel.com>
12116
Date: Thu Jul 30 12:06:02 2009 +0100
12118
[docs] switch gl_handle+gl_target docs for cogl_texture_new_from_foreign
12120
The descriptions for gl_handle and gl_target were inverted.
12122
Thanks to Young-Ho Cha for spotting that.
12124
Signed-off-by: Robert Bragg <robert@linux.intel.com>
12126
clutter/cogl/cogl/cogl-texture.h | 4 ++--
12127
1 files changed, 2 insertions(+), 2 deletions(-)
12129
commit 95a869dab1b893f74c5b880e7be43e134eeb706f
12130
Author: Robert Bragg <robert@linux.intel.com>
12131
Date: Wed Jul 29 17:21:07 2009 +0100
12133
[cogl] move clutter/pango to clutter/cogl/pango
12135
As part of the re-organisation of Cogl; move clutter/pango to be part of the
12138
clutter/Makefile.am | 22 +-
12139
clutter/cogl/Makefile.am | 2 +-
12140
clutter/cogl/pango/Makefile.am | 33 ++
12141
clutter/cogl/pango/cogl-pango-display-list.c | 417 +++++++++++++++
12142
clutter/cogl/pango/cogl-pango-display-list.h | 70 +++
12143
clutter/cogl/pango/cogl-pango-fontmap.c | 209 ++++++++
12144
clutter/cogl/pango/cogl-pango-glyph-cache.c | 352 +++++++++++++
12145
clutter/cogl/pango/cogl-pango-glyph-cache.h | 78 +++
12146
clutter/cogl/pango/cogl-pango-private.h | 38 ++
12147
clutter/cogl/pango/cogl-pango-render.c | 697 ++++++++++++++++++++++++++
12148
clutter/cogl/pango/cogl-pango.h | 85 ++++
12149
clutter/pango/Makefile.am | 33 --
12150
clutter/pango/cogl-pango-display-list.c | 417 ---------------
12151
clutter/pango/cogl-pango-display-list.h | 70 ---
12152
clutter/pango/cogl-pango-fontmap.c | 209 --------
12153
clutter/pango/cogl-pango-glyph-cache.c | 352 -------------
12154
clutter/pango/cogl-pango-glyph-cache.h | 78 ---
12155
clutter/pango/cogl-pango-private.h | 38 --
12156
clutter/pango/cogl-pango-render.c | 697 --------------------------
12157
clutter/pango/cogl-pango.h | 85 ----
12158
configure.ac | 2 +-
12159
21 files changed, 1992 insertions(+), 1992 deletions(-)
12161
commit 43efab46bcf88c14cc429c6c7b659bdbc84f1f71
12162
Author: Robert Bragg <robert@linux.intel.com>
12163
Date: Tue Jul 28 02:02:02 2009 +0100
12165
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
12167
As part of an incremental process to have Cogl be a standalone project we
12168
want to re-consider how we organise the Cogl source code.
12170
Currently this is the structure I'm aiming for:
12173
<put common source here>
12188
The new winsys component is a starting point for migrating window system
12189
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
12191
The utils/ and pango/ directories aren't added by this commit, but they are
12192
noted because I plan to add them soon.
12194
Overview of the planned structure:
12196
* The winsys/ API is the API that binds OpenGL to a specific window system,
12197
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
12198
under clutter/{glx,osx,win32 etc} should migrate here.
12200
* Note there is also the idea of a winsys-base that may represent a window
12201
system for which there are multiple winsys APIs. An example of this is
12202
x11, since glx and egl may both be used with x11. (currently only Clutter
12203
has the idea of a winsys-base)
12205
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
12206
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
12207
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
12209
* Everything under cogl/ should fundamentally be supporting access to the
12210
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
12211
Graphics API and drawing a line between this and the utility functionality
12212
we add to support Clutter should help keep this lean and maintainable.
12214
* Code under utils/ as suggested builds on cogl/ adding more convenient
12215
APIs or mechanism to optimize special cases. Broadly speaking you can
12216
compare cogl/ to OpenGL and utils/ to GLU.
12218
* clutter/pango will be moved to clutter/cogl/pango
12220
How some of the internal configure.ac/pkg-config terminology has changed:
12221
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
12222
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
12223
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
12224
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
12225
clutterbackendlib -> CLUTTER_WINSYS_LIB
12226
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
12228
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
12230
As the first thing to take advantage of the new winsys component in Cogl;
12231
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
12232
cogl/common/cogl.c and this common implementation first trys
12233
_cogl_winsys_get_proc_address() but if that fails then it falls back to
12237
clutter.pc.in | 10 +-
12238
clutter/Makefile.am | 38 +-
12239
clutter/cogl/Makefile.am | 89 +-
12240
clutter/cogl/TODO | 25 -
12241
clutter/cogl/cogl-bitmap.h | 80 -
12242
clutter/cogl/cogl-color.h | 261 --
12243
clutter/cogl/cogl-debug.h | 79 -
12244
clutter/cogl/cogl-deprecated.h | 36 -
12245
clutter/cogl/cogl-fixed.h | 782 ----
12246
clutter/cogl/cogl-material.h | 781 ----
12247
clutter/cogl/cogl-matrix.h | 290 --
12248
clutter/cogl/cogl-offscreen.h | 96 -
12249
clutter/cogl/cogl-path.h | 347 --
12250
clutter/cogl/cogl-shader.h | 313 --
12251
clutter/cogl/cogl-texture.h | 465 ---
12252
clutter/cogl/cogl-types.h | 328 --
12253
clutter/cogl/cogl-vertex-buffer.h | 452 ---
12254
clutter/cogl/cogl.h.in | 875 -----
12255
clutter/cogl/cogl.pc.in | 15 -
12256
clutter/cogl/cogl/Makefile.am | 161 +
12257
clutter/cogl/cogl/cogl-bitmap-fallback.c | 460 +++
12258
clutter/cogl/cogl/cogl-bitmap-pixbuf.c | 368 ++
12259
clutter/cogl/cogl/cogl-bitmap-private.h | 115 +
12260
clutter/cogl/cogl/cogl-bitmap.c | 208 ++
12261
clutter/cogl/cogl/cogl-bitmap.h | 80 +
12262
clutter/cogl/cogl/cogl-blend-string.c | 1005 ++++++
12263
clutter/cogl/cogl/cogl-blend-string.h | 138 +
12264
clutter/cogl/cogl/cogl-clip-stack.c | 503 +++
12265
clutter/cogl/cogl/cogl-clip-stack.h | 43 +
12266
clutter/cogl/cogl/cogl-color.c | 201 ++
12267
clutter/cogl/cogl/cogl-color.h | 261 ++
12268
clutter/cogl/cogl/cogl-context.c | 215 ++
12269
clutter/cogl/cogl/cogl-context.h | 131 +
12270
clutter/cogl/cogl/cogl-current-matrix.c | 549 +++
12271
clutter/cogl/cogl/cogl-current-matrix.h | 95 +
12272
clutter/cogl/cogl/cogl-debug.c | 131 +
12273
clutter/cogl/cogl/cogl-debug.h | 79 +
12274
clutter/cogl/cogl/cogl-deprecated.h | 36 +
12275
clutter/cogl/cogl/cogl-enum-types.c.in | 41 +
12276
clutter/cogl/cogl/cogl-enum-types.h.in | 25 +
12277
clutter/cogl/cogl/cogl-fixed.c | 950 +++++
12278
clutter/cogl/cogl/cogl-fixed.h | 782 ++++
12279
clutter/cogl/cogl/cogl-handle.h | 157 +
12280
clutter/cogl/cogl/cogl-internal.h | 88 +
12281
clutter/cogl/cogl/cogl-material-private.h | 255 ++
12282
clutter/cogl/cogl/cogl-material.c | 1972 ++++++++++
12283
clutter/cogl/cogl/cogl-material.h | 781 ++++
12284
clutter/cogl/cogl/cogl-matrix-stack.c | 363 ++
12285
clutter/cogl/cogl/cogl-matrix-stack.h | 82 +
12286
clutter/cogl/cogl/cogl-matrix.c | 282 ++
12287
clutter/cogl/cogl/cogl-matrix.h | 290 ++
12288
clutter/cogl/cogl/cogl-offscreen.h | 96 +
12289
clutter/cogl/cogl/cogl-path.h | 347 ++
12290
clutter/cogl/cogl/cogl-primitives.c | 2329 ++++++++++++
12291
clutter/cogl/cogl/cogl-primitives.h | 62 +
12292
clutter/cogl/cogl/cogl-shader.h | 313 ++
12293
clutter/cogl/cogl/cogl-texture-driver.h | 157 +
12294
clutter/cogl/cogl/cogl-texture-private.h | 151 +
12295
clutter/cogl/cogl/cogl-texture.c | 1682 +++++++++
12296
clutter/cogl/cogl/cogl-texture.h | 465 +++
12297
clutter/cogl/cogl/cogl-types.h | 328 ++
12298
clutter/cogl/cogl/cogl-util.c | 252 ++
12299
clutter/cogl/cogl/cogl-util.h | 30 +
12300
clutter/cogl/cogl/cogl-vertex-buffer-private.h | 169 +
12301
clutter/cogl/cogl/cogl-vertex-buffer.c | 2016 +++++++++++
12302
clutter/cogl/cogl/cogl-vertex-buffer.h | 452 +++
12303
clutter/cogl/cogl/cogl.c | 879 +++++
12304
clutter/cogl/cogl/cogl.h.in | 875 +++++
12305
clutter/cogl/cogl/cogl.pc.in | 17 +
12306
clutter/cogl/cogl/driver/Makefile.am | 7 +
12307
clutter/cogl/cogl/driver/gl/Makefile.am | 39 +
12308
clutter/cogl/cogl/driver/gl/cogl-context-driver.c | 84 +
12309
clutter/cogl/cogl/driver/gl/cogl-context-driver.h | 103 +
12310
clutter/cogl/cogl/driver/gl/cogl-defines.h.in | 1053 ++++++
12311
clutter/cogl/cogl/driver/gl/cogl-fbo.c | 330 ++
12312
clutter/cogl/cogl/driver/gl/cogl-fbo.h | 39 +
12313
clutter/cogl/cogl/driver/gl/cogl-primitives.c | 282 ++
12314
clutter/cogl/cogl/driver/gl/cogl-program.c | 255 ++
12315
clutter/cogl/cogl/driver/gl/cogl-program.h | 39 +
12316
clutter/cogl/cogl/driver/gl/cogl-shader-private.h | 39 +
12317
clutter/cogl/cogl/driver/gl/cogl-shader.c | 177 +
12318
clutter/cogl/cogl/driver/gl/cogl-texture-driver.c | 454 +++
12319
clutter/cogl/cogl/driver/gl/cogl.c | 443 +++
12320
clutter/cogl/cogl/driver/gles/Makefile.am | 62 +
12321
.../cogl/cogl/driver/gles/cogl-context-driver.c | 41 +
12322
.../cogl/cogl/driver/gles/cogl-context-driver.h | 44 +
12323
clutter/cogl/cogl/driver/gles/cogl-defines.h.in | 638 ++++
12324
clutter/cogl/cogl/driver/gles/cogl-fbo.c | 343 ++
12325
clutter/cogl/cogl/driver/gles/cogl-fbo.h | 39 +
12326
.../driver/gles/cogl-fixed-fragment-shader.glsl | 62 +
12327
.../cogl/driver/gles/cogl-fixed-vertex-shader.glsl | 65 +
12328
clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c | 1635 +++++++++
12329
clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.h | 433 +++
12330
clutter/cogl/cogl/driver/gles/cogl-primitives.c | 453 +++
12331
clutter/cogl/cogl/driver/gles/cogl-program.c | 338 ++
12332
clutter/cogl/cogl/driver/gles/cogl-program.h | 43 +
12333
.../cogl/cogl/driver/gles/cogl-shader-private.h | 40 +
12334
clutter/cogl/cogl/driver/gles/cogl-shader.c | 221 ++
12335
.../cogl/cogl/driver/gles/cogl-texture-driver.c | 481 +++
12336
clutter/cogl/cogl/driver/gles/cogl-util.c | 49 +
12337
clutter/cogl/cogl/driver/gles/cogl-util.h | 30 +
12338
clutter/cogl/cogl/driver/gles/cogl.c | 64 +
12339
clutter/cogl/cogl/driver/gles/stringify.sh | 94 +
12340
clutter/cogl/cogl/stb_image.c | 3772 ++++++++++++++++++++
12341
clutter/cogl/cogl/winsys/Makefile.am | 43 +
12342
clutter/cogl/cogl/winsys/cogl-eglnative.c | 35 +
12343
clutter/cogl/cogl/winsys/cogl-eglx.c | 35 +
12344
clutter/cogl/cogl/winsys/cogl-fruity.c | 35 +
12345
clutter/cogl/cogl/winsys/cogl-glx.c | 78 +
12346
clutter/cogl/cogl/winsys/cogl-osx.c | 35 +
12347
clutter/cogl/cogl/winsys/cogl-sdl.c | 35 +
12348
clutter/cogl/cogl/winsys/cogl-win32.c | 35 +
12349
clutter/cogl/cogl/winsys/cogl-winsys.h | 30 +
12350
clutter/cogl/common/Makefile.am | 96 -
12351
clutter/cogl/common/cogl-bitmap-fallback.c | 460 ---
12352
clutter/cogl/common/cogl-bitmap-pixbuf.c | 368 --
12353
clutter/cogl/common/cogl-bitmap-private.h | 115 -
12354
clutter/cogl/common/cogl-bitmap.c | 208 --
12355
clutter/cogl/common/cogl-blend-string.c | 1005 ------
12356
clutter/cogl/common/cogl-blend-string.h | 138 -
12357
clutter/cogl/common/cogl-clip-stack.c | 503 ---
12358
clutter/cogl/common/cogl-clip-stack.h | 43 -
12359
clutter/cogl/common/cogl-color.c | 201 --
12360
clutter/cogl/common/cogl-context.c | 215 --
12361
clutter/cogl/common/cogl-context.h | 131 -
12362
clutter/cogl/common/cogl-current-matrix.c | 549 ---
12363
clutter/cogl/common/cogl-current-matrix.h | 95 -
12364
clutter/cogl/common/cogl-debug.c | 131 -
12365
clutter/cogl/common/cogl-enum-types.c.in | 41 -
12366
clutter/cogl/common/cogl-enum-types.h.in | 25 -
12367
clutter/cogl/common/cogl-fixed.c | 950 -----
12368
clutter/cogl/common/cogl-handle.h | 157 -
12369
clutter/cogl/common/cogl-internal.h | 88 -
12370
clutter/cogl/common/cogl-material-private.h | 255 --
12371
clutter/cogl/common/cogl-material.c | 1972 ----------
12372
clutter/cogl/common/cogl-matrix-stack.c | 363 --
12373
clutter/cogl/common/cogl-matrix-stack.h | 81 -
12374
clutter/cogl/common/cogl-matrix.c | 282 --
12375
clutter/cogl/common/cogl-primitives.c | 2329 ------------
12376
clutter/cogl/common/cogl-primitives.h | 62 -
12377
clutter/cogl/common/cogl-texture-driver.h | 157 -
12378
clutter/cogl/common/cogl-texture-private.h | 151 -
12379
clutter/cogl/common/cogl-texture.c | 1682 ---------
12380
clutter/cogl/common/cogl-util.c | 252 --
12381
clutter/cogl/common/cogl-util.h | 30 -
12382
clutter/cogl/common/cogl-vertex-buffer-private.h | 169 -
12383
clutter/cogl/common/cogl-vertex-buffer.c | 2016 -----------
12384
clutter/cogl/common/cogl.c | 858 -----
12385
clutter/cogl/common/stb_image.c | 3772 --------------------
12386
clutter/cogl/gl/cogl-context-driver.c | 84 -
12387
clutter/cogl/gl/cogl-context-driver.h | 103 -
12388
clutter/cogl/gl/cogl-defines.h.in | 1053 ------
12389
clutter/cogl/gl/cogl-fbo.c | 330 --
12390
clutter/cogl/gl/cogl-fbo.h | 39 -
12391
clutter/cogl/gl/cogl-primitives.c | 282 --
12392
clutter/cogl/gl/cogl-program.c | 255 --
12393
clutter/cogl/gl/cogl-program.h | 39 -
12394
clutter/cogl/gl/cogl-shader-private.h | 39 -
12395
clutter/cogl/gl/cogl-shader.c | 177 -
12396
clutter/cogl/gl/cogl-texture-driver.c | 454 ---
12397
clutter/cogl/gl/cogl.c | 515 ---
12398
clutter/cogl/gles/cogl-context-driver.c | 41 -
12399
clutter/cogl/gles/cogl-context-driver.h | 44 -
12400
clutter/cogl/gles/cogl-defines.h.in | 638 ----
12401
clutter/cogl/gles/cogl-fbo.c | 343 --
12402
clutter/cogl/gles/cogl-fbo.h | 39 -
12403
clutter/cogl/gles/cogl-fixed-fragment-shader.glsl | 62 -
12404
clutter/cogl/gles/cogl-fixed-vertex-shader.glsl | 65 -
12405
clutter/cogl/gles/cogl-gles2-wrapper.c | 1635 ---------
12406
clutter/cogl/gles/cogl-gles2-wrapper.h | 433 ---
12407
clutter/cogl/gles/cogl-primitives.c | 453 ---
12408
clutter/cogl/gles/cogl-program.c | 338 --
12409
clutter/cogl/gles/cogl-program.h | 43 -
12410
clutter/cogl/gles/cogl-shader-private.h | 40 -
12411
clutter/cogl/gles/cogl-shader.c | 221 --
12412
clutter/cogl/gles/cogl-texture-driver.c | 481 ---
12413
clutter/cogl/gles/cogl-util.c | 49 -
12414
clutter/cogl/gles/cogl-util.h | 30 -
12415
clutter/cogl/gles/cogl.c | 74 -
12416
clutter/cogl/gles/stringify.sh | 94 -
12417
clutter/eglnative/Makefile.am | 12 +-
12418
clutter/eglx/Makefile.am | 2 +
12419
clutter/fruity/Makefile.am | 8 +-
12420
clutter/glx/Makefile.am | 2 +
12421
clutter/osx/Makefile.am | 6 +-
12422
clutter/sdl/Makefile.am | 2 +
12423
clutter/win32/Makefile.am | 2 +
12424
clutter/win32/clutter-win32.pc.in | 8 +-
12425
clutter/x11/Makefile.am | 2 +
12426
clutter/x11/clutter-x11.pc.in | 10 +-
12427
configure.ac | 119 +-
12428
doc/reference/clutter/Makefile.am | 6 +-
12429
doc/reference/cogl/Makefile.am | 11 +-
12430
tests/conform/Makefile.am | 4 +-
12431
tests/interactive/Makefile.am | 4 +-
12432
tests/micro-bench/Makefile.am | 9 +-
12433
tests/tools/Makefile.am | 2 +
12434
198 files changed, 34272 insertions(+), 33869 deletions(-)
12436
commit 2eea83de75cec3dbc334feecd004a180a7f5b1e5
12437
Author: Robert Bragg <robert@linux.intel.com>
12438
Date: Tue Jul 28 01:34:33 2009 +0100
12440
Make the CoglContext structure a bit more maintainable
12442
This moves most of cogl-context.{c.h} to cogl/common with some driver
12443
specific members now living in a CoglContextDriver struct. Driver specific
12444
context initialization and typedefs now live in
12445
cogl/{gl,gles}/cogl-context-driver.{c,h}
12447
Driver specific members can be found under ctx->drv.stuff
12449
clutter/cogl/common/Makefile.am | 2 +
12450
clutter/cogl/common/cogl-blend-string.c | 2 +-
12451
clutter/cogl/common/cogl-context.c | 215 +++++++++++++++++++++++++
12452
clutter/cogl/common/cogl-context.h | 131 +++++++++++++++
12453
clutter/cogl/common/cogl-material.c | 14 +-
12454
clutter/cogl/common/cogl-primitives.c | 12 +-
12455
clutter/cogl/common/cogl-vertex-buffer.c | 26 ++--
12456
clutter/cogl/common/cogl.c | 2 +-
12457
clutter/cogl/gl/Makefile.am | 2 +-
12458
clutter/cogl/gl/cogl-context-driver.c | 84 ++++++++++
12459
clutter/cogl/gl/cogl-context-driver.h | 103 ++++++++++++
12460
clutter/cogl/gl/cogl-context.c | 259 ------------------------------
12461
clutter/cogl/gl/cogl-context.h | 197 -----------------------
12462
clutter/cogl/gl/cogl-fbo.c | 24 ++--
12463
clutter/cogl/gl/cogl-primitives.c | 2 +-
12464
clutter/cogl/gl/cogl-program.c | 50 +++---
12465
clutter/cogl/gl/cogl-shader.c | 12 +-
12466
clutter/cogl/gl/cogl-texture-driver.c | 2 +-
12467
clutter/cogl/gl/cogl.c | 224 +++++++++++++-------------
12468
clutter/cogl/gles/Makefile.am | 2 +-
12469
clutter/cogl/gles/cogl-context-driver.c | 41 +++++
12470
clutter/cogl/gles/cogl-context-driver.h | 44 +++++
12471
clutter/cogl/gles/cogl-context.c | 214 ------------------------
12472
clutter/cogl/gles/cogl-context.h | 136 ----------------
12473
clutter/cogl/gles/cogl-fbo.c | 8 +-
12474
clutter/cogl/gles/cogl-gles2-wrapper.c | 2 +-
12475
clutter/cogl/gles/cogl-program.c | 16 +-
12476
clutter/cogl/gles/cogl-texture-driver.c | 14 +-
12477
28 files changed, 828 insertions(+), 1012 deletions(-)
12479
commit 157eb437bac38d7a61991f47bd943cb9f6d84ad7
12480
Author: Robert Bragg <robert@linux.intel.com>
12481
Date: Tue Jul 28 00:37:11 2009 +0100
12483
Improve cogl-texture maintainability by moving 90% into cogl/common
12485
This splits the limited components that differed between
12486
cogl/{gl,gles}/cogl-texture.c into new {gl,gles}/cogl-texture-driver.c files
12487
and the rest that can now be shared into cogl/common/cogl-texture.c
12489
clutter/cogl/common/Makefile.am | 3 +
12490
clutter/cogl/common/cogl-internal.h | 1 +
12491
clutter/cogl/common/cogl-texture-driver.h | 157 +++
12492
clutter/cogl/common/cogl-texture-private.h | 151 ++
12493
clutter/cogl/common/cogl-texture.c | 1682 ++++++++++++++++++++++
12494
clutter/cogl/gl/Makefile.am | 3 +-
12495
clutter/cogl/gl/cogl-texture-driver.c | 454 ++++++
12496
clutter/cogl/gl/cogl-texture-private.h | 145 --
12497
clutter/cogl/gl/cogl-texture.c | 1996 ---------------------------
12498
clutter/cogl/gles/Makefile.am | 3 +-
12499
clutter/cogl/gles/cogl-gles2-wrapper.h | 1 +
12500
clutter/cogl/gles/cogl-texture-driver.c | 481 +++++++
12501
clutter/cogl/gles/cogl-texture-private.h | 144 --
12502
clutter/cogl/gles/cogl-texture.c | 2066 ----------------------------
12503
14 files changed, 2932 insertions(+), 4355 deletions(-)
12505
commit fe01ec6323967614c6404bc193503adb5bda1624
12506
Author: Robert Bragg <robert@linux.intel.com>
12507
Date: Thu Aug 20 11:54:41 2009 +0100
12509
[stage-egl] support fallbacks in clutter_stage_egl_realize
12511
Most of clutter_stage_egl_realize was renamed to
12512
_clutter_stage_egl_try_realize which now takes a cookie indicating which
12513
fallback number should tried next. clutter_stage_egl_realize now keeps
12514
trying to realize with successive fallback numbers until it succeeds or runs
12517
The only fallback supported for now is for hardware with no stencil buffer
12520
clutter/eglx/clutter-stage-egl.c | 112 ++++++++++++++++++++++++++++----------
12521
1 files changed, 82 insertions(+), 30 deletions(-)
12523
commit 3187e1964279b3fb93703fe6c67df5b6025729c9
12524
Author: Robert Bragg <robert@linux.intel.com>
12525
Date: Mon Aug 3 14:50:10 2009 +0100
12527
[x11 backend] remove data duplicated between backends and stages
12529
Make backends the canonical point of reference for the xdisplay, the xscreen
12530
number, the x root window and the xvisinfo for creating foreign stages.
12532
clutter/eglx/clutter-backend-egl.c | 10 +--
12533
clutter/eglx/clutter-stage-egl.c | 18 ++--
12534
clutter/glx/clutter-backend-glx.c | 59 +++++++-----
12535
clutter/glx/clutter-backend-glx.h | 6 +
12536
clutter/glx/clutter-stage-glx.c | 58 ++++++------
12537
clutter/x11/clutter-backend-x11.c | 1 +
12538
clutter/x11/clutter-backend-x11.h | 5 +
12539
clutter/x11/clutter-stage-x11.c | 177 ++++++++++++++++++++++--------------
12540
clutter/x11/clutter-stage-x11.h | 8 +--
12541
9 files changed, 200 insertions(+), 142 deletions(-)
12543
commit 63414ab233522b0da8462b32c4e36e74be891475
12544
Author: Robert Bragg <robert@linux.intel.com>
12545
Date: Fri Jul 31 20:39:28 2009 +0100
12547
[glx backend] white space fixes
12549
Simply removes lots of trailing white spaces
12551
clutter/glx/clutter-backend-glx.c | 40 ++++++++++++++++++------------------
12552
1 files changed, 20 insertions(+), 20 deletions(-)
12554
commit 45a668bef855b8564236a3153bf07e1ea0148d16
12555
Author: Robert Bragg <robert@linux.intel.com>
12556
Date: Fri Jul 31 17:07:10 2009 +0100
12558
[glx backend] use FBConfigs instead of Visuals for GL context creation
12560
This replaces calls to the old (glx 1.2) functions glXChooseVisual,
12561
glXCreateContext, glXMakeCurrent with the 1.3+ fbconfig varients
12562
glXChooseFBConfig, glXCreateNewContext, glXMakeContextCurrent.
12564
clutter/glx/clutter-backend-glx.c | 122 +++++++++++++++++++++++--------------
12565
1 files changed, 75 insertions(+), 47 deletions(-)
12567
commit 15d7a86621f3fc80d3d50e7f5a3a141412163e7f
12568
Author: Robert Bragg <robert@linux.intel.com>
12569
Date: Fri Jul 31 18:34:51 2009 +0100
12571
[backends] Remove the idea of offscreen stages from all backends
12573
The only backend that tried to implement offscreen stages was the GLX backend
12574
and even this has apparently be broken for some time without anyone noticing.
12576
The property still remains and since the property already clearly states that
12577
it may not work I don't expect anyone to notice.
12579
This simplifies quite a bit of the GLX code which is very desireable from the
12580
POV that we want to start migrating window system code down to Cogl and the
12581
simpler the code is the more straight forward this work will be.
12583
In the future when Cogl has a nicely designed API for framebuffer objects then
12584
re-implementing offscreen stages cleanly for *all* backends should be quite
12587
clutter/clutter-backend.c | 3 +-
12588
clutter/clutter-backend.h | 1 -
12589
clutter/clutter-private.h | 1 -
12590
clutter/clutter-stage.c | 33 +----
12591
clutter/eglnative/clutter-stage-egl.c | 217 +++++++++++------------
12592
clutter/eglx/clutter-backend-egl.c | 3 +-
12593
clutter/eglx/clutter-stage-egl.c | 307 +++++++++++++++------------------
12594
clutter/fruity/clutter-stage-fruity.c | 175 +++++++++----------
12595
clutter/glx/clutter-backend-glx.c | 59 ++-----
12596
clutter/glx/clutter-stage-glx.c | 224 ++++++++----------------
12597
clutter/osx/clutter-stage-osx.c | 10 -
12598
clutter/sdl/clutter-stage-sdl.c | 39 ++---
12599
clutter/x11/clutter-backend-x11.c | 5 +-
12600
clutter/x11/clutter-backend-x11.h | 8 +-
12601
clutter/x11/clutter-stage-x11.c | 5 +-
12602
15 files changed, 435 insertions(+), 655 deletions(-)
12604
commit 35f11d863c4ac66136df9846c898ed88ff8ffb34
12605
Author: Robert Bragg <robert@linux.intel.com>
12606
Date: Fri Oct 16 17:15:47 2009 +0100
12608
[build] more Makefile.am.{enums,marshal} fixes for out of tree builds
12610
for the marshal files $(srcdir) was getting prefixed twice since my last
12611
commit (2cc88f1140) since it was already being prefixed including
12612
Makefile.am. The problem with prefixing it in the includer file though is
12613
that the Make variable substitutions like :.list=.h mean we end up
12614
generating into the $(srcdir). This removes the prefix added in
12615
clutter/Makefile.am
12617
We were also missing a $(srcdir) prefix when setting EXTRA_DIST
12619
build/autotools/Makefile.am.enums | 2 +-
12620
build/autotools/Makefile.am.marshal | 3 ++-
12621
clutter/Makefile.am | 2 +-
12622
3 files changed, 4 insertions(+), 3 deletions(-)
12624
commit f1acc91f3704bfff45652aea4f14355485f34df0
12625
Author: Emmanuele Bassi <ebassi@gnome.org>
12626
Date: Fri Oct 16 15:57:21 2009 +0100
12628
Simple coding style fix for commit c5551184
12630
clutter/clutter-interval.c | 2 ++
12631
1 files changed, 2 insertions(+), 0 deletions(-)
12633
commit a9d2c0f6903fff5a5b445265040f8bb689c10750
12634
Merge: b5adbf8 70c8128
12635
Author: Emmanuele Bassi <ebassi@gnome.org>
12636
Date: Fri Oct 16 15:55:05 2009 +0100
12638
Merge branch 'bug-1846'
12641
Fix warning message in the ParamSpec validation
12643
commit b5adbf89b851baa9fb833b00ad6137cc5e6547cb
12644
Merge: ee9f8c3 c555118
12645
Author: Emmanuele Bassi <ebassi@gnome.org>
12646
Date: Fri Oct 16 15:55:04 2009 +0100
12648
Merge branch 'bug-1845'
12651
Add a warning when ClutterInterval can't compute progress
12653
commit 70c8128457d49bf9dde0838470f1b4b363f9aafb
12654
Author: Damien Lespiau <damien.lespiau@intel.com>
12655
Date: Mon Oct 12 17:05:05 2009 +0100
12657
Fix warning message in the ParamSpec validation
12659
When validating a new GValue against the ClutterParamSpecUnits, we issue
12660
a warning when the units do not match with both the new value and the
12661
unit we expect to have. Unfortunately we were printing the unit of the
12662
new value twice and not the unit of the ParamSpec.
12664
http://bugzilla.openedhand.com/show_bug.cgi?id=1846
12666
clutter/clutter-units.c | 2 +-
12667
1 files changed, 1 insertions(+), 1 deletions(-)
12669
commit c5551184b0337ea8a990b14e52eb15e855a27ca9
12670
Author: Damien Lespiau <damien.lespiau@intel.com>
12671
Date: Mon Oct 12 16:45:39 2009 +0100
12673
Add a warning when ClutterInterval can't compute progress
12675
This is really useful when trying to animate GTypes that haven't
12676
registered any progress function. Instead of silently not working it
12677
will warn the developer.
12679
http://bugzilla.openedhand.com/show_bug.cgi?id=1845
12681
clutter/clutter-interval.c | 9 +++++++++
12682
1 files changed, 9 insertions(+), 0 deletions(-)
12684
commit ee9f8c3bdf9672e0d79598eed8f73569190888dc
12685
Author: Damien Lespiau <damien.lespiau@intel.com>
12686
Date: Mon Oct 12 16:28:10 2009 +0100
12688
Add ClutterInterval integration
12690
To be able to animate CLUTTER_TYPE_UNITS properties we need to register
12691
the GType and its progress function against the ClutterInterval code.
12693
The two ClutterUnits defining the interval can use different units, the
12694
resulting unit will always be in pixels, so calculating a progress
12695
between 10px and 4cm is valid.
12697
http://bugzilla.openedhand.com/show_bug.cgi?id=1844
12699
clutter/clutter-units.c | 29 +++++++++++++++++++++++++++++
12700
1 files changed, 29 insertions(+), 0 deletions(-)
12702
commit 83b4ec7a12ea279b59a80f6008e1bece25de3a8c
12703
Author: Emmanuele Bassi <ebassi@gnome.org>
12704
Date: Fri Oct 16 15:25:37 2009 +0100
12706
units: Cache the pixels value inside Units
12708
When computing the pixels value of a ClutterUnits value we should
12709
be caching the value to avoid recomputing for every call of
12710
clutter_units_to_pixels(). We already have a flag telling us to
12711
return the cached value, but we miss the mechanism to evict the
12712
cache whenever the Backend settings affecting the conversion, that
12713
is default font and resolution, change.
12715
In order to implement the eviction we can use a "serial"; the
12716
Backend will have an internal serial field which we retrieve and
12717
put inside the ClutterUnits structure (we split one of the two
12718
64 bit padding fields into two 32 bit fields to maintain ABI); every
12719
time we call clutter_units_to_pixels() we compare the units serial
12720
with that of the Backend; if they match and pixels_set is set to
12721
TRUE then we just return the stored pixels value. If the serials
12722
do not match then we unset the pixels_set flag and recompute the
12725
We can verify this by adding a simple test unit checking that
12726
by changing the resolution of ClutterBackend we get different
12727
pixel values for 1 em.
12729
http://bugzilla.openedhand.com/show_bug.cgi?id=1843
12732
clutter/clutter-backend.c | 21 +++++++++++++++-
12733
clutter/clutter-private.h | 2 +
12734
clutter/clutter-units.c | 45 ++++++++++++++++++++++++++++++++++++
12735
clutter/clutter-units.h | 9 ++++++-
12736
tests/conform/test-clutter-units.c | 23 ++++++++++++++++++
12737
tests/conform/test-conform-main.c | 1 +
12738
7 files changed, 99 insertions(+), 3 deletions(-)
12740
commit 2ff31dfbaaad3056265b05efe57eac63f8e3ce61
12741
Author: Emmanuele Bassi <ebassi@gnome.org>
12742
Date: Fri Oct 16 14:22:15 2009 +0100
12744
text: Notify :position when it changes
12746
The :position property is not notified when changed.
12748
http://bugzilla.openedhand.com/show_bug.cgi?id=1830
12750
clutter/clutter-text.c | 15 +++++++++++++++
12751
1 files changed, 15 insertions(+), 0 deletions(-)
12753
commit bc424fb56c3a75a822b22c0e5b284b5775f76abe
12754
Author: Emmanuele Bassi <ebassi@linux.intel.com>
12755
Date: Sat Sep 19 09:19:06 2009 +0100
12757
[text] NULL-ify strings to avoid double-frees
12759
clutter/clutter-text.c | 1 +
12760
1 files changed, 1 insertions(+), 0 deletions(-)
12762
commit 6f43f4b805387e0cac054d7b002634da3b00b106
12763
Author: Emmanuele Bassi <ebassi@linux.intel.com>
12764
Date: Sat Sep 19 09:18:06 2009 +0100
12766
[text] Do not apply unset preedit attributes
12768
The pre-edit attributes are optional and thus should only be applied
12769
if they have been set to avoid assertion failures.
12771
clutter/clutter-text.c | 13 ++++++++-----
12772
1 files changed, 8 insertions(+), 5 deletions(-)
12774
commit 28837283877c11f26565d79e6bcd4b171203a9b0
12775
Author: Emmanuele Bassi <ebassi@linux.intel.com>
12776
Date: Wed Sep 9 12:15:23 2009 +0100
12778
[text] Add pre-edit string to ClutterText
12780
Input Methods require to be able to set a "pre-edit string", that is
12781
a string that it's just displayed into the Text actor without being
12782
committed to the actor's buffer. The string might require custom Pango
12783
attributes, and an update of the cursor position.
12785
clutter/clutter-text.c | 193 +++++++++++++++++++++++-----
12786
clutter/clutter-text.h | 5 +
12787
doc/reference/clutter/clutter-sections.txt | 1 +
12788
tests/interactive/test-text-field.c | 179 ++++++++++++++++++++++++++
12789
4 files changed, 346 insertions(+), 32 deletions(-)
12791
commit 2cc88f1140ffa774371b877d723dfaf9e33a6ce5
12792
Author: Robert Bragg <robert@linux.intel.com>
12793
Date: Thu Oct 15 19:12:34 2009 +0100
12795
[build] fix Makefile.am.{enums,marshal} to support out of tree builds
12797
Out of tree builds were broken in commit 46b736f42e1165 since we didn't
12798
explicitly use $(srcdir) to find the input files for glib-mkenums and
12801
build/autotools/Makefile.am.enums | 4 ++--
12802
build/autotools/Makefile.am.marshal | 4 ++--
12803
2 files changed, 4 insertions(+), 4 deletions(-)
12805
commit 87f0b94df7524400b233cd1acca871fa6f8f0a02
12806
Author: Emmanuele Bassi <ebassi@gnome.org>
12807
Date: Thu Oct 15 14:20:44 2009 +0100
12809
layout, docs: Fix description of Bin properties
12811
The BinLayer and BinLayout properties name and blurb for introspection
12812
should be slightly more descriptive.
12814
clutter/clutter-bin-layout.c | 12 ++++++------
12815
1 files changed, 6 insertions(+), 6 deletions(-)
12817
commit 852abbb138898467fb6497508e99fb1a92203c78
12818
Author: Emmanuele Bassi <ebassi@gnome.org>
12819
Date: Thu Oct 15 14:12:37 2009 +0100
12821
layout, bin: Use ceilf() instead of casting to int
12823
Casting a float to int to truncate it before assigning the value
12824
to a float again is wrong. We should use ceilf() instead which
12825
does what we want to achieve (rounding up the size to avoid
12826
sub-pixel positioning of children).
12828
clutter/clutter-bin-layout.c | 26 ++++++++++++++------------
12829
1 files changed, 14 insertions(+), 12 deletions(-)
12831
commit 308c930f37c7c00eb6791d53fced7d1c2ac9600e
12832
Author: Emmanuele Bassi <ebassi@gnome.org>
12833
Date: Thu Oct 15 14:11:36 2009 +0100
12835
layout, docs: Add long description for FlowLayout
12837
Add the full description of the layout policy
12839
clutter/clutter-flow-layout.c | 16 ++++++++++++++++
12840
1 files changed, 16 insertions(+), 0 deletions(-)
12842
commit 4d153e4507fdd8fc135998f771e1826a9b02e658
12843
Author: Emmanuele Bassi <ebassi@gnome.org>
12844
Date: Thu Oct 15 12:15:49 2009 +0100
12846
layout, box: Clean up
12848
* Use g_list_foreach() instead of iterating over the list inside
12849
the destruction sequence, since we are causing the widgets to be
12850
implicitly removed from the list via the destroy() call.
12852
* Use g_signal_connect_swapped() and spare us from a callback.
12854
clutter/clutter-box.c | 20 ++++++--------------
12855
1 files changed, 6 insertions(+), 14 deletions(-)
12857
commit adca939101e3a25309c29e6a263c1c7ac7b0d877
12858
Author: Emmanuele Bassi <ebassi@gnome.org>
12859
Date: Thu Oct 15 12:04:50 2009 +0100
12861
layout, box: Write long description for Box
12863
Also have an example of how to create a Box with a layout manager
12864
and how to use the pack() method.
12866
clutter/clutter-box.c | 45 ++++++++++++++++++++++++++++++++++++++++++++-
12867
1 files changed, 44 insertions(+), 1 deletions(-)
12869
commit 9f06f726d409d0ac948179b9771350147c5e699b
12870
Author: Emmanuele Bassi <ebassi@linux.intel.com>
12871
Date: Tue Oct 13 16:52:57 2009 +0100
12873
layout, docs: Remove unused functions
12875
The :wrap property and its accessor functions were removed from
12878
doc/reference/clutter/clutter-sections.txt | 2 --
12879
1 files changed, 0 insertions(+), 2 deletions(-)
12881
commit cd3dce1d5d957046934062780d21558e182ceb1a
12882
Author: Emmanuele Bassi <ebassi@linux.intel.com>
12883
Date: Tue Oct 13 12:15:25 2009 +0100
12885
layout: Document BoxLayout
12887
Add BoxLayout to the API reference.
12889
doc/reference/clutter/clutter-docs.xml.in | 1 +
12890
doc/reference/clutter/clutter-sections.txt | 38 ++++++++++++++++++++++++++++
12891
doc/reference/clutter/clutter.types | 1 +
12892
3 files changed, 40 insertions(+), 0 deletions(-)
12894
commit b526b765931bcf4e44feac4ab1b72763eb68f264
12895
Author: Emmanuele Bassi <ebassi@linux.intel.com>
12896
Date: Tue Oct 13 12:14:05 2009 +0100
12898
layout: Add BoxLayout, a single line layout manager
12900
The BoxLayout layout manager implements a layout policy for arranging
12901
children on a single line, either alongside the X axis or alongside the
12905
clutter/Makefile.am | 2 +
12906
clutter/clutter-box-layout.c | 1496 +++++++++++++++++++++++++++++++++++
12907
clutter/clutter-box-layout.h | 143 ++++
12908
clutter/clutter.h | 1 +
12909
tests/interactive/Makefile.am | 3 +-
12910
tests/interactive/test-box-layout.c | 207 +++++
12911
7 files changed, 1852 insertions(+), 1 deletions(-)
12913
commit c4b2d4ce797b5ac4c61865d4249badcfb85657f0
12914
Author: Emmanuele Bassi <ebassi@gnome.org>
12915
Date: Thu Oct 8 15:45:29 2009 +0100
12917
layout: Report the correct size of FlowLayout
12919
FlowLayout should compute the correct height for the assigned width when
12920
in horizontal flow, and the correct width for the assigned height when
12921
in vertical flow. This means pre-computing the number of lines inside
12922
the get_preferred_width() and get_preferred_height(). We can then cache
12923
the computed column width and row height, cache them inside the layout
12924
and then use them when allocating the children.
12926
clutter/clutter-flow-layout.c | 457 +++++++++++++++++++++++++++-------
12927
tests/interactive/test-flow-layout.c | 4 +-
12928
2 files changed, 369 insertions(+), 92 deletions(-)
12930
commit 6f19666b13ac9bde44996620df714484dbe4bd67
12931
Author: Emmanuele Bassi <ebassi@gnome.org>
12932
Date: Wed Oct 7 15:30:29 2009 +0100
12934
layout: Resizing the stage resizes the FlowLayout box
12936
Add some user interaction to verify the dynamic reflowing.
12938
tests/interactive/test-flow-layout.c | 21 +++++++++++++++++++++
12939
1 files changed, 21 insertions(+), 0 deletions(-)
12941
commit 0876575a9549acd54fbc3c70b4e7178e9e4e1e65
12942
Author: Emmanuele Bassi <ebassi@gnome.org>
12943
Date: Wed Oct 7 15:29:47 2009 +0100
12945
layout: Use the get_request_mode() getter in BinLayout
12947
Instead of using g_object_get(child, "request-mode", ...).
12949
clutter/clutter-bin-layout.c | 3 +--
12950
1 files changed, 1 insertions(+), 2 deletions(-)
12952
commit eb40e856e1a687c27d047ee6069b6ec84e1e1237
12953
Author: Emmanuele Bassi <ebassi@gnome.org>
12954
Date: Wed Oct 7 15:28:01 2009 +0100
12956
layout: Change the request-mode along with the orientation
12958
When changing the orientation of a FlowLayout, the associated
12959
container should also change its request mode. A horizontally
12960
flowing layout has a height depending on the width, since it
12961
will reflow vertically; similarly, a vertically reflowing layout
12962
will have a width depending on the height.
12964
clutter/clutter-flow-layout.c | 30 ++++++++++++++++++++++++++++--
12965
1 files changed, 28 insertions(+), 2 deletions(-)
12967
commit b5895335ab2d6975665426693fb1b96d7ca86f74
12968
Author: Emmanuele Bassi <ebassi@gnome.org>
12969
Date: Wed Oct 7 15:15:02 2009 +0100
12971
actor: Add set_request_mode() method
12973
We should not require the use g_object_set()/_get() for accessing
12974
the :request-mode property. A proper accessors pair should be
12977
clutter/clutter-actor.c | 48 +++++++++++++++++++++++----
12978
clutter/clutter-actor.h | 3 ++
12979
doc/reference/clutter/clutter-sections.txt | 2 +
12980
3 files changed, 46 insertions(+), 7 deletions(-)
12982
commit 19317520b57461b505751411cf9d9f39bbf12ad5
12983
Author: Emmanuele Bassi <ebassi@gnome.org>
12984
Date: Wed Oct 7 12:35:39 2009 +0100
12986
[layout] Remove FlowLayout:wrap
12988
The :wrap property is not implemented, and mostly useless: the
12989
FlowLayout is a reflowing grid. This means that if it receives
12990
less than the preferred width or height in the flow direction
12991
then it should always reflow.
12993
clutter/clutter-flow-layout.c | 107 +++-------------------------------------
12994
clutter/clutter-flow-layout.h | 3 -
12995
2 files changed, 8 insertions(+), 102 deletions(-)
12997
commit 6d954ec0742bad823c8c474873a21ab990a56c7f
12998
Author: Emmanuele Bassi <ebassi@gnome.org>
12999
Date: Wed Oct 7 11:42:09 2009 +0100
13001
[layout] Rename BinLayout and FlowLayout interactive tests
13003
The BinLayout and FlowLayout interactive tests should be named more
13007
tests/interactive/Makefile.am | 4 +-
13008
tests/interactive/test-bin-layout.c | 185 ++++++++++++++++++++++++++++++++++
13009
tests/interactive/test-box.c | 185 ----------------------------------
13010
tests/interactive/test-flow-layout.c | 148 +++++++++++++++++++++++++++
13011
tests/interactive/test-flow.c | 148 ---------------------------
13012
6 files changed, 337 insertions(+), 337 deletions(-)
13014
commit 4ea57bc685abeea9273b2b8427a9199980cc2f40
13015
Author: Emmanuele Bassi <ebassi@gnome.org>
13016
Date: Wed Oct 7 11:39:18 2009 +0100
13018
[layout] Skip invisible children in FlowLayout
13020
Skip hidden actors when computing the preferred size and when
13023
clutter/clutter-flow-layout.c | 9 +++++++++
13024
1 files changed, 9 insertions(+), 0 deletions(-)
13026
commit b1bae4d66afc8420209f72dabcbf2fe81b461ff3
13027
Author: Emmanuele Bassi <ebassi@gnome.org>
13028
Date: Wed Oct 7 11:08:51 2009 +0100
13030
[layout] Clean up and document FlowLayout
13032
clutter/clutter-flow-layout.c | 177 ++++++++++++++++++++++++++++++++++++++--
13033
1 files changed, 168 insertions(+), 9 deletions(-)
13035
commit db3ef971705485b1000def688635daaac99f79cd
13036
Author: Emmanuele Bassi <ebassi@gnome.org>
13037
Date: Tue Oct 6 17:30:49 2009 +0100
13039
[layout] Snap children of FlowLayout to column/row
13041
Use the column and row size to align each child; with :homogeneous
13042
set to TRUE, or with children with the same size, the FlowLayout
13043
will behave like a reflowing grid.
13045
clutter/clutter-flow-layout.c | 14 ++++++++++----
13046
1 files changed, 10 insertions(+), 4 deletions(-)
13048
commit e5a074fd9e487444db9114c2970a4d83c1661c7f
13049
Author: Emmanuele Bassi <ebassi@gnome.org>
13050
Date: Tue Oct 6 16:17:16 2009 +0100
13052
[layout] Add :homogeneous to FlowLayout
13054
clutter/clutter-flow-layout.c | 90 +++++++++++++++++++++++++++++++++++-----
13055
clutter/clutter-flow-layout.h | 3 +
13056
tests/interactive/test-flow.c | 37 +++++++++++++++-
13057
3 files changed, 115 insertions(+), 15 deletions(-)
13059
commit 5737cf869f162f5539ae00f86db7923502c38dab
13060
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13061
Date: Fri Sep 18 17:28:02 2009 +0100
13063
[layout] Initial implementation of FlowLayout
13065
FlowLayout is a layout manager that arranges its children in a
13066
reflowing line; the orientation controls the major axis for the
13067
layout: horizontal, for reflow on the Y axis, and vertical, for
13068
reflow on the X axis.
13071
clutter/Makefile.am | 2 +
13072
clutter/clutter-flow-layout.c | 855 ++++++++++++++++++++++++++++
13073
clutter/clutter-flow-layout.h | 127 ++++
13074
clutter/clutter.h | 1 +
13075
doc/reference/clutter/clutter-docs.xml.in | 1 +
13076
doc/reference/clutter/clutter-sections.txt | 34 ++
13077
doc/reference/clutter/clutter.types | 1 +
13078
tests/interactive/Makefile.am | 3 +-
13079
tests/interactive/test-flow.c | 117 ++++
13080
10 files changed, 1141 insertions(+), 1 deletions(-)
13082
commit 857b0239e906b0e5eb1a2fec8703eb675a70675f
13083
Author: Emmanuele Bassi <ebassi@gnome.org>
13084
Date: Mon Oct 5 17:21:41 2009 +0100
13086
[layout] Use FixedLayout inside Group
13088
The Group actor should use the FixedLayout layout manager object
13089
to avoid duplicating code.
13091
clutter/clutter-group.c | 138 ++++++++++-------------------------------------
13092
1 files changed, 29 insertions(+), 109 deletions(-)
13094
commit 62db72cf4106f498a041d02d67de72460130acdd
13095
Author: Emmanuele Bassi <ebassi@gnome.org>
13096
Date: Mon Oct 5 17:09:04 2009 +0100
13098
[layout] Update FixedLayout
13100
The behaviour of ClutterGroup has been fixed with regards to the
13101
preferred size request; the fixed layout manager should use the
13104
clutter/clutter-fixed-layout.c | 116 +++++++---------------------------------
13105
1 files changed, 20 insertions(+), 96 deletions(-)
13107
commit 4663552a0017f85c818a664b3528fab617e6e15c
13108
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13109
Date: Fri Sep 18 15:29:09 2009 +0100
13111
[layout] Typo and whitespace fixes
13113
clutter/clutter-box.c | 2 +-
13114
clutter/clutter-box.h | 2 +-
13115
2 files changed, 2 insertions(+), 2 deletions(-)
13117
commit c98388bb0166fedd4e72bca42b99782a9b2fb52c
13118
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13119
Date: Thu Sep 17 18:21:51 2009 +0100
13121
[layout, box] Add Box:color
13123
Allow setting the background color of a ClutterBox
13125
clutter/clutter-box.c | 136 +++++++++++++++++++++++++++-
13126
clutter/clutter-box.h | 5 +
13127
doc/reference/clutter/clutter-sections.txt | 4 +
13128
3 files changed, 144 insertions(+), 1 deletions(-)
13130
commit df6ca3d171a6a8d1a18cbf0fe70f4e4572e54479
13131
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13132
Date: Thu Sep 17 11:38:43 2009 +0100
13134
[layout, docs] Clean up BinLayout documentation
13136
Documentation and code style fixes for BinLayout.
13138
clutter/clutter-bin-layout.c | 120 ++++++++++++++++++++++++++++++-----------
13139
clutter/clutter-bin-layout.h | 24 ++++++++
13140
2 files changed, 112 insertions(+), 32 deletions(-)
13142
commit 8b2088a91787562c01d5b8184f1f2b2f1d225371
13143
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13144
Date: Wed Sep 16 15:55:30 2009 +0100
13146
[layout, tests] Use variants for child packing in Box
13148
There are three potential variants to add a child inside a Box
13151
- clutter_box_pack(), a variadic argument function which
13152
allows passing arbitrary LayoutMeta properties and values;
13154
- clutter_bin_layout_add(), which uses the backpointer to
13155
the container from the LayoutManager and sets the layout
13156
properties directly without GValue (de)marshalling
13158
- clutter_container_add_actor() and
13159
clutter_bin_layout_set_alignment(), similar to the
13160
clutter_bin_layout_add() function above, but split in two
13162
The test-box interactive test should exercise all three variants.
13164
tests/interactive/test-box.c | 24 ++++++++++++++++--------
13165
1 files changed, 16 insertions(+), 8 deletions(-)
13167
commit 431a63d04adc40dfd719563c4f9978324f618b4e
13168
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13169
Date: Wed Sep 16 15:51:13 2009 +0100
13171
[layout] Store and use the container inside BinLayout
13173
The BinLayout should store a pointer to the Container that it is
13174
using it as the layout manager.
13176
This allows us to fix the API and drop the additional Container
13177
arguments from set_alignment() and get_alignment().
13179
This also allows us to add a ClutterBinLayout::add() method which
13180
adds an actor and sets the alignment policies without dealing with
13181
variadic arguments functions and GValue (de)marshalling.
13183
clutter/clutter-bin-layout.c | 120 +++++++++++++++++++++++++---
13184
clutter/clutter-bin-layout.h | 7 +-
13185
doc/reference/clutter/clutter-sections.txt | 1 +
13186
3 files changed, 114 insertions(+), 14 deletions(-)
13188
commit 755896664f7efc4bbfce0bfb6ea3249b6c526a59
13189
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13190
Date: Wed Sep 16 15:48:28 2009 +0100
13192
[layout] Set a back pointer to Box inside the layout
13194
Use the LayoutManager API to set a back pointer to the Box actor
13195
inside the LayoutManager used by the box.
13197
This also allows us to replace the LayoutManager on a Box, since
13198
the LayoutManager will be able to replace all the metadata if
13201
clutter/clutter-box.c | 37 ++++++++++++++++++++++++++-
13202
clutter/clutter-box.h | 2 +
13203
doc/reference/clutter/clutter-sections.txt | 1 +
13204
3 files changed, 38 insertions(+), 2 deletions(-)
13206
commit 22bb243ec24821cd18e7dba791e793884ffe2a63
13207
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13208
Date: Wed Sep 16 15:47:26 2009 +0100
13210
[layout] Replace stale LayoutMeta
13212
If a LayoutMeta references a different container and/or layout manager
13213
then we should simply replace it and discard the previous one.
13215
clutter/clutter-layout-manager.c | 17 ++++++++++++++++-
13216
1 files changed, 16 insertions(+), 1 deletions(-)
13218
commit 9117ee205691a5bb1a3bb65e1963ed5b8826b79f
13219
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13220
Date: Wed Sep 16 14:58:30 2009 +0100
13222
[layout] Allow taking a back pointer to the Container
13224
The LayoutManager implementation might opt to take a back pointer
13225
to the Container that is using the layout instance; this allows
13226
direct access to the container itself from within the implementation.
13228
clutter/clutter-layout-manager.c | 28 ++++++++++++++++++++++++++++
13229
clutter/clutter-layout-manager.h | 12 ++++++++++++
13230
doc/reference/clutter/clutter-sections.txt | 1 +
13231
3 files changed, 41 insertions(+), 0 deletions(-)
13233
commit f58bdbad15206f4369589f50789b9db9585f6e03
13234
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13235
Date: Wed Sep 16 11:10:45 2009 +0100
13237
[layout] Rename Box::add to Box::pack
13239
Since ClutterBox is a ClutterContainer we should avoid naming
13240
collisions between methods.
13242
clutter/clutter-box.c | 24 ++++++++++++------------
13243
clutter/clutter-box.h | 4 ++--
13244
doc/reference/clutter/clutter-sections.txt | 4 ++--
13245
tests/interactive/test-box.c | 24 ++++++++++++------------
13246
4 files changed, 28 insertions(+), 28 deletions(-)
13248
commit c6f67bf872ec2b51951a554e0351e6d7615d28ce
13249
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13250
Date: Wed Sep 16 11:10:38 2009 +0100
13252
[layout, docs] Document FixedLayout
13254
clutter/clutter-fixed-layout.c | 45 ++++++++++++++++++++++++++++++++++++++++
13255
clutter/clutter-fixed-layout.h | 42 +++++++++++++++++++++++++++++++++++++
13256
2 files changed, 87 insertions(+), 0 deletions(-)
13258
commit aaae60e17837d6f0b330c04345f1e2c2be9f24b9
13259
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13260
Date: Tue Sep 15 23:20:51 2009 +0100
13262
[layout] Implement ClutterBox::add
13264
The ClutterBox::add method is a simple wrapper around the Container
13265
add_actor() method and the LayoutManager layout properties API. It
13266
allows adding an actor to a Box and setting the layout properties in
13269
If the LayoutManager used by the Box does not support layout properties
13270
then the add() method short-circuits out.
13272
Along with the varargs version of the method there's also a vector-based
13273
variant, for language bindings to use.
13275
clutter/clutter-box.c | 186 ++++++++++++++++++++++++++++
13276
clutter/clutter-box.h | 10 ++
13277
doc/reference/clutter/clutter-sections.txt | 2 +
13278
tests/interactive/test-box.c | 31 ++---
13279
4 files changed, 210 insertions(+), 19 deletions(-)
13281
commit a2086f1178fa3aed7fdc6f94d09efbc0e1bc2c11
13282
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13283
Date: Tue Sep 15 17:37:11 2009 +0100
13285
[layout] Add LayoutMeta
13287
Instead of overloading ClutterChildMeta with both container and layout
13288
metadata and delegate to every LayoutManager implementation to keep a
13289
backpointer to the layout manager instance, we can simply subclass
13290
ChildMeta into LayoutMeta and presto! everything works out pretty well
13293
clutter/Makefile.am | 2 +
13294
clutter/clutter-bin-layout.c | 35 +++----
13295
clutter/clutter-layout-manager.c | 58 ++++++-----
13296
clutter/clutter-layout-manager.h | 133 +++++++++++++-------------
13297
clutter/clutter-layout-meta.c | 142 ++++++++++++++++++++++++++++
13298
clutter/clutter-layout-meta.h | 85 +++++++++++++++++
13299
clutter/clutter-types.h | 1 +
13300
clutter/clutter.h | 1 +
13301
doc/reference/clutter/clutter-docs.xml.in | 5 +-
13302
doc/reference/clutter/clutter-sections.txt | 19 ++++
13303
doc/reference/clutter/clutter.types | 1 +
13304
11 files changed, 369 insertions(+), 113 deletions(-)
13306
commit 899db6f226864614350d6aa07d8313dccf7d652f
13307
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13308
Date: Tue Sep 15 16:24:47 2009 +0100
13310
[layout, docs] Add layout managers sections
13312
Add LayoutManager and its subclasses, and the Box actor to the
13313
gtk-doc machinery needed to generate the API reference.
13315
clutter/clutter-bin-layout.c | 6 +-
13316
clutter/clutter-bin-layout.h | 4 +-
13317
clutter/clutter-layout-manager.c | 145 +++++++++++++++++++++++++++-
13318
clutter/clutter-layout-manager.h | 16 +++-
13319
doc/reference/clutter/clutter-docs.xml.in | 9 ++
13320
doc/reference/clutter/clutter-sections.txt | 94 ++++++++++++++++++
13321
doc/reference/clutter/clutter.types | 4 +
13322
7 files changed, 269 insertions(+), 9 deletions(-)
13324
commit 9cccff504a40706e70b11878572d7e7db7430792
13325
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13326
Date: Mon Sep 14 21:51:49 2009 +0100
13328
[layout] Add layers to BinLayout
13330
Each actor managed by a BinLayout policy should reside inside its
13331
own "layer", with horizontal and vertical alignment. The :x-align
13332
and :y-align properties of the BinLayout are the default alignment
13333
policies, which are copied to each new "layer" when it is created.
13335
The set_alignment() and get_alignment() methods of BinLayout can
13336
be changed to operate on a specific "layer".
13338
The whole machinery uses the new ChildMeta support inside the
13339
LayoutManager base abstract class.
13341
clutter/clutter-bin-layout.c | 265 +++++++++++++++++++++++++++++++++++++----
13342
clutter/clutter-bin-layout.h | 4 +
13343
tests/interactive/test-box.c | 147 ++++++++++++++++++++++-
13344
3 files changed, 385 insertions(+), 31 deletions(-)
13346
commit 98474076a1310494fec252fb6bfce8001bca78da
13347
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13348
Date: Mon Sep 14 21:50:20 2009 +0100
13350
[layout] Bind the layout ChildMeta inside Box
13352
The ClutterBox container actor should add and remove ChildMeta to
13353
each actor that has been added and removed to the list of children,
13356
clutter/clutter-box.c | 9 +++++++++
13357
1 files changed, 9 insertions(+), 0 deletions(-)
13359
commit 7051fe275d9d052ce42e8237080844aa18ee927c
13360
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13361
Date: Mon Sep 14 21:48:06 2009 +0100
13363
[layout] Bind ChildMeta to LayoutManager
13365
The ChildMeta object is a storage for child-container properties,
13366
that is properties that exist only when an actor is inside a specific
13367
container. The LayoutManager delegate class should also have
13368
layout-specific properties -- so, for this job, we can "recycle"
13369
ChildMeta as the storage.
13371
clutter/clutter-layout-manager.c | 372 ++++++++++++++++++++++++++++++++++++++
13372
clutter/clutter-layout-manager.h | 92 ++++++----
13373
2 files changed, 432 insertions(+), 32 deletions(-)
13375
commit 83a4e9626772453804c61d7aa022eacf540bf0ce
13376
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13377
Date: Mon Sep 14 12:04:42 2009 +0100
13379
[layout] Document BinLayout
13381
clutter/clutter-bin-layout.c | 93 ++++++++++++++++++++++++++++++++++++++++++
13382
clutter/clutter-bin-layout.h | 46 ++++++++++++++++++++-
13383
2 files changed, 137 insertions(+), 2 deletions(-)
13385
commit b06a3293fe3d065369d9f97ad8bfa77051414fec
13386
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13387
Date: Mon Sep 14 12:03:38 2009 +0100
13389
[layout] Notify of alignment changes in BinLayout
13391
Emit the ::layout-changed when the BinLayout alignment policies change.
13393
This will result in a queue_relayout() on the containers using the
13394
BinLayout layout manager.
13396
clutter/clutter-bin-layout.c | 10 ++++++++++
13397
1 files changed, 10 insertions(+), 0 deletions(-)
13399
commit 4e8d8bbc15f26e95adfd59469306b7098f9fd491
13400
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13401
Date: Mon Sep 14 11:28:34 2009 +0100
13403
[layout] Update Box
13405
* Use ::layout-changed to queue a relayout when the layout changes
13407
* Destroy the Box children when destroying the Box
13409
* Allow getting the layout manager from the Box
13411
clutter/clutter-box.c | 72 +++++++++++++++++++++++++++++++++++++++++++++---
13412
clutter/clutter-box.h | 4 ++-
13413
2 files changed, 70 insertions(+), 6 deletions(-)
13415
commit d096a3c791ab5b105d55a19ab316cd8b2fff878b
13416
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13417
Date: Mon Sep 14 11:04:11 2009 +0100
13419
[layout] Add LayoutManager::layout-changed signal
13421
If a sub-class of LayoutManager wishes to implement a parametrized
13422
layout policy it also needs a way to notify the container using the
13423
layout manager that the layout has changed. We cannot do it directly
13424
and automatically from the LayoutManager because a) it has no back
13425
link to the actor that it is using it and b) it can be attached to
13428
This is a job for <cue raising dramatic music> signals!
13430
By adding ClutterLayoutManager::layout-changed (and its relative
13431
emitted function) we can notify actors using the layout manager that
13432
the layout parameters have been changed, and thus they should queue
13435
clutter/clutter-layout-manager.c | 103 +++++++++++++++++++++++++++++++++++++-
13436
clutter/clutter-layout-manager.h | 44 ++++++++++++++++
13437
2 files changed, 146 insertions(+), 1 deletions(-)
13439
commit a1853892bae7c54d28a86e253e04c3753d65e159
13440
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13441
Date: Fri Sep 11 15:34:13 2009 +0100
13443
[tests] Add a Box interactive test
13446
tests/interactive/Makefile.am | 3 +-
13447
tests/interactive/test-box.c | 47 +++++++++++++++++++++++++++++++++++++++++
13448
3 files changed, 50 insertions(+), 1 deletions(-)
13450
commit 1061ebeac90a5b03a172aa649aa5a8b8cfb5b293
13451
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13452
Date: Fri Sep 11 13:51:23 2009 +0100
13454
[layout] Add BinLayout
13456
A BinLayout is a simple layout manager that allocates a single cell,
13457
providing alignment on both the horizontal and vertical axis.
13459
If the container associated to the BinLayout has more than one child,
13460
the preferred size returned by the layout manager will be as big as
13461
the maximum of the children preferred sizes; the allocation will be
13462
applied to all children - but it will still depend on each child
13463
preferred size and the BinLayout horizontal and vertical alignment
13466
The supported alignment properties are:
13468
* center: align the child by centering it
13469
* start: align the child at the top or left border of the layout
13470
* end: align the child at the bottom or right border of the layout
13471
* fill: expand the child to fill the size of the layout
13472
* fixed: let the child position itself
13474
clutter/Makefile.am | 2 +
13475
clutter/clutter-bin-layout.c | 397 ++++++++++++++++++++++++++++++++++++++++++
13476
clutter/clutter-bin-layout.h | 50 ++++++
13477
clutter/clutter.h | 1 +
13478
4 files changed, 450 insertions(+), 0 deletions(-)
13480
commit 6d4cc13f7c7047a609dd8055ce63048da294af39
13481
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13482
Date: Wed Sep 2 12:37:16 2009 +0100
13484
[layout] Add Fixed layout manager
13486
The FixedLayout layout manager object implements the same layout
13487
policy of ClutterGroup.
13489
clutter/Makefile.am | 2 +
13490
clutter/clutter-fixed-layout.c | 217 ++++++++++++++++++++++++++++++++++++++++
13491
clutter/clutter-fixed-layout.h | 38 +++++++
13492
clutter/clutter.h | 1 +
13493
4 files changed, 258 insertions(+), 0 deletions(-)
13495
commit 141a1556908749236c90e69fc2388f4fc40c6d8f
13496
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13497
Date: Wed Sep 2 11:55:22 2009 +0100
13499
[layout] Make LayoutManager a floating object
13501
A layout manager instance makes only sense if it's owned by a
13502
container. For this reason, it should have a floating reference
13503
instead of a full reference on construction; this allows constructing
13506
box = clutter_box_new (clutter_fixed_layout_new ());
13508
without leaking the layout manager instance.
13510
clutter/clutter-box.c | 3 ++-
13511
clutter/clutter-layout-manager.c | 4 +++-
13512
clutter/clutter-layout-manager.h | 4 ++--
13513
3 files changed, 7 insertions(+), 4 deletions(-)
13515
commit 0340f656346d80696305218897720e28c88f367a
13516
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13517
Date: Tue Sep 1 17:42:50 2009 +0100
13519
[box] Add ClutterBox
13521
ClutterBox is an actor with no layout management. It relies on
13522
a ClutterLayoutManager to perform size requisition and allocation
13525
clutter/Makefile.am | 2 +
13526
clutter/clutter-box.c | 368 +++++++++++++++++++++++++++++++++++++++++++++++++
13527
clutter/clutter-box.h | 43 ++++++
13528
clutter/clutter.h | 1 +
13529
4 files changed, 414 insertions(+), 0 deletions(-)
13531
commit d6183e95e51d1e3807ed5150768de2426b6b8e65
13532
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13533
Date: Tue Sep 1 16:34:28 2009 +0100
13535
[layout] Add initial implementation of LayoutManager
13537
The LayoutManager class is an abstract proxy for the size requesition
13538
and size allocation process in ClutterActor.
13540
A ClutterLayoutManager sub-class must implement get_preferred_width(),
13541
get_preferred_height() and allocate(); a ClutterContainer using the
13542
LayoutManager API will then proxy the corresponding Actor virtual
13543
functions to the LayoutManager instance. This allows having a generic
13544
"blank" ClutterActor sub-class, implementing the ClutterContainer
13545
interface, which leaves only the layout management implementation to
13546
the application developers.
13548
clutter/Makefile.am | 2 +
13549
clutter/clutter-layout-manager.c | 180 ++++++++++++++++++++++++++++++++++++++
13550
clutter/clutter-layout-manager.h | 92 +++++++++++++++++++
13551
clutter/clutter.h | 1 +
13552
4 files changed, 275 insertions(+), 0 deletions(-)
13554
commit 4f2bfc003ad0f5b0b9d69693eed1bdbc9655f947
13555
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13556
Date: Tue Oct 13 19:27:03 2009 +0100
13558
build: Clean up main Makefile.am
13560
clutter/Makefile.am | 55 ++++++++++++++++++++++++++------------------------
13561
1 files changed, 29 insertions(+), 26 deletions(-)
13563
commit 46b736f42e1165420796ed2afe4fc791d82381da
13564
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13565
Date: Tue Oct 13 17:27:19 2009 +0100
13567
build: Move marshallers and enum types rules out
13569
The rules to create signal marshallers and enumeration GTypes are
13570
usually copied and pasted all over different projects, though they
13571
are pretty generic and, given a little bit of parametrization, can
13572
be put in separate Makefile.am files and included whenever needed.
13574
build/autotools/Makefile.am | 2 +
13575
build/autotools/Makefile.am.enums | 43 ++++++++++++++++++++
13576
build/autotools/Makefile.am.marshal | 44 ++++++++++++++++++++
13577
clutter/Makefile.am | 75 ++++++++--------------------------
13578
4 files changed, 107 insertions(+), 57 deletions(-)
13580
commit 0e33c10048dd3cba33644fd51ae3e1ea18dcc357
13581
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13582
Date: Tue Oct 13 17:00:15 2009 +0100
13584
docs: Allow XInclude fallback for the annotation glossary
13586
doc/reference/clutter/clutter-docs.xml.in | 2 +-
13587
1 files changed, 1 insertions(+), 1 deletions(-)
13589
commit a99f693c85cee6e389892b271f8aa25532bd7a6f
13590
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13591
Date: Sat Oct 10 13:52:46 2009 +0100
13593
docs: Make StageManager a public class
13595
The StageManager API is useful to track the stages of an application.
13596
It will also be useful when we land the modules API.
13598
doc/reference/clutter/Makefile.am | 1 -
13599
doc/reference/clutter/clutter-docs.xml.in | 1 +
13600
doc/reference/clutter/clutter-sections.txt | 23 +++++++++++++++++++++++
13601
doc/reference/clutter/clutter.types | 2 ++
13602
4 files changed, 26 insertions(+), 1 deletions(-)
13604
commit c3d056533c8733160227b790388723a4c8a16123
13605
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13606
Date: Sat Oct 10 13:51:47 2009 +0100
13608
stage/manager: Set :default-stage as read-only
13610
The StageManager:default-stage property should be read-only, since
13611
the default stage is owned by Clutter itself.
13613
clutter/clutter-stage-manager.c | 23 ++---------------------
13614
1 files changed, 2 insertions(+), 21 deletions(-)
13616
commit 74eaa2941327d3ee7762a93136b647979b6e094a
13617
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13618
Date: Sat Oct 10 13:50:25 2009 +0100
13620
stage/manager: Deprecate set_default_stage()
13622
The set_default_stage() method of StageManager should not be used
13623
by application code; technically, nothing in Clutter uses it, and
13624
StageManager's API is not considered public anyway.
13626
clutter/clutter-stage-manager.c | 52 ++++++++++++++++++++++++++++++--------
13627
clutter/clutter-stage-manager.h | 23 ++++++++++++++---
13628
2 files changed, 60 insertions(+), 15 deletions(-)
13630
commit a7ff5385a5071824e996eae6b92486ef07bd143e
13631
Author: Damien Lespiau <damien.lespiau@intel.com>
13632
Date: Fri Oct 9 17:18:34 2009 +0100
13634
[actor] Unset the IN_DESTRUCTION flag when leaving ::destroy()
13636
The IN_DESTRUCTION flag is set around the unrealization and disposal of
13637
the actor in clutter_actor_destroy() but is never unset (it's set twice
13640
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
13642
clutter/clutter-actor.c | 2 +-
13643
1 files changed, 1 insertions(+), 1 deletions(-)
13645
commit 3bbc96e17e5a03ba931c86a5cd2a0ecaa2a3b77b
13646
Author: Emmanuele Bassi <ebassi@linux.intel.com>
13647
Date: Wed Oct 7 21:44:17 2009 +0100
13649
text: Make the :text property not set the :use-markup one
13651
Currently, setting the :text property has the side-effect of
13652
setting the :use-markup property to FALSE. This prevents
13653
constructing a Text actor, or setting its properties, like:
13655
g_object_set (text,
13656
"use-markup", TRUE,
13657
"text", some_string,
13660
as the ordering becomes important. Unfortunately, the ordering
13661
of the properties cannot be enforced with ClutterScript or
13662
with language bindings.
13664
The documentation of the clutter_text_set_text() method should
13665
be expanded to properly specify that the set_text() method will
13666
change the :use-markup property to FALSE as a side effect.
13668
clutter/clutter-text.c | 283 ++++++++++++++++++++++++------------------------
13669
1 files changed, 144 insertions(+), 139 deletions(-)
13671
commit 1f207c00d96e08141f6b998269732d9e65d4cf14
13672
Author: Emmanuele Bassi <ebassi@gnome.org>
13673
Date: Wed Oct 7 17:35:11 2009 +0100
13675
docs: Add the "clipping" section to the COGL API reference
13677
All the clip-related API in COGL is missing from the API reference
13678
because the cogl-clipping section is not included inside the main
13681
doc/reference/cogl/cogl-docs.xml.in | 1 +
13682
doc/reference/cogl/cogl-sections.txt | 3 ++-
13683
2 files changed, 3 insertions(+), 1 deletions(-)
13685
commit 80b3a8d3283fcc8af89bc83b2266ccd894cc50a6
13686
Author: Damien Lespiau <damien.lespiau@intel.com>
13687
Date: Wed Oct 7 17:09:41 2009 +0100
13689
[units] Ensure we don't have ponies
13691
The documentation states we should not parse ponies. Even with those
13692
with exclamation marks.
13694
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
13696
tests/conform/test-clutter-units.c | 2 +-
13697
1 files changed, 1 insertions(+), 1 deletions(-)
13699
commit 19c68799608910635b70c9befb92c1a6a21c15f3
13700
Author: Damien Lespiau <damien.lespiau@intel.com>
13701
Date: Tue Oct 6 00:49:40 2009 +0100
13703
[path] Add GValue transform functions from and to G_TYPE_STRING
13705
Transform functions allow the use of g_value_transform() to cast
13706
GValues. It's very handy to have casts to and from G_TYPE_STRING as it
13707
allows generic serialization and parsing of GTypes.
13709
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
13711
clutter/clutter-path.c | 36 +++++++++++++++++++++++++++++++++++-
13712
1 files changed, 35 insertions(+), 1 deletions(-)
13714
commit 8605073edb7a1e830696632a6de5ad694f1af98d
13715
Author: Damien Lespiau <damien.lespiau@intel.com>
13716
Date: Tue Oct 6 17:47:34 2009 +0100
13718
[units] Add support for centimeters
13720
The only tricky part of the patch is to remember that 1cm is 10mm.
13722
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
13724
clutter/clutter-units.c | 48 ++++++++++++++++++++++++++-
13725
clutter/clutter-units.h | 7 +++-
13726
doc/reference/clutter/clutter-sections.txt | 1 +
13727
tests/conform/test-clutter-units.c | 17 ++++++++--
13728
4 files changed, 67 insertions(+), 6 deletions(-)
13730
commit 96859959bd24d99f51d5dea3b5ec7bc4bf7071f3
13731
Author: Damien Lespiau <damien.lespiau@intel.com>
13732
Date: Tue Oct 6 12:02:15 2009 +0100
13734
[units] Be more strict in the grammar we are parsing
13736
Current parsing of units has a number of shortcomings:
13737
* a number followed by trailing space (without any unit specified) was
13739
* "5 emeralds" was parsed as 5em,
13740
* the way we parse the digits after the separator makes us lose
13741
precision for no good reason (5.0 is parsed as 5.00010014...f which
13742
makes g_assert_cmpfloat() fail)
13744
Let's define a stricter grammar we can recognize and try to do so. The
13745
description is in EBNF form, removing the optional <> which is a pain
13746
when having to write DocBook, and using '' for the terminal symbols.
13748
Last step, add more ClutterUnits unit test to get a better coverage of
13749
the grammar we want to parse.
13751
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
13753
clutter/clutter-units.c | 76 ++++++++++++++++++++++-------------
13754
tests/conform/test-clutter-units.c | 22 ++++++++++
13755
2 files changed, 70 insertions(+), 28 deletions(-)
13757
commit 4d481e03f3534cb703a276cd430056d3ec27fcb0
13758
Author: Emmanuele Bassi <ebassi@gnome.org>
13759
Date: Wed Oct 7 13:00:57 2009 +0100
13761
color: Measure the string just once when parsing
13763
Instead of measuring the color hexadecimal string for each case, just
13764
measure it once and then use a switch() to go to the right case.
13766
clutter/clutter-color.c | 40 ++++++++++++++++++++++------------------
13767
1 files changed, 22 insertions(+), 18 deletions(-)
13769
commit c7d50083ec1d1209dd8653bc30ba4f3bec09e976
13770
Author: Thomas Wood <thomas.wood@intel.com>
13771
Date: Wed Oct 7 12:27:38 2009 +0100
13773
[color] allow alpha to be omitted when converting to color from string
13775
Parse #rgb and #rrggbb in addition to forms with the alpha channel
13776
specified. This allows conversion of colour strings from documents such as
13777
CSS where the alpha channel is not specified when using '#' notation.
13779
This patch also adds the relevant conformance test.
13781
clutter/clutter-color.c | 22 ++++++++++++++++++++++
13782
tests/conform/test-color.c | 28 ++++++++++++++++++++++++++++
13783
2 files changed, 50 insertions(+), 0 deletions(-)
13785
commit 13ac1fe75bec418f4e37e04540e6d16af55413f5
13786
Author: Neil Roberts <neil@linux.intel.com>
13787
Date: Wed Oct 7 11:31:44 2009 +0100
13789
[clutter-id-pool] Also warn if the ID refers to a deleted actor
13791
We should also warn if the glReadPixels happens to generate an ID that
13792
is within the range of the ID array but no longer points to an
13795
clutter/clutter-id-pool.c | 10 +++++-----
13796
1 files changed, 5 insertions(+), 5 deletions(-)
13798
commit a4ff4d37a40b60ce7f7029c6fe12181c0e1e89e5
13799
Author: Neil Roberts <neil@linux.intel.com>
13800
Date: Wed Oct 7 12:46:43 2009 +0100
13802
[clutter-id-pool] Fix the check for out-of-range IDs
13804
If id == the length of the array then it is also invalid and could
13807
clutter/clutter-id-pool.c | 2 +-
13808
1 files changed, 1 insertions(+), 1 deletions(-)
13810
commit 142f8865181e92fb405ae0d2b2bc65468a9d2262
13811
Author: Thomas Wood <thomas.wood@intel.com>
13812
Date: Wed Oct 7 12:15:26 2009 +0100
13814
Revert "[color] allow alpha to omitted when converting from strings"
13816
This reverts commit eb8daac4b0726c1d9925bbbaeed7a8f39007da21.
13818
The original commit was incorrect and pushed accidentally.
13820
clutter/clutter-color.c | 22 ----------------------
13821
1 files changed, 0 insertions(+), 22 deletions(-)
13823
commit bdf7499207d3fdba440228832445b71b9f64d300
13824
Author: Thomas Wood <thomas.wood@intel.com>
13825
Date: Wed Oct 7 11:40:41 2009 +0100
13827
[color] add a note to the documentation to specify the values of the alpha
13829
The alpha channel is fully opaque at 255 and fully transparent at 0.
13831
clutter/clutter-color.c | 2 ++
13832
1 files changed, 2 insertions(+), 0 deletions(-)
13834
commit eb8daac4b0726c1d9925bbbaeed7a8f39007da21
13835
Author: Thomas Wood <thomas.wood@intel.com>
13836
Date: Wed Oct 7 11:38:08 2009 +0100
13838
[color] allow alpha to omitted when converting from strings
13840
Parse #rgb and #rrggbb in addition to forms with the alpha channel
13841
specified. This allows conversion of colour strings from documents such as
13842
CSS where the alpha channel is not specified when using '#' notation.
13844
clutter/clutter-color.c | 22 ++++++++++++++++++++++
13845
1 files changed, 22 insertions(+), 0 deletions(-)
13847
commit 9e03d9231696160ef7d4d98cf6c1d2f2214c7172
13848
Author: Damien Lespiau <damien.lespiau@intel.com>
13849
Date: Tue Oct 6 01:04:50 2009 +0100
13851
[path] MOVE_TO and LINE_TO only use a pair of coordinates
13853
The documentation of ClutterPathNode had a small typo and stated that
13854
they use 2 pairs of coordinates.
13856
clutter/clutter-path.h | 4 ++--
13857
1 files changed, 2 insertions(+), 2 deletions(-)
13859
commit dd8e4dcd62979bf8b7c8ad0e8898888a065ba445
13860
Author: Robert Bragg <robert@linux.intel.com>
13861
Date: Mon Oct 5 16:46:24 2009 +0100
13863
[debug] Guard the use of gdk_pixbuf for pick debugging by #ifdef USE_GDKPIXBUF
13865
gdk is an optional clutter dependency, so the pick buffer debugging option
13866
needs some guards so we don't break, for example, the OSX builds. This also
13867
adds a comment for the bit fiddling done on the pick colors used to ensure
13868
the pick colors are more distinguished while debugging. (we swap the
13869
nibbles of each color component so that pick buffers don't just look black.)
13871
clutter/clutter-main.c | 25 +++++++++++++++++++++++++
13872
1 files changed, 25 insertions(+), 0 deletions(-)
13874
commit f7c02642453420cf5866f9759d5f266d8ada40a5
13875
Author: Emmanuele Bassi <ebassi@gnome.org>
13876
Date: Mon Oct 5 15:51:28 2009 +0100
13878
[sdl] Update the SDL backend to the new StageWindow API
13880
The SDL backend remains experimental and not meant for public
13881
consumption, but at least it compiles and runs successfully.
13883
clutter/sdl/clutter-backend-sdl.c | 8 +-
13884
clutter/sdl/clutter-stage-sdl.c | 130 +++++++++++++++----------------------
13885
2 files changed, 57 insertions(+), 81 deletions(-)
13887
commit 3fee43560d8108f9508cbb24ee98228e50b79e5d
13888
Author: Emmanuele Bassi <ebassi@gnome.org>
13889
Date: Mon Oct 5 15:53:06 2009 +0100
13891
[eglx] Create a StageWindow, not an Actor
13893
The Backend should create a StageWindow instance, not an Actor.
13895
clutter/eglx/clutter-backend-egl.c | 4 ++--
13896
1 files changed, 2 insertions(+), 2 deletions(-)
13898
commit 40222e891bec62e4e7187a3e66bdf7866a60bd38
13899
Author: Neil Roberts <neil@linux.intel.com>
13900
Date: Tue Sep 29 12:11:55 2009 +0100
13902
[ClutterGroup] Don't take into account the left edges when calculating the size
13904
ClutterGroup previously calculated the size as the distance from the
13905
left edge of the leftmost child to the right edge of the rightmost
13906
child except if there were any chidren left of the origin then the
13907
left edge would be zero.
13909
However the group is always allocated its size relative to its
13910
origin so if all of the children are to the right of the origin then
13911
the preferred size would not be large enough to reach the rightmost
13926
This patch makes it so the size is always just the rightmost edge.
13942
http://bugzilla.openedhand.com/show_bug.cgi?id=1825
13944
clutter/clutter-group.c | 122 ++++++++++-------------------------------------
13945
1 files changed, 26 insertions(+), 96 deletions(-)
13947
commit 14e12ae4fd9320eeb970ff8aa7dfcd43dcfd5975
13948
Author: Emmanuele Bassi <ebassi@gnome.org>
13949
Date: Mon Oct 5 14:58:08 2009 +0100
13951
[eglx] Update the EGLX Stage to the new StageWindow API
13953
Move the ::realize and ::unrealize implementations over to the
13954
StageWindow instead of using Actor.
13956
clutter/eglx/clutter-stage-egl.c | 120 +++++++++++++++++++-------------------
13957
1 files changed, 60 insertions(+), 60 deletions(-)
13959
commit a799f6ccec0ea755c7677c5fe20c1bd52b321c05
13960
Author: Damien Lespiau <damien.lespiau@intel.com>
13961
Date: Sat Oct 3 14:08:33 2009 +0100
13963
Fix string parsing when no unit is given
13965
The check should really be on the character pointed by str. Added the
13966
corresponding test case.
13968
clutter/clutter-units.c | 2 +-
13969
tests/conform/test-clutter-units.c | 4 ++++
13970
2 files changed, 5 insertions(+), 1 deletions(-)
13972
commit 4d7b8c9d4290c91ea69d992bad396d067e84b15b
13973
Author: Damien Lespiau <damien.lespiau@intel.com>
13974
Date: Sat Oct 3 12:15:13 2009 +0100
13976
clutter_value_get_unit() has not be renamed
13978
Since the Great Rework of ClutterUnits, functions have been using
13979
'units' not 'unit' in their name. clutter_value_get_unit() is a left
13980
over from a dark age, its declaration and documentation have been
13981
updated but not the symbol itself.
13983
clutter/clutter-units.c | 2 +-
13984
1 files changed, 1 insertions(+), 1 deletions(-)
13986
commit 72243081b5b0bf0518951f9f5f3ae91a7d4c640f
13987
Merge: ad83caa 111512a
13988
Author: Emmanuele Bassi <ebassi@gnome.org>
13989
Date: Mon Oct 5 12:37:08 2009 +0100
13991
Merge branch 'stage-window-object'
13993
* stage-window-object:
13994
[x11] Fix Stage user-initiated resize
13995
[x11] Remove a useless forced paint
13996
[stage] Rework the Stage implementation class
13998
commit ad83caaed16a36aea0fafd4ed87cc283c30c413b
13999
Author: Emmanuele Bassi <ebassi@gnome.org>
14000
Date: Mon Oct 5 12:34:48 2009 +0100
14002
Clarify the IdPool warning
14004
Instead of having an assertion failure with a message of dubious
14005
usefulness, we should probably use a more verbose warning explaining
14006
what is the problem and what might be the cause.
14008
clutter/clutter-id-pool.c | 9 ++++++++-
14009
1 files changed, 8 insertions(+), 1 deletions(-)
14011
commit 111512a2a05243a7fc6f999f18805eae9bd6bfce
14012
Author: Emmanuele Bassi <ebassi@gnome.org>
14013
Date: Mon Oct 5 12:24:19 2009 +0100
14015
[x11] Fix Stage user-initiated resize
14017
The user-initiated resize is conflicting with the allocated size. This
14018
happens because we change the size of the stage's X Window behind the
14019
back of the size allocation machinery.
14021
Instead, we should change the size of the actor whenever we receive a
14022
ConfigureNotify event to reflect the new size of the actor.
14024
clutter/x11/clutter-event-x11.c | 7 +++----
14025
clutter/x11/clutter-stage-x11.c | 6 +++++-
14026
tests/interactive/test-actors.c | 1 +
14027
3 files changed, 9 insertions(+), 5 deletions(-)
14029
commit e3c2ed0009e2ce85e65d5a1724a807faae865494
14030
Author: Emmanuele Bassi <ebassi@gnome.org>
14031
Date: Mon Oct 5 12:21:02 2009 +0100
14033
[x11] Remove a useless forced paint
14035
We force the redraw before mapping, in the hope that when a composited
14036
window manager maps the window it will have its contents ready; that is
14037
not going to work: the solution for this problem requires the implementation
14038
of a protocol for compositors, and not a hack.
14040
Moreover, painting before mapping will cause a paint with the wrong
14041
GL viewport size, which is the wrong thing to do on GLX.
14043
clutter/x11/clutter-stage-x11.c | 5 -----
14044
1 files changed, 0 insertions(+), 5 deletions(-)
14046
commit 6ddffac93561b5d3aa6226ee54bd8a5e1fcedeb5
14047
Author: Emmanuele Bassi <ebassi@gnome.org>
14048
Date: Sun Sep 27 11:38:01 2009 +0100
14050
[docs] Update the "Subclassing Actor" chapter
14052
The chapter on how to subclass ClutterActor inside the API reference for
14053
Clutter is still using ClutterUnit and referencing to concepts that have
14054
been changed since the document was written.
14056
doc/reference/clutter/subclassing-ClutterActor.xml | 169 ++++++++++++-------
14057
1 files changed, 107 insertions(+), 62 deletions(-)
14059
commit ab76d64df02bc03f935e9cdf5a0a29c6ffeace72
14060
Author: Robert Bragg <robert@linux.intel.com>
14061
Date: Tue Jul 28 00:40:29 2009 +0100
14063
[cogl-debug] avoid warnings when using COGL_NOTE with unbraced else clauses
14065
When not building a debug build the compiler was warning about empty
14066
else clauses with no braces due to code like:
14070
COGL_NOTE (DRAW, "a-wibble");
14072
This simply ensures that even for non debug builds COGL_NOTE will expand to
14073
a single statement.
14075
clutter/cogl/cogl-debug.h | 2 +-
14076
1 files changed, 1 insertions(+), 1 deletions(-)
14078
commit 904c495c6d3c59b34148c9a4834e4803b488997b
14079
Author: Robert Bragg <robert@linux.intel.com>
14080
Date: Thu Sep 24 17:34:26 2009 +0100
14082
[cogl-vertex-buffer] fix n_components validation for GL's builtin attributes
14084
glVertexPointer expects positions with 2, 3 or 4 components, glColorPointer
14085
expects colors with 3 or 4 components and glNormalPointer expects normals
14086
with three components so when adding vertex buffer atributes with the names
14087
"gl_Vertex", "gl_Color" or "gl_Normal" we assert these constraints and print
14088
an explanation to the developer if not met.
14090
This also fixes the previosly incorrect constraint that gl_Normal attributes
14091
must have n_components == 1; thanks to Cat Sidhe for reporting this:
14093
Bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1819
14095
clutter/cogl/common/cogl-vertex-buffer.c | 19 +++++++++++++++----
14096
1 files changed, 15 insertions(+), 4 deletions(-)
14098
commit dae569b468c286ea23aa0e74e910232e025932db
14099
Author: Robert Bragg <robert@linux.intel.com>
14100
Date: Thu Sep 24 12:49:17 2009 +0100
14102
[debug] Adds a dump-pick-buffers CLUTTER_DEBUG option
14104
Now if you export CLUTTER_DEBUG=dump-pick-buffers clutter will write out a
14105
png, e.g. pick-buffer-00000.png, each time _clutter_to_pick() is called.
14106
It's a rather crude way to debug the picking (realtime visualization in a
14107
second stage would probably be nicer) but it we've used this approach
14108
successfully numerous times when debugging Clutter picking issues so it
14109
makes sense to have a debug option for it.
14111
clutter/clutter-debug.h | 35 +++++++++--------
14112
clutter/clutter-main.c | 94 ++++++++++++++++++++++++++++++++++++++++++++---
14113
2 files changed, 106 insertions(+), 23 deletions(-)
14115
commit 27ae9722dedb5bc25415c32326ffc7ba4ef1557d
14116
Author: Neil Roberts <neil@linux.intel.com>
14117
Date: Tue Sep 22 17:55:04 2009 +0100
14119
[container] Remove the unused 'object' variable in destroy_child_meta
14121
Since commit b2f958a61 this variable is no longer used so it was
14122
causing compiler warnings.
14124
clutter/clutter-container.c | 1 -
14125
1 files changed, 0 insertions(+), 1 deletions(-)
14127
commit 4293920a11d5216095577cdfc46b9e21bb427a12
14128
Author: Robert Bragg <robert@linux.intel.com>
14129
Date: Tue Sep 22 11:27:47 2009 +0100
14131
[tests] Remove test-entry.c since we don't have a ClutterEntry any more
14133
Removes an unused interactive unit test for the old ClutterEntry actor we
14137
tests/interactive/test-entry.c | 47 ----------------------------------------
14138
2 files changed, 0 insertions(+), 48 deletions(-)
14140
commit b710ed0eeace5561ccec1b1558ad26abb4af0da3
14141
Author: Robert Bragg <robert@linux.intel.com>
14142
Date: Thu Aug 20 11:53:37 2009 +0100
14144
[backend-egl] fix clutter_backend_egl_get_visual_info to not use Xalloc
14146
It looks like the intention was to duplicate an XVisualInfo in such a way
14147
that the pointer could be returned and then later freed using XFree. But
14148
Xalloc isn't an Xlib counterpart to XFree; Xlib doesn't provide a general
14149
purpose malloc wrapper afik. By shuffling things about a bit, it was
14150
possible to avoid the need for this hack.
14152
clutter/eglx/clutter-backend-egl.c | 46 +++++++++++------------------------
14153
1 files changed, 15 insertions(+), 31 deletions(-)
14155
commit 6e50e26c86af20597b118f5a71d04f70b173f733
14156
Author: Damien Lespiau <damien.lespiau@intel.com>
14157
Date: Mon Sep 21 15:21:21 2009 +0100
14159
Add a few annotations on Cogl primitives functions
14161
By default, float * is considered as an out argument by gobject
14162
introspection which is wrong for quite a few Cogl symbols. Start adding
14163
annotations to fix that for the ones in the "Primitives" gtk-doc
14166
clutter/cogl/cogl-path.h | 8 ++++----
14167
clutter/cogl/cogl-texture.h | 15 ++++++++-------
14168
2 files changed, 12 insertions(+), 11 deletions(-)
14170
commit 1b37cb6cb79dc36279d40ef108576aafeb905412
14171
Author: Robert Bragg <robert@linux.intel.com>
14172
Date: Mon Sep 21 18:12:02 2009 +0100
14174
[container] cast actor to gobject before calling g_object_set_qdata
14176
A minor compiler warning fix: in destroy_child_meta we weren't casting the
14177
first argument to g_object_set_qdata to a gobject.
14179
clutter/clutter-container.c | 2 +-
14180
1 files changed, 1 insertions(+), 1 deletions(-)
14182
commit b2f958a61807ca36ccc1e7b3edf112b317885528
14183
Author: Øyvind Kolås <pippin@linux.intel.com>
14184
Date: Mon Sep 21 15:55:58 2009 +0100
14186
[container] unset the child meta qdata on the child, not the container
14188
In the default implementation of container::destroy_child_meta Set child
14189
meta qdata to NULL on the child and not the container, since the child
14190
is the object that owns the data.
14192
clutter/clutter-container.c | 2 +-
14193
1 files changed, 1 insertions(+), 1 deletions(-)
14195
commit d4e46bb893d41f7e9d80d3d272765e7b2779d32b
14196
Author: Thomas Wood <thomas.wood@intel.com>
14197
Date: Mon Sep 21 15:40:53 2009 +0100
14199
[container] set the child meta qdata on the child, not the container
14201
Set child meta qdata on the child and not the container, since the child is
14202
the object that owns the data.
14204
clutter/clutter-container.c | 2 +-
14205
1 files changed, 1 insertions(+), 1 deletions(-)
14207
commit 1c3d5a0e870d6a8f221577783f4c9d79dbc062c5
14208
Author: Neil Roberts <neil@linux.intel.com>
14209
Date: Thu Sep 17 18:29:03 2009 +0100
14211
[cogl] Remove CoglContext->journal_vbo{,_len}
14213
The lifetime of the journal VBO is entirely within the scope of the
14214
cogl_journal_flush function so there is no need to store it globally
14215
in the Cogl context. Instead, upload_vertices_to_vbo just returns the
14216
new VBO. cogl_journal_flush stores this in a local variable and
14217
destroys it before returning.
14219
This also fixes an assertion when using the GLES backend which was
14220
caused by nothing initialising the journal_vbo variable.
14222
clutter/cogl/common/cogl-primitives.c | 20 ++++++++++----------
14223
clutter/cogl/gl/cogl-context.c | 2 --
14224
clutter/cogl/gl/cogl-context.h | 2 --
14225
clutter/cogl/gles/cogl-context.h | 1 -
14226
4 files changed, 10 insertions(+), 15 deletions(-)
14228
commit ecfa0c4f92e3a78bdc4257c62a61b47aa41e0d05
14229
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14230
Date: Wed Sep 16 17:43:58 2009 +0100
14232
[build] Split out the custom silent rules
14234
The silent rules we use for custom targets should be moved into a
14235
separate Makefile.am that gets included from all the others.
14238
build/autotools/Makefile.am | 1 +
14239
build/autotools/Makefile.am.silent | 17 +++++++++++++++++
14240
clutter/Makefile.am | 12 +++++-------
14241
clutter/cogl/Makefile.am | 8 ++------
14242
clutter/cogl/common/Makefile.am | 8 ++------
14243
clutter/cogl/gl/Makefile.am | 2 ++
14244
clutter/cogl/gles/Makefile.am | 2 ++
14245
clutter/glx/Makefile.am | 2 ++
14246
clutter/pango/Makefile.am | 2 ++
14247
clutter/x11/Makefile.am | 2 ++
14248
tests/conform/Makefile.am | 8 +++++---
14249
tests/data/Makefile.am | 1 -
14250
tests/interactive/Makefile.am | 11 ++++++-----
14251
tests/micro-bench/Makefile.am | 2 ++
14252
tests/tools/Makefile.am | 9 ++++++---
14253
16 files changed, 58 insertions(+), 31 deletions(-)
14255
commit 94e60c393b6be8b69140da01835a377409f6a77b
14256
Author: Robert Bragg <robert@linux.intel.com>
14257
Date: Wed Sep 16 17:12:30 2009 +0100
14259
[test-cogl-multitexture] Print an error if textures can't be loaded
14261
I just wasted a silly amount time trying to bisect an apparently broken
14262
cogl-test-multitexture until I realized it was just silently failing to load
14265
tests/interactive/test-cogl-multitexture.c | 15 ++++++++++++---
14266
1 files changed, 12 insertions(+), 3 deletions(-)
14268
commit 3b4f46a18a1c631410b324d5f926c64f0e22ae93
14269
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14270
Date: Wed Sep 16 12:47:46 2009 +0100
14272
[docs] Fix the comment on version bumps
14274
configure.ac | 5 +++--
14275
1 files changed, 3 insertions(+), 2 deletions(-)
14277
commit 35c0da2b3a2558964ba74b9a213262f377aa2650
14278
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14279
Date: Wed Sep 16 11:57:45 2009 +0100
14281
[gitignore] Add test-preferred-size
14284
1 files changed, 1 insertions(+), 0 deletions(-)
14286
commit 9dc012c07d1f6760d8d4cca07f5279e7b316dbd0
14287
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14288
Date: Wed Sep 16 11:55:04 2009 +0100
14290
[timeline] Account for clock roll backs between frames
14292
If the system clock rolls back between two frames then we need
14293
to account for the change, to avoid stopping the timeline.
14295
The best option, since a roll back can be any arbitrary amount
14296
of milliseconds, is to skip a frame.
14300
http://bugzilla.moblin.org/show_bug.cgi?id=3839
14302
clutter/clutter-timeline.c | 33 +++++++++++++++++++++++----------
14303
1 files changed, 23 insertions(+), 10 deletions(-)
14305
commit 0d08f6e0707c1b3274227abc8054529422206e22
14306
Author: Robert Bragg <robert@linux.intel.com>
14307
Date: Tue Sep 15 16:27:45 2009 +0100
14309
[cogl-fbo] Disable mipmap filters before calling glCheckFramebufferStatusEXT
14311
The framebuffer_object spec isn't clear in defining whether attaching a
14312
texture as a renderbuffer with mipmap filtering enabled while the mipmaps
14313
have not been uploaded should result in an incomplete framebuffer object.
14314
(different drivers make different decisions)
14316
To avoid an error with drivers that do consider this a problem we explicitly
14317
set non mipmapped filters before calling glCheckFramebufferStatusEXT. The
14318
filters will later be reset when the texture is actually used for rendering
14319
according to the filters set on the corresponding CoglMaterial.
14321
clutter/cogl/gl/cogl-fbo.c | 12 ++++++++++++
14322
1 files changed, 12 insertions(+), 0 deletions(-)
14324
commit 561f5868e876ec17e9a6fa66282b8dcdf3ead6b6
14325
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14326
Date: Tue Sep 15 11:09:49 2009 +0100
14328
[tests] Add preferred size conformance test unit
14330
This unit verifies that an Actor class will invoke the get_preferred_*
14331
virtual functions unless the caching is in effect; it also verifies
14332
that the cached values are correctly evicted.
14334
tests/conform/test-actor-size.c | 136 ++++++++++++++++++++++++++++++++++++-
14335
tests/conform/test-conform-main.c | 1 +
14336
2 files changed, 136 insertions(+), 1 deletions(-)
14338
commit 092401c01b249cd3ae9e4788ecbcce91ebb80f38
14339
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14340
Date: Mon Sep 14 21:45:51 2009 +0100
14342
[tests] Add initial sizing conformance test suite
14344
The size requisition and allocation mechanisms should be thoroughly
14345
tested to avoid unwanted regressions.
14347
For starters, we can test the explicit size setting and the side
14348
effects of calling clutter_actor_set_size().
14351
tests/conform/Makefile.am | 1 +
14352
tests/conform/test-actor-size.c | 77 +++++++++++++++++++++++++++++++++++++
14353
tests/conform/test-conform-main.c | 2 +
14354
4 files changed, 81 insertions(+), 0 deletions(-)
14356
commit abbe2ebf8baa61edeaa2071fa850d000d565a6ce
14357
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14358
Date: Mon Sep 14 15:57:31 2009 +0100
14360
[container] Use a 1:1 mapping between child and ChildMeta
14362
Since an actor can only be parented to one container we don't need
14363
the extra complications of maintaining a list of ChildMeta objects
14364
attached to an actor in the default implementation of the Container
14367
clutter/clutter-container.c | 50 +++++++-----------------------------------
14368
1 files changed, 9 insertions(+), 41 deletions(-)
14370
commit 6e3afa4ebed9ea4f9347e8dfd6f3cc20d1042dcd
14371
Author: Damien Lespiau <damien.lespiau@intel.com>
14372
Date: Thu Sep 10 13:27:02 2009 +0100
14374
[docs] Clutter's model implementation is called ClutterListModel
14376
It was renamed from ClutterModelDefault to ClutterListModel a while
14377
back. Update the reference to this class in ClutterModel documentation.
14379
clutter/clutter-model.c | 4 ++--
14380
1 files changed, 2 insertions(+), 2 deletions(-)
14382
commit c5195dda1533e2f42514a880bb5b7d105d4fe541
14383
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14384
Date: Wed Sep 9 16:15:54 2009 +0100
14386
[docs] Add fixxref for Cairo symbols
14388
Let gtk-doc resolve the Cairo types and symbols to the installed
14389
Cairo documentation.
14391
configure.ac | 2 ++
14392
doc/reference/clutter/Makefile.am | 6 +++---
14393
2 files changed, 5 insertions(+), 3 deletions(-)
14395
commit f4e272ee9b6224cddc7eca54172025c5232e37bf
14396
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14397
Date: Wed Sep 9 16:01:07 2009 +0100
14399
[docs] Add a Path migration guide
14401
ClutterBehaviourPath has been changed and ClutterBehaviourBspline has
14402
been removed; now we use ClutterPath everywhere we need to describe a
14403
path. This warrants a chapter in the migration guide.
14405
doc/reference/clutter/Makefile.am | 6 +-
14406
doc/reference/clutter/clutter-docs.xml.in | 1 +
14407
doc/reference/clutter/migrating-ClutterPath.xml | 167 +++++++++++++++++++++++
14408
3 files changed, 172 insertions(+), 2 deletions(-)
14410
commit 3cc56b2b138ff6451ba73e088d1023705455aef7
14411
Author: Øyvind Kolås <pippin@linux.intel.com>
14412
Date: Tue Sep 8 13:06:51 2009 +0100
14414
[text] implement get_property for "use-markup"
14416
clutter/clutter-text.c | 4 ++++
14417
1 files changed, 4 insertions(+), 0 deletions(-)
14419
commit 6988744db750dc3430a6c8cdd6274bc7e855aaf5
14420
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14421
Date: Thu Aug 13 12:34:07 2009 +0100
14423
[stage] Rework the Stage implementation class
14425
Instead of using ClutterActor for the base class of the Stage
14426
implementation we should extend the StageWindow interface with
14427
the required bits (geometry, realization) and use a simple object
14430
This require a wee bit of changes across Backend, Stage and
14431
StageWindow, even though it's mostly re-shuffling.
14433
First of all, StageWindow should get new virtual functions:
14443
This covers all the bits that we use from ClutterActor currently
14444
inside the stage implementations.
14446
The ClutterBackend::create_stage() virtual function should create
14447
a StageWindow, and not an Actor (it should always have been; the
14448
fact that it returned an Actor was a leak of the black magic going
14449
on underneath). Since we never guaranteed ABI compatibility for
14450
the Backend class, this is not a problem.
14452
Internally to ClutterStage we can finally drop the shenanigans of
14453
setting/unsetting actor flags on the implementation: if the realization
14454
succeeds, for instance, we set the REALIZED flag on the Stage and
14457
As an initial proof of concept, the X11 and GLX stage implementations
14458
have been ported to the New World Order(tm) and show no regressions.
14460
clutter/Makefile.am | 2 +-
14461
clutter/clutter-backend.c | 14 ++--
14462
clutter/clutter-backend.h | 5 +-
14463
clutter/clutter-private.h | 2 +-
14464
clutter/clutter-stage-window.c | 79 ++++++++++++++++++-
14465
clutter/clutter-stage-window.h | 33 ++++++++
14466
clutter/clutter-stage.c | 105 ++++++++++++------------
14467
clutter/clutter.h | 1 +
14468
clutter/glx/clutter-backend-glx.c | 14 ++--
14469
clutter/glx/clutter-stage-glx.c | 50 +++++-------
14470
clutter/x11/clutter-stage-x11.c | 161 +++++++++++--------------------------
14471
11 files changed, 253 insertions(+), 213 deletions(-)
14473
commit 742cc4d95b602440c004d5af09a7fab662f03596
14474
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14475
Date: Mon Sep 7 11:44:44 2009 +0100
14477
[docs] Small annotation fixes
14479
clutter/clutter-behaviour.c | 5 +++--
14480
clutter/cogl/cogl-material.h | 29 ++++++++++++++++++-----------
14481
clutter/cogl/cogl-texture.h | 7 ++++---
14482
3 files changed, 25 insertions(+), 16 deletions(-)
14484
commit c69209a253c7ccbfe5d2c91e6972fa3dc1deb50c
14485
Author: Neil Roberts <neil@linux.intel.com>
14486
Date: Mon Sep 7 11:36:05 2009 +0100
14488
[animation] Move the check for the 'signal::' prefix into a separate function
14490
The old code checked whether the property began with 'signal-' and
14491
then checked for 'signal-swapped' and 'signal-after'. This prevented
14492
you from animating a property called for example 'signal-strength'.
14494
The check for the prefix is now in a separate function which also adds
14495
a 'signal-swapped-after' prefix for completeness.
14499
http://bugzilla.openedhand.com/show_bug.cgi?id=1798
14501
clutter/clutter-animation.c | 75 +++++++++++++++++++++++-------------------
14502
1 files changed, 41 insertions(+), 34 deletions(-)
14504
commit 7783635af3c78cf65fcb62ccb03478f1a9556b05
14505
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14506
Date: Thu Sep 3 16:51:14 2009 +0100
14508
[docs] Add more collateral documentation
14510
* Add the main Glossary for Clutter terms
14512
* Add the annotation glossary, as generated by gtk-doc
14514
* Add the objects index and tree
14516
doc/reference/clutter/Makefile.am | 2 +
14517
doc/reference/clutter/clutter-docs.xml.in | 45 ++++++++-
14518
doc/reference/clutter/glossary.xml | 142 +++++++++++++++++++++++++++++
14519
3 files changed, 184 insertions(+), 5 deletions(-)
14521
commit 763f5a9d014656c09c4684bc69a0e45862882f43
14522
Author: Samuel Degrande <samuel.degrande@lifl.fr>
14523
Date: Wed Sep 2 16:27:22 2009 +0100
14525
DOT3_RGB[A] cannot be used in a Blend String
14527
The blend string compiler checks that the syntax of a function name is
14528
[A-Za-z_]*, preventing the use of DOT3_RGB[A].
14530
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
14532
clutter/cogl/common/cogl-blend-string.c | 8 +++++++-
14533
1 files changed, 7 insertions(+), 1 deletions(-)
14535
commit a5e081dc9c8f39ce66270b77f5beaa6ac53e7a91
14536
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14537
Date: Wed Sep 2 15:26:33 2009 +0100
14539
[model] Do not attempt to free empty column names
14541
The column names are optional - ClutterModel will use the GType name
14542
if there is no user-specified column name. Hence, the ::finalize vfunc
14543
should not try to free an empty column names vector.
14547
http://bugzilla.openedhand.com/show_bug.cgi?id=1790
14549
clutter/clutter-model.c | 17 ++++++++++-------
14550
1 files changed, 10 insertions(+), 7 deletions(-)
14552
commit 3686107460847d6b9333ff2149b850401590bae8
14553
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14554
Date: Mon Aug 31 15:49:39 2009 +0100
14556
[docs] Make sure to document the point-release process
14558
Put the documentation right inside configure.ac, lest I forget.
14560
configure.ac | 25 ++++++++++++++++++-------
14561
1 files changed, 18 insertions(+), 7 deletions(-)
14563
commit db6b0a91e0c2aebb245ad5d382769889abbf88dd
14564
Author: Neil Roberts <neil@linux.intel.com>
14565
Date: Wed Aug 26 18:28:35 2009 +0100
14567
Take a reference to the material in clutter_texture_set_cogl_material
14569
The material is unref'd in clutter_texture_finalize and the
14570
documentation explicitly states that the function will take a ref so
14573
clutter/clutter-texture.c | 2 ++
14574
1 files changed, 2 insertions(+), 0 deletions(-)
14576
commit bad7782ab4bc0b5a96d8a97b9b32d5726343b1c2
14577
Author: Neil Roberts <neil@linux.intel.com>
14578
Date: Wed Aug 26 18:24:48 2009 +0100
14580
Fix the documentation for clutter_texture_set_cogl_material
14582
The documentation was a copy of the docs for set_cogl_texture so it
14583
was somewhat broken.
14585
clutter/clutter-texture.c | 11 ++++++++---
14586
1 files changed, 8 insertions(+), 3 deletions(-)
14588
commit b766a1cc100778c7f74acd9dcc280400eae4c55b
14589
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14590
Date: Wed Aug 26 16:50:37 2009 +0100
14592
[tests] Update the script test JSON
14594
The test-script.json UI definition still used old types, like
14595
ClutterLabel and ClutterCloneTexture. It should move to the classes
14596
that have replaced them.
14598
tests/data/test-script.json | 18 +++++++++---------
14599
1 files changed, 9 insertions(+), 9 deletions(-)
14601
commit bb17dc1ce5d91f68da53944b5d7565be00b179eb
14602
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14603
Date: Wed Aug 26 16:49:45 2009 +0100
14605
[script] Clean up the ad hoc parsing code in Actor
14607
The old parsing code still assumed we had integers for pixels
14608
and floating point values for percentages; this is not the case
14611
clutter/clutter-actor.c | 38 ++------------------------------------
14612
1 files changed, 2 insertions(+), 36 deletions(-)
14614
commit 2ffebad3d9b29931c29b8cb927580f9166ab39df
14615
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14616
Date: Wed Aug 26 16:48:32 2009 +0100
14618
[script] Convert double to float when parsing
14620
The default floating point type for JSON is double precision; this means
14621
that we need to conver to single precision when setting a property with
14624
clutter/clutter-script.c | 13 +++++++++++++
14625
1 files changed, 13 insertions(+), 0 deletions(-)
14627
commit 87831b3427be959bea6a649e2718a5bda5927463
14628
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14629
Date: Tue Aug 25 17:55:51 2009 +0100
14631
[tests] Add a Group actor unit
14633
We need to test that the depth sorting of ClutterGroup works correctly
14634
in case we wish to change the data structure that stores the children,
14635
and do so without changing the default behaviour.
14638
tests/conform/Makefile.am | 1 +
14639
tests/conform/test-conform-main.c | 2 +
14640
tests/conform/test-group.c | 57 +++++++++++++++++++++++++++++++++++++
14641
4 files changed, 61 insertions(+), 0 deletions(-)
14643
commit f1d58812078e04c7db17c80b51d48bb716b868d1
14644
Author: Øyvind Kolås <pippin@linux.intel.com>
14645
Date: Tue Aug 25 17:32:42 2009 +0100
14647
[group] Use floating point in sort_z_order
14649
clutter/clutter-group.c | 8 ++++++--
14650
1 files changed, 6 insertions(+), 2 deletions(-)
14652
commit d8d344f52930872a8eabdcc801872246b7ae61d1
14653
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14654
Date: Tue Aug 25 12:39:40 2009 +0100
14656
[docs] Add Interval get_type function
14658
The get_type() function for ClutterInterval is missing from the
14659
known GObject types, so gtk-doc doesn't know that it has to
14660
introspect it for hierarchy, properties and signals.
14662
doc/reference/clutter/clutter.types | 1 +
14663
1 files changed, 1 insertions(+), 0 deletions(-)
14665
commit 95a6e1c925c7dd24ba97a4625d1da09ff861e5c3
14666
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14667
Date: Tue Aug 25 12:18:32 2009 +0100
14669
Fix the warnings for Animation::update_interval()
14671
The bindings for update_interval() were copied from bind().
14673
clutter/clutter-animation.c | 7 ++++---
14674
1 files changed, 4 insertions(+), 3 deletions(-)
14676
commit 899f051cd92fb0b5d41948897c7130b86a98dae9
14677
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14678
Date: Tue Aug 25 12:16:41 2009 +0100
14680
[animation] Add Animation::update()
14682
Currently, to update a property inside an animation you have to
14683
get the interval for that property and then call the set_final_value()
14686
We can provide a simpler, bind()-like method for the convenience of
14687
the developers that just validates everything and then calls the
14688
Interval.set_final_value().
14690
clutter/clutter-animation.c | 53 ++++++++++++++++++++++++++++
14691
clutter/clutter-animation.h | 3 ++
14692
doc/reference/clutter/clutter-sections.txt | 1 +
14693
3 files changed, 57 insertions(+), 0 deletions(-)
14695
commit 4ca375e8fe395e375826ea795566b8af8029e09f
14696
Author: Neil Roberts <neil@linux.intel.com>
14697
Date: Mon Aug 24 12:50:57 2009 +0100
14699
[cogl-texture] Set GL_PACK_ROW_LENGTH when downloading texture data
14701
Otherwise the rowstride passed in from an application is not used
14702
correctly so you can not download to an area with a much larger
14705
clutter/cogl/gl/cogl-texture.c | 14 +++++++++++---
14706
1 files changed, 11 insertions(+), 3 deletions(-)
14708
commit 172074fd29cd42bf2790f78aa736f854218906f0
14709
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14710
Date: Fri Aug 21 12:05:52 2009 +0100
14712
[glx] Perform more checks before calling glXMakeCurrent
14714
Right now we just check for a NULL stage before calling glXMakeCurrent().
14716
We can, though, get a valid stage without an implementation attached to
14717
it while we are disposing a stage after a CLUTTER_DELETE event, since the
14718
events processing is performed on a vblank-locked basis.
14720
clutter/glx/clutter-backend-glx.c | 17 +++++++++++------
14721
1 files changed, 11 insertions(+), 6 deletions(-)
14723
commit 93e1d8e7a35afd0f1c08022bdf0f04154ad08ef1
14724
Author: Owen W. Taylor <otaylor@fishsoup.net>
14725
Date: Fri Aug 7 21:16:04 2009 -0400
14727
Add ::queue-relayout signal to ClutterActor for ClutterClone
14729
ClutterClone bases its preferred size on the preferred size of
14730
the source actor, so it needs to invalid its cached preferred
14731
size when the preferred size of the source actor changes.
14733
In order for this to work, we need to have notification when
14734
the size of the source actor changes, so add a ::queue-relayout
14735
signal to ClutterActor.
14737
Then connect to this from ClutterClone and queue a relayout
14738
on the clone when a relayout is queued on the source.
14740
http://bugzilla.openedhand.com/show_bug.cgi?id=1755
14742
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
14744
clutter/clutter-actor.c | 56 ++++++++++++++++++++++++++++++++++++++--------
14745
clutter/clutter-actor.h | 5 +++-
14746
clutter/clutter-clone.c | 12 ++++++++++
14747
3 files changed, 62 insertions(+), 11 deletions(-)
14749
commit 56daae9d7bc49a29a4e1c4e093928efb747ed675
14750
Author: Robert Bragg <robert@linux.intel.com>
14751
Date: Thu Aug 20 12:53:32 2009 +0100
14753
Revert "[cogl] Allow Cogl to create NPOT textures for GLES2"
14755
This reverts commit 3c47a3beb51462ef8af1070b75123660059e97d0.
14757
Of course I remembered just after pushing the patch why we hadn't done
14758
this before :-) If you look in the glsl spec:
14759
http://www.khronos.org/registry/gles/specs/2.0/es_full_spec_2.0.24.pdf
14760
Section 3.7.10 Texture Completeness and Non-Power-Of-Two Textures
14761
you can see GLES 2.0 doesn't support mipmaps for npot textures.
14763
There is possibly some way we could support this in Cogl but at least
14764
it's not as simple as or-ing in the feature flag, sadly.
14766
clutter/cogl/gles/cogl.c | 3 +--
14767
1 files changed, 1 insertions(+), 2 deletions(-)
14769
commit 3c47a3beb51462ef8af1070b75123660059e97d0
14770
Author: Robert Bragg <robert@linux.intel.com>
14771
Date: Thu Aug 20 12:15:21 2009 +0100
14773
[cogl] Allow Cogl to create NPOT textures for GLES2
14775
The core GLES2 API supports NPOT textures, i.e. there is no extension as for
14776
OpenGL, so we now add COGL_FEATURE_TEXTURE_NPOT to the feature flags in
14777
_cogl_features_init.
14779
Thanks to Gordon Williams for spotting this.
14781
clutter/cogl/gles/cogl.c | 3 ++-
14782
1 files changed, 2 insertions(+), 1 deletions(-)
14784
commit a5fe4ae4ec5c5c43aa0898095284447095462e37
14785
Author: Robert Bragg <robert@linux.intel.com>
14786
Date: Wed Aug 19 15:38:25 2009 +0100
14788
[cogl] %.c: %.glsl codegen: use BUILT_SOURCES var + fix stringify.sh
14790
Don't let stringify.sh write to the $srcdir + use the BUILT_SOURCES var in
14791
Makefile.am so as to ensure all .c. and .h files get generated from their
14792
corresponding .glsl files before building other targets.
14794
clutter/cogl/gles/Makefile.am | 14 +++++++++-----
14795
clutter/cogl/gles/stringify.sh | 40 +++++++++++++++++++---------------------
14796
2 files changed, 28 insertions(+), 26 deletions(-)
14798
commit 3761e9cd47950bfade7d3b829b20b245806632a2
14799
Author: Jonas Bonn <jonas@southpole.se>
14800
Date: Wed Aug 19 13:14:10 2009 +0000
14802
Check timeline direction when forcing final state
14804
If the timeline is running backwards, the completed signal handler should
14805
set the final state from the interval's initial value.
14807
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
14809
clutter/clutter-animation.c | 11 ++++++++++-
14810
1 files changed, 10 insertions(+), 1 deletions(-)
14812
commit 373b165b3f1adc556e7ee70f01cff66d4a38cd60
14813
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14814
Date: Mon Aug 10 12:45:44 2009 +0200
14816
Use AM_SILENT_RULES if automake >= 1.11 is installed
14820
http://bugzilla.openedhand.com/show_bug.cgi?id=1756
14822
Based on a patch by: Javier Jardón <javierjc1982@gmail.com>
14824
clutter/Makefile.am | 7 +++++--
14825
clutter/cogl/Makefile.am | 6 ++++--
14826
clutter/cogl/common/Makefile.am | 7 ++++---
14827
configure.ac | 18 +++++++++++++++---
14828
4 files changed, 28 insertions(+), 10 deletions(-)
14830
commit 6a9130f10fe5ed3c78b541cf0d021857efb57cb4
14831
Author: Neil Roberts <neil@linux.intel.com>
14832
Date: Tue Aug 18 18:07:37 2009 +0100
14834
[pango-display-list] Don't premultiply the colour twice
14836
When rendering a glyph run from a texture we were premultiplying the
14837
colour once in display_list_render() and then again in
14838
display_list_render_texture(). This was causing the color to come out
14839
wrong. This fixes bug #1775.
14841
Thanks to Pierre-Luc Beaudoin for reporting.
14843
clutter/pango/cogl-pango-display-list.c | 1 -
14844
1 files changed, 0 insertions(+), 1 deletions(-)
14846
commit 9befb055d0dd993d1171bf5652eefdc35567e7f5
14847
Author: Robert Bragg <robert@linux.intel.com>
14848
Date: Tue Aug 18 16:13:13 2009 +0100
14850
[cogl-material] Fix some brackets in _layer_flush_gl_sampler_state
14852
The wrong part of an expression was bracketed in the test to determine
14853
when a new texture matrix needed to be loaded which resulted in the
14854
first pass through _cogl_material_layer_flush_gl_sampler_state
14855
not uploading any user matrix.
14857
clutter/cogl/common/cogl-material.c | 8 ++++----
14858
1 files changed, 4 insertions(+), 4 deletions(-)
14860
commit 366e0725ce1bb804219b28a29539add1e05f73e8
14861
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14862
Date: Tue Aug 18 11:11:29 2009 +0100
14864
[docs] texture_polygon() is called polygon()
14866
Remove the mentions to the old name of cogl_polygon().
14868
clutter/cogl/cogl-types.h | 5 +++--
14869
1 files changed, 3 insertions(+), 2 deletions(-)
14871
commit f655b28e669b7aec5b3ace0d8873adeefa11b4de
14872
Author: Emmanuele Bassi <ebassi@linux.intel.com>
14873
Date: Mon Aug 17 23:27:22 2009 +0100
14875
[build] Nothing can be prepended to QUIET_* rules
14877
Move the LD_LIBRARY_PATH override after the QUIET_GEN rule and
14878
unbreak the typelib compilation.
14880
clutter/Makefile.am | 3 ++-
14881
1 files changed, 2 insertions(+), 1 deletions(-)
14883
commit 8c00d705c0ec009c08950f314ab896b6ff40aa37
14884
Author: Jussi Kukkonen <jku@linux.intel.com>
14885
Date: Mon Aug 17 00:00:35 2009 +0300
14887
[text] move_word_backward/forward fixes
14889
clutter_text_move_word_backward/forward() calls did not use the
14890
start argument consistently. Also, clutter_text_move_word_forward()
14891
bound check checked the wrong end.
14895
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
14897
clutter/clutter-text.c | 12 ++++++------
14898
1 files changed, 6 insertions(+), 6 deletions(-)
14900
commit 99437c476136ec6a735270efd8670efcd1f2c77e
14901
Author: Neil Roberts <neil@linux.intel.com>
14902
Date: Mon Aug 17 17:43:42 2009 +0100
14904
[text] Don't interpret the unicode value when the control modifier is on
14906
When a letter key is pressed with the control key held down one of
14907
three things will happen :-
14909
a) If the stage is embedded within a GtkClutterEmbed the unicode value
14910
will be filled from gdk_keyval_to_unicode. This will be the same
14911
value as if control was not pressed (so Ctrl+V will be 'v').
14913
b) If the stage is not in a GtkClutterEmbed and Clutter is running on
14914
the X11 backend then it will try to fill in the unicode value from
14915
XLookupString. This *will* take into account the control so the
14916
unicode value will represent a control character (Ctrl+V will be
14919
c) Most other backends will not bother to fill in the unicode
14920
value. Therefore clutter_keysym_to_unicode will be used which also
14921
does not take into account the control key (so Ctrl+V will be 'v').
14923
For cut and paste to work in Nbtk, the control keys need to bubble up
14924
to the parent NbtkEntry container. This works fine for 'b' but not 'a'
14927
This patch makes ClutterText always allow the event to bubble if the
14928
key is not handled by the binding pool and the control modifier is
14931
Ideally ClutterText would always get a unicode value that takes into
14932
account the modifiers but this is probably best left up to the input
14935
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
14937
clutter/clutter-text.c | 3 ++-
14938
1 files changed, 2 insertions(+), 1 deletions(-)
14940
commit 5d7c2e7c4495b3d6f35ed3f4e50857f17b946872
14941
Author: Owen W. Taylor <otaylor@fishsoup.net>
14942
Date: Mon Aug 17 13:57:18 2009 -0400
14944
Set LD_LIBRARY_PATH when running g-ir-compiler
14946
g-ir-compiler currently opens the library for the .gir it is compiling;
14947
to make that work we need to set LD_LIBRARY_PATH before running
14948
g-ir-compiler to include .libs.
14950
(I think this may have been working earlier because there was a
14951
hack that substituted .so with .la and tried opening that; that
14952
works for the incorrect libclutter-glx-1.0.so but not for the
14953
correct libclutter-glx-1.0.so.0)
14955
http://bugzilla.openedhand.com/show_bug.cgi?id=1771
14957
clutter/Makefile.am | 1 +
14958
1 files changed, 1 insertions(+), 0 deletions(-)
14960
commit 4c1248c5e9b934b23bdabbfc3d2dabdb8bab0656
14961
Author: Owen W. Taylor <otaylor@fishsoup.net>
14962
Date: Mon Aug 17 15:41:27 2009 +0100
14964
Full fix for the G-I support in Clutter
14966
Update the sed hack for the shared library to be more robust.
14968
Remove the --shared-library command line argument from g-ir-scanner,
14969
as no distribution will ever ship the .la files. This effectively
14970
reverts commit 68f8a98cfbf70e2b7bfcda7831907633eb08ca50.
14972
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
14974
clutter/Makefile.am | 5 ++---
14975
1 files changed, 2 insertions(+), 3 deletions(-)
14977
commit 68f8a98cfbf70e2b7bfcda7831907633eb08ca50
14978
Author: Götz Waschk <waschk@mandriva.org>
14979
Date: Mon Aug 17 14:21:42 2009 +0100
14981
Specify the shared library for g-ir-compile
14983
Use the --shared-library option to specify the shared object to link
14984
against when compiling the typelib from the GIR data.
14986
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
14988
clutter/Makefile.am | 6 +++++-
14989
1 files changed, 5 insertions(+), 1 deletions(-)
14991
commit 366e0f9cd7773433ba14cc531119bca3b9879a1e
14992
Author: Götz Waschk <waschk@mandriva.org>
14993
Date: Mon Aug 17 14:12:21 2009 +0100
14995
Update Clutter to use G-I 0.6.4
14997
Following bug #1762, the syntax of g-ir-scanner was changed in
14998
gobject-introspection, so Clutter does not build anymore with 0.6.4.
15000
See the bugzilla bug:
15002
http://bugzilla.gnome.org/show_bug.cgi?id=591669
15004
GObject-Introspection now uses a different mechanism to extract the
15005
SONAME when building the gir file and it needs the libtool archive as
15008
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
15011
clutter/Makefile.am | 2 +-
15012
clutter/cogl/Makefile.am | 2 +-
15013
clutter/json/Makefile.am | 2 +-
15014
configure.ac | 2 +-
15015
5 files changed, 5 insertions(+), 5 deletions(-)
15017
commit 53cb86d94ba258cb917221856501c60738a143f3
15018
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15019
Date: Mon Aug 17 10:27:13 2009 +0100
15021
[docs] Update the requirements section
15023
README | 9 +++++++--
15024
1 files changed, 7 insertions(+), 2 deletions(-)
15026
commit 90d8f3183193176b796ac533158e3b0c2a4c2e85
15027
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15028
Date: Fri Aug 14 15:59:29 2009 +0100
15030
[units] Do not be locale-dependant on string conversion
15032
When dumping a ClutterUnits structure to a string we are using a bare
15033
g_strdup_printf(), which unfortunately is locale dependant. So, for
15034
instance, a type of CLUTTER_UNIT_EM and a value of 42 are stringified
15042
This would not be a problem -- clutter_units_from_string() allows both
15043
'.' and ',' as fractionary part delimiters. The test suite, on the
15044
other hand, does not know that, and it checks for exact matches with
15047
Calling setlocale(LC_ALL,"C") at the beginning of the conformance test
15048
suite is not a good idea, because it would prevent external testing; and
15049
it's a lame cop out from doing exactly what we have to do -- pick a format
15052
Like other platforms, languages and frameworks before us, we opt to
15053
be less liberal in what we create; so, we choose to always stringify
15054
ClutterUnits with fractionary parts using '.' as the delimiter.
15058
http://bugzilla.openedhand.com/show_bug.cgi?id=1763
15060
clutter/clutter-units.c | 24 ++++++++++++++----------
15061
1 files changed, 14 insertions(+), 10 deletions(-)
15063
commit f08b583a312cd87f3263078eecdb19a9328ac79f
15064
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15065
Date: Fri Aug 14 15:58:00 2009 +0100
15067
[tests] Abstract GTest and Clutter initialization
15069
The set up process of the conformance test suite is complex enough to
15070
warrant a split up into its own function.
15072
tests/conform/test-conform-main.c | 27 ++++++++++++++++++---------
15073
1 files changed, 18 insertions(+), 9 deletions(-)
15075
commit b31e2d59bdfcc3be46f3ec87de4bcabc32747133
15076
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15077
Date: Fri Aug 14 13:08:59 2009 +0100
15079
[build] Remove last user of CLUTTER_MAJORMINOR
15081
We should always use CLUTTER_API_VERSION instead.
15083
doc/manual/Makefile.am | 10 +++++-----
15084
1 files changed, 5 insertions(+), 5 deletions(-)
15086
commit 5274b4e4c48dbd81c7553ef9889b5897afe932c5
15087
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15088
Date: Fri Aug 14 13:08:17 2009 +0100
15090
[build] Clean up the eglnative and fruity Makefile.am
15092
* Do not use CLUTTER_MAJORMINOR
15094
* Use per-target compiler flags and libraries
15096
clutter/eglnative/Makefile.am | 11 +++++------
15097
clutter/fruity/Makefile.am | 21 ++++++++++-----------
15098
2 files changed, 15 insertions(+), 17 deletions(-)
15100
commit f7edc97d8df2f035fa81343126884b0cbfc9bc3a
15101
Author: Xu Li <xu.li@intel.com>
15102
Date: Tue Aug 4 22:06:27 2009 +0800
15104
Add new Atom atom_NET_WM_PID to set pid info
15106
Clutter advertises itself on X11 as implementing the _NET_WM_PING protocol,
15107
which is needed to be able to detect frozen applications; this allows us to
15108
stop the destruction of the stage by blocking the CLUTTER_DELETE event and
15109
wait for user feedback without the Window Manager thinking that the app has
15112
In order to implement the _NET_WM_PING protocol properly, though, we need
15113
to add the _NET_WM_PID property on the Stage window, since the EWMH states:
15115
[_NET_WM_PID] MAY be used by the Window Manager to kill windows which
15116
do not respond to the _NET_WM_PING protocol.
15118
Meaning that an unresponsive Clutter application might not be killable by
15119
the window manager.
15123
http://bugzilla.openedhand.com/show_bug.cgi?id=1748
15125
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
15127
clutter/x11/clutter-backend-x11.c | 22 ++++++++++++----------
15128
clutter/x11/clutter-backend-x11.h | 1 +
15129
clutter/x11/clutter-stage-x11.c | 25 +++++++++++++++++++++++++
15130
3 files changed, 38 insertions(+), 10 deletions(-)
15132
commit 3abf393b87d83211d82b161c0417d80312b8783f
15133
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15134
Date: Fri Aug 14 11:29:03 2009 +0100
15136
[build] Clean up cogl-pango Makefile
15138
* Do _not_ use CLUTTER_MAJORMINOR to define the installation path
15139
for the headers; we must use CLUTTER_API_VERSION for that.
15141
* Do not put the C compiler flags in the INCLUDES directive.
15143
Bases on a patch by: Gary Ching-Pang Lin <glin@novell.com>
15145
clutter/pango/Makefile.am | 9 +++------
15146
1 files changed, 3 insertions(+), 6 deletions(-)
15148
commit 5c8ae6d2dcdb592a56f33927dcec2369a9147396
15149
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15150
Date: Thu Aug 13 18:05:38 2009 +0100
15152
[json] Fix compilation of the internal JSON-GLib
15154
Define the symbols needed to pass the single include policy when
15155
compiling the static object.
15157
clutter/json/Makefile.am | 4 +++-
15158
clutter/json/json-glib.h | 4 ++++
15159
2 files changed, 7 insertions(+), 1 deletions(-)
15161
commit 6e1f9ad9b65fedaa18950de712d7f6ab39b809f0
15162
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15163
Date: Thu Aug 13 16:15:04 2009 +0100
15165
[docs] Remove the version number from the title
15167
The version number in the title made sense when we were breaking
15168
API with every minor release. Now that we're API stable we can
15169
drop that and make the output in Devhelp and on the website slightly
15172
doc/reference/clutter/clutter-docs.xml.in | 4 ++--
15173
doc/reference/cogl/cogl-docs.xml.in | 9 +++++++--
15174
2 files changed, 9 insertions(+), 4 deletions(-)
15176
commit 8a794a85337c01a21f88a02c84bd519ed511b6c6
15177
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15178
Date: Thu Aug 13 16:13:55 2009 +0100
15180
[docs] Fix the examples for animate()
15182
Update the examples to reference to existing easing modes and to
15183
make sure to use floating point values for floating point properties.
15185
clutter/clutter-animation.c | 36 ++++++++++++++++++------------------
15186
1 files changed, 18 insertions(+), 18 deletions(-)
15188
commit f25cdf066c023222330119a1fe8ef5204773faa7
15189
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15190
Date: Thu Aug 13 12:26:09 2009 +0100
15192
[actor] Allow unsetting width and height separately
15194
It is possible to unset the size of an actor specified with set_width()
15195
and set_height() by using:
15197
clutter_actor_set_size (actor, -1, -1);
15199
Which works by unsetting the :min-*-set and the :natural-*-set properties.
15201
Calling set_width(-1) and set_height(-1) separately, though, doesn't work
15202
thus implicitly breaking the assumption that set_size() is nothing more
15203
than set_width()+set_height(). This was obviously due to the face that
15204
pre-1.0 set_width() and set_height() took an unsigned integer as an
15207
clutter/clutter-actor.c | 81 ++++++++++++++++++++++++++++++-----------------
15208
1 files changed, 52 insertions(+), 29 deletions(-)
15210
commit d3e06bc1e5654248d86aaa568179c5732839412e
15211
Author: Colin Walters <walters@verbum.org>
15212
Date: Thu Aug 13 10:49:39 2009 +0100
15214
Add (allow-none) for clutter_stage_set_key_focus()
15216
The @actor argument can be NULL to unset the key focus.
15218
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
15220
clutter/clutter-stage.c | 2 +-
15221
1 files changed, 1 insertions(+), 1 deletions(-)
15223
commit 9766fb13005b04669e60befd9e0e3cddf822ac1c
15224
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15225
Date: Wed Aug 12 16:02:23 2009 +0100
15227
[script] Fix Actor's ad-hoc parser
15229
ClutterActor parses positional and dimensional properties with a
15230
custom deserializer. We need to:
15232
- handle G_TYPE_INT64, the default integer type for JSON-GLib
15233
- use G_TYPE_FLOAT for properties, since Actor switched to it
15234
for the pixel-based ones
15236
This makes ClutterScript work again.
15238
clutter/clutter-actor.c | 8 ++++----
15239
1 files changed, 4 insertions(+), 4 deletions(-)
15241
commit cfbbacb8079e2ad92d5e538195d49cfdf8818144
15242
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15243
Date: Wed Aug 12 16:01:25 2009 +0100
15245
[script] Fix the default deserialization
15247
Properties parsed from ClutterScript should now use G_TYPE_INT64
15248
and automatically convert between G_TYPE_INT and G_TYPE_INT64.
15250
clutter/clutter-script.c | 21 +++++++++++++--------
15251
1 files changed, 13 insertions(+), 8 deletions(-)
15253
commit 4d522456372c2394046968ce0a4b22f603023d32
15254
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15255
Date: Wed Aug 12 16:00:13 2009 +0100
15257
[json] Update the internal copy of JSON-GLib
15259
JSON-GLib switch to 64 bit integers upstream, to avoid the undefined
15260
integer size of the JSON RFC. All integers are automatically promoted
15263
clutter/json/json-array.c | 4 +-
15264
clutter/json/json-node.c | 61 +++++++++++++++++++++++++++++++++++--------
15265
clutter/json/json-object.c | 41 +++++++----------------------
15266
clutter/json/json-parser.c | 13 +++++----
15267
clutter/json/json-types.h | 16 +++++++----
15268
5 files changed, 78 insertions(+), 57 deletions(-)
15270
commit 2b70b0d4ed791e8bc25b59eb3b2e9dbeb8201b11
15271
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15272
Date: Wed Aug 12 15:57:25 2009 +0100
15274
Include clutter-json.h, not json-types.h
15276
The json-types.h header is found by the mere fact of it being
15277
in the project; if we are compiling against the system JSON-GLib
15278
this could be horribly out of date.
15280
We need to use clutter-json.h, which will include the right
15283
clutter/clutter-script-private.h | 2 +-
15284
1 files changed, 1 insertions(+), 1 deletions(-)
15286
commit cc6aa6e4d537c5eec3fda85475f78bdf0da2ea10
15287
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15288
Date: Wed Aug 12 15:32:18 2009 +0100
15290
Clutter GIR depends on ClutterJson GIR conditionally
15292
If we're building Clutter with a system JSON-GLib we need to skip
15293
the typelib compilation of ClutterJson since we depend on Json-1.0.gir
15296
clutter/Makefile.am | 3 ++-
15297
1 files changed, 2 insertions(+), 1 deletions(-)
15299
commit 6fcf5c1820b29610a05e0f5022d1d6d907716df5
15300
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15301
Date: Wed Aug 12 15:31:16 2009 +0100
15303
[json] Include only json-glib.h
15305
JSON-GLib moved to a single include scheme, so we should only include
15306
json-glib.h. If we use the internal copy it doesn't matter, since the
15307
header does the right thing.
15309
clutter/clutter-json.h.in | 4 +---
15310
1 files changed, 1 insertions(+), 3 deletions(-)
15312
commit 8c49e227536fabddd2cbf81aa94e1624d30ca312
15313
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15314
Date: Wed Aug 12 10:30:11 2009 +0100
15316
Add copyright and license notice
15318
The clutter-script-parser.c does not have a copyright and license
15319
notices; even though the LGPL is a per-project license and not a
15320
per-file license, having those notices in every source file is a
15323
clutter/clutter-script-parser.c | 32 ++++++++++++++++++++++++++++++++
15324
1 files changed, 32 insertions(+), 0 deletions(-)
15326
commit 13e055a351f83c56b895b131566a6e842d24ed2a
15327
Author: zhou jiangwei <dyllan.zhou@samsung.com>
15328
Date: Tue Aug 11 14:18:37 2009 +0100
15330
[eglx] Update the EGLX backend
15332
The EGLX backend needs to be updated to the new ClutterBackendX11
15335
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
15337
clutter/eglx/clutter-backend-egl.c | 43 ++++++++++++++++++++++++++++++++++++
15338
clutter/eglx/clutter-backend-egl.h | 1 +
15339
clutter/eglx/clutter-stage-egl.c | 4 +-
15340
3 files changed, 46 insertions(+), 2 deletions(-)
15342
commit 2ab9bef5873ca9d226ddf31fc65b96fe20fa72d5
15343
Author: zhou jiangwei <dyllan.zhou@samsung.com>
15344
Date: Tue Aug 11 14:17:28 2009 +0100
15346
[cogl] Fix the GLES 2.0 backend
15348
Update the GLES 2.0 backend to the new COGL API after the breakage
15349
introduced by the journal.
15351
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
15353
clutter/cogl/common/cogl-primitives.c | 5 +++--
15354
clutter/cogl/gles/cogl-context.h | 5 ++++-
15355
clutter/cogl/gles/cogl-gles2-wrapper.h | 5 +++++
15356
clutter/cogl/gles/cogl-primitives.c | 10 +++++-----
15357
clutter/cogl/gles/cogl-texture-private.h | 3 +++
15358
5 files changed, 20 insertions(+), 8 deletions(-)
15360
commit dbfd3f0f444680d85556edc0b96dff68ea22722d
15361
Author: Robert Bragg <robert@linux.intel.com>
15362
Date: Tue Aug 11 13:49:12 2009 +0100
15364
[cogl_clear] Also pass the alpha component of the CoglColor to glClearColor
15366
Previously we were passing a constant of 0.0 for the alpha component which
15367
wasn't as flexible.
15369
clutter/cogl/common/cogl.c | 2 +-
15370
1 files changed, 1 insertions(+), 1 deletions(-)
15372
commit f0cb337d920c46cb7ca45d80ade69057d0408ff5
15373
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15374
Date: Tue Aug 11 13:27:25 2009 +0100
15376
[build] Fix LDADD -> LIBADD usage
15378
clutter/osx/Makefile.am | 2 +-
15379
1 files changed, 1 insertions(+), 1 deletions(-)
15381
commit dfc32b60c4b1b0b83fbf70d7e02b58cbc919326a
15382
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15383
Date: Tue Aug 11 13:11:34 2009 +0100
15385
[osx] Clean up Makefile.am
15387
The OS X backend Makefile.am was missing a line concatenation, and
15388
so the -xobjective-c directive was always ignored.
15390
Instead of dumping everything into INCLUDES and LDADD we should follow
15391
what the rest of the backends do, and use per-target CFLAGS and LDADD,
15392
and reserve the INCLUDES to -D and -I directives.
15394
Thanks to: Christian Hergert <chris@dronelabs.com>
15396
clutter/osx/Makefile.am | 30 ++++++++++++++----------------
15397
1 files changed, 14 insertions(+), 16 deletions(-)
15399
commit d0748b3b9b34bf77ed3b813e3872cac64d6a6c35
15400
Merge: d263e7a df572d0
15401
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15402
Date: Mon Aug 10 17:21:20 2009 +0100
15404
Merge branch 'system-json-glib'
15406
* system-json-glib:
15407
[script] Simplify the parser code
15408
Update JSON-GLib dependency
15410
commit d263e7a78b7e98b2b87a51a194b93473344b6b27
15411
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15412
Date: Mon Aug 10 17:19:04 2009 +0100
15414
[build] Install JSON headers inside the right directory
15416
Don't install inside the clutter-MAJOR_MINOR/ directory, but use
15417
the API_VERSION (1.0).
15419
Otherwise we'd have the Clutter headers for 1.x inside:
15421
$includedir/clutter-1.0/clutter
15423
And the JSON-related headers inside:
15425
$includedir/clutter-1.<minor>/clutter
15427
clutter/json/Makefile.am | 2 +-
15428
1 files changed, 1 insertions(+), 1 deletions(-)
15430
commit 19a53054fde3ccfac365452618e4524e3f3c7efc
15431
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15432
Date: Fri Aug 7 15:27:25 2009 +0100
15434
Bump to 1.1.1 after branching 1.0
15436
configure.ac | 2 +-
15437
1 files changed, 1 insertions(+), 1 deletions(-)
15439
commit 420ed353b53bd624331bd249d7df98d14714b504
15440
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15441
Date: Fri Aug 7 08:18:17 2009 +0100
15443
[x11] Do not ask to destroy an empty Window
15445
The fix for bug 1750 inside commit b190448e made Clutter-GTK spew
15446
BadWindow errors. The reason for that is that we call XDestroyWindow()
15447
without checking if the old Window is None; this happens if we call
15448
clutter_x11_set_stage_foreign() on a new ClutterStage before it has
15451
Since Clutter-GTK does not need to realize the Stage it is going to
15452
embed anymore (the only reason for that was to obtain a proper Visual
15453
but now there's ClutterBackendX11 API for that), the set_stage_foreign()
15454
call is effectively setting the StageX11 Window for the first time.
15456
clutter/x11/clutter-stage-x11.c | 20 +++++++++++++++-----
15457
1 files changed, 15 insertions(+), 5 deletions(-)
15459
commit 335fb07ab02bc719c04bf2de115a88216f1321f7
15460
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15461
Date: Wed Aug 5 17:46:18 2009 +0100
15463
[actor] Add missing return_if_fail()
15465
The queue_relayout() method was missing the argument check.
15467
Thanks to: Neil Patel <njpatel@gmail.com>
15469
clutter/clutter-actor.c | 2 ++
15470
1 files changed, 2 insertions(+), 0 deletions(-)
15472
commit 1434d7213487ad42626fcc4b1da180fe98192ef1
15473
Author: Neil Roberts <neil@linux.intel.com>
15474
Date: Wed Aug 5 15:51:49 2009 +0100
15476
Small doc fix to clutter_text_get_color
15478
Bug reported by Rob Bradford.
15480
clutter/clutter-text.c | 2 +-
15481
1 files changed, 1 insertions(+), 1 deletions(-)
15483
commit b190448ed460ae466cd6d1c7c34e47d4386fe4c4
15484
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15485
Date: Tue Aug 4 16:59:15 2009 +0100
15487
[x11] Destroy the Window we own when setting a foreign one
15489
When we replace the stage Window using a foreign one we also need to
15490
destroy the Window we created, if needed, to avoid leaking resources
15495
http://bugzilla.openedhand.com/show_bug.cgi?id=1750
15497
clutter/x11/clutter-stage-x11.c | 6 ++++++
15498
1 files changed, 6 insertions(+), 0 deletions(-)
15500
commit 7963254c23f42a43b64ca3f2401499b456d677ce
15501
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15502
Date: Tue Aug 4 11:39:09 2009 +0100
15506
doc/reference/clutter/building-clutter.xml | 6 ++++--
15507
1 files changed, 4 insertions(+), 2 deletions(-)
15509
commit 79288b46ed60efe4cf3f970ef7f1cce17685cd84
15510
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15511
Date: Tue Aug 4 11:38:48 2009 +0100
15513
[docs] Fix a missing parameter
15515
clutter/cogl/cogl-vertex-buffer.h | 2 +-
15516
1 files changed, 1 insertions(+), 1 deletions(-)
15518
commit 9cda8d130f7097d8ca43ffb0e50206ab72d1892d
15519
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15520
Date: Tue Aug 4 11:11:59 2009 +0100
15522
[actor] Be more explicit when warning about invariants
15524
The "catch all" warning for a the mapped invariant violation is too
15525
generic: it doesn't tell you why the invariant was broken in case
15526
we are trying to map an unparented actor - e.g. through a Clone.
15528
clutter/clutter-actor.c | 10 ++++++++--
15529
1 files changed, 8 insertions(+), 2 deletions(-)
15531
commit f8a964b422c195219c59a3b21d9bb3125ce215dd
15532
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15533
Date: Tue Aug 4 11:10:55 2009 +0100
15535
[cogl] Expose cogl_is_vertex_buffer()
15537
The function is public and available in the shared object, but
15538
it's not present in the header, so this is not an API/ABI change.
15540
clutter/cogl/cogl-vertex-buffer.h | 14 ++++++++++++++
15541
doc/reference/cogl/cogl-sections.txt | 1 +
15542
2 files changed, 15 insertions(+), 0 deletions(-)
15544
commit c9f57452e60c89c0b046def2f1787773545244df
15545
Author: Robert Bragg <robert@linux.intel.com>
15546
Date: Mon Aug 3 15:03:19 2009 +0100
15548
[build] remove reference to light1.png in tests/interactive/Makefile.am
15550
This file doesn't exist in the repo and isn't referenced by any unit tests.
15552
tests/interactive/Makefile.am | 4 +---
15553
1 files changed, 1 insertions(+), 3 deletions(-)
15555
commit 71c4fa0f73ec9a101a4dcb07a0d782e075185d4b
15556
Author: Robert Bragg <robert@linux.intel.com>
15557
Date: Mon Aug 3 14:53:46 2009 +0100
15559
[build] dist tests/interactive/wrapper.sh
15561
in tests/interactive/Makefile.am add wrapper.sh to EXTRA_DIST otherwise
15562
interactive unit tests wont be runnable when building from distributed
15565
tests/interactive/Makefile.am | 3 +++
15566
1 files changed, 3 insertions(+), 0 deletions(-)
15568
commit c9c87543e8f827ee4c3510cd0025e8653d3309b1
15569
Author: Damien Lespiau <damien.lespiau@intel.com>
15570
Date: Mon Aug 3 14:11:33 2009 +0100
15572
[debug] CLUTTER_{NOTE,MARK,DBG,GLERR,TIMESTAMP} should always be statements
15574
In case someone tries to do:
15576
CLUTTER_NOTE(DOMAIN, "%s", blah);
15578
CLUTTER_NOTE () should always be a statement
15580
clutter/clutter-debug.h | 10 +++++-----
15581
1 files changed, 5 insertions(+), 5 deletions(-)
15583
commit cd35f3b384b645d171de49eee555363d4b2acc94
15584
Author: Damien Lespiau <damien.lespiau@intel.com>
15585
Date: Mon Aug 3 13:58:52 2009 +0100
15587
[debug] Fix __GNUC__ typo
15589
The right gcc define is __GNUC__ not __GNUC_. This typo had the side
15590
effect that we were using the non gcc specific debug macros leading to
15591
a less optmised CLUTTER_NOTE () than one could have dreamed of.
15593
clutter/clutter-debug.h | 2 +-
15594
1 files changed, 1 insertions(+), 1 deletions(-)
15596
commit 94b35a4a5ee4fa86d837b2deb06fe849a2a68977
15597
Author: Damien Lespiau <damien.lespiau@intel.com>
15598
Date: Mon Aug 3 13:56:32 2009 +0100
15600
[build] GCC_FLAGS is no more, MAINTAINER_CFLAGS is the One.
15602
CC_FLAGS was a left over from the 0.8.x age. Killed it and use the
15603
newer MAINTAINER_CFLAGS variable instead.
15605
clutter/Makefile.am | 2 +-
15606
clutter/eglnative/Makefile.am | 2 +-
15607
clutter/eglx/Makefile.am | 2 +-
15608
clutter/fruity/Makefile.am | 2 +-
15609
clutter/glx/Makefile.am | 3 +--
15610
clutter/json/Makefile.am | 2 ++
15611
clutter/osx/Makefile.am | 2 +-
15612
clutter/sdl/Makefile.am | 2 +-
15613
clutter/win32/Makefile.am | 2 +-
15614
clutter/x11/Makefile.am | 3 +--
15615
10 files changed, 11 insertions(+), 11 deletions(-)
15617
commit 4ee49eded0561ad987b50e1b04e15a685c1c06e2
15618
Author: Damien Lespiau <damien.lespiau@intel.com>
15619
Date: Mon Aug 3 13:58:21 2009 +0100
15621
[gitignore] Ignore new test-color-hls-roundtrip test
15623
tests/.gitignore | 1 +
15624
1 files changed, 1 insertions(+), 0 deletions(-)
15626
commit b2ab2b953548bb9af41789e2465dfa9a588c9b2d
15627
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15628
Date: Sun Aug 2 18:34:17 2009 +0100
15630
[actor] Use the right vertex
15632
The vertex that should be used by the apply_relative_transform
15633
is the one passed in as const, and the result should be placed
15634
inside the non-const ClutterVertext. Currently, we are using
15635
the latter, and thus the function is completely useless.
15637
clutter/clutter-actor.c | 6 +++---
15638
1 files changed, 3 insertions(+), 3 deletions(-)
15640
commit ae2a861a0b042e36393e5eb76ecb17759a933892
15641
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15642
Date: Fri Jul 31 10:29:33 2009 +0100
15644
[x11] Force a redraw before mapping the stage
15646
Does as it says on the tin: run a paint cycle before calling
15649
clutter/x11/clutter-stage-x11.c | 9 ++++++---
15650
1 files changed, 6 insertions(+), 3 deletions(-)
15652
commit abdcf4debbedd9f924da4db9403ecbc9a030cb20
15653
Author: Joshua Lock <josh@linux.intel.com>
15654
Date: Fri Jul 31 10:16:56 2009 +0100
15656
[docs] Update building instructions for OS X
15658
Recommend OS X users install the dependencies using MacPorts and build
15659
Clutter themselves.
15661
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
15663
doc/reference/clutter/building-clutter.xml | 41 +++++++++++++++------------
15664
1 files changed, 23 insertions(+), 18 deletions(-)
15666
commit b3842a6b62979d264b7d7057e4125602e644ccad
15667
Author: Neil Roberts <neil@linux.intel.com>
15668
Date: Wed Jul 29 19:06:36 2009 +0100
15670
[mingw] Update the README
15672
The README has been updated to say that you can use the script under
15673
MSYS and also to contain a pointer to OAH. It also contains the
15674
updated contents of a blog post¹ about building with MSYS.
15676
1. http://www.busydoingnothing.co.uk/blog/2008/07/13#ClutterWin32
15678
build/mingw/README | 133 +++++++++++++++++++++++++++++++++++++++++++++++++--
15679
1 files changed, 127 insertions(+), 6 deletions(-)
15681
commit 8ad446f3e9903d2339536db4febef1cbc77db643
15682
Author: Neil Roberts <neil@linux.intel.com>
15683
Date: Wed Jul 29 18:13:19 2009 +0100
15685
[mingw-cross-compile.sh] Fix to use git rather than svn
15687
The script includes a part to automatically checkout the Clutter
15688
source and build it but it was using the old svn repo instead of git.
15690
build/mingw/mingw-cross-compile.sh | 6 +++---
15691
1 files changed, 3 insertions(+), 3 deletions(-)
15693
commit d796d3c88c3d3044d1c1bf54c320504f4e5886eb
15694
Author: Neil Roberts <neil@linux.intel.com>
15695
Date: Wed Jul 29 17:59:54 2009 +0100
15697
[mingw-cross-compile.sh] Add a note about MSYS in the comment
15699
The comment previously implied that you could only use the script to
15700
cross compile but it works just as well under MSYS.
15702
build/mingw/mingw-cross-compile.sh | 5 +++--
15703
1 files changed, 3 insertions(+), 2 deletions(-)
15705
commit 1e14d3041dc2f68d18dcd3e03d34e8d0fa7a05f4
15706
Author: Neil Roberts <neil@linux.intel.com>
15707
Date: Wed Jul 29 17:58:02 2009 +0100
15709
[mingw-cross-compile.sh] Update version numbers of all the dependencies
15711
This updates the URLs for the binary dependencies to use the latest
15714
build/mingw/mingw-cross-compile.sh | 23 +++++++++++++----------
15715
1 files changed, 13 insertions(+), 10 deletions(-)
15717
commit a3c323c52c42785f93641e3603a5426bbb371876
15718
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15719
Date: Wed Jul 29 17:22:18 2009 +0100
15721
[docs] Remove mentions of Clutter-Cairo
15723
The mingw README file still mentions Clutter-Cairo as a known issue.
15725
build/mingw/README | 8 ++------
15726
1 files changed, 2 insertions(+), 6 deletions(-)
15728
commit 0ec6793738085308206e028d1136cb4cd4274f11
15729
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15730
Date: Wed Jul 29 17:21:13 2009 +0100
15732
[mingw/win32] Remove clutter-cairo
15734
The Clutter-Cairo library has been removed, so there's no point
15735
in checking it out -- from Subversion, even.
15737
build/mingw/mingw-cross-compile.sh | 23 -----------------------
15738
1 files changed, 0 insertions(+), 23 deletions(-)
15740
commit fba1045bcb46da4ed04bd789b7650e985915243b
15741
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15742
Date: Tue Jul 28 18:39:24 2009 +0100
15744
Post-release bump to 1.0.1
15746
configure.ac | 2 +-
15747
1 files changed, 1 insertions(+), 1 deletions(-)
15749
commit df572d089c0811ecbc5e41d1c68d39fae47040e9
15750
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15751
Date: Mon Jun 29 16:33:36 2009 +0100
15753
[script] Simplify the parser code
15755
JSON-GLib provides simple accessors for basic types so that we
15756
can avoid getting the JsonNode out of a complex type. This makes
15757
the code simpler to understand.
15759
clutter/clutter-script.c | 39 ++++++++++-----------------------------
15760
1 files changed, 10 insertions(+), 29 deletions(-)
15762
commit 354fa437cdc4b67ca6c2452756a261222109b289
15763
Author: Emmanuele Bassi <ebassi@linux.intel.com>
15764
Date: Thu Jun 25 18:56:52 2009 +0100
15766
Update JSON-GLib dependency
15768
Currently, Clutter depends on the internal copy of JSON-GLib for
15769
the ClutterScript parser. This is done to allow building Clutter
15770
on platforms that do not have the library installed on the system.
15772
Just like we use the internal PNG/JPEG loader as a fallback in
15773
case we don't have GdkPixbuf or CoreGraphics available, we should
15774
use the internal copy of JSON-GLib only in case the system copy
15777
The change is simply to move the default for the --with-json
15778
configure switch from "internal" to "check".
15780
In order to allow stricter compliance, a third setting should
15781
be present: "system", which fails if the system copy is not
15784
We should also change the introspection generation to avoid
15785
breaking in case we require the installed Json-1.0.gir instead
15786
of the generated ClutterJson.gir
15788
clutter/Makefile.am | 5 ++++-
15789
configure.ac | 44 +++++++++++++++++++++++++++++++++++---------
15790
2 files changed, 39 insertions(+), 10 deletions(-)