# HG changeset patch
# User e085711
# Date 1317739892 -32400
# Node ID 1783ca4e48777968c459f11ad60fbe549cbc9c5f
# Parent  71bfbb5241bf7c4c8d8ff13192efa8057c560522
update

diff -r 71bfbb5241bf -r 1783ca4e4877 src/myVncClient/CuiMyVncClient.java
--- a/src/myVncClient/CuiMyVncClient.java	Thu Sep 22 05:43:48 2011 +0900
+++ b/src/myVncClient/CuiMyVncClient.java	Tue Oct 04 23:51:32 2011 +0900
@@ -317,7 +317,12 @@
 
 
 		if (rfb.serverMinor == 855) {
+			/*
+			 * if connect to proxy, userEchoPortFlag is true. 
+			 * if connect to client, userEchoPortFlag is false.
+			 */
 			boolean useEchoPortFlag = rfb.readProxyFlag();
+
 			if (useEchoPortFlag) {
 				byte[] b = new byte[4];
 				b = rfb.readEchoPort();
@@ -331,6 +336,7 @@
 					rfb.changeParent(host, port);
 					rfb.readVersionMsg();
 					rfb.writeVersionMsg();
+					boolean flag = rfb.readProxyFlag();
 				}
 			}
 		}	
@@ -398,6 +404,7 @@
 					rfb.changeParent(host, port);
 					rfb.readVersionMsg();
 					rfb.writeVersionMsg();
+					boolean flag = rfb.readProxyFlag();
 				}
 			}
 		}	
diff -r 71bfbb5241bf -r 1783ca4e4877 src/myVncClient/CuiVncCanvas.java
--- a/src/myVncClient/CuiVncCanvas.java	Thu Sep 22 05:43:48 2011 +0900
+++ b/src/myVncClient/CuiVncCanvas.java	Tue Oct 04 23:51:32 2011 +0900
@@ -371,7 +371,7 @@
 			 *  read Data from parents and send Data to Client.
 			 */
 			rfb.sendDataToClient();
-			
+
 			long numBytesRead = rfb.getNumBytesRead();
 			
 			// Read message type from the server. 
diff -r 71bfbb5241bf -r 1783ca4e4877 src/myVncClient/MyVncClient.java
--- a/src/myVncClient/MyVncClient.java	Thu Sep 22 05:43:48 2011 +0900
+++ b/src/myVncClient/MyVncClient.java	Tue Oct 04 23:51:32 2011 +0900
@@ -380,6 +380,10 @@
 				+ "." + rfb.clientMinor);
 
 		if (rfb.serverMinor == 855) {
+			/*
+			 * if connect to proxy, userEchoPortFlag is true. 
+			 * if connect to client, userEchoPortFlag is false.
+			 */
 			boolean useEchoPortFlag = rfb.readProxyFlag();
 			if (useEchoPortFlag) {
 				byte[] b = new byte[4];
@@ -468,6 +472,7 @@
 					rfb.changeParent(host, port);
 					rfb.readVersionMsg();
 					rfb.writeVersionMsg();
+					boolean flag = rfb.readProxyFlag();
 				}
 			}
 		}
diff -r 71bfbb5241bf -r 1783ca4e4877 src/myVncClient/VncCanvas.java
--- a/src/myVncClient/VncCanvas.java	Thu Sep 22 05:43:48 2011 +0900
+++ b/src/myVncClient/VncCanvas.java	Tue Oct 04 23:51:32 2011 +0900
@@ -1003,7 +1003,7 @@
 				dst[i] = ((buf[i * 3 + 2] & 0xFF) << 16
 						| (buf[i * 3 + 1] & 0xFF) << 8 | (buf[i * 3] & 0xFF));
 				/*
-				 * dst[i] = (0x00 << 16 | 0x00 << 8 | 0xFF);
+ 				 * dst[i] = (0x00 << 16 | 0x00 << 8 | 0xFF);
 				 */
 
 			}
@@ -1944,10 +1944,8 @@
 		BufferedImage bimg =  rfb.createBimg();
 		memGraphics.setClip(0,0, rfb.framebufferWidth, rfb.framebufferHeight );
 		memGraphics.drawImage( bimg, 0,0, null);
-		
 	}
 	
-
 	BufferedImage createBufferedImage(Image img){
 		BufferedImage bimg = new BufferedImage(img.getWidth(null), img.getHeight(null), BufferedImage.TYPE_INT_RGB  );