# HG changeset patch
# User oshiro
# Date 1548848979 -32400
# Node ID 141f627665ab7d2fde1f55a51f771ff24ec20980
# Parent f06b0d50e4e2a37dd9d411ec7734231172b053d6
fix display
diff -r f06b0d50e4e2 -r 141f627665ab .idea/encodings.xml
--- 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 @@
-
-
-
+
\ No newline at end of file
diff -r f06b0d50e4e2 -r 141f627665ab src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java
--- 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();
diff -r f06b0d50e4e2 -r 141f627665ab src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java
--- 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 bufs) {
ByteBuffer serialNum = multicastqueue.allocate(4 + 8); // addSerialNum flag + SerialNum
diff -r f06b0d50e4e2 -r 141f627665ab src/main/java/jp/ac/u_ryukyu/treevnc/TreeVNCNetwork.java
--- 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 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()) {
diff -r f06b0d50e4e2 -r 141f627665ab src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java
--- 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();