Changeset c394de8 for functions.c

Timestamp:

Sep 18, 2010, 5:07:40 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:

fc5eef4

Parents:

9190285

git-author:

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

git-committer:

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

Message:

Use ref-counting to make editwin ownership saner

When creating an editwin, one creates an editcontext which takes a
reference to the editwin. Likewise, the pointer in owl_global holds
reference. The reference counting manages their ownership claims. In
addition, owl_global_set_typwin_inactive now does release a reference.

Instead, the callback-calling commands take a reference and release it
later. We may wish to further improve that so that the contexts are also
ref-counted such that, when their commands are running, they will not be
deallocated, even if popped. That will avoid the callback dance.

File:

• functions.c (modified) (8 diffs)

functions.c

@@ -274 +274 @@
 {
   owl_editwin *e;
+  owl_context *ctx;
   char *s;
 
@@ -286 +287 @@
   owl_editwin_set_cbdata(e, data, cleanup);
   owl_editwin_set_callback(e, callback);
-  owl_global_push_context(&g, OWL_CTX_EDITMULTI, e, "editmulti", owl_editwin_get_window(e));
+  ctx = owl_editcontext_new(OWL_CTX_EDITMULTI, e, "editmulti");
+  owl_global_push_context_obj(&g, ctx);
+
 }
 
@@ -1881 +1884 @@
 {
   owl_editwin *tw;
+  owl_context *ctx;
 
   tw = owl_global_set_typwin_active(&g, OWL_EDITWIN_STYLE_ONELINE, owl_global_get_cmd_history(&g));
@@ -1888 +1892 @@
   owl_editwin_insert_string(tw, line);
 
-  owl_global_push_context(&g, OWL_CTX_EDITLINE, tw, "editline", owl_editwin_get_window(tw));
+  ctx = owl_editcontext_new(OWL_CTX_EDITLINE, tw, "editline");
+  owl_global_push_context_obj(&g, ctx);
   owl_editwin_set_callback(tw, owl_callback_command);
 }
@@ -1895 +1900 @@
 {
   owl_editwin *tw;
+  owl_context *ctx;
 
   tw = owl_global_set_typwin_active(&g, OWL_EDITWIN_STYLE_ONELINE, owl_global_get_cmd_history(&g));
@@ -1900 +1906 @@
   owl_editwin_set_locktext(tw, line);
 
-  owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editresponse", owl_editwin_get_window(tw));
+  ctx = owl_editcontext_new(OWL_CTX_EDITRESPONSE, tw, "editresponse");
+  owl_global_push_context_obj(&g, ctx);
   return tw;
 }
@@ -1907 +1914 @@
 {
   owl_editwin *tw;
+  owl_context *ctx;
 
   tw = owl_global_set_typwin_active(&g, OWL_EDITWIN_STYLE_ONELINE, NULL);
@@ -1914 +1922 @@
   owl_editwin_set_locktext(tw, line);
 
-  owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editresponse", owl_editwin_get_window(tw));
+  ctx = owl_editcontext_new(OWL_CTX_EDITRESPONSE, tw, "editresponse");
+  owl_global_push_context_obj(&g, ctx);
   return tw;
 }