From bf9d9494db89e7de45653e4797e2977c6e185c13 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 12 Jun 2016 15:26:07 +0200
Subject: Add a CHOICE type to the settings system.

This is useful to let the user choose an option between a finite set of
valid alternatives.
---
 src/fe-common/core/completion.c  | 17 ++++++++++++++---
 src/fe-common/core/fe-settings.c |  5 +++++
 2 files changed, 19 insertions(+), 3 deletions(-)

(limited to 'src/fe-common')

diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index 861054b5..0e9982d5 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -690,9 +690,20 @@ static void sig_complete_set(GList **list, WINDOW_REC *window,
 	else if (*line != '\0' && *word == '\0') {
 		SETTINGS_REC *rec = settings_get_record(line);
 		if (rec != NULL) {
-			char *value = settings_get_print(rec);
-			if (value != NULL)
-				*list = g_list_append(*list, value);
+			/* show the whole list of valid options */
+			if (rec->type == SETTING_TYPE_CHOICE) {
+				char **tmp = rec->choices;
+
+				while (*tmp)
+					*list = g_list_append(*list, g_strdup(*tmp++));
+			}
+			/* show the current option */
+			else {
+				char *value = settings_get_print(rec);
+
+				if (value != NULL)
+					*list = g_list_append(*list, value);
+			}
 		}
 	}
 
diff --git a/src/fe-common/core/fe-settings.c b/src/fe-common/core/fe-settings.c
index b689cbf9..e25886ec 100644
--- a/src/fe-common/core/fe-settings.c
+++ b/src/fe-common/core/fe-settings.c
@@ -142,6 +142,11 @@ static void cmd_set(char *data)
 				else
 					set_int(key, value);
 				break;
+			case SETTING_TYPE_CHOICE:
+				settings_set_choice(key, clear ? "" :
+						    set_default ? rec->choices[rec->default_value.v_int] :
+						    value);
+				break;
 			case SETTING_TYPE_STRING:
 				settings_set_str(key, clear ? "" :
 						 set_default ? rec->default_value.v_string :
-- 
cgit v1.2.3