Changeset 3e36085

Timestamp:

Jul 11, 2009, 1:14:35 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:

77f605d

Parents:

fc2677b

git-author:

Karl Ramm <kcr@1ts.org> (06/15/09 04:33:20)

git-committer:

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

Message:

Support echochar in the redisplay code.

File:

• editwin.c (modified) (5 diffs)

editwin.c

@@ -486 +486 @@
 }
 
+static void oe_addnec(owl_editwin *e, int count)
+{
+  int i;
+
+  for (i = 0; i < count; i++)
+    waddch(e->curswin, e->echochar);
+}
+
+static void oe_mvaddnec(owl_editwin *e, int y, int x, int count)
+{
+  wmove(e->curswin, y, x);
+  oe_addnec(e, count);
+}
+
 /* regenerate the text on the curses window */
 /* if update == 1 then do a doupdate(), otherwise do not */
@@ -507 +521 @@
       if (x == -1 && t != -1)
         x = t, y = line;
-      if (index - lineindex)
-        mvwaddnstr(e->curswin, line, 0,
-                   e->buff + lineindex,
-                   index - lineindex);
+      if (index - lineindex) {
+        if (!e->echochar)
+          mvwaddnstr(e->curswin, line, 0,
+                     e->buff + lineindex,
+                     index - lineindex);
+        else {
+          if(lineindex < e->lock) {
+            mvwaddnstr(e->curswin, line, 0,
+                       e->buff + lineindex,
+                       MIN(index - lineindex,
+                           e->lock - lineindex));
+            if (e->lock < index)
+              oe_addnec(e,
+                        oe_region_width(e, e->lock, index,
+                                        oe_region_width(e, lineindex, e->lock, 0)));
+          } else
+            oe_mvaddnec(e, line, 0, oe_region_width(e, line, index, 0));
+        }
+      }
       line++;
     }
@@ -576 +605 @@
 
   /* fix up the mark */
-  if (e->mark != -1)
-    oe_fixup(&e->mark, start, end, change);
+  oe_fixup(&e->mark, start, end, change);
+  oe_fixup(&e->topindex, start, end, change);
   /* fix up any saved points after the replaced area */
   for (x = e->excursions; x != NULL; x = x->next) {
     oe_fixup(&x->index, start, end, change);
-    if (x->mark != -1)
-      oe_fixup(&x->mark, start, end, change);
+    oe_fixup(&x->mark, start, end, change);
   }
 
@@ -1145 +1173 @@
 }
 
-static int oe_region_width(owl_editwin *e, int start, int end, int width)
+static int oe_region_width(owl_editwin *e, int start, int end, int offset)
 {
   char *p;
+  int width = offset;
+  
   for(p = e->buff + start;
       p < e->buff + end;
@@ -1153 +1183 @@
     width += oe_char_width(g_utf8_get_char(p), width);
 
-  return width;
+  return width - offset;
 }