Styles: add style "input"

MusicPlayerDaemon · Sep 6, 2024 · 223c317 · 223c317
1 parent 2ef6c4d
commit 223c317
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 5 deletions.
diff --git a/NEWS b/NEWS
@@ -2,6 +2,7 @@ ncmpc 0.50 - not yet released
 * build: require Meson 0.60
 * require libfmt 9
 * draw progress bar as Unicode double line
+* add color style "text" for input text controls
 * lyrics/musixmatch: add new lyrics extension
 * lyrics/google: fix partial loading of lyrics
 

diff --git a/doc/index.rst b/doc/index.rst
@@ -320,6 +320,9 @@ color used to display time the status window.
 :command:`color alert = COLOR[,ATTRIBUTE]...` - Set the text color
 used to display alerts in the status window.
 
+:command:`color input = COLOR[,ATTRIBUTE]...` - Set the text color of
+text input controls.
+
 :command:`colordef COLOR = R, G, B` - Redefine any of the base
 colors. The RGB values must be integer values between 0 and 1000.
 *Note*: Only some terminals allow redefinitions of colors!

diff --git a/src/Styles.cxx b/src/Styles.cxx
@@ -163,6 +163,11 @@ static StyleData styles[size_t(Style::END)] = {
 		COLOR_RED, COLOR_INHERIT, A_INHERIT,
 		A_NORMAL,
 	},
+	{
+		"input", Style::BACKGROUND,
+		COLOR_NONE, COLOR_INHERIT, A_NORMAL,
+		A_NORMAL,
+	},
 	{
 		"background", Style::DEFAULT,
 		COLOR_NONE, COLOR_BLACK, A_NORMAL,

diff --git a/src/Styles.hxx b/src/Styles.hxx
@@ -30,6 +30,7 @@ enum class Style : unsigned {
 	STATUS_ALERT,
 	DIRECTORY,
 	PLAYLIST,
+	INPUT,
 	BACKGROUND,
 	END
 };

diff --git a/src/screen_utils.cxx b/src/screen_utils.cxx
@@ -7,6 +7,8 @@
 #include "i18n.h"
 #include "Styles.hxx"
 #include "wreadln.hxx"
+#include "ui/Options.hxx"
+#include "util/ScopeExit.hxx"
 #include "config.h"
 
 #ifndef _WIN32
@@ -34,9 +36,17 @@ screen_getch(ScreenManager &screen, const char *prompt) noexcept
 {
 	const auto &window = screen.status_bar.GetWindow();
 
+	if (ui_options.enable_colors)
+		window.SetBackgroundStyle(Style::INPUT);
+
+	AtScopeExit(&window) {
+		if (ui_options.enable_colors)
+			window.SetBackgroundStyle(Style::STATUS);
+	};
+
 	SelectStyle(window, Style::STATUS_ALERT);
-	window.Erase();
 	window.String({0, 0}, prompt);
+	window.ClearToEol();
 
 	echo();
 	curs_set(1);
@@ -92,6 +102,14 @@ screen_readln(ScreenManager &screen, const char *prompt,
 {
 	const auto &window = screen.status_bar.GetWindow();
 
+	if (ui_options.enable_colors)
+		window.SetBackgroundStyle(Style::INPUT);
+
+	AtScopeExit(&window) {
+		if (ui_options.enable_colors)
+			window.SetBackgroundStyle(Style::STATUS);
+	};
+
 	window.MoveCursor({0, 0});
 
 	if (prompt != nullptr) {
@@ -100,8 +118,7 @@ screen_readln(ScreenManager &screen, const char *prompt,
 		window.String(": "sv);
 	}
 
-	SelectStyle(window, Style::STATUS);
-	window.AttributeOn(A_REVERSE);
+	SelectStyle(window, Style::INPUT);
 
 	return wreadln(window, value, history, completion);
 }
@@ -111,6 +128,14 @@ screen_read_password(ScreenManager &screen, const char *prompt) noexcept
 {
 	const auto &window = screen.status_bar.GetWindow();
 
+	if (ui_options.enable_colors)
+		window.SetBackgroundStyle(Style::INPUT);
+
+	AtScopeExit(&window) {
+		if (ui_options.enable_colors)
+			window.SetBackgroundStyle(Style::STATUS);
+	};
+
 	window.MoveCursor({0, 0});
 	SelectStyle(window, Style::STATUS_ALERT);
 
@@ -120,8 +145,7 @@ screen_read_password(ScreenManager &screen, const char *prompt) noexcept
 	window.String(prompt);
 	window.String(": "sv);
 
-	SelectStyle(window, Style::STATUS);
-	window.AttributeOn(A_REVERSE);
+	SelectStyle(window, Style::INPUT);
 
 	return wreadln_masked(window, nullptr);
 }