# HG changeset patch
# User e085711
# Date 1312790074 -32400
# Node ID e3dddee7b934fe8d9e65dd7b1e21ebfaef9fcf6e
# Parent  c2c21a67097cc9548ef8a8b6183989a042144394
modify OptionsNofFrame.java

diff -r c2c21a67097c -r e3dddee7b934 src/myVncProxy/OptionsNoFrame.java
--- a/src/myVncProxy/OptionsNoFrame.java	Sun Aug 07 15:53:19 2011 +0900
+++ b/src/myVncProxy/OptionsNoFrame.java	Mon Aug 08 16:54:34 2011 +0900
@@ -74,13 +74,16 @@
   // Constructor.  Set up the labels and choices from the names and values
   // arrays.
   //
-  
+
   OptionsNoFrame(VncProxyService v) {
 	    viewer = v;
+	    preferredEncoding = -1;
   }	    
 
   OptionsNoFrame(VncProxyService v, VncCanvas vc) {
-    
+//  OptionsNoFrame(VncProxyService v) {
+	    viewer = v;    
+
     for (int i = 0; i < names.length; i++) {
     	labels[i] = new Label(names[i]);
     	
diff -r c2c21a67097c -r e3dddee7b934 src/myVncProxy/ProxyVncCanvas.java
--- a/src/myVncProxy/ProxyVncCanvas.java	Sun Aug 07 15:53:19 2011 +0900
+++ b/src/myVncProxy/ProxyVncCanvas.java	Mon Aug 08 16:54:34 2011 +0900
@@ -377,7 +377,6 @@
 			switch (msgType) {
 			case MyRfbProto.SpeedCheckMillis:
 				rfb.readSpeedCheck();
-				
 				break;
 			case RfbProto.FramebufferUpdate:
 
diff -r c2c21a67097c -r e3dddee7b934 src/myVncProxy/VncProxyService.java
--- a/src/myVncProxy/VncProxyService.java	Sun Aug 07 15:53:19 2011 +0900
+++ b/src/myVncProxy/VncProxyService.java	Mon Aug 08 16:54:34 2011 +0900
@@ -355,18 +355,22 @@
 
 
 		encodings[nEncodings++] = preferredEncoding;
+/*
 		if (options.useCopyRect) {
 			encodings[nEncodings++] = RfbProto.EncodingCopyRect;
 		}
 		if (preferredEncoding != RfbProto.EncodingTight) {
 			encodings[nEncodings++] = RfbProto.EncodingTight;
 		}
+*/		
 		if (preferredEncoding != RfbProto.EncodingZRLE) {
 			encodings[nEncodings++] = RfbProto.EncodingZRLE;
 		}
+/*		
 		if (preferredEncoding != RfbProto.EncodingHextile) {
 			encodings[nEncodings++] = RfbProto.EncodingHextile;
 		}
+*/
 		if (preferredEncoding != RfbProto.EncodingZlib) {
 			encodings[nEncodings++] = RfbProto.EncodingZlib;
 		}