Merge commit 'origin/master' into cogl-material

Conflicts:

	clutter/clutter-texture.c
	clutter/cogl/cogl-texture.h
	clutter/cogl/gles/cogl-context.c
	clutter/cogl/gles/cogl-context.h

doc/reference/clutter/Makefile.am

@@ -55,6 +55,7 @@ CFILE_GLOB=$(top_srcdir)/clutter/*.c
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
 IGNORE_HFILES=\
 	clutter.h \
+        clutter-bezier.h \
 	clutter-debug.h \
 	clutter-deprecated.h \
 	clutter-enum-types.h \

doc/reference/clutter/clutter-docs.xml

@@ -57,9 +57,8 @@
       <xi:include href="xml/clutter-rectangle.xml"/>
       <xi:include href="xml/clutter-texture.xml"/>
       <xi:include href="xml/clutter-clone-texture.xml"/>
+      <xi:include href="xml/clutter-text.xml"/>
       <xi:include href="xml/clutter-cairo-texture.xml"/>
-      <xi:include href="xml/clutter-label.xml"/>
-      <xi:include href="xml/clutter-entry.xml"/>
     </chapter>
 
     <chapter>

doc/reference/clutter/clutter-sections.txt

@@ -28,6 +28,7 @@ clutter_media_get_type
 <FILE>clutter-units</FILE>
 <TITLE>Unit conversion</TITLE>
 ClutterUnit
+CLUTTER_UNITS_FORMAT
 CLUTTER_UNITS_FROM_DEVICE
 CLUTTER_UNITS_TO_DEVICE
 CLUTTER_UNITS_FROM_FIXED
@@ -66,48 +67,6 @@ clutter_unit_get_type
 clutter_param_unit_get_type
 </SECTION>
 
-<SECTION>
-<FILE>clutter-label</FILE>
-<TITLE>ClutterLabel</TITLE>
-ClutterLabel
-ClutterLabelClass
-clutter_label_new
-clutter_label_new_with_text
-clutter_label_new_full
-clutter_label_set_text
-clutter_label_get_text
-clutter_label_set_font_name
-clutter_label_get_font_name
-clutter_label_set_color
-clutter_label_get_color
-clutter_label_set_ellipsize
-clutter_label_get_ellipsize
-clutter_label_set_line_wrap
-clutter_label_get_line_wrap
-clutter_label_set_line_wrap_mode
-clutter_label_get_line_wrap_mode
-clutter_label_get_layout
-clutter_label_set_attributes
-clutter_label_get_attributes
-clutter_label_set_use_markup
-clutter_label_get_use_markup
-clutter_label_set_alignment
-clutter_label_get_alignment
-clutter_label_get_justify
-clutter_label_set_justify
-
-<SUBSECTION Standard>
-CLUTTER_LABEL
-CLUTTER_IS_LABEL
-CLUTTER_TYPE_LABEL
-CLUTTER_LABEL_CLASS
-CLUTTER_IS_LABEL_CLASS
-CLUTTER_LABEL_GET_CLASS
-<SUBSECTION Private>
-ClutterLabelPrivate
-clutter_label_get_type
-</SECTION>
-
 <SECTION>
 <FILE>clutter-behaviour</FILE>
 <TITLE>ClutterBehaviour</TITLE>
@@ -476,6 +435,11 @@ clutter_actor_get_scalex
 clutter_actor_set_rotationx
 clutter_actor_get_rotationx
 
+<SUBSECTION>
+clutter_actor_grab_key_focus
+clutter_actor_get_pango_context
+clutter_actor_create_pango_context
+
 <SUBSECTION Standard>
 CLUTTER_TYPE_GEOMETRY
 CLUTTER_TYPE_ACTOR_BOX
@@ -698,6 +662,8 @@ ClutterPathCallback
 ClutterPathNodeType
 clutter_path_new
 clutter_path_new_with_description
+
+<SUBSECTION>
 clutter_path_add_move_to
 clutter_path_add_rel_move_to
 clutter_path_add_line_to
@@ -708,6 +674,8 @@ clutter_path_add_close
 clutter_path_add_string
 clutter_path_add_node
 clutter_path_add_cairo_path
+
+<SUBSECTION>
 clutter_path_get_n_nodes
 clutter_path_get_node
 clutter_path_get_nodes
@@ -736,11 +704,9 @@ CLUTTER_PATH_CLASS
 CLUTTER_IS_PATH
 CLUTTER_IS_PATH_CLASS
 CLUTTER_PATH_GET_CLASS
-CLUTTER_BEZIER_MAX_LENGTH
 CLUTTER_PATH_RELATIVE
 
 <SUBSECTION Private>
-ClutterBezier
 ClutterPathPrivate
 clutter_path_get_type
 clutter_path_node_get_type
@@ -869,14 +835,16 @@ clutter_behaviour_ellipse_get_type
 <FILE>clutter-backend</FILE>
 <TITLE>ClutterBackend</TITLE>
 clutter_get_default_backend
-clutter_backend_get_resolution
 clutter_backend_set_resolution
-clutter_backend_get_double_click_time
+clutter_backend_get_resolution
 clutter_backend_set_double_click_time
-clutter_backend_get_double_click_distance
+clutter_backend_get_double_click_time
 clutter_backend_set_double_click_distance
+clutter_backend_get_double_click_distance
 clutter_backend_set_font_options
 clutter_backend_get_font_options
+clutter_backend_set_font_name
+clutter_backend_get_font_name
 <SUBSECTION Standard>
 CLUTTER_BACKEND
 CLUTTER_IS_BACKEND
@@ -1219,50 +1187,6 @@ CLUTTER_COGL
 CLUTTER_NO_FPU
 </SECTION>
 
-<SECTION>
-<FILE>clutter-entry</FILE>
-<TITLE>ClutterEntry</TITLE>
-ClutterEntry
-ClutterEntryClass
-clutter_entry_new
-clutter_entry_new_with_text
-clutter_entry_new_full
-clutter_entry_set_text
-clutter_entry_get_text
-clutter_entry_set_font_name
-clutter_entry_get_font_name
-clutter_entry_set_color
-clutter_entry_get_color
-clutter_entry_get_layout
-clutter_entry_set_alignment
-clutter_entry_get_alignment
-clutter_entry_set_cursor_position
-clutter_entry_get_cursor_position
-clutter_entry_handle_key_event
-clutter_entry_insert_unichar
-clutter_entry_delete_chars
-clutter_entry_insert_text
-clutter_entry_delete_text
-clutter_entry_set_visible_cursor
-clutter_entry_get_visible_cursor
-clutter_entry_set_visibility
-clutter_entry_get_visibility
-clutter_entry_set_invisible_char
-clutter_entry_get_invisible_char
-clutter_entry_set_max_length
-clutter_entry_get_max_length
-<SUBSECTION Standard>
-CLUTTER_ENTRY
-CLUTTER_IS_ENTRY
-CLUTTER_TYPE_ENTRY
-CLUTTER_ENTRY_CLASS
-CLUTTER_IS_ENTRY_CLASS
-CLUTTER_ENTRY_GET_CLASS
-<SUBSECTION Private>
-ClutterEntryPrivate
-clutter_entry_get_type
-</SECTION>
-
 <SECTION>
 <FILE>clutter-effect</FILE>
 <TITLE>Clutter Effects</TITLE>
@@ -1533,23 +1457,25 @@ clutter_shader_release
 clutter_shader_is_compiled
 clutter_shader_set_is_enabled
 clutter_shader_get_is_enabled
-clutter_shader_set_uniform_1f
+
+<SUBSECTION>
 clutter_shader_set_uniform
 clutter_shader_get_cogl_program
 clutter_shader_get_cogl_fragment_shader
 clutter_shader_get_cogl_vertex_shader
+clutter_shader_set_uniform_1f
 
 <SUBSECTION>
-CLUTTER_VALUE_HOLDS_SHADER_FLOAT
 ClutterShaderFloat
+CLUTTER_VALUE_HOLDS_SHADER_FLOAT
 clutter_value_set_shader_float
 clutter_value_get_shader_float
-CLUTTER_VALUE_HOLDS_SHADER_INT
 ClutterShaderInt
+CLUTTER_VALUE_HOLDS_SHADER_INT
 clutter_value_set_shader_int
 clutter_value_get_shader_int
-CLUTTER_VALUE_HOLDS_SHADER_MATRIX
 ClutterShaderMatrix
+CLUTTER_VALUE_HOLDS_SHADER_MATRIX
 clutter_value_set_shader_matrix
 clutter_value_get_shader_matrix
 
@@ -1638,8 +1564,8 @@ clutter_interval_set_interval
 clutter_interval_get_interval
 
 <SUBSECTION>
-clutter_interval_validate
 clutter_interval_compute_value
+clutter_interval_validate
 
 <SUBSECTION Standard>
 CLUTTER_TYPE_INTERVAL
@@ -1655,32 +1581,8 @@ clutter_interval_get_type
 </SECTION>
 
 <SECTION>
-<TITLE>Key Bindings</TITLE>
-<FILE>clutter-binding-pool</FILE>
-ClutterBindingPool
-ClutterBindingActionFunc
-
-<SUBSECTION>
-clutter_binding_pool_new
-clutter_binding_pool_get_for_class
-clutter_binding_pool_find
-
-<SUBSECTION>
-clutter_binding_pool_install_action
-clutter_binding_pool_install_closure
-clutter_binding_pool_list_actions
-clutter_binding_pool_find_action
-clutter_binding_pool_remove_action
-clutter_binding_pool_block_action
-clutter_binding_pool_unblock_action
-
-<SUBSECTION>
-clutter_binding_pool_activate
-</SECTION>
-
-<SECTION>
-<TITLE>ClutterCairoTexture</TITLE>
 <FILE>clutter-cairo-texture</FILE>
+<TITLE>ClutterCairoTexture</TITLE>
 ClutterCairoTexture
 ClutterCairoTextureClass
 clutter_cairo_texture_new
@@ -1706,3 +1608,107 @@ CLUTTER_CAIRO_TEXTURE_GET_CLASS
 ClutterCairoTexturePrivate
 clutter_cairo_texture_get_type
 </SECTION>
+
+<SECTION>
+<TITLE>ClutterText</TITLE>
+<FILE>clutter-text</FILE>
+ClutterText
+ClutterTextClass
+clutter_text_new
+clutter_text_new_full
+clutter_text_new_with_text
+
+<SUBSECTION>
+clutter_text_set_text
+clutter_text_get_text
+clutter_text_set_activatable
+clutter_text_get_activatable
+clutter_text_set_alignment
+clutter_text_get_alignment
+clutter_text_set_attributes
+clutter_text_get_attributes
+clutter_text_set_color
+clutter_text_get_color
+clutter_text_set_ellipsize
+clutter_text_get_ellipsize
+clutter_text_set_font_name
+clutter_text_get_font_name
+clutter_text_set_password_char
+clutter_text_get_password_char
+clutter_text_set_justify
+clutter_text_get_justify
+clutter_text_get_layout
+clutter_text_set_line_wrap
+clutter_text_get_line_wrap
+clutter_text_set_line_wrap_mode
+clutter_text_get_line_wrap_mode
+clutter_text_set_max_length
+clutter_text_get_max_length
+clutter_text_set_selectable
+clutter_text_get_selectable
+clutter_text_set_selection
+clutter_text_get_selection
+clutter_text_set_selection_bound
+clutter_text_get_selection_bound
+clutter_text_set_single_line_mode
+clutter_text_get_single_line_mode
+clutter_text_set_use_markup
+clutter_text_get_use_markup
+
+<SUBSECTION>
+clutter_text_set_editable
+clutter_text_get_editable
+clutter_text_insert_text
+clutter_text_insert_unichar
+clutter_text_delete_chars
+clutter_text_delete_text
+clutter_text_get_chars
+clutter_text_set_cursor_color
+clutter_text_get_cursor_color
+clutter_text_set_cursor_position
+clutter_text_get_cursor_position
+clutter_text_set_cursor_visible
+clutter_text_get_cursor_visible
+clutter_text_set_cursor_size
+clutter_text_get_cursor_size
+
+<SUBSECTION>
+clutter_text_activate
+
+<SUBSECTION Standard>
+CLUTTER_IS_TEXT
+CLUTTER_IS_TEXT_CLASS
+CLUTTER_TEXT
+CLUTTER_TEXT_CLASS
+CLUTTER_TEXT_GET_CLASS
+CLUTTER_TYPE_TEXT
+
+<SUBSECTION Private>
+ClutterTextPrivate
+clutter_text_get_type
+</SECTION>
+
+<SECTION>
+<TITLE>Key Bindings</TITLE>
+<FILE>clutter-binding-pool</FILE>
+ClutterBindingPool
+ClutterBindingActionFunc
+
+<SUBSECTION>
+clutter_binding_pool_new
+clutter_binding_pool_get_for_class
+clutter_binding_pool_find
+
+<SUBSECTION>
+clutter_binding_pool_install_action
+clutter_binding_pool_install_closure
+clutter_binding_pool_override_action
+clutter_binding_pool_override_closure
+clutter_binding_pool_find_action
+clutter_binding_pool_remove_action
+clutter_binding_pool_block_action
+clutter_binding_pool_unblock_action
+
+<SUBSECTION>
+clutter_binding_pool_activate
+</SECTION>

doc/reference/clutter/clutter.types

@@ -6,7 +6,6 @@ clutter_stage_get_type
 clutter_rectangle_get_type
 clutter_texture_get_type
 clutter_clone_texture_get_type
-clutter_label_get_type
 clutter_timeline_get_type
 clutter_media_get_type
 clutter_behaviour_get_type
@@ -19,7 +18,6 @@ clutter_path_get_type
 clutter_behaviour_rotate_get_type
 clutter_behaviour_scale_get_type
 clutter_backend_get_type
-clutter_entry_get_type
 clutter_script_get_type
 clutter_scriptable_get_type
 clutter_model_get_type
@@ -29,3 +27,4 @@ clutter_score_get_type
 clutter_shader_get_type
 clutter_child_meta_get_type
 clutter_cairo_texture_get_type
+clutter_text_get_type

doc/reference/cogl/cogl-sections.txt

@@ -120,6 +120,7 @@ cogl_texture_set_region
 cogl_texture_ref
 cogl_texture_unref
 cogl_texture_rectangle
+cogl_texture_multiple_rectangles
 cogl_texture_polygon
 </SECTION>