===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v
retrieving revision 1.249
retrieving revision 1.250
diff -c -r1.249 -r1.250
*** src/usr.bin/tmux/window.c	2020/03/16 08:23:24	1.249
--- src/usr.bin/tmux/window.c	2020/03/19 14:03:49	1.250
***************
*** 1,4 ****
! /* $OpenBSD: window.c,v 1.249 2020/03/16 08:23:24 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: window.c,v 1.250 2020/03/19 14:03:49 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 891,897 ****
  	if (gethostname(host, sizeof host) == 0)
  		screen_set_title(&wp->base, host);
  
! 	input_init(wp);
  
  	return (wp);
  }
--- 891,897 ----
  	if (gethostname(host, sizeof host) == 0)
  		screen_set_title(&wp->base, host);
  
! 	wp->ictx = input_init(wp);
  
  	return (wp);
  }
***************
*** 907,913 ****
  		close(wp->fd);
  	}
  
! 	input_free(wp);
  
  	screen_free(&wp->status_screen);
  
--- 907,913 ----
  		close(wp->fd);
  	}
  
! 	input_free(wp->ictx);
  
  	screen_free(&wp->status_screen);
  
***************
*** 949,955 ****
  	}
  
  	log_debug("%%%u has %zu bytes", wp->id, size);
! 	input_parse(wp);
  
  	wp->pipe_off = EVBUFFER_LENGTH(evb);
  }
--- 949,955 ----
  	}
  
  	log_debug("%%%u has %zu bytes", wp->id, size);
! 	input_parse_pane(wp);
  
  	wp->pipe_off = EVBUFFER_LENGTH(evb);
  }
***************
*** 1257,1263 ****
  	if (wp->fd == -1 || wp->flags & PANE_INPUTOFF)
  		return (0);
  
! 	if (input_key(wp, key, m) != 0)
  		return (-1);
  
  	if (KEYC_IS_MOUSE(key))
--- 1257,1263 ----
  	if (wp->fd == -1 || wp->flags & PANE_INPUTOFF)
  		return (0);
  
! 	if (input_key_pane(wp, key, m) != 0)
  		return (-1);
  
  	if (KEYC_IS_MOUSE(key))
***************
*** 1269,1275 ****
  			    wp2->fd != -1 &&
  			    (~wp2->flags & PANE_INPUTOFF) &&
  			    window_pane_visible(wp2))
! 				input_key(wp2, key, NULL);
  		}
  	}
  	return (0);
--- 1269,1275 ----
  			    wp2->fd != -1 &&
  			    (~wp2->flags & PANE_INPUTOFF) &&
  			    window_pane_visible(wp2))
! 				input_key_pane(wp2, key, NULL);
  		}
  	}
  	return (0);