Changeset 77d4402 for editwin.c

Timestamp:

Jul 11, 2009, 1:14:33 PM (16 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:

2021bea

Parents:

b5ef65c

git-author:

Karl Ramm <kcr@1ts.org> (06/09/09 11:29:42)

git-committer:

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

Message:

cursor location improved; other behavior
The cursor locater now handles wrapped lines /better/ but still messes up
 when the line is the width of the screen and the cursor is at the end
 (so it should be a the beginning of a blank screen line)
C-a set the goal column
kill-to-end-of-line will eat a final newline and thus join.

File:

• editwin.c (modified) (7 diffs)

editwin.c

@@ -312 +312 @@
   char *p;
 
-    /* are we at the point already? */
+  while(1) {
+    /* note the position of the dot */
     if (x != NULL && index == e->index)
       *x = width;
-  while(1) {
+
     /* get the current character */
     c = g_utf8_get_char(e->buff + index);
@@ -327 +328 @@
         cw = 0;
 
-    if (width + cw > e->wincols)
+    if (width + cw > e->wincols) {
+      if (x != NULL && *x == width)
+        *x = -1;
       break;
+    }
     width += cw;
 
     if (c == '\n') {
-      ++index; /* skip the newline */
+      if (width < e->wincols)
+        ++index; /* skip the newline */
       break;
     }
@@ -345 +350 @@
     index = p - e->buff;
 
-    /* note the position of the dot */
-    if (x != NULL && index == e->index)
-      *x = width;
   }
   return index;
@@ -394 +396 @@
 {
   int x = -1, y = -1, t;
-  int line, index, lineindex;
+  int line, index, lineindex, times = 0;
 
   do {
@@ -418 +420 @@
     if (x == -1)
         e->topindex = -1; /* force a reframe */
-  } while(x == -1);
+    times++;
+  } while(x == -1 && times < 3);
 
   wmove(e->curswin, y, x);
@@ -819 +822 @@
       distance += owl_editwin_point_move(e, 1);
   }
+  e->goal_column = 0; /* subtleties */
 
   return distance;
@@ -974 +978 @@
   end = e->index;
   oe_restore_excursion(e, &x);
-  _owl_editwin_remove_bytes(e, end - e->index);
+  if (end - e->index)
+    _owl_editwin_remove_bytes(e, end - e->index);
+  else if (end < e->bufflen)
+    _owl_editwin_remove_bytes(e, 1);
 }