Changeset 44cc9ab for keymap.c


Ignore:
Timestamp:
May 29, 2010, 1:13:50 PM (11 years ago)
Author:
David Benjamin <davidben@mit.edu>
Branches:
master, 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:
1 edited

Legend:

Unmodified
Added
Removed
  • keymap.c

    r13ebf92 r44cc9ab  
    33
    44static void _owl_keymap_format_bindings(const owl_keymap *km, owl_fmtext *fm);
    5 static void _owl_keymap_format_with_submaps(const owl_keymap *km, owl_fmtext *fm);
     5static void _owl_keymap_format_with_parents(const owl_keymap *km, owl_fmtext *fm);
    66
    77/* returns 0 on success */
     
    1212  if ((km->desc = owl_strdup(desc)) == NULL) return(-1);
    1313  if (0 != owl_list_create(&km->bindings)) return(-1);
    14   km->submap = NULL;
     14  km->parent = NULL;
    1515  km->default_fn = default_fn;
    1616  km->prealways_fn = prealways_fn;
     
    2727}
    2828
    29 void owl_keymap_set_submap(owl_keymap *km, const owl_keymap *submap)
    30 {
    31   km->submap = submap;
     29void owl_keymap_set_parent(owl_keymap *km, const owl_keymap *parent)
     30{
     31  km->parent = parent;
    3232}
    3333
     
    9999    owl_fmtext_append_normal(fm, "\n");
    100100  }
    101   if (km->submap) {
    102     owl_fmtext_append_normal(fm, OWL_TABSTR "Has submap: ");
    103     owl_fmtext_append_normal(fm, km->submap->name);
     101  if (km->parent) {
     102    owl_fmtext_append_normal(fm, OWL_TABSTR "Has parent: ");
     103    owl_fmtext_append_normal(fm, km->parent->name);
    104104    owl_fmtext_append_normal(fm, "\n");
    105105  }
     
    120120  owl_fmtext_append_bold(fm, "\nKey bindings:\n\n"); 
    121121  if (recurse) {
    122     _owl_keymap_format_with_submaps(km, fm);
     122    _owl_keymap_format_with_parents(km, fm);
    123123  } else {
    124124    _owl_keymap_format_bindings(km, fm);
     
    126126}
    127127
    128 static void _owl_keymap_format_with_submaps(const owl_keymap *km, owl_fmtext *fm)
     128static void _owl_keymap_format_with_parents(const owl_keymap *km, owl_fmtext *fm)
    129129{
    130130  while (km) {
    131131    _owl_keymap_format_bindings(km, fm);
    132     km = km->submap;
     132    km = km->parent;
    133133    if (km) {
    134134      owl_fmtext_append_bold(fm, "\nInherited from ");
     
    273273  }
    274274
    275   /* deal with the always_fn for the map and submaps */
    276   for (km=kh->active; km; km=km->submap) {
     275  /* deal with the always_fn for the map and parents */
     276  for (km=kh->active; km; km=km->parent) {
    277277    if (km->prealways_fn) {
    278278      km->prealways_fn(j);
     
    281281
    282282  /* search for a match.  goes through active keymap and then
    283    * through submaps... TODO:  clean this up so we can pull
     283   * through parents... TODO:  clean this up so we can pull
    284284   * keyhandler and keymap apart.  */
    285   for (km=kh->active; km; km=km->submap) {
     285  for (km=kh->active; km; km=km->parent) {
    286286    for (i=owl_list_get_size(&km->bindings)-1; i>=0; i--) {
    287287      kb = owl_list_get_element(&km->bindings, i);
Note: See TracChangeset for help on using the changeset viewer.