commit 2f0294e004bc31cc9329e3e701d33de408a177bf
author enikey <enikey@3789f03b-4d11-0410-bbf8-ca57d06f2519> Wed Dec 24 08:18:54 2008 +0000
committer enikey <enikey@3789f03b-4d11-0410-bbf8-ca57d06f2519> Wed Dec 24 08:18:54 2008 +0000
tree 7d4d85e166d59a236a57b32cbc827c65e959d079
parent 7b0c8aa7c18c7e03191a537d27f2dcfb96c83be4

[Refactoring, cleanup] Write encoding ID of real decoders in decoders classes. Pseudo encoding ID still writes in RfbProto class. ZlibDecoder recoding enabled. ZRLEDecoder recoding still not working.

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

java/src/com/tightvnc/decoder/RawDecoder.java

diff --git a/java/src/com/tightvnc/decoder/RawDecoder.java b/java/src/com/tightvnc/decoder/RawDecoder.java
index 9025e9e..affdc67 100644
--- a/java/src/com/tightvnc/decoder/RawDecoder.java
+++ b/java/src/com/tightvnc/decoder/RawDecoder.java
@@ -85,6 +85,15 @@
   //
 
   public void handleRect(int x, int y, int w, int h) throws IOException, Exception {
+
+    //
+    // Write encoding ID to record output stream
+    //
+
+    if ((dos != null) && (enableEncodingRecordWritting)) {
+      dos.writeInt(RawDecoder.EncodingRaw);
+    }
+
     if (bytesPerPixel == 1) {
       for (int dy = y; dy < y + h; dy++) {
         if (pixels8 != null) {
@@ -189,6 +198,17 @@
   }
 
   //
+  // This method will be used by HextileDecoder to disable
+  // double writting encoding id to record stream.
+  //
+  // FIXME: Try to find better solution than this.
+  //
+
+  protected void enableEncodingRecordWritting(boolean enable) {
+    enableEncodingRecordWritting = enable;
+  }
+
+  //
   // Unique data for every decoder (? maybe not ?)
   //
 
@@ -199,6 +219,7 @@
   protected Graphics graphics = null;
   protected RecordInterface rec = null;
   protected DataOutput dos = null;
+  protected boolean enableEncodingRecordWritting = true;
 
   //
   // This data must be shared between decoders