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

GUACAMOLE-377: Warn about required color depth only if actually overridden.

Browse Source
This commit is contained in:
Michael Jumper 2022-05-18 16:04:02 -07:00
parent b26f9d64d6
commit d5761ad625
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/protocols/rdp/settings.c
View File

@ -916,11 +916,6 @@ guac_rdp_settings* guac_rdp_parse_args(guac_user* user,
GUAC_RDP_CLIENT_ARGS[IDX_DISABLE_GLYPH_CACHING]); GUAC_RDP_CLIENT_ARGS[IDX_DISABLE_GLYPH_CACHING]);
} }
/* Session color depth */
settings->color_depth =
guac_user_parse_args_int(user, GUAC_RDP_CLIENT_ARGS, argv,
IDX_COLOR_DEPTH, RDP_DEFAULT_DEPTH);
/* Preconnection ID */ /* Preconnection ID */
settings->preconnection_id = -1; settings->preconnection_id = -1;
if (argv[IDX_PRECONNECTION_ID][0] != '\0') { if (argv[IDX_PRECONNECTION_ID][0] != '\0') {
@ -1142,6 +1137,11 @@ guac_rdp_settings* guac_rdp_parse_args(guac_user* user,
!guac_user_parse_args_boolean(user, GUAC_RDP_CLIENT_ARGS, argv, !guac_user_parse_args_boolean(user, GUAC_RDP_CLIENT_ARGS, argv,
IDX_DISABLE_GFX, 0); IDX_DISABLE_GFX, 0);
/* Session color depth */
settings->color_depth =
guac_user_parse_args_int(user, GUAC_RDP_CLIENT_ARGS, argv,
IDX_COLOR_DEPTH, settings->enable_gfx ? RDP_GFX_REQUIRED_DEPTH : RDP_DEFAULT_DEPTH);
/* Multi-touch input enable/disable */ /* Multi-touch input enable/disable */
settings->enable_touch = settings->enable_touch =
guac_user_parse_args_boolean(user, GUAC_RDP_CLIENT_ARGS, argv, guac_user_parse_args_boolean(user, GUAC_RDP_CLIENT_ARGS, argv,
@ -1420,15 +1420,15 @@ void guac_rdp_push_settings(guac_client* client,
rdp_settings->SupportGraphicsPipeline = TRUE; rdp_settings->SupportGraphicsPipeline = TRUE;
rdp_settings->RemoteFxCodec = TRUE; rdp_settings->RemoteFxCodec = TRUE;
if (rdp_settings->ColorDepth != 32) { if (rdp_settings->ColorDepth != RDP_GFX_REQUIRED_DEPTH) {
guac_client_log(client, GUAC_LOG_WARNING, "Ignoring requested " guac_client_log(client, GUAC_LOG_WARNING, "Ignoring requested "
"color depth of %i bpp, as the RDP Graphics Pipeline " "color depth of %i bpp, as the RDP Graphics Pipeline "
"requires 32 bpp.", rdp_settings->ColorDepth); "requires %i bpp.", rdp_settings->ColorDepth, RDP_GFX_REQUIRED_DEPTH);
} }
/* Required for RemoteFX / Graphics Pipeline */ /* Required for RemoteFX / Graphics Pipeline */
rdp_settings->FastPathOutput = TRUE; rdp_settings->FastPathOutput = TRUE;
rdp_settings->ColorDepth = 32; rdp_settings->ColorDepth = RDP_GFX_REQUIRED_DEPTH;
rdp_settings->SoftwareGdi = TRUE; rdp_settings->SoftwareGdi = TRUE;
} }

5
src/protocols/rdp/settings.h
View File

@ -58,6 +58,11 @@
*/ */
#define RDP_DEFAULT_DEPTH 16 #define RDP_DEFAULT_DEPTH 16
/**
* The color depth required by the RDPGFX channel, in bits.
*/
#define RDP_GFX_REQUIRED_DEPTH 32
/** /**
* The filename to use for the screen recording, if not specified. * The filename to use for the screen recording, if not specified.
*/ */