Changeset 44cc9ab for keymap.c

Timestamp:

May 29, 2010, 1:13:50 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:

449af72, d27ecf3

Parents:

13ebf92

git-author:

David Benjamin <davidben@mit.edu> (05/24/10 15:08:44)

git-committer:

David Benjamin <davidben@mit.edu> (05/29/10 13:13:50)

Message:

While we're at it, rename submap to parent

Should be more consistent with other programs.

Signed-off-by: David Benjamin <davidben@mit.edu>

File:

• keymap.c (modified) (8 diffs)

keymap.c

@@ -3 +3 @@
 
 static void _owl_keymap_format_bindings(const owl_keymap *km, owl_fmtext *fm);
-static void _owl_keymap_format_with_submaps(const owl_keymap *km, owl_fmtext *fm);
+static void _owl_keymap_format_with_parents(const owl_keymap *km, owl_fmtext *fm);
 
 /* returns 0 on success */
@@ -12 +12 @@
   if ((km->desc = owl_strdup(desc)) == NULL) return(-1);
   if (0 != owl_list_create(&km->bindings)) return(-1);
-  km->submap = NULL;
+  km->parent = NULL;
   km->default_fn = default_fn;
   km->prealways_fn = prealways_fn;
@@ -27 +27 @@
 }
 
-void owl_keymap_set_submap(owl_keymap *km, const owl_keymap *submap)
-{
-  km->submap = submap;
+void owl_keymap_set_parent(owl_keymap *km, const owl_keymap *parent)
+{
+  km->parent = parent;
 }
 
@@ -99 +99 @@
     owl_fmtext_append_normal(fm, "\n");
   }
-  if (km->submap) {
-    owl_fmtext_append_normal(fm, OWL_TABSTR "Has submap: ");
-    owl_fmtext_append_normal(fm, km->submap->name);
+  if (km->parent) {
+    owl_fmtext_append_normal(fm, OWL_TABSTR "Has parent: ");
+    owl_fmtext_append_normal(fm, km->parent->name);
     owl_fmtext_append_normal(fm, "\n");
   }
@@ -120 +120 @@
   owl_fmtext_append_bold(fm, "\nKey bindings:\n\n");  
   if (recurse) {
-    _owl_keymap_format_with_submaps(km, fm);
+    _owl_keymap_format_with_parents(km, fm);
   } else {
     _owl_keymap_format_bindings(km, fm);
@@ -126 +126 @@
 }
 
-static void _owl_keymap_format_with_submaps(const owl_keymap *km, owl_fmtext *fm)
+static void _owl_keymap_format_with_parents(const owl_keymap *km, owl_fmtext *fm)
 {
   while (km) {
     _owl_keymap_format_bindings(km, fm);
-    km = km->submap;
+    km = km->parent;
     if (km) {
       owl_fmtext_append_bold(fm, "\nInherited from ");
@@ -273 +273 @@
   }
 
-  /* deal with the always_fn for the map and submaps */
-  for (km=kh->active; km; km=km->submap) {
+  /* deal with the always_fn for the map and parents */
+  for (km=kh->active; km; km=km->parent) {
     if (km->prealways_fn) {
       km->prealways_fn(j);
@@ -281 +281 @@
 
   /* search for a match.  goes through active keymap and then
-   * through submaps... TODO:  clean this up so we can pull
+   * through parents... TODO:  clean this up so we can pull
    * keyhandler and keymap apart.  */
-  for (km=kh->active; km; km=km->submap) {
+  for (km=kh->active; km; km=km->parent) {
     for (i=owl_list_get_size(&km->bindings)-1; i>=0; i--) {
       kb = owl_list_get_element(&km->bindings, i);