Changeset 13ebf92

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:

44cc9ab

Parents:

89ce405

git-author:

David Benjamin <davidben@mit.edu> (05/24/10 14:51:11)

git-committer:

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

Message:

Display submap bindings in :show keymap KEYMAP

We don't recursively expand when running :show keymaps since we're
already displaying every keymap.

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

Files:

• functions.c (modified) (2 diffs)
• keymap.c (modified) (3 diffs)

functions.c

@@ -2879 +2879 @@
     km = owl_keyhandler_get_keymap(kh, kmname);
     owl_fmtext_append_bold(&fm, "\n\n----------------------------------------------------------------------------------------------------\n\n");
-    owl_keymap_get_details(km, &fm);    
+    owl_keymap_get_details(km, &fm, 0);
   }
   owl_fmtext_append_normal(&fm, "\n");
@@ -2905 +2905 @@
   km = owl_keyhandler_get_keymap(owl_global_get_keyhandler(&g), name);
   if (km) {
-    owl_keymap_get_details(km, &fm);
+    owl_keymap_get_details(km, &fm, 1);
   } else {
     owl_fmtext_append_normal(&fm, "No such keymap...\n");

keymap.c

@@ -1 +1 @@
 #include <string.h>
 #include "owl.h"
+
+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);
 
 /* returns 0 on success */
@@ -86 +89 @@
 
 /* Appends details about the keymap to fm */
-void owl_keymap_get_details(const owl_keymap *km, owl_fmtext *fm)
-{
-  int i, nbindings; 
-  const owl_keybinding *kb;
-  
+void owl_keymap_get_details(const owl_keymap *km, owl_fmtext *fm, int recurse)
+{
   owl_fmtext_append_bold(fm, "KEYMAP - ");
   owl_fmtext_append_bold(fm, km->name);
@@ -119 +119 @@
 
   owl_fmtext_append_bold(fm, "\nKey bindings:\n\n");  
+  if (recurse) {
+    _owl_keymap_format_with_submaps(km, fm);
+  } else {
+    _owl_keymap_format_bindings(km, fm);
+  }
+}
+
+static void _owl_keymap_format_with_submaps(const owl_keymap *km, owl_fmtext *fm)
+{
+  while (km) {
+    _owl_keymap_format_bindings(km, fm);
+    km = km->submap;
+    if (km) {
+      owl_fmtext_append_bold(fm, "\nInherited from ");
+      owl_fmtext_append_bold(fm, km->name);
+      owl_fmtext_append_bold(fm, ":\n\n");
+    }
+  }
+}
+
+static void _owl_keymap_format_bindings(const owl_keymap *km, owl_fmtext *fm)
+{
+  int i, nbindings;
+  const owl_keybinding *kb;
+  
   nbindings = owl_list_get_size(&km->bindings);
   for (i=0; i<nbindings; i++) {