diff src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java @ 427:ed15f0bd8dfa

Remove shareScrrenNumber for ScreenChangeRequest Message
author Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp>
date Mon, 01 Feb 2016 04:39:53 +0900
parents 90c059a70e2e
children 7eaa95ca7e45
line wrap: on
line diff
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java	Fri Jan 29 20:27:25 2016 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java	Mon Feb 01 04:39:53 2016 +0900
@@ -948,7 +948,7 @@
         int scale = retinaScale(shareScreenNumber);
 
         if (viewer.getRfb().isTreeManager()) {
-            changeVncServer(viewer, x, y, singleWidth, singleHeight, shareScreenNumber, scale, viewer.getRfb().getId());
+            changeVncServer(viewer, x, y, singleWidth, singleHeight, scale, viewer.getRfb().getId());
             return;
         }
 
@@ -957,7 +957,7 @@
                 if (scanPort(adr, ConnectionParams.DEFAULT_RFB_PORT)) {
                     // -1 means request to reverse direct connection socket
                     short id = viewer.getRfb().isTreeManager()? (short)-1 : viewer.getRfb().getId();
-                    context.sendMessage(new ScreenChangeRequest(adr, ConnectionParams.DEFAULT_VNC_ROOT, id, x, y, singleWidth, singleHeight, shareScreenNumber, scale));
+                    context.sendMessage(new ScreenChangeRequest(adr, ConnectionParams.DEFAULT_VNC_ROOT, id, x, y, singleWidth, singleHeight, scale));
                 }
         }
     }
@@ -1081,10 +1081,10 @@
         frame.setVisible(b);
     }
 
-    private void changeVncServer(ViewerInterface viewer, int x, int y, int width, int height, int shareScreenNumber, int scale, short id) {
+    private void changeVncServer(ViewerInterface viewer, int x, int y, int width, int height, int scale, short id) {
         String localhost = "127.0.0.1"; // InetAddress.getLocalHost().getHostName()
         try {
-            viewer.getRfb().changeVNCServer(viewer, localhost, ConnectionParams.DEFAULT_RFB_PORT, x, y, width, height, shareScreenNumber, scale, id, null, null);
+            viewer.getRfb().changeVNCServer(viewer, localhost, ConnectionParams.DEFAULT_RFB_PORT, x, y, width, height, scale, id, null, null);
         } catch (Exception e1) {
             System.out.println("can't change server :" + e1.getMessage());
         }