===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/cmd-choose-window.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -c -r1.8 -r1.9
*** src/usr.bin/tmux/Attic/cmd-choose-window.c	2009/08/25 13:32:14	1.8
--- src/usr.bin/tmux/Attic/cmd-choose-window.c	2009/09/07 21:01:50	1.9
***************
*** 1,4 ****
! /* $OpenBSD: cmd-choose-window.c,v 1.8 2009/08/25 13:32:14 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-choose-window.c,v 1.9 2009/09/07 21:01:50 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 43,50 ****
  };
  
  struct cmd_choose_window_data {
! 	u_int		 client;
! 	u_int		 session;
  	char   		*template;
  };
  
--- 43,50 ----
  };
  
  struct cmd_choose_window_data {
! 	struct client	*client;
! 	struct session	*session;
  	char   		*template;
  };
  
***************
*** 107,119 ****
  	}
  
  	cdata = xmalloc(sizeof *cdata);
- 	if (session_index(s, &cdata->session) != 0)
- 		fatalx("session not found");
  	if (data->arg != NULL)
  		cdata->template = xstrdup(data->arg);
  	else
  		cdata->template = xstrdup("select-window -t '%%'");
! 	cdata->client = server_client_index(ctx->curclient);
  
  	window_choose_ready(wl->window->active, 
  	    cur, cmd_choose_window_callback, cmd_choose_window_free, cdata);
--- 107,120 ----
  	}
  
  	cdata = xmalloc(sizeof *cdata);
  	if (data->arg != NULL)
  		cdata->template = xstrdup(data->arg);
  	else
  		cdata->template = xstrdup("select-window -t '%%'");
! 	cdata->session = s;
! 	cdata->session->references++;
! 	cdata->client = ctx->curclient;
! 	cdata->client->references++;
  
  	window_choose_ready(wl->window->active, 
  	    cur, cmd_choose_window_callback, cmd_choose_window_free, cdata);
***************
*** 125,155 ****
  cmd_choose_window_callback(void *data, int idx)
  {
  	struct cmd_choose_window_data	*cdata = data;
- 	struct client			*c;
- 	struct session			*s;
  	struct cmd_list			*cmdlist;
  	struct cmd_ctx			 ctx;
  	char				*target, *template, *cause;
  
  	if (idx == -1)
  		return;
! 	if (cdata->client > ARRAY_LENGTH(&clients) - 1)
  		return;
! 	c = ARRAY_ITEM(&clients, cdata->client);
! 	if (cdata->session > ARRAY_LENGTH(&sessions) - 1)
  		return;
- 	s = ARRAY_ITEM(&sessions, cdata->session);
- 	if (c->session != s)
- 		return;
  
! 	xasprintf(&target, "%s:%d", s->name, idx);
  	template = cmd_template_replace(cdata->template, target, 1);
  	xfree(target);
  
  	if (cmd_string_parse(template, &cmdlist, &cause) != 0) {
  		if (cause != NULL) {
  			*cause = toupper((u_char) *cause);
! 			status_message_set(c, "%s", cause);
  			xfree(cause);
  		}
  		xfree(template);
--- 126,152 ----
  cmd_choose_window_callback(void *data, int idx)
  {
  	struct cmd_choose_window_data	*cdata = data;
  	struct cmd_list			*cmdlist;
  	struct cmd_ctx			 ctx;
  	char				*target, *template, *cause;
  
  	if (idx == -1)
  		return;
! 	if (cdata->client->flags & CLIENT_DEAD)
! 		return;	
! 	if (cdata->session->flags & SESSION_DEAD)
  		return;
! 	if (cdata->client->session != cdata->session)
  		return;
  
! 	xasprintf(&target, "%s:%d", cdata->session->name, idx);
  	template = cmd_template_replace(cdata->template, target, 1);
  	xfree(target);
  
  	if (cmd_string_parse(template, &cmdlist, &cause) != 0) {
  		if (cause != NULL) {
  			*cause = toupper((u_char) *cause);
! 			status_message_set(cdata->client, "%s", cause);
  			xfree(cause);
  		}
  		xfree(template);
***************
*** 158,164 ****
  	xfree(template);
  
  	ctx.msgdata = NULL;
! 	ctx.curclient = c;
  
  	ctx.error = key_bindings_error;
  	ctx.print = key_bindings_print;
--- 155,161 ----
  	xfree(template);
  
  	ctx.msgdata = NULL;
! 	ctx.curclient = cdata->client;
  
  	ctx.error = key_bindings_error;
  	ctx.print = key_bindings_print;
***************
*** 175,180 ****
--- 172,179 ----
  {
  	struct cmd_choose_window_data	*cdata = data;
  
+ 	cdata->session->references--;
+ 	cdata->client->references--;
  	xfree(cdata->template);
  	xfree(cdata);
  }