Merge remote-tracking branch 'rth/tcg-for-anthony' into staging

[qemu.git] / ui / vnc-enc-tight.c

diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c
index cc57c26796862bbecbd3ad3081d8440dacdb9463..e6966aebc355a826ae08c51d5174fec97d02106c 100644 (file)
--- a/ui/vnc-enc-tight.c
+++ b/ui/vnc-enc-tight.c
@@ -28,7 +28,15 @@
 
 #include "config-host.h"
 
 
 #include "config-host.h"
 

+/* This needs to be before jpeglib.h line because of conflict with
+   INT32 definitions between jmorecfg.h (included by jpeglib.h) and
+   Win32 basetsd.h (included by windows.h). */
+#include "qemu-common.h"
+

 #ifdef CONFIG_VNC_PNG
 #ifdef CONFIG_VNC_PNG

+/* The following define is needed by pngconf.h. Otherwise it won't compile,
+   because setjmp.h was already included by qemu-common.h. */
+#define PNG_SKIP_SETJMP_CHECK

 #include <png.h>
 #endif
 #ifdef CONFIG_VNC_JPEG
 #include <png.h>
 #endif
 #ifdef CONFIG_VNC_JPEG


@@ -36,13 +44,11 @@
 #include <jpeglib.h>
 #endif
 
 #include <jpeglib.h>
 #endif
 

-#include "qemu-common.h"
-
-#include "bswap.h"
-#include "qdict.h"
-#include "qint.h"
+#include "qemu/bswap.h"
+#include "qapi/qmp/qint.h"

 #include "vnc.h"
 #include "vnc-enc-tight.h"
 #include "vnc.h"
 #include "vnc-enc-tight.h"

+#include "vnc-palette.h"

 
 /* Compression level stuff. The following array contains various
    encoder parameters for each of 10 compression levels (0..9).
 
 /* Compression level stuff. The following array contains various
    encoder parameters for each of 10 compression levels (0..9).


@@ -72,18 +78,53 @@ static const struct {
 static int tight_send_framebuffer_update(VncState *vs, int x, int y,
                                          int w, int h);
 
 static int tight_send_framebuffer_update(VncState *vs, int x, int y,
                                          int w, int h);
 

+#ifdef CONFIG_VNC_JPEG
+static const struct {
+    double jpeg_freq_min;       /* Don't send JPEG if the freq is bellow */
+    double jpeg_freq_threshold; /* Always send JPEG if the freq is above */
+    int jpeg_idx;               /* Allow indexed JPEG */
+    int jpeg_full;              /* Allow full color JPEG */
+} tight_jpeg_conf[] = {
+    { 0,   8,  1, 1 },
+    { 0,   8,  1, 1 },
+    { 0,   8,  1, 1 },
+    { 0,   8,  1, 1 },
+    { 0,   10, 1, 1 },
+    { 0.1, 10, 1, 1 },
+    { 0.2, 10, 1, 1 },
+    { 0.3, 12, 0, 0 },
+    { 0.4, 14, 0, 0 },
+    { 0.5, 16, 0, 0 },
+};
+#endif
+

 #ifdef CONFIG_VNC_PNG
 #ifdef CONFIG_VNC_PNG

