* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
/* FIXME: We should use other error codes for the
* parts that deal with the format errors
*/
-#include <config.h>
+#include "config.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
+#include <errno.h>
#include "gdk-pixbuf/gdk-pixdata.h"
#include "gtktextbufferserialize.h"
-
+#include "gtktexttagprivate.h"
#include "gtkintl.h"
{
if (g_value_type_transformable (value->g_type, G_TYPE_STRING))
{
- GValue text_value = { 0 };
+ GValue text_value = G_VALUE_INIT;
gchar *tmp;
g_value_init (&text_value, G_TYPE_STRING);
return g_strdup_printf ("%x:%x:%x", color->red, color->green, color->blue);
}
- else if (g_type_is_a (value->g_type, GDK_TYPE_DRAWABLE))
- {
- /* Don't do anything */
- }
else
{
g_warning ("Type %s is not serializable\n", g_type_name (value->g_type));
{
if (g_value_type_transformable (G_TYPE_STRING, value->g_type))
{
- GValue text_value = { 0 };
+ GValue text_value = G_VALUE_INIT;
gboolean retval;
g_value_init (&text_value, G_TYPE_STRING);
gchar *tmp;
int v;
- v = strtol (str, &tmp, 10);
+ errno = 0;
+ v = g_ascii_strtoll (str, &tmp, 10);
- if (tmp == NULL || tmp == str)
+ if (errno || tmp == NULL || tmp == str)
return FALSE;
g_value_set_int (value, v);
gchar *tmp;
old = str;
- color.red = strtol (old, &tmp, 16);
+ tmp = NULL;
+ errno = 0;
+ color.red = g_ascii_strtoll (old, &tmp, 16);
- if (tmp == NULL || tmp == old)
+ if (errno || tmp == old)
return FALSE;
old = tmp;
if (*old++ != ':')
return FALSE;
- color.green = strtol (old, &tmp, 16);
- if (tmp == NULL || tmp == old)
+ tmp = NULL;
+ errno = 0;
+ color.green = g_ascii_strtoll (old, &tmp, 16);
+ if (errno || tmp == old)
return FALSE;
old = tmp;
if (*old++ != ':')
return FALSE;
- color.blue = strtol (old, &tmp, 16);
+ tmp = NULL;
+ errno = 0;
+ color.blue = g_ascii_strtoll (old, &tmp, 16);
- if (tmp == NULL || tmp == old || *tmp != '\0')
+ if (errno || tmp == old || *tmp != '\0')
return FALSE;
g_value_set_boxed (value, &color);
g_string_append (context->tag_table_str, " <tag ");
/* Handle anonymous tags */
- if (tag->name)
+ if (tag->priv->name)
{
- tag_name = g_markup_escape_text (tag->name, -1);
+ tag_name = g_markup_escape_text (tag->priv->name, -1);
g_string_append_printf (context->tag_table_str, "name=\"%s\"", tag_name);
g_free (tag_name);
}
g_string_append_printf (context->tag_table_str, "id=\"%d\"", tag_id);
}
- g_string_append_printf (context->tag_table_str, " priority=\"%d\">\n", tag->priority);
+ g_string_append_printf (context->tag_table_str, " priority=\"%d\">\n", tag->priv->priority);
/* Serialize properties */
pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (tag), &n_pspecs);
for (i = 0; i < n_pspecs; i++)
{
- GValue value = { 0 };
+ GValue value = G_VALUE_INIT;
gchar *tmp, *tmp2;
if (!(pspecs[i]->flags & G_PARAM_READABLE) ||
{
GtkTextIter iter, old_iter;
GSList *tag_list, *new_tag_list;
- GQueue *active_tags;
- int i;
+ GSList *active_tags;
g_string_append (context->text_str, "<text>");
iter = context->start;
tag_list = NULL;
- active_tags = g_queue_new ();
+ active_tags = NULL;
do
{
find_list_delta (tag_list, new_tag_list, &added, &removed);
/* Handle removed tags */
- tmp = removed;
- while (tmp)
+ for (tmp = removed; tmp; tmp = tmp->next)
{
GtkTextTag *tag = tmp->data;
- g_string_append (context->text_str, "</apply_tag>");
-
- /* We might need to drop some of the tags and re-add them afterwards */
- while (g_queue_peek_head (active_tags) != tag &&
- !g_queue_is_empty (active_tags))
- {
- added = g_list_prepend (added, g_queue_pop_head (active_tags));
- g_string_append_printf (context->text_str, "</apply_tag>");
- }
+ /* Only close the tag if we didn't close it before (by using
+ * the stack logic in the while() loop below)
+ */
+ if (g_slist_find (active_tags, tag))
+ {
+ g_string_append (context->text_str, "</apply_tag>");
- g_queue_pop_head (active_tags);
+ /* Drop all tags that were opened after this one (which are
+ * above this on in the stack)
+ */
+ while (active_tags->data != tag)
+ {
+ added = g_list_prepend (added, active_tags->data);
+ active_tags = g_slist_remove (active_tags, active_tags->data);
+ g_string_append_printf (context->text_str, "</apply_tag>");
+ }
- tmp = tmp->next;
+ active_tags = g_slist_remove (active_tags, active_tags->data);
+ }
}
/* Handle added tags */
- tmp = added;
- while (tmp)
+ for (tmp = added; tmp; tmp = tmp->next)
{
GtkTextTag *tag = tmp->data;
gchar *tag_name;
/* Add it to the tag hash table */
g_hash_table_insert (context->tags, tag, tag);
- if (tag->name)
+ if (tag->priv->name)
{
- tag_name = g_markup_escape_text (tag->name, -1);
+ tag_name = g_markup_escape_text (tag->priv->name, -1);
g_string_append_printf (context->text_str, "<apply_tag name=\"%s\">", tag_name);
g_free (tag_name);
g_string_append_printf (context->text_str, "<apply_tag id=\"%d\">", GPOINTER_TO_INT (tag_id));
}
- g_queue_push_head (active_tags, tag);
- tmp = tmp->next;
+ active_tags = g_slist_prepend (active_tags, tag);
}
g_slist_free (tag_list);
tag_list = new_tag_list;
+ g_list_free (added);
+ g_list_free (removed);
+
old_iter = iter;
/* Now try to go to either the next tag toggle, or if a pixbuf appears */
while (!gtk_text_iter_equal (&iter, &context->end));
/* Close any open tags */
- for (i = 0; i < g_queue_get_length (active_tags); i++) {
+ for (tag_list = active_tags; tag_list; tag_list = tag_list->next)
g_string_append (context->text_str, "</apply_tag>");
- }
- g_queue_free (active_tags);
+
+ g_slist_free (active_tags);
g_string_append (context->text_str, "</text>\n</text_view_markup>\n");
}
has_id = TRUE;
/* Try parsing the integer */
- *id = strtol (attribute_values[i], &tmp, 10);
+ tmp = NULL;
+ errno = 0;
+ *id = g_ascii_strtoll (attribute_values[i], &tmp, 10);
- if (tmp == NULL || tmp == attribute_values[i])
+ if (errno || tmp == attribute_values[i])
{
set_error (error, context,
G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("<%s> element has invalid id \"%s\""), attribute_values[i]);
+ _("<%s> element has invalid ID \"%s\""), attribute_values[i]);
return FALSE;
}
}
{
set_error (error, context,
G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("<%s> element has neither a \"name\" nor an \"id\" element"), element_name);
+ _("<%s> element has neither a \"name\" nor an \"id\" attribute"), element_name);
return FALSE;
}
ParseInfo *info,
GError **error)
{
+ GtkTextTagTable *tag_table;
const gchar *real_name;
+ tag_table = gtk_text_buffer_get_tag_table (info->buffer);
+
if (info->create_tags)
{
/* If we have an anonymous tag, just return it directly */
real_name = g_hash_table_lookup (info->substitutions, name);
if (real_name)
- return gtk_text_tag_table_lookup (info->buffer->tag_table, real_name);
+ return gtk_text_tag_table_lookup (tag_table, real_name);
/* Next, try the list of defined tags */
if (g_hash_table_lookup (info->defined_tags, name) != NULL)
- return gtk_text_tag_table_lookup (info->buffer->tag_table, name);
+ return gtk_text_tag_table_lookup (tag_table, name);
set_error (error, context,
G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
return NULL;
}
- tag = gtk_text_tag_table_lookup (info->buffer->tag_table, name);
+ tag = gtk_text_tag_table_lookup (tag_table, name);
if (tag)
return tag;
{
const gchar *name, *type, *value;
GType gtype;
- GValue gvalue = { 0 };
+ GValue gvalue = G_VALUE_INIT;
GParamSpec *pspec;
g_assert (peek_state (info) == STATE_TAG);
get_tag_name (ParseInfo *info,
const gchar *tag_name)
{
+ GtkTextTagTable *tag_table;
gchar *name;
gint i;
return name;
i = 0;
+ tag_table = gtk_text_buffer_get_tag_table (info->buffer);
- while (gtk_text_tag_table_lookup (info->buffer->tag_table, name) != NULL)
+ while (gtk_text_tag_table_lookup (tag_table, name) != NULL)
{
g_free (name);
name = g_strdup_printf ("%s-%d", tag_name, ++i);
}
}
- prio = strtol (priority, &tmp, 10);
+ tmp = NULL;
+ errno = 0;
+ prio = g_ascii_strtoll (priority, &tmp, 10);
- if (tmp == NULL || tmp == priority)
+ if (errno || tmp == priority)
{
set_error (error, context,
G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
TextTagPrio *prio = list->data;
if (info->create_tags)
- gtk_text_tag_table_add (info->buffer->tag_table, prio->tag);
+ gtk_text_tag_table_add (gtk_text_buffer_get_tag_table (info->buffer),
+ prio->tag);
g_object_unref (prio->tag);
prio->tag = NULL;
pop_state (info);
g_assert (peek_state (info) == STATE_TAGS);
- if (info->current_tag->name)
+ if (info->current_tag->priv->name)
{
/* Add tag to defined tags hash */
- tmp = g_strdup (info->current_tag->name);
+ tmp = g_strdup (info->current_tag->priv->name);
g_hash_table_insert (info->defined_tags,
tmp, tmp);
}
static void
parse_info_free (ParseInfo *info)
{
- GSList *slist;
GList *list;
- slist = info->tag_stack;
- while (slist)
- {
- g_free (slist->data);
-
- slist = slist->next;
- }
-
g_slist_free (info->tag_stack);
g_slist_free (info->states);
return g_list_reverse (headers);
error:
- g_list_foreach (headers, (GFunc) g_free, NULL);
- g_list_free (headers);
+ g_list_free_full (headers, g_free);
- g_set_error (error,
- G_MARKUP_ERROR,
- G_MARKUP_ERROR_PARSE,
- _("Serialized data is malformed"));
+ g_set_error_literal (error,
+ G_MARKUP_ERROR,
+ G_MARKUP_ERROR_PARSE,
+ _("Serialized data is malformed"));
return NULL;
}
header = headers->data;
if (!header_is (header, "GTKTEXTBUFFERCONTENTS-0001"))
{
- g_set_error (error,
- G_MARKUP_ERROR,
- G_MARKUP_ERROR_PARSE,
- _("Serialized data is malformed. First section isn't GTKTEXTBUFFERCONTENTS-0001"));
+ g_set_error_literal (error,
+ G_MARKUP_ERROR,
+ G_MARKUP_ERROR_PARSE,
+ _("Serialized data is malformed. First section isn't GTKTEXTBUFFERCONTENTS-0001"));
retval = FALSE;
goto out;
create_tags, error, headers->next);
out:
- g_list_foreach (headers, (GFunc)g_free, NULL);
- g_list_free (headers);
+ g_list_free_full (headers, g_free);
return retval;
}
projects / ~andy / gtk / blobdiff