Changeset cedc95c

Timestamp:

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

b5ef65c

Parents:

a0fbdee

git-author:

Karl Ramm <kcr@1ts.org> (06/08/09 19:00:40)

git-committer:

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

Message:

Framer works.
(+ some cursor detection fixup, and, hey, you need to erase the window
if you decide to reframe)

File:

• editwin.c (modified) (3 diffs)

editwin.c

@@ -344 +344 @@
     }
     index = p - e->buff;
+
+    /* note the position of the dot */
+    if (x != NULL && index == e->index)
+      *x = width;
   }
   return index;
@@ -349 +353 @@
 
 static void oe_reframe(owl_editwin *e) {
-  e->topindex = 0; /*XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
+  oe_excursion x;
+  int goal = e->winlines / 2;
+  int index;
+  int count = 0;
+  int point;
+  int n, i;
+  int last;
+
+  oe_save_excursion(e, &x);
+  /* step back line-by-line through the buffer until we have >= goal lines of
+     display text */
+  e->lock = 0; /* we can (must) tread on the locktext */
+
+  point = e->index;
+  last = -1;
+  while (count < goal) {
+    index = e->index;
+    owl_editwin_move_to_beginning_of_line(e);
+    if (last == e->index)
+      break;
+    last = e->index;
+    for (n = 0, i = e->index; i < index; n++)
+      i = oe_find_display_line(e, NULL, i);
+    count += n == 0 ? 1 : n;
+    if (count < goal)
+      owl_editwin_point_move(e, -1);
+  }
+  /* if we overshot, backtrack */
+  for (n = 0; n < (count - goal); n++)
+    e->index = oe_find_display_line(e, NULL, e->index);
+
+  e->topindex = e->index;
+
+  oe_restore_excursion(e, &x);
 }
 
@@ -359 +396 @@
   int line, index, lineindex;
 
-  werase(e->curswin);
-
   do {
+    werase(e->curswin);
+
     if (e->topindex == -1 || e->index < e->topindex)
       oe_reframe(e);