Changeset 9c3f334

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:

ac6d4e4

Parents:

58a16cc

git-author:

David Benjamin <davidben@mit.edu> (09/29/10 14:18:35)

git-committer:

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

Message:

cursorx in oe_insert_char is a lie

There's even a comment to that effect. Use owl_editwin_current_column
instead. This fixes the previously checked-in unit test.

File:

• editwin.c (modified) (6 diffs)

editwin.c

@@ -27 +27 @@
   int goal_column;
   int topindex;
-  int cursorx;
   int winlines, wincols, fillcol, wrapcol;
   owl_window *win;
@@ -101 +100 @@
   if (index != e->index) {
     e->goal_column = -1;
-    e->cursorx = -1;
   }
   e->index = index;
@@ -135 +133 @@
   e->killbuf = NULL;
   e->goal_column = -1;
-  e->cursorx = -1;
   e->topindex = 0;
   e->excursions = NULL;
@@ -591 +588 @@
 
   wmove(curswin, y, x);
-  e->cursorx = x;
 }
 
@@ -1296 +1292 @@
   char tmp[7];
   int replaced = -1;
+  int column;
 
   if (c == '\r') /* translate CRs to NLs */
@@ -1305 +1302 @@
     }
 
-    if (e->wrapcol > 0 && e->cursorx != -1 &&
-        e->cursorx + oe_char_width(c, e->cursorx) > e->wrapcol) {
+    column = owl_editwin_current_column(e);
+    if (e->wrapcol > 0 && column != -1 &&
+        column + oe_char_width(c, column) > e->wrapcol) {
       /* XXX this is actually wrong:
-       * + If the line has been been wrapped, we can be past the wrap column but
-       *   e->cursorx be much smaller.
        * + If the user went back and inserted a bunch of stuff in the middle of
        *   the line, there may be more than one word past the wrap column.