Changeset 1b1cd2c for editwin.c

Timestamp:

Mar 23, 2010, 5:23:43 PM (14 years ago)

Author:

Nelson Elhage <nelhage@ksplice.com>

Branches:

master, release-1.10, release-1.6, release-1.7, release-1.8, release-1.9

Children:

8dfb59c

Parents:

6b78afb

git-author:

Nelson Elhage <nelhage@mit.edu> (03/13/10 21:18:03)

git-committer:

Nelson Elhage <nelhage@ksplice.com> (03/23/10 17:23:43)

Message:

Editwin: Add a callback to destroy cbdata

File:

• editwin.c (modified) (5 diffs)

editwin.c

@@ -37 +37 @@
   char *command;
   void (*callback)(struct _owl_editwin*);
+  void (*destroy_cbdata)(void *);
   void *cbdata;
 };
@@ -58 +59 @@
 static int oe_copy_region(owl_editwin *e);
 static char *oe_chunk(owl_editwin *e, int start, int end);
+static void oe_destroy_cbdata(owl_editwin *e);
 
 #define INCR 4096
@@ -145 +147 @@
   e->echochar='\0';
 
-  /* We get initialized multiple times, but we need to hold on to
-     the callbacks, so we can't NULL them here. */
-  /*
-    e->command = NULL;
-    e->callback = NULL;
-    e->cbdata = NULL;
-  */
   if (win) werase(win);
 }
@@ -210 +205 @@
 }
 
-void owl_editwin_set_cbdata(owl_editwin *e, void *data)
-{
+static void oe_destroy_cbdata(owl_editwin *e) {
+  if (e->destroy_cbdata)
+    e->destroy_cbdata(e->cbdata);
+  e->cbdata = NULL;
+  e->destroy_cbdata = NULL;
+}
+
+void owl_editwin_set_cbdata(owl_editwin *e, void *data, void (*destroy)(void *))
+{
+  oe_destroy_cbdata(e);
   e->cbdata = data;
+  e->destroy_cbdata = destroy;
 }
 
@@ -282 +286 @@
   owl_free(e->buff);
   owl_editwin_init(e, e->curswin, e->winlines, e->wincols, e->style, e->hist);
+  e->callback = NULL;
+  oe_destroy_cbdata(e);
 }