Changeset 2a17b63 for functions.c

Timestamp:

Jan 7, 2010, 6:54:15 PM (14 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

10557e6

Parents:

a999d9e

git-author:

Nelson Elhage <nelhage@mit.edu> (12/30/09 17:52:20)

git-committer:

Nelson Elhage <nelhage@mit.edu> (01/07/10 18:54:15)

Message:

Push and pop contexts whenever we change context.

This allows us to get rid of the awful hack in owl_process_input_char,
and opens the path to being able to invoke popup windows from the
editwin and vice versa (In fact, you can now do so without
segfaulting, although the display layer does not yet quite do the
right thing).

File:

• functions.c (modified) (7 diffs)

functions.c

@@ -301 +301 @@
   owl_editwin_set_cbdata(owl_global_get_typwin(&g), data);
   owl_global_set_buffercallback(&g, callback);
+  owl_global_push_context(&g, OWL_CTX_EDITMULTI, e, "editmulti");
 }
 
@@ -1301 +1302 @@
 
   owl_popwin_up(pw);
+  owl_global_push_context(&g, OWL_CTX_POPLESS, v, "popless");
   owl_viewwin_init_text(v, owl_popwin_get_curswin(pw),
                         owl_popwin_get_lines(pw), owl_popwin_get_cols(pw),
@@ -1318 +1320 @@
 
   owl_popwin_up(pw);
+  owl_global_push_context(&g, OWL_CTX_POPLESS, v, "popless");
   owl_viewwin_init_fmtext(v, owl_popwin_get_curswin(pw),
                    owl_popwin_get_lines(pw), owl_popwin_get_cols(pw),
@@ -1940 +1943 @@
   owl_editwin_redisplay(tw, 0);
 
-  owl_context_set_editline(owl_global_get_context(&g), tw);
-  owl_function_activate_keymap("editline");
+  owl_global_push_context(&g, OWL_CTX_EDITLINE, tw, "editline");
 }
 
@@ -1957 +1959 @@
   owl_editwin_redisplay(tw, 0);
 
-  owl_context_set_editresponse(owl_global_get_context(&g), tw);
-  owl_function_activate_keymap("editresponse");
+  owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editline");
 }
 
@@ -1975 +1976 @@
   owl_editwin_redisplay(tw, 0);
 
-  owl_context_set_editresponse(owl_global_get_context(&g), tw);
-  owl_function_activate_keymap("editresponse");
+  owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editresponse");
 }
 
@@ -2830 +2830 @@
   if (direction==0) {
     owl_list_append_element(fl, f);
-  }
-}
-
-void owl_function_activate_keymap(const char *keymap)
-{
-  if (!owl_keyhandler_activate(owl_global_get_keyhandler(&g), keymap)) {
-    owl_function_error("Unable to activate keymap '%s'", keymap);
   }
 }