Drop the ability to have a list of keys in the prefix in favour of two

separate options, prefix and prefix2. This simplifies the code and gets
rid the data options type which was only used for this one option.

Also add a -2 flag to send-prefix to send the secondary prefix key,
fixing a cause of minor irritation.

People who want three prefix keys are out of luck :-).

1 files changed, 11 insertions, 14 deletions

diff --git a/options-table.c b/options-table.c
index 8bc61149..918a9f51 100644
--- a/options-table.c
+++ b/options-table.c
@@ -262,8 +262,13 @@ const struct options_table_entry session_options_table[] = {
 	},
 
 	{ .name = "prefix",
-	  .type = OPTIONS_TABLE_KEYS,
-	  /* set in main() */
+	  .type = OPTIONS_TABLE_KEY,
+	  .default_num = '\002',
+	},
+
+	{ .name = "prefix2",
+	  .type = OPTIONS_TABLE_KEY,
+	  .default_num = KEYC_NONE,
 	},
 
 	{ .name = "repeat-time",
@@ -683,10 +688,8 @@ const char *
 options_table_print_entry(
     const struct options_table_entry *oe, struct options_entry *o)
 {
-	static char				 out[BUFSIZ];
-	const char				*s;
-	struct keylist				*keylist;
-	u_int					 i;
+	static char	 out[BUFSIZ];
+	const char	*s;
 
 	*out = '\0';
 	switch (oe->type) {
@@ -696,14 +699,8 @@ options_table_print_entry(
 	case OPTIONS_TABLE_NUMBER:
 		xsnprintf(out, sizeof out, "%lld", o->num);
 		break;
-	case OPTIONS_TABLE_KEYS:
-		keylist = o->data;
-		for (i = 0; i < ARRAY_LENGTH(keylist); i++) {
-			s = key_string_lookup_key(ARRAY_ITEM(keylist, i));
-			strlcat(out, s, sizeof out);
-			if (i != ARRAY_LENGTH(keylist) - 1)
-				strlcat(out, ",", sizeof out);
-		}
+	case OPTIONS_TABLE_KEY:
+		xsnprintf(out, sizeof out, "%s", key_string_lookup_key(o->num));
 		break;
 	case OPTIONS_TABLE_COLOUR:
 		s = colour_tostring(o->num);