changeset 108:4199efcc4260

Working
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Fri, 05 Aug 2011 10:57:05 +0900
parents a8b2712de4c5
children 3f73ebf918bd
files src/myVncProxy/ProxyVncCanvas.java src/myVncProxy/RfbProto.java src/myVncProxy/VncCanvas.java
diffstat 3 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/myVncProxy/ProxyVncCanvas.java	Fri Aug 05 08:57:00 2011 +0900
+++ b/src/myVncProxy/ProxyVncCanvas.java	Fri Aug 05 10:57:05 2011 +0900
@@ -452,6 +452,7 @@
 						handleHextileRect(rx, ry, rw, rh);
 						break;
 					case RfbProto.EncodingZRLE:
+					case RfbProto.EncodingZRLEE:
 						statNumRectsZRLE++;
 						handleZRLERect(rx, ry, rw, rh);
 						break;
--- a/src/myVncProxy/RfbProto.java	Fri Aug 05 08:57:00 2011 +0900
+++ b/src/myVncProxy/RfbProto.java	Fri Aug 05 10:57:05 2011 +0900
@@ -26,12 +26,9 @@
 //
 
 import java.io.*;
-import java.awt.*;
 import java.awt.event.*;
 import java.net.Socket;
-import java.net.ServerSocket;
 import java.util.zip.*;
-import java.nio.*;
 
 class RfbProto {
 
--- a/src/myVncProxy/VncCanvas.java	Fri Aug 05 08:57:00 2011 +0900
+++ b/src/myVncProxy/VncCanvas.java	Fri Aug 05 10:57:05 2011 +0900
@@ -475,6 +475,7 @@
 						handleHextileRect(rx, ry, rw, rh);
 						break;
 					case RfbProto.EncodingZRLE:
+					case RfbProto.EncodingZRLEE:
 						statNumRectsZRLE++;
 						handleZRLERect(rx, ry, rw, rh);
 						break;
@@ -886,7 +887,7 @@
 
 	void handleZRLERect(int x, int y, int w, int h) throws Exception {
 		if (noZRLEdecode) return;
-		if (zrleInStream == null)
+		if (zrleInStream == null || rfb.updateRectEncoding==RfbProto.EncodingZRLEE)
 			zrleInStream = new ZlibInStream();
 //		System.out.println("zrleInStream.end="+zrleInStream.inflater.off);