Changeset 68f63a2 for viewwin.c

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:

1383b58

Parents:

7c8811c

git-author:

David Benjamin <davidben@mit.edu> (05/27/10 02:49:57)

git-committer:

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

Message:

Port owl_viewwin to owl_window

A number of hacks. This is just a test run of the API.

File:

• viewwin.c (modified) (15 diffs)

viewwin.c

@@ -7 +7 @@
  * window that will be used by viewwin
  */
-void owl_viewwin_init_text(owl_viewwin *v, WINDOW *win, int winlines, int wincols, const char *text)
+void owl_viewwin_init_text(owl_viewwin *v, owl_window *win, const char *text)
 {
   owl_fmtext_init_null(&(v->fmtext));
@@ -19 +19 @@
   v->topline=0;
   v->rightshift=0;
-  v->winlines=winlines;
-  v->wincols=wincols;
-  v->curswin=win;
   v->onclose_hook = NULL;
+
+  owl_viewwin_set_window(v, win);
 }
 
@@ -28 +27 @@
     owl_fmtext_append_normal(&(v->fmtext), text);
     v->textlines=owl_fmtext_num_lines(&(v->fmtext));  
+    owl_window_dirty(v->window);
 }
 
@@ -33 +33 @@
  * window that will be used by viewwin
  */
-void owl_viewwin_init_fmtext(owl_viewwin *v, WINDOW *win, int winlines, int wincols, const owl_fmtext *fmtext)
+void owl_viewwin_init_fmtext(owl_viewwin *v, owl_window *win, const owl_fmtext *fmtext)
 {
   char *text;
@@ -46 +46 @@
   v->topline=0;
   v->rightshift=0;
-  v->winlines=winlines;
-  v->wincols=wincols;
-  v->curswin=win;
+
+  owl_viewwin_set_window(v, win);
 }
 
-void owl_viewwin_set_curswin(owl_viewwin *v, WINDOW *w, int winlines, int wincols)
+void owl_viewwin_set_window(owl_viewwin *v, owl_window *w)
 {
-  v->curswin=w;
-  v->winlines=winlines;
-  v->wincols=wincols;
+  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);
+  }
 }
 
@@ -63 +69 @@
 }
 
+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_viewwin *v)
+void owl_viewwin_redisplay(owl_window *w, WINDOW *curswin, void *user_data)
 {
   owl_fmtext fm1, fm2;
-
-  /* avoid segfault when screen too small to create curswin */
-  if (v->curswin == NULL)
-    return;
+  owl_viewwin *v = user_data;
   
-  werase(v->curswin);
-  wmove(v->curswin, 0, 0);
+  werase(curswin);
+  wmove(curswin, 0, 0);
 
   owl_fmtext_init_null(&fm1);
@@ -81 +90 @@
   owl_fmtext_truncate_cols(&fm1, v->rightshift, v->wincols-1+v->rightshift, &fm2);
 
-  owl_fmtext_curs_waddstr_without_search(&fm2, v->curswin);
+  owl_fmtext_curs_waddstr_without_search(&fm2, curswin);
 
   /* print the message at the bottom */
-  wmove(v->curswin, v->winlines-1, 0);
-  wattrset(v->curswin, A_REVERSE);
+  wmove(curswin, v->winlines-1, 0);
+  wattrset(curswin, A_REVERSE);
   if (v->textlines - v->topline > v->winlines-BOTTOM_OFFSET) {
-    waddstr(v->curswin, "--More-- (Space to see more, 'q' to quit)");
+    waddstr(curswin, "--More-- (Space to see more, 'q' to quit)");
   } else {
-    waddstr(v->curswin, "--End-- (Press 'q' to quit)");
+    waddstr(curswin, "--End-- (Press 'q' to quit)");
   }
-  wattroff(v->curswin, A_REVERSE);
+  wattroff(curswin, A_REVERSE);
 
   owl_fmtext_cleanup(&fm1);
@@ -103 +112 @@
     v->topline = v->textlines - v->winlines + BOTTOM_OFFSET;
   }
+  owl_window_dirty(v->window);
 }
 
@@ -111 +121 @@
     v->topline = v->textlines - v->winlines + BOTTOM_OFFSET;
   }
+  owl_window_dirty(v->window);
 }
 
@@ -117 +128 @@
   v->topline-=v->winlines;
   if (v->topline<0) v->topline=0;
+  owl_window_dirty(v->window);
 }
 
@@ -123 +135 @@
   v->topline--;
   if (v->topline<0) v->topline=0;
+  owl_window_dirty(v->window);
 }
 
@@ -128 +141 @@
 {
   v->rightshift+=n;
+  owl_window_dirty(v->window);
 }
 
@@ -134 +148 @@
   v->rightshift-=n;
   if (v->rightshift<0) v->rightshift=0;
+  owl_window_dirty(v->window);
 }
 
@@ -140 +155 @@
   v->topline=0;
   v->rightshift=0;
+  owl_window_dirty(v->window);
 }
 
@@ -145 +161 @@
 {
   v->topline = v->textlines - v->winlines + BOTTOM_OFFSET;
+  owl_window_dirty(v->window);
 }