Changeset 005eae5 for global.c

Timestamp:

Sep 18, 2010, 5:07:39 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.7, release-1.8, release-1.9

Children:

818f19c

Parents:

a8186dc

git-author:

David Benjamin <davidben@mit.edu> (08/01/10 16:55:05)

git-committer:

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

Message:

Make owl_global_get_typwin return the context's typwin

The only remaining callers are the perl glue and some functions in
keys.c. This makes that allo of that code independent of a global
editwin.

File:

• global.c (modified) (2 diffs)

global.c

@@ -151 +151 @@
 }
 
-owl_context *owl_global_get_context(owl_global *g) {
+owl_context *owl_global_get_context(const owl_global *g) {
   if (!g->context_stack)
     return NULL;
@@ -283 +283 @@
 /* typwin */
 
+/* Gets the currently active typwin out of the current context. */
 owl_editwin *owl_global_get_typwin(const owl_global *g) {
-  return(g->tw);
+  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;
 }