Changeset 1d74663

Timestamp:

Sep 18, 2010, 5:07:39 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:

cb81570

Parents:

818f19c

git-author:

David Benjamin <davidben@mit.edu> (08/07/10 16:15:02)

git-committer:

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

Message:

Add deactivate and delete hooks for owl_context

Also make pushing and popping slightly more flexible.

Files:

• context.c (modified) (1 diff)
• global.c (modified) (1 diff)
• owl.h (modified) (1 diff)

context.c

@@ -53 +53 @@
   return(ctx->mode & OWL_CTX_INTERACTIVE)?1:0;
 }
+
+void owl_context_deactivate(owl_context *ctx)
+{
+  if (ctx->deactivate_cb)
+    ctx->deactivate_cb(ctx);
+}
+
+void owl_context_delete(owl_context *ctx)
+{
+  if (ctx->cursor)
+    g_object_unref(ctx->cursor);
+  owl_free(ctx->keymap);
+  if (ctx->delete_cb)
+    ctx->delete_cb(ctx);
+  owl_free(ctx);
+}

global.c

@@ -174 +174 @@
     mode |= OWL_CTX_INTERACTIVE;
   c = owl_malloc(sizeof *c);
+  memset(c, 0, sizeof(*c));
   c->mode = mode;
   c->data = data;
   c->cursor = cursor ? g_object_ref(cursor) : NULL;
   c->keymap = owl_strdup(keymap);
+  owl_global_push_context_obj(g, c);
+}
+
+void owl_global_push_context_obj(owl_global *g, owl_context *c)
+{
   g->context_stack = g_list_prepend(g->context_stack, c);
   owl_global_activate_context(g, owl_global_get_context(g));
 }
 
+/* Pops the current context from the context stack and returns it. Caller is
+ * responsible for freeing. */
+owl_context *owl_global_pop_context_no_delete(owl_global *g) {
+  owl_context *c;
+  if (!g->context_stack)
+    return NULL;
+  c = owl_global_get_context(g);
+  owl_context_deactivate(c);
+  g->context_stack = g_list_delete_link(g->context_stack,
+                                        g->context_stack);
+  owl_global_activate_context(g, owl_global_get_context(g));
+  return c;
+}
+
+/* Pops the current context from the context stack and deletes it. */
 void owl_global_pop_context(owl_global *g) {
   owl_context *c;
-  if (!g->context_stack)
-    return;
-  c = owl_global_get_context(g);
-  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_activate_context(g, owl_global_get_context(g));
+  c = owl_global_pop_context_no_delete(g);
+  if (c)
+    owl_context_delete(c);
 }
 

owl.h

@@ -304 +304 @@
   char *keymap;
   owl_window *cursor;
+  void (*deactivate_cb)(struct _owl_context*);
+  void (*delete_cb)(struct _owl_context*);
 } owl_context;