maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-630: Allow guac_terminal_parse_color_scheme() to dictate color scheme format.

Browse Source
This commit is contained in:
Michael Jumper 2019-08-04 11:55:45 -07:00
parent 0516d599cf
commit 4dabea37af
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/terminal/terminal/color-scheme.h
View File

@ -72,9 +72,15 @@
* The client that the terminal is connected to. * The client that the terminal is connected to.
* *
* @param color_scheme * @param color_scheme
* A semicolon-separated list of name-value pairs, i.e. * The name of a pre-defined color scheme (one of the
* "<name>: <value> [; <name>: <value> [; ...]]". * names defined by the GUAC_TERMINAL_SCHEME_* constants), or
* For example, "color2: rgb:cc/33/22; background: color5". * semicolon-separated list of name-value pairs, i.e. "<name>: <value> [;
* <name>: <value> [; ...]]". 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 * @param[out] foreground
* Parsed foreground color. * Parsed foreground color.

7
src/terminal/terminal/terminal.h
View File

@ -560,11 +560,8 @@ struct guac_terminal {
* The height of the terminal, in pixels. * The height of the terminal, in pixels.
* *
* @param color_scheme * @param color_scheme
* The name of the color scheme to use. This string must be one of the * The name of the color scheme to use. This string must be in the format
* names defined by the GUAC_TERMINAL_SCHEME_* constants. If blank, the * accepted by guac_terminal_parse_color_scheme().
* 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.
* *
* @param backspace * @param backspace
* The integer ASCII code to send when backspace is pressed in * The integer ASCII code to send when backspace is pressed in