comparison src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java @ 479:8f5a2d152c38

merge
author oshiro
date Wed, 28 Nov 2018 19:05:58 +0900
parents f0bd5f2c4ba3
children 141f627665ab
comparison
equal deleted inserted replaced
478:8cee5a014d32 479:8f5a2d152c38
207 int y = buf.getInt(); 207 int y = buf.getInt();
208 int singleWidth = buf.getInt(); 208 int singleWidth = buf.getInt();
209 int singleHeight = buf.getInt(); 209 int singleHeight = buf.getInt();
210 int port = buf.getInt(); 210 int port = buf.getInt();
211 int scale = buf.getInt(); 211 int scale = buf.getInt();
212 System.out.println("Root server change request :" + newHostName + " : " + port); 212 System.out.println("Root server change request :" + newHostName + " : " + port + " id:" + id);
213 changeVNCServer(viewer, newHostName, port, x, y, singleWidth, singleHeight, scale, id, is, os); 213 changeVNCServer(viewer, newHostName, port, x, y, singleWidth, singleHeight, scale, id, is, os);
214 } else { 214 } else {
215 continue; 215 continue;
216 } 216 }
217 } else if (b[0] == ClientToServerMessage.READY_SHARE_SOUND) { 217 } else if (b[0] == ClientToServerMessage.READY_SHARE_SOUND) {
899 Writer previousWriter = previousContext.getWriter(); 899 Writer previousWriter = previousContext.getWriter();
900 // exchangeDirectConnectedServer(previousReader, previousWriter); 900 // exchangeDirectConnectedServer(previousReader, previousWriter);
901 } 901 }
902 enableChildrenTransmission(); 902 enableChildrenTransmission();
903 printNetworkInterface(); 903 printNetworkInterface();
904 System.out.println("newVNCConenction reconnectingId: " + connectionPresenter.getReconnectingId());
905 if (isTreeManager()) {
906 sharingId = connectionPresenter.getReconnectingId();
907 }
904 sendDesktopSizeChange(connectionPresenter.getReconnectingId()); 908 sendDesktopSizeChange(connectionPresenter.getReconnectingId());
905 } 909 }
906 910
907 public void sendErrorAnnounce(short reconnectingId, String message) { 911 public void sendErrorAnnounce(short reconnectingId, String message) {
908 LinkedList<ByteBuffer> errorAnnounce = new LinkedList<ByteBuffer>(); 912 LinkedList<ByteBuffer> errorAnnounce = new LinkedList<ByteBuffer>();