Changeset c447d9c

Timestamp:

May 29, 2010, 1:14:57 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:

5f7eadf

Parents:

d3814ff

git-author:

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

git-committer:

David Benjamin <davidben@mit.edu> (05/29/10 13:14:57)

Message:

Also drop winlines/wincols from the viewwin struct

Deduplicating data is probably worthwhile, although this doesn't have a
negative diffstat. Maybe the owl_window struct should just be open.
(Then it should maybe return some sort of const owl_window * while we
internally work with a owl_window_private *)

Files:

• owl.h (modified) (1 diff)
• viewwin.c (modified) (8 diffs)

owl.h

@@ -403 +403 @@
   int topline;
   int rightshift;
-  int winlines, wincols;
   owl_window *window;
   void (*onclose_hook) (struct _owl_viewwin *vwin, void *data);

viewwin.c

@@ -54 +54 @@
   if (v->window) {
     owl_window_set_redraw_cb(v->window, 0, 0, 0);
-    owl_window_set_resize_cb(v->window, 0, 0, 0);
   }
   v->window = w;
   if (w) {
-    owl_window_get_position(w, &v->winlines, &v->wincols, 0, 0);
     owl_window_set_redraw_cb(w, owl_viewwin_redisplay, v, 0);
-    owl_window_set_resize_cb(w, owl_viewwin_resize_hook, v, 0);
   }
 }
@@ -69 +66 @@
 }
 
-void owl_viewwin_resize_hook(owl_window *w, void *user_data)
-{
-  owl_viewwin *v = user_data;
-  owl_window_get_position(w, &v->winlines, &v->wincols, 0, 0);
-}
-
 /* regenerate text on the curses window. */
 void owl_viewwin_redisplay(owl_window *w, WINDOW *curswin, void *user_data)
@@ -80 +71 @@
   owl_fmtext fm1, fm2;
   owl_viewwin *v = user_data;
+  int winlines, wincols;
+
+  owl_window_get_position(w, &winlines, &wincols, 0, 0);
   
   werase(curswin);
@@ -87 +81 @@
   owl_fmtext_init_null(&fm2);
   
-  owl_fmtext_truncate_lines(&(v->fmtext), v->topline, v->winlines-BOTTOM_OFFSET, &fm1);
-  owl_fmtext_truncate_cols(&fm1, v->rightshift, v->wincols-1+v->rightshift, &fm2);
+  owl_fmtext_truncate_lines(&(v->fmtext), v->topline, winlines-BOTTOM_OFFSET, &fm1);
+  owl_fmtext_truncate_cols(&fm1, v->rightshift, wincols-1+v->rightshift, &fm2);
 
   owl_fmtext_curs_waddstr_without_search(&fm2, curswin);
 
   /* print the message at the bottom */
-  wmove(curswin, v->winlines-1, 0);
+  wmove(curswin, winlines-1, 0);
   wattrset(curswin, A_REVERSE);
-  if (v->textlines - v->topline > v->winlines-BOTTOM_OFFSET) {
+  if (v->textlines - v->topline > winlines-BOTTOM_OFFSET) {
     waddstr(curswin, "--More-- (Space to see more, 'q' to quit)");
   } else {
@@ -108 +102 @@
 void owl_viewwin_pagedown(owl_viewwin *v)
 {
-  v->topline+=v->winlines - BOTTOM_OFFSET;
-  if ( (v->topline+v->winlines-BOTTOM_OFFSET) > v->textlines) {
-    v->topline = v->textlines - v->winlines + BOTTOM_OFFSET;
+  int winlines;
+  owl_window_get_position(v->window, &winlines, 0, 0, 0);
+  v->topline+=winlines - BOTTOM_OFFSET;
+  if ( (v->topline+winlines-BOTTOM_OFFSET) > v->textlines) {
+    v->topline = v->textlines - winlines + BOTTOM_OFFSET;
   }
   owl_window_dirty(v->window);
@@ -117 +113 @@
 void owl_viewwin_linedown(owl_viewwin *v)
 {
+  int winlines;
+  owl_window_get_position(v->window, &winlines, 0, 0, 0);
   v->topline++;
-  if ( (v->topline+v->winlines-BOTTOM_OFFSET) > v->textlines) {
-    v->topline = v->textlines - v->winlines + BOTTOM_OFFSET;
+  if ( (v->topline+winlines-BOTTOM_OFFSET) > v->textlines) {
+    v->topline = v->textlines - winlines + BOTTOM_OFFSET;
   }
   owl_window_dirty(v->window);
@@ -126 +124 @@
 void owl_viewwin_pageup(owl_viewwin *v)
 {
-  v->topline-=v->winlines;
+  int winlines;
+  owl_window_get_position(v->window, &winlines, 0, 0, 0);
+  v->topline-=winlines;
   if (v->topline<0) v->topline=0;
   owl_window_dirty(v->window);
@@ -160 +160 @@
 void owl_viewwin_bottom(owl_viewwin *v)
 {
-  v->topline = v->textlines - v->winlines + BOTTOM_OFFSET;
+  int winlines;
+  owl_window_get_position(v->window, &winlines, 0, 0, 0);
+  v->topline = v->textlines - winlines + BOTTOM_OFFSET;
   owl_window_dirty(v->window);
 }