brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

text: Clear up priv->text checks

Browse Source 
The priv->text field cannot ever be NULL, so we don't need to check for
that in a series of places. We also need to assert() that pre-condition
in the couple of places where we set the contents of the ClutterText
actor, namely in set_text_internal() and set_markup_internal().

Based on a patch by: Dan Winship <danw@gnome.org>

http://bugzilla.clutter-project.org/show_bug.cgi?id=2629
This commit is contained in:
Emmanuele Bassi 2011-09-07 13:28:15 +01:00
parent 320bdeac03
commit 0c22246bea
1 changed files with 45 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
clutter/clutter-text.c
View File

@ -337,10 +337,13 @@ clutter_text_get_display_text (ClutterText *self)
{ {
ClutterTextPrivate *priv = self->priv; ClutterTextPrivate *priv = self->priv;
if (priv->text == NULL) /* simple short-circuit to avoid going through GString
* with an empty text and a password char set
*/
if (priv->text[0] == '\0')
return g_strdup (""); return g_strdup ("");
if (G_LIKELY (priv->password_char == 0)) if (priv->password_char == 0)
return g_strndup (priv->text, priv->n_bytes); return g_strndup (priv->text, priv->n_bytes);
else else
{ {
@ -546,7 +549,7 @@ clutter_text_set_font_description_internal (ClutterText *self,
clutter_text_dirty_cache (self); clutter_text_dirty_cache (self);
if (priv->text && priv->text[0] != '\0') if (priv->text[0] != '\0')
clutter_actor_queue_relayout (CLUTTER_ACTOR (self)); clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_FONT_DESCRIPTION]); g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_FONT_DESCRIPTION]);
@ -981,7 +984,7 @@ clutter_text_delete_selection (ClutterText *self)
priv = self->priv; priv = self->priv;
if (!priv->text) if (priv->text[0] == '\0')
return TRUE; return TRUE;
start_index = offset_real (priv->text, priv->position); start_index = offset_real (priv->text, priv->position);
@ -1050,8 +1053,16 @@ clutter_text_set_text_internal (ClutterText *self,
{ {
ClutterTextPrivate *priv = self->priv; ClutterTextPrivate *priv = self->priv;
g_assert (text != NULL);
g_signal_emit (self, text_signals[DELETE_TEXT], 0, 0, -1); g_signal_emit (self, text_signals[DELETE_TEXT], 0, 0, -1);
if (text != NULL && *text != '\0')
/* emit ::insert-text only if we have text to insert; we need
* to emit this before actually changing the contents of the
* actor so that people connected to this signal will be able
* to intercept it
*/
if (text[0] != '\0')
{ {
gint tmp_pos = 0; gint tmp_pos = 0;
@ -1121,40 +1132,34 @@ clutter_text_set_markup_internal (ClutterText *self,
PangoAttrList *attrs = NULL; PangoAttrList *attrs = NULL;
gboolean res; gboolean res;
g_assert (str != NULL);
error = NULL; error = NULL;
res = pango_parse_markup (str, -1, 0, res = pango_parse_markup (str, -1, 0,
&attrs, &attrs,
&text, &text,
NULL, NULL,
&error); &error);
if (!res) if (!res)
{ {
if (G_LIKELY (error)) if (G_LIKELY (error != NULL))
{ {
g_warning ("Failed to set the markup of the actor of class '%s': %s", g_warning ("Failed to set the markup of the actor '%s': %s",
G_OBJECT_TYPE_NAME (self), _clutter_actor_get_debug_name (CLUTTER_ACTOR (self)),
error->message); error->message);
g_error_free (error); g_error_free (error);
} }
else else
g_warning ("Failed to set the markup of the actor of class '%s'", g_warning ("Failed to set the markup of the actor '%s'",
G_OBJECT_TYPE_NAME (self)); _clutter_actor_get_debug_name (CLUTTER_ACTOR (self)));
return; return;
} }
if (text) clutter_text_set_text_internal (self, text ? text : "");
{
gint tmp_pos = 0;
g_signal_emit (self, text_signals[DELETE_TEXT], 0, 0, -1); g_free (text);
g_signal_emit (self, text_signals[INSERT_TEXT], 0, text,
strlen (text), &tmp_pos);
clutter_text_set_text_internal (self, text);
g_free (text);
}
/* Store the new markup attributes */ /* Store the new markup attributes */
if (priv->markup_attrs != NULL) if (priv->markup_attrs != NULL)
@ -1659,10 +1664,9 @@ static gint
clutter_text_move_word_backward (ClutterText *self, clutter_text_move_word_backward (ClutterText *self,
gint start) gint start)
{ {
ClutterTextPrivate *priv = self->priv;
gint retval = start; gint retval = start;
if (priv->text && start > 0) if (start > 0)
{ {
PangoLayout *layout = clutter_text_get_layout (self); PangoLayout *layout = clutter_text_get_layout (self);
PangoLogAttr *log_attrs = NULL; PangoLogAttr *log_attrs = NULL;
@ -1687,7 +1691,7 @@ clutter_text_move_word_forward (ClutterText *self,
ClutterTextPrivate *priv = self->priv; ClutterTextPrivate *priv = self->priv;
gint retval = start; gint retval = start;
if (priv->text && start < priv->n_chars) if (start < priv->n_chars)
{ {
PangoLayout *layout = clutter_text_get_layout (self); PangoLayout *layout = clutter_text_get_layout (self);
PangoLogAttr *log_attrs = NULL; PangoLogAttr *log_attrs = NULL;
@ -1824,7 +1828,7 @@ clutter_text_button_press (ClutterActor *actor,
* set up the dragging of the selection since there's nothing * set up the dragging of the selection since there's nothing
* to select * to select
*/ */
if (priv->text == NULL || priv->text[0] == '\0') if (priv->text[0] == '\0')
{ {
clutter_text_set_positions (self, -1, -1); clutter_text_set_positions (self, -1, -1);
@ -2000,14 +2004,17 @@ clutter_text_paint (ClutterActor *self)
reflected in the get_paint_volume implementation which is tightly reflected in the get_paint_volume implementation which is tightly
tied to the workings of this function */ tied to the workings of this function */
if (G_UNLIKELY (priv->font_desc == NULL || priv->text == NULL)) if (G_UNLIKELY (priv->font_desc == NULL))
{ {
CLUTTER_NOTE (ACTOR, "desc: %p, text %p", CLUTTER_NOTE (ACTOR, "No font description for '%s'",
priv->font_desc ? priv->font_desc : 0x0, _clutter_actor_get_debug_name (self));
priv->text ? priv->text : 0x0);
return; return;
} }
/* don't bother painting an empty text actor */
if (priv->text[0] == '\0')
return;
clutter_actor_get_allocation_box (self, &alloc); clutter_actor_get_allocation_box (self, &alloc);
if (priv->editable && priv->single_line_mode) if (priv->editable && priv->single_line_mode)
@ -4428,9 +4435,12 @@ out:
* *
* Which will return a newly allocated string. * Which will return a newly allocated string.
* *
* Return value: the contents of the actor. The returned string * If the #ClutterText actor is empty, this function will return
* is owned by the #ClutterText actor and should never be * an empty string, and not %NULL.
* modified or freed *
* Return value: (transfer none): the contents of the actor. The returned
* string is owned by the #ClutterText actor and should never be modified
* or freed
* *
* Since: 1.0 * Since: 1.0
*/ */
@ -5252,11 +5262,7 @@ clutter_text_insert_unichar (ClutterText *self,
new = g_string_new (priv->text); new = g_string_new (priv->text);
if (priv->text) pos = offset_to_bytes (priv->text, priv->position);
pos = offset_to_bytes (priv->text, priv->position);
else
pos = 0;
new = g_string_insert_unichar (new, pos, wc); new = g_string_insert_unichar (new, pos, wc);
g_signal_emit (self, text_signals[INSERT_TEXT], 0, &wc, 1, &pos); g_signal_emit (self, text_signals[INSERT_TEXT], 0, &wc, 1, &pos);
@ -5350,7 +5356,7 @@ clutter_text_delete_text (ClutterText *self,
priv = self->priv; priv = self->priv;
if (!priv->text) if (priv->text[0] == '\0')
return; return;
if (start_pos == 0) if (start_pos == 0)
@ -5397,7 +5403,7 @@ clutter_text_delete_chars (ClutterText *self,
priv = self->priv; priv = self->priv;
if (!priv->text) if (priv->text[0] == '\0')
return; return;
new = g_string_new (priv->text); new = g_string_new (priv->text);