# HG changeset patch
# User oc
# Date 1418086077 -32400
# Node ID 17eb729d64be32e6dfce809ce17c6a5b0fe633fd
# Parent  57d71d8f1616e4bee895c0d5a5c2c957db49a2c2
fix --fixingSize option correspondence -p option.

diff -r 57d71d8f1616 -r 17eb729d64be src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java	Mon Dec 08 22:42:25 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java	Tue Dec 09 09:47:57 2014 +0900
@@ -698,8 +698,6 @@
     public void changeVNCServer(ViewerInterface vncProxyService, String hostName, int width, int height, short id)
             throws UnknownHostException, IOException, InterruptedException {
 
-        this.fixingSizeWidth = vncProxyService.getFixingWidth();
-        this.fixingSizeHeight = vncProxyService.getFixingHeight();
         this.frameSizeWidth = width;
         this.frameSizeHeight = height;
 
diff -r 57d71d8f1616 -r 17eb729d64be src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java
--- a/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java	Mon Dec 08 22:42:25 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java	Tue Dec 09 09:47:57 2014 +0900
@@ -22,6 +22,7 @@
     private boolean addSerialNum = false;
     private boolean fixingSizeDisplay = false;
     private boolean logFile;
+    private boolean filteringSingleDisplay = false;
 
 
     public static void main(String[] args) {
@@ -42,15 +43,16 @@
         if (treeProxy && !viewer) {
             // start treeManager only ( -p flag )
             VncProxyService vps = new VncProxyService();
+            if(fixingSizeDisplay)
+                setFixingSizeDisplay(vps);
             rootStart(args,vps);
             return;
         }
         if (viewer) {
             ViewerInterface v = cui ? new CuiViewer() : new Viewer();
             setWidthAndHeight(v);
-            if(fixingSizeDisplay) {
+            if(fixingSizeDisplay)
                 setFixingSizeDisplay(v);
-            }
             if (treeProxy) {
                 // this viewer also works as tree root ( display mode -d flag )
                 // start with no connection waiting server change request
@@ -105,6 +107,10 @@
                 fixingSizeWidth = 1280;
                 fixingSizeHeight = 800;
                 fixingSizeDisplay = true;
+            } else if ("--SingleDisplay".equals(args[i])) {
+                // retina display too large for TreeVNC.
+                // restrict display size.
+                filteringSingleDisplay = true;
             } else if ("--width".equals(args[i])) {
                 width = Integer.parseInt(args[i+1]);
                 i++;
diff -r 57d71d8f1616 -r 17eb729d64be src/viewer_swing/java/com/glavsoft/viewer/Viewer.java
--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Mon Dec 08 22:42:25 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Tue Dec 09 09:47:57 2014 +0900
@@ -386,6 +386,10 @@
         rfb.setCheckDelay(checkDelay);
         rfb.setAddSerialNum(addSerialNum);
         rfb.setFixingSize(fixingSize);
+        if(fixingSize) {
+            rfb.fixingSizeWidth = fixingSizeWidth;
+            rfb.fixingSizeHeight = fixingSizeHeight;
+        }
         rfb.setViewer(this);
         rfb.setCuiVersion(false);
         rfb.setHasViewer(true); // this flag will be overwrited after this method. Do we have to set here?