Mercurial > hg > Members > riono > TreeVNC_ja_comment

changeset 490:141f627665ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix display
author oshiro
date Wed, 30 Jan 2019 20:49:39 +0900
parents f06b0d50e4e2
children 13b08ea73237
files .idea/encodings.xml src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java src/main/java/jp/ac/u_ryukyu/treevnc/TreeVNCNetwork.java src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java
diffstat 5 files changed, 11 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/.idea/encodings.xml	Wed Jan 30 19:20:57 2019 +0900
+++ b/.idea/encodings.xml	Wed Jan 30 20:49:39 2019 +0900
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
 </project>
\ No newline at end of file
--- a/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java	Wed Jan 30 19:20:57 2019 +0900
+++ b/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java	Wed Jan 30 20:49:39 2019 +0900
@@ -109,7 +109,9 @@
     @Override
     public void run() {
         isRunning = true;
-        fullscreenFbUpdateIncrementalRequest.sendFullScreenRequest(context);
+        if (fullscreenFbUpdateIncrementalRequest != null) {
+            fullscreenFbUpdateIncrementalRequest.sendFullScreenRequest(context);
+        }
         while (isRunning) {
             try {
                 reader.available();
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java	Wed Jan 30 19:20:57 2019 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java	Wed Jan 30 20:49:39 2019 +0900
@@ -490,11 +490,11 @@
         multicastqueue.put(desktopSize);
     }
 
-    public byte[] createOriginalInitData(int singleWidth, int singleHeight, String remoteDesktopName) {
-        TreeVncCommandChannelListener treeVncCommandChannelListener = new TreeVncCommandChannelListener(this, acceptPort);
-        byte[] originalInitData = treeVncCommandChannelListener.createOriginalInitData(singleWidth, singleHeight, remoteDesktopName);
-        return originalInitData;
-    }
+    //public byte[] createOriginalInitData(int singleWidth, int singleHeight, String remoteDesktopName) {
+    //    TreeVncCommandChannelListener treeVncCommandChannelListener = new TreeVncCommandChannelListener(this, acceptPort);
+    //    byte[] originalInitData = treeVncCommandChannelListener.createOriginalInitData(singleWidth, singleHeight, remoteDesktopName);
+    //    return originalInitData;
+    //}
 
     public void addSerialNumber(LinkedList<ByteBuffer> bufs) {
         ByteBuffer serialNum = multicastqueue.allocate(4 + 8); // addSerialNum flag + SerialNum
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVNCNetwork.java	Wed Jan 30 19:20:57 2019 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVNCNetwork.java	Wed Jan 30 20:49:39 2019 +0900
@@ -28,7 +28,7 @@
 		int treeId = 0;
     	for (Enumeration<NetworkInterface> e = NetworkInterface.getNetworkInterfaces(); e.hasMoreElements();) {
     		NetworkInterface ni = e.nextElement();
-    		if (ni.isUp() && ni.supportsMulticast() && !ni.isLoopback()) {
+    		if (ni.isUp() && ni.supportsMulticast()) {
                 TreeManagement treeManager = new TreeManagement(ni.getDisplayName(), ConnectionParams.DEFAULT_VNC_ROOT, myRfb.getViewer().getShowTree(),treeId++);
                 addNetworkInterface(ni, treeManager);  // it looks like only last address is used
                 for (InterfaceAddress ipaddress : ni.getInterfaceAddresses()) {
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java	Wed Jan 30 19:20:57 2019 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java	Wed Jan 30 20:49:39 2019 +0900
@@ -100,6 +100,7 @@
         /**
          * initial connection of RFB protocol
          */
+        rfb = myRfbProto;
         InetAddress adr = connection.getLocalAddress();
         String myHostAddress = adr.getHostAddress();
         String intf = NetworkInterface.getByInetAddress(adr).getName();