# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1466566197 -32400
# Node ID 6f3d3da4094054ced760a95e0f52b60d3b383738
# Parent  432e2967eaabe82425945090ba5e7fc89a1a38b4
fix cui and hasViewer flag

diff -r 432e2967eaab -r 6f3d3da40940 src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java
--- a/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java	Wed Jun 22 11:55:45 2016 +0900
+++ b/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java	Wed Jun 22 12:29:57 2016 +0900
@@ -279,13 +279,11 @@
                     return;
                 } else if (rect.getEncodingType() == EncodingType.DESKTOP_SIZE) {
                     fullscreenFbUpdateIncrementalRequest = new FramebufferUpdateRequestMessage(rect.x, rect.y, rect.width, rect.height, false);
-                    rfb.setCuiVersion(false);
                     renderer = repaintController.createRenderer(reader, rect.width, rect.height, context.getPixelFormat());
                     if (rfb.hasViewer()){
                         setScreenParameter(rect,rect.width,rect.height);
                     }
                 } else if (rect.getEncodingType() == EncodingType.INIT_DATA) {
-                    rfb.setCuiVersion(false);
                     // VNCServer is changed, initiarize new screen.
                     int length = reader.readInt32() - 6;
                     short id = reader.readInt16();
diff -r 432e2967eaab -r 6f3d3da40940 src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java
--- a/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java	Wed Jun 22 11:55:45 2016 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java	Wed Jun 22 12:29:57 2016 +0900
@@ -261,7 +261,7 @@
     }
 
     @Override
-    public void proxyStart(String[] args, String hostName, int width, int height, boolean showTree, boolean checkDelay, boolean addSerialNum, boolean fixingSize, boolean filterSingleDisplay) {
+    public void proxyStart(String[] args, String hostName, int width, int height, boolean showTree, boolean checkDelay, boolean addSerialNum, boolean fixingSize, boolean filterSingleDisplay, boolean hasViewer) {
 
     }
 
diff -r 432e2967eaab -r 6f3d3da40940 src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java
--- a/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java	Wed Jun 22 11:55:45 2016 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java	Wed Jun 22 12:29:57 2016 +0900
@@ -89,8 +89,7 @@
 
     public void rootStart(String[] args, ViewerInterface v) throws SocketException, UnknownHostException {
         v.setNoConnection(noConnection);  // should we accept host name here?
-        v.proxyStart(args, hostName, width, height, showTree, checkDelay, addSerialNum, fixingSizeDisplay, filterSingleDisplay);
-        v.getRfb().setHasViewer(viewer);
+        v.proxyStart(args, hostName, width, height, showTree, checkDelay, addSerialNum, fixingSizeDisplay, filterSingleDisplay, viewer);
         if (!permitChangeScreen) v.getRfb().setPermitChangeScreen(false);
         v.getRfb().getAcceptThread().waitForShutdown();
     }
diff -r 432e2967eaab -r 6f3d3da40940 src/viewer_swing/java/com/glavsoft/viewer/Viewer.java
--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Wed Jun 22 11:55:45 2016 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Wed Jun 22 12:29:57 2016 +0900
@@ -393,10 +393,9 @@
         rfb.getAcceptThread().waitForShutdown();
     }
 
-    public void proxyStart(String[] argv, String hostName, int width, int height, boolean showTree, boolean checkDelay, boolean addSerialNum, boolean fixingSize, boolean filterSingleDisplay) {
+    public void proxyStart(String[] argv, String hostName, int width, int height, boolean showTree, boolean checkDelay, boolean addSerialNum, boolean fixingSize, boolean filterSingleDisplay, boolean hasViewer) {
         fbWidth = width;
         this.showTree = showTree;
-        // input into arguments Decision
         Parser parser = new Parser();
         ParametersHandler.completeParserOptions(parser);
         if (fbWidth == 0)
@@ -411,7 +410,8 @@
         if (myRfb == null) {
             myRfb = new TreeRFBProto(true, this);
         }
-
+        myRfb.setCuiVersion(!hasViewer);
+        myRfb.setHasViewer(hasViewer);
         myRfb.setShowTree(showTree);
         myRfb.setCheckDelay(checkDelay);
         myRfb.setAddSerialNum(addSerialNum);
@@ -420,8 +420,6 @@
             myRfb.fixingSizeWidth = fixingSizeWidth;
             myRfb.fixingSizeHeight = fixingSizeHeight;
         }
-        myRfb.setCuiVersion(false);
-        myRfb.setHasViewer(true); // this flag will be overwrited after this method. Do we have to set here?
         if (myRfb.getAcceptThread() == null) {
             myRfb.createConnectionAndStart(this);
         } else {
@@ -481,9 +479,6 @@
 
     @Override
     public ArrayList<Rectangle> getScreenRectangles() {
-        // before change the screen server, data from previous server
-        // should be stopped.
-        setCuiVersion(false);
         // New screen server has one or more screens.
         // Screens are numbered in the order from left.
         // put screens in an ArrayList.
diff -r 432e2967eaab -r 6f3d3da40940 src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java
--- a/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java	Wed Jun 22 11:55:45 2016 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java	Wed Jun 22 12:29:57 2016 +0900
@@ -31,7 +31,7 @@
 
     public void inhelitClients(String hostName, short newVNCServerId, int x, int y, int width, int height, int scale);
 
-    public void proxyStart(String[] args, String hostName, int width, int height, boolean showTree, boolean checkDelay, boolean addSerialNum, boolean fixingSize, boolean filterSingleDisplay);
+    public void proxyStart(String[] args, String hostName, int width, int height, boolean showTree, boolean checkDelay, boolean addSerialNum, boolean fixingSize, boolean filterSingleDisplay, boolean hasViewer);
 
     public void setNoConnection(boolean noConnection);