===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-client.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -c -r1.30 -r1.31
*** src/usr.bin/tmux/window-client.c	2020/12/03 07:12:12	1.30
--- src/usr.bin/tmux/window-client.c	2021/04/12 06:50:25	1.31
***************
*** 1,4 ****
! /* $OpenBSD: window-client.c,v 1.30 2020/12/03 07:12:12 nicm Exp $ */
  
  /*
   * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: window-client.c,v 1.31 2021/04/12 06:50:25 nicm Exp $ */
  
  /*
   * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 40,45 ****
--- 40,56 ----
  #define WINDOW_CLIENT_DEFAULT_FORMAT \
  	"#{t/p:client_activity}: session #{session_name}"
  
+ #define WINDOW_CLIENT_DEFAULT_KEY_FORMAT \
+ 	"#{?#{e|<:#{line},10}," \
+ 		"#{line}" \
+ 	"," \
+ 		"#{?#{e|<:#{line},36},"	\
+ 	        	"M-#{a:#{e|+:97,#{e|-:#{line},10}}}" \
+ 		"," \
+ 	        	"" \
+ 		"}" \
+ 	"}"
+ 
  static const struct menu_item window_client_menu_items[] = {
  	{ "Detach", 'd', NULL },
  	{ "Detach Tagged", 'D', NULL },
***************
*** 87,92 ****
--- 98,104 ----
  
  	struct mode_tree_data		 *data;
  	char				 *format;
+ 	char				 *key_format;
  	char				 *command;
  
  	struct window_client_itemdata	**item_list;
***************
*** 252,257 ****
--- 264,289 ----
  	window_client_key(wme, c, NULL, NULL, key, NULL);
  }
  
+ static key_code
+ window_client_get_key(void *modedata, void *itemdata, u_int line)
+ {
+ 	struct window_client_modedata	*data = modedata;
+ 	struct window_client_itemdata	*item = itemdata;
+ 	struct format_tree		*ft;
+ 	char				*expanded;
+ 	key_code			 key;
+ 
+ 	ft = format_create(NULL, NULL, FORMAT_NONE, 0);
+ 	format_defaults(ft, item->c, NULL, 0, NULL);
+ 	format_add(ft, "line", "%u", line);
+ 
+ 	expanded = format_expand(ft, data->key_format);
+ 	key = key_string_lookup_string(expanded);
+ 	free(expanded);
+ 	format_free(ft);
+ 	return key;
+ }
+ 
  static struct screen *
  window_client_init(struct window_mode_entry *wme,
      __unused struct cmd_find_state *fs, struct args *args)
***************
*** 267,281 ****
  		data->format = xstrdup(WINDOW_CLIENT_DEFAULT_FORMAT);
  	else
  		data->format = xstrdup(args_get(args, 'F'));
  	if (args == NULL || args->argc == 0)
  		data->command = xstrdup(WINDOW_CLIENT_DEFAULT_COMMAND);
  	else
  		data->command = xstrdup(args->argv[0]);
  
  	data->data = mode_tree_start(wp, args, window_client_build,
! 	    window_client_draw, NULL, window_client_menu, NULL, data,
! 	    window_client_menu_items, window_client_sort_list,
! 	    nitems(window_client_sort_list), &s);
  	mode_tree_zoom(data->data, args);
  
  	mode_tree_build(data->data);
--- 299,317 ----
  		data->format = xstrdup(WINDOW_CLIENT_DEFAULT_FORMAT);
  	else
  		data->format = xstrdup(args_get(args, 'F'));
+ 	if (args == NULL || !args_has(args, 'K'))
+ 		data->key_format = xstrdup(WINDOW_CLIENT_DEFAULT_KEY_FORMAT);
+ 	else
+ 		data->key_format = xstrdup(args_get(args, 'K'));
  	if (args == NULL || args->argc == 0)
  		data->command = xstrdup(WINDOW_CLIENT_DEFAULT_COMMAND);
  	else
  		data->command = xstrdup(args->argv[0]);
  
  	data->data = mode_tree_start(wp, args, window_client_build,
! 	    window_client_draw, NULL, window_client_menu, NULL,
! 	    window_client_get_key, data, window_client_menu_items,
! 	    window_client_sort_list, nitems(window_client_sort_list), &s);
  	mode_tree_zoom(data->data, args);
  
  	mode_tree_build(data->data);
***************
*** 300,305 ****
--- 336,342 ----
  	free(data->item_list);
  
  	free(data->format);
+ 	free(data->key_format);
  	free(data->command);
  
  	free(data);