Changeset 521bc84

Timestamp:

Jul 11, 2009, 1:14:34 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

bab52da

Parents:

6073462

git-author:

Karl Ramm <kcr@1ts.org> (06/09/09 20:52:40)

git-committer:

Nelson Elhage <nelhage@mit.edu> (07/11/09 13:14:34)

Message:

setter for e->index such that cached data invalidates when the point moves

File:

• editwin.c (modified) (16 diffs)

editwin.c

@@ -44 +44 @@
 }
 
+static void oe_set_index(owl_editwin *e, int index) {
+  e->index = index;
+  e->goal_column = -1;
+}
+
 /* initialize the editwin e.
  * 'win' is an already initialzed curses window that will be used by editwin
@@ -54 +59 @@
   e->hist=hist;
   e->allocated=INCR;
-  e->index = 0;
+  oe_set_index(e, 0);
   e->goal_column = -1;
   e->topindex=0;
@@ -170 +175 @@
 void owl_editwin_set_locktext(owl_editwin *e, char *text)
 {
-  e->index = 0;
+  oe_set_index(e, 0);
   owl_editwin_overwrite_string(e, text);
   owl_editwin_overwrite_char(e, '\0');
   e->lock=strlen(text);
-  e->index = e->lock;
+  oe_set_index(e, e->lock);
   owl_editwin_redisplay(e, 0);
 }
@@ -201 +206 @@
         e->bufflen=ptr - e->buff;
         e->buff[e->bufflen]='\0';
-        e->index = 0;
+        oe_set_index(e, 0);
       }
     }
@@ -246 +251 @@
   if (locktext) owl_free(locktext);
 
-  e->index = lock;
+  oe_set_index(e, lock);
 }
 
@@ -274 +279 @@
 static void oe_restore_excursion(owl_editwin *e, oe_excursion *x)
 {
-  e->index = x->index;
+  oe_set_index(e, x->index);
   e->goal_column = x->goal_column;
   e->lock = x->lock;
@@ -380 +385 @@
       owl_editwin_point_move(e, -1);
   }
+
+  e->topindex = e->index;
   /* if we overshot, backtrack */
   for (n = 0; n < (count - goal); n++)
-    e->index = oe_find_display_line(e, NULL, e->index);
-
-  e->topindex = e->index;
+    e->topindex = oe_find_display_line(e, NULL, e->topindex);
 
   oe_restore_excursion(e, &x);
@@ -480 +485 @@
       if (c != ' ') {
         i = ptr1 - e->buff;
-        e->index = i;
+        oe_set_index(e, i);
         _owl_editwin_insert_bytes(e, 1);
         /* _owl_editwin_insert_bytes may move e->buff. */
@@ -544 +549 @@
 
   /* advance the cursor */
-  e->index += len;
+  oe_set_index(e, e->index + len);
 }
 
@@ -596 +601 @@
 
   /* advance the cursor */
-  e->index += newlen;
+  oe_set_index(e, e->index + newlen);
 }
 
@@ -634 +639 @@
   if (e->index == e->bufflen) {
     /* point is after last character */
-    e->index--;
+    oe_set_index(e, e->index - 1);
   }
 
@@ -660 +665 @@
   strncpy(p3, tmp, p2 - p3);
   owl_free(tmp);
-  e->index = p3 - e->buff;
+  oe_set_index(e, p3 - e->buff);
 }
 
@@ -725 +730 @@
       p = oe_prev_point(e, p);
     if (p != NULL) {
-      e->index = p - e->buff;
+      oe_set_index(e, p - e->buff);
       d++;
     }
   }
-
-  if (delta)
-    e->goal_column = -1;
 
   return delta > 0 ? d : -d;
@@ -980 +982 @@
 void owl_editwin_move_to_end(owl_editwin *e)
 {
-  e->index = e->bufflen;
+  oe_set_index(e, e->bufflen);
 }
 
 void owl_editwin_move_to_top(owl_editwin *e)
 {
-  e->index = e->lock;
+  oe_set_index(e, e->lock);
 }
 
@@ -1003 +1005 @@
     if ( (i<=e->lock) ||
          ((e->buff[i]=='\n') && (e->buff[i-1]=='\n'))) {
-      e->index = i + 1;
+      oe_set_index(i + 1);
       break;
     }
@@ -1029 +1031 @@
       /* we may have added a character. */
       if (i < save) save += e->bufflen - len;
-      e->index = i;
+      oe_set_index(i);
     }