# HG changeset patch
# User Yu Taninari <you@cr.ie.u-ryukyu.ac.jp>
# Date 1319472349 -32400
# Node ID 0f0d3193017ccaf8d8e26412512459b1e6c75f90
# Parent  ce03da701bcb1dcdca041b1cf479ad6adcadb0f0# Parent  2a9dd76dde5f75061eb718f96e6d7f34cef97cfc
merge 178

diff -r ce03da701bcb -r 0f0d3193017c src/myVncProxy/MyRfbProto.java
--- a/src/myVncProxy/MyRfbProto.java	Tue Oct 25 01:04:55 2011 +0900
+++ b/src/myVncProxy/MyRfbProto.java	Tue Oct 25 01:05:49 2011 +0900
@@ -145,7 +145,6 @@
 		int i = 0;
 		readFully(inBuf);
 
-//		int[] data = {109, -98, -21, -71, -16, 54, 116, 53, -42, -46, -58, 71, 3, -59, 92, 29, -115, -67, -96, 97, -125, -55, 49, 91, 85, -54, 56, -11, 105, -68, -102, 5, 126, 60, -93, -12, 97, 4, 71, -12, -63, 36, 18, -111, -55, -24, -21, 89, 48, -104, 62, -55, 6, -49, -69, 126, -110, -26, -116, 3, 52, -91, 75, 112, 124, -103, -79, -50, 6, 21, 46, -119, -42, 100, 42, -42, -16, -9, -123, -101, 7, 83, 60, 102, -43, 112, -8, 61, -40, -46, 123, 76, -105, 98, -54, -59, 116, 81, 52, -60, 81, -107, -61, 101, -104, 18, 82, -71, -82, -25, 4, -64, 77, 25, 99, 10, -122, 4, -111, 79, -82, -114, 46, -14, 62, 100, -116, 103, 117, -102, -117, -32, 103, 110, 25, 23, 65, 30, -113, -36, -47, 115, 92, 55, -45, -98, -84, -120, -3, -1, -55, 87, -40, 62, 39, 32, -71, 96, 105, -109, 107, -3, 9, 84, 28, 14, -115, 1, -45, -94, 31, -57, 45, -20, 39, -109, -63, -57, 121, -127, -45, -96, 113, -103, 113, -36, -88, 72, -55, -22, -87, 24, -50, -57, -57, -125, -27, 42, 72, -78, 11, 43, -96, -111, 2, -43, 21, -87, 9, -49, -110, 126, 29, 62, -36, 84, 124, 30, -20, -38, -8, -9, -4, 114, -62, 29, -40, 41, 105, 22, 104, -51, -41, -28, -38, 96, -98, -119, -53, 2, 42, 6, 32, 92, -86, 127, 81, 59, -45, -24, -7, -88, 111, -41, -75, 16};
 		byte[] outBuf = new byte[256]; 
 		os.write(outBuf);
 		os.flush();
diff -r ce03da701bcb -r 0f0d3193017c src/myVncProxy/ProxyVncCanvas.java
--- a/src/myVncProxy/ProxyVncCanvas.java	Tue Oct 25 01:04:55 2011 +0900
+++ b/src/myVncProxy/ProxyVncCanvas.java	Tue Oct 25 01:05:49 2011 +0900
@@ -559,10 +559,10 @@
 
 //			int bufSize = (int)(rfb.getNumBytesRead() - numBytesRead);
 			long bufSize = rfb.getNumBytesRead() - numBytesRead;
-			System.out.println("bufSize="+bufSize);
+//			System.out.println("bufSize="+bufSize);
 
 			buf += rfb.getNumBytesRead() - numBytesRead;
-			System.out.println("total buf = " + buf);
+//			System.out.println("total buf = " + buf);
 //			rfb.bufResetSend(bufSize);
 
 
diff -r ce03da701bcb -r 0f0d3193017c src/myVncProxy/VncProxyService.java
--- a/src/myVncProxy/VncProxyService.java	Tue Oct 25 01:04:55 2011 +0900
+++ b/src/myVncProxy/VncProxyService.java	Tue Oct 25 01:05:49 2011 +0900
@@ -99,9 +99,9 @@
 				host = argv[0];
 				port = Integer.parseInt(argv[1]);
 				passwordParam = argv[2];
-			} else if (len < 3){
-				printHelp();
-				System.exit(0);
+			} else if (len <= 2) {
+				host = argv[0];
+				port = Integer.parseInt(argv[1]);
 			}
 		}