Changeset 830c36e

Timestamp:

Jan 2, 2008, 10:51:28 PM (16 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

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

Children:

3a7cf49

Parents:

987a93c

Message:

fixing bugs in editwin bufflen calculations.

File:

• editwin.c (modified) (8 diffs)

editwin.c

@@ -316 +316 @@
   e->buff[e->bufflen] = '\0';
 }
+
 /* Insert n bytes at cursor.*/
 void _owl_editwin_insert_bytes(owl_editwin *e, int n) /*noproto*/
@@ -371 +372 @@
   char tmp[6];
   memset(tmp, '\0', 6);
-  
+
   /* \r is \n */
   if (c == '\r') {
@@ -385 +386 @@
   g_unichar_to_utf8(c, tmp);
   len = strlen(tmp);
-  
+
   /* make sure there is enough memory for the new text */
   if ((e->bufflen + len) > (e->allocated - 5)) {
@@ -404 +405 @@
 
   /* shift all the other characters right */
-  _owl_editwin_insert_bytes(e, len);
+  if (z != e->bufflen) {
+    _owl_editwin_insert_bytes(e, len);
+  }
 
   /* insert the new character */
@@ -414 +417 @@
   e->bufflen += len;
   e->buff[e->bufflen] = '\0';
-
+  
   /* advance the cursor */
   z += len;
@@ -426 +429 @@
   char tmp[6];
   memset(tmp, '\0', 6);
-  
+
   /* \r is \n */
   if (c == '\r') {
     c = '\n';
   }
-
+  
   if (c == '\n' && e->style == OWL_EDITWIN_STYLE_ONELINE) {
     /* perhaps later this will change some state that allows the string
@@ -444 +447 @@
   {
     char *t = g_utf8_find_next_char(e->buff + z, NULL);
-    oldlen = (t ? (t - (e->buff + z)) : 1);
-  }
-
-  if ((e->bufflen + newlen - oldlen + 1) > (e->allocated - 5)) {
-    _owl_editwin_addspace(e);
-  }
-
-  if (oldlen > newlen) {
+    oldlen = (t ? (t - (e->buff + z)) : 0);
+  }
+
+  /* only if we are at the end of the buffer do we create new space here */
+  if (z == e->bufflen) {
+    if ((e->bufflen+newlen) > (e->allocated-5)) {
+      _owl_editwin_addspace(e);
+    }
+  }
+  /* if not at the end of the buffer, adjust based in char size difference. */ 
+  else if (oldlen > newlen) {
     _owl_editwin_remove_bytes(e, oldlen-newlen);
   }
@@ -463 +469 @@
        
   /* housekeeping */
-  e->buff[e->bufflen] = '\0';
-
+  if (z == e->bufflen) {
+    e->bufflen += newlen;
+    e->buff[e->bufflen] = '\0';
+  }
+  
   /* advance the cursor */
   z += newlen;