aboutsummaryrefslogtreecommitdiffstats
path: root/vnc.c
diff options
context:
space:
mode:
authorCorentin Chary <corentincj@iksaif.net>2010-05-04 14:01:58 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2010-05-10 11:36:03 -0500
commit14eb8b6829ad9dee7035de729e083844a425f274 (patch)
treebfb7b5875fbdaf608159e0b503b2051dc5b5df7a /vnc.c
parent5a834bb47c373e887de5210b7ceae96e1ef413f7 (diff)
vnc: set the right prefered encoding
message is a hint by the client as to its preference (the first encoding specified being most preferred)" Signed-off-by: Corentin Chary <corentincj@iksaif.net> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'vnc.c')
-rw-r--r--vnc.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/vnc.c b/vnc.c
index b1a3fdb30..1f7ad733c 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;