Emmanuele Bassi [Thu, 14 May 2009 11:00:51 +0000 (12:00 +0100)]
[text] Maintain the cursor at the end when deleting
If the cursor is already at the end of the Text contents then we
need to maintain its position when deleting the previous character
using the relative key binding.
Emmanuele Bassi [Thu, 14 May 2009 10:50:42 +0000 (11:50 +0100)]
[text] Reset the cursor when setting empty text
When setting the contents of Text to an empty string we should
reset the cursor position and selection bound to -1.
Emmanuele Bassi [Thu, 14 May 2009 09:02:06 +0000 (10:02 +0100)]
[build] Fix with --disable-introspection
The required "fake" libclutter-cogl.la upon with the main clutter
shared object depends is only built with introspection enabled
instead of being built unconditionally.
Emmanuele Bassi [Thu, 14 May 2009 07:32:46 +0000 (08:32 +0100)]
[build] Do not rebuild the conformance tests scripts
Make the build output a little bit cleaner by not re-creating the
small shell scripts that allow launching the test units separately.
Owen W. Taylor [Wed, 13 May 2009 22:14:24 +0000 (23:14 +0100)]
Don't build Cogl.gir against installed Clutter library
Passing:
--library=clutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@
to g-ir-scanner, when building Cogl was causing g-ir-scanner to
link the introspection program against the installed clutter library,
if it existed or fail otherwise. Instead copy the handling from
the json/ directory where we link against the convenience library
to scan, and do the generation of the typelib later in the
main clutter/directory.
Fixes bug:
http://bugzilla.openedhand.com/show_bug.cgi?id=1594
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
Emmanuele Bassi [Wed, 13 May 2009 22:04:25 +0000 (23:04 +0100)]
[text] Return the correct minimum height
If text is set, ClutterText should never return less than the layout
height for minimum and preferred heights.
This holds unless ellipsize and wrap are enabled, in which case the
minimum height should be the height of the first line -- which is
the height needed to at the very least show the ellipsization.
Based on a patch by: Thomas Wood <thomas@openedhand.com>
Fixes bug:
http://bugzilla.openedhand.com/show_bug.cgi?id=1598
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
Robert Bragg [Wed, 13 May 2009 11:11:54 +0000 (12:11 +0100)]
[text] Ensure clutter_text_get_selection copes with start/end positions of -1
I was seeing clutter_text_get_selection trying to malloc up to 4Gb due to
unexpected negative arithmetic for the start/end offsets which resulted
in a crash.
This just tests for positions of -1 before deciding if the start/end
positions need to be swapped. The conversion from position to byte offset
already works with -1.
Emmanuele Bassi [Tue, 12 May 2009 18:22:25 +0000 (19:22 +0100)]
[tests] Add command line option to the picking test
The picking test has two configurables: the number of actors and
the number of events per frame. It makes sense to have them as
command line options to test with multiple configurations without
having to change defines and recompile.
Owen W. Taylor [Sun, 10 May 2009 00:09:42 +0000 (20:09 -0400)]
Fix chain-up in clutter_list_model_dispose()
Chain up to parent class's dispose() method not parent class's
finalize() method.
http://bugzilla.openedhand.com/show_bug.cgi?id=1595
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
Chris Lord [Tue, 12 May 2009 15:17:51 +0000 (16:17 +0100)]
[tests/micro-bench] Add a picking performance test
Approved by Robert Bragg.
Robert Bragg [Tue, 12 May 2009 00:02:25 +0000 (01:02 +0100)]
[picking] Use cogl_clip_push_window_rect to greatly reduce the cost of picking.
cogl_clip_push_window_rect is implemented using GPU scissoring which allows
the GPU to cull anything that falls outside a given rectangle. Since in the
case of picking we only ever care about a single pixel we can get the GPU to
ignore all geometry that doesn't intersect that pixel and only rasterize for
one pixel.
Robert Bragg [Fri, 8 May 2009 15:32:01 +0000 (16:32 +0100)]
[cogl-clip-stack] Support pushing rectangles onto the stack using window coords
Previously clipping could only be specified in object coordinates, now
rectangles can also be pushed in window coordinates.
Internally rectangles pushed this way are intersected and then clipped using
scissoring. We also transparently try to convert rectangles pushed in
object coordinates into window coordinates as we anticipate the scissoring
path will be faster then the clip planes and undoubtably it will be faster
than using the stencil buffer.
Neil Roberts [Tue, 12 May 2009 14:36:16 +0000 (15:36 +0100)]
Don't clear the stencil buffer before painting and picking
The stencil buffer is always cleared the first time a clip is used
that needs it and the stencil test is disabled otherwise so there is
no need to clear before a paint.
Robert Bragg [Tue, 12 May 2009 13:15:18 +0000 (14:15 +0100)]
[cogl] Remove the COGL{enum,int,uint} typedefs
COGLenum, COGLint and COGLuint which were simply typedefs for GL{enum,int,uint}
have been removed from the API and replaced with specialised enum typedefs, int
and unsigned int. These were causing problems for generating bindings and also
considered poor style.
The cogl texture filter defines CGL_NEAREST and CGL_LINEAR etc are now replaced
by a namespaced typedef 'CoglTextureFilter' so they should be replaced with
COGL_TEXTURE_FILTER_NEAREST and COGL_TEXTURE_FILTER_LINEAR etc.
The shader type defines CGL_VERTEX_SHADER and CGL_FRAGMENT_SHADER are handled by
a CoglShaderType typedef and should be replaced with COGL_SHADER_TYPE_VERTEX and
COGL_SHADER_TYPE_FRAGMENT.
cogl_shader_get_parameteriv has been replaced by cogl_shader_get_type and
cogl_shader_is_compiled. More getters can be added later if desired.
Robert Bragg [Tue, 12 May 2009 13:20:22 +0000 (14:20 +0100)]
[ClutterTexture] Remove a spurious line I accidentally committed in
741c4bb5
I accidentally changed clutter_texture_set_cogl_texture to always set the
filter quality for the new Cogl texture to medium.
Robert Bragg [Wed, 6 May 2009 18:01:09 +0000 (19:01 +0100)]
Don't call glFinish in _clutter_do_pick
Calling glReadPixels is bad enough in forcing us to synchronize the CPU with
the GPU, but glFinish has even stronger synchonization semantics than
glReadPixels which may negate some driver optimizations possible in
glReadPixels.
Neil Roberts [Tue, 12 May 2009 13:15:37 +0000 (14:15 +0100)]
[build] Fix out-of-tree builds for Cogl
Commit
43fa38fcf5 broke out-of-tree builds by removing some of the
builddir directories from the include path. builddir/clutter/cogl and
builddir/clutter are needed because cogl.h and cogl-defines-gl.h are
automatically generated by the configure script. The main clutter
headers are in the srcdir so this needs to be in the path too.
Emmanuele Bassi [Sat, 9 May 2009 23:41:17 +0000 (00:41 +0100)]
[build] Unbreak compilation
When building Clutter with introspection enabled everything stops
at Cogl GIR generation because it depends on the installed library
to work. Since we still require some changes in the API to be able
to build the GIR and the typelib for Cogl we should disable the
generation of the GIR as well.
Rob Bradford [Fri, 8 May 2009 09:57:56 +0000 (10:57 +0100)]
[list-model] Return NULL for first row in a fully filtered model
If the filter means that the there should be no rows left in the model,
clutter_model_get_iter_at_row (model, 0) should return NULL.
Howevever the currene implementation misbehaves and returns a bad iterator.
This change resolves the issue by tracking if we actually found any
non-filtered rows in our pass through the sequence.
OH Bugzilla: 1591
Emmanuele Bassi [Wed, 6 May 2009 17:32:17 +0000 (18:32 +0100)]
[x11] Use -1 as the default screen guard
Currently, the default screen guard value is 0, which is a valid
screen number on X11, and it might not be the default.
Patch suggested by: Owen W. Taylor <otaylor@redhat.com>
Emmanuele Bassi [Wed, 6 May 2009 10:18:31 +0000 (11:18 +0100)]
[build] Build Cogl introspection data
Currently, the introspection data for Cogl is built right into
Clutter's own typelib. This makes functions like:
cogl_path_round_rectangle()
Appear as:
Clutter.cogl_path_round_rectangle()
It should be possible, instead, to have a Cogl namespace and:
Cogl.path_round_rectangle()
This means building introspection data for Cogl alone. Unfortunately,
there are three types defined in Cogl that confuse the introspection
scanner, and make it impossible to build a typelib:
COGLint
COGLuint
COGLenum
These three types should go away before 1.0, substituted by int,
unsigned int and proper enumeration types. For this reason, we can
just set up the GIR build and wait until the last moment to create
the typelib. Once that has been done, we will be able to safely
remove the Cogl API from the Clutter GIR and typelib and let
people import Cogl if they want to use the Cogl API via introspection.
Emmanuele Bassi [Wed, 6 May 2009 09:55:17 +0000 (10:55 +0100)]
[build] Clean up the makefile
Split out the files into their own variables to clean up the
Makefile template; also use top_srcdir with the header files
instead of top_builddir.
Emmanuele Bassi [Wed, 6 May 2009 09:35:28 +0000 (10:35 +0100)]
Fix inclusion guards and headers
The C++ inclusion guards G_BEGIN_DECLS and G_END_DECLS are
defined by GLib; so we need to include glib.h before using
them.
Rob Bradford [Tue, 5 May 2009 19:15:01 +0000 (20:15 +0100)]
[model] Add a private row mutator to ClutterModelIter
When calling clutter_model_iter_next () / clutter_model_iter_prev () we need
to update the row for the iterator. In order to improve the peformance of
iterating this change adds a private row mutator and switches ClutterListModel
to use it.
Rob Bradford [Tue, 5 May 2009 18:39:26 +0000 (19:39 +0100)]
[list-model] Use an internal iterator for comparisons
In order to carry out various comparisons for e.g. identifying the first
iterator in the model we need a ClutterModelIter. This change switches from
creating a new iterator each time to reusing an existing iterator.
Robert Bragg [Fri, 1 May 2009 08:53:20 +0000 (09:53 +0100)]
[cogl-material] Adds a cogl_material_set_color4f convenience function
This is simply a wrapper around cogl_color_set_from_4f and
cogl_material_set_color. We already had a prototype for this, it was
an oversight that it wasn't already implemented.
Robert Bragg [Thu, 30 Apr 2009 21:19:43 +0000 (22:19 +0100)]
[cogl-offscreen] Cleans up the cogl offscreen API and adds documentation
There were several functions I believe no one is currently using that were
only implemented in the GL backend (cogl_offscreen_blit_region and
cogl_offscreen_blit) that have simply been removed so we have a chance to
think about design later with a real use case.
There was one nonsense function (cogl_offscreen_new_multisample) that
sounded exciting but in all cases it just returned COGL_INVALID_HANDLE
(though at least for GL it checked for multisampling support first!?)
it has also been removed.
The MASK draw buffer type has been removed. If we want to expose color
masking later then I think it at least would be nicer to have the mask be a
property that can be set on any draw buffer.
The cogl_draw_buffer and cogl_{push,pop}_draw_buffer function prototypes
have been moved up into cogl.h since they are for managing global Cogl state
and not for modifying or creating the actual offscreen buffers.
This also documents the API so for example desiphering the semantics of
cogl_offscreen_new_to_texture() should be a bit easier now.
Havoc Pennington [Fri, 20 Feb 2009 03:37:08 +0000 (22:37 -0500)]
add cogl_push_draw_buffer() and cogl_pop_draw_buffer()
These are necessary if nesting redirections to an fbo,
otherwise there's no way to know how to restore
previous state.
glPushAttrib(GL_COLOR_BUFFER_BIT) would save draw buffer
state, but also saves a lot of other stuff, and
cogl_draw_buffer() relies on knowing about all draw
buffer state changes. So we have to implement a
draw buffer stack ourselves.
Signed-off-by: Robert Bragg <robert@linux.intel.com>
Robert Bragg [Thu, 30 Apr 2009 17:00:22 +0000 (18:00 +0100)]
[cogl] Only expose CoglBitmap as a CoglHandle
It was inconsistent that we exposed the CoglBitmap struct instead of an
opaque CoglHandle.
Robert Bragg [Wed, 29 Apr 2009 18:49:09 +0000 (19:49 +0100)]
[cogl-material] make _cogl_material_layer_free check for an invalid texture handle
It is valid in some situations to have a material layer with an invalid texture
handle (e.g. if you setup a texture combine mode before setting the texture)
and so _cogl_material_layer_free needs to check for a valid handle before
attempting to unref it.
Robert Bragg [Mon, 27 Apr 2009 14:48:12 +0000 (15:48 +0100)]
[cogl] Updates all file headers and removes lots of trailing white space
Adds missing notices, and ensures all the notices are consistent. The Cogl
blurb also now reads:
* Cogl
*
* An object oriented GL/GLES Abstraction/Utility Layer
Robert Bragg [Fri, 24 Apr 2009 17:09:52 +0000 (18:09 +0100)]
[cogl] Adds a bitfield argument to cogl_clear for specifying which buffers to clear
Redundant clearing of depth and stencil buffers every render can be very
expensive, so cogl now gives control over which auxiliary buffers are
cleared.
Note: For now clutter continues to clear the color, depth and stencil buffer
each paint.
Neil Roberts [Thu, 30 Apr 2009 14:00:01 +0000 (15:00 +0100)]
[ClutterTexture] Check before unrefing the fbo_handle
When replacing the fbo_handle with a new handle it first unrefs the
old handle. This was previously a call to cogl_offscreen_unref which
silently ignored attempts to unref COGL_INVALID_HANDLE. However the
new cogl_handle_unref does check for this so we should make sure the
handle is valid to avoid the warning.
Neil Roberts [Thu, 30 Apr 2009 13:32:19 +0000 (14:32 +0100)]
[ClutterTexture] Attach the FBO texture to a layer in the material
Bug 1565 - test-fbo case failed in many platform
clutter_texture_new_from_actor was broken because it created the FBO
texture but then never attached it to the material so it was never
used for rendering. The old behaviour in Clutter 0.8 was to assign the
texture directly to priv->tex. In 0.9 priv->tex is replaced with
priv->material which has a reference to the tex in layer 0. So putting
the FBO texture directly in layer 0 more closely matches the original
behaviour.
Øyvind Kolås [Thu, 30 Apr 2009 10:54:09 +0000 (11:54 +0100)]
[events] Added handling of missing type to clutter_event_get_state
clutter_event_get_state wasn't returning the state for
CLUTTER_BUTTON_RELEASE, the information was there it just needed to
be returned correctly.
Emmanuele Bassi [Wed, 29 Apr 2009 14:41:12 +0000 (15:41 +0100)]
[gitignore] Update with the new Model test
Emmanuele Bassi [Wed, 29 Apr 2009 14:40:13 +0000 (15:40 +0100)]
[docs] Add ClutterModel::get_filter_set()
Emmanuele Bassi [Wed, 29 Apr 2009 14:39:23 +0000 (15:39 +0100)]
[tests] Exercise the Model filtering
Add a test unit that exercises the ClutterModel iteration API
when there is a filter in place.
Emmanuele Bassi [Wed, 29 Apr 2009 14:26:05 +0000 (15:26 +0100)]
[model] Rework Model behaviour with a filter
Currently ClutterModel::get_iter_at_row() ignores whether we have
a filter in place. This also extends to the get_n_rows() method.
The more consistent, more intuitive and surely more correct way to
handle a Model with a filter in place is to take into account the
presence of the filter itself -- that is:
- get_n_rows() should take into account the filter and return the
number of *filtered* rows
- get_iter_at_row() should also take the filter into account and
get the first non-filtered row
These two changes make the ClutterModel with a filter function
behave like a subset of the original Model without a filter in
place.
For instance, given a model with three rows:
- [row 0] <does not match filter>
- [row 1] <matches filter>
- [row 2] <matches filter>
- [row 3] <does not match filter>
The get_n_rows() method will return "2", since only two rows will
match the filter; the get_first_iter() method will ask for the
zero-eth row, which will return an iterator pointing to the contents
of row 1 (but the :row property of the iterator will be set to 0);
the get_last_iter() method will ask for the last row, which will
return an iterator pointing to the contents of row 2 (but the :row
property of the iterator will be set to 1).
This changes will hopefully make the Model API more consistent
in its usage whether there is a filter in place or not.
Emmanuele Bassi [Wed, 29 Apr 2009 14:14:40 +0000 (15:14 +0100)]
[model] Add :filter-set
Currently, there is no way for implementations of the ClutterModel
abstract class to know whether there is a filter in place. Since
subclasses might implement some optimization in case there is no
filter present, we need a simple (and public) API to ask the model
itself.
Neil Roberts [Tue, 21 Apr 2009 13:15:19 +0000 (14:15 +0100)]
[ClutterText] Fix actors with a width but no wrapping and the wrap modes
Setting the wrap mode on the PangoLayout seems to have disappeared
during the text-actor-layout-height branch merge so this brings it
back. The test for this in test-text-cache no longer needs to be
disabled.
We also shouldn't set the width on the layout if there is no wrapping
or ellipsizing because otherwise it implicitly enables wrapping. This
only matters if the actor gets allocated smaller than its natural
size.
Emmanuele Bassi [Thu, 23 Apr 2009 10:38:58 +0000 (11:38 +0100)]
[docs] Increase verbosity for commit messages
Apparently, not everyone read the HACKING file, especially the
section about commit messages. This lead to some confusion with
regards to the acceptable (i.e. mandatory) format for commit
messages in Clutter. Let's clarify it a little bit before I start
enforcing it and reverting commits.
Emmanuele Bassi [Thu, 23 Apr 2009 10:35:10 +0000 (11:35 +0100)]
[alpha] Sanitize easing equations
Bug 1561 - Bad code in clutter-alpha.c
The implementation of the easing modes equations followed closely
the JavaScript and ActionScript counterparts. Obviously, JS and AS
are not C-compatible, so later versions of gcc (4.4.0 for instance)
would complain about uninitialized variables and such. The code is
also obfuscated and hard to debug/understand.
For these reasons, the implementation should be unobfuscated and
sanitized.
Robert Bragg [Fri, 17 Apr 2009 18:05:21 +0000 (19:05 +0100)]
[x11-texture-pixmap] Fixes a reported lockup due to an undesireable X server grab
A lockup was reported by fargoilas on #clutter and removing the server grab in
clutter_x11_texture_pixmap_sync_window fixed the problem.
We were doing an x server grab to guarantee that if the XGetWindowAttributes
request reported that our redirected window was viewable then we would also
be able to get a valid pixmap name. (the composite protocol says it's an
error to request a name for a window if it's not viewable) Without the grab
there would be a race condition.
Instead we now handle error conditions gracefully.
Emmanuele Bassi [Thu, 2 Apr 2009 09:28:37 +0000 (10:28 +0100)]
[text] Avoid a Pango warning with empty markup
When the markup string is empty Pango complains about invalid
characters.
Neil Roberts [Fri, 27 Mar 2009 21:55:40 +0000 (21:55 +0000)]
[test-pick] Improve to include a covering actor
Three tests are now performed on the picked squares. First there is no
covering actor which is the same as the original test. Then there is a
hidden covering actor which should not affect the results. Finally
there is a covering actor with a clip set on it so that only actors
at the borders of the stage should be pickable.
Emmanuele Bassi [Tue, 21 Apr 2009 11:09:59 +0000 (12:09 +0100)]
[tests] Disable a subtest of the Text cache unit
The wrap mode sub-test inside the ClutterText layout cache test
unit has been broken by the recent changes inside the Text actor.
The sub-test itself might require tweaking.
Emmanuele Bassi [Tue, 21 Apr 2009 11:06:14 +0000 (12:06 +0100)]
[text] Emit ::cursor-event only on changes
The documentation for the ::cursor-event says that the signal
is emitted only when the cursor position changes. Right now it
is being emitted every time we ensure the cursor position during
the Text paint sequence.
The clutter_text_ensure_cursor_position() function should check
whether the stored cursor position has changed since the last
paint, and emit the ::cursor-event signal only when there has
been a change.
Emmanuele Bassi [Tue, 21 Apr 2009 11:03:41 +0000 (12:03 +0100)]
[tests] Visually verify ellipsization
Verify that the non-editable, single line entries are still
correctly ellipsized when a maximum width is set.
Emmanuele Bassi [Tue, 21 Apr 2009 11:01:52 +0000 (12:01 +0100)]
[text] Return the correct minimum height
The correct minimum height in case of ellipsis is still 1px.
Emmanuele Bassi [Tue, 21 Apr 2009 10:59:38 +0000 (11:59 +0100)]
[text] Limit the Layout width
We only want to eschew the pango_layout_set_width() on editable,
single-line Text actors because they can "scroll" the PangoLayout.
This fixes the ellipsization on entries.
Robert Bragg [Mon, 20 Apr 2009 11:36:43 +0000 (12:36 +0100)]
[gl/cogl.c] #include <gmodule.h> for OS X builds
In unifying the {gl,gles}/cogl.c code recently, moving most of the code into
common/cogl.c the gmodule.h include was also mistakenly moved.
Thanks to Felix Rabe for reporting this issue.
Note: I haven't tested this fix myself, as I'm not set up to be able to
build for OS X
Robert Bragg [Wed, 15 Apr 2009 18:25:55 +0000 (19:25 +0100)]
[cogl vertex buffers] Adds fallbacks for drivers without VBO support
Buffer objects aren't currently available for glx indirect contexts, so we
now have a fallback that simply allocates fake client side vbos to store the
attributes.
Robert Bragg [Fri, 17 Apr 2009 14:10:55 +0000 (15:10 +0100)]
[cogl debug] --cogl-debug=rectangles now outlines all cogl rectangles
This makes the #if 0'd debug code that was in _cogl_journal_flush_quad_batch
- which we have repeatedly found usefull for debugging various geometry
issues in Clutter apps - a runtime debug option.
The outline colors rotate in order from red to green to blue which can also
help confirm the order that your geometry really drawn.
The outlines are not affected by the current material state, so if you e.g.
have a blending bug where geometry mysteriously disappears this can confirm
if the underlying rectangles are actually being emitted but blending is
causing them to be invisible.
Robert Bragg [Fri, 17 Apr 2009 13:53:24 +0000 (14:53 +0100)]
Use $(MAINTAINER_CFLAGS) in clutter/{x11,glx}/Makefile.am
These makefile weren't resulting in the addition of the maintainer flags while
building clutter.
Bastian Winkler [Thu, 16 Apr 2009 11:06:58 +0000 (13:06 +0200)]
Prevent a possible zero division
A zero division might occur in clutter_path_get_position if the length
of a curved node is zero.
Signed-off-by: Neil Roberts <neil@linux.intel.com>
Chris Lord [Thu, 16 Apr 2009 15:34:15 +0000 (16:34 +0100)]
[ClutterText] Return 1 for min width when editable
Editable ClutterText will scroll when allocated less width than is
necessary to lay out the entire layout on a single line, so return 1 for
the minimum width in this case.
Approved by Emmanuele Bassi, fixes bug #1555.
Emmanuele Bassi [Wed, 15 Apr 2009 17:08:14 +0000 (18:08 +0100)]
Merge branch 'text-actor-layout-height'
* text-actor-layout-height:
[clutter-text] Fix ellipsizing
Support pango_layout_set_height() in ClutterText
Conflicts:
clutter/clutter-text.c
Emmanuele Bassi [Wed, 15 Apr 2009 16:27:04 +0000 (17:27 +0100)]
[stage] Warn if perspective's z_far - z_near is 0
Since we have to do (z_far - z_near) and use it in a division we
should check that the user is not passing a value that would
cause a division by zero.
Emmanuele Bassi [Wed, 15 Apr 2009 16:25:50 +0000 (17:25 +0100)]
Add debug annotations for the layout process
If we need to check that the layout sequence is correct in
terms of order of execution and with respect to caching, then
having a CLUTTER_DEBUG_LAYOUT debug flag would make things
easier.
Emmanuele Bassi [Wed, 15 Apr 2009 16:23:45 +0000 (17:23 +0100)]
[text] Do not ellipsize non-editable layouts
If a ClutterText is set as non-editable then its PangoLayout
will occupy as much width as its contents and ignore the
ellipsization setting.
Neil Roberts [Wed, 15 Apr 2009 13:46:45 +0000 (14:46 +0100)]
[clutter-text] Fix ellipsizing
Ellipsizing was effectively broken for two reasons. There was a typo
in the code to set the width so it always ended up being some massive
value. If no height should be set on the layout it was being set to
G_MAXINT. Setting a height greater than 0 enables wrapping which so
ellipsizing is not performed. It should be left at the default of -1
instead.
Emmanuele Bassi [Wed, 15 Apr 2009 11:18:55 +0000 (12:18 +0100)]
[json] Avoid leaks on error code paths
Bug 1476 - JSON Parser memory leak
Static analysis of the code showed that the in-tree copy of
the JsonParser object leaks objects and arrays on parse errors.
Thanks to Gordon Williams <gordon.williams@collabora.co.uk>
Øyvind Kolås [Wed, 8 Apr 2009 17:18:31 +0000 (18:18 +0100)]
[group] avoid double evaluation of arguments in clutter_group_add
clutter_group_add would evaluate the actor argument twice, which is
bad if this is a function call creating a new actor and not a variable.
Neil Roberts [Tue, 7 Apr 2009 14:24:48 +0000 (15:24 +0100)]
Fix fullscreening when the stage is unrealized and on dual-head
If the stage is unrealized (such as will be the case if the stage was
created with clutter_stage_new) then it would set the size of the
stage display but it was not setting the fullscreen_on_map flag so it
never got the _NET_WM_STATE_FULLSCREEN property. Now it always sets
the flag regardless of whether the window is created yet.
There was also problems with dual-headed displays because in that case
DisplayWidth/Height will return the size of the combined display but
Metacity (and presumably other WMs) will sensibly try fit the window
to only one of the monitors. However we were setting the size hints so
that the minimum size is that of the combined display. Metacity tries
to honour this by setting the minimum size but then it no longer
positions the window at the top left of the screen.
The patch makes it avoid setting the minimum size when the stage is
fullscreen by checking the fullscreen_on_map flag. This also means we
can remove the static was_resizable flag which would presumably have
caused problems for multi-stage.
Neil Roberts [Mon, 6 Apr 2009 14:22:31 +0000 (15:22 +0100)]
[clutter-text] Add a separate property for the selection color
Adds a new property so that the selection color can be different from
the cursor color. If no selection color is specified it will use the
cursor color as before. If no cursor color is specified either it will
use the text color.
Neil Roberts [Mon, 6 Apr 2009 11:43:16 +0000 (12:43 +0100)]
[cogl-handle] Fix the broken debug macros
The debug macros for tracking reference counting of CoglHandles had
some typos introduced in c3d9f0 which meant it failed to compile when
COGL_DEBUG is 1.
Robert Bragg [Sat, 4 Apr 2009 18:02:01 +0000 (19:02 +0100)]
[cogl] cogl_is_*(): Don't dereference an invalid handle; just return FALSE
An invalid handle is implicitly not of any type.
Neil Roberts [Mon, 6 Apr 2009 10:14:43 +0000 (11:14 +0100)]
[cogl-pango-render] Fix returning to default color after a color attribute
Since the Cogl material branch merge when changing the color of a part
using pango attributes (such as using <span color="red" /> markup)
then it wouldn't return to the default color for the rest of the
layout. pango_renderer_get_color returns NULL if there is no color
override in which case it needs to revert to the color specified as
the argument to cogl_pango_render_layout. The 'color' member of
CoglPangoRenderer has been reinstated to store that default color and
now cogl_pango_render_set_color_for_part is the only place that sets
the material color.
Emmanuele Bassi [Sun, 5 Apr 2009 19:32:15 +0000 (20:32 +0100)]
[animation] Do not connect to ::completed multiple times
The clutter_actor_animate*() family of functions should only connect
to the Animation::completed signal once, during the construction of
the Animation object attached to the Actor. Otherwise, the completed
signal handler will be run multiple times, and will try to unref()
the Animation for each call -- leading to a segmentation fault.
Emmanuele Bassi [Fri, 3 Apr 2009 13:19:20 +0000 (14:19 +0100)]
[animation] Add the ::started signal
The Animation class is missing a ::started signal matching the
::completed one. A ::started signal is useful for debugging,
initial state set up, and checks.
Emmanuele Bassi [Fri, 3 Apr 2009 12:36:30 +0000 (13:36 +0100)]
[group] Fix compilation
A case of rebase FAIL. The sorting of the children was still
done using the now removed group function call instead of the
Container one.
Emmanuele Bassi [Fri, 3 Apr 2009 11:39:35 +0000 (12:39 +0100)]
[animation] Do not unref on ::complete by default
Bug 1535 - Complete animation always unrefs ClutterAnimation (even
after g_object_ref_sink)
Animations created through clutter_animation_new() should not
automagically unref themselves by default on ::complete. We
only want that behaviour for Animations created by the
clutter_actor_animate* family of functions, since those provide
the automagic memory management.
Emmanuele Bassi [Wed, 1 Apr 2009 10:22:42 +0000 (11:22 +0100)]
[group] Remove long deprecated API
ClutterGroup still ships with API deprecated since 0.4. We did
promise to keep it around for a minor release cycle -- not for 3.
Since we plan on shipping 1.0 without the extra baggage of the
deprecated entry points, here's the chance to remove the accumulated
cruft.
All the removed methods and signals have a ClutterContainer
counterpart.
Emmanuele Bassi [Wed, 1 Apr 2009 10:08:28 +0000 (11:08 +0100)]
[shader] Remove deprecated set_uniform_1f()
Since we're planning to release 1.0 without any of the deprecated
API baggage, we can simply remove the set_uniform_1f() method from
ClutterShader public API and add it to the deprecated header.
Robert Bragg [Wed, 1 Apr 2009 16:16:44 +0000 (17:16 +0100)]
[cogl-handle] Optimize how we define cogl handles
The cogl_is_* functions were showing up quite high on profiles due to
iterating through arrays of cogl handles.
This does away with all the handle arrays and implements a simple struct
inheritance scheme. All cogl objects now add a CoglHandleObject _parent;
member to their main structures. The base object includes 2 members a.t.m; a
ref_count, and a klass pointer. The klass in turn gives you a type and
virtual function for freeing objects of that type.
Each handle type has a _cogl_##handle_type##_get_type () function
automatically defined which returns a GQuark of the handle type, so now
implementing the cogl_is_* funcs is just a case of comparing with
obj->klass->type.
Another outcome of the re-work is that cogl_handle_{ref,unref} are also much
more efficient, and no longer need extending for each handle type added to
cogl. The cogl_##handle_type##_{ref,unref} functions are now deprecated and
are no longer used internally to Clutter or Cogl. Potentially we can remove
them completely before 1.0.
Robert Bragg [Thu, 2 Apr 2009 10:50:44 +0000 (11:50 +0100)]
[cogl] handle_automatic_blend_enable(): consider layers with invalid textures
A layer object may be instantiated when setting a combine mode, but before a
texture is associated. (e.g. this is done by the pango renderer) if this is the
case we shouldn't call cogl_texture_get_format() with an invalid cogl handle.
This patch skips over layers without a texture handle when determining if any
textures have an alpha channel.
Robert Bragg [Mon, 30 Mar 2009 16:07:31 +0000 (17:07 +0100)]
Unifies 90% of the code in {gl,gles}/cogl.c in common/cogl.c
This code keeps on diverging and we get bugs and fixes in one version but
not the other. This should make things a bit more maintainable.
Robert Bragg [Mon, 30 Mar 2009 15:41:02 +0000 (16:41 +0100)]
Removes cogl_blend_func prototype from cogl-internal.h
cogl_blend_func was removed a while ago so this was just a left over from then
Bastian Winkler [Mon, 30 Mar 2009 15:38:42 +0000 (17:38 +0200)]
[docs] Fix some inconsistency in Animation
For some examples of clutter_actor_animate the parameters of @mode and
@duration are swapped.
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
Havoc Pennington [Mon, 30 Mar 2009 16:32:54 +0000 (17:32 +0100)]
[texture] Queue a relayout when changing :keep-aspect-ratio
Bug 1528 - queue relayout when setting ClutterTexture:keep-aspect-ratio
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
Raymond Liu [Mon, 30 Mar 2009 15:57:11 +0000 (16:57 +0100)]
[text] Use the base class binding pool
Bug 1518 - [Patch] Widget derivied from ClutterText will crash on
key_press_event
In clutter_text_key_press() we are using G_OBJECT_TYPE_NAME to find
out the actor's type name. However, if some widget is derived from
ClutterText, when the key press handler is called, G_OBJECT_TYPE_NAME
will return the name of the derived widget.
The default implementation should get the binding pool for the base
class.
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
Emmanuele Bassi [Mon, 30 Mar 2009 15:46:57 +0000 (16:46 +0100)]
[text] Different selection modes with multiple clicks
ClutterText should offer multiple selection modes depending on the
number of pointer clicks.
Following the GTK+ conventions:
- double click selects the current word
- triple click selects the current line
Øyvind Kolås [Mon, 30 Mar 2009 11:10:41 +0000 (12:10 +0100)]
[animation] add varargs support for signal::completed
Added support for registering a handler for the completed signal
directly amongst the varargs making it easier to attach code
to be executed when animations complete.
Emmanuele Bassi [Mon, 30 Mar 2009 06:54:42 +0000 (07:54 +0100)]
[text] Check text length in ::button-press-event
Bug 1529 - Selection bound out of sync with an empty Text actor
When the user clicks on a Text actor the cursor position and the
selection bound are set using bytes_to_offset(); if the Text is
empty, this means placing them both to 0. Setting the selection
bound to 0 means that when the user inserts a character by typing
it into the Text, the selection will be [0,1]; this will select
the first character, which will then be overwritten when typing
a new character.
The Text actor should, instead, check if there are no contents
and set the cursor position and the selection bound to -1.
The clutter_text_set_selection_bound() method should also validate
the value passed, in case it's bigger than the text lenght, or
smaller than -1.
Emmanuele Bassi [Fri, 27 Mar 2009 14:28:08 +0000 (14:28 +0000)]
[docs] Fix typo in the AnimationMode name
Chris Lord [Thu, 26 Mar 2009 20:28:04 +0000 (20:28 +0000)]
[ClutterTimeline] Fix clutter_timeline_set_delay
When setting a delay, timeout_add was being used with msecs. timeout_add
takes fps since the fix to bug #1495. Delay now uses g_timeout_add
instead.
Damien Lespiau [Wed, 25 Mar 2009 20:58:22 +0000 (20:58 +0000)]
[gitignore] Ignore two newly introduced tests
Neil Roberts [Wed, 25 Mar 2009 14:53:58 +0000 (14:53 +0000)]
[doc] Fix two small typos in cogl-vertex-buffer
The symbol name for cogl_vertex_buffer_draw_elements was wrong so it
ended up with no documentation. The name for the vertex attribute was
incorrect in cogl_vertex_buffer_add.
Robert Bragg [Mon, 23 Mar 2009 12:46:20 +0000 (12:46 +0000)]
[build] Fixes a cogl-vertex-buffer.c warning when building for GLES
GLES 1 doesn't support GLSL so it never needs to use the generic_index
variable for generic attributes which was flagging a warning.
Robert Bragg [Mon, 23 Mar 2009 12:29:15 +0000 (12:29 +0000)]
[cogl] Move rect and poly drawing code from cogl-texture.c to cogl-primitives.c
None of this code directly related to implementing CoglTextures, and the
code was needlessly duplicated between the GL and GLES backends. This moves
the cogl_rectangle* and cogl_polygon* code into common/cogl-primitives.c
makes which makes lot of sense since the two copies keep needlessly
diverging introducing or fixing bugs in one but not the other. For instance
I came accross one such bug regarding the enabling of texture units when
unifying the code.
Robert Bragg [Mon, 23 Mar 2009 11:39:40 +0000 (11:39 +0000)]
[cogl_rectangles] A minor doc fix, and missing newline between functions
The gtk-doc had a copy and paste error, saying the float array should be 8
elements per rectangle instead of 4. There was also no newline in the gles
code before the new function.
Johan Bilien [Fri, 20 Mar 2009 19:22:23 +0000 (19:22 +0000)]
Allow using array of vertices even without textures
It's often nice to be able to draw a batch of vertices, even if these
have no texture coordinates. This add a cogl_rectangles, similar to
cogl_rectangles_with_texture_coords, only without.
Robert Bragg [Thu, 19 Mar 2009 16:46:07 +0000 (16:46 +0000)]
Removes a hack in gles/cogl.c that was already fixed in gl/cogl.c
It removes the need to cast a CoglMatrix to a float * for transforming
a vertex manually instead of using cogl_matrix_transform_point.
Emmanuele Bassi [Thu, 19 Mar 2009 11:40:13 +0000 (11:40 +0000)]
[doc] Update the should_pick_paint() documentation
The should_pick_paint() method of ClutterActor is not clearly
documented.
Neil Roberts [Thu, 19 Mar 2009 17:54:17 +0000 (17:54 +0000)]
[glx-texture-pixmap] Don't enable the texture target when binding the texture
There's no need to enable the texture target unless it is going to be
used for rendering. Enabling it directly with glEnable calls confuses
Cogl's state caching.
This is a replacement for the patch in bug 1483 which was reverted.
Neil Roberts [Thu, 19 Mar 2009 17:48:15 +0000 (17:48 +0000)]
Revert "Use COGL to establish GL state for ClutterGLXTexturePixmap"
This reverts commit
f9d996a4603bef1f52e32e99f9f69a32b7c823ba.
The change from calling glBindTexture to using the material API with
cogl_material_flush_gl_state does not always work because it doesn't
necessarily leave the active texture unit as GL_TEXTURE0. For example,
if the previously rendered texture was multi-layered then the last
thing cogl_material_flush_gl_state will do is select GL_TEXTURE1 just
to disable it.
Øyvind Kolås [Thu, 19 Mar 2009 14:42:50 +0000 (14:42 +0000)]
[actor] use an epsilon whens sanity checking sizes
Clutter was complaining about netural width smaller than minimum widths
(differences around 0.0005) by using an epsilon value of 1e-4 for these
floating point comparisons, these warnings have now been silenced.
Emmanuele Bassi [Wed, 18 Mar 2009 17:07:50 +0000 (17:07 +0000)]
[docs] Remove unused arguments
The documentation for some X11TexturePixmap method does not reflect
the actual API.
Emmanuele Bassi [Wed, 18 Mar 2009 17:06:56 +0000 (17:06 +0000)]
[docs] Pick up backend-specific API
The various backend API outside from clutter-x11.h and clutter-win32.h
is documented but not picked up by gtk-doc.