From 4dabea37af81cc5a7152237c3db670df3a65566f Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sun, 4 Aug 2019 11:55:45 -0700 Subject: [PATCH] GUACAMOLE-630: Allow guac_terminal_parse_color_scheme() to dictate color scheme format. --- src/terminal/terminal/color-scheme.h | 12 +++++++++--- src/terminal/terminal/terminal.h | 7 ++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/terminal/terminal/color-scheme.h b/src/terminal/terminal/color-scheme.h index 962d820d..5417ce1c 100644 --- a/src/terminal/terminal/color-scheme.h +++ b/src/terminal/terminal/color-scheme.h @@ -72,9 +72,15 @@ * The client that the terminal is connected to. * * @param color_scheme - * A semicolon-separated list of name-value pairs, i.e. - * ": [; : [; ...]]". - * For example, "color2: rgb:cc/33/22; background: color5". + * The name of a pre-defined color scheme (one of the + * names defined by the GUAC_TERMINAL_SCHEME_* constants), or + * semicolon-separated list of name-value pairs, i.e. ": [; + * : [; ...]]". For example, "color2: rgb:cc/33/22; + * background: color5". + * + * If blank, the default scheme of GUAC_TERMINAL_SCHEME_GRAY_BLACK will be + * used. If invalid, a warning will be logged, and + * GUAC_TERMINAL_SCHEME_GRAY_BLACK will be used. * * @param[out] foreground * Parsed foreground color. diff --git a/src/terminal/terminal/terminal.h b/src/terminal/terminal/terminal.h index 95a78d8b..c2fd456b 100644 --- a/src/terminal/terminal/terminal.h +++ b/src/terminal/terminal/terminal.h @@ -560,11 +560,8 @@ struct guac_terminal { * The height of the terminal, in pixels. * * @param color_scheme - * The name of the color scheme to use. This string must be one of the - * names defined by the GUAC_TERMINAL_SCHEME_* constants. If blank, the - * default scheme of GUAC_TERMINAL_SCHEME_GRAY_BLACK will be used. If - * invalid, a warning will be logged, and the terminal will fall back on - * GUAC_TERMINAL_SCHEME_GRAY_BLACK. + * The name of the color scheme to use. This string must be in the format + * accepted by guac_terminal_parse_color_scheme(). * * @param backspace * The integer ASCII code to send when backspace is pressed in