Mercurial > hg > Members > riono > TreeVNC_ja_comment

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
426:3a97a014d7ee 427:ed15f0bd8dfa
946 y = y < 0 ? 0 : y; 946 y = y < 0 ? 0 : y;
947 947
948 int scale = retinaScale(shareScreenNumber); 948 int scale = retinaScale(shareScreenNumber);
949 949
950 if (viewer.getRfb().isTreeManager()) { 950 if (viewer.getRfb().isTreeManager()) {
951 changeVncServer(viewer, x, y, singleWidth, singleHeight, shareScreenNumber, scale, viewer.getRfb().getId()); 951 changeVncServer(viewer, x, y, singleWidth, singleHeight, scale, viewer.getRfb().getId());
952 return; 952 return;
953 } 953 }
954 954
955 if (viewer.getRfb().hasParent()) { 955 if (viewer.getRfb().hasParent()) {
956 String adr = viewer.getRfb().getMyAddress(); 956 String adr = viewer.getRfb().getMyAddress();
957 if (scanPort(adr, ConnectionParams.DEFAULT_RFB_PORT)) { 957 if (scanPort(adr, ConnectionParams.DEFAULT_RFB_PORT)) {
958 // -1 means request to reverse direct connection socket 958 // -1 means request to reverse direct connection socket
959 short id = viewer.getRfb().isTreeManager()? (short)-1 : viewer.getRfb().getId(); 959 short id = viewer.getRfb().isTreeManager()? (short)-1 : viewer.getRfb().getId();
960 context.sendMessage(new ScreenChangeRequest(adr, ConnectionParams.DEFAULT_VNC_ROOT, id, x, y, singleWidth, singleHeight, shareScreenNumber, scale)); 960 context.sendMessage(new ScreenChangeRequest(adr, ConnectionParams.DEFAULT_VNC_ROOT, id, x, y, singleWidth, singleHeight, scale));
961 } 961 }
962 } 962 }
963 } 963 }
964 964
965 private int retinaScale(int shareScreenNumber) { 965 private int retinaScale(int shareScreenNumber) {
1079 1079
1080 public void setVisible(boolean b) { 1080 public void setVisible(boolean b) {
1081 frame.setVisible(b); 1081 frame.setVisible(b);
1082 } 1082 }
1083 1083
1084 private void changeVncServer(ViewerInterface viewer, int x, int y, int width, int height, int shareScreenNumber, int scale, short id) { 1084 private void changeVncServer(ViewerInterface viewer, int x, int y, int width, int height, int scale, short id) {
1085 String localhost = "127.0.0.1"; // InetAddress.getLocalHost().getHostName() 1085 String localhost = "127.0.0.1"; // InetAddress.getLocalHost().getHostName()
1086 try { 1086 try {
1087 viewer.getRfb().changeVNCServer(viewer, localhost, ConnectionParams.DEFAULT_RFB_PORT, x, y, width, height, shareScreenNumber, scale, id, null, null); 1087 viewer.getRfb().changeVNCServer(viewer, localhost, ConnectionParams.DEFAULT_RFB_PORT, x, y, width, height, scale, id, null, null);
1088 } catch (Exception e1) { 1088 } catch (Exception e1) {
1089 System.out.println("can't change server :" + e1.getMessage()); 1089 System.out.println("can't change server :" + e1.getMessage());
1090 } 1090 }
1091 } 1091 }
1092 1092