===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.189
retrieving revision 1.190
diff -c -r1.189 -r1.190
*** src/usr.bin/tmux/server-client.c	2016/10/09 16:24:34	1.189
--- src/usr.bin/tmux/server-client.c	2016/10/10 21:29:23	1.190
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.189 2016/10/09 16:24:34 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.190 2016/10/10 21:29:23 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 32,52 ****
  
  #include "tmux.h"
  
! void		server_client_free(int, short, void *);
! void		server_client_check_focus(struct window_pane *);
! void		server_client_check_resize(struct window_pane *);
! key_code	server_client_check_mouse(struct client *);
! void		server_client_repeat_timer(int, short, void *);
! void		server_client_check_exit(struct client *);
! void		server_client_check_redraw(struct client *);
! void		server_client_set_title(struct client *);
! void		server_client_reset_state(struct client *);
! int		server_client_assume_paste(struct session *);
  
! void		server_client_dispatch(struct imsg *, void *);
! void		server_client_dispatch_command(struct client *, struct imsg *);
! void		server_client_dispatch_identify(struct client *, struct imsg *);
! void		server_client_dispatch_shell(struct client *);
  
  /* Check if this client is inside this server. */
  int
--- 32,52 ----
  
  #include "tmux.h"
  
! static void	server_client_free(int, short, void *);
! static void	server_client_check_focus(struct window_pane *);
! static void	server_client_check_resize(struct window_pane *);
! static key_code	server_client_check_mouse(struct client *);
! static void	server_client_repeat_timer(int, short, void *);
! static void	server_client_check_exit(struct client *);
! static void	server_client_check_redraw(struct client *);
! static void	server_client_set_title(struct client *);
! static void	server_client_reset_state(struct client *);
! static int	server_client_assume_paste(struct session *);
  
! static void	server_client_dispatch(struct imsg *, void *);
! static void	server_client_dispatch_command(struct client *, struct imsg *);
! static void	server_client_dispatch_identify(struct client *, struct imsg *);
! static void	server_client_dispatch_shell(struct client *);
  
  /* Check if this client is inside this server. */
  int
***************
*** 264,270 ****
  }
  
  /* Free dead client. */
! void
  server_client_free(__unused int fd, __unused short events, void *arg)
  {
  	struct client	*c = arg;
--- 264,270 ----
  }
  
  /* Free dead client. */
! static void
  server_client_free(__unused int fd, __unused short events, void *arg)
  {
  	struct client	*c = arg;
***************
*** 289,295 ****
  }
  
  /* Check for mouse keys. */
! key_code
  server_client_check_mouse(struct client *c)
  {
  	struct session				*s = c->session;
--- 289,295 ----
  }
  
  /* Check for mouse keys. */
! static key_code
  server_client_check_mouse(struct client *c)
  {
  	struct session				*s = c->session;
***************
*** 555,561 ****
  }
  
  /* Is this fast enough to probably be a paste? */
! int
  server_client_assume_paste(struct session *s)
  {
  	struct timeval	tv;
--- 555,561 ----
  }
  
  /* Is this fast enough to probably be a paste? */
! static int
  server_client_assume_paste(struct session *s)
  {
  	struct timeval	tv;
***************
*** 787,793 ****
  }
  
  /* Check if pane should be resized. */
! void
  server_client_check_resize(struct window_pane *wp)
  {
  	struct timeval	 tv = { .tv_usec = 250000 };
--- 787,793 ----
  }
  
  /* Check if pane should be resized. */
! static void
  server_client_check_resize(struct window_pane *wp)
  {
  	struct timeval	 tv = { .tv_usec = 250000 };
***************
*** 817,823 ****
  }
  
  /* Check whether pane should be focused. */
! void
  server_client_check_focus(struct window_pane *wp)
  {
  	struct client	*c;
--- 817,823 ----
  }
  
  /* Check whether pane should be focused. */
! static void
  server_client_check_focus(struct window_pane *wp)
  {
  	struct client	*c;
***************
*** 878,884 ****
   * tty_region/tty_reset/tty_update_mode already take care of not resetting
   * things that are already in their default state.
   */
! void
  server_client_reset_state(struct client *c)
  {
  	struct window		*w = c->session->curw->window;
--- 878,884 ----
   * tty_region/tty_reset/tty_update_mode already take care of not resetting
   * things that are already in their default state.
   */
! static void
  server_client_reset_state(struct client *c)
  {
  	struct window		*w = c->session->curw->window;
***************
*** 914,920 ****
  }
  
  /* Repeat time callback. */
! void
  server_client_repeat_timer(__unused int fd, __unused short events, void *data)
  {
  	struct client	*c = data;
--- 914,920 ----
  }
  
  /* Repeat time callback. */
! static void
  server_client_repeat_timer(__unused int fd, __unused short events, void *data)
  {
  	struct client	*c = data;
***************
*** 927,933 ****
  }
  
  /* Check if client should be exited. */
! void
  server_client_check_exit(struct client *c)
  {
  	if (!(c->flags & CLIENT_EXIT))
--- 927,933 ----
  }
  
  /* Check if client should be exited. */
! static void
  server_client_check_exit(struct client *c)
  {
  	if (!(c->flags & CLIENT_EXIT))
***************
*** 945,951 ****
  }
  
  /* Check for client redraws. */
! void
  server_client_check_redraw(struct client *c)
  {
  	struct session		*s = c->session;
--- 945,951 ----
  }
  
  /* Check for client redraws. */
! static void
  server_client_check_redraw(struct client *c)
  {
  	struct session		*s = c->session;
***************
*** 1001,1007 ****
  }
  
  /* Set client title. */
! void
  server_client_set_title(struct client *c)
  {
  	struct session		*s = c->session;
--- 1001,1007 ----
  }
  
  /* Set client title. */
! static void
  server_client_set_title(struct client *c)
  {
  	struct session		*s = c->session;
***************
*** 1026,1032 ****
  }
  
  /* Dispatch message from client. */
! void
  server_client_dispatch(struct imsg *imsg, void *arg)
  {
  	struct client		*c = arg;
--- 1026,1032 ----
  }
  
  /* Dispatch message from client. */
! static void
  server_client_dispatch(struct imsg *imsg, void *arg)
  {
  	struct client		*c = arg;
***************
*** 1130,1136 ****
  }
  
  /* Handle command message. */
! void
  server_client_dispatch_command(struct client *c, struct imsg *imsg)
  {
  	struct msg_command_data	  data;
--- 1130,1136 ----
  }
  
  /* Handle command message. */
! static void
  server_client_dispatch_command(struct client *c, struct imsg *imsg)
  {
  	struct msg_command_data	  data;
***************
*** 1183,1189 ****
  }
  
  /* Handle identify message. */
! void
  server_client_dispatch_identify(struct client *c, struct imsg *imsg)
  {
  	const char	*data, *home;
--- 1183,1189 ----
  }
  
  /* Handle identify message. */
! static void
  server_client_dispatch_identify(struct client *c, struct imsg *imsg)
  {
  	const char	*data, *home;
***************
*** 1291,1297 ****
  }
  
  /* Handle shell message. */
! void
  server_client_dispatch_shell(struct client *c)
  {
  	const char	*shell;
--- 1291,1297 ----
  }
  
  /* Handle shell message. */
! static void
  server_client_dispatch_shell(struct client *c)
  {
  	const char	*shell;