===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/key-bindings.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -c -r1.85 -r1.86
*** src/usr.bin/tmux/key-bindings.c	2018/02/28 08:55:44	1.85
--- src/usr.bin/tmux/key-bindings.c	2018/08/02 11:44:07	1.86
***************
*** 1,4 ****
! /* $OpenBSD: key-bindings.c,v 1.85 2018/02/28 08:55:44 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: key-bindings.c,v 1.86 2018/08/02 11:44:07 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 24,40 ****
  
  #include "tmux.h"
  
! RB_GENERATE(key_bindings, key_binding, entry, key_bindings_cmp);
! RB_GENERATE(key_tables, key_table, entry, key_table_cmp);
! struct key_tables key_tables = RB_INITIALIZER(&key_tables);
  
! int
! key_table_cmp(struct key_table *e1, struct key_table *e2)
  {
! 	return (strcmp(e1->name, e2->name));
  }
  
! int
  key_bindings_cmp(struct key_binding *bd1, struct key_binding *bd2)
  {
  	if (bd1->key < bd2->key)
--- 24,42 ----
  
  #include "tmux.h"
  
! static int key_bindings_cmp(struct key_binding *, struct key_binding *);
! RB_GENERATE_STATIC(key_bindings, key_binding, entry, key_bindings_cmp);
! static int key_table_cmp(struct key_table *, struct key_table *);
! RB_GENERATE_STATIC(key_tables, key_table, entry, key_table_cmp);
! static struct key_tables key_tables = RB_INITIALIZER(&key_tables);
  
! static int
! key_table_cmp(struct key_table *table1, struct key_table *table2)
  {
! 	return (strcmp(table1->name, table2->name));
  }
  
! static int
  key_bindings_cmp(struct key_binding *bd1, struct key_binding *bd2)
  {
  	if (bd1->key < bd2->key)
***************
*** 64,69 ****
--- 66,83 ----
  	return (table);
  }
  
+ struct key_table *
+ key_bindings_first_table(void)
+ {
+ 	return (RB_MIN(key_tables, &key_tables));
+ }
+ 
+ struct key_table *
+ key_bindings_next_table(struct key_table *table)
+ {
+ 	return (RB_NEXT(key_tables, &key_tables, table));
+ }
+ 
  void
  key_bindings_unref_table(struct key_table *table)
  {
***************
*** 81,86 ****
--- 95,121 ----
  
  	free((void *)table->name);
  	free(table);
+ }
+ 
+ struct key_binding *
+ key_bindings_get(struct key_table *table, key_code key)
+ {
+ 	struct key_binding	bd;
+ 
+ 	bd.key = key;
+ 	return (RB_FIND(key_bindings, &table->key_bindings, &bd));
+ }
+ 
+ struct key_binding *
+ key_bindings_first(struct key_table *table)
+ {
+ 	return (RB_MIN(key_bindings, &table->key_bindings));
+ }
+ 
+ struct key_binding *
+ key_bindings_next(__unused struct key_table *table, struct key_binding *bd)
+ {
+ 	return (RB_NEXT(key_bindings, &table->key_bindings, bd));
  }
  
  void