Changeset fc5eef4

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:

6a35938

Parents:

c394de8

git-author:

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

git-committer:

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

Message:

Configure owl_global_set_typwin_inactive to be called on context deactivate

This removes the explicit calls to the deactivate function. In
particular, it means that we can set up an alternate deactivate function
and edit:done needn't know about it.

Files:

• commands.c (modified) (2 diffs)
• functions.c (modified) (4 diffs)
• global.c (modified) (1 diff)
• owl.h (modified) (1 diff)

commands.c

@@ -2691 +2691 @@
 
   owl_global_pop_context(&g);
-
-  owl_global_set_typwin_inactive(&g);
 }
 
@@ -2750 +2748 @@
    * 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

@@ -288 +288 @@
   owl_editwin_set_callback(e, callback);
   ctx = owl_editcontext_new(OWL_CTX_EDITMULTI, e, "editmulti");
+  ctx->deactivate_cb = owl_global_deactivate_editcontext;
+  ctx->cbdata = &g;
   owl_global_push_context_obj(&g, ctx);
 
@@ -1893 +1895 @@
 
   ctx = owl_editcontext_new(OWL_CTX_EDITLINE, tw, "editline");
+  ctx->deactivate_cb = owl_global_deactivate_editcontext;
+  ctx->cbdata = &g;
   owl_global_push_context_obj(&g, ctx);
   owl_editwin_set_callback(tw, owl_callback_command);
@@ -1907 +1911 @@
 
   ctx = owl_editcontext_new(OWL_CTX_EDITRESPONSE, tw, "editresponse");
+  ctx->deactivate_cb = owl_global_deactivate_editcontext;
+  ctx->cbdata = &g;
   owl_global_push_context_obj(&g, ctx);
   return tw;
@@ -1923 +1929 @@
 
   ctx = owl_editcontext_new(OWL_CTX_EDITRESPONSE, tw, "editresponse");
+  ctx->deactivate_cb = owl_global_deactivate_editcontext;
+  ctx->cbdata = &g;
   owl_global_push_context_obj(&g, ctx);
   return tw;

global.c

@@ -330 +330 @@
                           hist);
   return g->tw;
+}
+
+void owl_global_deactivate_editcontext(owl_context *ctx) {
+  owl_global *g = ctx->cbdata;
+  owl_global_set_typwin_inactive(g);
 }
 

owl.h

@@ -306 +306 @@
   void (*deactivate_cb)(struct _owl_context*);
   void (*delete_cb)(struct _owl_context*);
+  void *cbdata;
 } owl_context;