Changeset e9bb404

Timestamp:

Aug 20, 2008, 2:16:30 AM (16 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

5987370

Parents:

0504f63

Message:

editwin.c: Don't make owl_editwin_insert_char increase e->bufflen twice

This seems to fix at least some cases of the editwin becoming confused
and causing text entry to not work quite right (often manifesting as a
trailing '.' on a line by itself not sending a zephyr)

File:

• editwin.c (modified) (3 diffs)

editwin.c

@@ -330 +330 @@
 {
   int i, z;
-  
+
   if ((e->bufflen + n) > (e->allocated - 5)) {
     _owl_editwin_addspace(e);
   }
 
+  z = _owl_editwin_get_index_from_xy(e);
+
+  if(z != e->bufflen) {
+    for (i = e->bufflen + n - 1; i > z; i--) {
+      e->buff[i] = e->buff[i - n];
+    }
+  }
+
   e->bufflen += n;
   e->buff[e->bufflen] = '\0';
-  
-  z = _owl_editwin_get_index_from_xy(e);
-  for (i = e->bufflen - 1; i > z; i--) {
-    e->buff[i] = e->buff[i - n];
-  }
+
 }
 
@@ -426 +430 @@
 
   /* shift all the other characters right */
-  if (z != e->bufflen) {
-    _owl_editwin_insert_bytes(e, len);
-  }
+  _owl_editwin_insert_bytes(e, len);
 
   /* insert the new character */
@@ -435 +437 @@
   }
 
-  /* housekeeping */
-  e->bufflen += len;
-  e->buff[e->bufflen] = '\0';
-  
   /* advance the cursor */
   z += len;