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

Test for fastpath settings.

Browse Source
This commit is contained in:
Michael Jumper 2013-11-05 12:34:36 -08:00
parent 7547b4b5bd
commit 9a8363e0ba
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure.ac
View File

@ -263,6 +263,7 @@ have_winpr=yes
have_freerdp=yes have_freerdp=yes
legacy_freerdp_extensions=no legacy_freerdp_extensions=no
rdpsettings_interface=unknown rdpsettings_interface=unknown
rdpsettings_fastpath=yes
freerdp_interface=unknown freerdp_interface=unknown
event_interface=unknown event_interface=unknown
RDP_LIBS= RDP_LIBS=
@ -422,6 +423,8 @@ fi
# Check for current (as of 1.1) rdpSettings interface # Check for current (as of 1.1) rdpSettings interface
AC_CHECK_MEMBERS([rdpSettings.Width, AC_CHECK_MEMBERS([rdpSettings.Width,
rdpSettings.Height, rdpSettings.Height,
rdpSettings.FastPathInput,
rdpSettings.FastPathOutput,
rdpSettings.OrderSupport], rdpSettings.OrderSupport],
[rdpsettings_interface=stable],, [rdpsettings_interface=stable],,
[[#include <freerdp/freerdp.h>]]) [[#include <freerdp/freerdp.h>]])
@ -439,6 +442,13 @@ fi
# Set defines based on interface type, warn if unknown # Set defines based on interface type, warn if unknown
if test "x${rdpsettings_interface}" = "xlegacy"; then if test "x${rdpsettings_interface}" = "xlegacy"; then
AC_DEFINE([LEGACY_RDPSETTINGS]) AC_DEFINE([LEGACY_RDPSETTINGS])
# Legacy interface may not have FastPath settings
AC_CHECK_MEMBERS([rdpSettings.fast_path_input,
rdpSettings.fast_path_output],,
[rdpsettings_fastpath=no],
[[#include <freerdp/freerdp.h>]])
elif test "x${rdpsettings_interface}" = "xunknown"; then elif test "x${rdpsettings_interface}" = "xunknown"; then
AC_MSG_WARN([ AC_MSG_WARN([
-------------------------------------------- --------------------------------------------
@ -448,6 +458,11 @@ elif test "x${rdpsettings_interface}" = "xunknown"; then
have_freerdp=no have_freerdp=no
fi fi
# Activate FastPath settings if present
if test "x${rdpsettings_fastpath}" = "xyes"; then
AC_DEFINE([HAVE_RDPSETTINGS_FASTPATH])
fi
# #
# FreeRDP: rdpBitmap # FreeRDP: rdpBitmap
# #

4
src/protocols/rdp/rdp_settings.c
View File

@ -186,8 +186,10 @@ void guac_rdp_push_settings(guac_rdp_settings* guac_settings, freerdp* rdp) {
bitmap_cache = rdp_settings->bitmap_cache; bitmap_cache = rdp_settings->bitmap_cache;
rdp_settings->os_major_type = OSMAJORTYPE_UNSPECIFIED; rdp_settings->os_major_type = OSMAJORTYPE_UNSPECIFIED;
rdp_settings->os_minor_type = OSMINORTYPE_UNSPECIFIED; rdp_settings->os_minor_type = OSMINORTYPE_UNSPECIFIED;
#ifdef HAVE_RDPSETTINGS_FASTPATH
rdp_settings->fast_path_input = FALSE; rdp_settings->fast_path_input = FALSE;
rdp_settings->fast_path_output = FALSE; rdp_settings->fast_path_output = FALSE;
#endif
rdp_settings->order_support[NEG_DSTBLT_INDEX] = TRUE; rdp_settings->order_support[NEG_DSTBLT_INDEX] = TRUE;
rdp_settings->order_support[NEG_PATBLT_INDEX] = FALSE; /* PATBLT not yet supported */ rdp_settings->order_support[NEG_PATBLT_INDEX] = FALSE; /* PATBLT not yet supported */
rdp_settings->order_support[NEG_SCRBLT_INDEX] = TRUE; rdp_settings->order_support[NEG_SCRBLT_INDEX] = TRUE;
@ -216,8 +218,10 @@ void guac_rdp_push_settings(guac_rdp_settings* guac_settings, freerdp* rdp) {
bitmap_cache = rdp_settings->BitmapCacheEnabled; bitmap_cache = rdp_settings->BitmapCacheEnabled;
rdp_settings->OsMajorType = OSMAJORTYPE_UNSPECIFIED; rdp_settings->OsMajorType = OSMAJORTYPE_UNSPECIFIED;
rdp_settings->OsMinorType = OSMINORTYPE_UNSPECIFIED; rdp_settings->OsMinorType = OSMINORTYPE_UNSPECIFIED;
#ifdef HAVE_RDPSETTINGS_FASTPATH
rdp_settings->FastPathInput = FALSE; rdp_settings->FastPathInput = FALSE;
rdp_settings->FastPathOutput = FALSE; rdp_settings->FastPathOutput = FALSE;
#endif
rdp_settings->OrderSupport[NEG_DSTBLT_INDEX] = TRUE; rdp_settings->OrderSupport[NEG_DSTBLT_INDEX] = TRUE;
rdp_settings->OrderSupport[NEG_PATBLT_INDEX] = FALSE; /* PATBLT not yet supported */ rdp_settings->OrderSupport[NEG_PATBLT_INDEX] = FALSE; /* PATBLT not yet supported */
rdp_settings->OrderSupport[NEG_SCRBLT_INDEX] = TRUE; rdp_settings->OrderSupport[NEG_SCRBLT_INDEX] = TRUE;