Changeset d574d61

Timestamp:

Sep 18, 2010, 5:07:39 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:

fa23002

Parents:

9eb38bb

git-author:

David Benjamin <davidben@mit.edu> (08/01/10 14:50:27)

git-committer:

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

Message:

Add owl_viewwin_up and owl_viewwin_down

So we have one consistent place for the clipping logic. Also, take
BOTTOM_OFFSET into account in owl_viewwin_pageup.

File:

• viewwin.c (modified) (3 diffs)

viewwin.c

@@ -116 +116 @@
 }
 
-void owl_viewwin_pagedown(owl_viewwin *v)
-{
-  int winlines;
-  owl_window_get_position(v->window, &winlines, 0, 0, 0);
-  v->topline+=winlines - BOTTOM_OFFSET;
+void owl_viewwin_down(owl_viewwin *v, int amount) {
+  int winlines;
+  owl_window_get_position(v->window, &winlines, 0, 0, 0);
+  v->topline += amount;
   if ( (v->topline+winlines-BOTTOM_OFFSET) > v->textlines) {
     v->topline = v->textlines - winlines + BOTTOM_OFFSET;
@@ -127 +126 @@
 }
 
+void owl_viewwin_up(owl_viewwin *v, int amount)
+{
+  v->topline -= amount;
+  if (v->topline<0) v->topline=0;
+  owl_viewwin_dirty(v);
+}
+
+void owl_viewwin_pagedown(owl_viewwin *v)
+{
+  int winlines;
+  owl_window_get_position(v->window, &winlines, 0, 0, 0);
+  owl_viewwin_down(v, winlines - BOTTOM_OFFSET);
+}
+
 void owl_viewwin_linedown(owl_viewwin *v)
 {
-  int winlines;
-  owl_window_get_position(v->window, &winlines, 0, 0, 0);
-  v->topline++;
-  if ( (v->topline+winlines-BOTTOM_OFFSET) > v->textlines) {
-    v->topline = v->textlines - winlines + BOTTOM_OFFSET;
-  }
-  owl_viewwin_dirty(v);
+  owl_viewwin_down(v, 1);
 }
 
@@ -142 +149 @@
   int winlines;
   owl_window_get_position(v->window, &winlines, 0, 0, 0);
-  v->topline-=winlines;
-  if (v->topline<0) v->topline=0;
-  owl_viewwin_dirty(v);
-
+  owl_viewwin_up(v, winlines - BOTTOM_OFFSET);
 }
 
 void owl_viewwin_lineup(owl_viewwin *v)
 {
-  v->topline--;
-  if (v->topline<0) v->topline=0;
-  owl_viewwin_dirty(v);
+  owl_viewwin_up(v, 1);
 }