Changeset c394de8

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.

Files:

• Makefile.am (modified) (1 diff)
• commands.c (modified) (2 diffs)
• editcontext.c (added)
• functions.c (modified) (8 diffs)
• global.c (modified) (2 diffs)

Makefile.am

@@ -46 +46 @@
      aim.c buddy.c buddylist.c style.c errqueue.c \
      zbuddylist.c popexec.c select.c wcwidth.c \
-     glib_compat.c mainpanel.c msgwin.c sepbar.c
+     glib_compat.c mainpanel.c msgwin.c sepbar.c editcontext.c
 
 NORMAL_SRCS = filterproc.c window.c windowcb.c

commands.c

@@ -2693 +2693 @@
 
   owl_global_set_typwin_inactive(&g);
-  owl_editwin_unref(e);
 }
 
@@ -2746 +2745 @@
   }
 
+  /* Take a reference to the editwin, so that it survives the pop
+   * context. TODO: We should perhaps refcount or otherwise protect
+   * the context so that, even if a command pops a context, the
+   * context itself will last until the command returns. */
+  owl_editwin_ref(e);
   owl_global_set_typwin_inactive(&g);
   owl_global_pop_context(&g);

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;
 }

global.c

@@ -285 +285 @@
 owl_editwin *owl_global_current_typwin(const owl_global *g) {
   owl_context *ctx = owl_global_get_context(g);
-  /* Get the current editwin from the context. */
-  if (ctx && owl_context_matches(ctx, OWL_CTX_TYPWIN)) {
-    return owl_context_get_data(ctx);
-  }
-  return NULL;
+  return owl_editcontext_get_editwin(ctx);
 }
 
@@ -347 +343 @@
   owl_window_dirty(g->mainpanel.typwin);
 
+  owl_editwin_unref(g->tw);
   g->tw = NULL;
 }