changeset 485:520a9a3e4975

fix screen visiblitiy
author kono
date Fri, 25 Jan 2019 20:49:29 +0900
parents 4accfd4ea9c2
children 79d614cd91c7 101b8a3ed8e4
files build.gradle src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java src/main/java/jp/ac/u_ryukyu/treevnc/RectangleBlocking.java
diffstat 3 files changed, 9 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/build.gradle	Thu Jan 24 19:20:07 2019 +0900
+++ b/build.gradle	Fri Jan 25 20:49:29 2019 +0900
@@ -7,8 +7,8 @@
 apply plugin: 'application'
 
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 1.11
+targetCompatibility = 1.11
 version = '2.7.2'
 
 project.ext.baseName = 'tightvnc-jviewer'
--- a/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java	Thu Jan 24 19:20:07 2019 +0900
+++ b/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java	Fri Jan 25 20:49:29 2019 +0900
@@ -155,8 +155,6 @@
                 if (e.getCause().getClass().getSimpleName().equals("SocketTimeoutException")) {
                     sendFrameBufferUpdateRequest();
                     continue;
-//                } else if (e.getMessage() == "java.io.EOFException") {
-//                    sendFrameBufferUpdateRequest();
                 }
                 logger.severe("Close session : ReceiverTask : " + e.getMessage());
                 if(!rfb.isTreeManager() && !(rfb.getTerminationType())) {
@@ -170,8 +168,8 @@
                     } catch (TransportException e1) {
                         e1.printStackTrace();
                     }
-                } else {
-                    rfb.sendDesktopSizeChange((short) -1);
+                //} else {
+                //    rfb.sendDesktopSizeChange((short) -1);
                 }
                 stopTask();
             } catch (ProtocolException e) {
@@ -200,13 +198,8 @@
     }
 
     public void sendFrameBufferUpdateRequest() {
-        try {
-            if (rfb.isTreeManager()) {
-                sendFrameBufferUpdateRequest0();
-            }
-            reader.reset();
-        } catch (TransportException e1) {
-            e1.printStackTrace();
+        if (rfb.isTreeManager()) {
+            sendFrameBufferUpdateRequest0();
         }
     }
 
@@ -374,7 +367,8 @@
         if (rfb.isTreeManager()) {
             repaintController.setVisible(-1 != rfb.getSharingId() && rfb.getId() != rfb.getSharingId());
         } else {
-            repaintController.setVisible(rfb.getId() != rfb.getSharingId());
+            if (rfb.getSharingId() != -1)
+                repaintController.setVisible(rfb.getId() != rfb.getSharingId());
         }
     }
 
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/RectangleBlocking.java	Thu Jan 24 19:20:07 2019 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/RectangleBlocking.java	Fri Jan 25 20:49:29 2019 +0900
@@ -27,6 +27,6 @@
             public FramebufferUpdateRectangle next() {
                 return null;
             }
-        }
+        };
     }
 }
\ No newline at end of file