# HG changeset patch # User e165729 # Date 1580310406 -32400 # Node ID 1a7cf34b42b260b297aedf8f62492649effe116d # Parent 214ebc49b5bdbe078e6c2b6e53d126c90fbe04e2# Parent ff4c1972aa2e409836db742bf7aa582c1401d51c merge diff -r 214ebc49b5bd -r 1a7cf34b42b2 .idea/.name --- a/.idea/.name Thu Jan 30 00:05:40 2020 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -TreeVNC \ No newline at end of file diff -r 214ebc49b5bd -r 1a7cf34b42b2 .idea/copyright/profiles_settings.xml --- a/.idea/copyright/profiles_settings.xml Thu Jan 30 00:05:40 2020 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff -r 214ebc49b5bd -r 1a7cf34b42b2 .idea/encodings.xml --- a/.idea/encodings.xml Thu Jan 30 00:05:40 2020 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff -r 214ebc49b5bd -r 1a7cf34b42b2 .idea/scopes/scope_settings.xml --- a/.idea/scopes/scope_settings.xml Thu Jan 30 00:05:40 2020 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff -r 214ebc49b5bd -r 1a7cf34b42b2 .idea/uiDesigner.xml --- a/.idea/uiDesigner.xml Thu Jan 30 00:05:40 2020 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff -r 214ebc49b5bd -r 1a7cf34b42b2 .idea/vcs.xml --- a/.idea/vcs.xml Thu Jan 30 00:05:40 2020 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff -r 214ebc49b5bd -r 1a7cf34b42b2 build.gradle --- a/build.gradle Thu Jan 30 00:05:40 2020 +0900 +++ b/build.gradle Thu Jan 30 00:06:46 2020 +0900 @@ -9,8 +9,8 @@ apply plugin: "edu.sc.seis.macAppBundle" -sourceCompatibility = JavaVersion.VERSION_12 -targetCompatibility = JavaVersion.VERSION_12 +sourceCompatibility = JavaVersion.VERSION_11 +targetCompatibility = JavaVersion.VERSION_11 version = '2.7.2' project.ext.baseName = 'tightvnc-jviewer' diff -r 214ebc49b5bd -r 1a7cf34b42b2 src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEDecoder.java --- a/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEDecoder.java Thu Jan 30 00:05:40 2020 +0900 +++ b/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEDecoder.java Thu Jan 30 00:06:46 2020 +0900 @@ -260,7 +260,7 @@ LinkedList bufs = new LinkedList(); bufs.add(c1); - ReceiverTask.checkFrameBufferRectanble(c1); + rfb.getContext().checkFrameBufferRectanble(c1); if (rfb.isTreeManager() && rfb.connectionPresenter.isUseMulticast()) { for (ByteBuffer buf : bufs) rfb.getViewer().getRfbBroadcastListener().multicastUpdateRectangle(buf); diff -r 214ebc49b5bd -r 1a7cf34b42b2 src/main/java/com/glavsoft/rfb/protocol/Protocol.java --- a/src/main/java/com/glavsoft/rfb/protocol/Protocol.java Thu Jan 30 00:05:40 2020 +0900 +++ b/src/main/java/com/glavsoft/rfb/protocol/Protocol.java Thu Jan 30 00:06:46 2020 +0900 @@ -39,6 +39,7 @@ import com.glavsoft.transport.Writer; import jp.ac.u_ryukyu.treevnc.TreeRFBProto; +import java.nio.ByteBuffer; import java.util.logging.Logger; public class Protocol implements ProtocolContext, IChangeSettingsListener { @@ -337,6 +338,11 @@ } @Override + public void checkFrameBufferRectanble(ByteBuffer c1) { + receiverTask.checkFrameBufferRectanble(c1); + } + + @Override public void setTight(boolean isTight) { this.isTight = isTight; } diff -r 214ebc49b5bd -r 1a7cf34b42b2 src/main/java/com/glavsoft/rfb/protocol/ProtocolContext.java --- a/src/main/java/com/glavsoft/rfb/protocol/ProtocolContext.java Thu Jan 30 00:05:40 2020 +0900 +++ b/src/main/java/com/glavsoft/rfb/protocol/ProtocolContext.java Thu Jan 30 00:06:46 2020 +0900 @@ -32,6 +32,8 @@ import com.glavsoft.transport.Writer; import jp.ac.u_ryukyu.treevnc.TreeRFBProto; +import java.nio.ByteBuffer; + public interface ProtocolContext { void changeStateTo(ProtocolState state); @@ -86,6 +88,8 @@ boolean isRunning(); + void checkFrameBufferRectanble(ByteBuffer c1); + /** * TreeVNC expension command (server to client) * 0 : command byte diff -r 214ebc49b5bd -r 1a7cf34b42b2 src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java --- a/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java Thu Jan 30 00:05:40 2020 +0900 +++ b/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java Thu Jan 30 00:06:46 2020 +0900 @@ -373,7 +373,7 @@ sendFrameBufferUpdateRequest(); } - public static void checkFrameBufferRectanble(ByteBuffer c1) { + public void checkFrameBufferRectanble(ByteBuffer c1) { FramebufferUpdateRectangle rect = new FramebufferUpdateRectangle(); Reader in = new Reader(new ByteArrayInputStream(c1.array())); try {