Repository: guacamole-server
Updated Branches:
  refs/heads/master 3187a641c -> bc5b01d4d


GUACAMOLE-448: Add support for configuring bitmap caching.


Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/66ffda24
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/66ffda24
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/66ffda24

Branch: refs/heads/master
Commit: 66ffda24f007b6e8b8a52c794a8a3296f0c4f0e0
Parents: 5295886
Author: Nick Couchman <vn...@apache.org>
Authored: Tue Jan 2 18:26:29 2018 -0500
Committer: Nick Couchman <vn...@apache.org>
Committed: Tue Jan 2 18:26:29 2018 -0500

----------------------------------------------------------------------
 src/protocols/rdp/rdp_settings.c | 30 ++++++++++++++++++++++++++++--
 src/protocols/rdp/rdp_settings.h | 12 ++++++++++++
 2 files changed, 40 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/66ffda24/src/protocols/rdp/rdp_settings.c
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/rdp_settings.c b/src/protocols/rdp/rdp_settings.c
index 57e6016..b7062dd 100644
--- a/src/protocols/rdp/rdp_settings.c
+++ b/src/protocols/rdp/rdp_settings.c
@@ -72,6 +72,8 @@ const char* GUAC_RDP_CLIENT_ARGS[] = {
     "enable-full-window-drag",
     "enable-desktop-composition",
     "enable-menu-animations",
+    "disable-bitmap-caching",
+    "disable-offscreen-caching",
     "preconnection-id",
     "preconnection-blob",
 
@@ -306,6 +308,18 @@ enum RDP_ARGS_IDX {
     IDX_ENABLE_MENU_ANIMATIONS,
 
     /**
+     * "true" if bitmap caching should be disabled, "false" if bitmap caching
+     * should remain enabled.
+     */
+    IDX_DISABLE_BITMAP_CACHING,
+
+    /**
+     * "true" if the offscreen caching should be disabled, false if offscren
+     * caching should remain enabled.
+     */
+    IDX_DISABLE_OFFSCREEN_CACHING,
+
+    /**
      * The preconnection ID to send within the preconnection PDU when
      * initiating an RDP connection, if any.
      */
@@ -672,6 +686,14 @@ guac_rdp_settings* guac_rdp_parse_args(guac_user* user,
         guac_user_parse_args_boolean(user, GUAC_RDP_CLIENT_ARGS, argv,
                 IDX_ENABLE_MENU_ANIMATIONS, 0);
 
+    settings->disable_bitmap_caching =
+        guac_user_parse_args_boolean(user, GUAC_RDP_CLIENT_ARGS, argv,
+                IDX_DISABLE_BITMAP_CACHING, 0);
+
+    settings->disable_offscreen_caching =
+        guac_user_parse_args_boolean(user, GUAC_RDP_CLIENT_ARGS, argv,
+                IDX_DISABLE_OFFSCREEN_CACHING, 0);
+
     /* Session color depth */
     settings->color_depth = 
         guac_user_parse_args_int(user, GUAC_RDP_CLIENT_ARGS, argv,
@@ -1305,7 +1327,9 @@ void guac_rdp_push_settings(guac_rdp_settings* 
guac_settings, freerdp* rdp) {
 
     /* Order support */
 #ifdef LEGACY_RDPSETTINGS
-    bitmap_cache = rdp_settings->bitmap_cache;
+    rdp_settings->bitmap_cache = !guac_settings->disable_bitmap_caching;
+    bitmap_cache = !guac_settings->disable_bitmap_caching;
+    rdp_settings->offscreen_bitmap_cache = 
!guac_settings->disable_offscreen_caching;
     rdp_settings->os_major_type = OSMAJORTYPE_UNSPECIFIED;
     rdp_settings->os_minor_type = OSMINORTYPE_UNSPECIFIED;
     rdp_settings->desktop_resize = TRUE;
@@ -1334,7 +1358,9 @@ void guac_rdp_push_settings(guac_rdp_settings* 
guac_settings, freerdp* rdp) {
     rdp_settings->order_support[NEG_ELLIPSE_SC_INDEX] = FALSE;
     rdp_settings->order_support[NEG_ELLIPSE_CB_INDEX] = FALSE;
 #else
-    bitmap_cache = rdp_settings->BitmapCacheEnabled;
+    rdp_settings->BitmapCacheEnabled = !guac_settings->disable_bitmap_caching;
+    bitmap_cache = !guac_settings->disable_bitmap_caching;
+    rdp_settings->OffscreenSupportLevel = 
!guac_settings->disable_offscreen_caching;
     rdp_settings->OsMajorType = OSMAJORTYPE_UNSPECIFIED;
     rdp_settings->OsMinorType = OSMINORTYPE_UNSPECIFIED;
     rdp_settings->DesktopResize = TRUE;

http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/66ffda24/src/protocols/rdp/rdp_settings.h
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/rdp_settings.h b/src/protocols/rdp/rdp_settings.h
index ec540ef..f0f9137 100644
--- a/src/protocols/rdp/rdp_settings.h
+++ b/src/protocols/rdp/rdp_settings.h
@@ -300,6 +300,18 @@ typedef struct guac_rdp_settings {
     int menu_animations_enabled;
 
     /**
+     * Whether bitmap caching should be disabled.  By default it is
+     * enabled - this allows users to explicitly disable it.
+     */
+    int disable_bitmap_caching;
+
+    /**
+     * Whether offscreen caching should be disabled.  By default it is
+     * enabled - this allows users to explicitly disable it.
+     */
+    int disable_offscreen_caching;
+
+    /**
      * The preconnection ID to send within the preconnection PDU when
      * initiating an RDP connection, if any. If no preconnection ID is
      * specified, this will be -1.

Reply via email to