Changeset 9eb38bb for viewwin.c

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:

d574d61

Parents:

8ee712e0

git-author:

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

git-committer:

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

Message:

Likewise, don't reuse a global owl_viewwin

This means we don't have to support plugging and unplugging that thing
over and over. We also can almost entirely drop the global owl_viewwin.
Most of the code gets it from the context anyway.

File:

• viewwin.c (modified) (6 diffs)

viewwin.c

@@ -7 +7 @@
 static void owl_viewwin_set_window(owl_viewwin *v, owl_window *w);
 
-/* initialize the viewwin e.  'win' is an already initialzed curses
- * window that will be used by viewwin
+/* Create a viewwin.  'win' is an already initialized owl_window that
+ * will be used by the viewwin
  */
-void owl_viewwin_init_text(owl_viewwin *v, owl_window *win, const char *text)
+owl_viewwin *owl_viewwin_new_text(owl_window *win, const char *text)
 {
+  owl_viewwin *v = owl_malloc(sizeof(owl_viewwin));
+  memset(v, 0, sizeof(*v));
   owl_fmtext_init_null(&(v->fmtext));
   if (text) {
@@ -25 +27 @@
 
   owl_viewwin_set_window(v, win);
+  return v;
 }
 
@@ -42 +45 @@
 }
 
-/* initialize the viewwin e.  'win' is an already initialzed curses
- * window that will be used by viewwin
+/* Create a viewwin.  'win' is an already initialized owl_window that
+ * will be used by the viewwin
  */
-void owl_viewwin_init_fmtext(owl_viewwin *v, owl_window *win, const owl_fmtext *fmtext)
+owl_viewwin *owl_viewwin_new_fmtext(owl_window *win, const owl_fmtext *fmtext)
 {
   char *text;
+  owl_viewwin *v = owl_malloc(sizeof(owl_viewwin));
+  memset(v, 0, sizeof(*v));
 
   owl_fmtext_copy(&(v->fmtext), fmtext);
@@ -60 +65 @@
 
   owl_viewwin_set_window(v, win);
+  return v;
 }
 
 static void owl_viewwin_set_window(owl_viewwin *v, owl_window *w)
 {
-  if (v->window) {
-    g_signal_handler_disconnect(v->window, v->sig_redraw_id);
-    g_object_unref(v->window);
-  }
   v->window = w;
   if (w) {
@@ -181 +183 @@
 }
 
-void owl_viewwin_cleanup(owl_viewwin *v)
+void owl_viewwin_delete(owl_viewwin *v)
 {
-  owl_viewwin_set_window(v, NULL);
   if (v->onclose_hook) {
     v->onclose_hook(v, v->onclose_hook_data);
@@ -189 +190 @@
     v->onclose_hook_data = NULL;
   }
+  if (v->window) {
+    g_signal_handler_disconnect(v->window, v->sig_redraw_id);
+    g_object_unref(v->window);
+    v->window = NULL;
+  }
   owl_fmtext_cleanup(&(v->fmtext));
+  owl_free(v);
 }