# HG changeset patch
# User oc
# Date 1400841457 -32400
# Node ID 457f9dfbf7cec5ac55b5bc97402de1d7759df3f4
# Parent  1bceae0f5bd3ef8a5c715b836ffa92ba3af783db
minor fix.

diff -r 1bceae0f5bd3 -r 457f9dfbf7ce Todo.txt
--- a/Todo.txt	Fri May 23 17:57:27 2014 +0900
+++ b/Todo.txt	Fri May 23 19:37:37 2014 +0900
@@ -1,3 +1,7 @@
+Fri May 23 19:32:24 JST 2014
+    checkdelay
+
+
 Thu May 22 21:20:39 JST 2014
 
     1) zlibの同期が外れてる。
diff -r 1bceae0f5bd3 -r 457f9dfbf7ce src/main/java/jp/ac/u_ryukyu/treevnc/MyRfbProto.java
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/MyRfbProto.java	Fri May 23 17:57:27 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/MyRfbProto.java	Fri May 23 19:37:37 2014 +0900
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.net.Socket;
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 import java.util.LinkedList;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -117,7 +118,9 @@
 						if (isRoot()) {
 							if (b[0] == ClientToServerMessage.SERVER_CHANGE_REQUEST) {
 								if (permitChangeScreen()) {
-									int length = Integer.parseInt(new String(b, 4, 4));
+									ByteBuffer buf = ByteBuffer.wrap(b);
+									buf.order(ByteOrder.BIG_ENDIAN);
+									int length = buf.getInt(4);
 									if (length == 0) 
 										continue;
 				                	String newHostName = new String(b, 8, length);
@@ -149,8 +152,7 @@
 			}
 
 			private boolean permitChangeScreen() {
-				// TODO Auto-generated method stub
-				return false;
+				return true;
 			}
 		};
 		/**
diff -r 1bceae0f5bd3 -r 457f9dfbf7ce src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java	Fri May 23 17:57:27 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java	Fri May 23 19:37:37 2014 +0900
@@ -2,8 +2,6 @@
 
 import java.awt.event.*;
 import java.io.*;
-import java.net.ServerSocket;
-import java.net.Socket;
 import java.net.UnknownHostException;
 import java.util.LinkedList;
 import java.util.logging.Logger;
@@ -38,7 +36,6 @@
 	static VncProxyService currentVps;
 	private int fbWidth = 0;
 	private boolean firstTime = true;
-    private ServerSocket echoServerSocket;
 
     private int vncport = ConnectionParams.DEFAULT_RFB_PORT;
 
@@ -86,7 +83,6 @@
 		isApplet = true;
 		run();
 		createConnectionAndStart();
-		getChangeScreenRequest(); // Should be used Client Socket.
 		try {
 			threadSetAndStart();
 		} catch (UnknownHostException e) {
@@ -166,35 +162,6 @@
 		thread2.start();
 	}
 
-	private void getChangeScreenRequest() {
-		Thread th = new Thread(new Runnable() {
-
-            @Override
-			public void run() {
-				while (true) {
-				    try {
-				        Socket clientSocket = null;
-				        echoServerSocket = new ServerSocket(10002);
-				        while (true) {
-				            clientSocket = echoServerSocket.accept();
-				            BufferedReader is = new BufferedReader(new InputStreamReader(clientSocket.getInputStream()));
-				            String newHostName = is.readLine();
-				            if("checkdelay".equals(newHostName)) {
-				                Long delay = System.currentTimeMillis()-Long.parseLong(is.readLine());
-				                DataOutputStream os = new DataOutputStream(clientSocket.getOutputStream());
-				                os.writeBytes(String.valueOf(delay)+"\n");
-				            }
-				                clientSocket.close();
-				            }
-				    } catch (IOException e) {
-						continue; // log
-					}
-				}
-			}
-		});
-		th.start();
-	}
-
 	protected void socketClose() {
 	}
 
diff -r 1bceae0f5bd3 -r 457f9dfbf7ce src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java	Fri May 23 17:57:27 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java	Fri May 23 19:37:37 2014 +0900
@@ -25,6 +25,7 @@
 package com.glavsoft.viewer.swing;
 
 import com.glavsoft.core.SettingsChangedEvent;
+import com.glavsoft.exceptions.TransportException;
 import com.glavsoft.rfb.IChangeSettingsListener;
 import com.glavsoft.rfb.client.KeyEventMessage;
 import com.glavsoft.rfb.protocol.Protocol;
@@ -41,9 +42,9 @@
 import javax.swing.border.BevelBorder;
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
+
 import java.awt.*;
 import java.awt.event.*;
-import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.Executors;
@@ -823,11 +824,10 @@
         	@Override
         	public void actionPerformed(ActionEvent e) {
         		try {
-        			viewer.setCuiVersion(true);
+        			//viewer.setCuiVersion(true);
         			viewer.getRfb().screenChangeRequest();
-        		} catch (IOException e1) {
-        			e1.printStackTrace();
-        		}
+        		} catch (TransportException e1) {
+				}
         	}
         });
         kbdButtons.add(screenButton);