Fix bug in determining when we cross line boundaries. (#103421, Matthias

Thu Jun  5 14:53:40 2003  Owen Taylor  <otaylor@redhat.com>

        * pango/pango-layout.c (pango_layout_move_cursor_visually):
        Fix bug in determining when we cross line boundaries.
        (#103421, Matthias Clasen)

6 files changed, 69 insertions, 34 deletions

diff --git a/ChangeLog b/ChangeLog
index f331575a..e796c7d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,14 @@
+Thu Jun  5 14:53:40 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_move_cursor_visually):
+	Fix bug in determining when we cross line boundaries.
+	(#103421, Matthias Clasen)
+
 Wed Jun  4 14:32:47 2003  Owen Taylor  <otaylor@redhat.com>
  
  	* pango/glyphstring.c (pango_glyph_string_extents_range): 
  	Improve handling of empty ink rectangles; rework for
- 	simplicity.
+ 	simplicity. (#103662)
 	
 Mon Jun  2 12:10:11 2003  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index f331575a..e796c7d2 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,8 +1,14 @@
+Thu Jun  5 14:53:40 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_move_cursor_visually):
+	Fix bug in determining when we cross line boundaries.
+	(#103421, Matthias Clasen)
+
 Wed Jun  4 14:32:47 2003  Owen Taylor  <otaylor@redhat.com>
  
  	* pango/glyphstring.c (pango_glyph_string_extents_range): 
  	Improve handling of empty ink rectangles; rework for
- 	simplicity.
+ 	simplicity. (#103662)
 	
 Mon Jun  2 12:10:11 2003  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index f331575a..e796c7d2 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,8 +1,14 @@
+Thu Jun  5 14:53:40 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_move_cursor_visually):
+	Fix bug in determining when we cross line boundaries.
+	(#103421, Matthias Clasen)
+
 Wed Jun  4 14:32:47 2003  Owen Taylor  <otaylor@redhat.com>
  
  	* pango/glyphstring.c (pango_glyph_string_extents_range): 
  	Improve handling of empty ink rectangles; rework for
- 	simplicity.
+ 	simplicity. (#103662)
 	
 Mon Jun  2 12:10:11 2003  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index f331575a..e796c7d2 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,8 +1,14 @@
+Thu Jun  5 14:53:40 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_move_cursor_visually):
+	Fix bug in determining when we cross line boundaries.
+	(#103421, Matthias Clasen)
+
 Wed Jun  4 14:32:47 2003  Owen Taylor  <otaylor@redhat.com>
  
  	* pango/glyphstring.c (pango_glyph_string_extents_range): 
  	Improve handling of empty ink rectangles; rework for
- 	simplicity.
+ 	simplicity. (#103662)
 	
 Mon Jun  2 12:10:11 2003  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index f331575a..e796c7d2 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,8 +1,14 @@
+Thu Jun  5 14:53:40 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_move_cursor_visually):
+	Fix bug in determining when we cross line boundaries.
+	(#103421, Matthias Clasen)
+
 Wed Jun  4 14:32:47 2003  Owen Taylor  <otaylor@redhat.com>
  
  	* pango/glyphstring.c (pango_glyph_string_extents_range): 
  	Improve handling of empty ink rectangles; rework for
- 	simplicity.
+ 	simplicity. (#103662)
 	
 Mon Jun  2 12:10:11 2003  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 3143714d..403faa67 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -1232,6 +1232,8 @@ pango_layout_move_cursor_visually (PangoLayout *layout,
   int n_vis;
   int vis_pos, log_pos;
   int start_offset;
+  gboolean off_start = FALSE;
+  gboolean off_end = FALSE;
 
   g_return_if_fail (layout != NULL);
   g_return_if_fail (old_index >= 0 && old_index <= layout->length);
@@ -1261,10 +1263,31 @@ pango_layout_move_cursor_visually (PangoLayout *layout,
   
   vis_pos = log2vis_map[old_index - line->start_index];
   g_free (log2vis_map);
-  
+
+  /* Handling movement between lines */
   if (vis_pos == 0 && direction < 0)
     {
       if (base_dir == PANGO_DIRECTION_LTR)
+	off_start = TRUE;
+      else
+	off_end = TRUE;
+    }
+  else if (vis_pos == n_vis && direction > 0)
+    {
+      if (base_dir == PANGO_DIRECTION_LTR)
+	off_end = TRUE;
+      else
+	off_start = TRUE;
+    }
+
+  if (off_start || off_end)
+    {
+      /* If we move over a paragraph boundary, count that as
+       * an extra position in the motion
+       */
+      gboolean paragraph_boundary;
+
+      if (off_start)
 	{
 	  if (!prev_line)
 	    {
@@ -1273,6 +1296,7 @@ pango_layout_move_cursor_visually (PangoLayout *layout,
 	      return;
 	    }
 	  line = prev_line;
+	  paragraph_boundary = (line->start_index + line->length != old_index);
 	}
       else
 	{
@@ -1283,40 +1307,21 @@ pango_layout_move_cursor_visually (PangoLayout *layout,
 	      return;
 	    }
 	  line = next_line;
+	  paragraph_boundary = (line->start_index != old_index);
 	}
 
-      /* Handle paragraph separators as an extra position */
-      vis_pos = g_utf8_strlen (layout->text + line->start_index, line->length);
-      if (line->start_index + line->length != old_index)
-	vis_pos++;
-    }
-  else if (vis_pos == n_vis && direction > 0)
-    {
-      if (base_dir == PANGO_DIRECTION_LTR)
+      if (vis_pos == 0 && direction < 0)
 	{
-	  if (!next_line)
-	    {
-	      *new_index = G_MAXINT;
-	      *new_trailing = 0;
-	      return;
-	    }
-	  line = next_line;
+	  vis_pos = g_utf8_strlen (layout->text + line->start_index, line->length);
+	  if (paragraph_boundary)
+	    vis_pos++;
 	}
-      else
+      else /* (vis_pos == n_vis && direction > 0) */
 	{
-	  if (!prev_line)
-	    {
-	      *new_index = -1;
-	      *new_trailing = 0;
-	      return;
-	    }
-	  line = prev_line;
+	  vis_pos = 0;
+	  if (paragraph_boundary)
+	    vis_pos--;
 	}
-      
-      /* Handle paragraph separators as an extra position */
-      vis_pos = 0;
-      if (line->start_index != old_index)
-	vis_pos--;
     }
 
   vis2log_map = pango_layout_line_get_vis2log_map (line, strong);