brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25a7435a86
mutter/clutter/clutter-text.c

5517 lines
151 KiB
C
Raw Normal View History

Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
/*
* Clutter.
*
* An OpenGL based 'interactive canvas' library.
*
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
* Copyright (C) 2008 Intel Corporation.
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
*
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
* Authored By: Øyvind Kolås <pippin@o-hand.com>
* Emmanuele Bassi <ebassi@linux.intel.com>
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
*/
Fix documentation issues Provide a description for the ClutterText section, and fix some misnamed arguments inside the header file.
2008-12-11 15:00:22 +00:00
/**
* SECTION:clutter-text
* @short_description: An actor for displaying and editing text
*
* #ClutterText is an actor that displays custom text using Pango
* as the text rendering engine.
*
* #ClutterText also allows inline editing of the text if the
* actor is set editable using clutter_text_set_editable().
*
* Selection using keyboard or pointers can be enabled using
* clutter_text_set_selectable().
*
* #ClutterText is available since Clutter 1.0
*/
Whitespace fixes
2009-01-05 15:26:57 +00:00
/* TODO: undo/redo hooks? */
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <string.h>
Clean up clutter-private.h/6 Move all Actor private API to a separate file.
2010-10-21 11:16:05 +00:00
#include <math.h>
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
#include "clutter-text.h"
Use internal headers Since ClutterText is part of Clutter, it can use the internal and private headers instead of the catch-all clutter.h.
2008-12-11 11:15:11 +00:00
Clean up clutter-private.h/6 Move all Actor private API to a separate file.
2010-10-21 11:16:05 +00:00
#include "clutter-actor-private.h"
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
#include "clutter-binding-pool.h"
#include "clutter-debug.h"
#include "clutter-enum-types.h"
Group all the integer private fields Integer fields using the ": <bits>" notation should be packed together so that the compiler can optimize the structure size correctly.
2008-12-11 11:15:56 +00:00
#include "clutter-keysyms.h"
Use internal headers Since ClutterText is part of Clutter, it can use the internal and private headers instead of the catch-all clutter.h.
2008-12-11 11:15:11 +00:00
#include "clutter-main.h"
profile: Add profiling points for Text Add a static timer for the text layout code, and two counters for the layout cache hit and miss conditions.
2010-04-22 16:54:05 +00:00
#include "clutter-marshal.h"
Fix include location for cogl-pango.h In Cogl, cogl-pango.h has moved to <cogl-pango/cogl-pango.h>. When using the experimental 2.0 API (which Clutter does) it is no longer possible to include it under the old name of <cogl/cogl-pango.h> so we need to update the include location.
2011-05-16 15:04:27 +00:00
#include "clutter-private.h" /* includes <cogl-pango/cogl-pango.h> */
profile: Add profiling points for Text Add a static timer for the text layout code, and two counters for the layout cache hit and miss conditions.
2010-04-22 16:54:05 +00:00
#include "clutter-profile.h"
Use internal headers Since ClutterText is part of Clutter, it can use the internal and private headers instead of the catch-all clutter.h.
2008-12-11 11:15:11 +00:00
#include "clutter-units.h"
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
#include "clutter-paint-volume-private.h"
Use internal headers Since ClutterText is part of Clutter, it can use the internal and private headers instead of the catch-all clutter.h.
2008-12-11 11:15:11 +00:00
Use units in position_to_coords() We loose precision with a direct conversion for PangoUnits to pixels, so we should do the conversion as needed, inside the callers of clutter_text_position_to_coords().
2008-12-15 18:24:42 +00:00
/* cursor width in pixels */
#define DEFAULT_CURSOR_SIZE 2
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
/* We need at least three cached layouts to run the allocation without
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
* regenerating a new layout. First the layout will be generated at
* full width to get the preferred width, then it will be generated at
* the preferred width to get the preferred height and then it might
* be regenerated at a different width to get the height for the
* actual allocated width
text: Increase the size of the Layout cache Currently, each ClutterText caches 3 Pango layouts: » one for the preferred, unbounded width » one for the preferred height for a given width » one for the allocated size Some layout managers do a double pass that could flush the whole cache before it has a chance of actually storing relevant data, resulting in a continuous series of misses. We can try to counteract this by doubling the size of the cache, from three slots to six. More than six would be pointless, as well as too memory consuming; but we might get down to a number between 3 and 6 at any later point.
2010-04-16 10:11:50 +00:00
*
* since we might get multiple queries from layout managers doing a
* double-pass allocations, like tabular ones, we should use 6 slots
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
*/
text: Increase the size of the Layout cache Currently, each ClutterText caches 3 Pango layouts: » one for the preferred, unbounded width » one for the preferred height for a given width » one for the allocated size Some layout managers do a double pass that could flush the whole cache before it has a chance of actually storing relevant data, resulting in a continuous series of misses. We can try to counteract this by doubling the size of the cache, from three slots to six. More than six would be pointless, as well as too memory consuming; but we might get down to a number between 3 and 6 at any later point.
2010-04-16 10:11:50 +00:00
#define N_CACHED_LAYOUTS 6
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
#define CLUTTER_TEXT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_TEXT, ClutterTextPrivate))
typedef struct _LayoutCache LayoutCache;
[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.
2009-04-06 14:22:31 +00:00
static const ClutterColor default_cursor_color = { 0, 0, 0, 255 };
static const ClutterColor default_selection_color = { 0, 0, 0, 255 };
static const ClutterColor default_text_color = { 0, 0, 0, 255 };
clutter-text: Add a selected-text-color http://bugzilla.clutter-project.org/show_bug.cgi?id=2595
2011-03-02 17:02:56 +00:00
static const ClutterColor default_selected_text_color = { 0, 0, 0, 255 };
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
G_DEFINE_TYPE (ClutterText, clutter_text, CLUTTER_TYPE_ACTOR);
struct _LayoutCache
{
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
/* Cached layout. Pango internally caches the computed extents
* when they are requested so there is no need to cache that as
* well
*/
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
PangoLayout *layout;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
/* A number representing the age of this cache (so that when a
* new layout is needed the last used cache is replaced)
*/
Support pango_layout_set_height() in ClutterText This is the port of the patch attached to bug 1266: ClutterLabel support for pango_layout_set_height() to the ClutterText actor. This patch adds support for the pango_layout_set_height() function inside the layout creation and caching, so that setting the height of a ClutterText will make PangoLayout try to fill out the given height before ellipsizing the contents of the ClutterText actor. The original patch is from Havoc Pennington. This commit ports the patch to ClutterText and applies a small change to the height computation pointed out by Behdad Esfahbod on GNOME's Bugzilla: http://bugzilla.gnome.org/show_bug.cgi?id=560931 That the layout heights when doing a size request should be set to be G_MAXINT instead of -1. Unfortunately, the patch seems to break the conformance suite when setting the ellipsization on the layout.
2008-12-16 14:02:05 +00:00
guint age;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
};
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
struct _ClutterTextPrivate
{
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
PangoFontDescription *font_desc;
text: Do not set the markup unconditionally When setting :use-markup we always pass the contents of the Text actor to clutter_text_set_markup_internal(); if string contains any markup, this ends up being parsed and used - even when :use-markup is set to FALSE. http://bugzilla.clutter-project.org/show_bug.cgi?id=2239
2010-08-06 16:04:37 +00:00
/* the displayed text */
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
gchar *text;
text: Do not set the markup unconditionally When setting :use-markup we always pass the contents of the Text actor to clutter_text_set_markup_internal(); if string contains any markup, this ends up being parsed and used - even when :use-markup is set to FALSE. http://bugzilla.clutter-project.org/show_bug.cgi?id=2239
2010-08-06 16:04:37 +00:00
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
gchar *font_name;
text: Do not set the markup unconditionally When setting :use-markup we always pass the contents of the Text actor to clutter_text_set_markup_internal(); if string contains any markup, this ends up being parsed and used - even when :use-markup is set to FALSE. http://bugzilla.clutter-project.org/show_bug.cgi?id=2239
2010-08-06 16:04:37 +00:00
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
gchar *preedit_str;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
ClutterColor text_color;
LayoutCache cached_layouts[N_CACHED_LAYOUTS];
guint cache_age;
text: Store the markup attributes separately Previously when the markup property is set it would generate an attribute list from the markup and then merge it with the attributes from the attribute property and store it as the effective attributes. The markup attributes and the marked up text would then be forgotten. This breaks if the application then later changes the attributes property because it would try to regenerate the effective attributes from the markup text but the stored text no longer contains any markup. If the original markup text happened to contain entities like '&lt;' they would end up causing parse errors because they would be converted to the actual symbols. To fix this the attributes from the markup are now stored independently from the effective attributes. The effective attributes are now regenerated if either set of attributes changes right before a layout is created. http://bugzilla.openedhand.com/show_bug.cgi?id=1940
2010-01-05 11:58:12 +00:00
/* These are the attributes set by the attributes property */
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
PangoAttrList *attrs;
text: Store the markup attributes separately Previously when the markup property is set it would generate an attribute list from the markup and then merge it with the attributes from the attribute property and store it as the effective attributes. The markup attributes and the marked up text would then be forgotten. This breaks if the application then later changes the attributes property because it would try to regenerate the effective attributes from the markup text but the stored text no longer contains any markup. If the original markup text happened to contain entities like '&lt;' they would end up causing parse errors because they would be converted to the actual symbols. To fix this the attributes from the markup are now stored independently from the effective attributes. The effective attributes are now regenerated if either set of attributes changes right before a layout is created. http://bugzilla.openedhand.com/show_bug.cgi?id=1940
2010-01-05 11:58:12 +00:00
/* These are the attributes derived from the text when the
use-markup property is set */
PangoAttrList *markup_attrs;
/* This is the combination of the above two lists. It is set to NULL
whenever either of them changes and then regenerated by merging
the two lists whenever a layout is needed */
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
PangoAttrList *effective_attrs;
text: Store the markup attributes separately Previously when the markup property is set it would generate an attribute list from the markup and then merge it with the attributes from the attribute property and store it as the effective attributes. The markup attributes and the marked up text would then be forgotten. This breaks if the application then later changes the attributes property because it would try to regenerate the effective attributes from the markup text but the stored text no longer contains any markup. If the original markup text happened to contain entities like '&lt;' they would end up causing parse errors because they would be converted to the actual symbols. To fix this the attributes from the markup are now stored independently from the effective attributes. The effective attributes are now regenerated if either set of attributes changes right before a layout is created. http://bugzilla.openedhand.com/show_bug.cgi?id=1940
2010-01-05 11:58:12 +00:00
/* These are the attributes for the preedit string. These are merged
with the effective attributes into a temporary list before
creating a layout */
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
PangoAttrList *preedit_attrs;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
[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.
2009-04-06 14:22:31 +00:00
guint alignment : 2;
guint wrap : 1;
guint use_underline : 1;
guint use_markup : 1;
guint ellipsize : 3;
guint single_line_mode : 1;
guint wrap_mode : 3;
guint justify : 1;
guint editable : 1;
guint cursor_visible : 1;
guint activatable : 1;
guint selectable : 1;
guint selection_color_set : 1;
guint in_select_drag : 1;
guint cursor_color_set : 1;
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
guint preedit_set : 1;
text: Update actors using the default font If a ClutterText actor is using the default font from the backend then we should track font name changes and update it accordingly. This only applies to ClutterText actors with the :font-name property unset or explicitly set to NULL.
2010-06-26 14:49:15 +00:00
guint is_default_font : 1;
text: Only paint cursor if we have key focus If a Text actor does not have key focus then there's no point in showing the cursor at all.
2010-12-21 10:50:24 +00:00
guint has_focus : 1;
clutter-text: Add a selected-text-color http://bugzilla.clutter-project.org/show_bug.cgi?id=2595
2011-03-02 17:02:56 +00:00
guint selected_text_color_set : 1;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
/* current cursor position */
gint position;
/* current 'other end of selection' position */
gint selection_bound;
Comments and whitespace fixes to ClutterText
2009-01-07 00:43:24 +00:00
/* the x position in the PangoLayout, used to
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
* avoid drifting when repeatedly moving up|down
*/
Correctly initialize the initial state of ClutterText Some of the values in ClutterText have an initial state that does not match a zero-ed out ClutterTextPrivate structure.
2008-12-11 11:35:52 +00:00
gint x_pos;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
Comments and whitespace fixes to ClutterText
2009-01-07 00:43:24 +00:00
/* the x position of the PangoLayout when in
* single line mode, to scroll the contents of the
* text actor
*/
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
gint text_x;
clutter-text: new clutter_text_get_layout_offsets API This new function can be used to retrieve the coordinates where the ClutterText will draw the PangoLayout representing the text. http://bugzilla.clutter-project.org/show_bug.cgi?id=2553
2011-02-04 11:33:53 +00:00
/* the y position of the PangoLayout, fixed to 0 by
* default for now */
gint text_y;
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
/* the length of the text, in bytes */
gint n_bytes;
/* the length of the text, in characters */
gint n_chars;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
/* Where to draw the cursor */
ClutterGeometry cursor_pos;
ClutterColor cursor_color;
Add :cursor-size property to ClutterText We can control the width of the cursor when painting by using a simple property. The magic -1 number passed to the setter method will reset the cursor size to the default one of 2px. The getter method will return an unsigned integer with the current size.
2008-12-16 10:37:45 +00:00
guint cursor_size;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
/* Box representing the paint volume. The box is lazily calculated
and cached */
ClutterPaintVolume paint_volume;
gboolean paint_volume_valid;
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
guint preedit_cursor_pos;
gint preedit_n_chars;
[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.
2009-04-06 14:22:31 +00:00
ClutterColor selection_color;
clutter-text: Add a selected-text-color http://bugzilla.clutter-project.org/show_bug.cgi?id=2595
2011-03-02 17:02:56 +00:00
ClutterColor selected_text_color;
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
gint max_length;
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
gunichar password_char;
Listen for the font-changed signal on the backend in ClutterText Whenever a ClutterText is created it now connects to the font-changed signal. When it is emitted the layout cache is dirtied and a relayout is queued. That way changes to the font options or resolution will cause an immediate update to the labels in the scene.
2009-01-27 16:47:20 +00:00
/* Signal handler for when the backend changes its font settings */
guint font_changed_id;
text: Dirty layout cache on text direction changes When the text direction changes we should evict the cached layouts to avoid stale entries in case the direction change produces a layout with the same size.
2009-11-10 12:18:32 +00:00
/* Signal handler for when the :text-direction changes */
guint direction_changed_id;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
};
enum
{
PROP_0,
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
PROP_FONT_NAME,
text: Add :font-description High level toolkits might wish to construct a PangoFontDescription and then set it directly on a ClutterText actor proxy or sub-class. ClutterText should have a :font-description property to set (and get) the PangoFontDescription. http://bugzilla.openedhand.com/show_bug.cgi?id=1960
2010-02-03 14:35:45 +00:00
PROP_FONT_DESCRIPTION,
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
PROP_TEXT,
PROP_COLOR,
PROP_USE_MARKUP,
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
PROP_ATTRIBUTES,
[text] Rename :alignment to :line-alignment The :alignment property is prone to generate confusion: developers will set it thinking that the contents of a ClutterText will automagically align themselves. Instead of using the generic term :alignment, and following the GTK+ convention, we should use a more specific term, conveying the actual effect of the property: alignment of the lines with respect to each other, and not to the overall allocated area. See bug 1428: http://bugzilla.openedhand.com/show_bug.cgi?id=1428
2009-02-02 23:55:30 +00:00
PROP_LINE_ALIGNMENT,
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
PROP_LINE_WRAP,
PROP_LINE_WRAP_MODE,
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
PROP_JUSTIFY,
PROP_ELLIPSIZE,
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
PROP_POSITION,
PROP_SELECTION_BOUND,
[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.
2009-04-06 14:22:31 +00:00
PROP_SELECTION_COLOR,
PROP_SELECTION_COLOR_SET,
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
PROP_CURSOR_VISIBLE,
PROP_CURSOR_COLOR,
PROP_CURSOR_COLOR_SET,
Add :cursor-size property to ClutterText We can control the width of the cursor when painting by using a simple property. The magic -1 number passed to the setter method will reset the cursor size to the default one of 2px. The getter method will return an unsigned integer with the current size.
2008-12-16 10:37:45 +00:00
PROP_CURSOR_SIZE,
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
PROP_EDITABLE,
PROP_SELECTABLE,
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
PROP_ACTIVATABLE,
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
PROP_PASSWORD_CHAR,
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
PROP_MAX_LENGTH,
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
PROP_SINGLE_LINE_MODE,
clutter-text: Add a selected-text-color http://bugzilla.clutter-project.org/show_bug.cgi?id=2595
2011-03-02 17:02:56 +00:00
PROP_SELECTED_TEXT_COLOR,
PROP_SELECTED_TEXT_COLOR_SET,
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
PROP_LAST
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
};
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
static GParamSpec *obj_props[PROP_LAST];
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
enum
{
TEXT_CHANGED,
CURSOR_EVENT,
ACTIVATE,
Added ClutterText::insert-text and ClutterText::delete-text signals * clutter/clutter-marshal.list: added new marshaller * clutter/clutter-text.c (clutter_text_class_init): added insert-text and delete-text signals (clutter_text_insert_unichar): emits insert-text signal (clutter_text_insert_text): emits insert-text signal (clutter_text_delete_text): emits delete-text signal (clutter_text_delete_chars): emits delete-text signal (clutter_text_set_markup_internal): emits delete-text and insert-text signals (clutter_text_set_text): emits delete-text and insert-text signals http://bugzilla.openedhand.com/show_bug.cgi?id=1894
2009-11-20 14:17:41 +00:00
INSERT_TEXT,
DELETE_TEXT,
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
LAST_SIGNAL
};
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
static guint text_signals[LAST_SIGNAL] = { 0, };
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Listen for the font-changed signal on the backend in ClutterText Whenever a ClutterText is created it now connects to the font-changed signal. When it is emitted the layout cache is dirtied and a relayout is queued. That way changes to the font options or resolution will cause an immediate update to the labels in the scene.
2009-01-27 16:47:20 +00:00
static void clutter_text_font_changed_cb (ClutterText *text);
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
static void
clutter_text_dirty_paint_volume (ClutterText *text)
{
ClutterTextPrivate *priv = text->priv;
if (priv->paint_volume_valid)
{
clutter_paint_volume_free (&priv->paint_volume);
priv->paint_volume_valid = FALSE;
}
}
static void
clutter_text_queue_redraw (ClutterActor *self)
{
/* This is a wrapper for clutter_actor_queue_redraw that also
dirties the cached paint volume. It would be nice if we could
just override the default implementation of the queue redraw
signal to do this instead but that doesn't work because the
signal isn't immediately emitted when queue_redraw is called.
Clutter will however immediately call get_paint_volume when
queue_redraw is called so we do need to dirty it immediately. */
clutter_text_dirty_paint_volume (CLUTTER_TEXT (self));
clutter_actor_queue_redraw (self);
}
#define clutter_actor_queue_redraw \
Please_use_clutter_text_queue_redraw_instead
Comments and whitespace fixes to ClutterText
2009-01-07 00:43:24 +00:00
#define offset_real(t,p) ((p) == -1 ? g_utf8_strlen ((t), -1) : (p))
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Replace offset_to_bytes() implementation We should re-use the offset_to_bytes() implementation from ClutterEntry as it guaranteed some behaviour and sanity checks that we want to keep inside ClutterText.
2008-12-11 11:47:06 +00:00
static gint
offset_to_bytes (const gchar *text,
gint pos)
{
[clutter-text] Fix offset_to_bytes to work when pos == 0 The old function ended up returning the length of the string when pos was zero. This caused it to insert characters at the end when the cursor was at the beginning of the string.
2009-01-13 18:42:50 +00:00
const gchar *ptr;
Replace offset_to_bytes() implementation We should re-use the offset_to_bytes() implementation from ClutterEntry as it guaranteed some behaviour and sanity checks that we want to keep inside ClutterText.
2008-12-11 11:47:06 +00:00
if (pos < 0)
return strlen (text);
[clutter-text] Fix offset_to_bytes to work when pos == 0 The old function ended up returning the length of the string when pos was zero. This caused it to insert characters at the end when the cursor was at the beginning of the string.
2009-01-13 18:42:50 +00:00
/* Loop over each character in the string until we either reach the
end or the requested position */
for (ptr = text; *ptr && pos-- > 0; ptr = g_utf8_next_char (ptr));
return ptr - text;
Replace offset_to_bytes() implementation We should re-use the offset_to_bytes() implementation from ClutterEntry as it guaranteed some behaviour and sanity checks that we want to keep inside ClutterText.
2008-12-11 11:47:06 +00:00
}
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Comments and whitespace fixes to ClutterText
2009-01-07 00:43:24 +00:00
#define bytes_to_offset(t,p) (g_utf8_pointer_to_offset ((t), (t) + (p)))
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
static inline void
clutter_text_clear_selection (ClutterText *self)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
ClutterTextPrivate *priv = self->priv;
[text] Queue a redraw when the selection is cleared If you select all the text in a ClutterText, there is an invisible cursor position either at the beginning or end. If it's at the beginning, the bug is that left arrow won't clear the selection. If it's at the end, the bug is that the right arrow won't. Here are the ways to reproduce it: a. Ctrl-A selects all and moves the hidden cursor position to the left. b. For single line: End, Shift-Home does the same. c. Or manually moving to the end and doing Shift-Left Arrow to the beginning. These all put it in the state where right arrow will properly clear selection and move to cursor position 1, but left arrow fails to clear the selection. For b and c above, the opposite will give you the end case where right arrow doesn't work. Anyway, it turns out clear_selection is getting called, it just doesn't show up because it's not doing a queue_redraw. So the attached patch seems to fix things. Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-07-23 17:21:10 +00:00
if (priv->selection_bound != priv->position)
{
priv->selection_bound = priv->position;
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SELECTION_BOUND]);
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
clutter_text_queue_redraw (CLUTTER_ACTOR (self));
[text] Queue a redraw when the selection is cleared If you select all the text in a ClutterText, there is an invisible cursor position either at the beginning or end. If it's at the beginning, the bug is that left arrow won't clear the selection. If it's at the end, the bug is that the right arrow won't. Here are the ways to reproduce it: a. Ctrl-A selects all and moves the hidden cursor position to the left. b. For single line: End, Shift-Home does the same. c. Or manually moving to the end and doing Shift-Left Arrow to the beginning. These all put it in the state where right arrow will properly clear selection and move to cursor position 1, but left arrow fails to clear the selection. For b and c above, the opposite will give you the end case where right arrow doesn't work. Anyway, it turns out clear_selection is getting called, it just doesn't show up because it's not doing a queue_redraw. So the attached patch seems to fix things. Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-07-23 17:21:10 +00:00
}
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
}
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
static gchar *
clutter_text_get_display_text (ClutterText *self)
{
ClutterTextPrivate *priv = self->priv;
if (priv->text == NULL)
return g_strdup ("");
if (G_LIKELY (priv->password_char == 0))
return g_strndup (priv->text, priv->n_bytes);
else
{
GString *str = g_string_sized_new (priv->n_bytes);
gunichar invisible_char;
gchar buf[7];
gint char_len, i;
invisible_char = priv->password_char;
/* we need to convert the string built of invisible
* characters into UTF-8 for it to be fed to the Pango
* layout
*/
memset (buf, 0, sizeof (buf));
char_len = g_unichar_to_utf8 (invisible_char, buf);
for (i = 0; i < priv->n_chars; i++)
g_string_append_len (str, buf, char_len);
return g_string_free (str, FALSE);
}
}
text: Store the markup attributes separately Previously when the markup property is set it would generate an attribute list from the markup and then merge it with the attributes from the attribute property and store it as the effective attributes. The markup attributes and the marked up text would then be forgotten. This breaks if the application then later changes the attributes property because it would try to regenerate the effective attributes from the markup text but the stored text no longer contains any markup. If the original markup text happened to contain entities like '&lt;' they would end up causing parse errors because they would be converted to the actual symbols. To fix this the attributes from the markup are now stored independently from the effective attributes. The effective attributes are now regenerated if either set of attributes changes right before a layout is created. http://bugzilla.openedhand.com/show_bug.cgi?id=1940
2010-01-05 11:58:12 +00:00
static void
clutter_text_ensure_effective_attributes (ClutterText *self)
{
ClutterTextPrivate *priv = self->priv;
/* If we already have the effective attributes then we don't need to
do anything */
if (priv->effective_attrs == NULL)
{
text: Do not set the markup unconditionally When setting :use-markup we always pass the contents of the Text actor to clutter_text_set_markup_internal(); if string contains any markup, this ends up being parsed and used - even when :use-markup is set to FALSE. http://bugzilla.clutter-project.org/show_bug.cgi?id=2239
2010-08-06 16:04:37 +00:00
if (priv->attrs != NULL)
text: Store the markup attributes separately Previously when the markup property is set it would generate an attribute list from the markup and then merge it with the attributes from the attribute property and store it as the effective attributes. The markup attributes and the marked up text would then be forgotten. This breaks if the application then later changes the attributes property because it would try to regenerate the effective attributes from the markup text but the stored text no longer contains any markup. If the original markup text happened to contain entities like '&lt;' they would end up causing parse errors because they would be converted to the actual symbols. To fix this the attributes from the markup are now stored independently from the effective attributes. The effective attributes are now regenerated if either set of attributes changes right before a layout is created. http://bugzilla.openedhand.com/show_bug.cgi?id=1940
2010-01-05 11:58:12 +00:00
{
/* If there are no markup attributes then we can just use
these attributes directly */
if (priv->markup_attrs == NULL)
priv->effective_attrs = pango_attr_list_ref (priv->attrs);
else
{
/* Otherwise we need to merge the two lists */
PangoAttrIterator *iter;
GSList *attributes, *l;
priv->effective_attrs = pango_attr_list_copy (priv->markup_attrs);
iter = pango_attr_list_get_iterator (priv->attrs);
do
{
attributes = pango_attr_iterator_get_attrs (iter);
for (l = attributes; l != NULL; l = l->next)
{
PangoAttribute *attr = l->data;
pango_attr_list_insert (priv->effective_attrs, attr);
}
g_slist_free (attributes);
}
while (pango_attr_iterator_next (iter));
}
}
text: Do not set the markup unconditionally When setting :use-markup we always pass the contents of the Text actor to clutter_text_set_markup_internal(); if string contains any markup, this ends up being parsed and used - even when :use-markup is set to FALSE. http://bugzilla.clutter-project.org/show_bug.cgi?id=2239
2010-08-06 16:04:37 +00:00
else if (priv->markup_attrs != NULL)
{
/* We can just use the markup attributes directly */
priv->effective_attrs = pango_attr_list_ref (priv->markup_attrs);
}
text: Store the markup attributes separately Previously when the markup property is set it would generate an attribute list from the markup and then merge it with the attributes from the attribute property and store it as the effective attributes. The markup attributes and the marked up text would then be forgotten. This breaks if the application then later changes the attributes property because it would try to regenerate the effective attributes from the markup text but the stored text no longer contains any markup. If the original markup text happened to contain entities like '&lt;' they would end up causing parse errors because they would be converted to the actual symbols. To fix this the attributes from the markup are now stored independently from the effective attributes. The effective attributes are now regenerated if either set of attributes changes right before a layout is created. http://bugzilla.openedhand.com/show_bug.cgi?id=1940
2010-01-05 11:58:12 +00:00
}
}
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
static PangoLayout *
text: correct caching logic This patch combines a number of fixes and improvements to the layout caching logic in ClutterText. * Fix: The width must always be set on the PangoLayout when painting. This is necessary because the layout aligns in the width, and even when we think we are left-aligned, the auto-dir feature of PangoLayout may result in right-alignment. * Fix: We should only ever try to reuse a cached layout based on its logical width if layout.width was -1 when computing that logical width. If the layout was already ellipsized, then comparing the logical width to the new width we are trying to wrap to doesn't make sense. (If "abc" ellipsizes to a 15-pixel wide "..." for a width of 1 pixel, that doesn't mean that we should use "..." for a width of 15 pixels. Maybe "abc" itself is 15 pixels wide.) * Improvement: rather than looking up cached layouts based on the input allocation_width/allocation_height, look them up based on the actual width/height/ellipsize that we pass to create a layout. This is simpler and improves the chance we'll get a cache hit when appropriate even if there are small floating point differences. Note because of the first fix this is less aggressive than dd40732 in caching layouts; get_preferred_width() and painting can't share a layout since get_preferred_width() needs to pass a width of -1 to Pango and painting needs to pass the real width. The patch has been updated from the clutter-1.2 branch to current master; using the profiling instrumentation it is possible to verify with test-text-field that the hit/miss counters go from: Name Total Per Frame ---- ----- --------- Text layout cache hit counter 13 6 Text layout cache miss counter 11 5 before applying the patch, to: Name Total Per Frame ---- ----- --------- Text layout cache miss counter 4 2 Text layout cache hit counter 3 1 after applying the patch. https://bugzilla.gnome.org/show_bug.cgi?id=618104 http://bugzilla.openedhand.com/show_bug.cgi?id=2109 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2010-05-08 17:38:37 +00:00
clutter_text_create_layout_no_cache (ClutterText *text,
gint width,
gint height,
PangoEllipsizeMode ellipsize)
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
{
ClutterTextPrivate *priv = text->priv;
PangoLayout *layout;
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
gchar *contents;
gsize contents_len;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
profile: Add profiling points for Text Add a static timer for the text layout code, and two counters for the layout cache hit and miss conditions.
2010-04-22 16:54:05 +00:00
CLUTTER_STATIC_TIMER (text_layout_timer,
"Mainloop",
"Text Layout",
"Layout creation",
0);
CLUTTER_TIMER_START (_clutter_uprof_context, text_layout_timer);
[text] Use create_pango_layout() Since we added clutter_actor_get_pango_layout() it would be a good idea to use it in the ClutterText actor to cut down the PangoContext-related calls.
2009-02-02 12:04:34 +00:00
layout = clutter_actor_create_pango_layout (CLUTTER_ACTOR (text), NULL);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
pango_layout_set_font_description (layout, priv->font_desc);
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
contents = clutter_text_get_display_text (text);
contents_len = strlen (contents);
if (priv->editable && priv->preedit_set)
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
{
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
GString *tmp = g_string_new (contents);
PangoAttrList *tmp_attrs = pango_attr_list_new ();
gint cursor_index;
if (priv->position == 0)
cursor_index = 0;
[text] Do not use markup on an editable Text An editable ClutterText should not use pango_layout_set_markup(), as the contents of the text actor will not match the text. Only read-only text actors should parse the contents for Pango markup.
2009-01-07 13:48:45 +00:00
else
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
cursor_index = offset_to_bytes (contents, priv->position);
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
g_string_insert (tmp, cursor_index, priv->preedit_str);
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
pango_layout_set_text (layout, tmp->str, tmp->len);
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
[text] Do not apply unset preedit attributes The pre-edit attributes are optional and thus should only be applied if they have been set to avoid assertion failures.
2009-09-19 08:18:06 +00:00
if (priv->preedit_attrs != NULL)
{
pango_attr_list_splice (tmp_attrs, priv->preedit_attrs,
cursor_index,
strlen (priv->preedit_str));
pango_layout_set_attributes (layout, tmp_attrs);
}
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
g_string_free (tmp, TRUE);
pango_attr_list_unref (tmp_attrs);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
}
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
else
pango_layout_set_text (layout, contents, contents_len);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
text: Store the markup attributes separately Previously when the markup property is set it would generate an attribute list from the markup and then merge it with the attributes from the attribute property and store it as the effective attributes. The markup attributes and the marked up text would then be forgotten. This breaks if the application then later changes the attributes property because it would try to regenerate the effective attributes from the markup text but the stored text no longer contains any markup. If the original markup text happened to contain entities like '&lt;' they would end up causing parse errors because they would be converted to the actual symbols. To fix this the attributes from the markup are now stored independently from the effective attributes. The effective attributes are now regenerated if either set of attributes changes right before a layout is created. http://bugzilla.openedhand.com/show_bug.cgi?id=1940
2010-01-05 11:58:12 +00:00
if (!priv->editable)
{
/* This will merge the markup attributes and the attributes
property if needed */
clutter_text_ensure_effective_attributes (text);
text: Do not set the markup unconditionally When setting :use-markup we always pass the contents of the Text actor to clutter_text_set_markup_internal(); if string contains any markup, this ends up being parsed and used - even when :use-markup is set to FALSE. http://bugzilla.clutter-project.org/show_bug.cgi?id=2239
2010-08-06 16:04:37 +00:00
if (priv->effective_attrs != NULL)
text: Store the markup attributes separately Previously when the markup property is set it would generate an attribute list from the markup and then merge it with the attributes from the attribute property and store it as the effective attributes. The markup attributes and the marked up text would then be forgotten. This breaks if the application then later changes the attributes property because it would try to regenerate the effective attributes from the markup text but the stored text no longer contains any markup. If the original markup text happened to contain entities like '&lt;' they would end up causing parse errors because they would be converted to the actual symbols. To fix this the attributes from the markup are now stored independently from the effective attributes. The effective attributes are now regenerated if either set of attributes changes right before a layout is created. http://bugzilla.openedhand.com/show_bug.cgi?id=1940
2010-01-05 11:58:12 +00:00
pango_layout_set_attributes (layout, priv->effective_attrs);
}
[text] Merge the attributes with markup enabled ClutterText should merge the PangoAttributes set by using clutter_text_set_attributes() with the attributes generated by parsing Pango markup. For this to work we must parse the markup and merge the attributes we get out of pango_parse_markup() with the attributes set by the user. Setting the markup or the attributes on an editable text should not work for the time being.
2009-01-29 13:18:57 +00:00
pango_layout_set_alignment (layout, priv->alignment);
pango_layout_set_single_paragraph_mode (layout, priv->single_line_mode);
pango_layout_set_justify (layout, priv->justify);
[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.
2009-04-21 13:15:19 +00:00
pango_layout_set_wrap (layout, priv->wrap_mode);
[text] Merge the attributes with markup enabled ClutterText should merge the PangoAttributes set by using clutter_text_set_attributes() with the attributes generated by parsing Pango markup. For this to work we must parse the markup and merge the attributes we get out of pango_parse_markup() with the attributes set by the user. Setting the markup or the attributes on an editable text should not work for the time being.
2009-01-29 13:18:57 +00:00
text: correct caching logic This patch combines a number of fixes and improvements to the layout caching logic in ClutterText. * Fix: The width must always be set on the PangoLayout when painting. This is necessary because the layout aligns in the width, and even when we think we are left-aligned, the auto-dir feature of PangoLayout may result in right-alignment. * Fix: We should only ever try to reuse a cached layout based on its logical width if layout.width was -1 when computing that logical width. If the layout was already ellipsized, then comparing the logical width to the new width we are trying to wrap to doesn't make sense. (If "abc" ellipsizes to a 15-pixel wide "..." for a width of 1 pixel, that doesn't mean that we should use "..." for a width of 15 pixels. Maybe "abc" itself is 15 pixels wide.) * Improvement: rather than looking up cached layouts based on the input allocation_width/allocation_height, look them up based on the actual width/height/ellipsize that we pass to create a layout. This is simpler and improves the chance we'll get a cache hit when appropriate even if there are small floating point differences. Note because of the first fix this is less aggressive than dd40732 in caching layouts; get_preferred_width() and painting can't share a layout since get_preferred_width() needs to pass a width of -1 to Pango and painting needs to pass the real width. The patch has been updated from the clutter-1.2 branch to current master; using the profiling instrumentation it is possible to verify with test-text-field that the hit/miss counters go from: Name Total Per Frame ---- ----- --------- Text layout cache hit counter 13 6 Text layout cache miss counter 11 5 before applying the patch, to: Name Total Per Frame ---- ----- --------- Text layout cache miss counter 4 2 Text layout cache hit counter 3 1 after applying the patch. https://bugzilla.gnome.org/show_bug.cgi?id=618104 http://bugzilla.openedhand.com/show_bug.cgi?id=2109 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2010-05-08 17:38:37 +00:00
pango_layout_set_ellipsize (layout, ellipsize);
pango_layout_set_width (layout, width);
pango_layout_set_height (layout, height);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
g_free (contents);
profile: Add profiling points for Text Add a static timer for the text layout code, and two counters for the layout cache hit and miss conditions.
2010-04-22 16:54:05 +00:00
CLUTTER_TIMER_STOP (_clutter_uprof_context, text_layout_timer);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
return layout;
}
static void
clutter_text_dirty_cache (ClutterText *text)
{
ClutterTextPrivate *priv = text->priv;
int i;
/* Delete the cached layouts so they will be recreated the next time
they are needed */
for (i = 0; i < N_CACHED_LAYOUTS; i++)
if (priv->cached_layouts[i].layout)
{
g_object_unref (priv->cached_layouts[i].layout);
priv->cached_layouts[i].layout = NULL;
}
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
clutter_text_dirty_paint_volume (text);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
}
text: Update actors using the default font If a ClutterText actor is using the default font from the backend then we should track font name changes and update it accordingly. This only applies to ClutterText actors with the :font-name property unset or explicitly set to NULL.
2010-06-26 14:49:15 +00:00
/*
* clutter_text_set_font_description_internal:
* @self: a #ClutterText
* @desc: a #PangoFontDescription
*
* Sets @desc as the font description to be used by the #ClutterText
* actor. The font description ownership is transferred to @self so
* the #PangoFontDescription must not be freed after this function
*
* This function will also set the :font-name field as a side-effect
*
* This function will evict the layout cache, and queue a relayout if
* the #ClutterText actor has contents.
*/
static inline void
clutter_text_set_font_description_internal (ClutterText *self,
PangoFontDescription *desc)
{
ClutterTextPrivate *priv = self->priv;
if (priv->font_desc == desc)
return;
if (priv->font_desc != NULL)
pango_font_description_free (priv->font_desc);
priv->font_desc = desc;
/* update the font name string we use */
g_free (priv->font_name);
priv->font_name = pango_font_description_to_string (priv->font_desc);
clutter_text_dirty_cache (self);
if (priv->text && priv->text[0] != '\0')
clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_FONT_DESCRIPTION]);
text: Update actors using the default font If a ClutterText actor is using the default font from the backend then we should track font name changes and update it accordingly. This only applies to ClutterText actors with the :font-name property unset or explicitly set to NULL.
2010-06-26 14:49:15 +00:00
}
Listen for the font-changed signal on the backend in ClutterText Whenever a ClutterText is created it now connects to the font-changed signal. When it is emitted the layout cache is dirtied and a relayout is queued. That way changes to the font options or resolution will cause an immediate update to the labels in the scene.
2009-01-27 16:47:20 +00:00
static void
clutter_text_font_changed_cb (ClutterText *text)
{
text: Update actors using the default font If a ClutterText actor is using the default font from the backend then we should track font name changes and update it accordingly. This only applies to ClutterText actors with the :font-name property unset or explicitly set to NULL.
2010-06-26 14:49:15 +00:00
if (text->priv->is_default_font)
{
PangoFontDescription *font_desc;
Do not use deprecated API internally
2010-09-10 13:27:37 +00:00
ClutterSettings *settings;
gchar *font_name = NULL;
settings = clutter_settings_get_default ();
g_object_get (settings, "font-name", &font_name, NULL);
text: Update actors using the default font If a ClutterText actor is using the default font from the backend then we should track font name changes and update it accordingly. This only applies to ClutterText actors with the :font-name property unset or explicitly set to NULL.
2010-06-26 14:49:15 +00:00
CLUTTER_NOTE (ACTOR, "Text[%p]: default font changed to '%s'",
text,
font_name);
font_desc = pango_font_description_from_string (font_name);
clutter_text_set_font_description_internal (text, font_desc);
Do not use deprecated API internally
2010-09-10 13:27:37 +00:00
g_free (font_name);
text: Update actors using the default font If a ClutterText actor is using the default font from the backend then we should track font name changes and update it accordingly. This only applies to ClutterText actors with the :font-name property unset or explicitly set to NULL.
2010-06-26 14:49:15 +00:00
}
Listen for the font-changed signal on the backend in ClutterText Whenever a ClutterText is created it now connects to the font-changed signal. When it is emitted the layout cache is dirtied and a relayout is queued. That way changes to the font options or resolution will cause an immediate update to the labels in the scene.
2009-01-27 16:47:20 +00:00
clutter_text_dirty_cache (text);
clutter_actor_queue_relayout (CLUTTER_ACTOR (text));
}
text: Dirty layout cache on text direction changes When the text direction changes we should evict the cached layouts to avoid stale entries in case the direction change produces a layout with the same size.
2009-11-10 12:18:32 +00:00
static void
clutter_text_direction_changed_cb (GObject *gobject,
GParamSpec *pspec)
{
clutter_text_dirty_cache (CLUTTER_TEXT (gobject));
/* no need to queue a relayout: set_text_direction() will do that for us */
}
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
/*
* clutter_text_create_layout:
* @text: a #ClutterText
* @allocation_width: the allocation width
Support pango_layout_set_height() in ClutterText This is the port of the patch attached to bug 1266: ClutterLabel support for pango_layout_set_height() to the ClutterText actor. This patch adds support for the pango_layout_set_height() function inside the layout creation and caching, so that setting the height of a ClutterText will make PangoLayout try to fill out the given height before ellipsizing the contents of the ClutterText actor. The original patch is from Havoc Pennington. This commit ports the patch to ClutterText and applies a small change to the height computation pointed out by Behdad Esfahbod on GNOME's Bugzilla: http://bugzilla.gnome.org/show_bug.cgi?id=560931 That the layout heights when doing a size request should be set to be G_MAXINT instead of -1. Unfortunately, the patch seems to break the conformance suite when setting the ellipsization on the layout.
2008-12-16 14:02:05 +00:00
* @allocation_height: the allocation height
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
*
* Like clutter_text_create_layout_no_cache(), but will also ensure
* the glyphs cache. If a previously cached layout generated using the
* same width is available then that will be used instead of
* generating a new one.
*/
static PangoLayout *
clutter_text_create_layout (ClutterText *text,
Remove Units from the public API With the recent change to internal floating point values, ClutterUnit has become a redundant type, defined to be a float. All integer entry points are being internally converted to floating point values to be passed to the GL pipeline with the least amount of conversion. ClutterUnit is thus exposed as just a "pixel with fractionary bits", and not -- as users might think -- as generic, resolution and device independent units. not that it was the case, but a definitive amount of people was convinced it did provide this "feature", and was flummoxed about the mere existence of this type. So, having ClutterUnit exposed in the public API doubles the entry points and has the following disadvantages: - we have to maintain twice the amount of entry points in ClutterActor - we still do an integer-to-float implicit conversion - we introduce a weird impedance between pixels and "pixels with fractionary bits" - language bindings will have to choose what to bind, and resort to manually overriding the API + *except* for language bindings based on GObject-Introspection, as they cannot do manual overrides, thus will replicate the entire set of entry points For these reason, we should coalesces every Actor entry point for pixels and for ClutterUnit into a single entry point taking a float, like: void clutter_actor_set_x (ClutterActor *self, gfloat x); void clutter_actor_get_size (ClutterActor *self, gfloat *width, gfloat *height); gfloat clutter_actor_get_height (ClutterActor *self); etc. The issues I have identified are: - we'll have a two cases of compiler warnings: - printf() format of the return values from %d to %f - clutter_actor_get_size() taking floats instead of unsigned ints - we'll have a problem with varargs when passing an integer instead of a floating point value, except on 64bit platforms where the size of a float is the same as the size of an int To be clear: the *intent* of the API should not change -- we still use pixels everywhere -- but: - we remove ambiguity in the API with regard to pixels and units - we remove entry points we get to maintain for the whole 1.0 version of the API - we make things simpler to bind for both manual language bindings and automatic (gobject-introspection based) ones - we have the simplest API possible while still exposing the capabilities of the underlying GL implementation
2009-05-06 15:44:47 +00:00
gfloat allocation_width,
gfloat allocation_height)
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
{
ClutterTextPrivate *priv = text->priv;
LayoutCache *oldest_cache = priv->cached_layouts;
gboolean found_free_cache = FALSE;
text: correct caching logic This patch combines a number of fixes and improvements to the layout caching logic in ClutterText. * Fix: The width must always be set on the PangoLayout when painting. This is necessary because the layout aligns in the width, and even when we think we are left-aligned, the auto-dir feature of PangoLayout may result in right-alignment. * Fix: We should only ever try to reuse a cached layout based on its logical width if layout.width was -1 when computing that logical width. If the layout was already ellipsized, then comparing the logical width to the new width we are trying to wrap to doesn't make sense. (If "abc" ellipsizes to a 15-pixel wide "..." for a width of 1 pixel, that doesn't mean that we should use "..." for a width of 15 pixels. Maybe "abc" itself is 15 pixels wide.) * Improvement: rather than looking up cached layouts based on the input allocation_width/allocation_height, look them up based on the actual width/height/ellipsize that we pass to create a layout. This is simpler and improves the chance we'll get a cache hit when appropriate even if there are small floating point differences. Note because of the first fix this is less aggressive than dd40732 in caching layouts; get_preferred_width() and painting can't share a layout since get_preferred_width() needs to pass a width of -1 to Pango and painting needs to pass the real width. The patch has been updated from the clutter-1.2 branch to current master; using the profiling instrumentation it is possible to verify with test-text-field that the hit/miss counters go from: Name Total Per Frame ---- ----- --------- Text layout cache hit counter 13 6 Text layout cache miss counter 11 5 before applying the patch, to: Name Total Per Frame ---- ----- --------- Text layout cache miss counter 4 2 Text layout cache hit counter 3 1 after applying the patch. https://bugzilla.gnome.org/show_bug.cgi?id=618104 http://bugzilla.openedhand.com/show_bug.cgi?id=2109 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2010-05-08 17:38:37 +00:00
gint width = -1;
gint height = -1;
PangoEllipsizeMode ellipsize = PANGO_ELLIPSIZE_NONE;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
int i;
profile: Add profiling points for Text Add a static timer for the text layout code, and two counters for the layout cache hit and miss conditions.
2010-04-22 16:54:05 +00:00
CLUTTER_STATIC_COUNTER (text_cache_hit_counter,
"Text layout cache hit counter",
"Increments for each layout cache hit",
0);
CLUTTER_STATIC_COUNTER (text_cache_miss_counter,
"Text layout cache miss counter",
"Increments for each layout cache miss",
0);
text: correct caching logic This patch combines a number of fixes and improvements to the layout caching logic in ClutterText. * Fix: The width must always be set on the PangoLayout when painting. This is necessary because the layout aligns in the width, and even when we think we are left-aligned, the auto-dir feature of PangoLayout may result in right-alignment. * Fix: We should only ever try to reuse a cached layout based on its logical width if layout.width was -1 when computing that logical width. If the layout was already ellipsized, then comparing the logical width to the new width we are trying to wrap to doesn't make sense. (If "abc" ellipsizes to a 15-pixel wide "..." for a width of 1 pixel, that doesn't mean that we should use "..." for a width of 15 pixels. Maybe "abc" itself is 15 pixels wide.) * Improvement: rather than looking up cached layouts based on the input allocation_width/allocation_height, look them up based on the actual width/height/ellipsize that we pass to create a layout. This is simpler and improves the chance we'll get a cache hit when appropriate even if there are small floating point differences. Note because of the first fix this is less aggressive than dd40732 in caching layouts; get_preferred_width() and painting can't share a layout since get_preferred_width() needs to pass a width of -1 to Pango and painting needs to pass the real width. The patch has been updated from the clutter-1.2 branch to current master; using the profiling instrumentation it is possible to verify with test-text-field that the hit/miss counters go from: Name Total Per Frame ---- ----- --------- Text layout cache hit counter 13 6 Text layout cache miss counter 11 5 before applying the patch, to: Name Total Per Frame ---- ----- --------- Text layout cache miss counter 4 2 Text layout cache hit counter 3 1 after applying the patch. https://bugzilla.gnome.org/show_bug.cgi?id=618104 http://bugzilla.openedhand.com/show_bug.cgi?id=2109 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2010-05-08 17:38:37 +00:00
/* First determine the width, height, and ellipsize mode that
* we need for the layout. The ellipsize mode depends on
* allocation_width/allocation_size as follows:
*
* Cases, assuming ellipsize != NONE on actor:
*
* Width request: ellipsization can be set or not on layout,
* doesn't matter.
*
* Height request: ellipsization must never be set on layout
* if wrap=true, because we need to measure the wrapped
* height. It must always be set if wrap=false.
*
* Allocate: ellipsization must always be set.
*
* See http://bugzilla.gnome.org/show_bug.cgi?id=560931
*/
text: Fix typos that were causing false-positive cache hits If a cached layout didn't actually match the layout we're looking for, it would be returned anyway. Remove this return so that it can correctly continue looking and get a cache miss if appropriate. http://bugzilla.openedhand.com/show_bug.cgi?id=2109
2010-05-13 14:51:42 +00:00
if (priv->ellipsize != PANGO_ELLIPSIZE_NONE)
text: correct caching logic This patch combines a number of fixes and improvements to the layout caching logic in ClutterText. * Fix: The width must always be set on the PangoLayout when painting. This is necessary because the layout aligns in the width, and even when we think we are left-aligned, the auto-dir feature of PangoLayout may result in right-alignment. * Fix: We should only ever try to reuse a cached layout based on its logical width if layout.width was -1 when computing that logical width. If the layout was already ellipsized, then comparing the logical width to the new width we are trying to wrap to doesn't make sense. (If "abc" ellipsizes to a 15-pixel wide "..." for a width of 1 pixel, that doesn't mean that we should use "..." for a width of 15 pixels. Maybe "abc" itself is 15 pixels wide.) * Improvement: rather than looking up cached layouts based on the input allocation_width/allocation_height, look them up based on the actual width/height/ellipsize that we pass to create a layout. This is simpler and improves the chance we'll get a cache hit when appropriate even if there are small floating point differences. Note because of the first fix this is less aggressive than dd40732 in caching layouts; get_preferred_width() and painting can't share a layout since get_preferred_width() needs to pass a width of -1 to Pango and painting needs to pass the real width. The patch has been updated from the clutter-1.2 branch to current master; using the profiling instrumentation it is possible to verify with test-text-field that the hit/miss counters go from: Name Total Per Frame ---- ----- --------- Text layout cache hit counter 13 6 Text layout cache miss counter 11 5 before applying the patch, to: Name Total Per Frame ---- ----- --------- Text layout cache miss counter 4 2 Text layout cache hit counter 3 1 after applying the patch. https://bugzilla.gnome.org/show_bug.cgi?id=618104 http://bugzilla.openedhand.com/show_bug.cgi?id=2109 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2010-05-08 17:38:37 +00:00
{
if (allocation_height < 0 && priv->wrap)
; /* must not set ellipsization on wrap=true height request */
else
{
if (!priv->editable)
ellipsize = priv->ellipsize;
}
}
/* When painting, we always need to set the width, since
* we might need to align to the right. When getting the
* height, however, there are some cases where we know that
* the width won't affect the width.
*
* - editable, single-line text actors, since those can
* scroll the layout.
* - non-wrapping, non-ellipsizing actors.
*/
if (allocation_width >= 0 &&
(allocation_height >= 0 ||
!((priv->editable && priv->single_line_mode) ||
(priv->ellipsize == PANGO_ELLIPSIZE_NONE && !priv->wrap))))
{
clutter-text: Round the layout width to nearest integer not down When converting the floating point allocation width to an integer multiple of PANGO_SCALE to give to the PangoLayout it can sometimes end up slightly short of the allocated size due to rounding errors. This can cause some of the lines to be wrapped differently when a non-integer-aligned position is used (such as when animating text). It works better to round the number to the nearest integer by adding 0.5 instead of letting the default float cast truncate it downwards. http://bugzilla.openedhand.com/show_bug.cgi?id=2170
2010-06-14 10:59:33 +00:00
width = allocation_width * 1024 + 0.5f;
text: correct caching logic This patch combines a number of fixes and improvements to the layout caching logic in ClutterText. * Fix: The width must always be set on the PangoLayout when painting. This is necessary because the layout aligns in the width, and even when we think we are left-aligned, the auto-dir feature of PangoLayout may result in right-alignment. * Fix: We should only ever try to reuse a cached layout based on its logical width if layout.width was -1 when computing that logical width. If the layout was already ellipsized, then comparing the logical width to the new width we are trying to wrap to doesn't make sense. (If "abc" ellipsizes to a 15-pixel wide "..." for a width of 1 pixel, that doesn't mean that we should use "..." for a width of 15 pixels. Maybe "abc" itself is 15 pixels wide.) * Improvement: rather than looking up cached layouts based on the input allocation_width/allocation_height, look them up based on the actual width/height/ellipsize that we pass to create a layout. This is simpler and improves the chance we'll get a cache hit when appropriate even if there are small floating point differences. Note because of the first fix this is less aggressive than dd40732 in caching layouts; get_preferred_width() and painting can't share a layout since get_preferred_width() needs to pass a width of -1 to Pango and painting needs to pass the real width. The patch has been updated from the clutter-1.2 branch to current master; using the profiling instrumentation it is possible to verify with test-text-field that the hit/miss counters go from: Name Total Per Frame ---- ----- --------- Text layout cache hit counter 13 6 Text layout cache miss counter 11 5 before applying the patch, to: Name Total Per Frame ---- ----- --------- Text layout cache miss counter 4 2 Text layout cache hit counter 3 1 after applying the patch. https://bugzilla.gnome.org/show_bug.cgi?id=618104 http://bugzilla.openedhand.com/show_bug.cgi?id=2109 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2010-05-08 17:38:37 +00:00
}
/* Pango only uses height if ellipsization is enabled, so don't set
* height if ellipsize isn't set. Pango implicitly enables wrapping
* if height is set, so don't set height if wrapping is disabled.
* In other words, only set height if we want to both wrap then
* ellipsize and we're not in single line mode.
*
* See http://bugzilla.gnome.org/show_bug.cgi?id=560931 if this
* seems odd.
*/
if (allocation_height >= 0 &&
priv->wrap &&
priv->ellipsize != PANGO_ELLIPSIZE_NONE &&
!priv->single_line_mode)
{
clutter-text: Round the layout width to nearest integer not down When converting the floating point allocation width to an integer multiple of PANGO_SCALE to give to the PangoLayout it can sometimes end up slightly short of the allocated size due to rounding errors. This can cause some of the lines to be wrapped differently when a non-integer-aligned position is used (such as when animating text). It works better to round the number to the nearest integer by adding 0.5 instead of letting the default float cast truncate it downwards. http://bugzilla.openedhand.com/show_bug.cgi?id=2170
2010-06-14 10:59:33 +00:00
height = allocation_height * 1024 + 0.5f;
text: correct caching logic This patch combines a number of fixes and improvements to the layout caching logic in ClutterText. * Fix: The width must always be set on the PangoLayout when painting. This is necessary because the layout aligns in the width, and even when we think we are left-aligned, the auto-dir feature of PangoLayout may result in right-alignment. * Fix: We should only ever try to reuse a cached layout based on its logical width if layout.width was -1 when computing that logical width. If the layout was already ellipsized, then comparing the logical width to the new width we are trying to wrap to doesn't make sense. (If "abc" ellipsizes to a 15-pixel wide "..." for a width of 1 pixel, that doesn't mean that we should use "..." for a width of 15 pixels. Maybe "abc" itself is 15 pixels wide.) * Improvement: rather than looking up cached layouts based on the input allocation_width/allocation_height, look them up based on the actual width/height/ellipsize that we pass to create a layout. This is simpler and improves the chance we'll get a cache hit when appropriate even if there are small floating point differences. Note because of the first fix this is less aggressive than dd40732 in caching layouts; get_preferred_width() and painting can't share a layout since get_preferred_width() needs to pass a width of -1 to Pango and painting needs to pass the real width. The patch has been updated from the clutter-1.2 branch to current master; using the profiling instrumentation it is possible to verify with test-text-field that the hit/miss counters go from: Name Total Per Frame ---- ----- --------- Text layout cache hit counter 13 6 Text layout cache miss counter 11 5 before applying the patch, to: Name Total Per Frame ---- ----- --------- Text layout cache miss counter 4 2 Text layout cache hit counter 3 1 after applying the patch. https://bugzilla.gnome.org/show_bug.cgi?id=618104 http://bugzilla.openedhand.com/show_bug.cgi?id=2109 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2010-05-08 17:38:37 +00:00
}
Support pango_layout_set_height() in ClutterText This is the port of the patch attached to bug 1266: ClutterLabel support for pango_layout_set_height() to the ClutterText actor. This patch adds support for the pango_layout_set_height() function inside the layout creation and caching, so that setting the height of a ClutterText will make PangoLayout try to fill out the given height before ellipsizing the contents of the ClutterText actor. The original patch is from Havoc Pennington. This commit ports the patch to ClutterText and applies a small change to the height computation pointed out by Behdad Esfahbod on GNOME's Bugzilla: http://bugzilla.gnome.org/show_bug.cgi?id=560931 That the layout heights when doing a size request should be set to be G_MAXINT instead of -1. Unfortunately, the patch seems to break the conformance suite when setting the ellipsization on the layout.
2008-12-16 14:02:05 +00:00
/* Search for a cached layout with the same width and keep
* track of the oldest one
*/
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
for (i = 0; i < N_CACHED_LAYOUTS; i++)
{
if (priv->cached_layouts[i].layout == NULL)
{
/* Always prefer free cache spaces */
found_free_cache = TRUE;
oldest_cache = priv->cached_layouts + i;
}
text: Check generated size of layouts in cache By comparing the requested size against the computed sized for existing Pango layouts we can avoid creating layouts where the requested size matches that of a previously computed one. In particular this optimisation means that when working with a fixed positioning based layout (with no constraints on the size of the ClutterText) the same PangoLayout can be used to calculate the preferred width, height and also the layout used for the actual painting. http://bugzilla.openedhand.com/show_bug.cgi?id=2078 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2010-04-13 23:12:02 +00:00
else
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
{
text: correct caching logic This patch combines a number of fixes and improvements to the layout caching logic in ClutterText. * Fix: The width must always be set on the PangoLayout when painting. This is necessary because the layout aligns in the width, and even when we think we are left-aligned, the auto-dir feature of PangoLayout may result in right-alignment. * Fix: We should only ever try to reuse a cached layout based on its logical width if layout.width was -1 when computing that logical width. If the layout was already ellipsized, then comparing the logical width to the new width we are trying to wrap to doesn't make sense. (If "abc" ellipsizes to a 15-pixel wide "..." for a width of 1 pixel, that doesn't mean that we should use "..." for a width of 15 pixels. Maybe "abc" itself is 15 pixels wide.) * Improvement: rather than looking up cached layouts based on the input allocation_width/allocation_height, look them up based on the actual width/height/ellipsize that we pass to create a layout. This is simpler and improves the chance we'll get a cache hit when appropriate even if there are small floating point differences. Note because of the first fix this is less aggressive than dd40732 in caching layouts; get_preferred_width() and painting can't share a layout since get_preferred_width() needs to pass a width of -1 to Pango and painting needs to pass the real width. The patch has been updated from the clutter-1.2 branch to current master; using the profiling instrumentation it is possible to verify with test-text-field that the hit/miss counters go from: Name Total Per Frame ---- ----- --------- Text layout cache hit counter 13 6 Text layout cache miss counter 11 5 before applying the patch, to: Name Total Per Frame ---- ----- --------- Text layout cache miss counter 4 2 Text layout cache hit counter 3 1 after applying the patch. https://bugzilla.gnome.org/show_bug.cgi?id=618104 http://bugzilla.openedhand.com/show_bug.cgi?id=2109 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2010-05-08 17:38:37 +00:00
PangoLayout *cached = priv->cached_layouts[i].layout;
gint cached_width = pango_layout_get_width (cached);
gint cached_height = pango_layout_get_height (cached);
gint cached_ellipsize = pango_layout_get_ellipsize (cached);
if (cached_width == width &&
cached_height == height &&
cached_ellipsize == ellipsize)
{
/* If this cached layout is using the same size then we can
* just return that directly
profile: Add profiling points for Text Add a static timer for the text layout code, and two counters for the layout cache hit and miss conditions.
2010-04-22 16:54:05 +00:00
*/
text: correct caching logic This patch combines a number of fixes and improvements to the layout caching logic in ClutterText. * Fix: The width must always be set on the PangoLayout when painting. This is necessary because the layout aligns in the width, and even when we think we are left-aligned, the auto-dir feature of PangoLayout may result in right-alignment. * Fix: We should only ever try to reuse a cached layout based on its logical width if layout.width was -1 when computing that logical width. If the layout was already ellipsized, then comparing the logical width to the new width we are trying to wrap to doesn't make sense. (If "abc" ellipsizes to a 15-pixel wide "..." for a width of 1 pixel, that doesn't mean that we should use "..." for a width of 15 pixels. Maybe "abc" itself is 15 pixels wide.) * Improvement: rather than looking up cached layouts based on the input allocation_width/allocation_height, look them up based on the actual width/height/ellipsize that we pass to create a layout. This is simpler and improves the chance we'll get a cache hit when appropriate even if there are small floating point differences. Note because of the first fix this is less aggressive than dd40732 in caching layouts; get_preferred_width() and painting can't share a layout since get_preferred_width() needs to pass a width of -1 to Pango and painting needs to pass the real width. The patch has been updated from the clutter-1.2 branch to current master; using the profiling instrumentation it is possible to verify with test-text-field that the hit/miss counters go from: Name Total Per Frame ---- ----- --------- Text layout cache hit counter 13 6 Text layout cache miss counter 11 5 before applying the patch, to: Name Total Per Frame ---- ----- --------- Text layout cache miss counter 4 2 Text layout cache hit counter 3 1 after applying the patch. https://bugzilla.gnome.org/show_bug.cgi?id=618104 http://bugzilla.openedhand.com/show_bug.cgi?id=2109 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2010-05-08 17:38:37 +00:00
CLUTTER_NOTE (ACTOR,
"ClutterText: %p: cache hit for size %.2fx%.2f",
text,
allocation_width,
allocation_height);
CLUTTER_COUNTER_INC (_clutter_uprof_context,
text_cache_hit_counter);
return priv->cached_layouts[i].layout;
}
/* When getting the preferred height for a specific width,
* we might be able to reuse the layout from getting the
* preferred width. If the width that the layout gives
* unconstrained is less than the width that we are using
* than the height will be unaffected by that width.
*/
if (allocation_height < 0 &&
cached_width == -1 &&
cached_ellipsize == ellipsize)
{
PangoRectangle logical_rect;
pango_layout_get_extents (priv->cached_layouts[i].layout,
NULL,
&logical_rect);
if (logical_rect.width <= width)
{
/* We've been asked for our height for the width we gave as a result
* of a _get_preferred_width call
*/
CLUTTER_NOTE (ACTOR,
"ClutterText: %p: cache hit for size %.2fx%.2f "
"(unwrapped width narrower than given width)",
text,
allocation_width,
allocation_height);
CLUTTER_COUNTER_INC (_clutter_uprof_context,
text_cache_hit_counter);
return priv->cached_layouts[i].layout;
}
}
if (!found_free_cache &&
(priv->cached_layouts[i].age < oldest_cache->age))
{
oldest_cache = priv->cached_layouts + i;
}
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
}
}
[text] Add ClutterText::delete_selection() Add a method for deleting the current selection inside a Text actor. This is useful for subclasses. See bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1521 Based on a patch by: Raymond Liu <raymond.liu@intel.com>
2009-05-06 16:08:25 +00:00
CLUTTER_NOTE (ACTOR, "ClutterText: %p: cache miss for size %.2fx%.2f",
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
text,
[text] Add ClutterText::delete_selection() Add a method for deleting the current selection inside a Text actor. This is useful for subclasses. See bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1521 Based on a patch by: Raymond Liu <raymond.liu@intel.com>
2009-05-06 16:08:25 +00:00
allocation_width,
allocation_height);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
profile: Add profiling points for Text Add a static timer for the text layout code, and two counters for the layout cache hit and miss conditions.
2010-04-22 16:54:05 +00:00
CLUTTER_COUNTER_INC (_clutter_uprof_context, text_cache_miss_counter);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
/* If we make it here then we didn't have a cached version so we
need to recreate the layout */
if (oldest_cache->layout)
g_object_unref (oldest_cache->layout);
oldest_cache->layout =
text: correct caching logic This patch combines a number of fixes and improvements to the layout caching logic in ClutterText. * Fix: The width must always be set on the PangoLayout when painting. This is necessary because the layout aligns in the width, and even when we think we are left-aligned, the auto-dir feature of PangoLayout may result in right-alignment. * Fix: We should only ever try to reuse a cached layout based on its logical width if layout.width was -1 when computing that logical width. If the layout was already ellipsized, then comparing the logical width to the new width we are trying to wrap to doesn't make sense. (If "abc" ellipsizes to a 15-pixel wide "..." for a width of 1 pixel, that doesn't mean that we should use "..." for a width of 15 pixels. Maybe "abc" itself is 15 pixels wide.) * Improvement: rather than looking up cached layouts based on the input allocation_width/allocation_height, look them up based on the actual width/height/ellipsize that we pass to create a layout. This is simpler and improves the chance we'll get a cache hit when appropriate even if there are small floating point differences. Note because of the first fix this is less aggressive than dd40732 in caching layouts; get_preferred_width() and painting can't share a layout since get_preferred_width() needs to pass a width of -1 to Pango and painting needs to pass the real width. The patch has been updated from the clutter-1.2 branch to current master; using the profiling instrumentation it is possible to verify with test-text-field that the hit/miss counters go from: Name Total Per Frame ---- ----- --------- Text layout cache hit counter 13 6 Text layout cache miss counter 11 5 before applying the patch, to: Name Total Per Frame ---- ----- --------- Text layout cache miss counter 4 2 Text layout cache hit counter 3 1 after applying the patch. https://bugzilla.gnome.org/show_bug.cgi?id=618104 http://bugzilla.openedhand.com/show_bug.cgi?id=2109 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2010-05-08 17:38:37 +00:00
clutter_text_create_layout_no_cache (text, width, height, ellipsize);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
cogl_pango_ensure_glyph_cache_for_layout (oldest_cache->layout);
/* Mark the 'time' this cache was created and advance the time */
oldest_cache->age = priv->cache_age++;
return oldest_cache->layout;
}
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
static gint
clutter_text_coords_to_position (ClutterText *text,
Remove usage of Units and macros The ClutterUnit and relative macros should not be used when dealing with pixels -- which is to say, all the time when inside Clutter.
2009-06-02 17:44:30 +00:00
gfloat x,
gfloat y)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
Remove usage of Units and macros The ClutterUnit and relative macros should not be used when dealing with pixels -- which is to say, all the time when inside Clutter.
2009-06-02 17:44:30 +00:00
ClutterTextPrivate *priv = text->priv;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
gint index_;
gint px, py;
gint trailing;
[text] take scrolling into account when calculating cursor position Account for the scrolling in single line more when calculating the cursor position from coordinates.
2009-05-14 09:51:58 +00:00
/* Take any offset due to scrolling into account */
Remove usage of Units and macros The ClutterUnit and relative macros should not be used when dealing with pixels -- which is to say, all the time when inside Clutter.
2009-06-02 17:44:30 +00:00
if (priv->single_line_mode)
x += priv->text_x * -1;
[text] take scrolling into account when calculating cursor position Account for the scrolling in single line more when calculating the cursor position from coordinates.
2009-05-14 09:51:58 +00:00
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
px = x * PANGO_SCALE;
py = y * PANGO_SCALE;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
pango_layout_xy_to_index (clutter_text_get_layout (text),
Use units in position_to_coords() We loose precision with a direct conversion for PangoUnits to pixels, so we should do the conversion as needed, inside the callers of clutter_text_position_to_coords().
2008-12-15 18:24:42 +00:00
px, py,
&index_, &trailing);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
return index_ + trailing;
}
[text] Expose position_to_coords() The clutter_text_position_to_coords() is useful for ClutterText subclasses. See bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1521 Based on a patch by: Raymond Liu <raymond.liu@intel.com>
2009-05-06 16:18:12 +00:00
/**
Use units in position_to_coords() We loose precision with a direct conversion for PangoUnits to pixels, so we should do the conversion as needed, inside the callers of clutter_text_position_to_coords().
2008-12-15 18:24:42 +00:00
* clutter_text_position_to_coords:
* @self: a #ClutterText
* @position: position in characters
introspection: Add missing (out) annotations Comprehensively add (out) annotations to functions parameters returning int/float/double. Not handled here: structure out returns like ClutterColor or ClutterPerspective or GValue that should get (out caller-allocates). Not handled here: Cogl http://bugzilla.clutter-project.org/show_bug.cgi?id=2302
2010-09-08 14:37:58 +00:00
* @x: (out): return location for the X coordinate, or %NULL
* @y: (out): return location for the Y coordinate, or %NULL
* @line_height: (out): return location for the line height, or %NULL
Use units in position_to_coords() We loose precision with a direct conversion for PangoUnits to pixels, so we should do the conversion as needed, inside the callers of clutter_text_position_to_coords().
2008-12-15 18:24:42 +00:00
*
* Retrieves the coordinates of the given @position.
*
* Return value: %TRUE if the conversion was successful
[text] Expose position_to_coords() The clutter_text_position_to_coords() is useful for ClutterText subclasses. See bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1521 Based on a patch by: Raymond Liu <raymond.liu@intel.com>
2009-05-06 16:18:12 +00:00
*
* Since: 1.0
Use units in position_to_coords() We loose precision with a direct conversion for PangoUnits to pixels, so we should do the conversion as needed, inside the callers of clutter_text_position_to_coords().
2008-12-15 18:24:42 +00:00
*/
[text] Expose position_to_coords() The clutter_text_position_to_coords() is useful for ClutterText subclasses. See bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1521 Based on a patch by: Raymond Liu <raymond.liu@intel.com>
2009-05-06 16:18:12 +00:00
gboolean
General whitespace fixes in ClutterText Let's keep whitespace fixes to their own commit to avoid polluting git-blame.
2008-12-11 11:48:17 +00:00
clutter_text_position_to_coords (ClutterText *self,
gint position,
Remove Units from the public API With the recent change to internal floating point values, ClutterUnit has become a redundant type, defined to be a float. All integer entry points are being internally converted to floating point values to be passed to the GL pipeline with the least amount of conversion. ClutterUnit is thus exposed as just a "pixel with fractionary bits", and not -- as users might think -- as generic, resolution and device independent units. not that it was the case, but a definitive amount of people was convinced it did provide this "feature", and was flummoxed about the mere existence of this type. So, having ClutterUnit exposed in the public API doubles the entry points and has the following disadvantages: - we have to maintain twice the amount of entry points in ClutterActor - we still do an integer-to-float implicit conversion - we introduce a weird impedance between pixels and "pixels with fractionary bits" - language bindings will have to choose what to bind, and resort to manually overriding the API + *except* for language bindings based on GObject-Introspection, as they cannot do manual overrides, thus will replicate the entire set of entry points For these reason, we should coalesces every Actor entry point for pixels and for ClutterUnit into a single entry point taking a float, like: void clutter_actor_set_x (ClutterActor *self, gfloat x); void clutter_actor_get_size (ClutterActor *self, gfloat *width, gfloat *height); gfloat clutter_actor_get_height (ClutterActor *self); etc. The issues I have identified are: - we'll have a two cases of compiler warnings: - printf() format of the return values from %d to %f - clutter_actor_get_size() taking floats instead of unsigned ints - we'll have a problem with varargs when passing an integer instead of a floating point value, except on 64bit platforms where the size of a float is the same as the size of an int To be clear: the *intent* of the API should not change -- we still use pixels everywhere -- but: - we remove ambiguity in the API with regard to pixels and units - we remove entry points we get to maintain for the whole 1.0 version of the API - we make things simpler to bind for both manual language bindings and automatic (gobject-introspection based) ones - we have the simplest API possible while still exposing the capabilities of the underlying GL implementation
2009-05-06 15:44:47 +00:00
gfloat *x,
gfloat *y,
gfloat *line_height)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
[text] Expose position_to_coords() The clutter_text_position_to_coords() is useful for ClutterText subclasses. See bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1521 Based on a patch by: Raymond Liu <raymond.liu@intel.com>
2009-05-06 16:18:12 +00:00
ClutterTextPrivate *priv;
General whitespace fixes in ClutterText Let's keep whitespace fixes to their own commit to avoid polluting git-blame.
2008-12-11 11:48:17 +00:00
PangoRectangle rect;
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
gint n_chars;
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
gint password_char_bytes = 1;
General whitespace fixes in ClutterText Let's keep whitespace fixes to their own commit to avoid polluting git-blame.
2008-12-11 11:48:17 +00:00
gint index_;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
[text] Expose position_to_coords() The clutter_text_position_to_coords() is useful for ClutterText subclasses. See bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1521 Based on a patch by: Raymond Liu <raymond.liu@intel.com>
2009-05-06 16:18:12 +00:00
g_return_val_if_fail (CLUTTER_IS_TEXT (self), FALSE);
priv = self->priv;
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
if (priv->preedit_set)
n_chars = priv->n_chars + priv->preedit_n_chars;
else
n_chars = priv->n_chars;
if (position < -1 || position > n_chars)
[text] Expose position_to_coords() The clutter_text_position_to_coords() is useful for ClutterText subclasses. See bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1521 Based on a patch by: Raymond Liu <raymond.liu@intel.com>
2009-05-06 16:18:12 +00:00
return FALSE;
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
if (priv->password_char != 0)
password_char_bytes = g_unichar_to_utf8 (priv->password_char, NULL);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
if (position == -1)
General whitespace fixes in ClutterText Let's keep whitespace fixes to their own commit to avoid polluting git-blame.
2008-12-11 11:48:17 +00:00
{
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
if (priv->password_char == 0)
text: Take pre-edit cursor position into account When determining the cursor position we also need to take into account the pre-edit cursor position as set by the set_preedit_string() function.
2009-10-19 14:31:29 +00:00
{
if (priv->editable && priv->preedit_set)
index_ = priv->n_bytes + strlen (priv->preedit_str);
else
index_ = priv->n_bytes;
}
General whitespace fixes in ClutterText Let's keep whitespace fixes to their own commit to avoid polluting git-blame.
2008-12-11 11:48:17 +00:00
else
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
index_ = n_chars * password_char_bytes;
General whitespace fixes in ClutterText Let's keep whitespace fixes to their own commit to avoid polluting git-blame.
2008-12-11 11:48:17 +00:00
}
Use units in position_to_coords() We loose precision with a direct conversion for PangoUnits to pixels, so we should do the conversion as needed, inside the callers of clutter_text_position_to_coords().
2008-12-15 18:24:42 +00:00
else if (position == 0)
{
index_ = 0;
}
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
else
General whitespace fixes in ClutterText Let's keep whitespace fixes to their own commit to avoid polluting git-blame.
2008-12-11 11:48:17 +00:00
{
text: Take pre-edit cursor position into account When determining the cursor position we also need to take into account the pre-edit cursor position as set by the set_preedit_string() function.
2009-10-19 14:31:29 +00:00
gchar *text = clutter_text_get_display_text (self);
Fix cursor position in preedit status http://bugzilla.openedhand.com/show_bug.cgi?id=1871 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-11-09 08:42:15 +00:00
GString *tmp = g_string_new (text);
gint cursor_index;
cursor_index = offset_to_bytes (text, priv->position);
text: Add a NULL preedit string check This commit avoids a critical warning introduced by commit bc51b8ca47ac90e52ab6a27ff791ea97d53f4648
2009-11-09 11:07:27 +00:00
if (priv->preedit_str != NULL)
g_string_insert (tmp, cursor_index, priv->preedit_str);
text: Take pre-edit cursor position into account When determining the cursor position we also need to take into account the pre-edit cursor position as set by the set_preedit_string() function.
2009-10-19 14:31:29 +00:00
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
if (priv->password_char == 0)
Fix cursor position in preedit status http://bugzilla.openedhand.com/show_bug.cgi?id=1871 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-11-09 08:42:15 +00:00
index_ = offset_to_bytes (tmp->str, position);
General whitespace fixes in ClutterText Let's keep whitespace fixes to their own commit to avoid polluting git-blame.
2008-12-11 11:48:17 +00:00
else
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
index_ = position * password_char_bytes;
text: Take pre-edit cursor position into account When determining the cursor position we also need to take into account the pre-edit cursor position as set by the set_preedit_string() function.
2009-10-19 14:31:29 +00:00
g_free (text);
Fix cursor position in preedit status http://bugzilla.openedhand.com/show_bug.cgi?id=1871 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-11-09 08:42:15 +00:00
g_string_free (tmp, TRUE);
General whitespace fixes in ClutterText Let's keep whitespace fixes to their own commit to avoid polluting git-blame.
2008-12-11 11:48:17 +00:00
}
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
pango_layout_get_cursor_pos (clutter_text_get_layout (self),
index_,
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
&rect, NULL);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
if (x)
[text] Expose position_to_coords() The clutter_text_position_to_coords() is useful for ClutterText subclasses. See bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1521 Based on a patch by: Raymond Liu <raymond.liu@intel.com>
2009-05-06 16:18:12 +00:00
{
Remove usage of Units and macros The ClutterUnit and relative macros should not be used when dealing with pixels -- which is to say, all the time when inside Clutter.
2009-06-02 17:44:30 +00:00
*x = (gfloat) rect.x / 1024.0f;
[text] Expose position_to_coords() The clutter_text_position_to_coords() is useful for ClutterText subclasses. See bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1521 Based on a patch by: Raymond Liu <raymond.liu@intel.com>
2009-05-06 16:18:12 +00:00
/* Take any offset due to scrolling into account */
if (priv->single_line_mode)
*x += priv->text_x;
}
General whitespace fixes in ClutterText Let's keep whitespace fixes to their own commit to avoid polluting git-blame.
2008-12-11 11:48:17 +00:00
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
if (y)
Remove usage of Units and macros The ClutterUnit and relative macros should not be used when dealing with pixels -- which is to say, all the time when inside Clutter.
2009-06-02 17:44:30 +00:00
*y = (gfloat) rect.y / 1024.0f;
General whitespace fixes in ClutterText Let's keep whitespace fixes to their own commit to avoid polluting git-blame.
2008-12-11 11:48:17 +00:00
Use units in position_to_coords() We loose precision with a direct conversion for PangoUnits to pixels, so we should do the conversion as needed, inside the callers of clutter_text_position_to_coords().
2008-12-15 18:24:42 +00:00
if (line_height)
Remove usage of Units and macros The ClutterUnit and relative macros should not be used when dealing with pixels -- which is to say, all the time when inside Clutter.
2009-06-02 17:44:30 +00:00
*line_height = (gfloat) rect.height / 1024.0f;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Use units in position_to_coords() We loose precision with a direct conversion for PangoUnits to pixels, so we should do the conversion as needed, inside the callers of clutter_text_position_to_coords().
2008-12-15 18:24:42 +00:00
return TRUE;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
}
General whitespace fixes in ClutterText Let's keep whitespace fixes to their own commit to avoid polluting git-blame.
2008-12-11 11:48:17 +00:00
static inline void
clutter_text_ensure_cursor_position (ClutterText *self)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
General whitespace fixes in ClutterText Let's keep whitespace fixes to their own commit to avoid polluting git-blame.
2008-12-11 11:48:17 +00:00
ClutterTextPrivate *priv = self->priv;
Remove Units from the public API With the recent change to internal floating point values, ClutterUnit has become a redundant type, defined to be a float. All integer entry points are being internally converted to floating point values to be passed to the GL pipeline with the least amount of conversion. ClutterUnit is thus exposed as just a "pixel with fractionary bits", and not -- as users might think -- as generic, resolution and device independent units. not that it was the case, but a definitive amount of people was convinced it did provide this "feature", and was flummoxed about the mere existence of this type. So, having ClutterUnit exposed in the public API doubles the entry points and has the following disadvantages: - we have to maintain twice the amount of entry points in ClutterActor - we still do an integer-to-float implicit conversion - we introduce a weird impedance between pixels and "pixels with fractionary bits" - language bindings will have to choose what to bind, and resort to manually overriding the API + *except* for language bindings based on GObject-Introspection, as they cannot do manual overrides, thus will replicate the entire set of entry points For these reason, we should coalesces every Actor entry point for pixels and for ClutterUnit into a single entry point taking a float, like: void clutter_actor_set_x (ClutterActor *self, gfloat x); void clutter_actor_get_size (ClutterActor *self, gfloat *width, gfloat *height); gfloat clutter_actor_get_height (ClutterActor *self); etc. The issues I have identified are: - we'll have a two cases of compiler warnings: - printf() format of the return values from %d to %f - clutter_actor_get_size() taking floats instead of unsigned ints - we'll have a problem with varargs when passing an integer instead of a floating point value, except on 64bit platforms where the size of a float is the same as the size of an int To be clear: the *intent* of the API should not change -- we still use pixels everywhere -- but: - we remove ambiguity in the API with regard to pixels and units - we remove entry points we get to maintain for the whole 1.0 version of the API - we make things simpler to bind for both manual language bindings and automatic (gobject-introspection based) ones - we have the simplest API possible while still exposing the capabilities of the underlying GL implementation
2009-05-06 15:44:47 +00:00
gfloat x, y, cursor_height;
[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.
2009-04-21 11:06:14 +00:00
ClutterGeometry cursor_pos = { 0, };
gboolean x_changed, y_changed;
gboolean width_changed, height_changed;
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
gint position;
position = priv->position;
text: Take pre-edit cursor position into account When determining the cursor position we also need to take into account the pre-edit cursor position as set by the set_preedit_string() function.
2009-10-19 14:31:29 +00:00
if (priv->editable && priv->preedit_set)
Fix cursor position in preedit status http://bugzilla.openedhand.com/show_bug.cgi?id=1871 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-11-09 08:42:15 +00:00
{
if (position == -1)
position = priv->n_chars;
position += priv->preedit_cursor_pos;
}
text: Take pre-edit cursor position into account When determining the cursor position we also need to take into account the pre-edit cursor position as set by the set_preedit_string() function.
2009-10-19 14:31:29 +00:00
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
CLUTTER_NOTE (MISC, "Cursor at %d (preedit %s at pos: %d)",
position,
priv->preedit_set ? "set" : "unset",
priv->preedit_set ? priv->preedit_cursor_pos : 0);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Use units in position_to_coords() We loose precision with a direct conversion for PangoUnits to pixels, so we should do the conversion as needed, inside the callers of clutter_text_position_to_coords().
2008-12-15 18:24:42 +00:00
x = y = cursor_height = 0;
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
clutter_text_position_to_coords (self, position,
General whitespace fixes in ClutterText Let's keep whitespace fixes to their own commit to avoid polluting git-blame.
2008-12-11 11:48:17 +00:00
&x, &y,
&cursor_height);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
[text] Add ClutterText::delete_selection() Add a method for deleting the current selection inside a Text actor. This is useful for subclasses. See bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1521 Based on a patch by: Raymond Liu <raymond.liu@intel.com>
2009-05-06 16:08:25 +00:00
cursor_pos.x = x;
cursor_pos.y = y;
[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.
2009-04-21 11:06:14 +00:00
cursor_pos.width = priv->cursor_size;
[text] Add ClutterText::delete_selection() Add a method for deleting the current selection inside a Text actor. This is useful for subclasses. See bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1521 Based on a patch by: Raymond Liu <raymond.liu@intel.com>
2009-05-06 16:08:25 +00:00
cursor_pos.height = cursor_height - 2;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
[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.
2009-04-21 11:06:14 +00:00
x_changed = priv->cursor_pos.x != cursor_pos.x;
y_changed = priv->cursor_pos.y != cursor_pos.y;
width_changed = priv->cursor_pos.width != cursor_pos.width;
height_changed = priv->cursor_pos.height != cursor_pos.height;
if (x_changed || y_changed || width_changed || height_changed)
{
priv->cursor_pos = cursor_pos;
g_signal_emit (self, text_signals[CURSOR_EVENT], 0, &priv->cursor_pos);
}
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
}
[text] Add ClutterText::delete_selection() Add a method for deleting the current selection inside a Text actor. This is useful for subclasses. See bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1521 Based on a patch by: Raymond Liu <raymond.liu@intel.com>
2009-05-06 16:08:25 +00:00
/**
* clutter_text_delete_selection:
* @self: a #ClutterText
*
* Deletes the currently selected text
*
* This function is only useful in subclasses of #ClutterText
*
* Return value: %TRUE if text was deleted or if the text actor
* is empty, and %FALSE otherwise
*
* Since: 1.0
*/
gboolean
clutter_text_delete_selection (ClutterText *self)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
[text] Add ClutterText::delete_selection() Add a method for deleting the current selection inside a Text actor. This is useful for subclasses. See bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1521 Based on a patch by: Raymond Liu <raymond.liu@intel.com>
2009-05-06 16:08:25 +00:00
ClutterTextPrivate *priv;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
gint start_index;
gint end_index;
text: Notify :position when it changes The :position property is not notified when changed. http://bugzilla.openedhand.com/show_bug.cgi?id=1830
2009-10-16 13:22:15 +00:00
gint old_position, old_selection;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
[text] Add ClutterText::delete_selection() Add a method for deleting the current selection inside a Text actor. This is useful for subclasses. See bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1521 Based on a patch by: Raymond Liu <raymond.liu@intel.com>
2009-05-06 16:08:25 +00:00
g_return_val_if_fail (CLUTTER_IS_TEXT (self), FALSE);
priv = self->priv;
General whitespace fixes in ClutterText Let's keep whitespace fixes to their own commit to avoid polluting git-blame.
2008-12-11 11:48:17 +00:00
if (!priv->text)
return TRUE;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
start_index = offset_real (priv->text, priv->position);
end_index = offset_real (priv->text, priv->selection_bound);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
if (end_index == start_index)
return FALSE;
if (end_index < start_index)
{
gint temp = start_index;
start_index = end_index;
end_index = temp;
}
text: Notify :position when it changes The :position property is not notified when changed. http://bugzilla.openedhand.com/show_bug.cgi?id=1830
2009-10-16 13:22:15 +00:00
old_position = priv->position;
old_selection = priv->selection_bound;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
clutter_text_delete_text (self, start_index, end_index);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
priv->position = start_index;
priv->selection_bound = start_index;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
Fix problems with "position" and "selection-bound" change notification Added a "selection-bound" notify on clutter_text_clear_selection as it changes the value. Added utility function clutter_text_set_positions, in order to change both cursor position and selection bound inside a g_object_[freeze/thaw]_notify block Added g_object_[freeze/thaw]_notify in other functions that changes both cursor position and selection bound Solves http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-01-25 15:13:58 +00:00
/* Not required to be guarded by g_object_freeze/thaw_notify */
text: Notify :position when it changes The :position property is not notified when changed. http://bugzilla.openedhand.com/show_bug.cgi?id=1830
2009-10-16 13:22:15 +00:00
if (priv->position != old_position)
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_POSITION]);
text: Notify :position when it changes The :position property is not notified when changed. http://bugzilla.openedhand.com/show_bug.cgi?id=1830
2009-10-16 13:22:15 +00:00
if (priv->selection_bound != old_selection)
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SELECTION_BOUND]);
text: Notify :position when it changes The :position property is not notified when changed. http://bugzilla.openedhand.com/show_bug.cgi?id=1830
2009-10-16 13:22:15 +00:00
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
return TRUE;
}
Fix problems with "position" and "selection-bound" change notification Added a "selection-bound" notify on clutter_text_clear_selection as it changes the value. Added utility function clutter_text_set_positions, in order to change both cursor position and selection bound inside a g_object_[freeze/thaw]_notify block Added g_object_[freeze/thaw]_notify in other functions that changes both cursor position and selection bound Solves http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-01-25 15:13:58 +00:00
/*
* Utility function to update both cursor position and selection bound
* at once
*/
static inline void
clutter_text_set_positions (ClutterText *self,
gint new_pos,
gint new_bound)
{
g_object_freeze_notify (G_OBJECT (self));
clutter_text_set_cursor_position (self, new_pos);
clutter_text_set_selection_bound (self, new_bound);
g_object_thaw_notify (G_OBJECT (self));
}
text: Make the :text property not set the :use-markup one Currently, setting the :text property has the side-effect of setting the :use-markup property to FALSE. This prevents constructing a Text actor, or setting its properties, like: g_object_set (text, "use-markup", TRUE, "text", some_string, NULL); as the ordering becomes important. Unfortunately, the ordering of the properties cannot be enforced with ClutterScript or with language bindings. The documentation of the clutter_text_set_text() method should be expanded to properly specify that the set_text() method will change the :use-markup property to FALSE as a side effect.
2009-10-07 20:44:17 +00:00
static inline void
clutter_text_set_text_internal (ClutterText *self,
const gchar *text)
{
ClutterTextPrivate *priv = self->priv;
g_object_freeze_notify (G_OBJECT (self));
if (priv->max_length > 0)
{
gint len = g_utf8_strlen (text, -1);
if (len < priv->max_length)
{
g_free (priv->text);
priv->text = g_strdup (text);
priv->n_bytes = strlen (text);
priv->n_chars = len;
}
else
{
gchar *p = g_utf8_offset_to_pointer (text, priv->max_length);
gchar *n = g_malloc0 ((p - text) + 1);
g_free (priv->text);
g_utf8_strncpy (n, text, priv->max_length);
priv->text = n;
priv->n_bytes = strlen (n);
priv->n_chars = priv->max_length;
}
}
else
{
g_free (priv->text);
priv->text = g_strdup (text);
priv->n_bytes = strlen (text);
priv->n_chars = g_utf8_strlen (text, -1);
}
if (priv->n_bytes == 0)
text: Fixes for selection bound The commit ecbb7ce41a1a759e246fce07f146b8bed5e3d730 exposed some issues when positioning the cursor with the mouse pointer: the selection is not moved along with the cursor when inserting a single character or a string. Also, some freeze_notify() are called too early, leading to decoupling from their respective thaw_notify(). http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-02-02 17:07:22 +00:00
clutter_text_set_positions (self, -1, -1);
text: Make the :text property not set the :use-markup one Currently, setting the :text property has the side-effect of setting the :use-markup property to FALSE. This prevents constructing a Text actor, or setting its properties, like: g_object_set (text, "use-markup", TRUE, "text", some_string, NULL); as the ordering becomes important. Unfortunately, the ordering of the properties cannot be enforced with ClutterScript or with language bindings. The documentation of the clutter_text_set_text() method should be expanded to properly specify that the set_text() method will change the :use-markup property to FALSE as a side effect.
2009-10-07 20:44:17 +00:00
text: Invalidate caches and sizes in set_text_internal() The change in commit 3bbc96e17e5a03ba931c86a5cd2a0ecaa2a3b77b moved the :text property setter to use set_text_internal(); this function does not invalidate the Layout cache and does not queue a relayout, thus breaking the behaviour of ClutterText when setting the contents of the actor using the property. http://bugzilla.openedhand.com/show_bug.cgi?id=1851
2009-10-20 21:05:04 +00:00
clutter_text_dirty_cache (self);
clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
text: Make the :text property not set the :use-markup one Currently, setting the :text property has the side-effect of setting the :use-markup property to FALSE. This prevents constructing a Text actor, or setting its properties, like: g_object_set (text, "use-markup", TRUE, "text", some_string, NULL); as the ordering becomes important. Unfortunately, the ordering of the properties cannot be enforced with ClutterScript or with language bindings. The documentation of the clutter_text_set_text() method should be expanded to properly specify that the set_text() method will change the :use-markup property to FALSE as a side effect.
2009-10-07 20:44:17 +00:00
g_signal_emit (self, text_signals[TEXT_CHANGED], 0);
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_TEXT]);
text: Make the :text property not set the :use-markup one Currently, setting the :text property has the side-effect of setting the :use-markup property to FALSE. This prevents constructing a Text actor, or setting its properties, like: g_object_set (text, "use-markup", TRUE, "text", some_string, NULL); as the ordering becomes important. Unfortunately, the ordering of the properties cannot be enforced with ClutterScript or with language bindings. The documentation of the clutter_text_set_text() method should be expanded to properly specify that the set_text() method will change the :use-markup property to FALSE as a side effect.
2009-10-07 20:44:17 +00:00
g_object_thaw_notify (G_OBJECT (self));
}
static inline void
clutter_text_set_markup_internal (ClutterText *self,
const gchar *str)
{
ClutterTextPrivate *priv = self->priv;
GError *error;
gchar *text = NULL;
PangoAttrList *attrs = NULL;
gboolean res;
error = NULL;
res = pango_parse_markup (str, -1, 0,
&attrs,
&text,
NULL,
&error);
if (!res)
{
if (G_LIKELY (error))
{
g_warning ("Failed to set the markup of the actor of class '%s': %s",
G_OBJECT_TYPE_NAME (self),
error->message);
g_error_free (error);
}
else
g_warning ("Failed to set the markup of the actor of class '%s'",
G_OBJECT_TYPE_NAME (self));
return;
}
if (text)
{
Added ClutterText::insert-text and ClutterText::delete-text signals * clutter/clutter-marshal.list: added new marshaller * clutter/clutter-text.c (clutter_text_class_init): added insert-text and delete-text signals (clutter_text_insert_unichar): emits insert-text signal (clutter_text_insert_text): emits insert-text signal (clutter_text_delete_text): emits delete-text signal (clutter_text_delete_chars): emits delete-text signal (clutter_text_set_markup_internal): emits delete-text and insert-text signals (clutter_text_set_text): emits delete-text and insert-text signals http://bugzilla.openedhand.com/show_bug.cgi?id=1894
2009-11-20 14:17:41 +00:00
gint tmp_pos = 0;
g_signal_emit (self, text_signals[DELETE_TEXT], 0, 0, -1);
g_signal_emit (self, text_signals[INSERT_TEXT], 0, text,
strlen (text), &tmp_pos);
text: Make the :text property not set the :use-markup one Currently, setting the :text property has the side-effect of setting the :use-markup property to FALSE. This prevents constructing a Text actor, or setting its properties, like: g_object_set (text, "use-markup", TRUE, "text", some_string, NULL); as the ordering becomes important. Unfortunately, the ordering of the properties cannot be enforced with ClutterScript or with language bindings. The documentation of the clutter_text_set_text() method should be expanded to properly specify that the set_text() method will change the :use-markup property to FALSE as a side effect.
2009-10-07 20:44:17 +00:00
clutter_text_set_text_internal (self, text);
text: Do not set the markup unconditionally When setting :use-markup we always pass the contents of the Text actor to clutter_text_set_markup_internal(); if string contains any markup, this ends up being parsed and used - even when :use-markup is set to FALSE. http://bugzilla.clutter-project.org/show_bug.cgi?id=2239
2010-08-06 16:04:37 +00:00
text: Make the :text property not set the :use-markup one Currently, setting the :text property has the side-effect of setting the :use-markup property to FALSE. This prevents constructing a Text actor, or setting its properties, like: g_object_set (text, "use-markup", TRUE, "text", some_string, NULL); as the ordering becomes important. Unfortunately, the ordering of the properties cannot be enforced with ClutterScript or with language bindings. The documentation of the clutter_text_set_text() method should be expanded to properly specify that the set_text() method will change the :use-markup property to FALSE as a side effect.
2009-10-07 20:44:17 +00:00
g_free (text);
}
text: Store the markup attributes separately Previously when the markup property is set it would generate an attribute list from the markup and then merge it with the attributes from the attribute property and store it as the effective attributes. The markup attributes and the marked up text would then be forgotten. This breaks if the application then later changes the attributes property because it would try to regenerate the effective attributes from the markup text but the stored text no longer contains any markup. If the original markup text happened to contain entities like '&lt;' they would end up causing parse errors because they would be converted to the actual symbols. To fix this the attributes from the markup are now stored independently from the effective attributes. The effective attributes are now regenerated if either set of attributes changes right before a layout is created. http://bugzilla.openedhand.com/show_bug.cgi?id=1940
2010-01-05 11:58:12 +00:00
/* Store the new markup attributes */
text: Do not set the markup unconditionally When setting :use-markup we always pass the contents of the Text actor to clutter_text_set_markup_internal(); if string contains any markup, this ends up being parsed and used - even when :use-markup is set to FALSE. http://bugzilla.clutter-project.org/show_bug.cgi?id=2239
2010-08-06 16:04:37 +00:00
if (priv->markup_attrs != NULL)
text: Store the markup attributes separately Previously when the markup property is set it would generate an attribute list from the markup and then merge it with the attributes from the attribute property and store it as the effective attributes. The markup attributes and the marked up text would then be forgotten. This breaks if the application then later changes the attributes property because it would try to regenerate the effective attributes from the markup text but the stored text no longer contains any markup. If the original markup text happened to contain entities like '&lt;' they would end up causing parse errors because they would be converted to the actual symbols. To fix this the attributes from the markup are now stored independently from the effective attributes. The effective attributes are now regenerated if either set of attributes changes right before a layout is created. http://bugzilla.openedhand.com/show_bug.cgi?id=1940
2010-01-05 11:58:12 +00:00
pango_attr_list_unref (priv->markup_attrs);
text: Do not set the markup unconditionally When setting :use-markup we always pass the contents of the Text actor to clutter_text_set_markup_internal(); if string contains any markup, this ends up being parsed and used - even when :use-markup is set to FALSE. http://bugzilla.clutter-project.org/show_bug.cgi?id=2239
2010-08-06 16:04:37 +00:00
text: Store the markup attributes separately Previously when the markup property is set it would generate an attribute list from the markup and then merge it with the attributes from the attribute property and store it as the effective attributes. The markup attributes and the marked up text would then be forgotten. This breaks if the application then later changes the attributes property because it would try to regenerate the effective attributes from the markup text but the stored text no longer contains any markup. If the original markup text happened to contain entities like '&lt;' they would end up causing parse errors because they would be converted to the actual symbols. To fix this the attributes from the markup are now stored independently from the effective attributes. The effective attributes are now regenerated if either set of attributes changes right before a layout is created. http://bugzilla.openedhand.com/show_bug.cgi?id=1940
2010-01-05 11:58:12 +00:00
priv->markup_attrs = attrs;
text: Make the :text property not set the :use-markup one Currently, setting the :text property has the side-effect of setting the :use-markup property to FALSE. This prevents constructing a Text actor, or setting its properties, like: g_object_set (text, "use-markup", TRUE, "text", some_string, NULL); as the ordering becomes important. Unfortunately, the ordering of the properties cannot be enforced with ClutterScript or with language bindings. The documentation of the clutter_text_set_text() method should be expanded to properly specify that the set_text() method will change the :use-markup property to FALSE as a side effect.
2009-10-07 20:44:17 +00:00
text: Store the markup attributes separately Previously when the markup property is set it would generate an attribute list from the markup and then merge it with the attributes from the attribute property and store it as the effective attributes. The markup attributes and the marked up text would then be forgotten. This breaks if the application then later changes the attributes property because it would try to regenerate the effective attributes from the markup text but the stored text no longer contains any markup. If the original markup text happened to contain entities like '&lt;' they would end up causing parse errors because they would be converted to the actual symbols. To fix this the attributes from the markup are now stored independently from the effective attributes. The effective attributes are now regenerated if either set of attributes changes right before a layout is created. http://bugzilla.openedhand.com/show_bug.cgi?id=1940
2010-01-05 11:58:12 +00:00
/* Clear the effective attributes so they will be regenerated when a
layout is created */
text: Do not set the markup unconditionally When setting :use-markup we always pass the contents of the Text actor to clutter_text_set_markup_internal(); if string contains any markup, this ends up being parsed and used - even when :use-markup is set to FALSE. http://bugzilla.clutter-project.org/show_bug.cgi?id=2239
2010-08-06 16:04:37 +00:00
if (priv->effective_attrs != NULL)
text: Store the markup attributes separately Previously when the markup property is set it would generate an attribute list from the markup and then merge it with the attributes from the attribute property and store it as the effective attributes. The markup attributes and the marked up text would then be forgotten. This breaks if the application then later changes the attributes property because it would try to regenerate the effective attributes from the markup text but the stored text no longer contains any markup. If the original markup text happened to contain entities like '&lt;' they would end up causing parse errors because they would be converted to the actual symbols. To fix this the attributes from the markup are now stored independently from the effective attributes. The effective attributes are now regenerated if either set of attributes changes right before a layout is created. http://bugzilla.openedhand.com/show_bug.cgi?id=1940
2010-01-05 11:58:12 +00:00
{
pango_attr_list_unref (priv->effective_attrs);
priv->effective_attrs = NULL;
text: Make the :text property not set the :use-markup one Currently, setting the :text property has the side-effect of setting the :use-markup property to FALSE. This prevents constructing a Text actor, or setting its properties, like: g_object_set (text, "use-markup", TRUE, "text", some_string, NULL); as the ordering becomes important. Unfortunately, the ordering of the properties cannot be enforced with ClutterScript or with language bindings. The documentation of the clutter_text_set_text() method should be expanded to properly specify that the set_text() method will change the :use-markup property to FALSE as a side effect.
2009-10-07 20:44:17 +00:00
}
}
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
static void
clutter_text_set_property (GObject *gobject,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
ClutterText *self = CLUTTER_TEXT (gobject);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
switch (prop_id)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
case PROP_TEXT:
text: Make the :text property not set the :use-markup one Currently, setting the :text property has the side-effect of setting the :use-markup property to FALSE. This prevents constructing a Text actor, or setting its properties, like: g_object_set (text, "use-markup", TRUE, "text", some_string, NULL); as the ordering becomes important. Unfortunately, the ordering of the properties cannot be enforced with ClutterScript or with language bindings. The documentation of the clutter_text_set_text() method should be expanded to properly specify that the set_text() method will change the :use-markup property to FALSE as a side effect.
2009-10-07 20:44:17 +00:00
clutter_text_set_text_internal (self, g_value_get_string (value));
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
break;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
case PROP_COLOR:
clutter_text_set_color (self, clutter_value_get_color (value));
break;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
case PROP_FONT_NAME:
clutter_text_set_font_name (self, g_value_get_string (value));
break;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
text: Add :font-description High level toolkits might wish to construct a PangoFontDescription and then set it directly on a ClutterText actor proxy or sub-class. ClutterText should have a :font-description property to set (and get) the PangoFontDescription. http://bugzilla.openedhand.com/show_bug.cgi?id=1960
2010-02-03 14:35:45 +00:00
case PROP_FONT_DESCRIPTION:
clutter_text_set_font_description (self, g_value_get_boxed (value));
break;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
case PROP_USE_MARKUP:
clutter_text_set_use_markup (self, g_value_get_boolean (value));
break;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
case PROP_ATTRIBUTES:
clutter_text_set_attributes (self, g_value_get_boxed (value));
break;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
[text] Rename :alignment to :line-alignment The :alignment property is prone to generate confusion: developers will set it thinking that the contents of a ClutterText will automagically align themselves. Instead of using the generic term :alignment, and following the GTK+ convention, we should use a more specific term, conveying the actual effect of the property: alignment of the lines with respect to each other, and not to the overall allocated area. See bug 1428: http://bugzilla.openedhand.com/show_bug.cgi?id=1428
2009-02-02 23:55:30 +00:00
case PROP_LINE_ALIGNMENT:
clutter_text_set_line_alignment (self, g_value_get_enum (value));
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
break;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
case PROP_LINE_WRAP:
clutter_text_set_line_wrap (self, g_value_get_boolean (value));
break;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
case PROP_LINE_WRAP_MODE:
clutter_text_set_line_wrap_mode (self, g_value_get_enum (value));
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
break;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
case PROP_JUSTIFY:
clutter_text_set_justify (self, g_value_get_boolean (value));
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
break;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
case PROP_ELLIPSIZE:
clutter_text_set_ellipsize (self, g_value_get_enum (value));
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
break;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
case PROP_POSITION:
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
clutter_text_set_cursor_position (self, g_value_get_int (value));
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
break;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
case PROP_SELECTION_BOUND:
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
clutter_text_set_selection_bound (self, g_value_get_int (value));
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
break;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
[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.
2009-04-06 14:22:31 +00:00
case PROP_SELECTION_COLOR:
clutter_text_set_selection_color (self, g_value_get_boxed (value));
break;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
case PROP_CURSOR_VISIBLE:
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
clutter_text_set_cursor_visible (self, g_value_get_boolean (value));
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
break;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
case PROP_CURSOR_COLOR:
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
clutter_text_set_cursor_color (self, g_value_get_boxed (value));
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
break;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
Add :cursor-size property to ClutterText We can control the width of the cursor when painting by using a simple property. The magic -1 number passed to the setter method will reset the cursor size to the default one of 2px. The getter method will return an unsigned integer with the current size.
2008-12-16 10:37:45 +00:00
case PROP_CURSOR_SIZE:
clutter_text_set_cursor_size (self, g_value_get_int (value));
break;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
case PROP_EDITABLE:
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
clutter_text_set_editable (self, g_value_get_boolean (value));
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
break;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
case PROP_ACTIVATABLE:
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
clutter_text_set_activatable (self, g_value_get_boolean (value));
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
break;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
case PROP_SELECTABLE:
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
clutter_text_set_selectable (self, g_value_get_boolean (value));
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
break;
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
case PROP_PASSWORD_CHAR:
clutter_text_set_password_char (self, g_value_get_uint (value));
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
break;
Implement Text:max-length The :max-length property establishes the maximum available length for the Text actor's contents, in characters.
2008-12-11 11:54:07 +00:00
case PROP_MAX_LENGTH:
clutter_text_set_max_length (self, g_value_get_int (value));
break;
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
case PROP_SINGLE_LINE_MODE:
clutter_text_set_single_line_mode (self, g_value_get_boolean (value));
break;
clutter-text: Add a selected-text-color http://bugzilla.clutter-project.org/show_bug.cgi?id=2595
2011-03-02 17:02:56 +00:00
case PROP_SELECTED_TEXT_COLOR:
clutter_text_set_selected_text_color (self, clutter_value_get_color (value));
break;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
}
}
static void
clutter_text_get_property (GObject *gobject,
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
guint prop_id,
GValue *value,
GParamSpec *pspec)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
ClutterTextPrivate *priv = CLUTTER_TEXT (gobject)->priv;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
switch (prop_id)
{
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
case PROP_TEXT:
g_value_set_string (value, priv->text);
break;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
case PROP_FONT_NAME:
g_value_set_string (value, priv->font_name);
break;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
text: Add :font-description High level toolkits might wish to construct a PangoFontDescription and then set it directly on a ClutterText actor proxy or sub-class. ClutterText should have a :font-description property to set (and get) the PangoFontDescription. http://bugzilla.openedhand.com/show_bug.cgi?id=1960
2010-02-03 14:35:45 +00:00
case PROP_FONT_DESCRIPTION:
g_value_set_boxed (value, priv->font_desc);
break;
[text] implement get_property for "use-markup"
2009-09-08 12:06:51 +00:00
case PROP_USE_MARKUP:
g_value_set_boolean (value, priv->use_markup);
break;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
case PROP_COLOR:
clutter_value_set_color (value, &priv->text_color);
break;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
case PROP_CURSOR_VISIBLE:
g_value_set_boolean (value, priv->cursor_visible);
break;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
case PROP_CURSOR_COLOR:
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
clutter_value_set_color (value, &priv->cursor_color);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
break;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
Add :cursor-color-set property declaration The :cursor-color-set property is a read-only property that reflects whether the ClutterText actor is going to use the color set inside the :cursor-color property when painting the cursor.
2008-12-11 11:49:14 +00:00
case PROP_CURSOR_COLOR_SET:
g_value_set_boolean (value, priv->cursor_color_set);
break;
Add :cursor-size property to ClutterText We can control the width of the cursor when painting by using a simple property. The magic -1 number passed to the setter method will reset the cursor size to the default one of 2px. The getter method will return an unsigned integer with the current size.
2008-12-16 10:37:45 +00:00
case PROP_CURSOR_SIZE:
g_value_set_int (value, priv->cursor_size);
break;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
case PROP_POSITION:
[text] Fix GObject properties in ClutterText Some of the read-write properties of ClutterText were missing an implementation in clutter_text_get_property(), as well as the :position and :selection-bound properties being wrongly converted from fixed point to integer, passing through floating point values.
2009-01-08 17:06:04 +00:00
g_value_set_int (value, priv->position);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
break;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
case PROP_SELECTION_BOUND:
[text] Fix GObject properties in ClutterText Some of the read-write properties of ClutterText were missing an implementation in clutter_text_get_property(), as well as the :position and :selection-bound properties being wrongly converted from fixed point to integer, passing through floating point values.
2009-01-08 17:06:04 +00:00
g_value_set_int (value, priv->selection_bound);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
break;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
case PROP_EDITABLE:
g_value_set_boolean (value, priv->editable);
break;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
case PROP_SELECTABLE:
g_value_set_boolean (value, priv->selectable);
break;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
[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.
2009-04-06 14:22:31 +00:00
case PROP_SELECTION_COLOR:
clutter_value_set_color (value, &priv->selection_color);
break;
case PROP_SELECTION_COLOR_SET:
g_value_set_boolean (value, priv->selection_color_set);
break;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
case PROP_ACTIVATABLE:
g_value_set_boolean (value, priv->activatable);
break;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
case PROP_PASSWORD_CHAR:
g_value_set_uint (value, priv->password_char);
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
break;
Implement Text:max-length The :max-length property establishes the maximum available length for the Text actor's contents, in characters.
2008-12-11 11:54:07 +00:00
case PROP_MAX_LENGTH:
g_value_set_int (value, priv->max_length);
break;
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
case PROP_SINGLE_LINE_MODE:
g_value_set_boolean (value, priv->single_line_mode);
break;
[text] Fix GObject properties in ClutterText Some of the read-write properties of ClutterText were missing an implementation in clutter_text_get_property(), as well as the :position and :selection-bound properties being wrongly converted from fixed point to integer, passing through floating point values.
2009-01-08 17:06:04 +00:00
case PROP_ELLIPSIZE:
g_value_set_enum (value, priv->ellipsize);
break;
case PROP_LINE_WRAP:
g_value_set_boolean (value, priv->wrap);
break;
case PROP_LINE_WRAP_MODE:
g_value_set_enum (value, priv->wrap_mode);
break;
[text] Rename :alignment to :line-alignment The :alignment property is prone to generate confusion: developers will set it thinking that the contents of a ClutterText will automagically align themselves. Instead of using the generic term :alignment, and following the GTK+ convention, we should use a more specific term, conveying the actual effect of the property: alignment of the lines with respect to each other, and not to the overall allocated area. See bug 1428: http://bugzilla.openedhand.com/show_bug.cgi?id=1428
2009-02-02 23:55:30 +00:00
case PROP_LINE_ALIGNMENT:
[text] Fix GObject properties in ClutterText Some of the read-write properties of ClutterText were missing an implementation in clutter_text_get_property(), as well as the :position and :selection-bound properties being wrongly converted from fixed point to integer, passing through floating point values.
2009-01-08 17:06:04 +00:00
g_value_set_enum (value, priv->alignment);
break;
case PROP_JUSTIFY:
g_value_set_boolean (value, priv->justify);
break;
case PROP_ATTRIBUTES:
g_value_set_boxed (value, priv->attrs);
break;
clutter-text: Add a selected-text-color http://bugzilla.clutter-project.org/show_bug.cgi?id=2595
2011-03-02 17:02:56 +00:00
case PROP_SELECTED_TEXT_COLOR:
clutter_value_set_color (value, &priv->selected_text_color);
break;
case PROP_SELECTED_TEXT_COLOR_SET:
g_value_set_boolean (value, priv->selected_text_color_set);
break;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
}
}
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
static void
clutter_text_dispose (GObject *gobject)
{
ClutterText *self = CLUTTER_TEXT (gobject);
Listen for the font-changed signal on the backend in ClutterText Whenever a ClutterText is created it now connects to the font-changed signal. When it is emitted the layout cache is dirtied and a relayout is queued. That way changes to the font options or resolution will cause an immediate update to the labels in the scene.
2009-01-27 16:47:20 +00:00
ClutterTextPrivate *priv = self->priv;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
/* get rid of the entire cache */
clutter_text_dirty_cache (self);
text: Dirty layout cache on text direction changes When the text direction changes we should evict the cached layouts to avoid stale entries in case the direction change produces a layout with the same size.
2009-11-10 12:18:32 +00:00
if (priv->direction_changed_id)
{
g_signal_handler_disconnect (self, priv->direction_changed_id);
priv->direction_changed_id = 0;
}
Listen for the font-changed signal on the backend in ClutterText Whenever a ClutterText is created it now connects to the font-changed signal. When it is emitted the layout cache is dirtied and a relayout is queued. That way changes to the font options or resolution will cause an immediate update to the labels in the scene.
2009-01-27 16:47:20 +00:00
if (priv->font_changed_id)
{
g_signal_handler_disconnect (clutter_get_default_backend (),
priv->font_changed_id);
priv->font_changed_id = 0;
}
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
G_OBJECT_CLASS (clutter_text_parent_class)->dispose (gobject);
}
static void
clutter_text_finalize (GObject *gobject)
{
ClutterText *self = CLUTTER_TEXT (gobject);
ClutterTextPrivate *priv = self->priv;
if (priv->font_desc)
pango_font_description_free (priv->font_desc);
text: Free the Pango attribute list resources The ClutterText owns three PangoAttrList resources which were not being unref'd. This adds the unref calls to the finalize method.
2010-01-05 11:44:17 +00:00
if (priv->attrs)
pango_attr_list_unref (priv->attrs);
text: Store the markup attributes separately Previously when the markup property is set it would generate an attribute list from the markup and then merge it with the attributes from the attribute property and store it as the effective attributes. The markup attributes and the marked up text would then be forgotten. This breaks if the application then later changes the attributes property because it would try to regenerate the effective attributes from the markup text but the stored text no longer contains any markup. If the original markup text happened to contain entities like '&lt;' they would end up causing parse errors because they would be converted to the actual symbols. To fix this the attributes from the markup are now stored independently from the effective attributes. The effective attributes are now regenerated if either set of attributes changes right before a layout is created. http://bugzilla.openedhand.com/show_bug.cgi?id=1940
2010-01-05 11:58:12 +00:00
if (priv->markup_attrs)
pango_attr_list_unref (priv->markup_attrs);
text: Free the Pango attribute list resources The ClutterText owns three PangoAttrList resources which were not being unref'd. This adds the unref calls to the finalize method.
2010-01-05 11:44:17 +00:00
if (priv->effective_attrs)
pango_attr_list_unref (priv->effective_attrs);
if (priv->preedit_attrs)
pango_attr_list_unref (priv->preedit_attrs);
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
clutter_text_dirty_paint_volume (self);
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
g_free (priv->text);
g_free (priv->font_name);
G_OBJECT_CLASS (clutter_text_parent_class)->finalize (gobject);
}
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
typedef void (* ClutterTextSelectionFunc) (ClutterText *text,
const ClutterActorBox *box,
gpointer user_data);
static void
clutter_text_foreach_selection_rectangle (ClutterText *self,
ClutterTextSelectionFunc func,
gpointer user_data)
{
ClutterTextPrivate *priv = self->priv;
PangoLayout *layout = clutter_text_get_layout (self);
gchar *utf8 = clutter_text_get_display_text (self);
gint lines;
gint start_index;
gint end_index;
gint line_no;
if (priv->position == 0)
start_index = 0;
else
start_index = offset_to_bytes (utf8, priv->position);
if (priv->selection_bound == 0)
end_index = 0;
else
end_index = offset_to_bytes (utf8, priv->selection_bound);
if (start_index > end_index)
{
gint temp = start_index;
start_index = end_index;
end_index = temp;
}
lines = pango_layout_get_line_count (layout);
for (line_no = 0; line_no < lines; line_no++)
{
PangoLayoutLine *line;
gint n_ranges;
gint *ranges;
gint i;
gint index_;
gint maxindex;
ClutterActorBox box;
gfloat y, height;
line = pango_layout_get_line_readonly (layout, line_no);
pango_layout_line_x_to_index (line, G_MAXINT, &maxindex, NULL);
if (maxindex < start_index)
continue;
pango_layout_line_get_x_ranges (line, start_index, end_index,
&ranges,
&n_ranges);
pango_layout_line_x_to_index (line, 0, &index_, NULL);
clutter_text_position_to_coords (self,
bytes_to_offset (utf8, index_),
NULL, &y, &height);
box.y1 = y;
box.y2 = y + height;
for (i = 0; i < n_ranges; i++)
{
text: Make sure that the selection box is big enough Do not use integers to store the result of the PANGO_UNITS scaling to avoid rounding issues with the default C rules. We should use cielf() instead.
2011-07-10 09:24:40 +00:00
gfloat range_x;
gfloat range_width;
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
range_x = ranges[i * 2] / PANGO_SCALE;
/* Account for any scrolling in single line mode */
if (priv->single_line_mode)
range_x += priv->text_x;
text: Make sure that the selection box is big enough Do not use integers to store the result of the PANGO_UNITS scaling to avoid rounding issues with the default C rules. We should use cielf() instead.
2011-07-10 09:24:40 +00:00
range_width = ((gfloat) ranges[i * 2 + 1] - (gfloat) ranges[i * 2])
/ PANGO_SCALE;
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
box.x1 = range_x;
text: Make sure that the selection box is big enough Do not use integers to store the result of the PANGO_UNITS scaling to avoid rounding issues with the default C rules. We should use cielf() instead.
2011-07-10 09:24:40 +00:00
box.x2 = ceilf (range_x + range_width + .5f);
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
func (self, &box, user_data);
}
g_free (ranges);
}
g_free (utf8);
}
static void
text: Make sure that the selection box is big enough Do not use integers to store the result of the PANGO_UNITS scaling to avoid rounding issues with the default C rules. We should use cielf() instead.
2011-07-10 09:24:40 +00:00
add_selection_rectangle_to_path (ClutterText *text,
const ClutterActorBox *box,
gpointer user_data)
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
{
cogl_path_rectangle (user_data, box->x1, box->y1, box->x2, box->y2);
}
clutter-text: Add a selected-text-color http://bugzilla.clutter-project.org/show_bug.cgi?id=2595
2011-03-02 17:02:56 +00:00
/* Draws the selected text, its background, and the cursor */
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
static void
clutter-text: Add a selected-text-color http://bugzilla.clutter-project.org/show_bug.cgi?id=2595
2011-03-02 17:02:56 +00:00
selection_paint (ClutterText *self)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
ClutterTextPrivate *priv = self->priv;
Use the paint opacity when painting a ClutterText ClutterText should use the paint opacity for both text and cursor. ClutterLabel had the wrong behaviour, as it set the actor's opacity using the text color's alpha channel, and ClutterEntry completely disregarded the actor's opacity when painting the cursor. This commit harmonizes the ClutterText behaviour to always use a composition of the actor's paint opacity and the text and cursor alpha channel values, thus behaving more consistently with the rest of Clutter.
2008-12-11 12:18:26 +00:00
ClutterActor *actor = CLUTTER_ACTOR (self);
clutter-text: Add a selected-text-color http://bugzilla.clutter-project.org/show_bug.cgi?id=2595
2011-03-02 17:02:56 +00:00
guint8 paint_opacity = clutter_actor_get_paint_opacity (actor);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
text: Check the has_focus flag in selection_paint() It is the only place were it is used, so it should only be checked there, and not in the general paint() implementation.
2011-05-13 13:26:22 +00:00
if (!priv->has_focus)
return;
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
if (priv->editable && priv->cursor_visible)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
[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.
2009-04-06 14:22:31 +00:00
const ClutterColor *color;
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
gint position;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
position = priv->position;
if (position == priv->selection_bound)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
clutter-text: Add a selected-text-color http://bugzilla.clutter-project.org/show_bug.cgi?id=2595
2011-03-02 17:02:56 +00:00
/* No selection, just draw the cursor */
[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.
2009-04-06 14:22:31 +00:00
if (priv->cursor_color_set)
color = &priv->cursor_color;
else
color = &priv->text_color;
cogl_set_source_color4ub (color->red,
color->green,
color->blue,
paint_opacity
* color->alpha
/ 255);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
cogl_rectangle (priv->cursor_pos.x,
priv->cursor_pos.y,
Changes cogl_rectangle to take x1, y1, x2, y2 args not x1, y1, width, height This makes it consistent with cogl_rectangle_with_{multi,}texture_coords. Notably the reason cogl_rectangle_with_{multi,}texture_coords wasn't changed instead is that the former approach lets you describe back facing rectangles. (though technically you could pass negative width/height values to achieve this; it doesn't seem as neat.)
2009-01-28 14:47:03 +00:00
priv->cursor_pos.x + priv->cursor_pos.width,
priv->cursor_pos.y + priv->cursor_pos.height);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
}
else
{
clutter-text: Add a selected-text-color http://bugzilla.clutter-project.org/show_bug.cgi?id=2595
2011-03-02 17:02:56 +00:00
/* Paint selection background first */
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
PangoLayout *layout = clutter_text_get_layout (self);
clutter-text: Add a selected-text-color http://bugzilla.clutter-project.org/show_bug.cgi?id=2595
2011-03-02 17:02:56 +00:00
CoglPath *selection_path = cogl_path_new ();
CoglColor cogl_color = { 0, };
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
clutter-text: Add a selected-text-color http://bugzilla.clutter-project.org/show_bug.cgi?id=2595
2011-03-02 17:02:56 +00:00
/* Paint selection background */
if (priv->selection_color_set)
color = &priv->selection_color;
else if (priv->cursor_color_set)
color = &priv->cursor_color;
else
color = &priv->text_color;
cogl_set_source_color4ub (color->red,
color->green,
color->blue,
paint_opacity * color->alpha / 255);
text: Make sure that the selection box is big enough Do not use integers to store the result of the PANGO_UNITS scaling to avoid rounding issues with the default C rules. We should use cielf() instead.
2011-07-10 09:24:40 +00:00
clutter_text_foreach_selection_rectangle (self,
add_selection_rectangle_to_path,
selection_path);
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
clutter-text: Add a selected-text-color http://bugzilla.clutter-project.org/show_bug.cgi?id=2595
2011-03-02 17:02:56 +00:00
cogl_path_fill (selection_path);
/* Paint selected text */
cogl_clip_push_from_path (selection_path);
cogl_object_unref (selection_path);
if (priv->selected_text_color_set)
color = &priv->selected_text_color;
else if (priv->selection_color_set)
color = &priv->selection_color;
else if (priv->cursor_color_set)
color = &priv->cursor_color;
else
color = &priv->text_color;
cogl_color_init_from_4ub (&cogl_color,
color->red,
color->green,
color->blue,
paint_opacity * color->alpha / 255);
cogl_pango_render_layout (layout, priv->text_x, 0, &cogl_color, 0);
cogl_clip_pop ();
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
}
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
}
}
[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
2009-03-30 15:46:57 +00:00
static gint
clutter_text_move_word_backward (ClutterText *self,
gint start)
{
ClutterTextPrivate *priv = self->priv;
gint retval = start;
if (priv->text && start > 0)
{
PangoLayout *layout = clutter_text_get_layout (self);
PangoLogAttr *log_attrs = NULL;
gint n_attrs = 0;
pango_layout_get_log_attrs (layout, &log_attrs, &n_attrs);
retval = start - 1;
while (retval > 0 && !log_attrs[retval].is_word_start)
retval -= 1;
g_free (log_attrs);
}
return retval;
}
static gint
clutter_text_move_word_forward (ClutterText *self,
gint start)
{
ClutterTextPrivate *priv = self->priv;
gint retval = start;
[text] move_word_backward/forward fixes clutter_text_move_word_backward/forward() calls did not use the start argument consistently. Also, clutter_text_move_word_forward() bound check checked the wrong end. Fixes #1765 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-08-16 21:00:35 +00:00
if (priv->text && start < priv->n_chars)
[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
2009-03-30 15:46:57 +00:00
{
PangoLayout *layout = clutter_text_get_layout (self);
PangoLogAttr *log_attrs = NULL;
gint n_attrs = 0;
pango_layout_get_log_attrs (layout, &log_attrs, &n_attrs);
[text] move_word_backward/forward fixes clutter_text_move_word_backward/forward() calls did not use the start argument consistently. Also, clutter_text_move_word_forward() bound check checked the wrong end. Fixes #1765 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-08-16 21:00:35 +00:00
retval = start + 1;
while (retval < priv->n_chars && !log_attrs[retval].is_word_end)
[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
2009-03-30 15:46:57 +00:00
retval += 1;
g_free (log_attrs);
}
return retval;
}
static gint
clutter_text_move_line_start (ClutterText *self,
gint start)
{
ClutterTextPrivate *priv = self->priv;
PangoLayoutLine *layout_line;
PangoLayout *layout;
gint line_no;
gint index_;
gint position;
layout = clutter_text_get_layout (self);
if (start == 0)
index_ = 0;
else
index_ = offset_to_bytes (priv->text, start);
pango_layout_index_to_line_x (layout, index_,
0,
&line_no, NULL);
layout_line = pango_layout_get_line_readonly (layout, line_no);
if (!layout_line)
return FALSE;
pango_layout_line_x_to_index (layout_line, 0, &index_, NULL);
position = bytes_to_offset (priv->text, index_);
return position;
}
static gint
clutter_text_move_line_end (ClutterText *self,
gint start)
{
ClutterTextPrivate *priv = self->priv;
PangoLayoutLine *layout_line;
PangoLayout *layout;
gint line_no;
gint index_;
gint trailing;
gint position;
layout = clutter_text_get_layout (self);
if (start == 0)
index_ = 0;
else
index_ = offset_to_bytes (priv->text, priv->position);
pango_layout_index_to_line_x (layout, index_,
0,
&line_no, NULL);
layout_line = pango_layout_get_line_readonly (layout, line_no);
if (!layout_line)
return FALSE;
pango_layout_line_x_to_index (layout_line, G_MAXINT, &index_, &trailing);
index_ += trailing;
position = bytes_to_offset (priv->text, index_);
return position;
}
static void
clutter_text_select_word (ClutterText *self)
{
gint cursor_pos = self->priv->position;
gint start_pos, end_pos;
start_pos = clutter_text_move_word_backward (self, cursor_pos);
end_pos = clutter_text_move_word_forward (self, cursor_pos);
clutter_text_set_selection (self, start_pos, end_pos);
}
static void
clutter_text_select_line (ClutterText *self)
{
ClutterTextPrivate *priv = self->priv;
gint cursor_pos = priv->position;
gint start_pos, end_pos;
if (priv->single_line_mode)
{
start_pos = 0;
end_pos = -1;
}
else
{
start_pos = clutter_text_move_line_start (self, cursor_pos);
end_pos = clutter_text_move_line_end (self, cursor_pos);
}
clutter_text_set_selection (self, start_pos, end_pos);
}
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
static gboolean
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
clutter_text_button_press (ClutterActor *actor,
Do not use contractions when not needed I understand we are not Pascal developers, and we don't have to use cute and cuddly names like "i_am_an_integer_counter", but a ClutterButtonEvent should be stored inside an "event" variable. Using "bev" instead? Mmmh, not so much.
2008-12-11 12:21:57 +00:00
ClutterButtonEvent *event)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
ClutterText *self = CLUTTER_TEXT (actor);
ClutterTextPrivate *priv = self->priv;
[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.
2009-03-30 06:54:42 +00:00
gboolean res = FALSE;
Remove Units from the public API With the recent change to internal floating point values, ClutterUnit has become a redundant type, defined to be a float. All integer entry points are being internally converted to floating point values to be passed to the GL pipeline with the least amount of conversion. ClutterUnit is thus exposed as just a "pixel with fractionary bits", and not -- as users might think -- as generic, resolution and device independent units. not that it was the case, but a definitive amount of people was convinced it did provide this "feature", and was flummoxed about the mere existence of this type. So, having ClutterUnit exposed in the public API doubles the entry points and has the following disadvantages: - we have to maintain twice the amount of entry points in ClutterActor - we still do an integer-to-float implicit conversion - we introduce a weird impedance between pixels and "pixels with fractionary bits" - language bindings will have to choose what to bind, and resort to manually overriding the API + *except* for language bindings based on GObject-Introspection, as they cannot do manual overrides, thus will replicate the entire set of entry points For these reason, we should coalesces every Actor entry point for pixels and for ClutterUnit into a single entry point taking a float, like: void clutter_actor_set_x (ClutterActor *self, gfloat x); void clutter_actor_get_size (ClutterActor *self, gfloat *width, gfloat *height); gfloat clutter_actor_get_height (ClutterActor *self); etc. The issues I have identified are: - we'll have a two cases of compiler warnings: - printf() format of the return values from %d to %f - clutter_actor_get_size() taking floats instead of unsigned ints - we'll have a problem with varargs when passing an integer instead of a floating point value, except on 64bit platforms where the size of a float is the same as the size of an int To be clear: the *intent* of the API should not change -- we still use pixels everywhere -- but: - we remove ambiguity in the API with regard to pixels and units - we remove entry points we get to maintain for the whole 1.0 version of the API - we make things simpler to bind for both manual language bindings and automatic (gobject-introspection based) ones - we have the simplest API possible while still exposing the capabilities of the underlying GL implementation
2009-05-06 15:44:47 +00:00
gfloat x, y;
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
gint index_;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
ClutterText: Only grab keyboard focus if keyboard-interactive. Previously, ClutterText took keyboard focus on mouse-down, regardless if it were editable or selectable. Now it checks these properties, and behaves like other actors if it can't do anything useful with the focus. http://bugzilla.clutter-project.org/show_bug.cgi?id=2462
2010-12-09 14:39:23 +00:00
/* we'll steal keyfocus if we need it */
if (priv->editable || priv->selectable)
clutter_actor_grab_key_focus (actor);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
[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.
2009-03-30 06:54:42 +00:00
/* if the actor is empty we just reset everything and not
* set up the dragging of the selection since there's nothing
* to select
*/
if (priv->text == NULL || priv->text[0] == '\0')
{
Fix problems with "position" and "selection-bound" change notification Added a "selection-bound" notify on clutter_text_clear_selection as it changes the value. Added utility function clutter_text_set_positions, in order to change both cursor position and selection bound inside a g_object_[freeze/thaw]_notify block Added g_object_[freeze/thaw]_notify in other functions that changes both cursor position and selection bound Solves http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-01-25 15:13:58 +00:00
clutter_text_set_positions (self, -1, -1);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
[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.
2009-03-30 06:54:42 +00:00
return TRUE;
}
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Remove usage of Units and macros The ClutterUnit and relative macros should not be used when dealing with pixels -- which is to say, all the time when inside Clutter.
2009-06-02 17:44:30 +00:00
res = clutter_actor_transform_stage_point (actor,
event->x,
event->y,
&x, &y);
[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.
2009-03-30 06:54:42 +00:00
if (res)
{
[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
2009-03-30 15:46:57 +00:00
gint offset;
Remove usage of Units and macros The ClutterUnit and relative macros should not be used when dealing with pixels -- which is to say, all the time when inside Clutter.
2009-06-02 17:44:30 +00:00
index_ = clutter_text_coords_to_position (self, x, y);
[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
2009-03-30 15:46:57 +00:00
offset = bytes_to_offset (priv->text, index_);
/* what we select depends on the number of button clicks we
* receive:
*
* 1: just position the cursor and the selection
* 2: select the current word
* 3: select the contents of the whole actor
*/
if (event->click_count == 1)
{
Fix problems with "position" and "selection-bound" change notification Added a "selection-bound" notify on clutter_text_clear_selection as it changes the value. Added utility function clutter_text_set_positions, in order to change both cursor position and selection bound inside a g_object_[freeze/thaw]_notify block Added g_object_[freeze/thaw]_notify in other functions that changes both cursor position and selection bound Solves http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-01-25 15:13:58 +00:00
clutter_text_set_positions (self, offset, offset);
[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
2009-03-30 15:46:57 +00:00
}
else if (event->click_count == 2)
{
clutter_text_select_word (self);
}
else if (event->click_count == 3)
{
clutter_text_select_line (self);
}
[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.
2009-03-30 06:54:42 +00:00
}
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
/* grab the pointer */
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
priv->in_select_drag = TRUE;
clutter_grab_pointer (actor);
return TRUE;
}
static gboolean
clutter_text_motion (ClutterActor *actor,
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
ClutterMotionEvent *mev)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
Remove usage of Units and macros The ClutterUnit and relative macros should not be used when dealing with pixels -- which is to say, all the time when inside Clutter.
2009-06-02 17:44:30 +00:00
ClutterText *self = CLUTTER_TEXT (actor);
ClutterTextPrivate *priv = self->priv;
Remove Units from the public API With the recent change to internal floating point values, ClutterUnit has become a redundant type, defined to be a float. All integer entry points are being internally converted to floating point values to be passed to the GL pipeline with the least amount of conversion. ClutterUnit is thus exposed as just a "pixel with fractionary bits", and not -- as users might think -- as generic, resolution and device independent units. not that it was the case, but a definitive amount of people was convinced it did provide this "feature", and was flummoxed about the mere existence of this type. So, having ClutterUnit exposed in the public API doubles the entry points and has the following disadvantages: - we have to maintain twice the amount of entry points in ClutterActor - we still do an integer-to-float implicit conversion - we introduce a weird impedance between pixels and "pixels with fractionary bits" - language bindings will have to choose what to bind, and resort to manually overriding the API + *except* for language bindings based on GObject-Introspection, as they cannot do manual overrides, thus will replicate the entire set of entry points For these reason, we should coalesces every Actor entry point for pixels and for ClutterUnit into a single entry point taking a float, like: void clutter_actor_set_x (ClutterActor *self, gfloat x); void clutter_actor_get_size (ClutterActor *self, gfloat *width, gfloat *height); gfloat clutter_actor_get_height (ClutterActor *self); etc. The issues I have identified are: - we'll have a two cases of compiler warnings: - printf() format of the return values from %d to %f - clutter_actor_get_size() taking floats instead of unsigned ints - we'll have a problem with varargs when passing an integer instead of a floating point value, except on 64bit platforms where the size of a float is the same as the size of an int To be clear: the *intent* of the API should not change -- we still use pixels everywhere -- but: - we remove ambiguity in the API with regard to pixels and units - we remove entry points we get to maintain for the whole 1.0 version of the API - we make things simpler to bind for both manual language bindings and automatic (gobject-introspection based) ones - we have the simplest API possible while still exposing the capabilities of the underlying GL implementation
2009-05-06 15:44:47 +00:00
gfloat x, y;
Remove usage of Units and macros The ClutterUnit and relative macros should not be used when dealing with pixels -- which is to say, all the time when inside Clutter.
2009-06-02 17:44:30 +00:00
gint index_, offset;
gboolean res;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
if (!priv->in_select_drag)
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
return FALSE;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Remove usage of Units and macros The ClutterUnit and relative macros should not be used when dealing with pixels -- which is to say, all the time when inside Clutter.
2009-06-02 17:44:30 +00:00
res = clutter_actor_transform_stage_point (actor,
mev->x, mev->y,
&x, &y);
if (!res)
return FALSE;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Remove usage of Units and macros The ClutterUnit and relative macros should not be used when dealing with pixels -- which is to say, all the time when inside Clutter.
2009-06-02 17:44:30 +00:00
index_ = clutter_text_coords_to_position (self, x, y);
offset = bytes_to_offset (priv->text, index_);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
if (priv->selectable)
Remove usage of Units and macros The ClutterUnit and relative macros should not be used when dealing with pixels -- which is to say, all the time when inside Clutter.
2009-06-02 17:44:30 +00:00
clutter_text_set_cursor_position (self, offset);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
else
text: Fixes for selection bound The commit ecbb7ce41a1a759e246fce07f146b8bed5e3d730 exposed some issues when positioning the cursor with the mouse pointer: the selection is not moved along with the cursor when inserting a single character or a string. Also, some freeze_notify() are called too early, leading to decoupling from their respective thaw_notify(). http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-02-02 17:07:22 +00:00
clutter_text_set_positions (self, offset, offset);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
return TRUE;
}
static gboolean
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
clutter_text_button_release (ClutterActor *actor,
ClutterButtonEvent *bev)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
Remove usage of Units and macros The ClutterUnit and relative macros should not be used when dealing with pixels -- which is to say, all the time when inside Clutter.
2009-06-02 17:44:30 +00:00
ClutterText *self = CLUTTER_TEXT (actor);
ClutterTextPrivate *priv = self->priv;
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
if (priv->in_select_drag)
{
clutter_ungrab_pointer ();
priv->in_select_drag = FALSE;
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
return TRUE;
}
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
return FALSE;
}
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
static gboolean
clutter_text_key_press (ClutterActor *actor,
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
ClutterKeyEvent *event)
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
{
Truncate selections on text insertion When inserting text on a key press event we should also truncate the selection. We should not truncate the selection when inserting any Unicode character, since changing the selection also changes the cursor position - and one of the invariants we inherited from ClutterEntry is that inserting characters programmatically does not change the cursor position.
2008-12-11 12:10:46 +00:00
ClutterText *self = CLUTTER_TEXT (actor);
ClutterTextPrivate *priv = self->priv;
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
ClutterBindingPool *pool;
gboolean res;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
if (!priv->editable)
return FALSE;
[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>
2009-03-30 15:57:11 +00:00
/* we need to use the ClutterText type name to find our own
* key bindings; subclasses will override or chain up this
* event handler, so they can do whatever they want there
*/
pool = clutter_binding_pool_find (g_type_name (CLUTTER_TYPE_TEXT));
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
g_assert (pool != NULL);
Allow only synthetic events with keyval 0 We allow KeyEvents with a key symbol of '0' to fall through only if they are marked as synthetic. Otherwise we discard them without mercy. Synthetic events are useful to test ClutterText behaviour; in fact, we do use them inside the test suite exactly for that reason.
2008-12-11 12:24:45 +00:00
/* we allow passing synthetic events that only contain
* the Unicode value and not the key symbol
*/
introspection-friendly ClutterEvent accessors ClutterEvent is not really gobject-introspection friendly because of the whole discriminated union thing. In particular, if you get a ClutterEvent in a signal handler, you probably can't access the event-type-specific fields, and you probably can't call methods like clutter_key_event_symbol() either, because you can't cast the ClutterEvent to a ClutterKeyEvent. The cleanest solution is to turn every accessor into ClutterEvent methods, accepting a ClutterEvent* and internally checking the event type. Fixes bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1585
2009-06-06 14:27:37 +00:00
if (event->keyval == 0 && (event->flags & CLUTTER_EVENT_FLAG_SYNTHETIC))
Allow only synthetic events with keyval 0 We allow KeyEvents with a key symbol of '0' to fall through only if they are marked as synthetic. Otherwise we discard them without mercy. Synthetic events are useful to test ClutterText behaviour; in fact, we do use them inside the test suite exactly for that reason.
2008-12-11 12:24:45 +00:00
res = FALSE;
else
introspection-friendly ClutterEvent accessors ClutterEvent is not really gobject-introspection friendly because of the whole discriminated union thing. In particular, if you get a ClutterEvent in a signal handler, you probably can't access the event-type-specific fields, and you probably can't call methods like clutter_key_event_symbol() either, because you can't cast the ClutterEvent to a ClutterKeyEvent. The cleanest solution is to turn every accessor into ClutterEvent methods, accepting a ClutterEvent* and internally checking the event type. Fixes bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1585
2009-06-06 14:27:37 +00:00
res = clutter_binding_pool_activate (pool, event->keyval,
Allow only synthetic events with keyval 0 We allow KeyEvents with a key symbol of '0' to fall through only if they are marked as synthetic. Otherwise we discard them without mercy. Synthetic events are useful to test ClutterText behaviour; in fact, we do use them inside the test suite exactly for that reason.
2008-12-11 12:24:45 +00:00
event->modifier_state,
G_OBJECT (actor));
/* if the key binding has handled the event we bail out
* as fast as we can; otherwise, we try to insert the
* Unicode character inside the key event into the text
* actor
*/
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
if (res)
return TRUE;
[text] Don't interpret the unicode value when the control modifier is on When a letter key is pressed with the control key held down one of three things will happen :- a) If the stage is embedded within a GtkClutterEmbed the unicode value will be filled from gdk_keyval_to_unicode. This will be the same value as if control was not pressed (so Ctrl+V will be 'v'). b) If the stage is not in a GtkClutterEmbed and Clutter is running on the X11 backend then it will try to fill in the unicode value from XLookupString. This *will* take into account the control so the unicode value will represent a control character (Ctrl+V will be '\x16'). c) Most other backends will not bother to fill in the unicode value. Therefore clutter_keysym_to_unicode will be used which also does not take into account the control key (so Ctrl+V will be 'v'). For cut and paste to work in Nbtk, the control keys need to bubble up to the parent NbtkEntry container. This works fine for 'b' but not 'a' and 'c'. This patch makes ClutterText always allow the event to bubble if the key is not handled by the binding pool and the control modifier is down. Ideally ClutterText would always get a unicode value that takes into account the modifiers but this is probably best left up to the input methods. Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-08-17 16:43:42 +00:00
/* Skip keys when control is pressed */
else if ((event->modifier_state & CLUTTER_CONTROL_MASK) == 0)
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
{
introspection-friendly ClutterEvent accessors ClutterEvent is not really gobject-introspection friendly because of the whole discriminated union thing. In particular, if you get a ClutterEvent in a signal handler, you probably can't access the event-type-specific fields, and you probably can't call methods like clutter_key_event_symbol() either, because you can't cast the ClutterEvent to a ClutterKeyEvent. The cleanest solution is to turn every accessor into ClutterEvent methods, accepting a ClutterEvent* and internally checking the event type. Fixes bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1585
2009-06-06 14:27:37 +00:00
gunichar key_unichar;
key_unichar = clutter_event_get_key_unicode ((ClutterEvent *) event);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
Allow only synthetic events with keyval 0 We allow KeyEvents with a key symbol of '0' to fall through only if they are marked as synthetic. Otherwise we discard them without mercy. Synthetic events are useful to test ClutterText behaviour; in fact, we do use them inside the test suite exactly for that reason.
2008-12-11 12:24:45 +00:00
/* return is reported as CR, but we want LF */
if (key_unichar == '\r')
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
key_unichar = '\n';
[clutter-text] Don't allow control characters to be inserted If an unbound control key is pressed (such as Ctrl+R) it would insert a rectangle into the text. Also zero is considered a valid unicode character by g_unichar_validate so pressing a key such as shift would cause the current selection to be deleted. The character isn't actually inserted because insert_unichar disallows zeroes.
2009-01-13 17:52:38 +00:00
if (key_unichar == '\n' ||
(g_unichar_validate (key_unichar) &&
!g_unichar_iscntrl (key_unichar)))
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
{
Allow only synthetic events with keyval 0 We allow KeyEvents with a key symbol of '0' to fall through only if they are marked as synthetic. Otherwise we discard them without mercy. Synthetic events are useful to test ClutterText behaviour; in fact, we do use them inside the test suite exactly for that reason.
2008-12-11 12:24:45 +00:00
/* truncate the eventual selection so that the
* Unicode character can replace it
*/
[text] Add ClutterText::delete_selection() Add a method for deleting the current selection inside a Text actor. This is useful for subclasses. See bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1521 Based on a patch by: Raymond Liu <raymond.liu@intel.com>
2009-05-06 16:08:25 +00:00
clutter_text_delete_selection (self);
Truncate selections on text insertion When inserting text on a key press event we should also truncate the selection. We should not truncate the selection when inserting any Unicode character, since changing the selection also changes the cursor position - and one of the invariants we inherited from ClutterEntry is that inserting characters programmatically does not change the cursor position.
2008-12-11 12:10:46 +00:00
clutter_text_insert_unichar (self, key_unichar);
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
return TRUE;
}
}
return FALSE;
}
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
#define TEXT_PADDING 2
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
static void
clutter_text_paint (ClutterActor *self)
{
ClutterText *text = CLUTTER_TEXT (self);
ClutterTextPrivate *priv = text->priv;
PangoLayout *layout;
ClutterActorBox alloc = { 0, };
CoglColor color = { 0, };
Use the paint opacity when painting a ClutterText ClutterText should use the paint opacity for both text and cursor. ClutterLabel had the wrong behaviour, as it set the actor's opacity using the text color's alpha channel, and ClutterEntry completely disregarded the actor's opacity when painting the cursor. This commit harmonizes the ClutterText behaviour to always use a composition of the actor's paint opacity and the text and cursor alpha channel values, thus behaving more consistently with the rest of Clutter.
2008-12-11 12:18:26 +00:00
guint8 real_opacity;
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
gint text_x = priv->text_x;
gboolean clip_set = FALSE;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
/* Note that if anything in this paint method changes it needs to be
reflected in the get_paint_volume implementation which is tightly
tied to the workings of this function */
Comments and whitespace fixes to ClutterText
2009-01-07 00:43:24 +00:00
if (G_UNLIKELY (priv->font_desc == NULL || priv->text == NULL))
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
{
CLUTTER_NOTE (ACTOR, "desc: %p, text %p",
priv->font_desc ? priv->font_desc : 0x0,
priv->text ? priv->text : 0x0);
return;
}
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
clutter_actor_get_allocation_box (self, &alloc);
text: Layouts for single-line-mode entries are boundless A PangoLayout for an editable, single-line text entry is by definition without a given width, since the actor will be clipped when being drawn.
2010-07-09 17:37:34 +00:00
if (priv->editable && priv->single_line_mode)
layout = clutter_text_create_layout (text, -1, -1);
else
layout = clutter_text_create_layout (text,
alloc.x2 - alloc.x1,
alloc.y2 - alloc.y1);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
[text] Do not ensure the cursor if not needed If the Text actor is neither editable nor has its cursor set to visible, then we should not be ensuring the cursor position. This fixes a failure in the conformance test unit for the layout cache.
2009-01-07 13:14:13 +00:00
if (priv->editable && priv->cursor_visible)
clutter_text_ensure_cursor_position (text);
if (priv->editable && priv->single_line_mode)
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
{
PangoRectangle logical_rect = { 0, };
gint actor_width, text_width;
pango_layout_get_extents (layout, NULL, &logical_rect);
Remove all internal use of deprecated cogl_clip_* API cogl_clip_push, and cogl_clip_push_window_rect which are now deprecated were used in various places internally so this just switches to using the replacement functions.
2009-11-05 16:50:24 +00:00
cogl_clip_push_rectangle (0, 0,
(alloc.x2 - alloc.x1),
(alloc.y2 - alloc.y1));
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
clip_set = TRUE;
Remove usage of Units and macros The ClutterUnit and relative macros should not be used when dealing with pixels -- which is to say, all the time when inside Clutter.
2009-06-02 17:44:30 +00:00
actor_width = (alloc.x2 - alloc.x1)
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
- 2 * TEXT_PADDING;
text_width = logical_rect.width / PANGO_SCALE;
if (actor_width < text_width)
{
gint cursor_x = priv->cursor_pos.x;
if (priv->position == -1)
{
text_x = actor_width - text_width;
}
else if (priv->position == 0)
{
[text] position the cursor correctly in single line mode The position of the text should be increased by the value of TEXT_PADDING and the cursor offset by the same value as the text offset.
2009-05-14 09:17:24 +00:00
text_x = TEXT_PADDING;
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
}
else
{
[text] scroll to the cursor position if it is outside the allocation Adjust the text offset to keep the cursor within the allocation. This means the text will scroll per character
2009-05-14 12:31:51 +00:00
if (cursor_x < 0)
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
{
[text] scroll to the cursor position if it is outside the allocation Adjust the text offset to keep the cursor within the allocation. This means the text will scroll per character
2009-05-14 12:31:51 +00:00
text_x = text_x - cursor_x - TEXT_PADDING;
}
else if (cursor_x > actor_width)
{
text_x = text_x + (actor_width - cursor_x) - TEXT_PADDING;
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
}
}
}
else
{
[text] position the cursor correctly in single line mode The position of the text should be increased by the value of TEXT_PADDING and the cursor offset by the same value as the text offset.
2009-05-14 09:17:24 +00:00
text_x = TEXT_PADDING;
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
}
}
else
text_x = 0;
clutter-text: Always update cursor positions when painting The cursor's on-screen rectangle is defined in terms of the text length, the current index, and text_x and text_y, which hold the text offset in overflowing text fields. When deleting large amounts of text, text_x is set to 0. In some edge case branch paths, the cursor rectangle could be calculated after the current index and text length were updated, but before the text_x offset could be. This left a negative x position, which consequently blew up Cogl and the widget. https://bugzilla.gnome.org/show_bug.cgi?id=651079
2011-07-03 20:43:17 +00:00
if (priv->text_x != text_x)
{
priv->text_x = text_x;
clutter_text_ensure_cursor_position (text);
}
[text] scroll to the cursor position if it is outside the allocation Adjust the text offset to keep the cursor within the allocation. This means the text will scroll per character
2009-05-14 12:31:51 +00:00
Use the paint opacity when painting a ClutterText ClutterText should use the paint opacity for both text and cursor. ClutterLabel had the wrong behaviour, as it set the actor's opacity using the text color's alpha channel, and ClutterEntry completely disregarded the actor's opacity when painting the cursor. This commit harmonizes the ClutterText behaviour to always use a composition of the actor's paint opacity and the text and cursor alpha channel values, thus behaving more consistently with the rest of Clutter.
2008-12-11 12:18:26 +00:00
real_opacity = clutter_actor_get_paint_opacity (self)
* priv->text_color.alpha
/ 255;
Remove usage of the grave accent as quotation mark See: http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html This should make Thomas happy.
2009-03-17 14:12:01 +00:00
CLUTTER_NOTE (PAINT, "painting text (text: '%s')", priv->text);
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
Replace cogl_color_set_from_* with cogl_color_init_from_* The former is not yet "officially" deprecated by the latter, but it's confusing to have them both in the code base.
2010-09-03 15:55:12 +00:00
cogl_color_init_from_4ub (&color,
priv->text_color.red,
priv->text_color.green,
priv->text_color.blue,
real_opacity);
clutter-text: new clutter_text_get_layout_offsets API This new function can be used to retrieve the coordinates where the ClutterText will draw the PangoLayout representing the text. http://bugzilla.clutter-project.org/show_bug.cgi?id=2553
2011-02-04 11:33:53 +00:00
cogl_pango_render_layout (layout, text_x, priv->text_y, &color, 0);
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
text: Check the has_focus flag in selection_paint() It is the only place were it is used, so it should only be checked there, and not in the general paint() implementation.
2011-05-13 13:26:22 +00:00
selection_paint (text);
clutter-text: Add a selected-text-color http://bugzilla.clutter-project.org/show_bug.cgi?id=2595
2011-03-02 17:02:56 +00:00
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
if (clip_set)
[Cogl] cogl_clip_{set*,unset} renamed to cogl_clip_{push*,pop} This is so they self document the stacking semantics of the cogl clip API
2009-02-12 11:08:00 +00:00
cogl_clip_pop ();
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
}
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
static void
text: Make sure that the selection box is big enough Do not use integers to store the result of the PANGO_UNITS scaling to avoid rounding issues with the default C rules. We should use cielf() instead.
2011-07-10 09:24:40 +00:00
add_selection_to_paint_volume (ClutterText *text,
const ClutterActorBox *box,
gpointer user_data)
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
{
ClutterPaintVolume *total_volume = user_data;
ClutterPaintVolume rect_volume;
ClutterVertex vertex;
_clutter_paint_volume_init_static (&rect_volume, CLUTTER_ACTOR (text));
vertex.x = box->x1;
vertex.y = box->y1;
vertex.z = 0.0f;
clutter_paint_volume_set_origin (&rect_volume, &vertex);
clutter_paint_volume_set_width (&rect_volume, box->x2 - box->x1);
clutter_paint_volume_set_height (&rect_volume, box->y2 - box->y1);
clutter_paint_volume_union (total_volume, &rect_volume);
clutter_paint_volume_free (&rect_volume);
}
static void
clutter_text_get_paint_volume_for_cursor (ClutterText *text,
ClutterPaintVolume *volume)
{
ClutterTextPrivate *priv = text->priv;
ClutterVertex origin;
clutter_text_ensure_cursor_position (text);
if (priv->position == priv->selection_bound)
{
origin.x = priv->cursor_pos.x;
origin.y = priv->cursor_pos.y;
origin.z = 0;
clutter_paint_volume_set_origin (volume, &origin);
clutter_paint_volume_set_width (volume, priv->cursor_pos.width);
clutter_paint_volume_set_height (volume, priv->cursor_pos.height);
}
else
{
text: Make sure that the selection box is big enough Do not use integers to store the result of the PANGO_UNITS scaling to avoid rounding issues with the default C rules. We should use cielf() instead.
2011-07-10 09:24:40 +00:00
clutter_text_foreach_selection_rectangle (text,
add_selection_to_paint_volume,
volume);
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
}
}
actor: make default get_paint_volume more conservative There are too many examples where the default assumption that an actor paints inside its allocation isn't true, so we now return FALSE in the base implementation instead. This means that by default we are saying "we don't know the paint volume of the actor", so developers need to implement the get_paint_volume virtual to take advantage of culling and clipped redraws with their actors. This patch provides very conservative get_paint_volume implementations for ClutterTexture, ClutterCairoTexture, ClutterRectangle and ClutterText which all explicitly check the actor's object type to avoid making any assumptions about subclasses.
2010-09-08 18:47:11 +00:00
static gboolean
text: Update get_paint_volume() implementation In commit 9818eee4646e49e99beb5a43f1dafcbdcca41f94 I forgot to update ClutterText as well as the other actors.
2010-09-09 11:38:25 +00:00
clutter_text_get_paint_volume (ClutterActor *self,
actor: make default get_paint_volume more conservative There are too many examples where the default assumption that an actor paints inside its allocation isn't true, so we now return FALSE in the base implementation instead. This means that by default we are saying "we don't know the paint volume of the actor", so developers need to implement the get_paint_volume virtual to take advantage of culling and clipped redraws with their actors. This patch provides very conservative get_paint_volume implementations for ClutterTexture, ClutterCairoTexture, ClutterRectangle and ClutterText which all explicitly check the actor's object type to avoid making any assumptions about subclasses.
2010-09-08 18:47:11 +00:00
ClutterPaintVolume *volume)
{
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
ClutterText *text = CLUTTER_TEXT (self);
ClutterTextPrivate *priv = text->priv;
/* ClutterText uses the logical layout as the natural size of the
actor. This means that it can sometimes paint outside of its
allocation for example with italic fonts with serifs. Therefore
we should use the ink rectangle of the layout instead */
if (!priv->paint_volume_valid)
{
PangoLayout *layout;
PangoRectangle ink_rect;
ClutterVertex origin;
/* If the text is single line editable then it gets clipped to
the allocation anyway so we can just use that */
if (priv->editable && priv->single_line_mode)
return _clutter_actor_set_default_paint_volume (self,
CLUTTER_TYPE_TEXT,
volume);
if (G_OBJECT_TYPE (self) != CLUTTER_TYPE_TEXT)
return FALSE;
if (!clutter_actor_has_allocation (self))
return FALSE;
_clutter_paint_volume_init_static (&priv->paint_volume, self);
layout = clutter_text_get_layout (text);
pango_layout_get_extents (layout, &ink_rect, NULL);
origin.x = ink_rect.x / (float) PANGO_SCALE;
origin.y = ink_rect.y / (float) PANGO_SCALE;
origin.z = 0;
clutter_paint_volume_set_origin (&priv->paint_volume, &origin);
clutter_paint_volume_set_width (&priv->paint_volume,
ink_rect.width / (float) PANGO_SCALE);
clutter_paint_volume_set_height (&priv->paint_volume,
ink_rect.height / (float) PANGO_SCALE);
/* If the cursor is visible then that will likely be drawn
outside of the ink rectangle so we should merge that in */
if (priv->editable && priv->cursor_visible && priv->has_focus)
{
ClutterPaintVolume cursor_paint_volume;
_clutter_paint_volume_init_static (&cursor_paint_volume,
self);
clutter_text_get_paint_volume_for_cursor (text, &cursor_paint_volume);
clutter_paint_volume_union (&priv->paint_volume,
&cursor_paint_volume);
clutter_paint_volume_free (&cursor_paint_volume);
}
priv->paint_volume_valid = TRUE;
}
_clutter_paint_volume_copy_static (&priv->paint_volume, volume);
return TRUE;
actor: make default get_paint_volume more conservative There are too many examples where the default assumption that an actor paints inside its allocation isn't true, so we now return FALSE in the base implementation instead. This means that by default we are saying "we don't know the paint volume of the actor", so developers need to implement the get_paint_volume virtual to take advantage of culling and clipped redraws with their actors. This patch provides very conservative get_paint_volume implementations for ClutterTexture, ClutterCairoTexture, ClutterRectangle and ClutterText which all explicitly check the actor's object type to avoid making any assumptions about subclasses.
2010-09-08 18:47:11 +00:00
}
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
static void
clutter_text_get_preferred_width (ClutterActor *self,
Remove Units from the public API With the recent change to internal floating point values, ClutterUnit has become a redundant type, defined to be a float. All integer entry points are being internally converted to floating point values to be passed to the GL pipeline with the least amount of conversion. ClutterUnit is thus exposed as just a "pixel with fractionary bits", and not -- as users might think -- as generic, resolution and device independent units. not that it was the case, but a definitive amount of people was convinced it did provide this "feature", and was flummoxed about the mere existence of this type. So, having ClutterUnit exposed in the public API doubles the entry points and has the following disadvantages: - we have to maintain twice the amount of entry points in ClutterActor - we still do an integer-to-float implicit conversion - we introduce a weird impedance between pixels and "pixels with fractionary bits" - language bindings will have to choose what to bind, and resort to manually overriding the API + *except* for language bindings based on GObject-Introspection, as they cannot do manual overrides, thus will replicate the entire set of entry points For these reason, we should coalesces every Actor entry point for pixels and for ClutterUnit into a single entry point taking a float, like: void clutter_actor_set_x (ClutterActor *self, gfloat x); void clutter_actor_get_size (ClutterActor *self, gfloat *width, gfloat *height); gfloat clutter_actor_get_height (ClutterActor *self); etc. The issues I have identified are: - we'll have a two cases of compiler warnings: - printf() format of the return values from %d to %f - clutter_actor_get_size() taking floats instead of unsigned ints - we'll have a problem with varargs when passing an integer instead of a floating point value, except on 64bit platforms where the size of a float is the same as the size of an int To be clear: the *intent* of the API should not change -- we still use pixels everywhere -- but: - we remove ambiguity in the API with regard to pixels and units - we remove entry points we get to maintain for the whole 1.0 version of the API - we make things simpler to bind for both manual language bindings and automatic (gobject-introspection based) ones - we have the simplest API possible while still exposing the capabilities of the underlying GL implementation
2009-05-06 15:44:47 +00:00
gfloat for_height,
gfloat *min_width_p,
gfloat *natural_width_p)
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
{
ClutterText *text = CLUTTER_TEXT (self);
ClutterTextPrivate *priv = text->priv;
PangoRectangle logical_rect = { 0, };
PangoLayout *layout;
Use units in position_to_coords() We loose precision with a direct conversion for PangoUnits to pixels, so we should do the conversion as needed, inside the callers of clutter_text_position_to_coords().
2008-12-15 18:24:42 +00:00
gint logical_width;
Remove Units from the public API With the recent change to internal floating point values, ClutterUnit has become a redundant type, defined to be a float. All integer entry points are being internally converted to floating point values to be passed to the GL pipeline with the least amount of conversion. ClutterUnit is thus exposed as just a "pixel with fractionary bits", and not -- as users might think -- as generic, resolution and device independent units. not that it was the case, but a definitive amount of people was convinced it did provide this "feature", and was flummoxed about the mere existence of this type. So, having ClutterUnit exposed in the public API doubles the entry points and has the following disadvantages: - we have to maintain twice the amount of entry points in ClutterActor - we still do an integer-to-float implicit conversion - we introduce a weird impedance between pixels and "pixels with fractionary bits" - language bindings will have to choose what to bind, and resort to manually overriding the API + *except* for language bindings based on GObject-Introspection, as they cannot do manual overrides, thus will replicate the entire set of entry points For these reason, we should coalesces every Actor entry point for pixels and for ClutterUnit into a single entry point taking a float, like: void clutter_actor_set_x (ClutterActor *self, gfloat x); void clutter_actor_get_size (ClutterActor *self, gfloat *width, gfloat *height); gfloat clutter_actor_get_height (ClutterActor *self); etc. The issues I have identified are: - we'll have a two cases of compiler warnings: - printf() format of the return values from %d to %f - clutter_actor_get_size() taking floats instead of unsigned ints - we'll have a problem with varargs when passing an integer instead of a floating point value, except on 64bit platforms where the size of a float is the same as the size of an int To be clear: the *intent* of the API should not change -- we still use pixels everywhere -- but: - we remove ambiguity in the API with regard to pixels and units - we remove entry points we get to maintain for the whole 1.0 version of the API - we make things simpler to bind for both manual language bindings and automatic (gobject-introspection based) ones - we have the simplest API possible while still exposing the capabilities of the underlying GL implementation
2009-05-06 15:44:47 +00:00
gfloat layout_width;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
Support pango_layout_set_height() in ClutterText This is the port of the patch attached to bug 1266: ClutterLabel support for pango_layout_set_height() to the ClutterText actor. This patch adds support for the pango_layout_set_height() function inside the layout creation and caching, so that setting the height of a ClutterText will make PangoLayout try to fill out the given height before ellipsizing the contents of the ClutterText actor. The original patch is from Havoc Pennington. This commit ports the patch to ClutterText and applies a small change to the height computation pointed out by Behdad Esfahbod on GNOME's Bugzilla: http://bugzilla.gnome.org/show_bug.cgi?id=560931 That the layout heights when doing a size request should be set to be G_MAXINT instead of -1. Unfortunately, the patch seems to break the conformance suite when setting the ellipsization on the layout.
2008-12-16 14:02:05 +00:00
layout = clutter_text_create_layout (text, -1, -1);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
pango_layout_get_extents (layout, NULL, &logical_rect);
Use units in position_to_coords() We loose precision with a direct conversion for PangoUnits to pixels, so we should do the conversion as needed, inside the callers of clutter_text_position_to_coords().
2008-12-15 18:24:42 +00:00
/* the X coordinate of the logical rectangle might be non-zero
* according to the Pango documentation; hence, we need to offset
* the width accordingly
*/
logical_width = logical_rect.x + logical_rect.width;
layout_width = logical_width > 0
text: Round up the size Converting from Pango units to pixels by using the C conventions might cause us to lose a pixel; since we're doing the same for the height, we should use ceilf() to round up the width and the line height. http://bugzilla.clutter-project.org/show_bug.cgi?id=2573
2011-02-21 17:13:37 +00:00
? ceilf (logical_width / 1024.0f)
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
: 1;
if (min_width_p)
{
[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.
2009-04-16 15:34:15 +00:00
if (priv->wrap || priv->ellipsize || priv->editable)
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
*min_width_p = 1;
else
*min_width_p = layout_width;
}
if (natural_width_p)
[text] take text padding into account when in single line mode In single line mode, extra padding is added to the text which must be taken into account when reporting the natural size of the actor.
2009-05-14 08:53:41 +00:00
{
if (priv->editable && priv->single_line_mode)
*natural_width_p = layout_width + TEXT_PADDING * 2;
else
*natural_width_p = layout_width;
}
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
}
static void
clutter_text_get_preferred_height (ClutterActor *self,
Remove Units from the public API With the recent change to internal floating point values, ClutterUnit has become a redundant type, defined to be a float. All integer entry points are being internally converted to floating point values to be passed to the GL pipeline with the least amount of conversion. ClutterUnit is thus exposed as just a "pixel with fractionary bits", and not -- as users might think -- as generic, resolution and device independent units. not that it was the case, but a definitive amount of people was convinced it did provide this "feature", and was flummoxed about the mere existence of this type. So, having ClutterUnit exposed in the public API doubles the entry points and has the following disadvantages: - we have to maintain twice the amount of entry points in ClutterActor - we still do an integer-to-float implicit conversion - we introduce a weird impedance between pixels and "pixels with fractionary bits" - language bindings will have to choose what to bind, and resort to manually overriding the API + *except* for language bindings based on GObject-Introspection, as they cannot do manual overrides, thus will replicate the entire set of entry points For these reason, we should coalesces every Actor entry point for pixels and for ClutterUnit into a single entry point taking a float, like: void clutter_actor_set_x (ClutterActor *self, gfloat x); void clutter_actor_get_size (ClutterActor *self, gfloat *width, gfloat *height); gfloat clutter_actor_get_height (ClutterActor *self); etc. The issues I have identified are: - we'll have a two cases of compiler warnings: - printf() format of the return values from %d to %f - clutter_actor_get_size() taking floats instead of unsigned ints - we'll have a problem with varargs when passing an integer instead of a floating point value, except on 64bit platforms where the size of a float is the same as the size of an int To be clear: the *intent* of the API should not change -- we still use pixels everywhere -- but: - we remove ambiguity in the API with regard to pixels and units - we remove entry points we get to maintain for the whole 1.0 version of the API - we make things simpler to bind for both manual language bindings and automatic (gobject-introspection based) ones - we have the simplest API possible while still exposing the capabilities of the underlying GL implementation
2009-05-06 15:44:47 +00:00
gfloat for_width,
gfloat *min_height_p,
gfloat *natural_height_p)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
[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>
2009-05-13 22:04:25 +00:00
ClutterTextPrivate *priv = CLUTTER_TEXT (self)->priv;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
if (for_width == 0)
{
if (min_height_p)
*min_height_p = 0;
if (natural_height_p)
*natural_height_p = 0;
}
else
{
PangoLayout *layout;
PangoRectangle logical_rect = { 0, };
Use units in position_to_coords() We loose precision with a direct conversion for PangoUnits to pixels, so we should do the conversion as needed, inside the callers of clutter_text_position_to_coords().
2008-12-15 18:24:42 +00:00
gint logical_height;
Remove Units from the public API With the recent change to internal floating point values, ClutterUnit has become a redundant type, defined to be a float. All integer entry points are being internally converted to floating point values to be passed to the GL pipeline with the least amount of conversion. ClutterUnit is thus exposed as just a "pixel with fractionary bits", and not -- as users might think -- as generic, resolution and device independent units. not that it was the case, but a definitive amount of people was convinced it did provide this "feature", and was flummoxed about the mere existence of this type. So, having ClutterUnit exposed in the public API doubles the entry points and has the following disadvantages: - we have to maintain twice the amount of entry points in ClutterActor - we still do an integer-to-float implicit conversion - we introduce a weird impedance between pixels and "pixels with fractionary bits" - language bindings will have to choose what to bind, and resort to manually overriding the API + *except* for language bindings based on GObject-Introspection, as they cannot do manual overrides, thus will replicate the entire set of entry points For these reason, we should coalesces every Actor entry point for pixels and for ClutterUnit into a single entry point taking a float, like: void clutter_actor_set_x (ClutterActor *self, gfloat x); void clutter_actor_get_size (ClutterActor *self, gfloat *width, gfloat *height); gfloat clutter_actor_get_height (ClutterActor *self); etc. The issues I have identified are: - we'll have a two cases of compiler warnings: - printf() format of the return values from %d to %f - clutter_actor_get_size() taking floats instead of unsigned ints - we'll have a problem with varargs when passing an integer instead of a floating point value, except on 64bit platforms where the size of a float is the same as the size of an int To be clear: the *intent* of the API should not change -- we still use pixels everywhere -- but: - we remove ambiguity in the API with regard to pixels and units - we remove entry points we get to maintain for the whole 1.0 version of the API - we make things simpler to bind for both manual language bindings and automatic (gobject-introspection based) ones - we have the simplest API possible while still exposing the capabilities of the underlying GL implementation
2009-05-06 15:44:47 +00:00
gfloat layout_height;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
text: Optimise get_preferred_height for single-line-mode Don't calculate an extra layout in clutter_text_get_preferred_height for single-line strings, when it's unnecessary. There's no need to set the width of a layout when in single-line mode, as wrapping will not happen.
2010-11-25 15:11:42 +00:00
if (priv->single_line_mode)
for_width = -1;
[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>
2009-05-13 22:04:25 +00:00
layout = clutter_text_create_layout (CLUTTER_TEXT (self),
for_width, -1);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
pango_layout_get_extents (layout, NULL, &logical_rect);
Use units in position_to_coords() We loose precision with a direct conversion for PangoUnits to pixels, so we should do the conversion as needed, inside the callers of clutter_text_position_to_coords().
2008-12-15 18:24:42 +00:00
/* the Y coordinate of the logical rectangle might be non-zero
* according to the Pango documentation; hence, we need to offset
* the height accordingly
*/
logical_height = logical_rect.y + logical_rect.height;
text: Round up the size Converting from Pango units to pixels by using the C conventions might cause us to lose a pixel; since we're doing the same for the height, we should use ceilf() to round up the width and the line height. http://bugzilla.clutter-project.org/show_bug.cgi?id=2573
2011-02-21 17:13:37 +00:00
layout_height = ceilf (logical_height / 1024.0f);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
if (min_height_p)
Support pango_layout_set_height() in ClutterText This is the port of the patch attached to bug 1266: ClutterLabel support for pango_layout_set_height() to the ClutterText actor. This patch adds support for the pango_layout_set_height() function inside the layout creation and caching, so that setting the height of a ClutterText will make PangoLayout try to fill out the given height before ellipsizing the contents of the ClutterText actor. The original patch is from Havoc Pennington. This commit ports the patch to ClutterText and applies a small change to the height computation pointed out by Behdad Esfahbod on GNOME's Bugzilla: http://bugzilla.gnome.org/show_bug.cgi?id=560931 That the layout heights when doing a size request should be set to be G_MAXINT instead of -1. Unfortunately, the patch seems to break the conformance suite when setting the ellipsization on the layout.
2008-12-16 14:02:05 +00:00
{
[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>
2009-05-13 22:04:25 +00:00
/* if we wrap and ellipsize then the minimum height is
* going to be at least the size of the first line
*/
text: Optimise get_preferred_height for single-line-mode Don't calculate an extra layout in clutter_text_get_preferred_height for single-line strings, when it's unnecessary. There's no need to set the width of a layout when in single-line mode, as wrapping will not happen.
2010-11-25 15:11:42 +00:00
if ((priv->ellipsize && priv->wrap) && !priv->single_line_mode)
[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>
2009-05-13 22:04:25 +00:00
{
PangoLayoutLine *line;
Remove usage of Units and macros The ClutterUnit and relative macros should not be used when dealing with pixels -- which is to say, all the time when inside Clutter.
2009-06-02 17:44:30 +00:00
gfloat line_height;
[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>
2009-05-13 22:04:25 +00:00
line = pango_layout_get_line_readonly (layout, 0);
pango_layout_line_get_extents (line, NULL, &logical_rect);
logical_height = logical_rect.y + logical_rect.height;
text: Round up the size Converting from Pango units to pixels by using the C conventions might cause us to lose a pixel; since we're doing the same for the height, we should use ceilf() to round up the width and the line height. http://bugzilla.clutter-project.org/show_bug.cgi?id=2573
2011-02-21 17:13:37 +00:00
line_height = ceilf (logical_height / 1024.0f);
[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>
2009-05-13 22:04:25 +00:00
*min_height_p = line_height;
}
Support pango_layout_set_height() in ClutterText This is the port of the patch attached to bug 1266: ClutterLabel support for pango_layout_set_height() to the ClutterText actor. This patch adds support for the pango_layout_set_height() function inside the layout creation and caching, so that setting the height of a ClutterText will make PangoLayout try to fill out the given height before ellipsizing the contents of the ClutterText actor. The original patch is from Havoc Pennington. This commit ports the patch to ClutterText and applies a small change to the height computation pointed out by Behdad Esfahbod on GNOME's Bugzilla: http://bugzilla.gnome.org/show_bug.cgi?id=560931 That the layout heights when doing a size request should be set to be G_MAXINT instead of -1. Unfortunately, the patch seems to break the conformance suite when setting the ellipsization on the layout.
2008-12-16 14:02:05 +00:00
else
*min_height_p = layout_height;
}
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
if (natural_height_p)
Use units in position_to_coords() We loose precision with a direct conversion for PangoUnits to pixels, so we should do the conversion as needed, inside the callers of clutter_text_position_to_coords().
2008-12-15 18:24:42 +00:00
*natural_height_p = layout_height;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
}
}
static void
[actor] Use flags to control allocations Instead of passing a boolean value, the ::allocate virtual function should use a bitmask and flags. This gives us room for expansion without breaking API/ABI, and allows to encode more information to the allocation process instead of just changes of absolute origin.
2009-06-03 13:02:06 +00:00
clutter_text_allocate (ClutterActor *self,
const ClutterActorBox *box,
ClutterAllocationFlags flags)
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
{
ClutterText *text = CLUTTER_TEXT (self);
ClutterActorClass *parent_class;
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
/* Ensure that there is a cached layout with the right width so
* that we don't need to create the text during the paint run
text: Layouts for single-line-mode entries are boundless A PangoLayout for an editable, single-line text entry is by definition without a given width, since the actor will be clipped when being drawn.
2010-07-09 17:37:34 +00:00
*
* if the Text is editable and in single line mode we don't want
* to have any limit on the layout size, since the paint will clip
* it to the allocation of the actor
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
*/
text: Layouts for single-line-mode entries are boundless A PangoLayout for an editable, single-line text entry is by definition without a given width, since the actor will be clipped when being drawn.
2010-07-09 17:37:34 +00:00
if (text->priv->editable && text->priv->single_line_mode)
clutter_text_create_layout (text, -1, -1);
else
clutter_text_create_layout (text,
box->x2 - box->x1,
box->y2 - box->y1);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
parent_class = CLUTTER_ACTOR_CLASS (clutter_text_parent_class);
[actor] Use flags to control allocations Instead of passing a boolean value, the ::allocate virtual function should use a bitmask and flags. This gives us room for expansion without breaking API/ABI, and allows to encode more information to the allocation process instead of just changes of absolute origin.
2009-06-03 13:02:06 +00:00
parent_class->allocate (self, box, flags);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
}
text: Implement the ::has_overlaps virtual Since ClutterText has overlapping primitives when selecting, or a visible cursor, then we need to report that to Clutter, to avoid bleeding colors through when a Text actor is non-fully opaque.
2011-05-13 13:17:39 +00:00
static gboolean
clutter_text_has_overlaps (ClutterActor *self)
{
ClutterTextPrivate *priv = CLUTTER_TEXT (self)->priv;
return priv->editable ||
priv->selectable ||
priv->cursor_visible;
}
text: Only paint cursor if we have key focus If a Text actor does not have key focus then there's no point in showing the cursor at all.
2010-12-21 10:50:24 +00:00
static void
clutter_text_key_focus_in (ClutterActor *actor)
{
ClutterTextPrivate *priv = CLUTTER_TEXT (actor)->priv;
priv->has_focus = TRUE;
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
clutter_text_queue_redraw (actor);
text: Only paint cursor if we have key focus If a Text actor does not have key focus then there's no point in showing the cursor at all.
2010-12-21 10:50:24 +00:00
}
static void
clutter_text_key_focus_out (ClutterActor *actor)
{
ClutterTextPrivate *priv = CLUTTER_TEXT (actor)->priv;
priv->has_focus = FALSE;
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
clutter_text_queue_redraw (actor);
text: Only paint cursor if we have key focus If a Text actor does not have key focus then there's no point in showing the cursor at all.
2010-12-21 10:50:24 +00:00
}
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
static gboolean
clutter_text_real_move_left (ClutterText *self,
const gchar *action,
guint keyval,
ClutterModifierType modifiers)
{
ClutterTextPrivate *priv = self->priv;
gint pos = priv->position;
[text] Allow key navigation by word When pressing Ctrl with the left and right arrow keys we should skip to (or select until) the previous and next word, respectively. Fixes bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1713
2009-07-23 18:04:27 +00:00
gint new_pos = 0;
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
gint len;
[text] Use cached length when possible Since clutter_text_set_text() measures the length of the text each time, we should use the cached length instead of recomputing the text length each time. This should save us some time when dealing with long, multi-byte texts.
2009-01-06 20:52:03 +00:00
len = priv->n_chars;
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
Fix problems with "position" and "selection-bound" change notification Added a "selection-bound" notify on clutter_text_clear_selection as it changes the value. Added utility function clutter_text_set_positions, in order to change both cursor position and selection bound inside a g_object_[freeze/thaw]_notify block Added g_object_[freeze/thaw]_notify in other functions that changes both cursor position and selection bound Solves http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-01-25 15:13:58 +00:00
g_object_freeze_notify (G_OBJECT (self));
[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
2009-03-30 15:46:57 +00:00
if (pos != 0 && len != 0)
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
{
[text] Allow key navigation by word When pressing Ctrl with the left and right arrow keys we should skip to (or select until) the previous and next word, respectively. Fixes bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1713
2009-07-23 18:04:27 +00:00
if (modifiers & CLUTTER_CONTROL_MASK)
{
if (pos == -1)
[text] move_word_backward/forward fixes clutter_text_move_word_backward/forward() calls did not use the start argument consistently. Also, clutter_text_move_word_forward() bound check checked the wrong end. Fixes #1765 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-08-16 21:00:35 +00:00
new_pos = clutter_text_move_word_backward (self, len);
[text] Allow key navigation by word When pressing Ctrl with the left and right arrow keys we should skip to (or select until) the previous and next word, respectively. Fixes bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1713
2009-07-23 18:04:27 +00:00
else
[text] move_word_backward/forward fixes clutter_text_move_word_backward/forward() calls did not use the start argument consistently. Also, clutter_text_move_word_forward() bound check checked the wrong end. Fixes #1765 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-08-16 21:00:35 +00:00
new_pos = clutter_text_move_word_backward (self, pos);
[text] Allow key navigation by word When pressing Ctrl with the left and right arrow keys we should skip to (or select until) the previous and next word, respectively. Fixes bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1713
2009-07-23 18:04:27 +00:00
}
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
else
[text] Allow key navigation by word When pressing Ctrl with the left and right arrow keys we should skip to (or select until) the previous and next word, respectively. Fixes bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1713
2009-07-23 18:04:27 +00:00
{
if (pos == -1)
new_pos = len - 1;
else
new_pos = pos - 1;
}
clutter_text_set_cursor_position (self, new_pos);
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
}
if (!(priv->selectable && (modifiers & CLUTTER_SHIFT_MASK)))
clutter_text_clear_selection (self);
Fix problems with "position" and "selection-bound" change notification Added a "selection-bound" notify on clutter_text_clear_selection as it changes the value. Added utility function clutter_text_set_positions, in order to change both cursor position and selection bound inside a g_object_[freeze/thaw]_notify block Added g_object_[freeze/thaw]_notify in other functions that changes both cursor position and selection bound Solves http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-01-25 15:13:58 +00:00
g_object_thaw_notify (G_OBJECT (self));
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
return TRUE;
}
static gboolean
clutter_text_real_move_right (ClutterText *self,
const gchar *action,
guint keyval,
ClutterModifierType modifiers)
{
ClutterTextPrivate *priv = self->priv;
gint pos = priv->position;
Fix some compiler warnings GCC complains that some variable might be used uninitialized.
2010-02-09 16:57:14 +00:00
gint len = priv->n_chars;
gint new_pos = 0;
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
Fix problems with "position" and "selection-bound" change notification Added a "selection-bound" notify on clutter_text_clear_selection as it changes the value. Added utility function clutter_text_set_positions, in order to change both cursor position and selection bound inside a g_object_[freeze/thaw]_notify block Added g_object_[freeze/thaw]_notify in other functions that changes both cursor position and selection bound Solves http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-01-25 15:13:58 +00:00
g_object_freeze_notify (G_OBJECT (self));
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
if (pos != -1 && len !=0)
{
[text] Allow key navigation by word When pressing Ctrl with the left and right arrow keys we should skip to (or select until) the previous and next word, respectively. Fixes bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1713
2009-07-23 18:04:27 +00:00
if (modifiers & CLUTTER_CONTROL_MASK)
{
if (pos != len)
[text] move_word_backward/forward fixes clutter_text_move_word_backward/forward() calls did not use the start argument consistently. Also, clutter_text_move_word_forward() bound check checked the wrong end. Fixes #1765 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-08-16 21:00:35 +00:00
new_pos = clutter_text_move_word_forward (self, pos);
[text] Allow key navigation by word When pressing Ctrl with the left and right arrow keys we should skip to (or select until) the previous and next word, respectively. Fixes bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1713
2009-07-23 18:04:27 +00:00
}
else
{
if (pos != len)
new_pos = pos + 1;
}
clutter_text_set_cursor_position (self, new_pos);
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
}
if (!(priv->selectable && (modifiers & CLUTTER_SHIFT_MASK)))
clutter_text_clear_selection (self);
Fix problems with "position" and "selection-bound" change notification Added a "selection-bound" notify on clutter_text_clear_selection as it changes the value. Added utility function clutter_text_set_positions, in order to change both cursor position and selection bound inside a g_object_[freeze/thaw]_notify block Added g_object_[freeze/thaw]_notify in other functions that changes both cursor position and selection bound Solves http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-01-25 15:13:58 +00:00
g_object_thaw_notify (G_OBJECT (self));
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
return TRUE;
}
static gboolean
clutter_text_real_move_up (ClutterText *self,
const gchar *action,
guint keyval,
ClutterModifierType modifiers)
{
ClutterTextPrivate *priv = self->priv;
PangoLayoutLine *layout_line;
PangoLayout *layout;
gint line_no;
[clutter-text] Fix x-position of cursor when moving up or down ClutterText already has code to try to preserve the x position when moving up or down. A target x-position is stored and the cursor is positioned at the nearest point to that in the appropriate line when up or down is pressed. However the target position was never cleared so it would always target the x-position of the cursor from the first time you pressed up or down. To fix this the patch clears the target position in set_position and then sets it after the call in real_move_up/down. That way pressing up or down sets the target position and any other movement will clear it. To get an index for the pixel position in the line pango_layout_line_x_to_index is used. However when x is greater than the length of the line then the index before the last grapheme is returned which was causing it to jump to the penultimate character. The patch makes it add on the trailing value so that it will jump to the last character.
2009-01-14 11:12:02 +00:00
gint index_, trailing;
text: Fixes for selection bound The commit ecbb7ce41a1a759e246fce07f146b8bed5e3d730 exposed some issues when positioning the cursor with the mouse pointer: the selection is not moved along with the cursor when inserting a single character or a string. Also, some freeze_notify() are called too early, leading to decoupling from their respective thaw_notify(). http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-02-02 17:07:22 +00:00
gint pos;
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
gint x;
layout = clutter_text_get_layout (self);
Fix up/down key navigation The behaviour of ClutterText around the initial position is still a little bit erratic. This commit fixes the key navigation with Up and Down arrows around the first line of text.
2008-12-15 18:46:08 +00:00
if (priv->position == 0)
index_ = 0;
else
index_ = offset_to_bytes (priv->text, priv->position);
pango_layout_index_to_line_x (layout, index_,
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
0,
&line_no, &x);
Fix up/down key navigation The behaviour of ClutterText around the initial position is still a little bit erratic. This commit fixes the key navigation with Up and Down arrows around the first line of text.
2008-12-15 18:46:08 +00:00
line_no -= 1;
if (line_no < 0)
return FALSE;
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
if (priv->x_pos != -1)
x = priv->x_pos;
layout_line = pango_layout_get_line_readonly (layout, line_no);
if (!layout_line)
return FALSE;
[clutter-text] Fix x-position of cursor when moving up or down ClutterText already has code to try to preserve the x position when moving up or down. A target x-position is stored and the cursor is positioned at the nearest point to that in the appropriate line when up or down is pressed. However the target position was never cleared so it would always target the x-position of the cursor from the first time you pressed up or down. To fix this the patch clears the target position in set_position and then sets it after the call in real_move_up/down. That way pressing up or down sets the target position and any other movement will clear it. To get an index for the pixel position in the line pango_layout_line_x_to_index is used. However when x is greater than the length of the line then the index before the last grapheme is returned which was causing it to jump to the penultimate character. The patch makes it add on the trailing value so that it will jump to the last character.
2009-01-14 11:12:02 +00:00
pango_layout_line_x_to_index (layout_line, x, &index_, &trailing);
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
text: Fixes for selection bound The commit ecbb7ce41a1a759e246fce07f146b8bed5e3d730 exposed some issues when positioning the cursor with the mouse pointer: the selection is not moved along with the cursor when inserting a single character or a string. Also, some freeze_notify() are called too early, leading to decoupling from their respective thaw_notify(). http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-02-02 17:07:22 +00:00
g_object_freeze_notify (G_OBJECT (self));
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
text: Fixes for selection bound The commit ecbb7ce41a1a759e246fce07f146b8bed5e3d730 exposed some issues when positioning the cursor with the mouse pointer: the selection is not moved along with the cursor when inserting a single character or a string. Also, some freeze_notify() are called too early, leading to decoupling from their respective thaw_notify(). http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-02-02 17:07:22 +00:00
pos = bytes_to_offset (priv->text, index_);
clutter_text_set_cursor_position (self, pos + trailing);
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
[clutter-text] Fix x-position of cursor when moving up or down ClutterText already has code to try to preserve the x position when moving up or down. A target x-position is stored and the cursor is positioned at the nearest point to that in the appropriate line when up or down is pressed. However the target position was never cleared so it would always target the x-position of the cursor from the first time you pressed up or down. To fix this the patch clears the target position in set_position and then sets it after the call in real_move_up/down. That way pressing up or down sets the target position and any other movement will clear it. To get an index for the pixel position in the line pango_layout_line_x_to_index is used. However when x is greater than the length of the line then the index before the last grapheme is returned which was causing it to jump to the penultimate character. The patch makes it add on the trailing value so that it will jump to the last character.
2009-01-14 11:12:02 +00:00
/* Store the target x position to avoid drifting left and right when
moving the cursor up and down */
priv->x_pos = x;
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
if (!(priv->selectable && (modifiers & CLUTTER_SHIFT_MASK)))
clutter_text_clear_selection (self);
Fix problems with "position" and "selection-bound" change notification Added a "selection-bound" notify on clutter_text_clear_selection as it changes the value. Added utility function clutter_text_set_positions, in order to change both cursor position and selection bound inside a g_object_[freeze/thaw]_notify block Added g_object_[freeze/thaw]_notify in other functions that changes both cursor position and selection bound Solves http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-01-25 15:13:58 +00:00
g_object_thaw_notify (G_OBJECT (self));
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
return TRUE;
}
static gboolean
clutter_text_real_move_down (ClutterText *self,
const gchar *action,
guint keyval,
ClutterModifierType modifiers)
{
ClutterTextPrivate *priv = self->priv;
PangoLayoutLine *layout_line;
PangoLayout *layout;
gint line_no;
[clutter-text] Fix x-position of cursor when moving up or down ClutterText already has code to try to preserve the x position when moving up or down. A target x-position is stored and the cursor is positioned at the nearest point to that in the appropriate line when up or down is pressed. However the target position was never cleared so it would always target the x-position of the cursor from the first time you pressed up or down. To fix this the patch clears the target position in set_position and then sets it after the call in real_move_up/down. That way pressing up or down sets the target position and any other movement will clear it. To get an index for the pixel position in the line pango_layout_line_x_to_index is used. However when x is greater than the length of the line then the index before the last grapheme is returned which was causing it to jump to the penultimate character. The patch makes it add on the trailing value so that it will jump to the last character.
2009-01-14 11:12:02 +00:00
gint index_, trailing;
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
gint x;
text: Fixes for selection bound The commit ecbb7ce41a1a759e246fce07f146b8bed5e3d730 exposed some issues when positioning the cursor with the mouse pointer: the selection is not moved along with the cursor when inserting a single character or a string. Also, some freeze_notify() are called too early, leading to decoupling from their respective thaw_notify(). http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-02-02 17:07:22 +00:00
gint pos;
Fix problems with "position" and "selection-bound" change notification Added a "selection-bound" notify on clutter_text_clear_selection as it changes the value. Added utility function clutter_text_set_positions, in order to change both cursor position and selection bound inside a g_object_[freeze/thaw]_notify block Added g_object_[freeze/thaw]_notify in other functions that changes both cursor position and selection bound Solves http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-01-25 15:13:58 +00:00
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
layout = clutter_text_get_layout (self);
Fix up/down key navigation The behaviour of ClutterText around the initial position is still a little bit erratic. This commit fixes the key navigation with Up and Down arrows around the first line of text.
2008-12-15 18:46:08 +00:00
if (priv->position == 0)
index_ = 0;
else
index_ = offset_to_bytes (priv->text, priv->position);
pango_layout_index_to_line_x (layout, index_,
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
0,
&line_no, &x);
if (priv->x_pos != -1)
x = priv->x_pos;
layout_line = pango_layout_get_line_readonly (layout, line_no + 1);
if (!layout_line)
return FALSE;
[clutter-text] Fix x-position of cursor when moving up or down ClutterText already has code to try to preserve the x position when moving up or down. A target x-position is stored and the cursor is positioned at the nearest point to that in the appropriate line when up or down is pressed. However the target position was never cleared so it would always target the x-position of the cursor from the first time you pressed up or down. To fix this the patch clears the target position in set_position and then sets it after the call in real_move_up/down. That way pressing up or down sets the target position and any other movement will clear it. To get an index for the pixel position in the line pango_layout_line_x_to_index is used. However when x is greater than the length of the line then the index before the last grapheme is returned which was causing it to jump to the penultimate character. The patch makes it add on the trailing value so that it will jump to the last character.
2009-01-14 11:12:02 +00:00
pango_layout_line_x_to_index (layout_line, x, &index_, &trailing);
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
text: Fixes for selection bound The commit ecbb7ce41a1a759e246fce07f146b8bed5e3d730 exposed some issues when positioning the cursor with the mouse pointer: the selection is not moved along with the cursor when inserting a single character or a string. Also, some freeze_notify() are called too early, leading to decoupling from their respective thaw_notify(). http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-02-02 17:07:22 +00:00
g_object_freeze_notify (G_OBJECT (self));
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
text: Fixes for selection bound The commit ecbb7ce41a1a759e246fce07f146b8bed5e3d730 exposed some issues when positioning the cursor with the mouse pointer: the selection is not moved along with the cursor when inserting a single character or a string. Also, some freeze_notify() are called too early, leading to decoupling from their respective thaw_notify(). http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-02-02 17:07:22 +00:00
pos = bytes_to_offset (priv->text, index_);
clutter_text_set_cursor_position (self, pos + trailing);
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
[clutter-text] Fix x-position of cursor when moving up or down ClutterText already has code to try to preserve the x position when moving up or down. A target x-position is stored and the cursor is positioned at the nearest point to that in the appropriate line when up or down is pressed. However the target position was never cleared so it would always target the x-position of the cursor from the first time you pressed up or down. To fix this the patch clears the target position in set_position and then sets it after the call in real_move_up/down. That way pressing up or down sets the target position and any other movement will clear it. To get an index for the pixel position in the line pango_layout_line_x_to_index is used. However when x is greater than the length of the line then the index before the last grapheme is returned which was causing it to jump to the penultimate character. The patch makes it add on the trailing value so that it will jump to the last character.
2009-01-14 11:12:02 +00:00
/* Store the target x position to avoid drifting left and right when
moving the cursor up and down */
priv->x_pos = x;
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
if (!(priv->selectable && (modifiers & CLUTTER_SHIFT_MASK)))
clutter_text_clear_selection (self);
Fix problems with "position" and "selection-bound" change notification Added a "selection-bound" notify on clutter_text_clear_selection as it changes the value. Added utility function clutter_text_set_positions, in order to change both cursor position and selection bound inside a g_object_[freeze/thaw]_notify block Added g_object_[freeze/thaw]_notify in other functions that changes both cursor position and selection bound Solves http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-01-25 15:13:58 +00:00
g_object_thaw_notify (G_OBJECT (self));
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
return TRUE;
}
static gboolean
clutter_text_real_line_start (ClutterText *self,
const gchar *action,
guint keyval,
ClutterModifierType modifiers)
{
ClutterTextPrivate *priv = self->priv;
gint position;
Fix problems with "position" and "selection-bound" change notification Added a "selection-bound" notify on clutter_text_clear_selection as it changes the value. Added utility function clutter_text_set_positions, in order to change both cursor position and selection bound inside a g_object_[freeze/thaw]_notify block Added g_object_[freeze/thaw]_notify in other functions that changes both cursor position and selection bound Solves http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-01-25 15:13:58 +00:00
g_object_freeze_notify (G_OBJECT (self));
[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
2009-03-30 15:46:57 +00:00
position = clutter_text_move_line_start (self, priv->position);
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
clutter_text_set_cursor_position (self, position);
if (!(priv->selectable && (modifiers & CLUTTER_SHIFT_MASK)))
clutter_text_clear_selection (self);
Fix problems with "position" and "selection-bound" change notification Added a "selection-bound" notify on clutter_text_clear_selection as it changes the value. Added utility function clutter_text_set_positions, in order to change both cursor position and selection bound inside a g_object_[freeze/thaw]_notify block Added g_object_[freeze/thaw]_notify in other functions that changes both cursor position and selection bound Solves http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-01-25 15:13:58 +00:00
g_object_thaw_notify (G_OBJECT (self));
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
return TRUE;
}
static gboolean
clutter_text_real_line_end (ClutterText *self,
const gchar *action,
guint keyval,
ClutterModifierType modifiers)
{
ClutterTextPrivate *priv = self->priv;
gint position;
Fix problems with "position" and "selection-bound" change notification Added a "selection-bound" notify on clutter_text_clear_selection as it changes the value. Added utility function clutter_text_set_positions, in order to change both cursor position and selection bound inside a g_object_[freeze/thaw]_notify block Added g_object_[freeze/thaw]_notify in other functions that changes both cursor position and selection bound Solves http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-01-25 15:13:58 +00:00
g_object_freeze_notify (G_OBJECT (self));
[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
2009-03-30 15:46:57 +00:00
position = clutter_text_move_line_end (self, priv->position);
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
clutter_text_set_cursor_position (self, position);
if (!(priv->selectable && (modifiers & CLUTTER_SHIFT_MASK)))
clutter_text_clear_selection (self);
Fix problems with "position" and "selection-bound" change notification Added a "selection-bound" notify on clutter_text_clear_selection as it changes the value. Added utility function clutter_text_set_positions, in order to change both cursor position and selection bound inside a g_object_[freeze/thaw]_notify block Added g_object_[freeze/thaw]_notify in other functions that changes both cursor position and selection bound Solves http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-01-25 15:13:58 +00:00
g_object_thaw_notify (G_OBJECT (self));
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
return TRUE;
}
[text] Add select-all binding Bind Ctrl+A to the "select all" action.
2009-01-05 12:27:45 +00:00
static gboolean
clutter_text_real_select_all (ClutterText *self,
const gchar *action,
guint keyval,
ClutterModifierType modifiers)
{
Fix problems with "position" and "selection-bound" change notification Added a "selection-bound" notify on clutter_text_clear_selection as it changes the value. Added utility function clutter_text_set_positions, in order to change both cursor position and selection bound inside a g_object_[freeze/thaw]_notify block Added g_object_[freeze/thaw]_notify in other functions that changes both cursor position and selection bound Solves http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-01-25 15:13:58 +00:00
clutter_text_set_positions (self, 0, self->priv->n_chars);
[text] Add select-all binding Bind Ctrl+A to the "select all" action.
2009-01-05 12:27:45 +00:00
return TRUE;
}
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
static gboolean
clutter_text_real_del_next (ClutterText *self,
const gchar *action,
guint keyval,
ClutterModifierType modifiers)
{
ClutterTextPrivate *priv = self->priv;
gint pos;
gint len;
[text] Add ClutterText::delete_selection() Add a method for deleting the current selection inside a Text actor. This is useful for subclasses. See bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1521 Based on a patch by: Raymond Liu <raymond.liu@intel.com>
2009-05-06 16:08:25 +00:00
if (clutter_text_delete_selection (self))
Change the binding propagation when truncating a selection If a selection has been truncated inside a key binding handler, we should just return and let the usual key event handler continue. This fixes the case where we deleted a selection using the Delete or the Backspace keys.
2008-12-11 12:08:20 +00:00
return TRUE;
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
pos = priv->position;
[text] Fix the deletion actions When using the delete-prev action from the end of the text we end up either missing the first glyph we have to delete or falling through the last one in the text. This commit fixes both issues.
2009-01-06 20:54:20 +00:00
len = priv->n_chars;
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
if (len && pos != -1 && pos < len)
[text] Fix the deletion actions When using the delete-prev action from the end of the text we end up either missing the first glyph we have to delete or falling through the last one in the text. This commit fixes both issues.
2009-01-06 20:54:20 +00:00
clutter_text_delete_text (self, pos, pos + 1);
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
[text] Fix the deletion actions When using the delete-prev action from the end of the text we end up either missing the first glyph we have to delete or falling through the last one in the text. This commit fixes both issues.
2009-01-06 20:54:20 +00:00
return TRUE;
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
}
text: implement del_word_next/del_word_prev() Bind ctrl-backspace and ctrl-del to functions that delete a word before or after the cursor, respectively. Selection does not affect the deletion, but current selection is preserved. This mimicks GTK+ functionality in GtkTextView and GtkEntry. http://bugzilla.openedhand.com/show_bug.cgi?id=1767 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2010-02-03 17:04:38 +00:00
static gboolean
clutter_text_real_del_word_next (ClutterText *self,
const gchar *action,
guint keyval,
ClutterModifierType modifiers)
{
ClutterTextPrivate *priv = self->priv;
gint pos;
gint len;
pos = priv->position;
len = priv->n_chars;
if (len && pos != -1 && pos < len)
{
gint end;
end = clutter_text_move_word_forward (self, pos);
clutter_text_delete_text (self, pos, end);
if (priv->selection_bound >= end)
{
gint new_bound;
new_bound = priv->selection_bound - (end - pos);
clutter_text_set_selection_bound (self, new_bound);
}
else if (priv->selection_bound > pos)
{
clutter_text_set_selection_bound (self, pos);
}
}
return TRUE;
}
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
static gboolean
clutter_text_real_del_prev (ClutterText *self,
const gchar *action,
guint keyval,
ClutterModifierType modifiers)
{
ClutterTextPrivate *priv = self->priv;
gint pos;
gint len;
[text] Add ClutterText::delete_selection() Add a method for deleting the current selection inside a Text actor. This is useful for subclasses. See bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1521 Based on a patch by: Raymond Liu <raymond.liu@intel.com>
2009-05-06 16:08:25 +00:00
if (clutter_text_delete_selection (self))
Change the binding propagation when truncating a selection If a selection has been truncated inside a key binding handler, we should just return and let the usual key event handler continue. This fixes the case where we deleted a selection using the Delete or the Backspace keys.
2008-12-11 12:08:20 +00:00
return TRUE;
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
pos = priv->position;
[text] Fix the deletion actions When using the delete-prev action from the end of the text we end up either missing the first glyph we have to delete or falling through the last one in the text. This commit fixes both issues.
2009-01-06 20:54:20 +00:00
len = priv->n_chars;
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
if (pos != 0 && len != 0)
{
if (pos == -1)
{
[text] Fix the deletion actions When using the delete-prev action from the end of the text we end up either missing the first glyph we have to delete or falling through the last one in the text. This commit fixes both issues.
2009-01-06 20:54:20 +00:00
clutter_text_delete_text (self, len - 1, len);
[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.
2009-05-14 11:00:51 +00:00
Fix problems with "position" and "selection-bound" change notification Added a "selection-bound" notify on clutter_text_clear_selection as it changes the value. Added utility function clutter_text_set_positions, in order to change both cursor position and selection bound inside a g_object_[freeze/thaw]_notify block Added g_object_[freeze/thaw]_notify in other functions that changes both cursor position and selection bound Solves http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-01-25 15:13:58 +00:00
clutter_text_set_positions (self, -1, -1);
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
}
else
{
[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.
2009-05-14 11:00:51 +00:00
clutter_text_delete_text (self, pos - 1, pos);
Fix problems with "position" and "selection-bound" change notification Added a "selection-bound" notify on clutter_text_clear_selection as it changes the value. Added utility function clutter_text_set_positions, in order to change both cursor position and selection bound inside a g_object_[freeze/thaw]_notify block Added g_object_[freeze/thaw]_notify in other functions that changes both cursor position and selection bound Solves http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-01-25 15:13:58 +00:00
clutter_text_set_positions (self, pos - 1, pos - 1);
[text] Fix the deletion actions When using the delete-prev action from the end of the text we end up either missing the first glyph we have to delete or falling through the last one in the text. This commit fixes both issues.
2009-01-06 20:54:20 +00:00
}
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
}
[text] Fix the deletion actions When using the delete-prev action from the end of the text we end up either missing the first glyph we have to delete or falling through the last one in the text. This commit fixes both issues.
2009-01-06 20:54:20 +00:00
return TRUE;
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
}
text: implement del_word_next/del_word_prev() Bind ctrl-backspace and ctrl-del to functions that delete a word before or after the cursor, respectively. Selection does not affect the deletion, but current selection is preserved. This mimicks GTK+ functionality in GtkTextView and GtkEntry. http://bugzilla.openedhand.com/show_bug.cgi?id=1767 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2010-02-03 17:04:38 +00:00
static gboolean
clutter_text_real_del_word_prev (ClutterText *self,
const gchar *action,
guint keyval,
ClutterModifierType modifiers)
{
ClutterTextPrivate *priv = self->priv;
gint pos;
gint len;
pos = priv->position;
len = priv->n_chars;
if (pos != 0 && len != 0)
{
gint new_pos;
if (pos == -1)
{
new_pos = clutter_text_move_word_backward (self, len);
clutter_text_delete_text (self, new_pos, len);
clutter_text_set_positions (self, -1, -1);
}
else
{
new_pos = clutter_text_move_word_backward (self, pos);
clutter_text_delete_text (self, new_pos, pos);
clutter_text_set_cursor_position (self, new_pos);
if (priv->selection_bound >= pos)
{
gint new_bound;
new_bound = priv->selection_bound - (pos - new_pos);
clutter_text_set_selection_bound (self, new_bound);
}
else if (priv->selection_bound >= new_pos)
{
clutter_text_set_selection_bound (self, new_pos);
}
}
}
return TRUE;
}
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
static gboolean
Code style fixes Fix the arguments alignment whenever not consistent with the coding style rules.
2008-12-11 12:15:49 +00:00
clutter_text_real_activate (ClutterText *self,
const gchar *action,
guint keyval,
ClutterModifierType modifiers)
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
{
Use clutter_text_activate() Instead of repeating the same code for the ::activate signal emission, use the clutter_text_activate() function inside the 'activate' key binding handler.
2008-12-16 12:05:10 +00:00
return clutter_text_activate (self);
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
}
Allow selecting with line-start and line-end bindings Instead of installing the line-start and line-end key bindings using the bare ClutterBindingPool API, we can use the internal clutter_text_add_move_binding(), which automatically installs the same key binding with the Shift modifier mask. This allows selecting when pressing Shift+Home or Shift+End. The selection behaviour is still incorrect around the zeroeth position, with all the text after the first line being selected.
2008-12-16 10:39:52 +00:00
static inline void
[text] Allow key navigation by word When pressing Ctrl with the left and right arrow keys we should skip to (or select until) the previous and next word, respectively. Fixes bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1713
2009-07-23 18:04:27 +00:00
clutter_text_add_move_binding (ClutterBindingPool *pool,
const gchar *action,
guint key_val,
ClutterModifierType additional_modifiers,
GCallback callback)
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
{
clutter_binding_pool_install_action (pool, action,
[text] Allow key navigation by word When pressing Ctrl with the left and right arrow keys we should skip to (or select until) the previous and next word, respectively. Fixes bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1713
2009-07-23 18:04:27 +00:00
key_val,
0,
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
callback,
NULL, NULL);
clutter_binding_pool_install_action (pool, action,
[text] Allow key navigation by word When pressing Ctrl with the left and right arrow keys we should skip to (or select until) the previous and next word, respectively. Fixes bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1713
2009-07-23 18:04:27 +00:00
key_val,
CLUTTER_SHIFT_MASK,
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
callback,
NULL, NULL);
[text] Allow key navigation by word When pressing Ctrl with the left and right arrow keys we should skip to (or select until) the previous and next word, respectively. Fixes bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1713
2009-07-23 18:04:27 +00:00
if (additional_modifiers != 0)
{
clutter_binding_pool_install_action (pool, action,
key_val,
additional_modifiers,
callback,
NULL, NULL);
clutter_binding_pool_install_action (pool, action,
key_val,
CLUTTER_SHIFT_MASK |
additional_modifiers,
callback,
NULL, NULL);
}
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
}
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
static void
clutter_text_class_init (ClutterTextClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
ClutterBindingPool *binding_pool;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
GParamSpec *pspec;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
g_type_class_add_private (klass, sizeof (ClutterTextPrivate));
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
gobject_class->set_property = clutter_text_set_property;
gobject_class->get_property = clutter_text_get_property;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
gobject_class->dispose = clutter_text_dispose;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
gobject_class->finalize = clutter_text_finalize;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
actor_class->paint = clutter_text_paint;
actor: make default get_paint_volume more conservative There are too many examples where the default assumption that an actor paints inside its allocation isn't true, so we now return FALSE in the base implementation instead. This means that by default we are saying "we don't know the paint volume of the actor", so developers need to implement the get_paint_volume virtual to take advantage of culling and clipped redraws with their actors. This patch provides very conservative get_paint_volume implementations for ClutterTexture, ClutterCairoTexture, ClutterRectangle and ClutterText which all explicitly check the actor's object type to avoid making any assumptions about subclasses.
2010-09-08 18:47:11 +00:00
actor_class->get_paint_volume = clutter_text_get_paint_volume;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
actor_class->get_preferred_width = clutter_text_get_preferred_width;
actor_class->get_preferred_height = clutter_text_get_preferred_height;
actor_class->allocate = clutter_text_allocate;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
actor_class->key_press_event = clutter_text_key_press;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
actor_class->button_press_event = clutter_text_button_press;
actor_class->button_release_event = clutter_text_button_release;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
actor_class->motion_event = clutter_text_motion;
text: Only paint cursor if we have key focus If a Text actor does not have key focus then there's no point in showing the cursor at all.
2010-12-21 10:50:24 +00:00
actor_class->key_focus_in = clutter_text_key_focus_in;
actor_class->key_focus_out = clutter_text_key_focus_out;
text: Implement the ::has_overlaps virtual Since ClutterText has overlapping primitives when selecting, or a visible cursor, then we need to report that to Clutter, to avoid bleeding colors through when a Text actor is non-fully opaque.
2011-05-13 13:17:39 +00:00
actor_class->has_overlaps = clutter_text_has_overlaps;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
/**
* ClutterText:font-name:
*
* The font to be used by the #ClutterText, as a string
* that can be parsed by pango_font_description_from_string().
*
text: Document and annotate :font-name for NULL values Update the documentation of :font-name, to make it clear that by setting it to NULL the Text actor will use the default font. Also, set the annotation for the @font_name argument of the setter to be allow-none, and allow passing NULL through bindings.
2010-06-26 22:05:36 +00:00
* If set to %NULL, the default system font will be used instead.
*
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
* Since: 1.0
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
*/
pspec = g_param_spec_string ("font-name",
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("Font Name"),
P_("The font to be used by the text"),
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
NULL,
CLUTTER_PARAM_READWRITE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_FONT_NAME] = pspec;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
g_object_class_install_property (gobject_class, PROP_FONT_NAME, pspec);
text: Add :font-description High level toolkits might wish to construct a PangoFontDescription and then set it directly on a ClutterText actor proxy or sub-class. ClutterText should have a :font-description property to set (and get) the PangoFontDescription. http://bugzilla.openedhand.com/show_bug.cgi?id=1960
2010-02-03 14:35:45 +00:00
/**
* ClutterText:font-description:
*
* The #PangoFontDescription that should be used by the #ClutterText
*
* If you have a string describing the font then you should look at
* #ClutterText:font-name instead
*
* Since: 1.2
*/
pspec = g_param_spec_boxed ("font-description",
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("Font Description"),
P_("The font description to be used"),
text: Add :font-description High level toolkits might wish to construct a PangoFontDescription and then set it directly on a ClutterText actor proxy or sub-class. ClutterText should have a :font-description property to set (and get) the PangoFontDescription. http://bugzilla.openedhand.com/show_bug.cgi?id=1960
2010-02-03 14:35:45 +00:00
PANGO_TYPE_FONT_DESCRIPTION,
CLUTTER_PARAM_READWRITE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_FONT_DESCRIPTION] = pspec;
text: Add :font-description High level toolkits might wish to construct a PangoFontDescription and then set it directly on a ClutterText actor proxy or sub-class. ClutterText should have a :font-description property to set (and get) the PangoFontDescription. http://bugzilla.openedhand.com/show_bug.cgi?id=1960
2010-02-03 14:35:45 +00:00
g_object_class_install_property (gobject_class,
PROP_FONT_DESCRIPTION,
pspec);
[docs] Annotate properties and fix signals docs Annotate the properties without gtk-doc description, to get the "Since" attribute. Also, fix the ::cursor-event and ::activate signals documentation.
2008-12-16 11:30:47 +00:00
/**
* ClutterText:text:
*
* The text to render inside the actor.
*
* Since: 1.0
*/
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
pspec = g_param_spec_string ("text",
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("Text"),
P_("The text to render"),
Use "" as the default value for the :text property This follows the convention of GtkLabel/GtkEntry in GTK+ and the old ClutterEntry. It makes it easier to use strlen/strcmp etc on the output, since we can assume that it is always a string. This commit also updates the test unit for ClutterText to verify that the clutter_text_get_text() function also returns an empty string when a ClutterText actor has been created.
2008-12-22 13:29:10 +00:00
"",
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
CLUTTER_PARAM_READWRITE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_TEXT] = pspec;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
g_object_class_install_property (gobject_class, PROP_TEXT, pspec);
[docs] Annotate properties and fix signals docs Annotate the properties without gtk-doc description, to get the "Since" attribute. Also, fix the ::cursor-event and ::activate signals documentation.
2008-12-16 11:30:47 +00:00
/**
* ClutterText:color:
*
* The color used to render the text.
*
* Since: 1.0
*/
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
pspec = clutter_param_spec_color ("color",
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("Font Color"),
P_("Color of the font used by the text"),
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
&default_text_color,
CLUTTER_PARAM_READWRITE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_COLOR] = pspec;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
g_object_class_install_property (gobject_class, PROP_COLOR, pspec);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
/**
* ClutterText:editable:
*
* Whether key events delivered to the actor causes editing.
[docs] Annotate properties and fix signals docs Annotate the properties without gtk-doc description, to get the "Since" attribute. Also, fix the ::cursor-event and ::activate signals documentation.
2008-12-16 11:30:47 +00:00
*
* Since: 1.0
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
*/
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
pspec = g_param_spec_boolean ("editable",
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("Editable"),
P_("Whether the text is editable"),
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
TRUE,
G_PARAM_READWRITE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_EDITABLE] = pspec;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
g_object_class_install_property (gobject_class, PROP_EDITABLE, pspec);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
/**
* ClutterText:selectable:
*
[docs] Annotate properties and fix signals docs Annotate the properties without gtk-doc description, to get the "Since" attribute. Also, fix the ::cursor-event and ::activate signals documentation.
2008-12-16 11:30:47 +00:00
* Whether it is possible to select text, either using the pointer
* or the keyboard.
*
* Since: 1.0
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
*/
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
pspec = g_param_spec_boolean ("selectable",
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("Selectable"),
P_("Whether the text is selectable"),
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
TRUE,
G_PARAM_READWRITE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_SELECTABLE] = pspec;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
g_object_class_install_property (gobject_class, PROP_SELECTABLE, pspec);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
/**
* ClutterText:activatable:
*
* Toggles whether return invokes the activate signal or not.
[docs] Annotate properties and fix signals docs Annotate the properties without gtk-doc description, to get the "Since" attribute. Also, fix the ::cursor-event and ::activate signals documentation.
2008-12-16 11:30:47 +00:00
*
* Since: 1.0
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
*/
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
pspec = g_param_spec_boolean ("activatable",
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("Activatable"),
P_("Whether pressing return causes the activate signal to be emitted"),
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
TRUE,
G_PARAM_READWRITE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_ACTIVATABLE] = pspec;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
g_object_class_install_property (gobject_class, PROP_ACTIVATABLE, pspec);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
/**
* ClutterText:cursor-visible:
*
* Whether the input cursor is visible or not, it will only be visible
[docs] Annotate properties and fix signals docs Annotate the properties without gtk-doc description, to get the "Since" attribute. Also, fix the ::cursor-event and ::activate signals documentation.
2008-12-16 11:30:47 +00:00
* if both #ClutterText:cursor-visible and #ClutterText:editable are
* set to %TRUE.
*
* Since: 1.0
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
*/
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
pspec = g_param_spec_boolean ("cursor-visible",
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("Cursor Visible"),
P_("Whether the input cursor is visible"),
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
TRUE,
CLUTTER_PARAM_READWRITE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_CURSOR_VISIBLE] = pspec;
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
g_object_class_install_property (gobject_class, PROP_CURSOR_VISIBLE, pspec);
[docs] Annotate properties and fix signals docs Annotate the properties without gtk-doc description, to get the "Since" attribute. Also, fix the ::cursor-event and ::activate signals documentation.
2008-12-16 11:30:47 +00:00
/**
* ClutterText:cursor-color:
*
* The color of the cursor.
*
* Since: 1.0
*/
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
pspec = clutter_param_spec_color ("cursor-color",
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("Cursor Color"),
P_("Cursor Color"),
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
&default_cursor_color,
CLUTTER_PARAM_READWRITE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_CURSOR_COLOR] = pspec;
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
g_object_class_install_property (gobject_class, PROP_CURSOR_COLOR, pspec);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
[docs] Annotate properties and fix signals docs Annotate the properties without gtk-doc description, to get the "Since" attribute. Also, fix the ::cursor-event and ::activate signals documentation.
2008-12-16 11:30:47 +00:00
/**
* ClutterText:cursor-color-set:
*
* Will be set to %TRUE if #ClutterText:cursor-color has been set.
*
* Since: 1.0
*/
Add :cursor-color-set property declaration The :cursor-color-set property is a read-only property that reflects whether the ClutterText actor is going to use the color set inside the :cursor-color property when painting the cursor.
2008-12-11 11:49:14 +00:00
pspec = g_param_spec_boolean ("cursor-color-set",
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("Cursor Color Set"),
P_("Whether the cursor color has been set"),
Add :cursor-color-set property declaration The :cursor-color-set property is a read-only property that reflects whether the ClutterText actor is going to use the color set inside the :cursor-color property when painting the cursor.
2008-12-11 11:49:14 +00:00
FALSE,
CLUTTER_PARAM_READABLE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_CURSOR_COLOR_SET] = pspec;
Add :cursor-color-set property declaration The :cursor-color-set property is a read-only property that reflects whether the ClutterText actor is going to use the color set inside the :cursor-color property when painting the cursor.
2008-12-11 11:49:14 +00:00
g_object_class_install_property (gobject_class, PROP_CURSOR_COLOR_SET, pspec);
Add :cursor-size property to ClutterText We can control the width of the cursor when painting by using a simple property. The magic -1 number passed to the setter method will reset the cursor size to the default one of 2px. The getter method will return an unsigned integer with the current size.
2008-12-16 10:37:45 +00:00
/**
* ClutterText:cursor-size:
*
* The size of the cursor, in pixels. If set to -1 the size used will
* be the default cursor size of 2 pixels.
*
* Since: 1.0
*/
pspec = g_param_spec_int ("cursor-size",
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("Cursor Size"),
P_("The width of the cursor, in pixels"),
Add :cursor-size property to ClutterText We can control the width of the cursor when painting by using a simple property. The magic -1 number passed to the setter method will reset the cursor size to the default one of 2px. The getter method will return an unsigned integer with the current size.
2008-12-16 10:37:45 +00:00
-1, G_MAXINT, DEFAULT_CURSOR_SIZE,
CLUTTER_PARAM_READWRITE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_CURSOR_SIZE] = pspec;
Add :cursor-size property to ClutterText We can control the width of the cursor when painting by using a simple property. The magic -1 number passed to the setter method will reset the cursor size to the default one of 2px. The getter method will return an unsigned integer with the current size.
2008-12-16 10:37:45 +00:00
g_object_class_install_property (gobject_class, PROP_CURSOR_SIZE, pspec);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
/**
* ClutterText:position:
*
* The current input cursor position. -1 is taken to be the end of the text
[docs] Annotate properties and fix signals docs Annotate the properties without gtk-doc description, to get the "Since" attribute. Also, fix the ::cursor-event and ::activate signals documentation.
2008-12-16 11:30:47 +00:00
*
* Since: 1.0
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
*/
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
pspec = g_param_spec_int ("position",
text: Rename the nick of the position property "Cursor Position" the "position" property of ClutterText is really the position of the cursor. Rename the nick accordingly not to confuse it with the position of the actor itself and be consistent with all the other cursor-related properties.
2010-10-05 07:25:06 +00:00
P_("Cursor Position"),
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("The cursor position"),
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
-1, G_MAXINT,
-1,
CLUTTER_PARAM_READWRITE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_POSITION] = pspec;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
g_object_class_install_property (gobject_class, PROP_POSITION, pspec);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
/**
* ClutterText:selection-bound:
*
* The current input cursor position. -1 is taken to be the end of the text
[docs] Annotate properties and fix signals docs Annotate the properties without gtk-doc description, to get the "Since" attribute. Also, fix the ::cursor-event and ::activate signals documentation.
2008-12-16 11:30:47 +00:00
*
* Since: 1.0
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
*/
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
pspec = g_param_spec_int ("selection-bound",
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("Selection-bound"),
P_("The cursor position of the other end of the selection"),
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
-1, G_MAXINT,
-1,
CLUTTER_PARAM_READWRITE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_SELECTION_BOUND] = pspec;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
g_object_class_install_property (gobject_class, PROP_SELECTION_BOUND, pspec);
[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.
2009-04-06 14:22:31 +00:00
/**
* ClutterText:selection-color:
*
* The color of the selection.
*
* Since: 1.0
*/
pspec = clutter_param_spec_color ("selection-color",
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("Selection Color"),
P_("Selection Color"),
[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.
2009-04-06 14:22:31 +00:00
&default_selection_color,
CLUTTER_PARAM_READWRITE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_SELECTION_COLOR] = pspec;
[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.
2009-04-06 14:22:31 +00:00
g_object_class_install_property (gobject_class, PROP_SELECTION_COLOR, pspec);
/**
* ClutterText:selection-color-set:
*
* Will be set to %TRUE if #ClutterText:selection-color has been set.
*
* Since: 1.0
*/
pspec = g_param_spec_boolean ("selection-color-set",
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("Selection Color Set"),
P_("Whether the selection color has been set"),
[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.
2009-04-06 14:22:31 +00:00
FALSE,
CLUTTER_PARAM_READABLE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_SELECTION_COLOR_SET] = pspec;
[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.
2009-04-06 14:22:31 +00:00
g_object_class_install_property (gobject_class, PROP_SELECTION_COLOR_SET, pspec);
[docs] Annotate properties and fix signals docs Annotate the properties without gtk-doc description, to get the "Since" attribute. Also, fix the ::cursor-event and ::activate signals documentation.
2008-12-16 11:30:47 +00:00
/**
* ClutterText:attributes:
*
* A list of #PangoStyleAttribute<!-- -->s to be applied to the
* contents of the #ClutterText actor.
*
* Since: 1.0
*/
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
pspec = g_param_spec_boxed ("attributes",
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("Attributes"),
P_("A list of style attributes to apply to the contents of the actor"),
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
PANGO_TYPE_ATTR_LIST,
CLUTTER_PARAM_READWRITE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_ATTRIBUTES] = pspec;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
g_object_class_install_property (gobject_class, PROP_ATTRIBUTES, pspec);
/**
* ClutterText:use-markup:
*
text: Do not set the markup unconditionally When setting :use-markup we always pass the contents of the Text actor to clutter_text_set_markup_internal(); if string contains any markup, this ends up being parsed and used - even when :use-markup is set to FALSE. http://bugzilla.clutter-project.org/show_bug.cgi?id=2239
2010-08-06 16:04:37 +00:00
* Whether the text includes Pango markup.
*
* For more informations about the Pango markup format, see
* pango_layout_set_markup() in the Pango documentation.
*
* <note>It is not possible to round-trip this property between
* %TRUE and %FALSE. Once a string with markup has been set on
* a #ClutterText actor with :use-markup set to %TRUE, the markup
* is stripped from the string.</note>
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
*
* Since: 1.0
*/
pspec = g_param_spec_boolean ("use-markup",
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("Use markup"),
P_("Whether or not the text includes Pango markup"),
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
FALSE,
CLUTTER_PARAM_READWRITE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_USE_MARKUP] = pspec;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
g_object_class_install_property (gobject_class, PROP_USE_MARKUP, pspec);
/**
* ClutterText:line-wrap:
*
* Whether to wrap the lines of #ClutterText:text if the contents
* exceed the available allocation. The wrapping strategy is
* controlled by the #ClutterText:line-wrap-mode property.
*
* Since: 1.0
*/
pspec = g_param_spec_boolean ("line-wrap",
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("Line wrap"),
P_("If set, wrap the lines if the text becomes too wide"),
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
FALSE,
CLUTTER_PARAM_READWRITE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_LINE_WRAP] = pspec;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
g_object_class_install_property (gobject_class, PROP_LINE_WRAP, pspec);
/**
* ClutterText:line-wrap-mode:
*
* If #ClutterText:line-wrap is set to %TRUE, this property will
* control how the text is wrapped.
*
* Since: 1.0
*/
pspec = g_param_spec_enum ("line-wrap-mode",
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("Line wrap mode"),
P_("Control how line-wrapping is done"),
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
PANGO_TYPE_WRAP_MODE,
PANGO_WRAP_WORD,
CLUTTER_PARAM_READWRITE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_LINE_WRAP_MODE] = pspec;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
g_object_class_install_property (gobject_class, PROP_LINE_WRAP_MODE, pspec);
[docs] Annotate properties and fix signals docs Annotate the properties without gtk-doc description, to get the "Since" attribute. Also, fix the ::cursor-event and ::activate signals documentation.
2008-12-16 11:30:47 +00:00
/**
* ClutterText:ellipsize:
*
* The preferred place to ellipsize the contents of the #ClutterText actor
*
* Since: 1.0
*/
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
pspec = g_param_spec_enum ("ellipsize",
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("Ellipsize"),
P_("The preferred place to ellipsize the string"),
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
PANGO_TYPE_ELLIPSIZE_MODE,
PANGO_ELLIPSIZE_NONE,
CLUTTER_PARAM_READWRITE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_ELLIPSIZE] = pspec;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
g_object_class_install_property (gobject_class, PROP_ELLIPSIZE, pspec);
/**
[text] Rename :alignment to :line-alignment The :alignment property is prone to generate confusion: developers will set it thinking that the contents of a ClutterText will automagically align themselves. Instead of using the generic term :alignment, and following the GTK+ convention, we should use a more specific term, conveying the actual effect of the property: alignment of the lines with respect to each other, and not to the overall allocated area. See bug 1428: http://bugzilla.openedhand.com/show_bug.cgi?id=1428
2009-02-02 23:55:30 +00:00
* ClutterText:line-alignment:
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
*
* The preferred alignment for the text. This property controls
* the alignment of multi-line paragraphs.
*
* Since: 1.0
*/
[text] Rename :alignment to :line-alignment The :alignment property is prone to generate confusion: developers will set it thinking that the contents of a ClutterText will automagically align themselves. Instead of using the generic term :alignment, and following the GTK+ convention, we should use a more specific term, conveying the actual effect of the property: alignment of the lines with respect to each other, and not to the overall allocated area. See bug 1428: http://bugzilla.openedhand.com/show_bug.cgi?id=1428
2009-02-02 23:55:30 +00:00
pspec = g_param_spec_enum ("line-alignment",
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("Line Alignment"),
P_("The preferred alignment for the string, for multi-line text"),
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
PANGO_TYPE_ALIGNMENT,
PANGO_ALIGN_LEFT,
CLUTTER_PARAM_READWRITE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_LINE_ALIGNMENT] = pspec;
[text] Rename :alignment to :line-alignment The :alignment property is prone to generate confusion: developers will set it thinking that the contents of a ClutterText will automagically align themselves. Instead of using the generic term :alignment, and following the GTK+ convention, we should use a more specific term, conveying the actual effect of the property: alignment of the lines with respect to each other, and not to the overall allocated area. See bug 1428: http://bugzilla.openedhand.com/show_bug.cgi?id=1428
2009-02-02 23:55:30 +00:00
g_object_class_install_property (gobject_class, PROP_LINE_ALIGNMENT, pspec);
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
/**
* ClutterText:justify:
*
* Whether the contents of the #ClutterText should be justified
* on both margins.
*
* Since: 1.0
*/
pspec = g_param_spec_boolean ("justify",
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("Justify"),
P_("Whether the text should be justified"),
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
FALSE,
CLUTTER_PARAM_READWRITE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_JUSTIFY] = pspec;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
g_object_class_install_property (gobject_class, PROP_JUSTIFY, pspec);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
[docs] Annotate properties and fix signals docs Annotate the properties without gtk-doc description, to get the "Since" attribute. Also, fix the ::cursor-event and ::activate signals documentation.
2008-12-16 11:30:47 +00:00
/**
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
* ClutterText:password-char:
[docs] Annotate properties and fix signals docs Annotate the properties without gtk-doc description, to get the "Since" attribute. Also, fix the ::cursor-event and ::activate signals documentation.
2008-12-16 11:30:47 +00:00
*
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
* If non-zero, the character that should be used in place of
* the actual text in a password text actor.
[docs] Annotate properties and fix signals docs Annotate the properties without gtk-doc description, to get the "Since" attribute. Also, fix the ::cursor-event and ::activate signals documentation.
2008-12-16 11:30:47 +00:00
*
* Since: 1.0
*/
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
pspec = g_param_spec_unichar ("password-char",
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("Password Character"),
P_("If non-zero, use this character to display the actor's contents"),
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
0,
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
CLUTTER_PARAM_READWRITE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_PASSWORD_CHAR] = pspec;
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
g_object_class_install_property (gobject_class, PROP_PASSWORD_CHAR, pspec);
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
[docs] Annotate properties and fix signals docs Annotate the properties without gtk-doc description, to get the "Since" attribute. Also, fix the ::cursor-event and ::activate signals documentation.
2008-12-16 11:30:47 +00:00
/**
* ClutterText:max-length:
*
* The maximum length of the contents of the #ClutterText actor.
*
* Since: 1.0
*/
Implement Text:max-length The :max-length property establishes the maximum available length for the Text actor's contents, in characters.
2008-12-11 11:54:07 +00:00
pspec = g_param_spec_int ("max-length",
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("Max Length"),
P_("Maximum length of the text inside the actor"),
Implement Text:max-length The :max-length property establishes the maximum available length for the Text actor's contents, in characters.
2008-12-11 11:54:07 +00:00
-1, G_MAXINT, 0,
CLUTTER_PARAM_READWRITE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_MAX_LENGTH] = pspec;
Implement Text:max-length The :max-length property establishes the maximum available length for the Text actor's contents, in characters.
2008-12-11 11:54:07 +00:00
g_object_class_install_property (gobject_class, PROP_MAX_LENGTH, pspec);
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
/**
* ClutterText:single-line-mode:
*
* Whether the #ClutterText actor should be in single line mode
* or not. A single line #ClutterText actor will only contain a
* single line of text, scrolling it in case its length is bigger
* than the allocated size.
*
* Setting this property will also set the #ClutterText:activatable
* property as a side-effect.
*
docs: Clarify the scope of Text:single-line-mode Only editable text actors can be in single-line mode.
2010-06-14 13:05:49 +00:00
* The #ClutterText:single-line-mode property is used only if the
* #ClutterText:editable property is set to %TRUE.
*
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
* Since: 1.0
*/
pspec = g_param_spec_boolean ("single-line-mode",
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
P_("Single Line Mode"),
P_("Whether the text should be a single line"),
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
FALSE,
CLUTTER_PARAM_READWRITE);
Conditionally use g_object_notify_by_pspec This adds a wrapper macro to clutter-private that will use g_object_notify_by_pspec if it's compiled against a version of GLib that is sufficiently new. Otherwise it will notify by the property name as before by extracting the name from the pspec. The objects can then store a static array of GParamSpecs and notify using those as suggested in the documentation for g_object_notify_by_pspec. Note that the name of the variable used for storing the array of GParamSpecs is obj_props instead of properties as used in the documentation because some places in Clutter uses 'properties' as the name of a local variable. Mose of the classes in Clutter have been converted using the script in the bug report. Some classes have not been modified even though the script picked them up as described here: json-generator: We probably don't want to modify the internal copy of JSON behaviour-depth: rectangle: score: stage-manager: These aren't using the separate GParamSpec* variable style. blur-effect: win32/device-manager: Don't actually define any properties even though it has the enum. box-layout: flow-layout: Have some per-child properties that don't work automatically with the script. clutter-model: The script gets confused with ClutterModelIter stage: Script gets confused because PROP_USER_RESIZE doesn't match "user-resizable" test-layout: Don't really want to modify the tests http://bugzilla.clutter-project.org/show_bug.cgi?id=2150
2010-06-21 09:20:32 +00:00
obj_props[PROP_SINGLE_LINE_MODE] = pspec;
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
g_object_class_install_property (gobject_class, PROP_SINGLE_LINE_MODE, pspec);
clutter-text: Add a selected-text-color http://bugzilla.clutter-project.org/show_bug.cgi?id=2595
2011-03-02 17:02:56 +00:00
/**
* ClutterText:selected-text-color:
*
* The color of selected text.
*
* Since: 1.8
*/
pspec = clutter_param_spec_color ("selected-text-color",
P_("Selected Text Color"),
P_("Selected Text Color"),
&default_selected_text_color,
CLUTTER_PARAM_READWRITE);
obj_props[PROP_SELECTED_TEXT_COLOR] = pspec;
g_object_class_install_property (gobject_class, PROP_SELECTED_TEXT_COLOR, pspec);
/**
* ClutterText:selected-text-color-set:
*
* Will be set to %TRUE if #ClutterText:selected-text-color has been set.
*
* Since: 1.8
*/
pspec = g_param_spec_boolean ("selected-text-color-set",
P_("Selected Text Color Set"),
P_("Whether the selected text color has been set"),
FALSE,
CLUTTER_PARAM_READABLE);
obj_props[PROP_SELECTED_TEXT_COLOR_SET] = pspec;
g_object_class_install_property (gobject_class, PROP_SELECTED_TEXT_COLOR_SET, pspec);
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
/**
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
* ClutterText::text-changed:
Add documentation annotations ClutterText is heavily under-documented. This commit ports most of the API documentation from ClutterLabel and ClutterEntry to ClutterText.
2008-12-11 12:17:11 +00:00
* @self: the #ClutterText that emitted the signal
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
*
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
* The ::text-changed signal is emitted after @actor's text changes
*
* Since: 1.0
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
*/
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
text_signals[TEXT_CHANGED] =
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
g_signal_new (I_("text-changed"),
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
G_TYPE_FROM_CLASS (gobject_class),
G_SIGNAL_RUN_LAST,
Group all the integer private fields Integer fields using the ": <bits>" notation should be packed together so that the compiler can optimize the structure size correctly.
2008-12-11 11:15:56 +00:00
G_STRUCT_OFFSET (ClutterTextClass, text_changed),
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
NULL, NULL,
Hide the marshallers The marshallers we use for the signals are declared in a private header, and it stands to reason that they should also be hidden in the shared object by using the common '_' prefix. We are also using some direct g_cclosure_marshal_* symbol from GLib, instead of consistently use the clutter_marshal_* symbol.
2010-06-11 14:49:46 +00:00
_clutter_marshal_VOID__VOID,
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
G_TYPE_NONE, 0);
Added ClutterText::insert-text and ClutterText::delete-text signals * clutter/clutter-marshal.list: added new marshaller * clutter/clutter-text.c (clutter_text_class_init): added insert-text and delete-text signals (clutter_text_insert_unichar): emits insert-text signal (clutter_text_insert_text): emits insert-text signal (clutter_text_delete_text): emits delete-text signal (clutter_text_delete_chars): emits delete-text signal (clutter_text_set_markup_internal): emits delete-text and insert-text signals (clutter_text_set_text): emits delete-text and insert-text signals http://bugzilla.openedhand.com/show_bug.cgi?id=1894
2009-11-20 14:17:41 +00:00
/**
* ClutterText::insert-text:
* @self: the #ClutterText that emitted the signal
* @new_text: the new text to insert
* @new_text_length: the length of the new text, in bytes, or -1 if
* new_text is nul-terminated
* @position: the position, in characters, at which to insert the
* new text. this is an in-out parameter. After the signal
* emission is finished, it should point after the newly
* inserted text.
*
* This signal is emitted when text is inserted into the actor by
* the user. It is emitted before @self text changes.
*
* Since: 1.2
*/
text_signals[INSERT_TEXT] =
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
g_signal_new (I_("insert-text"),
Added ClutterText::insert-text and ClutterText::delete-text signals * clutter/clutter-marshal.list: added new marshaller * clutter/clutter-text.c (clutter_text_class_init): added insert-text and delete-text signals (clutter_text_insert_unichar): emits insert-text signal (clutter_text_insert_text): emits insert-text signal (clutter_text_delete_text): emits delete-text signal (clutter_text_delete_chars): emits delete-text signal (clutter_text_set_markup_internal): emits delete-text and insert-text signals (clutter_text_set_text): emits delete-text and insert-text signals http://bugzilla.openedhand.com/show_bug.cgi?id=1894
2009-11-20 14:17:41 +00:00
G_TYPE_FROM_CLASS (gobject_class),
text: Use G_SIGNAL_ACTION for ::insert-text and ::delete-text Both the ::insert-text and ::delete-text are "action" signals, that is signals that are safe to (and should) be emitted using g_signal_emit() directly.
2010-01-04 12:03:47 +00:00
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
Added ClutterText::insert-text and ClutterText::delete-text signals * clutter/clutter-marshal.list: added new marshaller * clutter/clutter-text.c (clutter_text_class_init): added insert-text and delete-text signals (clutter_text_insert_unichar): emits insert-text signal (clutter_text_insert_text): emits insert-text signal (clutter_text_delete_text): emits delete-text signal (clutter_text_delete_chars): emits delete-text signal (clutter_text_set_markup_internal): emits delete-text and insert-text signals (clutter_text_set_text): emits delete-text and insert-text signals http://bugzilla.openedhand.com/show_bug.cgi?id=1894
2009-11-20 14:17:41 +00:00
0,
NULL, NULL,
Hide the marshallers The marshallers we use for the signals are declared in a private header, and it stands to reason that they should also be hidden in the shared object by using the common '_' prefix. We are also using some direct g_cclosure_marshal_* symbol from GLib, instead of consistently use the clutter_marshal_* symbol.
2010-06-11 14:49:46 +00:00
_clutter_marshal_VOID__STRING_INT_POINTER,
Added ClutterText::insert-text and ClutterText::delete-text signals * clutter/clutter-marshal.list: added new marshaller * clutter/clutter-text.c (clutter_text_class_init): added insert-text and delete-text signals (clutter_text_insert_unichar): emits insert-text signal (clutter_text_insert_text): emits insert-text signal (clutter_text_delete_text): emits delete-text signal (clutter_text_delete_chars): emits delete-text signal (clutter_text_set_markup_internal): emits delete-text and insert-text signals (clutter_text_set_text): emits delete-text and insert-text signals http://bugzilla.openedhand.com/show_bug.cgi?id=1894
2009-11-20 14:17:41 +00:00
G_TYPE_NONE, 3,
G_TYPE_STRING,
G_TYPE_INT,
G_TYPE_POINTER);
/**
* ClutterText::delete-text:
* @self: the #ClutterText that emitted the signal
* @start_pos: the starting position
* @end_pos: the end position
*
* This signal is emitted when text is deleted from the actor by
* the user. It is emitted before @self text changes.
*
* Since: 1.2
*/
text_signals[DELETE_TEXT] =
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
g_signal_new (I_("delete-text"),
Added ClutterText::insert-text and ClutterText::delete-text signals * clutter/clutter-marshal.list: added new marshaller * clutter/clutter-text.c (clutter_text_class_init): added insert-text and delete-text signals (clutter_text_insert_unichar): emits insert-text signal (clutter_text_insert_text): emits insert-text signal (clutter_text_delete_text): emits delete-text signal (clutter_text_delete_chars): emits delete-text signal (clutter_text_set_markup_internal): emits delete-text and insert-text signals (clutter_text_set_text): emits delete-text and insert-text signals http://bugzilla.openedhand.com/show_bug.cgi?id=1894
2009-11-20 14:17:41 +00:00
G_TYPE_FROM_CLASS (gobject_class),
text: Use G_SIGNAL_ACTION for ::insert-text and ::delete-text Both the ::insert-text and ::delete-text are "action" signals, that is signals that are safe to (and should) be emitted using g_signal_emit() directly.
2010-01-04 12:03:47 +00:00
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
Added ClutterText::insert-text and ClutterText::delete-text signals * clutter/clutter-marshal.list: added new marshaller * clutter/clutter-text.c (clutter_text_class_init): added insert-text and delete-text signals (clutter_text_insert_unichar): emits insert-text signal (clutter_text_insert_text): emits insert-text signal (clutter_text_delete_text): emits delete-text signal (clutter_text_delete_chars): emits delete-text signal (clutter_text_set_markup_internal): emits delete-text and insert-text signals (clutter_text_set_text): emits delete-text and insert-text signals http://bugzilla.openedhand.com/show_bug.cgi?id=1894
2009-11-20 14:17:41 +00:00
0,
NULL, NULL,
Hide the marshallers The marshallers we use for the signals are declared in a private header, and it stands to reason that they should also be hidden in the shared object by using the common '_' prefix. We are also using some direct g_cclosure_marshal_* symbol from GLib, instead of consistently use the clutter_marshal_* symbol.
2010-06-11 14:49:46 +00:00
_clutter_marshal_VOID__INT_INT,
Added ClutterText::insert-text and ClutterText::delete-text signals * clutter/clutter-marshal.list: added new marshaller * clutter/clutter-text.c (clutter_text_class_init): added insert-text and delete-text signals (clutter_text_insert_unichar): emits insert-text signal (clutter_text_insert_text): emits insert-text signal (clutter_text_delete_text): emits delete-text signal (clutter_text_delete_chars): emits delete-text signal (clutter_text_set_markup_internal): emits delete-text and insert-text signals (clutter_text_set_text): emits delete-text and insert-text signals http://bugzilla.openedhand.com/show_bug.cgi?id=1894
2009-11-20 14:17:41 +00:00
G_TYPE_NONE, 2,
G_TYPE_INT,
G_TYPE_INT);
Add documentation annotations ClutterText is heavily under-documented. This commit ports most of the API documentation from ClutterLabel and ClutterEntry to ClutterText.
2008-12-11 12:17:11 +00:00
/**
* ClutterText::cursor-event:
* @self: the #ClutterText that emitted the signal
* @geometry: the coordinates of the cursor
*
[docs] Annotate properties and fix signals docs Annotate the properties without gtk-doc description, to get the "Since" attribute. Also, fix the ::cursor-event and ::activate signals documentation.
2008-12-16 11:30:47 +00:00
* The ::cursor-event signal is emitted whenever the cursor position
* changes inside a #ClutterText actor. Inside @geometry it is stored
* the current position and size of the cursor, relative to the actor
* itself.
Add documentation annotations ClutterText is heavily under-documented. This commit ports most of the API documentation from ClutterLabel and ClutterEntry to ClutterText.
2008-12-11 12:17:11 +00:00
*
* Since: 1.0
*/
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
text_signals[CURSOR_EVENT] =
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
g_signal_new (I_("cursor-event"),
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
G_TYPE_FROM_CLASS (gobject_class),
G_SIGNAL_RUN_LAST,
Group all the integer private fields Integer fields using the ": <bits>" notation should be packed together so that the compiler can optimize the structure size correctly.
2008-12-11 11:15:56 +00:00
G_STRUCT_OFFSET (ClutterTextClass, cursor_event),
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
NULL, NULL,
Hide the marshallers The marshallers we use for the signals are declared in a private header, and it stands to reason that they should also be hidden in the shared object by using the common '_' prefix. We are also using some direct g_cclosure_marshal_* symbol from GLib, instead of consistently use the clutter_marshal_* symbol.
2010-06-11 14:49:46 +00:00
_clutter_marshal_VOID__BOXED,
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
G_TYPE_NONE, 1,
CLUTTER_TYPE_GEOMETRY | G_SIGNAL_TYPE_STATIC_SCOPE);
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
/**
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
* ClutterText::activate
Add documentation annotations ClutterText is heavily under-documented. This commit ports most of the API documentation from ClutterLabel and ClutterEntry to ClutterText.
2008-12-11 12:17:11 +00:00
* @self: the #ClutterText that emitted the signal
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
*
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
* The ::activate signal is emitted each time the actor is 'activated'
[docs] Annotate properties and fix signals docs Annotate the properties without gtk-doc description, to get the "Since" attribute. Also, fix the ::cursor-event and ::activate signals documentation.
2008-12-16 11:30:47 +00:00
* by the user, normally by pressing the 'Enter' key. The signal is
* emitted only if #ClutterText:activatable is set to %TRUE.
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
*
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
* Since: 1.0
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
*/
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
text_signals[ACTIVATE] =
Mark property strings for translation Both the nick and the blurb fields should be translatable, for UI builders and other introspection-based tools.
2010-06-03 11:57:50 +00:00
g_signal_new (I_("activate"),
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
G_TYPE_FROM_CLASS (gobject_class),
G_SIGNAL_RUN_LAST,
Group all the integer private fields Integer fields using the ": <bits>" notation should be packed together so that the compiler can optimize the structure size correctly.
2008-12-11 11:15:56 +00:00
G_STRUCT_OFFSET (ClutterTextClass, activate),
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
NULL, NULL,
Hide the marshallers The marshallers we use for the signals are declared in a private header, and it stands to reason that they should also be hidden in the shared object by using the common '_' prefix. We are also using some direct g_cclosure_marshal_* symbol from GLib, instead of consistently use the clutter_marshal_* symbol.
2010-06-11 14:49:46 +00:00
_clutter_marshal_VOID__VOID,
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
G_TYPE_NONE, 0);
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
binding_pool = clutter_binding_pool_get_for_class (klass);
clutter_text_add_move_binding (binding_pool, "move-left",
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
CLUTTER_KEY_Left, CLUTTER_CONTROL_MASK,
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
G_CALLBACK (clutter_text_real_move_left));
clutter_text_add_move_binding (binding_pool, "move-left",
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
CLUTTER_KEY_KP_Left, CLUTTER_CONTROL_MASK,
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
G_CALLBACK (clutter_text_real_move_left));
clutter_text_add_move_binding (binding_pool, "move-right",
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
CLUTTER_KEY_Right, CLUTTER_CONTROL_MASK,
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
G_CALLBACK (clutter_text_real_move_right));
clutter_text_add_move_binding (binding_pool, "move-right",
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
CLUTTER_KEY_KP_Right, CLUTTER_CONTROL_MASK,
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
G_CALLBACK (clutter_text_real_move_right));
clutter_text_add_move_binding (binding_pool, "move-up",
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
CLUTTER_KEY_Up, 0,
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
G_CALLBACK (clutter_text_real_move_up));
clutter_text_add_move_binding (binding_pool, "move-up",
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
CLUTTER_KEY_KP_Up, 0,
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
G_CALLBACK (clutter_text_real_move_up));
clutter_text_add_move_binding (binding_pool, "move-down",
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
CLUTTER_KEY_Down, 0,
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
G_CALLBACK (clutter_text_real_move_down));
clutter_text_add_move_binding (binding_pool, "move-down",
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
CLUTTER_KEY_KP_Down, 0,
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
G_CALLBACK (clutter_text_real_move_down));
Allow selecting with line-start and line-end bindings Instead of installing the line-start and line-end key bindings using the bare ClutterBindingPool API, we can use the internal clutter_text_add_move_binding(), which automatically installs the same key binding with the Shift modifier mask. This allows selecting when pressing Shift+Home or Shift+End. The selection behaviour is still incorrect around the zeroeth position, with all the text after the first line being selected.
2008-12-16 10:39:52 +00:00
clutter_text_add_move_binding (binding_pool, "line-start",
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
CLUTTER_KEY_Home, 0,
Allow selecting with line-start and line-end bindings Instead of installing the line-start and line-end key bindings using the bare ClutterBindingPool API, we can use the internal clutter_text_add_move_binding(), which automatically installs the same key binding with the Shift modifier mask. This allows selecting when pressing Shift+Home or Shift+End. The selection behaviour is still incorrect around the zeroeth position, with all the text after the first line being selected.
2008-12-16 10:39:52 +00:00
G_CALLBACK (clutter_text_real_line_start));
clutter_text_add_move_binding (binding_pool, "line-start",
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
CLUTTER_KEY_KP_Home, 0,
Allow selecting with line-start and line-end bindings Instead of installing the line-start and line-end key bindings using the bare ClutterBindingPool API, we can use the internal clutter_text_add_move_binding(), which automatically installs the same key binding with the Shift modifier mask. This allows selecting when pressing Shift+Home or Shift+End. The selection behaviour is still incorrect around the zeroeth position, with all the text after the first line being selected.
2008-12-16 10:39:52 +00:00
G_CALLBACK (clutter_text_real_line_start));
clutter_text_add_move_binding (binding_pool, "line-start",
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
CLUTTER_KEY_Begin, 0,
Allow selecting with line-start and line-end bindings Instead of installing the line-start and line-end key bindings using the bare ClutterBindingPool API, we can use the internal clutter_text_add_move_binding(), which automatically installs the same key binding with the Shift modifier mask. This allows selecting when pressing Shift+Home or Shift+End. The selection behaviour is still incorrect around the zeroeth position, with all the text after the first line being selected.
2008-12-16 10:39:52 +00:00
G_CALLBACK (clutter_text_real_line_start));
clutter_text_add_move_binding (binding_pool, "line-end",
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
CLUTTER_KEY_End, 0,
Allow selecting with line-start and line-end bindings Instead of installing the line-start and line-end key bindings using the bare ClutterBindingPool API, we can use the internal clutter_text_add_move_binding(), which automatically installs the same key binding with the Shift modifier mask. This allows selecting when pressing Shift+Home or Shift+End. The selection behaviour is still incorrect around the zeroeth position, with all the text after the first line being selected.
2008-12-16 10:39:52 +00:00
G_CALLBACK (clutter_text_real_line_end));
clutter_text_add_move_binding (binding_pool, "line-end",
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
CLUTTER_KEY_KP_End, 0,
Allow selecting with line-start and line-end bindings Instead of installing the line-start and line-end key bindings using the bare ClutterBindingPool API, we can use the internal clutter_text_add_move_binding(), which automatically installs the same key binding with the Shift modifier mask. This allows selecting when pressing Shift+Home or Shift+End. The selection behaviour is still incorrect around the zeroeth position, with all the text after the first line being selected.
2008-12-16 10:39:52 +00:00
G_CALLBACK (clutter_text_real_line_end));
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
[text] Add select-all binding Bind Ctrl+A to the "select all" action.
2009-01-05 12:27:45 +00:00
clutter_binding_pool_install_action (binding_pool, "select-all",
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
CLUTTER_KEY_a, CLUTTER_CONTROL_MASK,
[text] Add select-all binding Bind Ctrl+A to the "select all" action.
2009-01-05 12:27:45 +00:00
G_CALLBACK (clutter_text_real_select_all),
NULL, NULL);
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
clutter_binding_pool_install_action (binding_pool, "delete-next",
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
CLUTTER_KEY_Delete, 0,
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
G_CALLBACK (clutter_text_real_del_next),
NULL, NULL);
text: implement del_word_next/del_word_prev() Bind ctrl-backspace and ctrl-del to functions that delete a word before or after the cursor, respectively. Selection does not affect the deletion, but current selection is preserved. This mimicks GTK+ functionality in GtkTextView and GtkEntry. http://bugzilla.openedhand.com/show_bug.cgi?id=1767 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2010-02-03 17:04:38 +00:00
clutter_binding_pool_install_action (binding_pool, "delete-next",
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
CLUTTER_KEY_Delete, CLUTTER_CONTROL_MASK,
text: implement del_word_next/del_word_prev() Bind ctrl-backspace and ctrl-del to functions that delete a word before or after the cursor, respectively. Selection does not affect the deletion, but current selection is preserved. This mimicks GTK+ functionality in GtkTextView and GtkEntry. http://bugzilla.openedhand.com/show_bug.cgi?id=1767 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2010-02-03 17:04:38 +00:00
G_CALLBACK (clutter_text_real_del_word_next),
NULL, NULL);
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
clutter_binding_pool_install_action (binding_pool, "delete-next",
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
CLUTTER_KEY_KP_Delete, 0,
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
G_CALLBACK (clutter_text_real_del_next),
NULL, NULL);
text: implement del_word_next/del_word_prev() Bind ctrl-backspace and ctrl-del to functions that delete a word before or after the cursor, respectively. Selection does not affect the deletion, but current selection is preserved. This mimicks GTK+ functionality in GtkTextView and GtkEntry. http://bugzilla.openedhand.com/show_bug.cgi?id=1767 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2010-02-03 17:04:38 +00:00
clutter_binding_pool_install_action (binding_pool, "delete-next",
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
CLUTTER_KEY_KP_Delete, CLUTTER_CONTROL_MASK,
text: implement del_word_next/del_word_prev() Bind ctrl-backspace and ctrl-del to functions that delete a word before or after the cursor, respectively. Selection does not affect the deletion, but current selection is preserved. This mimicks GTK+ functionality in GtkTextView and GtkEntry. http://bugzilla.openedhand.com/show_bug.cgi?id=1767 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2010-02-03 17:04:38 +00:00
G_CALLBACK (clutter_text_real_del_word_next),
NULL, NULL);
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
clutter_binding_pool_install_action (binding_pool, "delete-prev",
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
CLUTTER_KEY_BackSpace, 0,
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
G_CALLBACK (clutter_text_real_del_prev),
NULL, NULL);
text: Bind BackSpace + Shift as BackSpace Follow this old GTK+ bug: https://bugzilla.gnome.org/show_bug.cgi?id=80302 and ignore the Shift mask.
2011-01-30 23:00:00 +00:00
clutter_binding_pool_install_action (binding_pool, "delete-prev",
CLUTTER_KEY_BackSpace, CLUTTER_SHIFT_MASK,
G_CALLBACK (clutter_text_real_del_prev),
NULL, NULL);
text: implement del_word_next/del_word_prev() Bind ctrl-backspace and ctrl-del to functions that delete a word before or after the cursor, respectively. Selection does not affect the deletion, but current selection is preserved. This mimicks GTK+ functionality in GtkTextView and GtkEntry. http://bugzilla.openedhand.com/show_bug.cgi?id=1767 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2010-02-03 17:04:38 +00:00
clutter_binding_pool_install_action (binding_pool, "delete-prev",
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
CLUTTER_KEY_BackSpace, CLUTTER_CONTROL_MASK,
text: implement del_word_next/del_word_prev() Bind ctrl-backspace and ctrl-del to functions that delete a word before or after the cursor, respectively. Selection does not affect the deletion, but current selection is preserved. This mimicks GTK+ functionality in GtkTextView and GtkEntry. http://bugzilla.openedhand.com/show_bug.cgi?id=1767 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2010-02-03 17:04:38 +00:00
G_CALLBACK (clutter_text_real_del_word_prev),
NULL, NULL);
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
clutter_binding_pool_install_action (binding_pool, "activate",
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
CLUTTER_KEY_Return, 0,
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
G_CALLBACK (clutter_text_real_activate),
NULL, NULL);
clutter_binding_pool_install_action (binding_pool, "activate",
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
CLUTTER_KEY_KP_Enter, 0,
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
G_CALLBACK (clutter_text_real_activate),
NULL, NULL);
clutter_binding_pool_install_action (binding_pool, "activate",
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
CLUTTER_KEY_ISO_Enter, 0,
Use ClutterBindPool inside ClutterText ClutterText should use the newly added ClutterBindingPool API to handle key events, instead of its homegrown code. This commit removes the action/mapping code and defers the entire key binding matching to a ClutterBindingPool created inside the Text class initialization function.
2008-12-11 12:03:17 +00:00
G_CALLBACK (clutter_text_real_activate),
NULL, NULL);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
}
static void
clutter_text_init (ClutterText *self)
{
Do not use deprecated API internally
2010-09-10 13:27:37 +00:00
ClutterSettings *settings;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
ClutterTextPrivate *priv;
Do not use deprecated API internally
2010-09-10 13:27:37 +00:00
gchar *font_name;
Correctly initialize the initial state of ClutterText Some of the values in ClutterText have an initial state that does not match a zero-ed out ClutterTextPrivate structure.
2008-12-11 11:35:52 +00:00
int i;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
self->priv = priv = CLUTTER_TEXT_GET_PRIVATE (self);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
Correctly initialize the initial state of ClutterText Some of the values in ClutterText have an initial state that does not match a zero-ed out ClutterTextPrivate structure.
2008-12-11 11:35:52 +00:00
priv->alignment = PANGO_ALIGN_LEFT;
priv->wrap = FALSE;
priv->wrap_mode = PANGO_WRAP_WORD;
priv->ellipsize = PANGO_ELLIPSIZE_NONE;
priv->use_underline = FALSE;
priv->use_markup = FALSE;
priv->justify = FALSE;
for (i = 0; i < N_CACHED_LAYOUTS; i++)
priv->cached_layouts[i].layout = NULL;
Use "" as the default value for the :text property This follows the convention of GtkLabel/GtkEntry in GTK+ and the old ClutterEntry. It makes it easier to use strlen/strcmp etc on the output, since we can assume that it is always a string. This commit also updates the test unit for ClutterText to verify that the clutter_text_get_text() function also returns an empty string when a ClutterText actor has been created.
2008-12-22 13:29:10 +00:00
/* default to "" so that clutter_text_get_text() will
* return a valid string and we can safely call strlen()
* or strcmp() on it
*/
priv->text = g_strdup ("");
Correctly initialize the initial state of ClutterText Some of the values in ClutterText have an initial state that does not match a zero-ed out ClutterTextPrivate structure.
2008-12-11 11:35:52 +00:00
priv->text_color = default_text_color;
priv->cursor_color = default_cursor_color;
[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.
2009-04-06 14:22:31 +00:00
priv->selection_color = default_selection_color;
clutter-text: Add a selected-text-color http://bugzilla.clutter-project.org/show_bug.cgi?id=2595
2011-03-02 17:02:56 +00:00
priv->selected_text_color = default_selected_text_color;
Correctly initialize the initial state of ClutterText Some of the values in ClutterText have an initial state that does not match a zero-ed out ClutterTextPrivate structure.
2008-12-11 11:35:52 +00:00
text: Add :font-description High level toolkits might wish to construct a PangoFontDescription and then set it directly on a ClutterText actor proxy or sub-class. ClutterText should have a :font-description property to set (and get) the PangoFontDescription. http://bugzilla.openedhand.com/show_bug.cgi?id=1960
2010-02-03 14:35:45 +00:00
/* get the default font name from the context; we don't use
* set_font_description() here because we are initializing
* the Text and we don't need notifications and sanity checks
*/
Do not use deprecated API internally
2010-09-10 13:27:37 +00:00
settings = clutter_settings_get_default ();
g_object_get (settings, "font-name", &font_name, NULL);
priv->font_name = font_name; /* font_name is allocated */
Use the default font from the Backend Instead of storing the default font name and size as a pre-processor macro, use the newly added ClutterBackend API to retrieve the current default font from the backend.
2008-12-23 15:05:16 +00:00
priv->font_desc = pango_font_description_from_string (font_name);
text: Update actors using the default font If a ClutterText actor is using the default font from the backend then we should track font name changes and update it accordingly. This only applies to ClutterText actors with the :font-name property unset or explicitly set to NULL.
2010-06-26 14:49:15 +00:00
priv->is_default_font = TRUE;
Correctly initialize the initial state of ClutterText Some of the values in ClutterText have an initial state that does not match a zero-ed out ClutterTextPrivate structure.
2008-12-11 11:35:52 +00:00
Initialize the cursor position By default, the cursor position is initialized to -1, meaning "place the cursor always at the end of the text".
2008-12-11 11:42:33 +00:00
priv->position = -1;
General whitespace fixes in ClutterText Let's keep whitespace fixes to their own commit to avoid polluting git-blame.
2008-12-11 11:48:17 +00:00
priv->selection_bound = -1;
Initialize the cursor position By default, the cursor position is initialized to -1, meaning "place the cursor always at the end of the text".
2008-12-11 11:42:33 +00:00
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
priv->x_pos = -1;
priv->cursor_visible = TRUE;
priv->editable = FALSE;
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
priv->selectable = TRUE;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
[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.
2009-04-06 14:22:31 +00:00
priv->selection_color_set = FALSE;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
priv->cursor_color_set = FALSE;
clutter-text: Add a selected-text-color http://bugzilla.clutter-project.org/show_bug.cgi?id=2595
2011-03-02 17:02:56 +00:00
priv->selected_text_color_set = FALSE;
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
priv->preedit_set = FALSE;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
priv->password_char = 0;
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
General whitespace fixes in ClutterText Let's keep whitespace fixes to their own commit to avoid polluting git-blame.
2008-12-11 11:48:17 +00:00
priv->max_length = 0;
Use units in position_to_coords() We loose precision with a direct conversion for PangoUnits to pixels, so we should do the conversion as needed, inside the callers of clutter_text_position_to_coords().
2008-12-15 18:24:42 +00:00
clutter-text: new clutter_text_get_layout_offsets API This new function can be used to retrieve the coordinates where the ClutterText will draw the PangoLayout representing the text. http://bugzilla.clutter-project.org/show_bug.cgi?id=2553
2011-02-04 11:33:53 +00:00
priv->text_y = 0;
Use units in position_to_coords() We loose precision with a direct conversion for PangoUnits to pixels, so we should do the conversion as needed, inside the callers of clutter_text_position_to_coords().
2008-12-15 18:24:42 +00:00
priv->cursor_size = DEFAULT_CURSOR_SIZE;
text: Zero out the cursor_pos member Do not trust the zero-ing done by GObject on the private data structure, and use memset() instead to zero the ClutterGeometry structure.
2010-01-11 17:08:42 +00:00
memset (&priv->cursor_pos, 0, sizeof (ClutterGeometry));
Listen for the font-changed signal on the backend in ClutterText Whenever a ClutterText is created it now connects to the font-changed signal. When it is emitted the layout cache is dirtied and a relayout is queued. That way changes to the font options or resolution will cause an immediate update to the labels in the scene.
2009-01-27 16:47:20 +00:00
[text] Merge the attributes with markup enabled ClutterText should merge the PangoAttributes set by using clutter_text_set_attributes() with the attributes generated by parsing Pango markup. For this to work we must parse the markup and merge the attributes we get out of pango_parse_markup() with the attributes set by the user. Setting the markup or the attributes on an editable text should not work for the time being.
2009-01-29 13:18:57 +00:00
priv->font_changed_id =
g_signal_connect_swapped (clutter_get_default_backend (),
text: Use the ::settings-changed signal Instead of the ::font-changed one.
2010-06-28 09:43:13 +00:00
"settings-changed",
[text] Merge the attributes with markup enabled ClutterText should merge the PangoAttributes set by using clutter_text_set_attributes() with the attributes generated by parsing Pango markup. For this to work we must parse the markup and merge the attributes we get out of pango_parse_markup() with the attributes set by the user. Setting the markup or the attributes on an editable text should not work for the time being.
2009-01-29 13:18:57 +00:00
G_CALLBACK (clutter_text_font_changed_cb),
self);
text: Dirty layout cache on text direction changes When the text direction changes we should evict the cached layouts to avoid stale entries in case the direction change produces a layout with the same size.
2009-11-10 12:18:32 +00:00
priv->direction_changed_id =
g_signal_connect (self, "notify::text-direction",
G_CALLBACK (clutter_text_direction_changed_cb),
NULL);
[text] Merge the attributes with markup enabled ClutterText should merge the PangoAttributes set by using clutter_text_set_attributes() with the attributes generated by parsing Pango markup. For this to work we must parse the markup and merge the attributes we get out of pango_parse_markup() with the attributes set by the user. Setting the markup or the attributes on an editable text should not work for the time being.
2009-01-29 13:18:57 +00:00
}
[docs] Add more gtk-doc annotations for ClutterText Document the ClutterText constructors and the :editable, :selectable and :activatable properties accessors.
2008-12-16 11:52:57 +00:00
/**
* clutter_text_new:
*
* Creates a new #ClutterText actor. This actor can be used to
* display and edit text.
*
* Return value: the newly created #ClutterText actor
*
* Since: 1.0
*/
Add missing basic constructor ClutterText should have an empty constructor, mostly for bindings to use, that just proxies call to g_object_new() without setting any property.
2008-12-11 11:43:37 +00:00
ClutterActor *
clutter_text_new (void)
{
return g_object_new (CLUTTER_TYPE_TEXT, NULL);
}
[docs] Add more gtk-doc annotations for ClutterText Document the ClutterText constructors and the :editable, :selectable and :activatable properties accessors.
2008-12-16 11:52:57 +00:00
/**
* clutter_text_new_full:
* @font_name: a string with a font description
* @text: the contents of the actor
* @color: the color to be used to render @text
*
* Creates a new #ClutterText actor, using @font_name as the font
* description; @text will be used to set the contents of the actor;
* and @color will be used as the color to render @text.
*
* This function is equivalent to calling clutter_text_new(),
* clutter_text_set_font_name(), clutter_text_set_text() and
* clutter_text_set_color().
*
* Return value: the newly created #ClutterText actor
*
* Since: 1.0
*/
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
ClutterActor *
clutter_text_new_full (const gchar *font_name,
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
const gchar *text,
const ClutterColor *color)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
return g_object_new (CLUTTER_TYPE_TEXT,
"font-name", font_name,
"text", text,
"color", color,
NULL);
}
[docs] Add more gtk-doc annotations for ClutterText Document the ClutterText constructors and the :editable, :selectable and :activatable properties accessors.
2008-12-16 11:52:57 +00:00
/**
* clutter_text_new_with_text:
* @font_name: a string with a font description
* @text: the contents of the actor
*
* Creates a new #ClutterText actor, using @font_name as the font
* description; @text will be used to set the contents of the actor.
*
* This function is equivalent to calling clutter_text_new(),
* clutter_text_set_font_name(), and clutter_text_set_text().
*
* Return value: the newly created #ClutterText actor
*
* Since: 1.0
*/
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
ClutterActor *
clutter_text_new_with_text (const gchar *font_name,
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
const gchar *text)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
return g_object_new (CLUTTER_TYPE_TEXT,
"font-name", font_name,
"text", text,
NULL);
}
[docs] Add more gtk-doc annotations for ClutterText Document the ClutterText constructors and the :editable, :selectable and :activatable properties accessors.
2008-12-16 11:52:57 +00:00
/**
* clutter_text_set_editable:
* @self: a #ClutterText
* @editable: whether the #ClutterText should be editable
*
* Sets whether the #ClutterText actor should be editable.
*
* An editable #ClutterText with key focus set using
* clutter_actor_grab_key_focus() or clutter_stage_take_key_focus()
* will receive key events and will update its contents accordingly.
*
* Since: 1.0
*/
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
void
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
clutter_text_set_editable (ClutterText *self,
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
gboolean editable)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
ClutterTextPrivate *priv;
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
g_return_if_fail (CLUTTER_IS_TEXT (self));
priv = self->priv;
if (priv->editable != editable)
{
priv->editable = editable;
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
clutter_text_queue_redraw (CLUTTER_ACTOR (self));
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_EDITABLE]);
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
}
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
}
[docs] Add more gtk-doc annotations for ClutterText Document the ClutterText constructors and the :editable, :selectable and :activatable properties accessors.
2008-12-16 11:52:57 +00:00
/**
* clutter_text_get_editable:
* @self: a #ClutterText
*
* Retrieves whether a #ClutterText is editable or not.
*
* Return value: %TRUE if the actor is editable
*
* Since: 1.0
*/
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
gboolean
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
clutter_text_get_editable (ClutterText *self)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
g_return_val_if_fail (CLUTTER_IS_TEXT (self), FALSE);
return self->priv->editable;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
}
[docs] Add more gtk-doc annotations for ClutterText Document the ClutterText constructors and the :editable, :selectable and :activatable properties accessors.
2008-12-16 11:52:57 +00:00
/**
* clutter_text_set_selectable:
* @self: a #ClutterText
* @selectable: whether the #ClutterText actor should be selectable
*
* Sets whether a #ClutterText actor should be selectable.
*
* A selectable #ClutterText will allow selecting its contents using
* the pointer or the keyboard.
*
* Since: 1.0
*/
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
void
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
clutter_text_set_selectable (ClutterText *self,
gboolean selectable)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
ClutterTextPrivate *priv;
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
g_return_if_fail (CLUTTER_IS_TEXT (self));
priv = self->priv;
if (priv->selectable != selectable)
{
priv->selectable = selectable;
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
clutter_text_queue_redraw (CLUTTER_ACTOR (self));
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SELECTABLE]);
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
}
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
}
[docs] Add more gtk-doc annotations for ClutterText Document the ClutterText constructors and the :editable, :selectable and :activatable properties accessors.
2008-12-16 11:52:57 +00:00
/**
* clutter_text_get_selectable:
* @self: a #ClutterText
*
* Retrieves whether a #ClutterText is selectable or not.
*
* Return value: %TRUE if the actor is selectable
*
* Since: 1.0
*/
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
gboolean
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
clutter_text_get_selectable (ClutterText *self)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
g_return_val_if_fail (CLUTTER_IS_TEXT (self), TRUE);
return self->priv->selectable;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
}
[docs] Add more gtk-doc annotations for ClutterText Document the ClutterText constructors and the :editable, :selectable and :activatable properties accessors.
2008-12-16 11:52:57 +00:00
/**
* clutter_text_set_activatable:
* @self: a #ClutterText
* @activatable: whether the #ClutterText actor should be activatable
*
* Sets whether a #ClutterText actor should be activatable.
*
* An activatable #ClutterText actor will emit the #ClutterText::activate
* signal whenever the 'Enter' (or 'Return') key is pressed; if it is not
* activatable, a new line will be appended to the current content.
*
* An activatable #ClutterText must also be set as editable using
* clutter_text_set_editable().
*
* Since: 1.0
*/
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
void
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
clutter_text_set_activatable (ClutterText *self,
gboolean activatable)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
ClutterTextPrivate *priv;
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
g_return_if_fail (CLUTTER_IS_TEXT (self));
priv = self->priv;
if (priv->activatable != activatable)
{
priv->activatable = activatable;
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
clutter_text_queue_redraw (CLUTTER_ACTOR (self));
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ACTIVATABLE]);
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
}
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
}
[docs] Add more gtk-doc annotations for ClutterText Document the ClutterText constructors and the :editable, :selectable and :activatable properties accessors.
2008-12-16 11:52:57 +00:00
/**
* clutter_text_get_activatable:
* @self: a #ClutterText
*
* Retrieves whether a #ClutterText is activatable or not.
*
* Return value: %TRUE if the actor is activatable
*
* Since: 1.0
*/
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
gboolean
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
clutter_text_get_activatable (ClutterText *self)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
g_return_val_if_fail (CLUTTER_IS_TEXT (self), TRUE);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
return self->priv->activatable;
}
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Add ClutterText::activate() The clutter_text_activate() function will emit the ::activate signal if the :activatable property is set. This function is useful for subclasses or application code, for example if we are going to use ::captured-event or ::key-press-event signal handlers to intercept the Return key and emit the ::activate signal ourselves.
2008-12-16 12:02:58 +00:00
/**
* clutter_text_activate:
* @self: a #ClutterText
*
* Emits the #ClutterText::activate signal, if @self has been set
* as activatable using clutter_text_set_activatable().
*
* This function can be used to emit the ::activate signal inside
* a #ClutterActor::captured-event or #ClutterActor::key-press-event
* signal handlers before the default signal handler for the
* #ClutterText is invoked.
*
* Return value: %TRUE if the ::activate signal has been emitted,
* and %FALSE otherwise
*
* Since: 1.0
*/
gboolean
clutter_text_activate (ClutterText *self)
{
ClutterTextPrivate *priv;
g_return_val_if_fail (CLUTTER_IS_TEXT (self), FALSE);
priv = self->priv;
if (priv->activatable)
{
g_signal_emit (self, text_signals[ACTIVATE], 0);
return TRUE;
}
return FALSE;
}
[docs] Add more gtk-doc annotations Almost reaching full documentation.
2008-12-16 12:25:15 +00:00
/**
* clutter_text_set_cursor_visible:
* @self: a #ClutterText
* @cursor_visible: whether the cursor should be visible
*
* Sets whether the cursor of a #ClutterText actor should be
* visible or not.
*
* The color of the cursor will be the same as the text color
* unless clutter_text_set_cursor_color() has been called.
*
* The size of the cursor can be set using clutter_text_set_cursor_size().
*
* The position of the cursor can be changed programmatically using
* clutter_text_set_cursor_position().
*
* Since: 1.0
*/
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
void
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
clutter_text_set_cursor_visible (ClutterText *self,
gboolean cursor_visible)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
ClutterTextPrivate *priv;
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
g_return_if_fail (CLUTTER_IS_TEXT (self));
priv = self->priv;
if (priv->cursor_visible != cursor_visible)
{
priv->cursor_visible = cursor_visible;
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
clutter_text_queue_redraw (CLUTTER_ACTOR (self));
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CURSOR_VISIBLE]);
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
}
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
}
[docs] Add more gtk-doc annotations Almost reaching full documentation.
2008-12-16 12:25:15 +00:00
/**
* clutter_text_get_cursor_visible:
* @self: a #ClutterText
*
* Retrieves whether the cursor of a #ClutterText actor is visible.
*
* Return value: %TRUE if the cursor is visible
*
* Since: 1.0
*/
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
gboolean
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
clutter_text_get_cursor_visible (ClutterText *self)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
g_return_val_if_fail (CLUTTER_IS_TEXT (self), TRUE);
return self->priv->cursor_visible;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
}
[docs] Add more gtk-doc annotations Almost reaching full documentation.
2008-12-16 12:25:15 +00:00
/**
* clutter_text_set_cursor_color:
* @self: a #ClutterText
* @color: the color of the cursor, or %NULL to unset it
*
* Sets the color of the cursor of a #ClutterText actor.
*
* If @color is %NULL, the cursor color will be the same as the
* text color.
*
* Since: 1.0
*/
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
void
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
clutter_text_set_cursor_color (ClutterText *self,
const ClutterColor *color)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
ClutterTextPrivate *priv;
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
g_return_if_fail (CLUTTER_IS_TEXT (self));
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
priv = self->priv;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
if (color)
{
priv->cursor_color = *color;
priv->cursor_color_set = TRUE;
}
else
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
priv->cursor_color_set = FALSE;
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
clutter_text_queue_redraw (CLUTTER_ACTOR (self));
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CURSOR_COLOR]);
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CURSOR_COLOR_SET]);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
}
[docs] Add more gtk-doc annotations Almost reaching full documentation.
2008-12-16 12:25:15 +00:00
/**
* clutter_text_get_cursor_color:
* @self: a #ClutterText
* @color: return location for a #ClutterColor
*
* Retrieves the color of the cursor of a #ClutterText actor.
*
* Since: 1.0
*/
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
void
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
clutter_text_get_cursor_color (ClutterText *self,
ClutterColor *color)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
ClutterTextPrivate *priv;
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
g_return_if_fail (CLUTTER_IS_TEXT (self));
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
g_return_if_fail (color != NULL);
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
priv = self->priv;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
*color = priv->cursor_color;
}
Add ClutterText::set_selection() The clutter_text_set_selection() function is a convenience method for setting the cursor position and the selection boundary to a given position in a single call, with sanity checks for the positions.
2008-12-16 12:41:20 +00:00
/**
* clutter_text_set_selection:
* @self: a #ClutterText
* @start_pos: start of the selection, in characters
* @end_pos: end of the selection, in characters
*
* Selects the region of text between @start_pos and @end_pos.
*
* This function changes the position of the cursor to match
* @start_pos and the selection bound to match @end_pos.
*
* Since: 1.0
*/
void
clutter_text_set_selection (ClutterText *self,
gssize start_pos,
gssize end_pos)
{
ClutterTextPrivate *priv;
g_return_if_fail (CLUTTER_IS_TEXT (self));
priv = self->priv;
if (end_pos < 0)
end_pos = priv->n_chars;
start_pos = MIN (priv->n_chars, start_pos);
end_pos = MIN (priv->n_chars, end_pos);
Fix problems with "position" and "selection-bound" change notification Added a "selection-bound" notify on clutter_text_clear_selection as it changes the value. Added utility function clutter_text_set_positions, in order to change both cursor position and selection bound inside a g_object_[freeze/thaw]_notify block Added g_object_[freeze/thaw]_notify in other functions that changes both cursor position and selection bound Solves http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-01-25 15:13:58 +00:00
clutter_text_set_positions (self, start_pos, end_pos);
Add ClutterText::set_selection() The clutter_text_set_selection() function is a convenience method for setting the cursor position and the selection boundary to a given position in a single call, with sanity checks for the positions.
2008-12-16 12:41:20 +00:00
}
Fix ClutterText::get_selection() The clutter_text_get_selection() function was not checking the passed argument, and was still accessing the contents of the Text actor using clutter_text_get_text(). This commit also adds the last few gtk-doc annotations missing from ClutterText.
2008-12-16 12:25:45 +00:00
/**
* clutter_text_get_selection:
* @self: a #ClutterText
*
* Retrieves the currently selected text.
*
* Return value: a newly allocated string containing the currently
* selected text, or %NULL. Use g_free() to free the returned
* string.
*
* Since: 1.0
*/
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
gchar *
Fix ClutterText::get_selection() The clutter_text_get_selection() function was not checking the passed argument, and was still accessing the contents of the Text actor using clutter_text_get_text(). This commit also adds the last few gtk-doc annotations missing from ClutterText.
2008-12-16 12:25:45 +00:00
clutter_text_get_selection (ClutterText *self)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
ClutterTextPrivate *priv;
Fix ClutterText::get_selection() The clutter_text_get_selection() function was not checking the passed argument, and was still accessing the contents of the Text actor using clutter_text_get_text(). This commit also adds the last few gtk-doc annotations missing from ClutterText.
2008-12-16 12:25:45 +00:00
gchar *str;
gint len;
gint start_index, end_index;
gint start_offset, end_offset;
g_return_val_if_fail (CLUTTER_IS_TEXT (self), NULL);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Fix ClutterText::get_selection() The clutter_text_get_selection() function was not checking the passed argument, and was still accessing the contents of the Text actor using clutter_text_get_text(). This commit also adds the last few gtk-doc annotations missing from ClutterText.
2008-12-16 12:25:45 +00:00
priv = self->priv;
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
start_index = priv->position;
end_index = priv->selection_bound;
if (end_index == start_index)
return g_strdup ("");
Fix line start and line end key binding behaviour Another fix for the key navigation behaviour around the zeroeth glyph in the layout. This commit adds a fast path for for the zero index when the cursor position is set as zero, in case we are using the line-start or line-end key bindings, similarly to what we did in commit be64cbcdc22952ce2fa9f902e153e3bd9f4a08c9 for the move-up and move-down bindings.
2008-12-16 10:15:57 +00:00
[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.
2009-05-13 11:11:54 +00:00
if ((end_index != -1 && end_index < start_index) ||
start_index == -1)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
gint temp = start_index;
start_index = end_index;
end_index = temp;
}
Fix ClutterText::get_selection() The clutter_text_get_selection() function was not checking the passed argument, and was still accessing the contents of the Text actor using clutter_text_get_text(). This commit also adds the last few gtk-doc annotations missing from ClutterText.
2008-12-16 12:25:45 +00:00
start_offset = offset_to_bytes (priv->text, start_index);
end_offset = offset_to_bytes (priv->text, end_index);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
len = end_offset - start_offset;
str = g_malloc (len + 1);
Fix ClutterText::get_selection() The clutter_text_get_selection() function was not checking the passed argument, and was still accessing the contents of the Text actor using clutter_text_get_text(). This commit also adds the last few gtk-doc annotations missing from ClutterText.
2008-12-16 12:25:45 +00:00
g_utf8_strncpy (str, priv->text + start_offset, end_index - start_index);
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
return str;
}
Fix ClutterText::get_selection() The clutter_text_get_selection() function was not checking the passed argument, and was still accessing the contents of the Text actor using clutter_text_get_text(). This commit also adds the last few gtk-doc annotations missing from ClutterText.
2008-12-16 12:25:45 +00:00
/**
* clutter_text_set_selection_bound:
* @self: a #ClutterText
* @selection_bound: the position of the end of the selection, in characters
*
* Sets the other end of the selection, starting from the current
* cursor position.
*
* If @selection_bound is -1, the selection unset.
*
* Since: 1.0
*/
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
void
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
clutter_text_set_selection_bound (ClutterText *self,
gint selection_bound)
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
{
ClutterTextPrivate *priv;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
g_return_if_fail (CLUTTER_IS_TEXT (self));
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
priv = self->priv;
if (priv->selection_bound != selection_bound)
{
[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.
2009-03-30 06:54:42 +00:00
gint len = priv->n_chars;
if (selection_bound < 0 || selection_bound >= len)
priv->selection_bound = -1;
else
priv->selection_bound = selection_bound;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
clutter_text_queue_redraw (CLUTTER_ACTOR (self));
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SELECTION_BOUND]);
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
}
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
}
Fix ClutterText::get_selection() The clutter_text_get_selection() function was not checking the passed argument, and was still accessing the contents of the Text actor using clutter_text_get_text(). This commit also adds the last few gtk-doc annotations missing from ClutterText.
2008-12-16 12:25:45 +00:00
/**
* clutter_text_get_selection_bound:
* @self: a #ClutterText
*
* Retrieves the other end of the selection of a #ClutterText actor,
* in characters from the current cursor position.
*
* Return value: the position of the other end of the selection
*
* Since: 1.0
*/
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
gint
clutter_text_get_selection_bound (ClutterText *self)
{
g_return_val_if_fail (CLUTTER_IS_TEXT (self), -1);
return self->priv->selection_bound;
}
Initial import of the Text actor from Tidy The TidyText actor is meant as a replacement for both ClutterLabel and ClutterText. Any text-displaying and editing actor should derive from ClutterText and implement the various visual cues to differentiate the editable from the non-editable state. Those visual cues usually belong to a high-level toolkit, especially if themeing is involved.
2008-12-11 11:12:48 +00:00
[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.
2009-04-06 14:22:31 +00:00
/**
* clutter_text_set_selection_color:
* @self: a #ClutterText
* @color: the color of the selection, or %NULL to unset it
*
* Sets the color of the selection of a #ClutterText actor.
*
* If @color is %NULL, the selection color will be the same as the
* cursor color, or if no cursor color is set either then it will be
* the same as the text color.
*
* Since: 1.0
*/
void
clutter_text_set_selection_color (ClutterText *self,
const ClutterColor *color)
{
ClutterTextPrivate *priv;
g_return_if_fail (CLUTTER_IS_TEXT (self));
priv = self->priv;
if (color)
{
priv->selection_color = *color;
priv->selection_color_set = TRUE;
}
else
priv->selection_color_set = FALSE;
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
clutter_text_queue_redraw (CLUTTER_ACTOR (self));
[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.
2009-04-06 14:22:31 +00:00
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SELECTION_COLOR]);
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SELECTION_COLOR_SET]);
[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.
2009-04-06 14:22:31 +00:00
}
/**
* clutter_text_get_selection_color:
* @self: a #ClutterText
annotations: Use caller-allocates for color getters This should avoid a separate initialization of a ClutterColor in language bindings.
2011-02-14 18:36:51 +00:00
* @color: (out caller-allocates): return location for a #ClutterColor
[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.
2009-04-06 14:22:31 +00:00
*
* Retrieves the color of the selection of a #ClutterText actor.
*
* Since: 1.0
*/
void
clutter_text_get_selection_color (ClutterText *self,
ClutterColor *color)
{
ClutterTextPrivate *priv;
g_return_if_fail (CLUTTER_IS_TEXT (self));
g_return_if_fail (color != NULL);
priv = self->priv;
*color = priv->selection_color;
}
clutter-text: Add a selected-text-color http://bugzilla.clutter-project.org/show_bug.cgi?id=2595
2011-03-02 17:02:56 +00:00
/**
* clutter_text_set_selected_text_color:
* @self: a #ClutterText
* @color: the selected text color, or %NULL to unset it
*
* Sets the selected text color of a #ClutterText actor.
*
* If @color is %NULL, the selected text color will be the same as the
* selection color, which then falls back to cursor, and then text color.
*
* Since: 1.8
*/
void
clutter_text_set_selected_text_color (ClutterText *self,
const ClutterColor *color)
{
ClutterTextPrivate *priv;
g_return_if_fail (CLUTTER_IS_TEXT (self));
priv = self->priv;
if (color)
{
priv->selected_text_color = *color;
priv->selected_text_color_set = TRUE;
}
else
priv->selected_text_color_set = FALSE;
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
clutter_text_queue_redraw (CLUTTER_ACTOR (self));
clutter-text: Add a selected-text-color http://bugzilla.clutter-project.org/show_bug.cgi?id=2595
2011-03-02 17:02:56 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SELECTED_TEXT_COLOR]);
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SELECTED_TEXT_COLOR_SET]);
}
/**
* clutter_text_get_selected_text_color:
* @self: a #ClutterText
* @color: (out caller-allocates): return location for a #ClutterColor
*
* Retrieves the color of selected text of a #ClutterText actor.
*
* Since: 1.8
*/
void
clutter_text_get_selected_text_color (ClutterText *self,
ClutterColor *color)
{
ClutterTextPrivate *priv;
g_return_if_fail (CLUTTER_IS_TEXT (self));
g_return_if_fail (color != NULL);
priv = self->priv;
*color = priv->selected_text_color;
}
text: Add :font-description High level toolkits might wish to construct a PangoFontDescription and then set it directly on a ClutterText actor proxy or sub-class. ClutterText should have a :font-description property to set (and get) the PangoFontDescription. http://bugzilla.openedhand.com/show_bug.cgi?id=1960
2010-02-03 14:35:45 +00:00
/**
* clutter_text_set_font_description:
* @self: a #ClutterText
* @font_desc: a #PangoFontDescription
*
* Sets @font_desc as the font description for a #ClutterText
*
* The #PangoFontDescription is copied by the #ClutterText actor
* so you can safely call pango_font_description_free() on it after
* calling this function.
*
* Since: 1.2
*/
void
clutter_text_set_font_description (ClutterText *self,
PangoFontDescription *font_desc)
{
PangoFontDescription *copy;
g_return_if_fail (CLUTTER_IS_TEXT (self));
copy = pango_font_description_copy (font_desc);
clutter_text_set_font_description_internal (self, copy);
}
/**
* clutter_text_get_font_description:
* @self: a #ClutterText
*
* Retrieves the #PangoFontDescription used by @self
*
* Return value: a #PangoFontDescription. The returned value is owned
* by the #ClutterText actor and it should not be modified or freed
*
* Since: 1.2
*/
PangoFontDescription *
clutter_text_get_font_description (ClutterText *self)
{
g_return_val_if_fail (CLUTTER_IS_TEXT (self), NULL);
return self->priv->font_desc;
}
Add documentation annotations ClutterText is heavily under-documented. This commit ports most of the API documentation from ClutterLabel and ClutterEntry to ClutterText.
2008-12-11 12:17:11 +00:00
/**
* clutter_text_get_font_name:
* @self: a #ClutterText
*
* Retrieves the font name as set by clutter_text_set_font_name().
*
* Return value: a string containing the font name. The returned
* string is owned by the #ClutterText actor and should not be
* modified or freed
*
* Since: 1.0
*/
Eliminate G_CONST_RETURN The G_CONST_RETURN define in GLib is, and has always been, a bit fuzzy. We always used it to conform to the platform, at least for public-facing API. At first I assumed it has something to do with brain-damaged compilers or with weird platforms where const was not really supported; sadly, it's something much, much worse: it's a define that can be toggled at compile-time to remove const from the signature of public API. This is a truly terrifying feature that I assume was added in the past century, and whose inception clearly had something to do with massive doses of absynthe and opium — because any other explanation would make the existence of such a feature even worse than assuming drugs had anything to do with it. Anyway, and pleasing the gods, this dubious feature is being removed/deprecated in GLib; see bug: https://bugzilla.gnome.org/show_bug.cgi?id=644611 Before deprecation, though, we should just remove its usage from the whole API. We should especially remove its usage from Cally's internals, since there it never made sense in the first place.
2011-06-07 14:49:20 +00:00
const gchar *
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
clutter_text_get_font_name (ClutterText *text)
{
g_return_val_if_fail (CLUTTER_IS_TEXT (text), NULL);
return text->priv->font_name;
}
Add documentation annotations ClutterText is heavily under-documented. This commit ports most of the API documentation from ClutterLabel and ClutterEntry to ClutterText.
2008-12-11 12:17:11 +00:00
/**
* clutter_text_set_font_name:
* @self: a #ClutterText
text: Document and annotate :font-name for NULL values Update the documentation of :font-name, to make it clear that by setting it to NULL the Text actor will use the default font. Also, set the annotation for the @font_name argument of the setter to be allow-none, and allow passing NULL through bindings.
2010-06-26 22:05:36 +00:00
* @font_name: (allow-none): a font name, or %NULL to set the default font name
Add documentation annotations ClutterText is heavily under-documented. This commit ports most of the API documentation from ClutterLabel and ClutterEntry to ClutterText.
2008-12-11 12:17:11 +00:00
*
* Sets the font used by a #ClutterText. The @font_name string
Use the default font from the Backend Instead of storing the default font name and size as a pre-processor macro, use the newly added ClutterBackend API to retrieve the current default font from the backend.
2008-12-23 15:05:16 +00:00
* must either be %NULL, which means that the font name from the
* default #ClutterBackend will be used; or be something that can
* be parsed by the pango_font_description_from_string() function,
* like:
Add documentation annotations ClutterText is heavily under-documented. This commit ports most of the API documentation from ClutterLabel and ClutterEntry to ClutterText.
2008-12-11 12:17:11 +00:00
*
* |[
* clutter_text_set_font_name (text, "Sans 10pt");
* clutter_text_set_font_name (text, "Serif 16px");
* clutter_text_set_font_name (text, "Helvetica 10");
* ]|
*
* Since: 1.0
*/
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
void
Coding style consistency Channel mitch's spirit. This is also how I get to have the highest commit count on Clutter's repository.
2008-12-11 11:54:32 +00:00
clutter_text_set_font_name (ClutterText *self,
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
const gchar *font_name)
{
ClutterTextPrivate *priv;
PangoFontDescription *desc;
text: Update actors using the default font If a ClutterText actor is using the default font from the backend then we should track font name changes and update it accordingly. This only applies to ClutterText actors with the :font-name property unset or explicitly set to NULL.
2010-06-26 14:49:15 +00:00
gboolean is_default_font;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
Coding style consistency Channel mitch's spirit. This is also how I get to have the highest commit count on Clutter's repository.
2008-12-11 11:54:32 +00:00
g_return_if_fail (CLUTTER_IS_TEXT (self));
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
Use the default font from the Backend Instead of storing the default font name and size as a pre-processor macro, use the newly added ClutterBackend API to retrieve the current default font from the backend.
2008-12-23 15:05:16 +00:00
/* get the default font name from the backend */
text: Do not segfault with NULL :font-name Make sure that we have a fall back in place for the default font name string, and use g_strcmp0 to protect ourselves from NULL strings. http://bugzilla.clutter-project.org/show_bug.cgi?id=2417
2010-11-14 15:23:36 +00:00
if (font_name == NULL || font_name[0] == '\0')
text: Update actors using the default font If a ClutterText actor is using the default font from the backend then we should track font name changes and update it accordingly. This only applies to ClutterText actors with the :font-name property unset or explicitly set to NULL.
2010-06-26 14:49:15 +00:00
{
Do not use deprecated API internally
2010-09-10 13:27:37 +00:00
ClutterSettings *settings = clutter_settings_get_default ();
gchar *default_font_name = NULL;
text: Do not segfault with NULL :font-name Make sure that we have a fall back in place for the default font name string, and use g_strcmp0 to protect ourselves from NULL strings. http://bugzilla.clutter-project.org/show_bug.cgi?id=2417
2010-11-14 15:23:36 +00:00
g_object_get (settings, "font-name", &default_font_name, NULL);
if (default_font_name != NULL)
font_name = default_font_name;
else
{
/* last fallback */
default_font_name = g_strdup ("Sans 12");
}
text: Update actors using the default font If a ClutterText actor is using the default font from the backend then we should track font name changes and update it accordingly. This only applies to ClutterText actors with the :font-name property unset or explicitly set to NULL.
2010-06-26 14:49:15 +00:00
is_default_font = TRUE;
}
else
is_default_font = FALSE;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
Coding style consistency Channel mitch's spirit. This is also how I get to have the highest commit count on Clutter's repository.
2008-12-11 11:54:32 +00:00
priv = self->priv;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
text: Do not segfault with NULL :font-name Make sure that we have a fall back in place for the default font name string, and use g_strcmp0 to protect ourselves from NULL strings. http://bugzilla.clutter-project.org/show_bug.cgi?id=2417
2010-11-14 15:23:36 +00:00
if (g_strcmp0 (priv->font_name, font_name) == 0)
Do not use deprecated API internally
2010-09-10 13:27:37 +00:00
goto out;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
desc = pango_font_description_from_string (font_name);
if (!desc)
{
g_warning ("Attempting to create a PangoFontDescription for "
Remove usage of the grave accent as quotation mark See: http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html This should make Thomas happy.
2009-03-17 14:12:01 +00:00
"font name '%s', but failed.",
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
font_name);
Do not use deprecated API internally
2010-09-10 13:27:37 +00:00
goto out;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
}
text: Add :font-description High level toolkits might wish to construct a PangoFontDescription and then set it directly on a ClutterText actor proxy or sub-class. ClutterText should have a :font-description property to set (and get) the PangoFontDescription. http://bugzilla.openedhand.com/show_bug.cgi?id=1960
2010-02-03 14:35:45 +00:00
/* this will set the font_name field as well */
clutter_text_set_font_description_internal (self, desc);
text: Update actors using the default font If a ClutterText actor is using the default font from the backend then we should track font name changes and update it accordingly. This only applies to ClutterText actors with the :font-name property unset or explicitly set to NULL.
2010-06-26 14:49:15 +00:00
priv->is_default_font = is_default_font;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_FONT_NAME]);
Do not use deprecated API internally
2010-09-10 13:27:37 +00:00
out:
if (is_default_font)
g_free ((gchar *) font_name);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
}
Add documentation annotations ClutterText is heavily under-documented. This commit ports most of the API documentation from ClutterLabel and ClutterEntry to ClutterText.
2008-12-11 12:17:11 +00:00
/**
* clutter_text_get_text:
* @self: a #ClutterText
*
* Retrieves a pointer to the current contents of a #ClutterText
* actor.
*
* If you need a copy of the contents for manipulating, either
* use g_strdup() on the returned string, or use:
*
* |[
* copy = clutter_text_get_chars (text, 0, -1);
* ]|
*
* Which will return a newly allocated string.
*
* Return value: the contents of the actor. The returned string
* is owned by the #ClutterText actor and should never be
* modified or freed
*
* Since: 1.0
*/
Eliminate G_CONST_RETURN The G_CONST_RETURN define in GLib is, and has always been, a bit fuzzy. We always used it to conform to the platform, at least for public-facing API. At first I assumed it has something to do with brain-damaged compilers or with weird platforms where const was not really supported; sadly, it's something much, much worse: it's a define that can be toggled at compile-time to remove const from the signature of public API. This is a truly terrifying feature that I assume was added in the past century, and whose inception clearly had something to do with massive doses of absynthe and opium — because any other explanation would make the existence of such a feature even worse than assuming drugs had anything to do with it. Anyway, and pleasing the gods, this dubious feature is being removed/deprecated in GLib; see bug: https://bugzilla.gnome.org/show_bug.cgi?id=644611 Before deprecation, though, we should just remove its usage from the whole API. We should especially remove its usage from Cally's internals, since there it never made sense in the first place.
2011-06-07 14:49:20 +00:00
const gchar *
Coding style consistency Channel mitch's spirit. This is also how I get to have the highest commit count on Clutter's repository.
2008-12-11 11:54:32 +00:00
clutter_text_get_text (ClutterText *self)
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
{
Coding style consistency Channel mitch's spirit. This is also how I get to have the highest commit count on Clutter's repository.
2008-12-11 11:54:32 +00:00
g_return_val_if_fail (CLUTTER_IS_TEXT (self), NULL);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
Coding style consistency Channel mitch's spirit. This is also how I get to have the highest commit count on Clutter's repository.
2008-12-11 11:54:32 +00:00
return self->priv->text;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
}
[text] Merge the attributes with markup enabled ClutterText should merge the PangoAttributes set by using clutter_text_set_attributes() with the attributes generated by parsing Pango markup. For this to work we must parse the markup and merge the attributes we get out of pango_parse_markup() with the attributes set by the user. Setting the markup or the attributes on an editable text should not work for the time being.
2009-01-29 13:18:57 +00:00
static inline void
clutter_text_set_use_markup_internal (ClutterText *self,
gboolean use_markup)
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
{
[text] Merge the attributes with markup enabled ClutterText should merge the PangoAttributes set by using clutter_text_set_attributes() with the attributes generated by parsing Pango markup. For this to work we must parse the markup and merge the attributes we get out of pango_parse_markup() with the attributes set by the user. Setting the markup or the attributes on an editable text should not work for the time being.
2009-01-29 13:18:57 +00:00
ClutterTextPrivate *priv = self->priv;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
[text] Merge the attributes with markup enabled ClutterText should merge the PangoAttributes set by using clutter_text_set_attributes() with the attributes generated by parsing Pango markup. For this to work we must parse the markup and merge the attributes we get out of pango_parse_markup() with the attributes set by the user. Setting the markup or the attributes on an editable text should not work for the time being.
2009-01-29 13:18:57 +00:00
if (priv->use_markup != use_markup)
{
priv->use_markup = use_markup;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
text: Do not set the markup unconditionally When setting :use-markup we always pass the contents of the Text actor to clutter_text_set_markup_internal(); if string contains any markup, this ends up being parsed and used - even when :use-markup is set to FALSE. http://bugzilla.clutter-project.org/show_bug.cgi?id=2239
2010-08-06 16:04:37 +00:00
/* reset the attributes lists so that they can be
* re-generated
*/
if (priv->effective_attrs != NULL)
{
pango_attr_list_unref (priv->effective_attrs);
priv->effective_attrs = NULL;
}
if (priv->markup_attrs)
{
pango_attr_list_unref (priv->markup_attrs);
priv->markup_attrs = NULL;
}
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_USE_MARKUP]);
[text] Merge the attributes with markup enabled ClutterText should merge the PangoAttributes set by using clutter_text_set_attributes() with the attributes generated by parsing Pango markup. For this to work we must parse the markup and merge the attributes we get out of pango_parse_markup() with the attributes set by the user. Setting the markup or the attributes on an editable text should not work for the time being.
2009-01-29 13:18:57 +00:00
}
}
/**
* clutter_text_set_text:
* @self: a #ClutterText
[text] Avoid a Pango warning with empty markup When the markup string is empty Pango complains about invalid characters.
2009-04-02 09:28:37 +00:00
* @text: the text to set. Passing %NULL is the same as passing "" (the
* empty string)
[text] Merge the attributes with markup enabled ClutterText should merge the PangoAttributes set by using clutter_text_set_attributes() with the attributes generated by parsing Pango markup. For this to work we must parse the markup and merge the attributes we get out of pango_parse_markup() with the attributes set by the user. Setting the markup or the attributes on an editable text should not work for the time being.
2009-01-29 13:18:57 +00:00
*
Allow NULL for clutter_text_set_text() As a convenience, if NULL is passed for the text argument of clutter_text_set_text() (and for consistency, clutter_text_set_markup()), treat that the same as "".
2009-02-27 16:56:39 +00:00
* Sets the contents of a #ClutterText actor.
[text] Merge the attributes with markup enabled ClutterText should merge the PangoAttributes set by using clutter_text_set_attributes() with the attributes generated by parsing Pango markup. For this to work we must parse the markup and merge the attributes we get out of pango_parse_markup() with the attributes set by the user. Setting the markup or the attributes on an editable text should not work for the time being.
2009-01-29 13:18:57 +00:00
*
text: Make the :text property not set the :use-markup one Currently, setting the :text property has the side-effect of setting the :use-markup property to FALSE. This prevents constructing a Text actor, or setting its properties, like: g_object_set (text, "use-markup", TRUE, "text", some_string, NULL); as the ordering becomes important. Unfortunately, the ordering of the properties cannot be enforced with ClutterScript or with language bindings. The documentation of the clutter_text_set_text() method should be expanded to properly specify that the set_text() method will change the :use-markup property to FALSE as a side effect.
2009-10-07 20:44:17 +00:00
* If the #ClutterText:use-markup property was set to %TRUE it
* will be reset to %FALSE as a side effect. If you want to
* maintain the #ClutterText:use-markup you should use the
* clutter_text_set_markup() function instead
*
[text] Merge the attributes with markup enabled ClutterText should merge the PangoAttributes set by using clutter_text_set_attributes() with the attributes generated by parsing Pango markup. For this to work we must parse the markup and merge the attributes we get out of pango_parse_markup() with the attributes set by the user. Setting the markup or the attributes on an editable text should not work for the time being.
2009-01-29 13:18:57 +00:00
* Since: 1.0
*/
void
clutter_text_set_text (ClutterText *self,
const gchar *text)
{
g_return_if_fail (CLUTTER_IS_TEXT (self));
Added ClutterText::insert-text and ClutterText::delete-text signals * clutter/clutter-marshal.list: added new marshaller * clutter/clutter-text.c (clutter_text_class_init): added insert-text and delete-text signals (clutter_text_insert_unichar): emits insert-text signal (clutter_text_insert_text): emits insert-text signal (clutter_text_delete_text): emits delete-text signal (clutter_text_delete_chars): emits delete-text signal (clutter_text_set_markup_internal): emits delete-text and insert-text signals (clutter_text_set_text): emits delete-text and insert-text signals http://bugzilla.openedhand.com/show_bug.cgi?id=1894
2009-11-20 14:17:41 +00:00
g_signal_emit (self, text_signals[DELETE_TEXT], 0, 0, -1);
if (text)
{
gint tmp_pos = 0;
g_signal_emit (self, text_signals[INSERT_TEXT], 0, text,
strlen (text), &tmp_pos);
}
[text] Merge the attributes with markup enabled ClutterText should merge the PangoAttributes set by using clutter_text_set_attributes() with the attributes generated by parsing Pango markup. For this to work we must parse the markup and merge the attributes we get out of pango_parse_markup() with the attributes set by the user. Setting the markup or the attributes on an editable text should not work for the time being.
2009-01-29 13:18:57 +00:00
clutter_text_set_use_markup_internal (self, FALSE);
Allow NULL for clutter_text_set_text() As a convenience, if NULL is passed for the text argument of clutter_text_set_text() (and for consistency, clutter_text_set_markup()), treat that the same as "".
2009-02-27 16:56:39 +00:00
clutter_text_set_text_internal (self, text ? text : "");
[text] Merge the attributes with markup enabled ClutterText should merge the PangoAttributes set by using clutter_text_set_attributes() with the attributes generated by parsing Pango markup. For this to work we must parse the markup and merge the attributes we get out of pango_parse_markup() with the attributes set by the user. Setting the markup or the attributes on an editable text should not work for the time being.
2009-01-29 13:18:57 +00:00
}
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
[text] Merge the attributes with markup enabled ClutterText should merge the PangoAttributes set by using clutter_text_set_attributes() with the attributes generated by parsing Pango markup. For this to work we must parse the markup and merge the attributes we get out of pango_parse_markup() with the attributes set by the user. Setting the markup or the attributes on an editable text should not work for the time being.
2009-01-29 13:18:57 +00:00
/**
* clutter_text_set_markup:
* @self: a #ClutterText
[text] Avoid a Pango warning with empty markup When the markup string is empty Pango complains about invalid characters.
2009-04-02 09:28:37 +00:00
* @markup: a string containing Pango markup. Passing %NULL is the same
* as passing "" (the empty string)
[text] Merge the attributes with markup enabled ClutterText should merge the PangoAttributes set by using clutter_text_set_attributes() with the attributes generated by parsing Pango markup. For this to work we must parse the markup and merge the attributes we get out of pango_parse_markup() with the attributes set by the user. Setting the markup or the attributes on an editable text should not work for the time being.
2009-01-29 13:18:57 +00:00
*
* Sets @markup as the contents of a #ClutterText.
*
* This is a convenience function for setting a string containing
* Pango markup, and it is logically equivalent to:
*
* |[
* clutter_text_set_text (CLUTTER_TEXT (actor), markup);
text: Make the :text property not set the :use-markup one Currently, setting the :text property has the side-effect of setting the :use-markup property to FALSE. This prevents constructing a Text actor, or setting its properties, like: g_object_set (text, "use-markup", TRUE, "text", some_string, NULL); as the ordering becomes important. Unfortunately, the ordering of the properties cannot be enforced with ClutterScript or with language bindings. The documentation of the clutter_text_set_text() method should be expanded to properly specify that the set_text() method will change the :use-markup property to FALSE as a side effect.
2009-10-07 20:44:17 +00:00
* clutter_text_set_use_markup (CLUTTER_TEXT (actor), TRUE);
[text] Merge the attributes with markup enabled ClutterText should merge the PangoAttributes set by using clutter_text_set_attributes() with the attributes generated by parsing Pango markup. For this to work we must parse the markup and merge the attributes we get out of pango_parse_markup() with the attributes set by the user. Setting the markup or the attributes on an editable text should not work for the time being.
2009-01-29 13:18:57 +00:00
* ]|
*
* Since: 1.0
*/
void
clutter_text_set_markup (ClutterText *self,
const gchar *markup)
{
g_return_if_fail (CLUTTER_IS_TEXT (self));
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
[text] Merge the attributes with markup enabled ClutterText should merge the PangoAttributes set by using clutter_text_set_attributes() with the attributes generated by parsing Pango markup. For this to work we must parse the markup and merge the attributes we get out of pango_parse_markup() with the attributes set by the user. Setting the markup or the attributes on an editable text should not work for the time being.
2009-01-29 13:18:57 +00:00
clutter_text_set_use_markup_internal (self, TRUE);
[text] Avoid a Pango warning with empty markup When the markup string is empty Pango complains about invalid characters.
2009-04-02 09:28:37 +00:00
if (markup != NULL && *markup != '\0')
clutter_text_set_markup_internal (self, markup);
else
clutter_text_set_text_internal (self, "");
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
}
Add documentation annotations ClutterText is heavily under-documented. This commit ports most of the API documentation from ClutterLabel and ClutterEntry to ClutterText.
2008-12-11 12:17:11 +00:00
/**
* clutter_text_get_layout:
* @self: a #ClutterText
*
* Retrieves the current #PangoLayout used by a #ClutterText actor.
*
Add gobject-introspection annotations Add annotations such as (transfer-none) (out) (element-type ClutterActor), and so forth to the doc comments as appropriate. The annotations added here are a combination of the annotations previously in gir-repository for Clutter and annotations found in a review of all return values with that were being parsed with a transfer of "full". http://bugzilla.openedhand.com/show_bug.cgi?id=1452 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-02-17 00:25:20 +00:00
* Return value: (transfer none): a #PangoLayout. The returned object is owned by
Add documentation annotations ClutterText is heavily under-documented. This commit ports most of the API documentation from ClutterLabel and ClutterEntry to ClutterText.
2008-12-11 12:17:11 +00:00
* the #ClutterText actor and should not be modified or freed
*
* Since: 1.0
*/
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
PangoLayout *
Coding style consistency Channel mitch's spirit. This is also how I get to have the highest commit count on Clutter's repository.
2008-12-11 11:54:32 +00:00
clutter_text_get_layout (ClutterText *self)
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
{
Remove Units from the public API With the recent change to internal floating point values, ClutterUnit has become a redundant type, defined to be a float. All integer entry points are being internally converted to floating point values to be passed to the GL pipeline with the least amount of conversion. ClutterUnit is thus exposed as just a "pixel with fractionary bits", and not -- as users might think -- as generic, resolution and device independent units. not that it was the case, but a definitive amount of people was convinced it did provide this "feature", and was flummoxed about the mere existence of this type. So, having ClutterUnit exposed in the public API doubles the entry points and has the following disadvantages: - we have to maintain twice the amount of entry points in ClutterActor - we still do an integer-to-float implicit conversion - we introduce a weird impedance between pixels and "pixels with fractionary bits" - language bindings will have to choose what to bind, and resort to manually overriding the API + *except* for language bindings based on GObject-Introspection, as they cannot do manual overrides, thus will replicate the entire set of entry points For these reason, we should coalesces every Actor entry point for pixels and for ClutterUnit into a single entry point taking a float, like: void clutter_actor_set_x (ClutterActor *self, gfloat x); void clutter_actor_get_size (ClutterActor *self, gfloat *width, gfloat *height); gfloat clutter_actor_get_height (ClutterActor *self); etc. The issues I have identified are: - we'll have a two cases of compiler warnings: - printf() format of the return values from %d to %f - clutter_actor_get_size() taking floats instead of unsigned ints - we'll have a problem with varargs when passing an integer instead of a floating point value, except on 64bit platforms where the size of a float is the same as the size of an int To be clear: the *intent* of the API should not change -- we still use pixels everywhere -- but: - we remove ambiguity in the API with regard to pixels and units - we remove entry points we get to maintain for the whole 1.0 version of the API - we make things simpler to bind for both manual language bindings and automatic (gobject-introspection based) ones - we have the simplest API possible while still exposing the capabilities of the underlying GL implementation
2009-05-06 15:44:47 +00:00
gfloat width, height;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
Coding style consistency Channel mitch's spirit. This is also how I get to have the highest commit count on Clutter's repository.
2008-12-11 11:54:32 +00:00
g_return_val_if_fail (CLUTTER_IS_TEXT (self), NULL);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
text: Layouts for single-line-mode entries are boundless A PangoLayout for an editable, single-line text entry is by definition without a given width, since the actor will be clipped when being drawn.
2010-07-09 17:37:34 +00:00
if (self->priv->editable && self->priv->single_line_mode)
return clutter_text_create_layout (self, -1, -1);
Remove Units from the public API With the recent change to internal floating point values, ClutterUnit has become a redundant type, defined to be a float. All integer entry points are being internally converted to floating point values to be passed to the GL pipeline with the least amount of conversion. ClutterUnit is thus exposed as just a "pixel with fractionary bits", and not -- as users might think -- as generic, resolution and device independent units. not that it was the case, but a definitive amount of people was convinced it did provide this "feature", and was flummoxed about the mere existence of this type. So, having ClutterUnit exposed in the public API doubles the entry points and has the following disadvantages: - we have to maintain twice the amount of entry points in ClutterActor - we still do an integer-to-float implicit conversion - we introduce a weird impedance between pixels and "pixels with fractionary bits" - language bindings will have to choose what to bind, and resort to manually overriding the API + *except* for language bindings based on GObject-Introspection, as they cannot do manual overrides, thus will replicate the entire set of entry points For these reason, we should coalesces every Actor entry point for pixels and for ClutterUnit into a single entry point taking a float, like: void clutter_actor_set_x (ClutterActor *self, gfloat x); void clutter_actor_get_size (ClutterActor *self, gfloat *width, gfloat *height); gfloat clutter_actor_get_height (ClutterActor *self); etc. The issues I have identified are: - we'll have a two cases of compiler warnings: - printf() format of the return values from %d to %f - clutter_actor_get_size() taking floats instead of unsigned ints - we'll have a problem with varargs when passing an integer instead of a floating point value, except on 64bit platforms where the size of a float is the same as the size of an int To be clear: the *intent* of the API should not change -- we still use pixels everywhere -- but: - we remove ambiguity in the API with regard to pixels and units - we remove entry points we get to maintain for the whole 1.0 version of the API - we make things simpler to bind for both manual language bindings and automatic (gobject-introspection based) ones - we have the simplest API possible while still exposing the capabilities of the underlying GL implementation
2009-05-06 15:44:47 +00:00
clutter_actor_get_size (CLUTTER_ACTOR (self), &width, &height);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
Support pango_layout_set_height() in ClutterText This is the port of the patch attached to bug 1266: ClutterLabel support for pango_layout_set_height() to the ClutterText actor. This patch adds support for the pango_layout_set_height() function inside the layout creation and caching, so that setting the height of a ClutterText will make PangoLayout try to fill out the given height before ellipsizing the contents of the ClutterText actor. The original patch is from Havoc Pennington. This commit ports the patch to ClutterText and applies a small change to the height computation pointed out by Behdad Esfahbod on GNOME's Bugzilla: http://bugzilla.gnome.org/show_bug.cgi?id=560931 That the layout heights when doing a size request should be set to be G_MAXINT instead of -1. Unfortunately, the patch seems to break the conformance suite when setting the ellipsization on the layout.
2008-12-16 14:02:05 +00:00
return clutter_text_create_layout (self, width, height);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
}
Add documentation annotations ClutterText is heavily under-documented. This commit ports most of the API documentation from ClutterLabel and ClutterEntry to ClutterText.
2008-12-11 12:17:11 +00:00
/**
* clutter_text_set_color:
* @self: a #ClutterText
* @color: a #ClutterColor
*
* Sets the color of the contents of a #ClutterText actor.
*
* The overall opacity of the #ClutterText actor will be the
* result of the alpha value of @color and the composited
* opacity of the actor itself on the scenegraph, as returned
* by clutter_actor_get_paint_opacity().
*
* Since: 1.0
*/
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
void
Coding style consistency Channel mitch's spirit. This is also how I get to have the highest commit count on Clutter's repository.
2008-12-11 11:54:32 +00:00
clutter_text_set_color (ClutterText *self,
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
const ClutterColor *color)
{
ClutterTextPrivate *priv;
Coding style consistency Channel mitch's spirit. This is also how I get to have the highest commit count on Clutter's repository.
2008-12-11 11:54:32 +00:00
g_return_if_fail (CLUTTER_IS_TEXT (self));
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
g_return_if_fail (color != NULL);
Coding style consistency Channel mitch's spirit. This is also how I get to have the highest commit count on Clutter's repository.
2008-12-11 11:54:32 +00:00
priv = self->priv;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
priv->text_color = *color;
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
clutter_text_queue_redraw (CLUTTER_ACTOR (self));
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_COLOR]);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
}
Add documentation annotations ClutterText is heavily under-documented. This commit ports most of the API documentation from ClutterLabel and ClutterEntry to ClutterText.
2008-12-11 12:17:11 +00:00
/**
* clutter_text_get_color:
* @self: a #ClutterText
annotations: Use caller-allocates for color getters This should avoid a separate initialization of a ClutterColor in language bindings.
2011-02-14 18:36:51 +00:00
* @color: (out caller-allocates): return location for a #ClutterColor
Add documentation annotations ClutterText is heavily under-documented. This commit ports most of the API documentation from ClutterLabel and ClutterEntry to ClutterText.
2008-12-11 12:17:11 +00:00
*
Small doc fix to clutter_text_get_color Bug reported by Rob Bradford.
2009-08-05 14:51:49 +00:00
* Retrieves the text color as set by clutter_text_set_color().
Add documentation annotations ClutterText is heavily under-documented. This commit ports most of the API documentation from ClutterLabel and ClutterEntry to ClutterText.
2008-12-11 12:17:11 +00:00
*
* Since: 1.0
*/
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
void
Coding style consistency Channel mitch's spirit. This is also how I get to have the highest commit count on Clutter's repository.
2008-12-11 11:54:32 +00:00
clutter_text_get_color (ClutterText *self,
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
ClutterColor *color)
{
ClutterTextPrivate *priv;
Coding style consistency Channel mitch's spirit. This is also how I get to have the highest commit count on Clutter's repository.
2008-12-11 11:54:32 +00:00
g_return_if_fail (CLUTTER_IS_TEXT (self));
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
g_return_if_fail (color != NULL);
Coding style consistency Channel mitch's spirit. This is also how I get to have the highest commit count on Clutter's repository.
2008-12-11 11:54:32 +00:00
priv = self->priv;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
*color = priv->text_color;
}
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
/**
* clutter_text_set_ellipsize:
* @self: a #ClutterText
* @mode: a #PangoEllipsizeMode
*
* Sets the mode used to ellipsize (add an ellipsis: "...") to the
* text if there is not enough space to render the entire contents
* of a #ClutterText actor
*
* Since: 1.0
*/
void
clutter_text_set_ellipsize (ClutterText *self,
PangoEllipsizeMode mode)
{
ClutterTextPrivate *priv;
g_return_if_fail (CLUTTER_IS_TEXT (self));
g_return_if_fail (mode >= PANGO_ELLIPSIZE_NONE &&
mode <= PANGO_ELLIPSIZE_END);
priv = self->priv;
if ((PangoEllipsizeMode) priv->ellipsize != mode)
{
priv->ellipsize = mode;
clutter_text_dirty_cache (self);
clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ELLIPSIZE]);
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
}
}
/**
* clutter_text_get_ellipsize:
* @self: a #ClutterText
*
* Returns the ellipsizing position of a #ClutterText actor, as
* set by clutter_text_set_ellipsize().
*
* Return value: #PangoEllipsizeMode
*
* Since: 1.0
*/
PangoEllipsizeMode
clutter_text_get_ellipsize (ClutterText *self)
{
g_return_val_if_fail (CLUTTER_IS_TEXT (self), PANGO_ELLIPSIZE_NONE);
return self->priv->ellipsize;
}
Add documentation annotations ClutterText is heavily under-documented. This commit ports most of the API documentation from ClutterLabel and ClutterEntry to ClutterText.
2008-12-11 12:17:11 +00:00
/**
* clutter_text_get_line_wrap:
* @self: a #ClutterText
*
* Retrieves the value set using clutter_text_set_line_wrap().
*
* Return value: %TRUE if the #ClutterText actor should wrap
* its contents
*
* Since: 1.0
*/
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
gboolean
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
clutter_text_get_line_wrap (ClutterText *self)
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
{
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
g_return_val_if_fail (CLUTTER_IS_TEXT (self), FALSE);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
return self->priv->wrap;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
}
Add documentation annotations ClutterText is heavily under-documented. This commit ports most of the API documentation from ClutterLabel and ClutterEntry to ClutterText.
2008-12-11 12:17:11 +00:00
/**
* clutter_text_set_line_wrap:
* @self: a #ClutterText
* @line_wrap: whether the contents should wrap
*
* Sets whether the contents of a #ClutterText actor should wrap,
* if they don't fit the size assigned to the actor.
*
* Since: 1.0
*/
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
void
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
clutter_text_set_line_wrap (ClutterText *self,
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
gboolean line_wrap)
{
ClutterTextPrivate *priv;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
g_return_if_fail (CLUTTER_IS_TEXT (self));
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
priv = self->priv;
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
if (priv->wrap != line_wrap)
{
priv->wrap = line_wrap;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
clutter_text_dirty_cache (self);
clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_LINE_WRAP]);
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
}
}
/**
* clutter_text_set_line_wrap_mode:
* @self: a #ClutterText
* @wrap_mode: the line wrapping mode
*
* If line wrapping is enabled (see clutter_text_set_line_wrap()) this
* function controls how the line wrapping is performed. The default is
* %PANGO_WRAP_WORD which means wrap on word boundaries.
*
* Since: 1.0
*/
void
clutter_text_set_line_wrap_mode (ClutterText *self,
PangoWrapMode wrap_mode)
{
ClutterTextPrivate *priv;
g_return_if_fail (CLUTTER_IS_TEXT (self));
priv = self->priv;
if (priv->wrap_mode != wrap_mode)
{
priv->wrap_mode = wrap_mode;
clutter_text_dirty_cache (self);
clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_LINE_WRAP_MODE]);
Coalesce ClutterLabel API usage ClutterText replaces ClutterLabel, so it should expose the same kind of API - ideally with the minimal amount of changes, so that the porting is trivial.
2008-12-11 11:17:26 +00:00
}
}
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
/**
* clutter_text_get_line_wrap_mode:
* @self: a #ClutterText
*
* Retrieves the line wrap mode used by the #ClutterText actor.
*
* See clutter_text_set_line_wrap_mode ().
*
* Return value: the wrap mode used by the #ClutterText
*
* Since: 1.0
*/
PangoWrapMode
clutter_text_get_line_wrap_mode (ClutterText *self)
{
g_return_val_if_fail (CLUTTER_IS_TEXT (self), PANGO_WRAP_WORD);
return self->priv->wrap_mode;
}
/**
* clutter_text_set_attributes:
* @self: a #ClutterText
* @attrs: a #PangoAttrList or %NULL to unset the attributes
*
* Sets the attributes list that are going to be applied to the
[text] Merge the attributes with markup enabled ClutterText should merge the PangoAttributes set by using clutter_text_set_attributes() with the attributes generated by parsing Pango markup. For this to work we must parse the markup and merge the attributes we get out of pango_parse_markup() with the attributes set by the user. Setting the markup or the attributes on an editable text should not work for the time being.
2009-01-29 13:18:57 +00:00
* #ClutterText contents.
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
*
* The #ClutterText actor will take a reference on the #PangoAttrList
* passed to this function.
*
* Since: 1.0
*/
void
clutter_text_set_attributes (ClutterText *self,
PangoAttrList *attrs)
{
ClutterTextPrivate *priv;
g_return_if_fail (CLUTTER_IS_TEXT (self));
priv = self->priv;
if (attrs)
pango_attr_list_ref (attrs);
if (priv->attrs)
pango_attr_list_unref (priv->attrs);
[text] Merge the attributes with markup enabled ClutterText should merge the PangoAttributes set by using clutter_text_set_attributes() with the attributes generated by parsing Pango markup. For this to work we must parse the markup and merge the attributes we get out of pango_parse_markup() with the attributes set by the user. Setting the markup or the attributes on an editable text should not work for the time being.
2009-01-29 13:18:57 +00:00
priv->attrs = attrs;
text: Store the markup attributes separately Previously when the markup property is set it would generate an attribute list from the markup and then merge it with the attributes from the attribute property and store it as the effective attributes. The markup attributes and the marked up text would then be forgotten. This breaks if the application then later changes the attributes property because it would try to regenerate the effective attributes from the markup text but the stored text no longer contains any markup. If the original markup text happened to contain entities like '&lt;' they would end up causing parse errors because they would be converted to the actual symbols. To fix this the attributes from the markup are now stored independently from the effective attributes. The effective attributes are now regenerated if either set of attributes changes right before a layout is created. http://bugzilla.openedhand.com/show_bug.cgi?id=1940
2010-01-05 11:58:12 +00:00
/* Clear the effective attributes so they will be regenerated when a
layout is created */
if (priv->effective_attrs)
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
{
text: Store the markup attributes separately Previously when the markup property is set it would generate an attribute list from the markup and then merge it with the attributes from the attribute property and store it as the effective attributes. The markup attributes and the marked up text would then be forgotten. This breaks if the application then later changes the attributes property because it would try to regenerate the effective attributes from the markup text but the stored text no longer contains any markup. If the original markup text happened to contain entities like '&lt;' they would end up causing parse errors because they would be converted to the actual symbols. To fix this the attributes from the markup are now stored independently from the effective attributes. The effective attributes are now regenerated if either set of attributes changes right before a layout is created. http://bugzilla.openedhand.com/show_bug.cgi?id=1940
2010-01-05 11:58:12 +00:00
pango_attr_list_unref (priv->effective_attrs);
priv->effective_attrs = NULL;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
}
clutter_text_dirty_cache (self);
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ATTRIBUTES]);
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
}
/**
* clutter_text_get_attributes:
* @self: a #ClutterText
*
* Gets the attribute list that was set on the #ClutterText actor
* clutter_text_set_attributes(), if any.
*
Add gobject-introspection annotations Add annotations such as (transfer-none) (out) (element-type ClutterActor), and so forth to the doc comments as appropriate. The annotations added here are a combination of the annotations previously in gir-repository for Clutter and annotations found in a review of all return values with that were being parsed with a transfer of "full". http://bugzilla.openedhand.com/show_bug.cgi?id=1452 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-02-17 00:25:20 +00:00
* Return value: (transfer none): the attribute list, or %NULL if none was set. The
* returned value is owned by the #ClutterText and should not be unreferenced.
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
*
* Since: 1.0
*/
PangoAttrList *
clutter_text_get_attributes (ClutterText *self)
{
g_return_val_if_fail (CLUTTER_IS_TEXT (self), NULL);
return self->priv->attrs;
}
/**
[text] Rename :alignment to :line-alignment The :alignment property is prone to generate confusion: developers will set it thinking that the contents of a ClutterText will automagically align themselves. Instead of using the generic term :alignment, and following the GTK+ convention, we should use a more specific term, conveying the actual effect of the property: alignment of the lines with respect to each other, and not to the overall allocated area. See bug 1428: http://bugzilla.openedhand.com/show_bug.cgi?id=1428
2009-02-02 23:55:30 +00:00
* clutter_text_set_line_alignment:
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
* @self: a #ClutterText
* @alignment: A #PangoAlignment
*
[text] Rename :alignment to :line-alignment The :alignment property is prone to generate confusion: developers will set it thinking that the contents of a ClutterText will automagically align themselves. Instead of using the generic term :alignment, and following the GTK+ convention, we should use a more specific term, conveying the actual effect of the property: alignment of the lines with respect to each other, and not to the overall allocated area. See bug 1428: http://bugzilla.openedhand.com/show_bug.cgi?id=1428
2009-02-02 23:55:30 +00:00
* Sets the way that the lines of a wrapped label are aligned with
* respect to each other. This does not affect the overall alignment
* of the label within its allocated or specified width.
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
*
[text] Rename :alignment to :line-alignment The :alignment property is prone to generate confusion: developers will set it thinking that the contents of a ClutterText will automagically align themselves. Instead of using the generic term :alignment, and following the GTK+ convention, we should use a more specific term, conveying the actual effect of the property: alignment of the lines with respect to each other, and not to the overall allocated area. See bug 1428: http://bugzilla.openedhand.com/show_bug.cgi?id=1428
2009-02-02 23:55:30 +00:00
* To align a #ClutterText actor you should add it to a container
* that supports alignment, or use the anchor point.
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
*
* Since: 1.0
*/
void
[text] Rename :alignment to :line-alignment The :alignment property is prone to generate confusion: developers will set it thinking that the contents of a ClutterText will automagically align themselves. Instead of using the generic term :alignment, and following the GTK+ convention, we should use a more specific term, conveying the actual effect of the property: alignment of the lines with respect to each other, and not to the overall allocated area. See bug 1428: http://bugzilla.openedhand.com/show_bug.cgi?id=1428
2009-02-02 23:55:30 +00:00
clutter_text_set_line_alignment (ClutterText *self,
PangoAlignment alignment)
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
{
ClutterTextPrivate *priv;
g_return_if_fail (CLUTTER_IS_TEXT (self));
priv = self->priv;
if (priv->alignment != alignment)
{
priv->alignment = alignment;
clutter_text_dirty_cache (self);
clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_LINE_ALIGNMENT]);
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
}
}
/**
[text] Rename :alignment to :line-alignment The :alignment property is prone to generate confusion: developers will set it thinking that the contents of a ClutterText will automagically align themselves. Instead of using the generic term :alignment, and following the GTK+ convention, we should use a more specific term, conveying the actual effect of the property: alignment of the lines with respect to each other, and not to the overall allocated area. See bug 1428: http://bugzilla.openedhand.com/show_bug.cgi?id=1428
2009-02-02 23:55:30 +00:00
* clutter_text_get_line_alignment:
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
* @self: a #ClutterText
*
[text] Rename :alignment to :line-alignment The :alignment property is prone to generate confusion: developers will set it thinking that the contents of a ClutterText will automagically align themselves. Instead of using the generic term :alignment, and following the GTK+ convention, we should use a more specific term, conveying the actual effect of the property: alignment of the lines with respect to each other, and not to the overall allocated area. See bug 1428: http://bugzilla.openedhand.com/show_bug.cgi?id=1428
2009-02-02 23:55:30 +00:00
* Retrieves the alignment of a #ClutterText, as set by
* clutter_text_set_line_alignment().
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
*
* Return value: a #PangoAlignment
*
docs: Fix the 'Since' annotation for some functions The 'Since' annotation needs to have a colon after it or gtk-doc won't pick it up.
2009-11-19 11:51:21 +00:00
* Since: 1.0
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
*/
PangoAlignment
[text] Rename :alignment to :line-alignment The :alignment property is prone to generate confusion: developers will set it thinking that the contents of a ClutterText will automagically align themselves. Instead of using the generic term :alignment, and following the GTK+ convention, we should use a more specific term, conveying the actual effect of the property: alignment of the lines with respect to each other, and not to the overall allocated area. See bug 1428: http://bugzilla.openedhand.com/show_bug.cgi?id=1428
2009-02-02 23:55:30 +00:00
clutter_text_get_line_alignment (ClutterText *self)
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
{
g_return_val_if_fail (CLUTTER_IS_TEXT (self), PANGO_ALIGN_LEFT);
return self->priv->alignment;
}
/**
* clutter_text_set_use_markup:
* @self: a #ClutterText
* @setting: %TRUE if the text should be parsed for markup.
*
* Sets whether the contents of the #ClutterText actor contains markup
* in <link linkend="PangoMarkupFormat">Pango's text markup language</link>.
*
[text] Merge the attributes with markup enabled ClutterText should merge the PangoAttributes set by using clutter_text_set_attributes() with the attributes generated by parsing Pango markup. For this to work we must parse the markup and merge the attributes we get out of pango_parse_markup() with the attributes set by the user. Setting the markup or the attributes on an editable text should not work for the time being.
2009-01-29 13:18:57 +00:00
* Setting #ClutterText:use-markup on an editable #ClutterText will
text: Do not set the markup unconditionally When setting :use-markup we always pass the contents of the Text actor to clutter_text_set_markup_internal(); if string contains any markup, this ends up being parsed and used - even when :use-markup is set to FALSE. http://bugzilla.clutter-project.org/show_bug.cgi?id=2239
2010-08-06 16:04:37 +00:00
* not have any effect except hiding the markup.
*
* See also #ClutterText:use-markup.
[text] Do not use markup on an editable Text An editable ClutterText should not use pango_layout_set_markup(), as the contents of the text actor will not match the text. Only read-only text actors should parse the contents for Pango markup.
2009-01-07 13:48:45 +00:00
*
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
* Since: 1.0
*/
void
clutter_text_set_use_markup (ClutterText *self,
gboolean setting)
{
text: Do not set the markup unconditionally When setting :use-markup we always pass the contents of the Text actor to clutter_text_set_markup_internal(); if string contains any markup, this ends up being parsed and used - even when :use-markup is set to FALSE. http://bugzilla.clutter-project.org/show_bug.cgi?id=2239
2010-08-06 16:04:37 +00:00
ClutterTextPrivate *priv;
gchar *str;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
g_return_if_fail (CLUTTER_IS_TEXT (self));
text: Do not set the markup unconditionally When setting :use-markup we always pass the contents of the Text actor to clutter_text_set_markup_internal(); if string contains any markup, this ends up being parsed and used - even when :use-markup is set to FALSE. http://bugzilla.clutter-project.org/show_bug.cgi?id=2239
2010-08-06 16:04:37 +00:00
priv = self->priv;
str = g_strdup (priv->text);
[text] Merge the attributes with markup enabled ClutterText should merge the PangoAttributes set by using clutter_text_set_attributes() with the attributes generated by parsing Pango markup. For this to work we must parse the markup and merge the attributes we get out of pango_parse_markup() with the attributes set by the user. Setting the markup or the attributes on an editable text should not work for the time being.
2009-01-29 13:18:57 +00:00
clutter_text_set_use_markup_internal (self, setting);
text: Do not set the markup unconditionally When setting :use-markup we always pass the contents of the Text actor to clutter_text_set_markup_internal(); if string contains any markup, this ends up being parsed and used - even when :use-markup is set to FALSE. http://bugzilla.clutter-project.org/show_bug.cgi?id=2239
2010-08-06 16:04:37 +00:00
if (setting)
clutter_text_set_markup_internal (self, str);
else
clutter_text_set_text_internal (self, str);
g_free (str);
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
[text] Merge the attributes with markup enabled ClutterText should merge the PangoAttributes set by using clutter_text_set_attributes() with the attributes generated by parsing Pango markup. For this to work we must parse the markup and merge the attributes we get out of pango_parse_markup() with the attributes set by the user. Setting the markup or the attributes on an editable text should not work for the time being.
2009-01-29 13:18:57 +00:00
clutter_text_dirty_cache (self);
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
[text] Merge the attributes with markup enabled ClutterText should merge the PangoAttributes set by using clutter_text_set_attributes() with the attributes generated by parsing Pango markup. For this to work we must parse the markup and merge the attributes we get out of pango_parse_markup() with the attributes set by the user. Setting the markup or the attributes on an editable text should not work for the time being.
2009-01-29 13:18:57 +00:00
clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
}
/**
* clutter_text_get_use_markup:
* @self: a #ClutterText
*
* Retrieves whether the contents of the #ClutterText actor should be
* parsed for the Pango text markup.
*
* Return value: %TRUE if the contents will be parsed for markup
*
* Since: 1.0
*/
gboolean
clutter_text_get_use_markup (ClutterText *self)
{
g_return_val_if_fail (CLUTTER_IS_TEXT (self), FALSE);
return self->priv->use_markup;
}
/**
* clutter_text_set_justify:
* @self: a #ClutterText
* @justify: whether the text should be justified
*
* Sets whether the text of the #ClutterText actor should be justified
* on both margins. This setting is ignored if Clutter is compiled
* against Pango &lt; 1.18.
*
Add documentation annotations ClutterText is heavily under-documented. This commit ports most of the API documentation from ClutterLabel and ClutterEntry to ClutterText.
2008-12-11 12:17:11 +00:00
* Since: 1.0
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
*/
void
clutter_text_set_justify (ClutterText *self,
gboolean justify)
{
ClutterTextPrivate *priv;
g_return_if_fail (CLUTTER_IS_TEXT (self));
priv = self->priv;
if (priv->justify != justify)
{
priv->justify = justify;
clutter_text_dirty_cache (self);
clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_JUSTIFY]);
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
}
}
/**
* clutter_text_get_justify:
* @self: a #ClutterText
*
* Retrieves whether the #ClutterText actor should justify its contents
* on both margins.
*
* Return value: %TRUE if the text should be justified
*
* Since: 0.6
*/
gboolean
clutter_text_get_justify (ClutterText *self)
{
g_return_val_if_fail (CLUTTER_IS_TEXT (self), FALSE);
return self->priv->justify;
}
/**
* clutter_text_get_cursor_position:
* @self: a #ClutterText
*
* Retrieves the cursor position.
*
* Return value: the cursor position, in characters
*
* Since: 1.0
*/
gint
clutter_text_get_cursor_position (ClutterText *self)
{
g_return_val_if_fail (CLUTTER_IS_TEXT (self), -1);
return self->priv->position;
}
Add documentation annotations ClutterText is heavily under-documented. This commit ports most of the API documentation from ClutterLabel and ClutterEntry to ClutterText.
2008-12-11 12:17:11 +00:00
/**
* clutter_text_set_cursor_position:
* @self: a #ClutterText
* @position: the new cursor position, in characters
*
* Sets the cursor of a #ClutterText actor at @position.
*
* The position is expressed in characters, not in bytes.
*
* Since: 1.0
*/
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
void
clutter_text_set_cursor_position (ClutterText *self,
gint position)
{
ClutterTextPrivate *priv;
gint len;
g_return_if_fail (CLUTTER_IS_TEXT (self));
priv = self->priv;
text: Notify :position when it changes The :position property is not notified when changed. http://bugzilla.openedhand.com/show_bug.cgi?id=1830
2009-10-16 13:22:15 +00:00
if (priv->position == position)
return;
[text] Use cached length when possible Since clutter_text_set_text() measures the length of the text each time, we should use the cached length instead of recomputing the text length each time. This should save us some time when dealing with long, multi-byte texts.
2009-01-06 20:52:03 +00:00
len = priv->n_chars;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
if (position < 0 || position >= len)
priv->position = -1;
else
priv->position = position;
[clutter-text] Fix x-position of cursor when moving up or down ClutterText already has code to try to preserve the x position when moving up or down. A target x-position is stored and the cursor is positioned at the nearest point to that in the appropriate line when up or down is pressed. However the target position was never cleared so it would always target the x-position of the cursor from the first time you pressed up or down. To fix this the patch clears the target position in set_position and then sets it after the call in real_move_up/down. That way pressing up or down sets the target position and any other movement will clear it. To get an index for the pixel position in the line pango_layout_line_x_to_index is used. However when x is greater than the length of the line then the index before the last grapheme is returned which was causing it to jump to the penultimate character. The patch makes it add on the trailing value so that it will jump to the last character.
2009-01-14 11:12:02 +00:00
/* Forget the target x position so that it will be recalculated next
time the cursor is moved up or down */
priv->x_pos = -1;
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
clutter_text_queue_redraw (CLUTTER_ACTOR (self));
text: Notify :position when it changes The :position property is not notified when changed. http://bugzilla.openedhand.com/show_bug.cgi?id=1830
2009-10-16 13:22:15 +00:00
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_POSITION]);
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
}
Add :cursor-size property to ClutterText We can control the width of the cursor when painting by using a simple property. The magic -1 number passed to the setter method will reset the cursor size to the default one of 2px. The getter method will return an unsigned integer with the current size.
2008-12-16 10:37:45 +00:00
/**
* clutter_text_set_cursor_size:
* @self: a #ClutterText
* @size: the size of the cursor, in pixels, or -1 to use the
* default value
*
* Sets the size of the cursor of a #ClutterText. The cursor
* will only be visible if the #ClutterText:cursor-visible property
* is set to %TRUE.
*
* Since: 1.0
*/
void
clutter_text_set_cursor_size (ClutterText *self,
gint size)
{
ClutterTextPrivate *priv;
g_return_if_fail (CLUTTER_IS_TEXT (self));
priv = self->priv;
if (priv->cursor_size != size)
{
if (size < 0)
size = DEFAULT_CURSOR_SIZE;
priv->cursor_size = size;
clutter-text: Use the ink rect in the paint volume Previously ClutterText was just reporting the allocation as the paint volume. The preferred size of a ClutterText is just the logical rectangle of the layout. A pango layout can sometimes draw outside of its logical rectangle for example with an italicised font with large serifs. Additionally, ClutterText doesn't make any attempt to clip the text if the actor gets allocated a size too small for the text so it would also end up drawing outside of the paint volume in that case. To fix this, the paint volume is now reported as the ink rect of the Pango layout. The rectangle for the cursor and selection is also unioned into that because it won't necessarily be within the ink rectangle. The function for drawing the selection rectangles has been split up into a generic function that calculates the rectangles that need to be drawn and a function that draws them. That way the get_paint_volume virtual can share the code to calculate the rectangles. http://bugzilla.clutter-project.org/show_bug.cgi?id=2599
2011-03-07 18:53:07 +00:00
clutter_text_queue_redraw (CLUTTER_ACTOR (self));
Add :cursor-size property to ClutterText We can control the width of the cursor when painting by using a simple property. The magic -1 number passed to the setter method will reset the cursor size to the default one of 2px. The getter method will return an unsigned integer with the current size.
2008-12-16 10:37:45 +00:00
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CURSOR_SIZE]);
Add :cursor-size property to ClutterText We can control the width of the cursor when painting by using a simple property. The magic -1 number passed to the setter method will reset the cursor size to the default one of 2px. The getter method will return an unsigned integer with the current size.
2008-12-16 10:37:45 +00:00
}
}
/**
* clutter_text_get_cursor_size:
* @self: a #ClutterText
*
* Retrieves the size of the cursor of a #ClutterText actor.
*
* Return value: the size of the cursor, in pixels
*
* Since: 1.0
*/
guint
clutter_text_get_cursor_size (ClutterText *self)
{
g_return_val_if_fail (CLUTTER_IS_TEXT (self), DEFAULT_CURSOR_SIZE);
return self->priv->cursor_size;
}
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
/**
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
* clutter_text_set_password_char:
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
* @self: a #ClutterText
Comments and whitespace fixes to ClutterText
2009-01-07 00:43:24 +00:00
* @wc: a Unicode character, or 0 to unset the password character
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
*
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
* Sets the character to use in place of the actual text in a
* password text actor.
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
*
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
* If @wc is 0 the text will be displayed as it is entered in the
* #ClutterText actor.
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
*
* Since: 1.0
*/
void
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
clutter_text_set_password_char (ClutterText *self,
gunichar wc)
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
{
ClutterTextPrivate *priv;
g_return_if_fail (CLUTTER_IS_TEXT (self));
priv = self->priv;
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
if (priv->password_char != wc)
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
{
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
priv->password_char = wc;
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
clutter_text_dirty_cache (self);
clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_PASSWORD_CHAR]);
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
}
}
/**
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
* clutter_text_get_password_char:
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
* @self: a #ClutterText
*
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
* Retrieves the character to use in place of the actual text
* as set by clutter_text_set_password_char().
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
*
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
* Return value: a Unicode character or 0 if the password
* character is not set
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
*
* Since: 1.0
*/
gunichar
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
clutter_text_get_password_char (ClutterText *self)
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
{
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
g_return_val_if_fail (CLUTTER_IS_TEXT (self), 0);
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
[text] Coalesce text visibility and password character Using two properties to set a password entry can be construed as both cumbersome and a gtk-ism. And rightly so on both counts. The :text-visible property has also conflicting semantics with the :cursor-visible one: while the latter hides the cursor, the former changes the display of the contents of the Text actor. It is, thus, not a matter of "visibility" but of "rendering". Instead of setting the :text-visible and :invisible-char properties to have a password text field, the Text actor should just have a single :password-char property holding a Unicode character. If the value of the :password-char is non-zero, the Text actor will use the Unicode character to render the contents of the text entry. This commit removes the following methods: clutter_text_set_text_visible() clutter_text_get_text_visible() clutter_text_set_invisible_char() clutter_text_get_invisible_char() And the following properties: ClutterText:text-visible ClutterText:invisible-char In favour of: clutter_text_set_password_char() clutter_text_get_password_char() And: ClutterText:password-char Thus making obvious what use the property and accessor methods are for and simplifying the process of creating a simple password text field to: text = clutter_text_new (); clutter_text_set_password_char (CLUTTER_TEXT (text), '*');
2009-01-06 15:22:31 +00:00
return self->priv->password_char;
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
}
/**
* clutter_text_set_max_length:
* @self: a #ClutterText
* @max: the maximum number of characters allowed in the text actor; 0
* to disable or -1 to set the length of the current string
*
* Sets the maximum allowed length of the contents of the actor. If the
* current contents are longer than the given length, then they will be
* truncated to fit.
*
Implement Text:max-length The :max-length property establishes the maximum available length for the Text actor's contents, in characters.
2008-12-11 11:54:07 +00:00
* Since: 1.0
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
*/
void
clutter_text_set_max_length (ClutterText *self,
Implement Text:max-length The :max-length property establishes the maximum available length for the Text actor's contents, in characters.
2008-12-11 11:54:07 +00:00
gint max)
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
{
ClutterTextPrivate *priv;
gchar *new = NULL;
Implement Text:max-length The :max-length property establishes the maximum available length for the Text actor's contents, in characters.
2008-12-11 11:54:07 +00:00
g_return_if_fail (CLUTTER_IS_TEXT (self));
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
priv = self->priv;
if (priv->max_length != max)
{
if (max < 0)
[text] Use cached length when possible Since clutter_text_set_text() measures the length of the text each time, we should use the cached length instead of recomputing the text length each time. This should save us some time when dealing with long, multi-byte texts.
2009-01-06 20:52:03 +00:00
max = priv->n_chars;
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
priv->max_length = max;
new = g_strdup (priv->text);
Implement Text:max-length The :max-length property establishes the maximum available length for the Text actor's contents, in characters.
2008-12-11 11:54:07 +00:00
clutter_text_set_text (self, new);
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
g_free (new);
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_MAX_LENGTH]);
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
}
}
/**
* clutter_text_get_max_length:
Implement Text:max-length The :max-length property establishes the maximum available length for the Text actor's contents, in characters.
2008-12-11 11:54:07 +00:00
* @self: a #ClutterText
*
* Gets the maximum length of text that can be set into a text actor.
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
*
* See clutter_text_set_max_length().
*
* Return value: the maximum number of characters.
*
Implement Text:max-length The :max-length property establishes the maximum available length for the Text actor's contents, in characters.
2008-12-11 11:54:07 +00:00
* Since: 1.0
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
*/
gint
clutter_text_get_max_length (ClutterText *self)
{
Implement Text:max-length The :max-length property establishes the maximum available length for the Text actor's contents, in characters.
2008-12-11 11:54:07 +00:00
g_return_val_if_fail (CLUTTER_IS_TEXT (self), 0);
Add text-visibility accessors for ClutterText A ClutterText can be put in "password mode" by setting the text as "invisible": every character inside the Text actor's contents will be replaced when building the Pango layout with a specific Unicode character. The Unicode character is set to '*' by default, but the user can be changed using the provided API.
2008-12-11 11:40:55 +00:00
return self->priv->max_length;
}
Add documentation annotations ClutterText is heavily under-documented. This commit ports most of the API documentation from ClutterLabel and ClutterEntry to ClutterText.
2008-12-11 12:17:11 +00:00
/**
* clutter_text_insert_unichar:
* @self: a #ClutterText
* @wc: a Unicode character
*
* Inserts @wc at the current cursor position of a
* #ClutterText actor.
*
* Since: 1.0
*/
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
void
clutter_text_insert_unichar (ClutterText *self,
gunichar wc)
{
ClutterTextPrivate *priv;
GString *new = NULL;
glong pos;
g_return_if_fail (CLUTTER_IS_TEXT (self));
g_return_if_fail (g_unichar_validate (wc));
if (wc == 0)
return;
priv = self->priv;
new = g_string_new (priv->text);
Improve the safety checks inside the text setters We should check that the contents of the Text actor are not NULL when computing the offsets in bytes.
2008-12-11 11:49:45 +00:00
if (priv->text)
pos = offset_to_bytes (priv->text, priv->position);
else
pos = 0;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
new = g_string_insert_unichar (new, pos, wc);
Added ClutterText::insert-text and ClutterText::delete-text signals * clutter/clutter-marshal.list: added new marshaller * clutter/clutter-text.c (clutter_text_class_init): added insert-text and delete-text signals (clutter_text_insert_unichar): emits insert-text signal (clutter_text_insert_text): emits insert-text signal (clutter_text_delete_text): emits delete-text signal (clutter_text_delete_chars): emits delete-text signal (clutter_text_set_markup_internal): emits delete-text and insert-text signals (clutter_text_set_text): emits delete-text and insert-text signals http://bugzilla.openedhand.com/show_bug.cgi?id=1894
2009-11-20 14:17:41 +00:00
g_signal_emit (self, text_signals[INSERT_TEXT], 0, &wc, 1, &pos);
clutter_text_set_text_internal (self, new->str);
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
if (priv->position >= 0)
text: Fixes for selection bound The commit ecbb7ce41a1a759e246fce07f146b8bed5e3d730 exposed some issues when positioning the cursor with the mouse pointer: the selection is not moved along with the cursor when inserting a single character or a string. Also, some freeze_notify() are called too early, leading to decoupling from their respective thaw_notify(). http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-02-02 17:07:22 +00:00
clutter_text_set_positions (self,
priv->position + 1,
priv->position + 1);
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
g_string_free (new, TRUE);
}
Add documentation annotations ClutterText is heavily under-documented. This commit ports most of the API documentation from ClutterLabel and ClutterEntry to ClutterText.
2008-12-11 12:17:11 +00:00
/**
* clutter_text_insert_text:
* @self: a #ClutterText
* @text: the text to be inserted
* @position: the position of the insertion, or -1
*
* Inserts @text into a #ClutterActor at the given position.
*
* If @position is a negative number, the text will be appended
* at the end of the current contents of the #ClutterText.
*
* The position is expressed in characters, not in bytes.
*
* Since: 1.0
*/
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
void
Add text editing methods Port the text editing methods from ClutterEntry, so that ClutterText exposes the same API.
2008-12-11 11:43:56 +00:00
clutter_text_insert_text (ClutterText *self,
const gchar *text,
gssize position)
{
ClutterTextPrivate *priv;
GString *new = NULL;
[text] Insertion of multi-byte characters broken Bug 1501 - clutter_text_insert_text not working right with non-onebyte character In clutter_text_insert_text(), the position is expressed in characters, not in bytes. Actually, it turns out to be working on bytes, so when there are already multi-byte character in the text buffer, insert text at the position after the multi-byte character will not work right. Also, the position is not updated after the insert work is done. Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-03-09 06:10:45 +00:00
gint pos_bytes;
Add text editing methods Port the text editing methods from ClutterEntry, so that ClutterText exposes the same API.
2008-12-11 11:43:56 +00:00
g_return_if_fail (CLUTTER_IS_TEXT (self));
g_return_if_fail (text != NULL);
priv = self->priv;
[text] Insertion of multi-byte characters broken Bug 1501 - clutter_text_insert_text not working right with non-onebyte character In clutter_text_insert_text(), the position is expressed in characters, not in bytes. Actually, it turns out to be working on bytes, so when there are already multi-byte character in the text buffer, insert text at the position after the multi-byte character will not work right. Also, the position is not updated after the insert work is done. Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-03-09 06:10:45 +00:00
pos_bytes = offset_to_bytes (priv->text, position);
Add text editing methods Port the text editing methods from ClutterEntry, so that ClutterText exposes the same API.
2008-12-11 11:43:56 +00:00
new = g_string_new (priv->text);
[text] Insertion of multi-byte characters broken Bug 1501 - clutter_text_insert_text not working right with non-onebyte character In clutter_text_insert_text(), the position is expressed in characters, not in bytes. Actually, it turns out to be working on bytes, so when there are already multi-byte character in the text buffer, insert text at the position after the multi-byte character will not work right. Also, the position is not updated after the insert work is done. Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-03-09 06:10:45 +00:00
new = g_string_insert (new, pos_bytes, text);
Add text editing methods Port the text editing methods from ClutterEntry, so that ClutterText exposes the same API.
2008-12-11 11:43:56 +00:00
Added ClutterText::insert-text and ClutterText::delete-text signals * clutter/clutter-marshal.list: added new marshaller * clutter/clutter-text.c (clutter_text_class_init): added insert-text and delete-text signals (clutter_text_insert_unichar): emits insert-text signal (clutter_text_insert_text): emits insert-text signal (clutter_text_delete_text): emits delete-text signal (clutter_text_delete_chars): emits delete-text signal (clutter_text_set_markup_internal): emits delete-text and insert-text signals (clutter_text_set_text): emits delete-text and insert-text signals http://bugzilla.openedhand.com/show_bug.cgi?id=1894
2009-11-20 14:17:41 +00:00
g_signal_emit (self, text_signals[INSERT_TEXT], 0,
text: Fixes for selection bound The commit ecbb7ce41a1a759e246fce07f146b8bed5e3d730 exposed some issues when positioning the cursor with the mouse pointer: the selection is not moved along with the cursor when inserting a single character or a string. Also, some freeze_notify() are called too early, leading to decoupling from their respective thaw_notify(). http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-02-02 17:07:22 +00:00
text,
g_utf8_strlen (text, -1),
&position);
Added ClutterText::insert-text and ClutterText::delete-text signals * clutter/clutter-marshal.list: added new marshaller * clutter/clutter-text.c (clutter_text_class_init): added insert-text and delete-text signals (clutter_text_insert_unichar): emits insert-text signal (clutter_text_insert_text): emits insert-text signal (clutter_text_delete_text): emits delete-text signal (clutter_text_delete_chars): emits delete-text signal (clutter_text_set_markup_internal): emits delete-text and insert-text signals (clutter_text_set_text): emits delete-text and insert-text signals http://bugzilla.openedhand.com/show_bug.cgi?id=1894
2009-11-20 14:17:41 +00:00
clutter_text_set_text_internal (self, new->str);
Add text editing methods Port the text editing methods from ClutterEntry, so that ClutterText exposes the same API.
2008-12-11 11:43:56 +00:00
[text] Insertion of multi-byte characters broken Bug 1501 - clutter_text_insert_text not working right with non-onebyte character In clutter_text_insert_text(), the position is expressed in characters, not in bytes. Actually, it turns out to be working on bytes, so when there are already multi-byte character in the text buffer, insert text at the position after the multi-byte character will not work right. Also, the position is not updated after the insert work is done. Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-03-09 06:10:45 +00:00
if (position >= 0 && priv->position >= position)
{
text: Fixes for selection bound The commit ecbb7ce41a1a759e246fce07f146b8bed5e3d730 exposed some issues when positioning the cursor with the mouse pointer: the selection is not moved along with the cursor when inserting a single character or a string. Also, some freeze_notify() are called too early, leading to decoupling from their respective thaw_notify(). http://bugzilla.openedhand.com/show_bug.cgi?id=1955
2010-02-02 17:07:22 +00:00
gint new_pos = priv->position + g_utf8_strlen (text, -1);
clutter_text_set_positions (self, new_pos, new_pos);
[text] Insertion of multi-byte characters broken Bug 1501 - clutter_text_insert_text not working right with non-onebyte character In clutter_text_insert_text(), the position is expressed in characters, not in bytes. Actually, it turns out to be working on bytes, so when there are already multi-byte character in the text buffer, insert text at the position after the multi-byte character will not work right. Also, the position is not updated after the insert work is done. Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-03-09 06:10:45 +00:00
}
Add text editing methods Port the text editing methods from ClutterEntry, so that ClutterText exposes the same API.
2008-12-11 11:43:56 +00:00
g_string_free (new, TRUE);
}
Add documentation annotations ClutterText is heavily under-documented. This commit ports most of the API documentation from ClutterLabel and ClutterEntry to ClutterText.
2008-12-11 12:17:11 +00:00
/**
* clutter_text_delete_text:
* @self: a #ClutterText
* @start_pos: starting position
* @end_pos: ending position
*
* Deletes the text inside a #ClutterText actor between @start_pos
* and @end_pos.
*
* The starting and ending positions are expressed in characters,
* not in bytes.
*
* Since: 1.0
*/
Add text editing methods Port the text editing methods from ClutterEntry, so that ClutterText exposes the same API.
2008-12-11 11:43:56 +00:00
void
clutter_text_delete_text (ClutterText *self,
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
gssize start_pos,
gssize end_pos)
{
ClutterTextPrivate *priv;
GString *new = NULL;
gint start_bytes;
gint end_bytes;
Add text editing methods Port the text editing methods from ClutterEntry, so that ClutterText exposes the same API.
2008-12-11 11:43:56 +00:00
g_return_if_fail (CLUTTER_IS_TEXT (self));
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
Add text editing methods Port the text editing methods from ClutterEntry, so that ClutterText exposes the same API.
2008-12-11 11:43:56 +00:00
priv = self->priv;
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
Improve the safety checks inside the text setters We should check that the contents of the Text actor are not NULL when computing the offsets in bytes.
2008-12-11 11:49:45 +00:00
if (!priv->text)
return;
[text] Fix the deletion actions When using the delete-prev action from the end of the text we end up either missing the first glyph we have to delete or falling through the last one in the text. This commit fixes both issues.
2009-01-06 20:54:20 +00:00
if (start_pos == 0)
start_bytes = 0;
else
start_bytes = offset_to_bytes (priv->text, start_pos);
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
if (end_pos == -1)
[text] Fix the deletion actions When using the delete-prev action from the end of the text we end up either missing the first glyph we have to delete or falling through the last one in the text. This commit fixes both issues.
2009-01-06 20:54:20 +00:00
end_bytes = offset_to_bytes (priv->text, priv->n_chars);
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
else
[text] Fix the deletion actions When using the delete-prev action from the end of the text we end up either missing the first glyph we have to delete or falling through the last one in the text. This commit fixes both issues.
2009-01-06 20:54:20 +00:00
end_bytes = offset_to_bytes (priv->text, end_pos);
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
Add text editing methods Port the text editing methods from ClutterEntry, so that ClutterText exposes the same API.
2008-12-11 11:43:56 +00:00
new = g_string_new (priv->text);
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
new = g_string_erase (new, start_bytes, end_bytes - start_bytes);
Added ClutterText::insert-text and ClutterText::delete-text signals * clutter/clutter-marshal.list: added new marshaller * clutter/clutter-text.c (clutter_text_class_init): added insert-text and delete-text signals (clutter_text_insert_unichar): emits insert-text signal (clutter_text_insert_text): emits insert-text signal (clutter_text_delete_text): emits delete-text signal (clutter_text_delete_chars): emits delete-text signal (clutter_text_set_markup_internal): emits delete-text and insert-text signals (clutter_text_set_text): emits delete-text and insert-text signals http://bugzilla.openedhand.com/show_bug.cgi?id=1894
2009-11-20 14:17:41 +00:00
g_signal_emit (self, text_signals[DELETE_TEXT], 0, start_pos, end_pos);
clutter_text_set_text_internal (self, new->str);
Add text editing methods Port the text editing methods from ClutterEntry, so that ClutterText exposes the same API.
2008-12-11 11:43:56 +00:00
g_string_free (new, TRUE);
}
Add documentation annotations ClutterText is heavily under-documented. This commit ports most of the API documentation from ClutterLabel and ClutterEntry to ClutterText.
2008-12-11 12:17:11 +00:00
/**
* clutter_text_delete_chars:
* @self: a #ClutterText
* @n_chars: the number of characters to delete
*
* Deletes @n_chars inside a #ClutterText actor, starting from the
* current cursor position.
*
* Since: 1.0
*/
Add text editing methods Port the text editing methods from ClutterEntry, so that ClutterText exposes the same API.
2008-12-11 11:43:56 +00:00
void
clutter_text_delete_chars (ClutterText *self,
guint n_chars)
{
ClutterTextPrivate *priv;
GString *new = NULL;
gint pos;
gint num_pos;
Added ClutterText::insert-text and ClutterText::delete-text signals * clutter/clutter-marshal.list: added new marshaller * clutter/clutter-text.c (clutter_text_class_init): added insert-text and delete-text signals (clutter_text_insert_unichar): emits insert-text signal (clutter_text_insert_text): emits insert-text signal (clutter_text_delete_text): emits delete-text signal (clutter_text_delete_chars): emits delete-text signal (clutter_text_set_markup_internal): emits delete-text and insert-text signals (clutter_text_set_text): emits delete-text and insert-text signals http://bugzilla.openedhand.com/show_bug.cgi?id=1894
2009-11-20 14:17:41 +00:00
gint start_pos;
Add text editing methods Port the text editing methods from ClutterEntry, so that ClutterText exposes the same API.
2008-12-11 11:43:56 +00:00
g_return_if_fail (CLUTTER_IS_TEXT (self));
priv = self->priv;
if (!priv->text)
return;
new = g_string_new (priv->text);
if (priv->position == -1)
{
Use the stored contents length in ::delete_chars() Instead of recomputing it, we can reuse the contents length we compute and store inside clutter_text_set_text().
2008-12-11 11:50:02 +00:00
num_pos = offset_to_bytes (priv->text, priv->n_chars - n_chars);
Add text editing methods Port the text editing methods from ClutterEntry, so that ClutterText exposes the same API.
2008-12-11 11:43:56 +00:00
new = g_string_erase (new, num_pos, -1);
}
else
{
pos = offset_to_bytes (priv->text, priv->position - n_chars);
num_pos = offset_to_bytes (priv->text, priv->position);
new = g_string_erase (new, pos, num_pos - pos);
}
Added ClutterText::insert-text and ClutterText::delete-text signals * clutter/clutter-marshal.list: added new marshaller * clutter/clutter-text.c (clutter_text_class_init): added insert-text and delete-text signals (clutter_text_insert_unichar): emits insert-text signal (clutter_text_insert_text): emits insert-text signal (clutter_text_delete_text): emits delete-text signal (clutter_text_delete_chars): emits delete-text signal (clutter_text_set_markup_internal): emits delete-text and insert-text signals (clutter_text_set_text): emits delete-text and insert-text signals http://bugzilla.openedhand.com/show_bug.cgi?id=1894
2009-11-20 14:17:41 +00:00
start_pos = clutter_text_get_cursor_position (self);
g_signal_emit (self, text_signals[DELETE_TEXT], 0,
start_pos, start_pos + n_chars);
clutter_text_set_text_internal (self, new->str);
Add text editing methods Port the text editing methods from ClutterEntry, so that ClutterText exposes the same API.
2008-12-11 11:43:56 +00:00
if (priv->position > 0)
clutter_text_set_cursor_position (self, priv->position - n_chars);
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
g_string_free (new, TRUE);
Add text editing methods Port the text editing methods from ClutterEntry, so that ClutterText exposes the same API.
2008-12-11 11:43:56 +00:00
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_TEXT]);
Merge the ClutterLabel properties into ClutterText ClutterText should have the same properties as ClutterLabel. While at it, we can finally fix the disconnect between the wrap and wrap-mode properties and its accessors, that we perpetuated from GtkLabel. The ClutterText:line-wrap property and ClutterText:line-wrap-mode are mapped to the set_line_wrap(), get_line_wrap() and set_line_wrap_mode(), get_line_wrap_mode() accessor functions respectively. This should simplify bindings the Vala ones that map a property into a method.
2008-12-11 11:33:10 +00:00
}
Add Text::get_chars() implementation and tests The clutter_text_get_chars() function returns a section of the contents of the Text actor, delimited by a start and an end position. This commit adds the implementation for that function and a test unit that guarantees the offset-to-bytes computations are correct.
2008-12-11 11:59:50 +00:00
/**
* clutter_text_get_chars:
Add documentation annotations ClutterText is heavily under-documented. This commit ports most of the API documentation from ClutterLabel and ClutterEntry to ClutterText.
2008-12-11 12:17:11 +00:00
* @self: a #ClutterText
Add Text::get_chars() implementation and tests The clutter_text_get_chars() function returns a section of the contents of the Text actor, delimited by a start and an end position. This commit adds the implementation for that function and a test unit that guarantees the offset-to-bytes computations are correct.
2008-12-11 11:59:50 +00:00
* @start_pos: start of text, in characters
* @end_pos: end of text, in characters
*
* Retrieves the contents of the #ClutterText actor between
Improve clutter_text_get_chars doc Explicitly explain that end_pos is not included with the resulting string http://bugzilla.clutter-project.org/show_bug.cgi?id=2081
2010-04-14 16:07:21 +00:00
* @start_pos and @end_pos, but not including @end_pos.
Add Text::get_chars() implementation and tests The clutter_text_get_chars() function returns a section of the contents of the Text actor, delimited by a start and an end position. This commit adds the implementation for that function and a test unit that guarantees the offset-to-bytes computations are correct.
2008-12-11 11:59:50 +00:00
*
* The positions are specified in characters, not in bytes.
*
* Return value: a newly allocated string with the contents of
* the text actor between the specified positions. Use g_free()
* to free the resources when done
*
* Since: 1.0
*/
Add text editing methods Port the text editing methods from ClutterEntry, so that ClutterText exposes the same API.
2008-12-11 11:43:56 +00:00
gchar *
clutter_text_get_chars (ClutterText *self,
gssize start_pos,
gssize end_pos)
{
Add Text::get_chars() implementation and tests The clutter_text_get_chars() function returns a section of the contents of the Text actor, delimited by a start and an end position. This commit adds the implementation for that function and a test unit that guarantees the offset-to-bytes computations are correct.
2008-12-11 11:59:50 +00:00
ClutterTextPrivate *priv;
gint start_index, end_index;
Add text editing methods Port the text editing methods from ClutterEntry, so that ClutterText exposes the same API.
2008-12-11 11:43:56 +00:00
g_return_val_if_fail (CLUTTER_IS_TEXT (self), NULL);
Add Text::get_chars() implementation and tests The clutter_text_get_chars() function returns a section of the contents of the Text actor, delimited by a start and an end position. This commit adds the implementation for that function and a test unit that guarantees the offset-to-bytes computations are correct.
2008-12-11 11:59:50 +00:00
priv = self->priv;
if (end_pos < 0)
end_pos = priv->n_chars;
start_pos = MIN (priv->n_chars, start_pos);
end_pos = MIN (priv->n_chars, end_pos);
start_index = g_utf8_offset_to_pointer (priv->text, start_pos)
- priv->text;
end_index = g_utf8_offset_to_pointer (priv->text, end_pos)
- priv->text;
return g_strndup (priv->text + start_index, end_index - start_index);
Add text editing methods Port the text editing methods from ClutterEntry, so that ClutterText exposes the same API.
2008-12-11 11:43:56 +00:00
}
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
/**
* clutter_text_set_single_line_mode:
* @self: a #ClutterText
* @single_line: whether to enable single line mode
*
* Sets whether a #ClutterText actor should be in single line mode
docs: Clarify the scope of Text:single-line-mode Only editable text actors can be in single-line mode.
2010-06-14 13:05:49 +00:00
* or not. Only editable #ClutterText<!-- -->s can be in single line
* mode.
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
*
* A text actor in single line mode will not wrap text and will clip
Fixed "the the" repetitions in some doc strings http://bugzilla.clutter-project.org/show_bug.cgi?id=2450
2010-11-25 18:13:51 +00:00
* the visible area to the predefined size. The contents of the
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
* text actor will scroll to display the end of the text if its length
* is bigger than the allocated width.
*
* When setting the single line mode the #ClutterText:activatable
* property is also set as a side effect. Instead of entering a new
* line character, the text actor will emit the #ClutterText::activate
* signal.
*
* Since: 1.0
*/
void
clutter_text_set_single_line_mode (ClutterText *self,
gboolean single_line)
{
ClutterTextPrivate *priv;
g_return_if_fail (CLUTTER_IS_TEXT (self));
priv = self->priv;
if (priv->single_line_mode != single_line)
{
g_object_freeze_notify (G_OBJECT (self));
priv->single_line_mode = single_line;
if (priv->single_line_mode)
{
priv->activatable = TRUE;
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ACTIVATABLE]);
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
}
clutter_text_dirty_cache (self);
clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596
2011-03-03 11:35:46 +00:00
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SINGLE_LINE_MODE]);
[text] Add single-line-mode to ClutterText Allow using ClutterText as a single line text field. This is useful for text fields that accept just a single line of contents by default, and respond to the Enter key press to execute some action. The :single-line-mode property enables this behaviour inside ClutterText by clipping and scrolling the contents of the PangoLayout if they do not fit the allocated width of the Text actor.
2009-01-07 00:25:24 +00:00
g_object_thaw_notify (G_OBJECT (self));
}
}
/**
* clutter_text_get_single_line_mode:
* @self: a #ClutterText
*
* Retrieves whether the #ClutterText actor is in single line mode.
*
* Return value: %TRUE if the #ClutterText actor is in single line mode
*
* Since: 1.0
*/
gboolean
clutter_text_get_single_line_mode (ClutterText *self)
{
g_return_val_if_fail (CLUTTER_IS_TEXT (self), FALSE);
return self->priv->single_line_mode;
}
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
/**
* clutter_text_set_preedit_string:
* @self: a #ClutterText
* @preedit_str: (allow-none): the pre-edit string, or %NULL to unset it
* @preedit_attrs: (allow-none): the pre-edit string attributes
* @cursor_pos: the cursor position for the pre-edit string
*
* Sets, or unsets, the pre-edit string. This function is useful
* for input methods to display a string (with eventual specific
* Pango attributes) before it is entered inside the #ClutterText
* buffer.
*
* The preedit string and attributes are ignored if the #ClutterText
* actor is not editable.
*
* This function should not be used by applications
*
* Since: 1.2
*/
void
clutter_text_set_preedit_string (ClutterText *self,
const gchar *preedit_str,
PangoAttrList *preedit_attrs,
guint cursor_pos)
{
ClutterTextPrivate *priv;
g_return_if_fail (CLUTTER_IS_TEXT (self));
priv = self->priv;
g_free (priv->preedit_str);
[text] NULL-ify strings to avoid double-frees
2009-09-19 08:19:06 +00:00
priv->preedit_str = NULL;
[text] Add pre-edit string to ClutterText Input Methods require to be able to set a "pre-edit string", that is a string that it's just displayed into the Text actor without being committed to the actor's buffer. The string might require custom Pango attributes, and an update of the cursor position.
2009-09-09 11:15:23 +00:00
if (priv->preedit_attrs != NULL)
{
pango_attr_list_unref (priv->preedit_attrs);
priv->preedit_attrs = NULL;
}
priv->preedit_n_chars = 0;
priv->preedit_cursor_pos = 0;
if (preedit_str == NULL || *preedit_str == '\0')
priv->preedit_set = FALSE;
else
{
priv->preedit_str = g_strdup (preedit_str);
if (priv->preedit_str != NULL)
priv->preedit_n_chars = g_utf8_strlen (priv->preedit_str, -1);
else
priv->preedit_n_chars = 0;
if (preedit_attrs != NULL)
priv->preedit_attrs = pango_attr_list_ref (preedit_attrs);
priv->preedit_cursor_pos =
CLAMP (cursor_pos, 0, priv->preedit_n_chars);
priv->preedit_set = TRUE;
}
clutter_text_dirty_cache (self);
clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
}
clutter-text: new clutter_text_get_layout_offsets API This new function can be used to retrieve the coordinates where the ClutterText will draw the PangoLayout representing the text. http://bugzilla.clutter-project.org/show_bug.cgi?id=2553
2011-02-04 11:33:53 +00:00
/**
* clutter_text_get_layout_offsets:
* @self: a #ClutterText
* @x: (out): location to store X offset of layout, or %NULL
* @y: (out): location to store Y offset of layout, or %NULL
*
* Obtains the coordinates where the #ClutterText will draw the #PangoLayout
* representing the text.
*
* Since: 1.7
**/
void
clutter_text_get_layout_offsets (ClutterText *self,
gint *x,
gint *y)
{
ClutterTextPrivate *priv;
g_return_if_fail (CLUTTER_IS_TEXT (self));
priv = self->priv;
if (x != NULL)
*x = priv->text_x;
if (y != NULL)
*y = priv->text_y;
}
Reference in New Issue Copy Permalink