+static const struct {
+    int png_zlib_level, png_filters;
+} tight_png_conf[] = {
+    { 0, PNG_NO_FILTERS },
+    { 1, PNG_NO_FILTERS },
+    { 2, PNG_NO_FILTERS },
+    { 3, PNG_NO_FILTERS },
+    { 4, PNG_NO_FILTERS },
+    { 5, PNG_ALL_FILTERS },
+    { 6, PNG_ALL_FILTERS },
+    { 7, PNG_ALL_FILTERS },
+    { 8, PNG_ALL_FILTERS },
+    { 9, PNG_ALL_FILTERS },
+};
+

 static int send_png_rect(VncState *vs, int x, int y, int w, int h,
 static int send_png_rect(VncState *vs, int x, int y, int w, int h,

-                         QDict *palette);
+                         VncPalette *palette);

 
 static bool tight_can_send_png_rect(VncState *vs, int w, int h)
 {
 
 static bool tight_can_send_png_rect(VncState *vs, int w, int h)
 {

-    if (vs->tight_type != VNC_ENCODING_TIGHT_PNG) {
+    if (vs->tight.type != VNC_ENCODING_TIGHT_PNG) {

         return false;
     }
 
         return false;
     }
 

-    if (ds_get_bytes_per_pixel(vs->ds) == 1 ||
-        vs->clientds.pf.bytes_per_pixel == 1) {
+    if (surface_bytes_per_pixel(vs->vd->ds) == 1 ||
+        vs->client_pf.bytes_per_pixel == 1) {

         return false;
     }
 
         return false;
     }
 


@@ -96,23 +137,23 @@ static bool tight_can_send_png_rect(VncState *vs, int w, int h)
  * compression (by applying "gradient" filter or JPEG coder).
  */
 
  * compression (by applying "gradient" filter or JPEG coder).
  */
 

-static uint
+static unsigned int

 tight_detect_smooth_image24(VncState *vs, int w, int h)
 {
     int off;
     int x, y, d, dx;
 tight_detect_smooth_image24(VncState *vs, int w, int h)
 {
     int off;
     int x, y, d, dx;

-    uint c;
-    uint stats[256];
+    unsigned int c;
+    unsigned int stats[256];

     int pixels = 0;
     int pix, left[3];
     int pixels = 0;
     int pix, left[3];

-    uint errors;
-    unsigned char *buf = vs->tight.buffer;
+    unsigned int errors;
+    unsigned char *buf = vs->tight.tight.buffer;

 
     /*
      * If client is big-endian, color samples begin from the second
      * byte (offset 1) of a 32-bit pixel value.
      */
 
     /*
      * If client is big-endian, color samples begin from the second
      * byte (offset 1) of a 32-bit pixel value.
      */

-    off = !!(vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG);
+    off = vs->client_be;

 
     memset(stats, 0, sizeof (stats));
 
 
     memset(stats, 0, sizeof (stats));
 


@@ -162,29 +203,29 @@ tight_detect_smooth_image24(VncState *vs, int w, int h)
 
 #define DEFINE_DETECT_FUNCTION(bpp)                                     \
                                                                         \
 
 #define DEFINE_DETECT_FUNCTION(bpp)                                     \
                                                                         \

-    static uint                                                         \
+    static unsigned int                                                 \

     tight_detect_smooth_image##bpp(VncState *vs, int w, int h) {        \
         bool endian;                                                    \
         uint##bpp##_t pix;                                              \
         int max[3], shift[3];                                           \
         int x, y, d, dx;                                                \
     tight_detect_smooth_image##bpp(VncState *vs, int w, int h) {        \
         bool endian;                                                    \
         uint##bpp##_t pix;                                              \
         int max[3], shift[3];                                           \
         int x, y, d, dx;                                                \

-        uint c;                                                         \
-        uint stats[256];                                                \
+        unsigned int c;                                                 \
+        unsigned int stats[256];                                        \

         int pixels = 0;                                                 \
         int sample, sum, left[3];                                       \
         int pixels = 0;                                                 \
         int sample, sum, left[3];                                       \

-        uint errors;                                                    \
-        unsigned char *buf = vs->tight.buffer;                          \
+        unsigned int errors;                                            \
+        unsigned char *buf = vs->tight.tight.buffer;                    \

                                                                         \
                                                                         \

-        endian = ((vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) !=        \
-                  (vs->ds->surface->flags & QEMU_BIG_ENDIAN_FLAG));     \
+        endian = 0; /* FIXME: ((vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) != \
+                      (vs->ds->surface->flags & QEMU_BIG_ENDIAN_FLAG)); */ \

                                                                         \
                                                                         \
                                                                         \
                                                                         \

-        max[0] = vs->clientds.pf.rmax;                                  \
-        max[1] = vs->clientds.pf.gmax;                                  \
-        max[2] = vs->clientds.pf.bmax;                                  \
-        shift[0] = vs->clientds.pf.rshift;                              \
-        shift[1] = vs->clientds.pf.gshift;                              \
-        shift[2] = vs->clientds.pf.bshift;                              \
+        max[0] = vs->client_pf.rmax;                                  \
+        max[1] = vs->client_pf.gmax;                                  \
+        max[2] = vs->client_pf.bmax;                                  \
+        shift[0] = vs->client_pf.rshift;                              \
+        shift[1] = vs->client_pf.gshift;                              \
+        shift[2] = vs->client_pf.bshift;                              \

                                                                         \
         memset(stats, 0, sizeof(stats));                                \
                                                                         \
                                                                         \
         memset(stats, 0, sizeof(stats));                                \
                                                                         \


@@ -194,7 +235,7 @@ tight_detect_smooth_image24(VncState *vs, int w, int h)
                      d < w - x - VNC_TIGHT_DETECT_SUBROW_WIDTH; d++) {  \
                 pix = ((uint##bpp##_t *)buf)[(y+d)*w+x+d];              \
                 if (endian) {                                           \
                      d < w - x - VNC_TIGHT_DETECT_SUBROW_WIDTH; d++) {  \
                 pix = ((uint##bpp##_t *)buf)[(y+d)*w+x+d];              \
                 if (endian) {                                           \

-                    pix = bswap_##bpp(pix);                             \
+                    pix = bswap##bpp(pix);                              \

                 }                                                       \
                 for (c = 0; c < 3; c++) {                               \
                     left[c] = (int)(pix >> shift[c] & max[c]);          \
                 }                                                       \
                 for (c = 0; c < 3; c++) {                               \
                     left[c] = (int)(pix >> shift[c] & max[c]);          \


@@ -203,7 +244,7 @@ tight_detect_smooth_image24(VncState *vs, int w, int h)
                      dx++) {                                            \
                     pix = ((uint##bpp##_t *)buf)[(y+d)*w+x+d+dx];       \
                     if (endian) {                                       \
                      dx++) {                                            \
                     pix = ((uint##bpp##_t *)buf)[(y+d)*w+x+d+dx];       \
                     if (endian) {                                       \

-                        pix = bswap_##bpp(pix);                         \
+                        pix = bswap##bpp(pix);                          \

                     }                                                   \
                     sum = 0;                                            \
                     for (c = 0; c < 3; c++) {                           \
                     }                                                   \
                     sum = 0;                                            \
                     for (c = 0; c < 3; c++) {                           \


@@ -252,21 +293,21 @@ DEFINE_DETECT_FUNCTION(32)
 static int
 tight_detect_smooth_image(VncState *vs, int w, int h)
 {
 static int
 tight_detect_smooth_image(VncState *vs, int w, int h)
 {

-    uint errors;
-    int compression = vs->tight_compression;
-    int quality = vs->tight_quality;
+    unsigned int errors;
+    int compression = vs->tight.compression;
+    int quality = vs->tight.quality;

 
     if (!vs->vd->lossy) {
         return 0;
     }
 
 
     if (!vs->vd->lossy) {
         return 0;
     }
 

-    if (ds_get_bytes_per_pixel(vs->ds) == 1 ||
-        vs->clientds.pf.bytes_per_pixel == 1 ||
+    if (surface_bytes_per_pixel(vs->vd->ds) == 1 ||
+        vs->client_pf.bytes_per_pixel == 1 ||

         w < VNC_TIGHT_DETECT_MIN_WIDTH || h < VNC_TIGHT_DETECT_MIN_HEIGHT) {
         return 0;
     }
 
         w < VNC_TIGHT_DETECT_MIN_WIDTH || h < VNC_TIGHT_DETECT_MIN_HEIGHT) {
         return 0;
     }
 

-    if (vs->tight_quality != -1) {
+    if (vs->tight.quality != (uint8_t)-1) {

         if (w * h < VNC_TIGHT_JPEG_MIN_RECT_SIZE) {
             return 0;
         }
         if (w * h < VNC_TIGHT_JPEG_MIN_RECT_SIZE) {
             return 0;
         }


@@ -276,10 +317,10 @@ tight_detect_smooth_image(VncState *vs, int w, int h)
         }
     }
 
         }
     }
 

-    if (vs->clientds.pf.bytes_per_pixel == 4) {
-        if (vs->tight_pixel24) {
+    if (vs->client_pf.bytes_per_pixel == 4) {
+        if (vs->tight.pixel24) {

             errors = tight_detect_smooth_image24(vs, w, h);
             errors = tight_detect_smooth_image24(vs, w, h);

-            if (vs->tight_quality != -1) {
+            if (vs->tight.quality != (uint8_t)-1) {

                 return (errors < tight_conf[quality].jpeg_threshold24);
             }
             return (errors < tight_conf[compression].gradient_threshold24);
                 return (errors < tight_conf[quality].jpeg_threshold24);
             }
             return (errors < tight_conf[compression].gradient_threshold24);


@@ -298,79 +339,18 @@ tight_detect_smooth_image(VncState *vs, int w, int h)
 /*
  * Code to determine how many different colors used in rectangle.
  */
 /*
  * Code to determine how many different colors used in rectangle.
  */

-
-static void tight_palette_rgb2buf(uint32_t rgb, int bpp, uint8_t buf[6])
-{
-    memset(buf, 0, 6);
-
-    if (bpp == 32) {
-        buf[0] = ((rgb >> 24) & 0xFF);
-        buf[1] = ((rgb >> 16) & 0xFF);
-        buf[2] = ((rgb >>  8) & 0xFF);
-        buf[3] = ((rgb >>  0) & 0xFF);
-        buf[4] = ((buf[0] & 1) == 0) << 3 | ((buf[1] & 1) == 0) << 2;
-        buf[4]|= ((buf[2] & 1) == 0) << 1 | ((buf[3] & 1) == 0) << 0;
-        buf[0] |= 1;
-        buf[1] |= 1;
-        buf[2] |= 1;
-        buf[3] |= 1;
-    }
-    if (bpp == 16) {
-        buf[0] = ((rgb >> 8) & 0xFF);
-        buf[1] = ((rgb >> 0) & 0xFF);
-        buf[2] = ((buf[0] & 1) == 0) << 1 | ((buf[1] & 1) == 0) << 0;
-        buf[0] |= 1;
-        buf[1] |= 1;
-    }
-}
-
-static uint32_t tight_palette_buf2rgb(int bpp, const uint8_t *buf)
-{
-    uint32_t rgb = 0;
-
-    if (bpp == 32) {
-        rgb |= ((buf[0] & ~1) | !((buf[4] >> 3) & 1)) << 24;
-        rgb |= ((buf[1] & ~1) | !((buf[4] >> 2) & 1)) << 16;
-        rgb |= ((buf[2] & ~1) | !((buf[4] >> 1) & 1)) <<  8;
-        rgb |= ((buf[3] & ~1) | !((buf[4] >> 0) & 1)) <<  0;
-    }
-    if (bpp == 16) {
-        rgb |= ((buf[0] & ~1) | !((buf[2] >> 1) & 1)) << 8;
-        rgb |= ((buf[1] & ~1) | !((buf[2] >> 0) & 1)) << 0;
-    }
-    return rgb;
-}
-
-
-static int tight_palette_insert(QDict *palette, uint32_t rgb, int bpp, int max)
-{
-    uint8_t key[6];
-    int idx = qdict_size(palette);
-    bool present;
-
-    tight_palette_rgb2buf(rgb, bpp, key);
-    present = qdict_haskey(palette, (char *)key);
-    if (idx >= max && !present) {
-        return 0;
-    }
-    if (!present) {
-        qdict_put(palette, (char *)key, qint_from_int(idx));
-    }
-    return qdict_size(palette);
-}
-

 #define DEFINE_FILL_PALETTE_FUNCTION(bpp)                               \
                                                                         \
     static int                                                          \
     tight_fill_palette##bpp(VncState *vs, int x, int y,                 \
                             int max, size_t count,                      \
                             uint32_t *bg, uint32_t *fg,                 \
 #define DEFINE_FILL_PALETTE_FUNCTION(bpp)                               \
                                                                         \
     static int                                                          \
     tight_fill_palette##bpp(VncState *vs, int x, int y,                 \
                             int max, size_t count,                      \
                             uint32_t *bg, uint32_t *fg,                 \

-                            struct QDict **palette) {                   \
+                            VncPalette **palette) {                     \

         uint##bpp##_t *data;                                            \
         uint##bpp##_t c0, c1, ci;                                       \
         int i, n0, n1;                                                  \
                                                                         \
         uint##bpp##_t *data;                                            \
         uint##bpp##_t c0, c1, ci;                                       \
         int i, n0, n1;                                                  \
                                                                         \

-        data = (uint##bpp##_t *)vs->tight.buffer;                       \
+        data = (uint##bpp##_t *)vs->tight.tight.buffer;                 \

                                                                         \
         c0 = data[0];                                                   \
         i = 1;                                                          \
                                                                         \
         c0 = data[0];                                                   \
         i = 1;                                                          \


@@ -412,24 +392,23 @@ static int tight_palette_insert(QDict *palette, uint32_t rgb, int bpp, int max)
             return 0;                                                   \
         }                                                               \
                                                                         \
             return 0;                                                   \
         }                                                               \
                                                                         \

-        *palette = qdict_new();                                         \
-        tight_palette_insert(*palette, c0, bpp, max);                   \
-        tight_palette_insert(*palette, c1, bpp, max);                   \
-        tight_palette_insert(*palette, ci, bpp, max);                   \
+        *palette = palette_new(max, bpp);                               \
+        palette_put(*palette, c0);                                      \
+        palette_put(*palette, c1);                                      \
+        palette_put(*palette, ci);                                      \

                                                                         \
         for (i++; i < count; i++) {                                     \
             if (data[i] == ci) {                                        \
                 continue;                                               \
             } else {                                                    \
                 ci = data[i];                                           \
                                                                         \
         for (i++; i < count; i++) {                                     \
             if (data[i] == ci) {                                        \
                 continue;                                               \
             } else {                                                    \
                 ci = data[i];                                           \

-                if (!tight_palette_insert(*palette, (uint32_t)ci,       \
-                                          bpp, max)) {                  \
+                if (!palette_put(*palette, (uint32_t)ci)) {             \

                     return 0;                                           \
                 }                                                       \
             }                                                           \
         }                                                               \
                                                                         \
                     return 0;                                           \
                 }                                                       \
             }                                                           \
         }                                                               \
                                                                         \

-        return qdict_size(*palette);                                    \
+        return palette_size(*palette);                                  \

     }
 
 DEFINE_FILL_PALETTE_FUNCTION(8)
     }
 
 DEFINE_FILL_PALETTE_FUNCTION(8)


@@ -438,20 +417,20 @@ DEFINE_FILL_PALETTE_FUNCTION(32)
 
 static int tight_fill_palette(VncState *vs, int x, int y,
                               size_t count, uint32_t *bg, uint32_t *fg,
 
 static int tight_fill_palette(VncState *vs, int x, int y,
                               size_t count, uint32_t *bg, uint32_t *fg,

-                              struct QDict **palette)
+                              VncPalette **palette)

 {
     int max;
 
 {
     int max;
 

-    max = count / tight_conf[vs->tight_compression].idx_max_colors_divisor;
+    max = count / tight_conf[vs->tight.compression].idx_max_colors_divisor;

     if (max < 2 &&
     if (max < 2 &&

-        count >= tight_conf[vs->tight_compression].mono_min_rect_size) {
+        count >= tight_conf[vs->tight.compression].mono_min_rect_size) {

         max = 2;
     }
     if (max >= 256) {
         max = 256;
     }
 
         max = 2;
     }
     if (max >= 256) {
         max = 256;
     }
 

-    switch(vs->clientds.pf.bytes_per_pixel) {
+    switch (vs->client_pf.bytes_per_pixel) {

     case 4:
         return tight_fill_palette32(vs, x, y, max, count, bg, fg, palette);
     case 2:
     case 4:
         return tight_fill_palette32(vs, x, y, max, count, bg, fg, palette);
     case 2:


@@ -463,20 +442,6 @@ static int tight_fill_palette(VncState *vs, int x, int y,
     return 0;
 }
 
     return 0;
 }
 

-/* Callback to dump a palette with qdict_iter
-static void print_palette(const char *key, QObject *obj, void *opaque)
-{
-    uint8_t idx = qint_get_int(qobject_to_qint(obj));
-    uint32_t rgb = tight_palette_buf2rgb(32, (uint8_t *)key);
-
-    fprintf(stderr, "%.2x ", (unsigned char)*key);
-    while (*key++)
-        fprintf(stderr, "%.2x ", (unsigned char)*key);
-
-    fprintf(stderr, ": idx: %x rgb: %x\n", idx, rgb);
-}
-*/
-

 /*
  * Converting truecolor samples into palette indices.
  */
 /*
  * Converting truecolor samples into palette indices.
  */


@@ -484,10 +449,9 @@ static void print_palette(const char *key, QObject *obj, void *opaque)
                                                                         \
     static void                                                         \
     tight_encode_indexed_rect##bpp(uint8_t *buf, int count,             \
                                                                         \
     static void                                                         \
     tight_encode_indexed_rect##bpp(uint8_t *buf, int count,             \

-                                   struct QDict *palette) {             \
+                                   VncPalette *palette) {               \

         uint##bpp##_t *src;                                             \
         uint##bpp##_t rgb;                                              \
         uint##bpp##_t *src;                                             \
         uint##bpp##_t rgb;                                              \

-        uint8_t key[6];                                                 \

         int i, rep;                                                     \
         uint8_t idx;                                                    \
                                                                         \
         int i, rep;                                                     \
         uint8_t idx;                                                    \
                                                                         \


@@ -500,15 +464,13 @@ static void print_palette(const char *key, QObject *obj, void *opaque)
             while (i < count && *src == rgb) {                          \
                 rep++, src++, i++;                                      \
             }                                                           \
             while (i < count && *src == rgb) {                          \
                 rep++, src++, i++;                                      \
             }                                                           \

-            tight_palette_rgb2buf(rgb, bpp, key);                       \
-            if (!qdict_haskey(palette, (char *)key)) {                  \
-                /*                                                      \
-                 * Should never happen, but don't break everything      \
-                 * if it does, use the first color instead              \
-                 */                                                     \
+            idx = palette_idx(palette, rgb);                            \
+            /*                                                          \
+             * Should never happen, but don't break everything          \
+             * if it does, use the first color instead                  \
+             */                                                         \
+            if (idx == (uint8_t)-1) {                                   \

                 idx = 0;                                                \
                 idx = 0;                                                \

-            } else {                                                    \
-                idx = qdict_get_int(palette, (char *)key);              \

             }                                                           \
             while (rep >= 0) {                                          \
                 *buf++ = idx;                                           \
             }                                                           \
             while (rep >= 0) {                                          \
                 *buf++ = idx;                                           \


@@ -593,17 +555,17 @@ tight_filter_gradient24(VncState *vs, uint8_t *buf, int w, int h)
     int x, y, c;
 
     buf32 = (uint32_t *)buf;
     int x, y, c;
 
     buf32 = (uint32_t *)buf;

-    memset(vs->tight_gradient.buffer, 0, w * 3 * sizeof(int));
+    memset(vs->tight.gradient.buffer, 0, w * 3 * sizeof(int));

 
 

-    if ((vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) ==
-        (vs->ds->surface->flags & QEMU_BIG_ENDIAN_FLAG)) {
-        shift[0] = vs->clientds.pf.rshift;
-        shift[1] = vs->clientds.pf.gshift;
-        shift[2] = vs->clientds.pf.bshift;
+    if (1 /* FIXME: (vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) ==
+             (vs->ds->surface->flags & QEMU_BIG_ENDIAN_FLAG) */) {
+        shift[0] = vs->client_pf.rshift;
+        shift[1] = vs->client_pf.gshift;
+        shift[2] = vs->client_pf.bshift;

     } else {
     } else {

-        shift[0] = 24 - vs->clientds.pf.rshift;
-        shift[1] = 24 - vs->clientds.pf.gshift;
-        shift[2] = 24 - vs->clientds.pf.bshift;
+        shift[0] = 24 - vs->client_pf.rshift;
+        shift[1] = 24 - vs->client_pf.gshift;
+        shift[2] = 24 - vs->client_pf.bshift;

     }
 
     for (y = 0; y < h; y++) {
     }
 
     for (y = 0; y < h; y++) {


@@ -611,7 +573,7 @@ tight_filter_gradient24(VncState *vs, uint8_t *buf, int w, int h)
             upper[c] = 0;
             here[c] = 0;
         }
             upper[c] = 0;
             here[c] = 0;
         }

-        prev = (int *)vs->tight_gradient.buffer;
+        prev = (int *)vs->tight.gradient.buffer;

         for (x = 0; x < w; x++) {
             pix32 = *buf32++;
             for (c = 0; c < 3; c++) {
         for (x = 0; x < w; x++) {
             pix32 = *buf32++;
             for (c = 0; c < 3; c++) {


@@ -651,28 +613,28 @@ tight_filter_gradient24(VncState *vs, uint8_t *buf, int w, int h)
         int prediction;                                                 \
         int x, y, c;                                                    \
                                                                         \
         int prediction;                                                 \
         int x, y, c;                                                    \
                                                                         \

-        memset (vs->tight_gradient.buffer, 0, w * 3 * sizeof(int));     \
+        memset (vs->tight.gradient.buffer, 0, w * 3 * sizeof(int));     \

                                                                         \
                                                                         \

-        endian = ((vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) !=        \
-                  (vs->ds->surface->flags & QEMU_BIG_ENDIAN_FLAG));     \
+        endian = 0; /* FIXME: ((vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) != \
+                       (vs->ds->surface->flags & QEMU_BIG_ENDIAN_FLAG)); */ \

                                                                         \
                                                                         \

-        max[0] = vs->clientds.pf.rmax;                                  \
-        max[1] = vs->clientds.pf.gmax;                                  \
-        max[2] = vs->clientds.pf.bmax;                                  \
-        shift[0] = vs->clientds.pf.rshift;                              \
-        shift[1] = vs->clientds.pf.gshift;                              \
-        shift[2] = vs->clientds.pf.bshift;                              \
+        max[0] = vs->client_pf.rmax;                                    \
+        max[1] = vs->client_pf.gmax;                                    \
+        max[2] = vs->client_pf.bmax;                                    \
+        shift[0] = vs->client_pf.rshift;                                \
+        shift[1] = vs->client_pf.gshift;                                \
+        shift[2] = vs->client_pf.bshift;                                \

                                                                         \
         for (y = 0; y < h; y++) {                                       \
             for (c = 0; c < 3; c++) {                                   \
                 upper[c] = 0;                                           \
                 here[c] = 0;                                            \
             }                                                           \
                                                                         \
         for (y = 0; y < h; y++) {                                       \
             for (c = 0; c < 3; c++) {                                   \
                 upper[c] = 0;                                           \
                 here[c] = 0;                                            \
             }                                                           \

-            prev = (int *)vs->tight_gradient.buffer;                    \
+            prev = (int *)vs->tight.gradient.buffer;                    \

             for (x = 0; x < w; x++) {                                   \
                 pix = *buf;                                             \
                 if (endian) {                                           \
             for (x = 0; x < w; x++) {                                   \
                 pix = *buf;                                             \
                 if (endian) {                                           \

-                    pix = bswap_##bpp(pix);                             \
+                    pix = bswap##bpp(pix);                              \

                 }                                                       \
                 diff = 0;                                               \
                 for (c = 0; c < 3; c++) {                               \
                 }                                                       \
                 diff = 0;                                               \
                 for (c = 0; c < 3; c++) {                               \


@@ -692,7 +654,7 @@ tight_filter_gradient24(VncState *vs, uint8_t *buf, int w, int h)
                         << shift[c];                                    \
                 }                                                       \
                 if (endian) {                                           \
                         << shift[c];                                    \
                 }                                                       \
                 if (endian) {                                           \

-                    diff = bswap_##bpp(diff);                           \
+                    diff = bswap##bpp(diff);                            \

                 }                                                       \
                 *buf++ = diff;                                          \
             }                                                           \
                 }                                                       \
                 *buf++ = diff;                                          \
             }                                                           \


@@ -705,60 +667,46 @@ DEFINE_GRADIENT_FILTER_FUNCTION(32)
 /*
  * Check if a rectangle is all of the same color. If needSameColor is
  * set to non-zero, then also check that its color equals to the
 /*
  * Check if a rectangle is all of the same color. If needSameColor is
  * set to non-zero, then also check that its color equals to the

- * *colorPtr value. The result is 1 if the test is successfull, and in
+ * *colorPtr value. The result is 1 if the test is successful, and in

  * that case new color will be stored in *colorPtr.
  */
 
  * that case new color will be stored in *colorPtr.
  */
 

-#define DEFINE_CHECK_SOLID_FUNCTION(bpp)                                \
-                                                                        \
-    static bool                                                         \
-    check_solid_tile##bpp(VncState *vs, int x, int y, int w, int h,     \
-                          uint32_t* color, bool samecolor)              \
-    {                                                                   \
-        VncDisplay *vd = vs->vd;                                        \
-        uint##bpp##_t *fbptr;                                           \
-        uint##bpp##_t c;                                                \
-        int dx, dy;                                                     \
-                                                                        \
-        fbptr = (uint##bpp##_t *)                                       \
-            (vd->server->data + y * ds_get_linesize(vs->ds) +           \
-             x * ds_get_bytes_per_pixel(vs->ds));                       \
-                                                                        \
-        c = *fbptr;                                                     \
-        if (samecolor && (uint32_t)c != *color) {                       \
-            return false;                                               \
-        }                                                               \
-                                                                        \
-        for (dy = 0; dy < h; dy++) {                                    \
-            for (dx = 0; dx < w; dx++) {                                \
-                if (c != fbptr[dx]) {                                   \
-                    return false;                                       \
-                }                                                       \
-            }                                                           \
-            fbptr = (uint##bpp##_t *)                                   \
-                ((uint8_t *)fbptr + ds_get_linesize(vs->ds));           \
-        }                                                               \
-                                                                        \
-        *color = (uint32_t)c;                                           \
-        return true;                                                    \
+static bool
+check_solid_tile32(VncState *vs, int x, int y, int w, int h,
+                   uint32_t *color, bool samecolor)
+{
+    VncDisplay *vd = vs->vd;
+    uint32_t *fbptr;
+    uint32_t c;
+    int dx, dy;
+
+    fbptr = vnc_server_fb_ptr(vd, x, y);
+
+    c = *fbptr;
+    if (samecolor && (uint32_t)c != *color) {
+        return false;
+    }
+
+    for (dy = 0; dy < h; dy++) {
+        for (dx = 0; dx < w; dx++) {
+            if (c != fbptr[dx]) {
+                return false;
+            }
+        }
+        fbptr = (uint32_t *)
+            ((uint8_t *)fbptr + vnc_server_fb_stride(vd));

     }
 
     }
 

-DEFINE_CHECK_SOLID_FUNCTION(32)
-DEFINE_CHECK_SOLID_FUNCTION(16)
-DEFINE_CHECK_SOLID_FUNCTION(8)
+    *color = (uint32_t)c;
+    return true;
+}

 
 static bool check_solid_tile(VncState *vs, int x, int y, int w, int h,
                              uint32_t* color, bool samecolor)
 {
 
 static bool check_solid_tile(VncState *vs, int x, int y, int w, int h,
                              uint32_t* color, bool samecolor)
 {

-    VncDisplay *vd = vs->vd;
-
-    switch(vd->server->pf.bytes_per_pixel) {
+    switch (VNC_SERVER_FB_BYTES) {

     case 4:
         return check_solid_tile32(vs, x, y, w, h, color, samecolor);
     case 4:
         return check_solid_tile32(vs, x, y, w, h, color, samecolor);

-    case 2:
-        return check_solid_tile16(vs, x, y, w, h, color, samecolor);
-    default:
-        return check_solid_tile8(vs, x, y, w, h, color, samecolor);

     }
 }
 
     }
 }
 


@@ -838,7 +786,7 @@ static void extend_solid_area(VncState *vs, int x, int y, int w, int h,
 static int tight_init_stream(VncState *vs, int stream_id,
                              int level, int strategy)
 {
 static int tight_init_stream(VncState *vs, int stream_id,
                              int level, int strategy)
 {

-    z_streamp zstream = &vs->tight_stream[stream_id];
+    z_streamp zstream = &vs->tight.stream[stream_id];

 
     if (zstream->opaque == NULL) {
         int err;
 
     if (zstream->opaque == NULL) {
         int err;


@@ -856,15 +804,15 @@ static int tight_init_stream(VncState *vs, int stream_id,
             return -1;
         }
 
             return -1;
         }
 

-        vs->tight_levels[stream_id] = level;
+        vs->tight.levels[stream_id] = level;

         zstream->opaque = vs;
     }
 
         zstream->opaque = vs;
     }
 

-    if (vs->tight_levels[stream_id] != level) {
+    if (vs->tight.levels[stream_id] != level) {

         if (deflateParams(zstream, level, strategy) != Z_OK) {
             return -1;
         }
         if (deflateParams(zstream, level, strategy) != Z_OK) {
             return -1;
         }

-        vs->tight_levels[stream_id] = level;
+        vs->tight.levels[stream_id] = level;

     }
     return 0;
 }
     }
     return 0;
 }


@@ -892,11 +840,11 @@ static void tight_send_compact_size(VncState *vs, size_t len)
 static int tight_compress_data(VncState *vs, int stream_id, size_t bytes,
                                int level, int strategy)
 {
 static int tight_compress_data(VncState *vs, int stream_id, size_t bytes,
                                int level, int strategy)
 {

-    z_streamp zstream = &vs->tight_stream[stream_id];
+    z_streamp zstream = &vs->tight.stream[stream_id];

     int previous_out;
 
     if (bytes < VNC_TIGHT_MIN_TO_COMPRESS) {
     int previous_out;
 
     if (bytes < VNC_TIGHT_MIN_TO_COMPRESS) {

-        vnc_write(vs, vs->tight.buffer, vs->tight.offset);
+        vnc_write(vs, vs->tight.tight.buffer, vs->tight.tight.offset);

         return bytes;
     }
 
         return bytes;
     }
 


@@ -905,15 +853,15 @@ static int tight_compress_data(VncState *vs, int stream_id, size_t bytes,
     }
 
     /* reserve memory in output buffer */
     }
 
     /* reserve memory in output buffer */

-    buffer_reserve(&vs->tight_zlib, bytes + 64);
+    buffer_reserve(&vs->tight.zlib, bytes + 64);

 
     /* set pointers */
 
     /* set pointers */

-    zstream->next_in = vs->tight.buffer;
-    zstream->avail_in = vs->tight.offset;
-    zstream->next_out = vs->tight_zlib.buffer + vs->tight_zlib.offset;
-    zstream->avail_out = vs->tight_zlib.capacity - vs->tight_zlib.offset;
+    zstream->next_in = vs->tight.tight.buffer;
+    zstream->avail_in = vs->tight.tight.offset;
+    zstream->next_out = vs->tight.zlib.buffer + vs->tight.zlib.offset;
+    zstream->avail_out = vs->tight.zlib.capacity - vs->tight.zlib.offset;
+    previous_out = zstream->avail_out;

     zstream->data_type = Z_BINARY;
     zstream->data_type = Z_BINARY;

-    previous_out = zstream->total_out;

 
     /* start encoding */
     if (deflate(zstream, Z_SYNC_FLUSH) != Z_OK) {
 
     /* start encoding */
     if (deflate(zstream, Z_SYNC_FLUSH) != Z_OK) {


@@ -921,13 +869,14 @@ static int tight_compress_data(VncState *vs, int stream_id, size_t bytes,
         return -1;
     }
 
         return -1;
     }
 

-    vs->tight_zlib.offset = vs->tight_zlib.capacity - zstream->avail_out;
-    bytes = zstream->total_out - previous_out;
+    vs->tight.zlib.offset = vs->tight.zlib.capacity - zstream->avail_out;
+    /* ...how much data has actually been produced by deflate() */
+    bytes = previous_out - zstream->avail_out;

 
     tight_send_compact_size(vs, bytes);
 
     tight_send_compact_size(vs, bytes);

-    vnc_write(vs, vs->tight_zlib.buffer, bytes);
+    vnc_write(vs, vs->tight.zlib.buffer, bytes);

 
 

-    buffer_reset(&vs->tight_zlib);
+    buffer_reset(&vs->tight.zlib);

 
     return bytes;
 }
 
     return bytes;
 }


@@ -943,15 +892,15 @@ static void tight_pack24(VncState *vs, uint8_t *buf, size_t count, size_t *ret)
 
     buf32 = (uint32_t *)buf;
 
 
     buf32 = (uint32_t *)buf;
 

-    if ((vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) ==
-        (vs->ds->surface->flags & QEMU_BIG_ENDIAN_FLAG)) {
-        rshift = vs->clientds.pf.rshift;
-        gshift = vs->clientds.pf.gshift;
-        bshift = vs->clientds.pf.bshift;
+    if (1 /* FIXME: (vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) ==
+             (vs->ds->surface->flags & QEMU_BIG_ENDIAN_FLAG) */) {
+        rshift = vs->client_pf.rshift;
+        gshift = vs->client_pf.gshift;
+        bshift = vs->client_pf.bshift;

     } else {
     } else {

-        rshift = 24 - vs->clientds.pf.rshift;
-        gshift = 24 - vs->clientds.pf.gshift;
-        bshift = 24 - vs->clientds.pf.bshift;
+        rshift = 24 - vs->client_pf.rshift;
+        gshift = 24 - vs->client_pf.gshift;
+        bshift = 24 - vs->client_pf.bshift;

     }
 
     if (ret) {
     }
 
     if (ret) {


@@ -969,7 +918,7 @@ static void tight_pack24(VncState *vs, uint8_t *buf, size_t count, size_t *ret)
 static int send_full_color_rect(VncState *vs, int x, int y, int w, int h)
 {
     int stream = 0;
 static int send_full_color_rect(VncState *vs, int x, int y, int w, int h)
 {
     int stream = 0;

-    size_t bytes;
+    ssize_t bytes;

 
 #ifdef CONFIG_VNC_PNG
     if (tight_can_send_png_rect(vs, w, h)) {
 
 #ifdef CONFIG_VNC_PNG
     if (tight_can_send_png_rect(vs, w, h)) {


@@ -979,15 +928,15 @@ static int send_full_color_rect(VncState *vs, int x, int y, int w, int h)
 
     vnc_write_u8(vs, stream << 4); /* no flushing, no filter */
 
 
     vnc_write_u8(vs, stream << 4); /* no flushing, no filter */
 

-    if (vs->tight_pixel24) {
-        tight_pack24(vs, vs->tight.buffer, w * h, &vs->tight.offset);
+    if (vs->tight.pixel24) {
+        tight_pack24(vs, vs->tight.tight.buffer, w * h, &vs->tight.tight.offset);

         bytes = 3;
     } else {
         bytes = 3;
     } else {

-        bytes = vs->clientds.pf.bytes_per_pixel;
+        bytes = vs->client_pf.bytes_per_pixel;

     }
 
     bytes = tight_compress_data(vs, stream, w * h * bytes,
     }
 
     bytes = tight_compress_data(vs, stream, w * h * bytes,

-                                tight_conf[vs->tight_compression].raw_zlib_level,
+                                tight_conf[vs->tight.compression].raw_zlib_level,

                                 Z_DEFAULT_STRATEGY);
 
     return (bytes >= 0);
                                 Z_DEFAULT_STRATEGY);
 
     return (bytes >= 0);


@@ -999,34 +948,34 @@ static int send_solid_rect(VncState *vs)
 
     vnc_write_u8(vs, VNC_TIGHT_FILL << 4); /* no flushing, no filter */
 
 
     vnc_write_u8(vs, VNC_TIGHT_FILL << 4); /* no flushing, no filter */
 

-    if (vs->tight_pixel24) {
-        tight_pack24(vs, vs->tight.buffer, 1, &vs->tight.offset);
+    if (vs->tight.pixel24) {
+        tight_pack24(vs, vs->tight.tight.buffer, 1, &vs->tight.tight.offset);

         bytes = 3;
     } else {
         bytes = 3;
     } else {

-        bytes = vs->clientds.pf.bytes_per_pixel;
+        bytes = vs->client_pf.bytes_per_pixel;

     }
 
     }
 

-    vnc_write(vs, vs->tight.buffer, bytes);
+    vnc_write(vs, vs->tight.tight.buffer, bytes);

     return 1;
 }
 
 static int send_mono_rect(VncState *vs, int x, int y,
                           int w, int h, uint32_t bg, uint32_t fg)
 {
     return 1;
 }
 
 static int send_mono_rect(VncState *vs, int x, int y,
                           int w, int h, uint32_t bg, uint32_t fg)
 {

-    size_t bytes;
+    ssize_t bytes;

     int stream = 1;
     int stream = 1;

-    int level = tight_conf[vs->tight_compression].mono_zlib_level;
+    int level = tight_conf[vs->tight.compression].mono_zlib_level;

 
 #ifdef CONFIG_VNC_PNG
     if (tight_can_send_png_rect(vs, w, h)) {
         int ret;
 
 #ifdef CONFIG_VNC_PNG
     if (tight_can_send_png_rect(vs, w, h)) {
         int ret;

-        QDict *palette = qdict_new();
-        int bpp = vs->clientds.pf.bytes_per_pixel * 8;
+        int bpp = vs->client_pf.bytes_per_pixel * 8;
+        VncPalette *palette = palette_new(2, bpp);

 
 

-        tight_palette_insert(palette, bg, bpp, 2);
-        tight_palette_insert(palette, fg, bpp, 2);
+        palette_put(palette, bg);
+        palette_put(palette, fg);

         ret = send_png_rect(vs, x, y, w, h, palette);
         ret = send_png_rect(vs, x, y, w, h, palette);

-        QDECREF(palette);
+        palette_destroy(palette);

         return ret;
     }
 #endif
         return ret;
     }
 #endif


@@ -1037,32 +986,32 @@ static int send_mono_rect(VncState *vs, int x, int y,
     vnc_write_u8(vs, VNC_TIGHT_FILTER_PALETTE);
     vnc_write_u8(vs, 1);
 
     vnc_write_u8(vs, VNC_TIGHT_FILTER_PALETTE);
     vnc_write_u8(vs, 1);
 

-    switch(vs->clientds.pf.bytes_per_pixel) {
+    switch (vs->client_pf.bytes_per_pixel) {

     case 4:
     {
         uint32_t buf[2] = {bg, fg};
         size_t ret = sizeof (buf);
 
     case 4:
     {
         uint32_t buf[2] = {bg, fg};
         size_t ret = sizeof (buf);
 

-        if (vs->tight_pixel24) {
+        if (vs->tight.pixel24) {

             tight_pack24(vs, (unsigned char*)buf, 2, &ret);
         }
         vnc_write(vs, buf, ret);
 
             tight_pack24(vs, (unsigned char*)buf, 2, &ret);
         }
         vnc_write(vs, buf, ret);
 

-        tight_encode_mono_rect32(vs->tight.buffer, w, h, bg, fg);
+        tight_encode_mono_rect32(vs->tight.tight.buffer, w, h, bg, fg);

         break;
     }
     case 2:
         vnc_write(vs, &bg, 2);
         vnc_write(vs, &fg, 2);
         break;
     }
     case 2:
         vnc_write(vs, &bg, 2);
         vnc_write(vs, &fg, 2);

-        tight_encode_mono_rect16(vs->tight.buffer, w, h, bg, fg);
+        tight_encode_mono_rect16(vs->tight.tight.buffer, w, h, bg, fg);

         break;
     default:
         vnc_write_u8(vs, bg);
         vnc_write_u8(vs, fg);
         break;
     default:
         vnc_write_u8(vs, bg);
         vnc_write_u8(vs, fg);

-        tight_encode_mono_rect8(vs->tight.buffer, w, h, bg, fg);
+        tight_encode_mono_rect8(vs->tight.tight.buffer, w, h, bg, fg);

         break;
     }
         break;
     }

-    vs->tight.offset = bytes;
+    vs->tight.tight.offset = bytes;

 
     bytes = tight_compress_data(vs, stream, bytes, level, Z_DEFAULT_STRATEGY);
     return (bytes >= 0);
 
     bytes = tight_compress_data(vs, stream, bytes, level, Z_DEFAULT_STRATEGY);
     return (bytes >= 0);


@@ -1076,20 +1025,15 @@ struct palette_cb_priv {
 #endif
 };
 
 #endif
 };
 

-static void write_palette(const char *key, QObject *obj, void *opaque)
+static void write_palette(int idx, uint32_t color, void *opaque)

 {
     struct palette_cb_priv *priv = opaque;
     VncState *vs = priv->vs;
 {
     struct palette_cb_priv *priv = opaque;
     VncState *vs = priv->vs;

-    uint32_t bytes = vs->clientds.pf.bytes_per_pixel;
-    uint8_t idx = qint_get_int(qobject_to_qint(obj));
+    uint32_t bytes = vs->client_pf.bytes_per_pixel;

 
     if (bytes == 4) {
 
     if (bytes == 4) {

-        uint32_t color = tight_palette_buf2rgb(32, (uint8_t *)key);
-

         ((uint32_t*)priv->header)[idx] = color;
     } else {
         ((uint32_t*)priv->header)[idx] = color;
     } else {

-        uint16_t color = tight_palette_buf2rgb(16, (uint8_t *)key);
-

         ((uint16_t*)priv->header)[idx] = color;
     }
 }
         ((uint16_t*)priv->header)[idx] = color;
     }
 }


@@ -1097,32 +1041,33 @@ static void write_palette(const char *key, QObject *obj, void *opaque)
 static bool send_gradient_rect(VncState *vs, int x, int y, int w, int h)
 {
     int stream = 3;
 static bool send_gradient_rect(VncState *vs, int x, int y, int w, int h)
 {
     int stream = 3;

-    int level = tight_conf[vs->tight_compression].gradient_zlib_level;
-    size_t bytes;
+    int level = tight_conf[vs->tight.compression].gradient_zlib_level;
+    ssize_t bytes;

 
 

-    if (vs->clientds.pf.bytes_per_pixel == 1)
+    if (vs->client_pf.bytes_per_pixel == 1) {

         return send_full_color_rect(vs, x, y, w, h);
         return send_full_color_rect(vs, x, y, w, h);

+    }

 
     vnc_write_u8(vs, (stream | VNC_TIGHT_EXPLICIT_FILTER) << 4);
     vnc_write_u8(vs, VNC_TIGHT_FILTER_GRADIENT);
 
 
     vnc_write_u8(vs, (stream | VNC_TIGHT_EXPLICIT_FILTER) << 4);
     vnc_write_u8(vs, VNC_TIGHT_FILTER_GRADIENT);
 

-    buffer_reserve(&vs->tight_gradient, w * 3 * sizeof (int));
+    buffer_reserve(&vs->tight.gradient, w * 3 * sizeof (int));

 
 

-    if (vs->tight_pixel24) {
-        tight_filter_gradient24(vs, vs->tight.buffer, w, h);
+    if (vs->tight.pixel24) {
+        tight_filter_gradient24(vs, vs->tight.tight.buffer, w, h);

         bytes = 3;
         bytes = 3;

-    } else if (vs->clientds.pf.bytes_per_pixel == 4) {
-        tight_filter_gradient32(vs, (uint32_t *)vs->tight.buffer, w, h);
+    } else if (vs->client_pf.bytes_per_pixel == 4) {
+        tight_filter_gradient32(vs, (uint32_t *)vs->tight.tight.buffer, w, h);

         bytes = 4;
     } else {
         bytes = 4;
     } else {

-        tight_filter_gradient16(vs, (uint16_t *)vs->tight.buffer, w, h);
+        tight_filter_gradient16(vs, (uint16_t *)vs->tight.tight.buffer, w, h);

         bytes = 2;
     }
 
         bytes = 2;
     }
 

-    buffer_reset(&vs->tight_gradient);
+    buffer_reset(&vs->tight.gradient);

 
     bytes = w * h * bytes;
 
     bytes = w * h * bytes;

-    vs->tight.offset = bytes;
+    vs->tight.tight.offset = bytes;

 
     bytes = tight_compress_data(vs, stream, bytes,
                                 level, Z_FILTERED);
 
     bytes = tight_compress_data(vs, stream, bytes,
                                 level, Z_FILTERED);


@@ -1130,12 +1075,12 @@ static bool send_gradient_rect(VncState *vs, int x, int y, int w, int h)
 }
 
 static int send_palette_rect(VncState *vs, int x, int y,
 }
 
 static int send_palette_rect(VncState *vs, int x, int y,

-                             int w, int h, struct QDict *palette)
+                             int w, int h, VncPalette *palette)

 {
     int stream = 2;
 {
     int stream = 2;

-    int level = tight_conf[vs->tight_compression].idx_zlib_level;
+    int level = tight_conf[vs->tight.compression].idx_zlib_level;

     int colors;
     int colors;

-    size_t bytes;
+    ssize_t bytes;

 
 #ifdef CONFIG_VNC_PNG
     if (tight_can_send_png_rect(vs, w, h)) {
 
 #ifdef CONFIG_VNC_PNG
     if (tight_can_send_png_rect(vs, w, h)) {


@@ -1143,39 +1088,39 @@ static int send_palette_rect(VncState *vs, int x, int y,
     }
 #endif
 
     }
 #endif
 

-    colors = qdict_size(palette);
+    colors = palette_size(palette);

 
     vnc_write_u8(vs, (stream | VNC_TIGHT_EXPLICIT_FILTER) << 4);
     vnc_write_u8(vs, VNC_TIGHT_FILTER_PALETTE);
     vnc_write_u8(vs, colors - 1);
 
 
     vnc_write_u8(vs, (stream | VNC_TIGHT_EXPLICIT_FILTER) << 4);
     vnc_write_u8(vs, VNC_TIGHT_FILTER_PALETTE);
     vnc_write_u8(vs, colors - 1);
 

-    switch(vs->clientds.pf.bytes_per_pixel) {
+    switch (vs->client_pf.bytes_per_pixel) {

     case 4:
     {
         size_t old_offset, offset;
     case 4:
     {
         size_t old_offset, offset;

-        uint32_t header[qdict_size(palette)];
+        uint32_t header[palette_size(palette)];

         struct palette_cb_priv priv = { vs, (uint8_t *)header };
 
         old_offset = vs->output.offset;
         struct palette_cb_priv priv = { vs, (uint8_t *)header };
 
         old_offset = vs->output.offset;

-        qdict_iter(palette, write_palette, &priv);
+        palette_iter(palette, write_palette, &priv);

         vnc_write(vs, header, sizeof(header));
 
         vnc_write(vs, header, sizeof(header));
 

-        if (vs->tight_pixel24) {
+        if (vs->tight.pixel24) {

             tight_pack24(vs, vs->output.buffer + old_offset, colors, &offset);
             vs->output.offset = old_offset + offset;
         }
 
             tight_pack24(vs, vs->output.buffer + old_offset, colors, &offset);
             vs->output.offset = old_offset + offset;
         }
 

-        tight_encode_indexed_rect32(vs->tight.buffer, w * h, palette);
+        tight_encode_indexed_rect32(vs->tight.tight.buffer, w * h, palette);

         break;
     }
     case 2:
     {
         break;
     }
     case 2:
     {

-        uint16_t header[qdict_size(palette)];
+        uint16_t header[palette_size(palette)];

         struct palette_cb_priv priv = { vs, (uint8_t *)header };
 
         struct palette_cb_priv priv = { vs, (uint8_t *)header };
 

-        qdict_iter(palette, write_palette, &priv);
+        palette_iter(palette, write_palette, &priv);

         vnc_write(vs, header, sizeof(header));
         vnc_write(vs, header, sizeof(header));

-        tight_encode_indexed_rect16(vs->tight.buffer, w * h, palette);
+        tight_encode_indexed_rect16(vs->tight.tight.buffer, w * h, palette);

         break;
     }
     default:
         break;
     }
     default:


@@ -1183,81 +1128,13 @@ static int send_palette_rect(VncState *vs, int x, int y,
         break;
     }
     bytes = w * h;
         break;
     }
     bytes = w * h;

-    vs->tight.offset = bytes;
+    vs->tight.tight.offset = bytes;

 
     bytes = tight_compress_data(vs, stream, bytes,
                                 level, Z_DEFAULT_STRATEGY);
     return (bytes >= 0);
 }
 
 
     bytes = tight_compress_data(vs, stream, bytes,
                                 level, Z_DEFAULT_STRATEGY);
     return (bytes >= 0);
 }
 

-#if defined(CONFIG_VNC_JPEG) || defined(CONFIG_VNC_PNG)
-static void rgb_prepare_row24(VncState *vs, uint8_t *dst, int x, int y,
-                              int count)
-{
-    VncDisplay *vd = vs->vd;
-    uint32_t *fbptr;
-    uint32_t pix;
-
-    fbptr = (uint32_t *)(vd->server->data + y * ds_get_linesize(vs->ds) +
-                         x * ds_get_bytes_per_pixel(vs->ds));
-
-    while (count--) {
-        pix = *fbptr++;
-        *dst++ = (uint8_t)(pix >> vs->ds->surface->pf.rshift);
-        *dst++ = (uint8_t)(pix >> vs->ds->surface->pf.gshift);
-        *dst++ = (uint8_t)(pix >> vs->ds->surface->pf.bshift);
-    }
-}
-
-#define DEFINE_RGB_GET_ROW_FUNCTION(bpp)                                \
-                                                                        \
-    static void                                                         \
-    rgb_prepare_row##bpp(VncState *vs, uint8_t *dst,                    \
-                         int x, int y, int count)                       \
-    {                                                                   \
-        VncDisplay *vd = vs->vd;                                        \
-        uint##bpp##_t *fbptr;                                           \
-        uint##bpp##_t pix;                                              \
-        int r, g, b;                                                    \
-                                                                        \
-        fbptr = (uint##bpp##_t *)                                       \
-            (vd->server->data + y * ds_get_linesize(vs->ds) +           \
-             x * ds_get_bytes_per_pixel(vs->ds));                       \
-                                                                        \
-        while (count--) {                                               \
-            pix = *fbptr++;                                             \
-                                                                        \
-            r = (int)((pix >> vs->ds->surface->pf.rshift)               \
-                      & vs->ds->surface->pf.rmax);                      \
-            g = (int)((pix >> vs->ds->surface->pf.gshift)               \
-                      & vs->ds->surface->pf.gmax);                      \
-            b = (int)((pix >> vs->ds->surface->pf.bshift)               \
-                      & vs->ds->surface->pf.bmax);                      \
-                                                                        \
-            *dst++ = (uint8_t)((r * 255 + vs->ds->surface->pf.rmax / 2) \
-                               / vs->ds->surface->pf.rmax);             \
-            *dst++ = (uint8_t)((g * 255 + vs->ds->surface->pf.gmax / 2) \
-                               / vs->ds->surface->pf.gmax);             \
-            *dst++ = (uint8_t)((b * 255 + vs->ds->surface->pf.bmax / 2) \
-                               / vs->ds->surface->pf.bmax);             \
-        }                                                               \
-    }
-
-DEFINE_RGB_GET_ROW_FUNCTION(16)
-DEFINE_RGB_GET_ROW_FUNCTION(32)
-
-static void rgb_prepare_row(VncState *vs, uint8_t *dst, int x, int y,
-                            int count)
-{
-    if (vs->tight_pixel24)
-        rgb_prepare_row24(vs, dst, x, y, count);
-    else if (ds_get_bytes_per_pixel(vs->ds) == 4)
-        rgb_prepare_row32(vs, dst, x, y, count);
-    else
-        rgb_prepare_row16(vs, dst, x, y, count);
-}
-#endif /* CONFIG_VNC_JPEG or CONFIG_VNC_PNG */
-

 /*
  * JPEG compression stuff.
  */
 /*
  * JPEG compression stuff.
  */


@@ -1270,7 +1147,7 @@ static void rgb_prepare_row(VncState *vs, uint8_t *dst, int x, int y,
 static void jpeg_init_destination(j_compress_ptr cinfo)
 {
     VncState *vs = cinfo->client_data;
 static void jpeg_init_destination(j_compress_ptr cinfo)
 {
     VncState *vs = cinfo->client_data;

-    Buffer *buffer = &vs->tight_jpeg;
+    Buffer *buffer = &vs->tight.jpeg;

 
     cinfo->dest->next_output_byte = (JOCTET *)buffer->buffer + buffer->offset;
     cinfo->dest->free_in_buffer = (size_t)(buffer->capacity - buffer->offset);
 
     cinfo->dest->next_output_byte = (JOCTET *)buffer->buffer + buffer->offset;
     cinfo->dest->free_in_buffer = (size_t)(buffer->capacity - buffer->offset);


@@ -1280,7 +1157,7 @@ static void jpeg_init_destination(j_compress_ptr cinfo)
 static boolean jpeg_empty_output_buffer(j_compress_ptr cinfo)
 {
     VncState *vs = cinfo->client_data;
 static boolean jpeg_empty_output_buffer(j_compress_ptr cinfo)
 {
     VncState *vs = cinfo->client_data;

-    Buffer *buffer = &vs->tight_jpeg;
+    Buffer *buffer = &vs->tight.jpeg;

 
     buffer->offset = buffer->capacity;
     buffer_reserve(buffer, 2048);
 
     buffer->offset = buffer->capacity;
     buffer_reserve(buffer, 2048);


@@ -1292,7 +1169,7 @@ static boolean jpeg_empty_output_buffer(j_compress_ptr cinfo)
 static void jpeg_term_destination(j_compress_ptr cinfo)
 {
     VncState *vs = cinfo->client_data;
 static void jpeg_term_destination(j_compress_ptr cinfo)
 {
     VncState *vs = cinfo->client_data;

-    Buffer *buffer = &vs->tight_jpeg;
+    Buffer *buffer = &vs->tight.jpeg;

 
     buffer->offset = buffer->capacity - cinfo->dest->free_in_buffer;
 }
 
     buffer->offset = buffer->capacity - cinfo->dest->free_in_buffer;
 }


@@ -1302,14 +1179,16 @@ static int send_jpeg_rect(VncState *vs, int x, int y, int w, int h, int quality)
     struct jpeg_compress_struct cinfo;
     struct jpeg_error_mgr jerr;
     struct jpeg_destination_mgr manager;
     struct jpeg_compress_struct cinfo;
     struct jpeg_error_mgr jerr;
     struct jpeg_destination_mgr manager;

+    pixman_image_t *linebuf;

     JSAMPROW row[1];
     uint8_t *buf;
     int dy;
 
     JSAMPROW row[1];
     uint8_t *buf;
     int dy;
 

-    if (ds_get_bytes_per_pixel(vs->ds) == 1)
+    if (surface_bytes_per_pixel(vs->vd->ds) == 1) {

         return send_full_color_rect(vs, x, y, w, h);
         return send_full_color_rect(vs, x, y, w, h);

+    }

 
 

-    buffer_reserve(&vs->tight_jpeg, 2048);
+    buffer_reserve(&vs->tight.jpeg, 2048);

 
     cinfo.err = jpeg_std_error(&jerr);
     jpeg_create_compress(&cinfo);
 
     cinfo.err = jpeg_std_error(&jerr);
     jpeg_create_compress(&cinfo);


@@ -1330,22 +1209,23 @@ static int send_jpeg_rect(VncState *vs, int x, int y, int w, int h, int quality)
 
     jpeg_start_compress(&cinfo, true);
 
 
     jpeg_start_compress(&cinfo, true);
 

-    buf = qemu_malloc(w * 3);
+    linebuf = qemu_pixman_linebuf_create(PIXMAN_BE_r8g8b8, w);
+    buf = (uint8_t *)pixman_image_get_data(linebuf);

     row[0] = buf;
     for (dy = 0; dy < h; dy++) {
     row[0] = buf;
     for (dy = 0; dy < h; dy++) {

-        rgb_prepare_row(vs, buf, x, y + dy, w);
+        qemu_pixman_linebuf_fill(linebuf, vs->vd->server, w, x, y + dy);

         jpeg_write_scanlines(&cinfo, row, 1);
     }
         jpeg_write_scanlines(&cinfo, row, 1);
     }

-    qemu_free(buf);
+    qemu_pixman_image_unref(linebuf);

 
     jpeg_finish_compress(&cinfo);
     jpeg_destroy_compress(&cinfo);
 
     vnc_write_u8(vs, VNC_TIGHT_JPEG << 4);
 
 
     jpeg_finish_compress(&cinfo);
     jpeg_destroy_compress(&cinfo);
 
     vnc_write_u8(vs, VNC_TIGHT_JPEG << 4);
 

-    tight_send_compact_size(vs, vs->tight_jpeg.offset);
-    vnc_write(vs, vs->tight_jpeg.buffer, vs->tight_jpeg.offset);
-    buffer_reset(&vs->tight_jpeg);
+    tight_send_compact_size(vs, vs->tight.jpeg.offset);
+    vnc_write(vs, vs->tight.jpeg.buffer, vs->tight.jpeg.offset);
+    buffer_reset(&vs->tight.jpeg);

 
     return 1;
 }
 
     return 1;
 }


@@ -1355,40 +1235,31 @@ static int send_jpeg_rect(VncState *vs, int x, int y, int w, int h, int quality)
  * PNG compression stuff.
  */
 #ifdef CONFIG_VNC_PNG
  * PNG compression stuff.
  */
 #ifdef CONFIG_VNC_PNG

-static void write_png_palette(const char *key, QObject *obj, void *opaque)
+static void write_png_palette(int idx, uint32_t pix, void *opaque)

 {
     struct palette_cb_priv *priv = opaque;
     VncState *vs = priv->vs;
 {
     struct palette_cb_priv *priv = opaque;
     VncState *vs = priv->vs;

-    uint32_t bytes = vs->clientds.pf.bytes_per_pixel;
-    uint8_t idx = qint_get_int(qobject_to_qint(obj));

     png_colorp color = &priv->png_palette[idx];
     png_colorp color = &priv->png_palette[idx];

-    uint32_t pix;

 
 

-    if (bytes == 4) {
-        pix = tight_palette_buf2rgb(32, (uint8_t *)key);
-    } else {
-        pix = tight_palette_buf2rgb(16, (uint8_t *)key);
-    }
-
-    if (vs->tight_pixel24)
+    if (vs->tight.pixel24)

     {
     {

-        color->red = (pix >> vs->clientds.pf.rshift) & vs->clientds.pf.rmax;
-        color->green = (pix >> vs->clientds.pf.gshift) & vs->clientds.pf.gmax;
-        color->blue = (pix >> vs->clientds.pf.bshift) & vs->clientds.pf.bmax;
+        color->red = (pix >> vs->client_pf.rshift) & vs->client_pf.rmax;
+        color->green = (pix >> vs->client_pf.gshift) & vs->client_pf.gmax;
+        color->blue = (pix >> vs->client_pf.bshift) & vs->client_pf.bmax;

     }
     else
     {
         int red, green, blue;
 
     }
     else
     {
         int red, green, blue;
 

-        red = (pix >> vs->clientds.pf.rshift) & vs->clientds.pf.rmax;
-        green = (pix >> vs->clientds.pf.gshift) & vs->clientds.pf.gmax;
-        blue = (pix >> vs->clientds.pf.bshift) & vs->clientds.pf.bmax;
-        color->red = ((red * 255 + vs->clientds.pf.rmax / 2) /
-                      vs->clientds.pf.rmax);
-        color->green = ((green * 255 + vs->clientds.pf.gmax / 2) /
-                        vs->clientds.pf.gmax);
-        color->blue = ((blue * 255 + vs->clientds.pf.bmax / 2) /
-                       vs->clientds.pf.bmax);
+        red = (pix >> vs->client_pf.rshift) & vs->client_pf.rmax;
+        green = (pix >> vs->client_pf.gshift) & vs->client_pf.gmax;
+        blue = (pix >> vs->client_pf.bshift) & vs->client_pf.bmax;
+        color->red = ((red * 255 + vs->client_pf.rmax / 2) /
+                      vs->client_pf.rmax);
+        color->green = ((green * 255 + vs->client_pf.gmax / 2) /
+                        vs->client_pf.gmax);
+        color->blue = ((blue * 255 + vs->client_pf.bmax / 2) /
+                       vs->client_pf.bmax);

     }
 }
 
     }
 }
 


@@ -1397,10 +1268,10 @@ static void png_write_data(png_structp png_ptr, png_bytep data,
 {
     VncState *vs = png_get_io_ptr(png_ptr);
 
 {
     VncState *vs = png_get_io_ptr(png_ptr);
 

-    buffer_reserve(&vs->tight_png, vs->tight_png.offset + length);
-    memcpy(vs->tight_png.buffer + vs->tight_png.offset, data, length);
+    buffer_reserve(&vs->tight.png, vs->tight.png.offset + length);
+    memcpy(vs->tight.png.buffer + vs->tight.png.offset, data, length);

 
 

-    vs->tight_png.offset += length;
+    vs->tight.png.offset += length;

 }
 
 static void png_flush_data(png_structp png_ptr)
 }
 
 static void png_flush_data(png_structp png_ptr)


@@ -1409,23 +1280,24 @@ static void png_flush_data(png_structp png_ptr)
 
 static void *vnc_png_malloc(png_structp png_ptr, png_size_t size)
 {
 
 static void *vnc_png_malloc(png_structp png_ptr, png_size_t size)
 {

-    return qemu_malloc(size);
+    return g_malloc(size);

 }
 
 static void vnc_png_free(png_structp png_ptr, png_voidp ptr)
 {
 }
 
 static void vnc_png_free(png_structp png_ptr, png_voidp ptr)
 {

-    qemu_free(ptr);
+    g_free(ptr);

 }
 
 static int send_png_rect(VncState *vs, int x, int y, int w, int h,
 }
 
 static int send_png_rect(VncState *vs, int x, int y, int w, int h,

-                         QDict *palette)
+                         VncPalette *palette)

 {
     png_byte color_type;
     png_structp png_ptr;
     png_infop info_ptr;
     png_colorp png_palette = NULL;
 {
     png_byte color_type;
     png_structp png_ptr;
     png_infop info_ptr;
     png_colorp png_palette = NULL;

-    size_t offset;
-    int level = tight_conf[vs->tight_compression].raw_zlib_level;
+    pixman_image_t *linebuf;
+    int level = tight_png_conf[vs->tight.compression].png_zlib_level;
+    int filters = tight_png_conf[vs->tight.compression].png_filters;

     uint8_t *buf;
     int dy;
 
     uint8_t *buf;
     int dy;
 


@@ -1444,6 +1316,7 @@ static int send_png_rect(VncState *vs, int x, int y, int w, int h,
 
     png_set_write_fn(png_ptr, (void *) vs, png_write_data, png_flush_data);
     png_set_compression_level(png_ptr, level);
 
     png_set_write_fn(png_ptr, (void *) vs, png_write_data, png_flush_data);
     png_set_compression_level(png_ptr, level);

+    png_set_filter(png_ptr, PNG_FILTER_TYPE_DEFAULT, filters);

 
     if (palette) {
         color_type = PNG_COLOR_TYPE_PALETTE;
 
     if (palette) {
         color_type = PNG_COLOR_TYPE_PALETTE;


@@ -1459,36 +1332,36 @@ static int send_png_rect(VncState *vs, int x, int y, int w, int h,
         struct palette_cb_priv priv;
 
         png_palette = png_malloc(png_ptr, sizeof(*png_palette) *
         struct palette_cb_priv priv;
 
         png_palette = png_malloc(png_ptr, sizeof(*png_palette) *

-                                 qdict_size(palette));
+                                 palette_size(palette));

 
         priv.vs = vs;
         priv.png_palette = png_palette;
 
         priv.vs = vs;
         priv.png_palette = png_palette;

-        qdict_iter(palette, write_png_palette, &priv);
+        palette_iter(palette, write_png_palette, &priv);

 
 

-        png_set_PLTE(png_ptr, info_ptr, png_palette, qdict_size(palette));
+        png_set_PLTE(png_ptr, info_ptr, png_palette, palette_size(palette));

 
 

-        offset = vs->tight.offset;
-        if (vs->clientds.pf.bytes_per_pixel == 4) {
-            tight_encode_indexed_rect32(vs->tight.buffer, w * h, palette);
+        if (vs->client_pf.bytes_per_pixel == 4) {
+            tight_encode_indexed_rect32(vs->tight.tight.buffer, w * h, palette);

         } else {
         } else {

-            tight_encode_indexed_rect16(vs->tight.buffer, w * h, palette);
+            tight_encode_indexed_rect16(vs->tight.tight.buffer, w * h, palette);

         }
     }
 
     png_write_info(png_ptr, info_ptr);
 
         }
     }
 
     png_write_info(png_ptr, info_ptr);
 

-    buffer_reserve(&vs->tight_png, 2048);
-    buf = qemu_malloc(w * 3);
+    buffer_reserve(&vs->tight.png, 2048);
+    linebuf = qemu_pixman_linebuf_create(PIXMAN_BE_r8g8b8, w);
+    buf = (uint8_t *)pixman_image_get_data(linebuf);

     for (dy = 0; dy < h; dy++)
     {
         if (color_type == PNG_COLOR_TYPE_PALETTE) {
     for (dy = 0; dy < h; dy++)
     {
         if (color_type == PNG_COLOR_TYPE_PALETTE) {

-            memcpy(buf, vs->tight.buffer + (dy * w), w);
+            memcpy(buf, vs->tight.tight.buffer + (dy * w), w);

         } else {
         } else {

-            rgb_prepare_row(vs, buf, x, y + dy, w);
+            qemu_pixman_linebuf_fill(linebuf, vs->vd->server, w, x, y + dy);

         }
         png_write_row(png_ptr, buf);
     }
         }
         png_write_row(png_ptr, buf);
     }

-    qemu_free(buf);
+    qemu_pixman_image_unref(linebuf);

 
     png_write_end(png_ptr, NULL);
 
 
     png_write_end(png_ptr, NULL);
 


@@ -1500,57 +1373,65 @@ static int send_png_rect(VncState *vs, int x, int y, int w, int h,
 
     vnc_write_u8(vs, VNC_TIGHT_PNG << 4);
 
 
     vnc_write_u8(vs, VNC_TIGHT_PNG << 4);
 

-    tight_send_compact_size(vs, vs->tight_png.offset);
-    vnc_write(vs, vs->tight_png.buffer, vs->tight_png.offset);
-    buffer_reset(&vs->tight_png);
+    tight_send_compact_size(vs, vs->tight.png.offset);
+    vnc_write(vs, vs->tight.png.buffer, vs->tight.png.offset);
+    buffer_reset(&vs->tight.png);

     return 1;
 }
 #endif /* CONFIG_VNC_PNG */
 
 static void vnc_tight_start(VncState *vs)
 {
     return 1;
 }
 #endif /* CONFIG_VNC_PNG */
 
 static void vnc_tight_start(VncState *vs)
 {

-    buffer_reset(&vs->tight);
+    buffer_reset(&vs->tight.tight);

 
     // make the output buffer be the zlib buffer, so we can compress it later
 
     // make the output buffer be the zlib buffer, so we can compress it later

-    vs->tight_tmp = vs->output;
-    vs->output = vs->tight;
+    vs->tight.tmp = vs->output;
+    vs->output = vs->tight.tight;

 }
 
 static void vnc_tight_stop(VncState *vs)
 {
     // switch back to normal output/zlib buffers
 }
 
 static void vnc_tight_stop(VncState *vs)
 {
     // switch back to normal output/zlib buffers

-    vs->tight = vs->output;
-    vs->output = vs->tight_tmp;
+    vs->tight.tight = vs->output;
+    vs->output = vs->tight.tmp;

 }
 
 }
 

-static int send_sub_rect(VncState *vs, int x, int y, int w, int h)
+static int send_sub_rect_nojpeg(VncState *vs, int x, int y, int w, int h,
+                                int bg, int fg, int colors, VncPalette *palette)

 {
 {

-    struct QDict *palette = NULL;
-    uint32_t bg = 0, fg = 0;
-    int colors;
-    int ret = 0;
-
-    vnc_framebuffer_update(vs, x, y, w, h, vs->tight_type);
-
-    vnc_tight_start(vs);
-    vnc_raw_send_framebuffer_update(vs, x, y, w, h);
-    vnc_tight_stop(vs);
-
-    colors = tight_fill_palette(vs, x, y, w * h, &fg, &bg, &palette);
+    int ret;

 
     if (colors == 0) {
         if (tight_detect_smooth_image(vs, w, h)) {
 
     if (colors == 0) {
         if (tight_detect_smooth_image(vs, w, h)) {

-            if (vs->tight_quality == -1) {
-                ret = send_gradient_rect(vs, x, y, w, h);
-            } else {
+            ret = send_gradient_rect(vs, x, y, w, h);
+        } else {
+            ret = send_full_color_rect(vs, x, y, w, h);
+        }
+    } else if (colors == 1) {
+        ret = send_solid_rect(vs);
+    } else if (colors == 2) {
+        ret = send_mono_rect(vs, x, y, w, h, bg, fg);
+    } else if (colors <= 256) {
+        ret = send_palette_rect(vs, x, y, w, h, palette);
+    } else {
+        ret = 0;
+    }
+    return ret;
+}
+

 #ifdef CONFIG_VNC_JPEG
 #ifdef CONFIG_VNC_JPEG

-                int quality = tight_conf[vs->tight_quality].jpeg_quality;
+static int send_sub_rect_jpeg(VncState *vs, int x, int y, int w, int h,
+                              int bg, int fg, int colors,
+                              VncPalette *palette, bool force)
+{
+    int ret;

 
 

-                ret = send_jpeg_rect(vs, x, y, w, h, quality);
-#else
-                ret = send_full_color_rect(vs, x, y, w, h);
-#endif
-            }
+    if (colors == 0) {
+        if (force || (tight_jpeg_conf[vs->tight.quality].jpeg_full &&
+                      tight_detect_smooth_image(vs, w, h))) {
+            int quality = tight_conf[vs->tight.quality].jpeg_quality;
+
+            ret = send_jpeg_rect(vs, x, y, w, h, quality);

         } else {
             ret = send_full_color_rect(vs, x, y, w, h);
         }
         } else {
             ret = send_full_color_rect(vs, x, y, w, h);
         }


@@ -1559,26 +1440,73 @@ static int send_sub_rect(VncState *vs, int x, int y, int w, int h)
     } else if (colors == 2) {
         ret = send_mono_rect(vs, x, y, w, h, bg, fg);
     } else if (colors <= 256) {
     } else if (colors == 2) {
         ret = send_mono_rect(vs, x, y, w, h, bg, fg);
     } else if (colors <= 256) {

-#ifdef CONFIG_VNC_JPEG
-        if (colors > 96 && vs->tight_quality != -1 && vs->tight_quality <= 3 &&
-            tight_detect_smooth_image(vs, w, h)) {
-            int quality = tight_conf[vs->tight_quality].jpeg_quality;
+        if (force || (colors > 96 &&
+                      tight_jpeg_conf[vs->tight.quality].jpeg_idx &&
+                      tight_detect_smooth_image(vs, w, h))) {
+            int quality = tight_conf[vs->tight.quality].jpeg_quality;

 
             ret = send_jpeg_rect(vs, x, y, w, h, quality);
         } else {
             ret = send_palette_rect(vs, x, y, w, h, palette);
         }
 
             ret = send_jpeg_rect(vs, x, y, w, h, quality);
         } else {
             ret = send_palette_rect(vs, x, y, w, h, palette);
         }

-#else
-        ret = send_palette_rect(vs, x, y, w, h, palette);
+    } else {
+        ret = 0;
+    }
+    return ret;
+}
+#endif
+
+static int send_sub_rect(VncState *vs, int x, int y, int w, int h)
+{
+    VncPalette *palette = NULL;
+    uint32_t bg = 0, fg = 0;
+    int colors;
+    int ret = 0;
+#ifdef CONFIG_VNC_JPEG
+    bool force_jpeg = false;
+    bool allow_jpeg = true;
+#endif
+
+    vnc_framebuffer_update(vs, x, y, w, h, vs->tight.type);
+
+    vnc_tight_start(vs);
+    vnc_raw_send_framebuffer_update(vs, x, y, w, h);
+    vnc_tight_stop(vs);
+
+#ifdef CONFIG_VNC_JPEG
+    if (!vs->vd->non_adaptive && vs->tight.quality != (uint8_t)-1) {
+        double freq = vnc_update_freq(vs, x, y, w, h);
+
+        if (freq < tight_jpeg_conf[vs->tight.quality].jpeg_freq_min) {
+            allow_jpeg = false;
+        }
+        if (freq >= tight_jpeg_conf[vs->tight.quality].jpeg_freq_threshold) {
+            force_jpeg = true;
+            vnc_sent_lossy_rect(vs, x, y, w, h);
+        }
+    }

 #endif
 #endif

+
+    colors = tight_fill_palette(vs, x, y, w * h, &fg, &bg, &palette);
+
+#ifdef CONFIG_VNC_JPEG
+    if (allow_jpeg && vs->tight.quality != (uint8_t)-1) {
+        ret = send_sub_rect_jpeg(vs, x, y, w, h, bg, fg, colors, palette,
+                                 force_jpeg);
+    } else {
+        ret = send_sub_rect_nojpeg(vs, x, y, w, h, bg, fg, colors, palette);

     }
     }

-    QDECREF(palette);
+#else
+    ret = send_sub_rect_nojpeg(vs, x, y, w, h, bg, fg, colors, palette);
+#endif
+
+    palette_destroy(palette);

     return ret;
 }
 
 static int send_sub_rect_solid(VncState *vs, int x, int y, int w, int h)
 {
     return ret;
 }
 
 static int send_sub_rect_solid(VncState *vs, int x, int y, int w, int h)
 {

-    vnc_framebuffer_update(vs, x, y, w, h, vs->tight_type);
+    vnc_framebuffer_update(vs, x, y, w, h, vs->tight.type);

 
     vnc_tight_start(vs);
     vnc_raw_send_framebuffer_update(vs, x, y, w, h);
 
     vnc_tight_start(vs);
     vnc_raw_send_framebuffer_update(vs, x, y, w, h);


@@ -1587,7 +1515,8 @@ static int send_sub_rect_solid(VncState *vs, int x, int y, int w, int h)
     return send_solid_rect(vs);
 }
 
     return send_solid_rect(vs);
 }
 

-static int send_rect_simple(VncState *vs, int x, int y, int w, int h)
+static int send_rect_simple(VncState *vs, int x, int y, int w, int h,
+                            bool split)

 {
     int max_size, max_width;
     int max_sub_width, max_sub_height;
 {
     int max_size, max_width;
     int max_sub_width, max_sub_height;


@@ -1595,10 +1524,10 @@ static int send_rect_simple(VncState *vs, int x, int y, int w, int h)
     int rw, rh;
     int n = 0;
 
     int rw, rh;
     int n = 0;
 

-    max_size = tight_conf[vs->tight_compression].max_rect_size;
-    max_width = tight_conf[vs->tight_compression].max_rect_width;
+    max_size = tight_conf[vs->tight.compression].max_rect_size;
+    max_width = tight_conf[vs->tight.compression].max_rect_width;

 
 

-    if (w > max_width || w * h > max_size) {
+    if (split && (w > max_width || w * h > max_size)) {

         max_sub_width = (w > max_width) ? max_width : w;
         max_sub_height = max_size / max_sub_width;
 
         max_sub_width = (w > max_width) ? max_width : w;
         max_sub_height = max_size / max_sub_width;
 


@@ -1629,7 +1558,7 @@ static int find_large_solid_color_rect(VncState *vs, int x, int y,
         /* If a rectangle becomes too large, send its upper part now. */
 
         if (dy - y >= max_rows) {
         /* If a rectangle becomes too large, send its upper part now. */
 
         if (dy - y >= max_rows) {

-            n += send_rect_simple(vs, x, y, w, max_rows);
+            n += send_rect_simple(vs, x, y, w, max_rows, true);

             y += max_rows;
             h -= max_rows;
         }
             y += max_rows;
             h -= max_rows;
         }


@@ -1668,7 +1597,7 @@ static int find_large_solid_color_rect(VncState *vs, int x, int y,
             /* Send rectangles at top and left to solid-color area. */
 
             if (y_best != y) {
             /* Send rectangles at top and left to solid-color area. */
 
             if (y_best != y) {

-                n += send_rect_simple(vs, x, y, w, y_best-y);
+                n += send_rect_simple(vs, x, y, w, y_best-y, true);

             }
             if (x_best != x) {
                 n += tight_send_framebuffer_update(vs, x, y_best,
             }
             if (x_best != x) {
                 n += tight_send_framebuffer_update(vs, x, y_best,


@@ -1695,7 +1624,7 @@ static int find_large_solid_color_rect(VncState *vs, int x, int y,
             return n;
         }
     }
             return n;
         }
     }

-    return n + send_rect_simple(vs, x, y, w, h);
+    return n + send_rect_simple(vs, x, y, w, h, true);

 }
 
 static int tight_send_framebuffer_update(VncState *vs, int x, int y,
 }
 
 static int tight_send_framebuffer_update(VncState *vs, int x, int y,


@@ -1703,20 +1632,31 @@ static int tight_send_framebuffer_update(VncState *vs, int x, int y,
 {
     int max_rows;
 
 {
     int max_rows;
 

-    if (vs->clientds.pf.bytes_per_pixel == 4 && vs->clientds.pf.rmax == 0xFF &&
-        vs->clientds.pf.bmax == 0xFF && vs->clientds.pf.gmax == 0xFF) {
-        vs->tight_pixel24 = true;
+    if (vs->client_pf.bytes_per_pixel == 4 && vs->client_pf.rmax == 0xFF &&
+        vs->client_pf.bmax == 0xFF && vs->client_pf.gmax == 0xFF) {
+        vs->tight.pixel24 = true;

     } else {
     } else {

-        vs->tight_pixel24 = false;
+        vs->tight.pixel24 = false;

     }
 
     }
 

-    if (w * h < VNC_TIGHT_MIN_SPLIT_RECT_SIZE)
-        return send_rect_simple(vs, x, y, w, h);
+#ifdef CONFIG_VNC_JPEG
+    if (vs->tight.quality != (uint8_t)-1) {
+        double freq = vnc_update_freq(vs, x, y, w, h);
+
+        if (freq > tight_jpeg_conf[vs->tight.quality].jpeg_freq_threshold) {
+            return send_rect_simple(vs, x, y, w, h, false);
+        }
+    }
+#endif
+
+    if (w * h < VNC_TIGHT_MIN_SPLIT_RECT_SIZE) {
+        return send_rect_simple(vs, x, y, w, h, true);
+    }

 
     /* Calculate maximum number of rows in one non-solid rectangle. */
 
 
     /* Calculate maximum number of rows in one non-solid rectangle. */
 

-    max_rows = tight_conf[vs->tight_compression].max_rect_size;
-    max_rows /= MIN(tight_conf[vs->tight_compression].max_rect_width, w);
+    max_rows = tight_conf[vs->tight.compression].max_rect_size;
+    max_rows /= MIN(tight_conf[vs->tight.compression].max_rect_width, w);

 
     return find_large_solid_color_rect(vs, x, y, w, h, max_rows);
 }
 
     return find_large_solid_color_rect(vs, x, y, w, h, max_rows);
 }


@@ -1724,30 +1664,33 @@ static int tight_send_framebuffer_update(VncState *vs, int x, int y,
 int vnc_tight_send_framebuffer_update(VncState *vs, int x, int y,
                                       int w, int h)
 {
 int vnc_tight_send_framebuffer_update(VncState *vs, int x, int y,
                                       int w, int h)
 {

-    vs->tight_type = VNC_ENCODING_TIGHT;
+    vs->tight.type = VNC_ENCODING_TIGHT;

     return tight_send_framebuffer_update(vs, x, y, w, h);
 }
 
 int vnc_tight_png_send_framebuffer_update(VncState *vs, int x, int y,
                                           int w, int h)
 {
     return tight_send_framebuffer_update(vs, x, y, w, h);
 }
 
 int vnc_tight_png_send_framebuffer_update(VncState *vs, int x, int y,
                                           int w, int h)
 {

-    vs->tight_type = VNC_ENCODING_TIGHT_PNG;
+    vs->tight.type = VNC_ENCODING_TIGHT_PNG;

     return tight_send_framebuffer_update(vs, x, y, w, h);
 }
 
 void vnc_tight_clear(VncState *vs)
 {
     int i;
     return tight_send_framebuffer_update(vs, x, y, w, h);
 }
 
 void vnc_tight_clear(VncState *vs)
 {
     int i;

-    for (i=0; i<ARRAY_SIZE(vs->tight_stream); i++) {
-        if (vs->tight_stream[i].opaque) {
-            deflateEnd(&vs->tight_stream[i]);
+    for (i=0; i<ARRAY_SIZE(vs->tight.stream); i++) {
+        if (vs->tight.stream[i].opaque) {
+            deflateEnd(&vs->tight.stream[i]);

         }
     }
 
         }
     }
 

-    buffer_free(&vs->tight);
-    buffer_free(&vs->tight_zlib);
-    buffer_free(&vs->tight_gradient);
+    buffer_free(&vs->tight.tight);
+    buffer_free(&vs->tight.zlib);
+    buffer_free(&vs->tight.gradient);

 #ifdef CONFIG_VNC_JPEG
 #ifdef CONFIG_VNC_JPEG

-    buffer_free(&vs->tight_jpeg);
+    buffer_free(&vs->tight.jpeg);
+#endif
+#ifdef CONFIG_VNC_PNG
+    buffer_free(&vs->tight.png);

 #endif
 }
 #endif
 }