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

GUAC-865: Allow client-requested DPI to be overridden.

Browse Source
This commit is contained in:
Michael Jumper 2014-11-21 16:45:47 -08:00
parent b812cc19a9
commit 4cbb4001fc
1 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/protocols/rdp/client.c
View File

@ -89,6 +89,7 @@ const char* GUAC_CLIENT_ARGS[] = {
"password", "password",
"width", "width",
"height", "height",
"dpi",
"initial-program", "initial-program",
"color-depth", "color-depth",
"disable-audio", "disable-audio",
@ -117,6 +118,7 @@ enum RDP_ARGS_IDX {
IDX_PASSWORD, IDX_PASSWORD,
IDX_WIDTH, IDX_WIDTH,
IDX_HEIGHT, IDX_HEIGHT,
IDX_DPI,
IDX_INITIAL_PROGRAM, IDX_INITIAL_PROGRAM,
IDX_COLOR_DEPTH, IDX_COLOR_DEPTH,
IDX_DISABLE_AUDIO, IDX_DISABLE_AUDIO,
@ -469,7 +471,8 @@ static int __guac_rdp_reduce_resolution(guac_client* client, int resolution) {
client->info.optimal_width = width; client->info.optimal_width = width;
client->info.optimal_height = height; client->info.optimal_height = height;
client->info.optimal_resolution = resolution; client->info.optimal_resolution = resolution;
guac_client_log(client, GUAC_LOG_INFO, "Reducing resolution to %ix%i at %i DPI", width, height, resolution); guac_client_log(client, GUAC_LOG_INFO,
"Reducing resolution to %i DPI (%ix%i)", resolution, width, height);
return 1; return 1;
} }
@ -478,6 +481,31 @@ static int __guac_rdp_reduce_resolution(guac_client* client, int resolution) {
} }
/**
* Forces the client resolution to the given value, without checking whether
* the resulting width and height are reasonable.
*/
static void __guac_rdp_force_resolution(guac_client* client, int resolution) {
int width = client->info.optimal_width * resolution / client->info.optimal_resolution;
int height = client->info.optimal_height * resolution / client->info.optimal_resolution;
/* Do not force DPI to zero */
if (resolution == 0) {
guac_client_log(client, GUAC_LOG_WARNING,
"Cowardly refusing to force resolution to %i DPI", resolution);
return;
}
/* Reduced resolution if result is reasonably sized */
client->info.optimal_width = width;
client->info.optimal_height = height;
client->info.optimal_resolution = resolution;
guac_client_log(client, GUAC_LOG_INFO,
"Resolution forced to %i DPI (%ix%i)", resolution, width, height);
}
int guac_client_init(guac_client* client, int argc, char** argv) { int guac_client_init(guac_client* client, int argc, char** argv) {
rdp_guac_client_data* guac_client_data; rdp_guac_client_data* guac_client_data;
@ -572,8 +600,12 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
client->info.optimal_height, client->info.optimal_height,
client->info.optimal_resolution); client->info.optimal_resolution);
/* Attempt to reduce resolution for high DPI */ /* Use optimal resolution unless overridden */
if (client->info.optimal_resolution > GUAC_RDP_NATIVE_RESOLUTION if (argv[IDX_DPI][0] != '\0')
__guac_rdp_force_resolution(client, atoi(argv[IDX_DPI]));
/* If resolution not forced, attempt to reduce resolution for high DPI */
else if (client->info.optimal_resolution > GUAC_RDP_NATIVE_RESOLUTION
&& !__guac_rdp_reduce_resolution(client, GUAC_RDP_NATIVE_RESOLUTION) && !__guac_rdp_reduce_resolution(client, GUAC_RDP_NATIVE_RESOLUTION)
&& !__guac_rdp_reduce_resolution(client, GUAC_RDP_HIGH_RESOLUTION)) && !__guac_rdp_reduce_resolution(client, GUAC_RDP_HIGH_RESOLUTION))
guac_client_log(client, GUAC_LOG_INFO, "No reasonable lower resolution"); guac_client_log(client, GUAC_LOG_INFO, "No reasonable lower resolution");