Changeset 5b68c05

Timestamp:

Sep 18, 2010, 3:17:27 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:

f7456bc

Parents:

449c682

git-author:

David Benjamin <davidben@mit.edu> (07/31/10 18:22:23)

git-committer:

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

Message:

Update the viewwin when the global search string changes

This will want to be made less hacky when we have some notification
mechanism for all of owl_global's properties. Also, use the new
owl_viewwin_dirty in internal functions to avoid dirtying a NULL window.

Files:

• global.c (modified) (1 diff)
• viewwin.c (modified) (9 diffs)

global.c

@@ -643 +643 @@
   if (re != NULL)
     owl_regex_copy(re, &g->search_re);
+  /* TODO: Emit a signal so we don't depend on the viewwin here. */
+  if (owl_global_get_viewwin(g))
+    owl_viewwin_dirty(owl_global_get_viewwin(g));
 }
 

viewwin.c

@@ -28 +28 @@
 void owl_viewwin_append_text(owl_viewwin *v, const char *text) {
     owl_fmtext_append_normal(&(v->fmtext), text);
-    v->textlines=owl_fmtext_num_lines(&(v->fmtext));  
+    v->textlines=owl_fmtext_num_lines(&(v->fmtext));
+    owl_viewwin_dirty(v);
+}
+
+/* Schedule a redraw of 'v'. Exported for hooking into the search
+   string; when we have some way of listening for changes, this can be
+   removed. */
+void owl_viewwin_dirty(owl_viewwin *v)
+{
+  if (v->window)
     owl_window_dirty(v->window);
 }
@@ -112 +121 @@
     v->topline = v->textlines - winlines + BOTTOM_OFFSET;
   }
-  owl_window_dirty(v->window);
+  owl_viewwin_dirty(v);
 }
 
@@ -123 +132 @@
     v->topline = v->textlines - winlines + BOTTOM_OFFSET;
   }
-  owl_window_dirty(v->window);
+  owl_viewwin_dirty(v);
 }
 
@@ -132 +141 @@
   v->topline-=winlines;
   if (v->topline<0) v->topline=0;
-  owl_window_dirty(v->window);
+  owl_viewwin_dirty(v);
+
 }
 
@@ -139 +149 @@
   v->topline--;
   if (v->topline<0) v->topline=0;
-  owl_window_dirty(v->window);
+  owl_viewwin_dirty(v);
 }
 
@@ -145 +155 @@
 {
   v->rightshift+=n;
-  owl_window_dirty(v->window);
+  owl_viewwin_dirty(v);
 }
 
@@ -152 +162 @@
   v->rightshift-=n;
   if (v->rightshift<0) v->rightshift=0;
-  owl_window_dirty(v->window);
+  owl_viewwin_dirty(v);
 }
 
@@ -159 +169 @@
   v->topline=0;
   v->rightshift=0;
-  owl_window_dirty(v->window);
+  owl_viewwin_dirty(v);
 }
 
@@ -167 +177 @@
   owl_window_get_position(v->window, &winlines, 0, 0, 0);
   v->topline = v->textlines - winlines + BOTTOM_OFFSET;
-  owl_window_dirty(v->window);
+  owl_viewwin_dirty(v);
 }