diff src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java @ 448:344a35b7c47f

send both frame buffer size and selected screen size in Disktop size change (INIT_DATA)
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Sat, 18 Jun 2016 20:09:46 +0900
parents ffe01c959cdd
children 141f627665ab
line wrap: on
line diff
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java	Fri Jun 17 17:06:22 2016 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java	Sat Jun 18 20:09:46 2016 +0900
@@ -1,4 +1,14 @@
 package jp.ac.u_ryukyu.treevnc;
+import com.glavsoft.exceptions.TransportException;
+import com.glavsoft.rfb.protocol.ProtocolContext;
+import com.glavsoft.rfb.protocol.ProtocolContext.TreeCommand;
+import com.glavsoft.rfb.protocol.state.HandshakeState;
+import com.glavsoft.transport.Reader;
+import com.glavsoft.transport.Writer;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
@@ -7,16 +17,6 @@
 import java.nio.ByteOrder;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import com.glavsoft.exceptions.TransportException;
-import com.glavsoft.rfb.protocol.ProtocolContext;
-import com.glavsoft.rfb.protocol.ProtocolContext.TreeCommand;
-import com.glavsoft.rfb.protocol.state.HandshakeState;
-import com.glavsoft.transport.Reader;
-import com.glavsoft.transport.Writer;
 
 
 public class TreeVncCommandChannelListener implements Runnable {
@@ -228,15 +228,7 @@
     void sendInitData(Writer os) throws TransportException {
         ProtocolContext context = rfb.context;
         if (context != null) {
-            if (rfb.filterSingleDisplay) {
-                int width = rfb.getSingleWidth();
-                int height = rfb.getSingleHeight();
-                byte[] initData = createOriginalInitData(width, height, context.getRemoteDesktopName());
-//                os.write(initData);
-                os.write(context.getInitData());
-            } else {
-                os.write(context.getInitData());
-            }
+            os.write(context.getInitData());
         } else {
             // In case of "-d" we have no context
             // Send dummy data