Changeset 07b59ea

Timestamp:

Jun 3, 2010, 2:58:30 AM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

e8128c5

Parents:

4dd115f

Message:

Maintain the cursor location with the context stack

Files:

• context.c (modified) (1 diff)
• functions.c (modified) (6 diffs)
• global.c (modified) (4 diffs)
• owl.c (modified) (3 diffs)
• owl.h (modified) (1 diff)
• popexec.c (modified) (1 diff)

context.c

@@ -9 +9 @@
   ctx->mode = OWL_CTX_STARTUP;
   ctx->data = NULL;
+  ctx->cursor = NULL;
   return 0;
 }

functions.c

@@ -292 +292 @@
   owl_editwin_set_cbdata(e, data, cleanup);
   owl_editwin_set_callback(e, callback);
-  owl_global_push_context(&g, OWL_CTX_EDITMULTI, e, "editmulti");
+  owl_global_push_context(&g, OWL_CTX_EDITMULTI, e, "editmulti", owl_global_get_curs_typwin(&g));
 }
 
@@ -1260 +1260 @@
 
   owl_popwin_up(pw);
-  owl_global_push_context(&g, OWL_CTX_POPLESS, v, "popless");
+  owl_global_push_context(&g, OWL_CTX_POPLESS, v, "popless", NULL);
   owl_viewwin_init_text(v, owl_popwin_get_content(pw), text);
 }
@@ -1273 +1273 @@
 
   owl_popwin_up(pw);
-  owl_global_push_context(&g, OWL_CTX_POPLESS, v, "popless");
+  owl_global_push_context(&g, OWL_CTX_POPLESS, v, "popless", NULL);
   owl_viewwin_init_fmtext(v, owl_popwin_get_content(pw), fm);
 }
@@ -1895 +1895 @@
   owl_editwin_insert_string(tw, line);
 
-  owl_global_push_context(&g, OWL_CTX_EDITLINE, tw, "editline");
+  owl_global_push_context(&g, OWL_CTX_EDITLINE, tw, "editline", owl_global_get_curs_typwin(&g));
   owl_editwin_set_callback(tw, owl_callback_command);
 }
@@ -1907 +1907 @@
   owl_editwin_set_locktext(tw, line);
 
-  owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editresponse");
+  owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editresponse", owl_global_get_curs_typwin(&g));
   return tw;
 }
@@ -1921 +1921 @@
   owl_editwin_set_locktext(tw, line);
 
-  owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editresponse");
+  owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editresponse", owl_global_get_curs_typwin(&g));
   return tw;
 }

global.c

@@ -34 +34 @@
 
   g->context_stack = NULL;
-  owl_global_push_context(g, OWL_CTX_STARTUP, NULL, NULL);
+  owl_global_push_context(g, OWL_CTX_STARTUP, NULL, NULL, NULL);
 
   g->curmsg=0;
@@ -177 +177 @@
 }
 
-static void owl_global_lookup_keymap(owl_global *g) {
-  owl_context *c = owl_global_get_context(g);
-  if (!c || !c->keymap)
+static void owl_global_activate_context(owl_global *g, owl_context *c) {
+  if (!c)
     return;
 
-  if (!owl_keyhandler_activate(owl_global_get_keyhandler(g), c->keymap)) {
-    owl_function_error("Unable to activate keymap '%s'", c->keymap);
-  }
-}
-
-void owl_global_push_context(owl_global *g, int mode, void *data, const char *keymap) {
+  if (c->keymap) {
+    if (!owl_keyhandler_activate(owl_global_get_keyhandler(g), c->keymap)) {
+      owl_function_error("Unable to activate keymap '%s'", c->keymap);
+    }
+  }
+  owl_window_set_cursor(c->cursor);
+}
+
+void owl_global_push_context(owl_global *g, int mode, void *data, const char *keymap, owl_window *cursor) {
   owl_context *c;
   if (!(mode & OWL_CTX_MODE_BITS))
@@ -194 +196 @@
   c->mode = mode;
   c->data = data;
+  c->cursor = cursor ? g_object_ref(cursor) : NULL;
   c->keymap = owl_strdup(keymap);
   g->context_stack = g_list_prepend(g->context_stack, c);
-  owl_global_lookup_keymap(g);
+  owl_global_activate_context(g, owl_global_get_context(g));
 }
 
@@ -206 +209 @@
   g->context_stack = g_list_delete_link(g->context_stack,
                                         g->context_stack);
+  if (c->cursor)
+    g_object_unref(c->cursor);
   owl_free(c->keymap);
   owl_free(c);
-  owl_global_lookup_keymap(g);
+  owl_global_activate_context(g, owl_global_get_context(g));
 }
 

owl.c

@@ -464 +464 @@
   if (owl_global_is_needrefresh(&g)) {
     /* Redraw the screen */
-
-    /* HACK: move the cursor to unmanaged window if necessary; these should be
-     * associated with the context or something. */
-    if (!owl_popwin_is_active(owl_global_get_popwin(&g))
-        && owl_global_get_typwin(&g)) {
-      owl_window_set_cursor(owl_global_get_curs_typwin(&g));
-    } else {
-      owl_window_set_cursor(NULL);
-    }
-
     owl_window_redraw_scheduled();
     doupdate();
@@ -549 +539 @@
 
   owl_global_pop_context(&g);
-  owl_global_push_context(&g, OWL_CTX_READCONFIG, NULL, NULL);
+  owl_global_push_context(&g, OWL_CTX_READCONFIG, NULL, NULL, NULL);
 
   perlerr=owl_perlconfig_initperl(opts.configfile, &argc, &argv, &env);
@@ -616 +606 @@
 
   owl_global_pop_context(&g);
-  owl_global_push_context(&g, OWL_CTX_READCONFIG|OWL_CTX_RECV, NULL, "recv");
+  owl_global_push_context(&g, OWL_CTX_READCONFIG|OWL_CTX_RECV, NULL, "recv", NULL);
 
   owl_select_add_pre_select_action(owl_refresh_pre_select_action, NULL, NULL);

owl.h

@@ -310 +310 @@
   void *data;           /* determined by mode */
   char *keymap;
+  owl_window *cursor;
 } owl_context;
 

popexec.c

@@ -27 +27 @@
 
   owl_popwin_up(pw);
-  owl_global_push_context(&g, OWL_CTX_POPLESS, v, "popless");
+  owl_global_push_context(&g, OWL_CTX_POPLESS, v, "popless", NULL);
   owl_viewwin_init_text(v, owl_popwin_get_content(pw), "");
   owl_viewwin_set_onclose_hook(v, owl_popexec_viewwin_onclose, pe);