===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-tree.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- src/usr.bin/tmux/window-tree.c	2019/05/12 08:58:09	1.38
+++ src/usr.bin/tmux/window-tree.c	2019/05/28 07:18:42	1.39
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-tree.c,v 1.38 2019/05/12 08:58:09 nicm Exp $ */
+/* $OpenBSD: window-tree.c,v 1.39 2019/05/28 07:18:42 nicm Exp $ */
 
 /*
  * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -53,19 +53,22 @@
 		"}" \
 	"}"
 
-#define WINDOW_TREE_MENU \
-	"Select,Enter,|" \
-	"Expand,Right,|" \
-	"|" \
-	"Tag,t,|" \
-	"Tag All,C-t,|" \
-	"Tag None,T,|" \
-	"|" \
-	"Kill,x,|" \
-	"Kill Tagged,X,|" \
-	"|" \
-	"Cancel,q,"
+static const struct menu_item window_tree_menu_items[] = {
+	{ "Select", 'E', NULL },
+	{ "Expand", 'R', NULL },
+	{ "", KEYC_NONE, NULL },
+	{ "Tag", 't', NULL },
+	{ "Tag All", '\024', NULL },
+	{ "Tag None", 'T', NULL },
+	{ "", KEYC_NONE, NULL },
+	{ "Kill", 'x', NULL },
+	{ "Kill Tagged", 'X', NULL },
+	{ "", KEYC_NONE, NULL },
+	{ "Cancel", 'q', NULL },
 
+	{ NULL, KEYC_NONE, NULL }
+};
+
 const struct window_mode window_tree_mode = {
 	.name = "tree-mode",
 	.default_format = WINDOW_TREE_DEFAULT_FORMAT,
@@ -872,7 +875,7 @@
 
 	data->data = mode_tree_start(wp, args, window_tree_build,
 	    window_tree_draw, window_tree_search, window_tree_menu, data,
-	    WINDOW_TREE_MENU, window_tree_sort_list,
+	    window_tree_menu_items, window_tree_sort_list,
 	    nitems(window_tree_sort_list), &s);
 	mode_tree_zoom(data->data, args);