anjuta r3492 - in trunk: . plugins/editor

[naba svn gnome org]

Author: naba
Date: Sat Jan 19 10:14:13 2008
New Revision: 3492
URL: http://svn.gnome.org/viewvc/anjuta?rev=3492&view=rev

Log:
	* plugins/editor/text-editor-iterable.c: (iiter_next),
	(iiter_set_position), (iiter_get_position), (iiter_get_length): Use
	editor native funtions to avoid round trips.


Modified:
   trunk/ChangeLog
   trunk/plugins/editor/text-editor-iterable.c

Modified: trunk/plugins/editor/text-editor-iterable.c
==============================================================================
--- trunk/plugins/editor/text-editor-iterable.c	(original)
+++ trunk/plugins/editor/text-editor-iterable.c	Sat Jan 19 10:14:13 2008
@@ -492,11 +492,8 @@
 iiter_next (IAnjutaIterable* iter, GError** e)
 {
 	TextEditorCell* cell = TEXT_EDITOR_CELL(iter);
-	gint length;
 	gint old_position;
 	
-	length = ianjuta_editor_get_length (IANJUTA_EDITOR (cell->priv->editor),
-										NULL);
 	old_position = cell->priv->position;
 	cell->priv->position = scintilla_send_message (SCINTILLA (cell->priv->editor->scintilla),
 												   SCI_POSITIONAFTER, old_position,
@@ -562,68 +559,68 @@
 static gboolean
 iiter_set_position (IAnjutaIterable* iter, gint position, GError** e)
 {
-	gint i, saved_position;
-	gboolean out_of_range = FALSE;
-	
+	gint i;
+	gint old_byte_position, new_byte_position;
 	TextEditorCell* cell = TEXT_EDITOR_CELL(iter);
 	
-	/* FIXME: Find more optimal solution */
-	saved_position = cell->priv->position;
-	
-	cell->priv->position = 0;
+	if (position < 0)
+		return FALSE;
 	
-	/* Iterate untill the we reach given position */
+	/* FIXME: Find more optimal solution */
+	/* Iterate untill the we reach given character position */
+	old_byte_position = 0;
 	for (i = 0; i < position; i++)
 	{
-		if (!ianjuta_iterable_next (iter, NULL))
+		new_byte_position =
+			scintilla_send_message (SCINTILLA (cell->priv->editor->scintilla),
+									SCI_POSITIONAFTER, old_byte_position, 0);	
+		if (old_byte_position == new_byte_position)
 		{
-			out_of_range = TRUE;
-			break;
+			/* Out of range. Don't set anything */
+			return FALSE;
 		}
 	}
-	
-	if (out_of_range)
-	{
-		/* out of range. Restore previous position */
-		cell->priv->position = saved_position;
-		return FALSE;
-	}
+	cell->priv->position = new_byte_position;
 	return TRUE;
 }
 
 static gint
-iiter_get_position(IAnjutaIterable* iter, GError** e)
+iiter_get_position (IAnjutaIterable* iter, GError** e)
 {
-	gchar *text;
 	gint char_position = 0;
 	
 	TextEditorCell* cell = TEXT_EDITOR_CELL(iter);
 	
+	/* FIXME: Find a more optimal solution */
 	if (cell->priv->position > 0)
 	{
-		/* FIXME: Find a more optimal solution */
-		text = ianjuta_editor_get_text (IANJUTA_EDITOR (cell->priv->editor), 0,
-										cell->priv->position,
-										NULL);
-		char_position = g_utf8_strlen (text, -1);
-		g_free (text);
+		gchar *data =
+			(gchar *) aneditor_command (TEXT_EDITOR
+										(cell->priv->editor)->editor_id,
+										ANE_GETTEXTRANGE, 0,
+										cell->priv->position);
+		char_position = g_utf8_strlen (data, -1);
+		g_free (data);
 	}
 	return char_position;
 }
 
 static gint
-iiter_get_length(IAnjutaIterable* iter, GError** e)
+iiter_get_length (IAnjutaIterable* iter, GError** e)
 {
-	gchar *text;
+	gchar *data;
 	gint length;
 	
 	TextEditorCell* cell = TEXT_EDITOR_CELL(iter);
 	
 	/* FIXME: Find a more optimal solution */
-	text = ianjuta_editor_get_text (IANJUTA_EDITOR (cell->priv->editor), 0, -1,
-									NULL);
-	length = g_utf8_strlen (text, -1);
-	g_free (text);
+	data =
+		(gchar *) aneditor_command (TEXT_EDITOR
+									(cell->priv->editor)->editor_id,
+									ANE_GETTEXTRANGE, 0,
+									-1);
+	length = g_utf8_strlen (data, -1);
+	g_free (data);
 	return length;
 }