===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/window-choose.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -c -r1.78 -r1.79
*** src/usr.bin/tmux/Attic/window-choose.c	2016/10/11 07:23:34	1.78
--- src/usr.bin/tmux/Attic/window-choose.c	2016/10/11 13:21:59	1.79
***************
*** 1,4 ****
! /* $OpenBSD: window-choose.c,v 1.78 2016/10/11 07:23:34 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: window-choose.c,v 1.79 2016/10/11 13:21:59 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 24,51 ****
  
  #include "tmux.h"
  
! struct screen *window_choose_init(struct window_pane *);
! void	window_choose_free(struct window_pane *);
! void	window_choose_resize(struct window_pane *, u_int, u_int);
! void	window_choose_key(struct window_pane *, struct client *,
! 	    struct session *, key_code, struct mouse_event *);
  
! void	window_choose_default_callback(struct window_choose_data *);
! struct window_choose_mode_item *window_choose_get_item(struct window_pane *,
! 	    key_code, struct mouse_event *);
  
! void	window_choose_fire_callback(struct window_pane *,
! 	    struct window_choose_data *);
! void	window_choose_redraw_screen(struct window_pane *);
! void	window_choose_write_line(struct window_pane *,
! 	    struct screen_write_ctx *, u_int);
  
! void	window_choose_scroll_up(struct window_pane *);
! void	window_choose_scroll_down(struct window_pane *);
  
! void	window_choose_collapse(struct window_pane *, struct session *, u_int);
! void	window_choose_expand(struct window_pane *, struct session *, u_int);
  
  enum window_choose_input_type {
  	WINDOW_CHOOSE_NORMAL = -1,
  	WINDOW_CHOOSE_GOTO_ITEM,
--- 24,56 ----
  
  #include "tmux.h"
  
! static struct screen *window_choose_init(struct window_pane *);
! static void	window_choose_free(struct window_pane *);
! static void	window_choose_resize(struct window_pane *, u_int, u_int);
! static void	window_choose_key(struct window_pane *, struct client *,
! 		    struct session *, key_code, struct mouse_event *);
  
! static void	window_choose_default_callback(struct window_choose_data *);
! static struct window_choose_mode_item *window_choose_get_item(
! 		    struct window_pane *, key_code, struct mouse_event *);
  
! static void	window_choose_fire_callback(struct window_pane *,
! 		    struct window_choose_data *);
! static void	window_choose_redraw_screen(struct window_pane *);
! static void	window_choose_write_line(struct window_pane *,
! 		    struct screen_write_ctx *, u_int);
  
! static void	window_choose_scroll_up(struct window_pane *);
! static void	window_choose_scroll_down(struct window_pane *);
  
! static void	window_choose_collapse(struct window_pane *, struct session *,
! 		    u_int);
! static void	window_choose_expand(struct window_pane *, struct session *,
! 		    u_int);
! static void	window_choose_collapse_all(struct window_pane *);
  
+ static void	window_choose_data_free(struct window_choose_data *);
+ 
  enum window_choose_input_type {
  	WINDOW_CHOOSE_NORMAL = -1,
  	WINDOW_CHOOSE_GOTO_ITEM,
***************
*** 86,97 ****
  	void 			(*callbackfn)(struct window_choose_data *);
  };
  
! void	window_choose_free1(struct window_choose_mode_data *);
! int     window_choose_key_index(struct window_choose_mode_data *, u_int);
! int     window_choose_index_key(struct window_choose_mode_data *, key_code);
! void	window_choose_prompt_input(enum window_choose_input_type,
! 	    const char *, struct window_pane *, key_code);
! void	window_choose_reset_top(struct window_pane *, u_int);
  
  void
  window_choose_add(struct window_pane *wp, struct window_choose_data *wcd)
--- 91,104 ----
  	void 			(*callbackfn)(struct window_choose_data *);
  };
  
! static void	window_choose_free1(struct window_choose_mode_data *);
! static int	window_choose_key_index(struct window_choose_mode_data *,
! 		    u_int);
! static int	window_choose_index_key(struct window_choose_mode_data *,
! 		    key_code);
! static void	window_choose_prompt_input(enum window_choose_input_type,
! 		    const char *, struct window_pane *, key_code);
! static void	window_choose_reset_top(struct window_pane *, u_int);
  
  void
  window_choose_add(struct window_pane *wp, struct window_choose_data *wcd)
***************
*** 122,128 ****
  	window_choose_reset_top(wp, screen_size_y(s));
  }
  
! void
  window_choose_reset_top(struct window_pane *wp, u_int sy)
  {
  	struct window_choose_mode_data	*data = wp->modedata;
--- 129,135 ----
  	window_choose_reset_top(wp, screen_size_y(s));
  }
  
! static void
  window_choose_reset_top(struct window_pane *wp, u_int sy)
  {
  	struct window_choose_mode_data	*data = wp->modedata;
***************
*** 156,162 ****
  	window_choose_collapse_all(wp);
  }
  
! struct screen *
  window_choose_init(struct window_pane *wp)
  {
  	struct window_choose_mode_data	*data;
--- 163,169 ----
  	window_choose_collapse_all(wp);
  }
  
! static struct screen *
  window_choose_init(struct window_pane *wp)
  {
  	struct window_choose_mode_data	*data;
***************
*** 218,224 ****
  	return (wcd);
  }
  
! void
  window_choose_data_free(struct window_choose_data *wcd)
  {
  	server_client_unref(wcd->start_client);
--- 225,231 ----
  	return (wcd);
  }
  
! static void
  window_choose_data_free(struct window_choose_data *wcd)
  {
  	server_client_unref(wcd->start_client);
***************
*** 260,266 ****
  	cmd_list_free(cmdlist);
  }
  
! void
  window_choose_default_callback(struct window_choose_data *wcd)
  {
  	if (wcd == NULL)
--- 267,273 ----
  	cmd_list_free(cmdlist);
  }
  
! static void
  window_choose_default_callback(struct window_choose_data *wcd)
  {
  	if (wcd == NULL)
***************
*** 271,284 ****
  	window_choose_data_run(wcd);
  }
  
! void
  window_choose_free(struct window_pane *wp)
  {
  	if (wp->modedata != NULL)
  		window_choose_free1(wp->modedata);
  }
  
! void
  window_choose_free1(struct window_choose_mode_data *data)
  {
  	struct window_choose_mode_item	*item;
--- 278,291 ----
  	window_choose_data_run(wcd);
  }
  
! static void
  window_choose_free(struct window_pane *wp)
  {
  	if (wp->modedata != NULL)
  		window_choose_free1(wp->modedata);
  }
  
! static void
  window_choose_free1(struct window_choose_mode_data *data)
  {
  	struct window_choose_mode_item	*item;
***************
*** 301,307 ****
  	free(data);
  }
  
! void
  window_choose_resize(struct window_pane *wp, u_int sx, u_int sy)
  {
  	struct window_choose_mode_data	*data = wp->modedata;
--- 308,314 ----
  	free(data);
  }
  
! static void
  window_choose_resize(struct window_pane *wp, u_int sx, u_int sy)
  {
  	struct window_choose_mode_data	*data = wp->modedata;
***************
*** 312,318 ****
  	window_choose_redraw_screen(wp);
  }
  
! void
  window_choose_fire_callback(struct window_pane *wp,
      struct window_choose_data *wcd)
  {
--- 319,325 ----
  	window_choose_redraw_screen(wp);
  }
  
! static void
  window_choose_fire_callback(struct window_pane *wp,
      struct window_choose_data *wcd)
  {
***************
*** 326,332 ****
  	window_choose_free1(data);
  }
  
! void
  window_choose_prompt_input(enum window_choose_input_type input_type,
      const char *prompt, struct window_pane *wp, key_code key)
  {
--- 333,339 ----
  	window_choose_free1(data);
  }
  
! static void
  window_choose_prompt_input(enum window_choose_input_type input_type,
      const char *prompt, struct window_pane *wp, key_code key)
  {
***************
*** 344,350 ****
  	window_choose_redraw_screen(wp);
  }
  
! void
  window_choose_collapse(struct window_pane *wp, struct session *s, u_int pos)
  {
  	struct window_choose_mode_data	*data = wp->modedata;
--- 351,357 ----
  	window_choose_redraw_screen(wp);
  }
  
! static void
  window_choose_collapse(struct window_pane *wp, struct session *s, u_int pos)
  {
  	struct window_choose_mode_data	*data = wp->modedata;
***************
*** 395,401 ****
  	}
  }
  
! void
  window_choose_collapse_all(struct window_pane *wp)
  {
  	struct window_choose_mode_data	*data = wp->modedata;
--- 402,408 ----
  	}
  }
  
! static void
  window_choose_collapse_all(struct window_pane *wp)
  {
  	struct window_choose_mode_data	*data = wp->modedata;
***************
*** 446,452 ****
  	window_choose_reset_top(wp, screen_size_y(scr));
  }
  
! void
  window_choose_expand(struct window_pane *wp, struct session *s, u_int pos)
  {
  	struct window_choose_mode_data	*data = wp->modedata;
--- 453,459 ----
  	window_choose_reset_top(wp, screen_size_y(scr));
  }
  
! static void
  window_choose_expand(struct window_pane *wp, struct session *s, u_int pos)
  {
  	struct window_choose_mode_data	*data = wp->modedata;
***************
*** 518,524 ****
  	}
  }
  
! struct window_choose_mode_item *
  window_choose_get_item(struct window_pane *wp, key_code key,
      struct mouse_event *m)
  {
--- 525,531 ----
  	}
  }
  
! static struct window_choose_mode_item *
  window_choose_get_item(struct window_pane *wp, key_code key,
      struct mouse_event *m)
  {
***************
*** 537,543 ****
  	return (&data->list[idx]);
  }
  
! void
  window_choose_key(struct window_pane *wp, __unused struct client *c,
      __unused struct session *sess, key_code key, struct mouse_event *m)
  {
--- 544,550 ----
  	return (&data->list[idx]);
  }
  
! static void
  window_choose_key(struct window_pane *wp, __unused struct client *c,
      __unused struct session *sess, key_code key, struct mouse_event *m)
  {
***************
*** 769,775 ****
  	}
  }
  
! void
  window_choose_write_line(struct window_pane *wp, struct screen_write_ctx *ctx,
      u_int py)
  {
--- 776,782 ----
  	}
  }
  
! static void
  window_choose_write_line(struct window_pane *wp, struct screen_write_ctx *ctx,
      u_int py)
  {
***************
*** 827,833 ****
  
  }
  
! int
  window_choose_key_index(struct window_choose_mode_data *data, u_int idx)
  {
  	static const char	keys[] = "0123456789"
--- 834,840 ----
  
  }
  
! static int
  window_choose_key_index(struct window_choose_mode_data *data, u_int idx)
  {
  	static const char	keys[] = "0123456789"
***************
*** 846,852 ****
  	return (-1);
  }
  
! int
  window_choose_index_key(struct window_choose_mode_data *data, key_code key)
  {
  	static const char	keys[] = "0123456789"
--- 853,859 ----
  	return (-1);
  }
  
! static int
  window_choose_index_key(struct window_choose_mode_data *data, key_code key)
  {
  	static const char	keys[] = "0123456789"
***************
*** 867,873 ****
  	return (-1);
  }
  
! void
  window_choose_redraw_screen(struct window_pane *wp)
  {
  	struct window_choose_mode_data	*data = wp->modedata;
--- 874,880 ----
  	return (-1);
  }
  
! static void
  window_choose_redraw_screen(struct window_pane *wp)
  {
  	struct window_choose_mode_data	*data = wp->modedata;
***************
*** 881,887 ****
  	screen_write_stop(&ctx);
  }
  
! void
  window_choose_scroll_up(struct window_pane *wp)
  {
  	struct window_choose_mode_data	*data = wp->modedata;
--- 888,894 ----
  	screen_write_stop(&ctx);
  }
  
! static void
  window_choose_scroll_up(struct window_pane *wp)
  {
  	struct window_choose_mode_data	*data = wp->modedata;
***************
*** 900,906 ****
  	screen_write_stop(&ctx);
  }
  
! void
  window_choose_scroll_down(struct window_pane *wp)
  {
  	struct window_choose_mode_data	*data = wp->modedata;
--- 907,913 ----
  	screen_write_stop(&ctx);
  }
  
! static void
  window_choose_scroll_down(struct window_pane *wp)
  {
  	struct window_choose_mode_data	*data = wp->modedata;