From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O9Glx-00065H-R3 for qemu-devel@nongnu.org; Tue, 04 May 2010 07:58:45 -0400 Received: from [140.186.70.92] (port=37045 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O9Glw-00064d-9k for qemu-devel@nongnu.org; Tue, 04 May 2010 07:58:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O9Glu-0001Kc-HC for qemu-devel@nongnu.org; Tue, 04 May 2010 07:58:44 -0400 Received: from iksaif.net ([88.191.73.63]:57927) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O9Glt-0001Jz-ID for qemu-devel@nongnu.org; Tue, 04 May 2010 07:58:42 -0400 From: Corentin Chary Date: Tue, 4 May 2010 14:01:58 +0200 Message-Id: <1272974518-20144-1-git-send-email-corentincj@iksaif.net> In-Reply-To: <4BDEEB03.9070009@linux.vnet.ibm.com> References: <4BDEEB03.9070009@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH] vnc: set the right prefered encoding List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Corentin Chary , Anthony Liguori >>From RFB specs: "The order of the encoding types given in this message is a hint by the client as to its preference (the first encoding specified being most preferred)" Signed-off-by: Corentin Chary --- vnc.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/vnc.c b/vnc.c index 5241a6a..2d05d8f 100644 --- a/vnc.c +++ b/vnc.c @@ -1594,7 +1594,7 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings) vnc_zlib_init(vs); vs->features = 0; - vs->vnc_encoding = 0; + vs->vnc_encoding = -1; vs->tight_compression = 9; vs->tight_quality = 9; vs->absolute = -1; @@ -1603,18 +1603,24 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings) enc = encodings[i]; switch (enc) { case VNC_ENCODING_RAW: - vs->vnc_encoding = enc; + if (vs->vnc_encoding != -1) { + vs->vnc_encoding = enc; + } break; case VNC_ENCODING_COPYRECT: vs->features |= VNC_FEATURE_COPYRECT_MASK; break; case VNC_ENCODING_HEXTILE: vs->features |= VNC_FEATURE_HEXTILE_MASK; - vs->vnc_encoding = enc; + if (vs->vnc_encoding != -1) { + vs->vnc_encoding = enc; + } break; case VNC_ENCODING_ZLIB: vs->features |= VNC_FEATURE_ZLIB_MASK; - vs->vnc_encoding = enc; + if (vs->vnc_encoding != -1) { + vs->vnc_encoding = enc; + } break; case VNC_ENCODING_DESKTOPRESIZE: vs->features |= VNC_FEATURE_RESIZE_MASK; -- 1.7.0.2