commit f350545337cd45b238cd4193bd4295e0ce16c3ed
author Pierre Ossman <ossman@cendio.se> Fri Jul 15 08:11:55 2011 +0000
committer Pierre Ossman <ossman@cendio.se> Fri Jul 15 08:11:55 2011 +0000
tree 72a2b5a41a4698c7772185ae602778605fd5c6a9
parent cf836f26245a13fc5e97065ebc5e486d2c0b216d

The new viewer stores the framebuffer in a native format, instead of
converting it on each render like the old one. That means we have to change
how we deal with colour maps and make sure it is updated before any changes
to the framebuffer.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4589 3789f03b-4d11-0410-bbf8-ca57d06f2519

vncviewer/Viewport.h

diff --git a/vncviewer/Viewport.h b/vncviewer/Viewport.h
index 9eb3b73..c9a3cf3 100644
--- a/vncviewer/Viewport.h
+++ b/vncviewer/Viewport.h
@@ -70,6 +70,8 @@
   void fillRect(const rfb::Rect& r, rfb::Pixel pix) {
     if (pixelTrans) {
       rfb::Pixel pix2;
+      if (colourMapChange)
+        commitColourMap();
       pixelTrans->translatePixels(&pix, &pix2, 1);
       pix = pix2;
     }
@@ -78,13 +80,16 @@
     damageRect(r);
   }
   void imageRect(const rfb::Rect& r, void* pixels) {
-    if (pixelTrans)
+    if (pixelTrans) {
+      if (colourMapChange)
+        commitColourMap();
       pixelTrans->translateRect(pixels, r.width(),
                                 rfb::Rect(0, 0, r.width(), r.height()),
                                 frameBuffer->data, frameBuffer->getStride(),
                                 r.tl);
-    else
+    } else {
       frameBuffer->imageRect(r, pixels);
+    }
     damageRect(r);
   }
   void copyRect(const rfb::Rect& r, int srcX, int srcY) {
@@ -112,7 +117,8 @@
   };
 
   static void handleUpdateTimeout(void *data);
-  static void handleColourMap(void *data);
+
+  void commitColourMap();
 
   static void handleClipboardChange(int source, void *data);
 
@@ -136,6 +142,7 @@
 
   rfb::PixelTransformer *pixelTrans;
   rfb::SimpleColourMap colourMap;
+  bool colourMapChange;
 
   rfb::Region damage;