Changeset cb81570 for context.c

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:

08263a8

Parents:

1d74663

git-author:

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

git-committer:

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

Message:

Add a separate owl_context_new and remove owl_context_init

The latter is unused anyway.

File:

• context.c (modified) (1 diff)

context.c

@@ -5 +5 @@
 #define SET_MODE(ctx, new) ctx->mode = ((ctx->mode)&~OWL_CTX_MODE_BITS)|new
 
-int owl_context_init(owl_context *ctx)
+/* TODO: dependency from owl_context -> owl_window is annoying. */
+owl_context *owl_context_new(int mode, void *data, const char *keymap, owl_window *cursor)
 {
-  ctx->mode = OWL_CTX_STARTUP;
-  ctx->data = NULL;
-  ctx->cursor = NULL;
-  return 0;
+  owl_context *c;
+  if (!(mode & OWL_CTX_MODE_BITS))
+    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);
+  return c;
 }
-
 
 /* returns whether test matches the current context */