Changeset ac6d4e4

Timestamp:

Sep 30, 2010, 8:07:17 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

385cce2

Parents:

9c3f334

git-author:

David Benjamin <davidben@mit.edu> (09/29/10 15:41:28)

git-committer:

David Benjamin <davidben@mit.edu> (09/30/10 20:07:17)

Message:

Cache the current column to avoid repeatly recomputing it

In particular, we appropriately update it when inserting characters.

Files:

• editwin.c (modified) (8 diffs)
• tester.c (modified) (1 diff)

editwin.c

@@ -27 +27 @@
   int goal_column;
   int topindex;
+  int column;
   int winlines, wincols, fillcol, wrapcol;
   owl_window *win;
@@ -50 +51 @@
 static void oe_restore_mark_only(owl_editwin *e, oe_excursion *x);
 static int oe_char_width(gunichar c, int column);
-static int oe_region_width(owl_editwin *e, int start, int end, int width);
+static int oe_region_column(owl_editwin *e, int start, int end, int offset);
+static int oe_region_width(owl_editwin *e, int start, int end, int offset);
 static int oe_find_display_line(owl_editwin *e, int *x, int index, int *hard);
 static void oe_insert_char(owl_editwin *e, gunichar c);
@@ -100 +102 @@
   if (index != e->index) {
     e->goal_column = -1;
+    e->column = -1;
   }
   e->index = index;
@@ -133 +136 @@
   e->killbuf = NULL;
   e->goal_column = -1;
+  e->column = -1;
   e->topindex = 0;
   e->excursions = NULL;
@@ -646 +650 @@
 static int owl_editwin_replace_internal(owl_editwin *e, int replace, const char *s)
 {
-  int start, end, free, need, size, change;
+  int start, end, free, need, size, change, oldindex;
   oe_excursion *x;
 
@@ -665 +669 @@
   change = start - end + strlen(s);
   e->bufflen += change;
+  oldindex = e->index;
   e->index += strlen(s);
+  if (e->column != -1)
+    e->column = oe_region_column(e, oldindex, e->index, e->column);
 
   /* fix up the mark */
@@ -1146 +1153 @@
 int owl_editwin_current_column(owl_editwin *e)
 {
-  oe_excursion x;
-  int lineindex;
-
-  oe_save_excursion(e, &x);
-  owl_editwin_move_to_beginning_of_line(e);
-  lineindex = e->index;
-  oe_restore_excursion(e, &x);
-  return oe_region_width(e, lineindex, e->index, 0);
+  if (e->column == -1) {
+    oe_excursion x;
+    int lineindex;
+
+    oe_save_excursion(e, &x);
+    owl_editwin_move_to_beginning_of_line(e);
+    lineindex = e->index;
+    oe_restore_excursion(e, &x);
+    e->column = oe_region_width(e, lineindex, e->index, 0);
+  }
+  return e->column;
 }
 
@@ -1272 +1282 @@
     return;
   }
+}
+
+static int oe_region_column(owl_editwin *e, int start, int end, int offset)
+{
+  const char *p;
+  int column = offset;
+
+  for(p = e->buff + start;
+      p < e->buff + end;
+      p = g_utf8_find_next_char(p, NULL)) {
+    gunichar c = g_utf8_get_char(p);
+    if (c == '\n')
+      column = 0;
+    else
+      column += oe_char_width(c, column);
+  }
+  return column;
 }
 

tester.c

@@ -450 +450 @@
   owl_global_set_edit_maxwrapcols(&g, 70);
 
+  /* Test owl_editwin_current_column. */
+  oe = owl_editwin_new(NULL, 80, 80, OWL_EDITWIN_STYLE_MULTILINE, NULL);
+  FAIL_UNLESS("initial column zero", owl_editwin_current_column(oe) == 0);
+  owl_editwin_insert_string(oe, "abcdef");
+  FAIL_UNLESS("simple insert", owl_editwin_current_column(oe) == 6);
+  owl_editwin_insert_string(oe, "\t");
+  FAIL_UNLESS("insert tabs", owl_editwin_current_column(oe) == 8);
+  owl_editwin_insert_string(oe, "123\n12\t3");
+  FAIL_UNLESS("newline with junk", owl_editwin_current_column(oe) == 9);
+  owl_editwin_move_to_beginning_of_line(oe);
+  FAIL_UNLESS("beginning of line", owl_editwin_current_column(oe) == 0);
+  owl_editwin_unref(oe); oe = NULL;
+
   printf("# END testing owl_editwin (%d failures)\n", numfailed);