Mercurial > hg > Members > riono > TreeVNC_ja_comment
changeset 64:e73e2c30c9a6
before update for build CUI version.
| author | Taninari YU <you@cr.ie.u-ryukyu.ac.jp> |
|---|---|
| date | Sat, 25 Jan 2014 21:19:52 +0900 |
| parents | 84f1c39ba3bf |
| children | ffd7537cebfc |
| files | src/main/java/jp/ac/u_ryukyu/treevnc/MyRfbProto.java src/main/java/jp/ac/u_ryukyu/treevnc/client/EchoClient.java src/main/java/jp/ac/u_ryukyu/treevnc/server/AcceptClient.java src/main/java/jp/ac/u_ryukyu/treevnc/server/MyRfbProtoProxy.java src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java |
| diffstat | 6 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/MyRfbProto.java Fri Jan 17 12:43:25 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/MyRfbProto.java Sat Jan 25 21:19:52 2014 +0900 @@ -228,7 +228,7 @@ } public void screenChangeRequest() throws IOException { - Socket echoSocket = new Socket(proxyAddr, 10001); + Socket echoSocket = new Socket(proxyAddr, 10002); DataOutputStream os = new DataOutputStream(echoSocket.getOutputStream()); os.writeBytes(echo.getMyAddress()+"\n"); //os.writeBytes(String.valueOf(echo.client.getFrameWidth())+"\n"); temp comment out for rebuild
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/client/EchoClient.java Fri Jan 17 12:43:25 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/client/EchoClient.java Sat Jan 25 21:19:52 2014 +0900 @@ -144,6 +144,7 @@ } } + /* String getProxyData2(BufferedReader is) throws IOException { String checkRepetition = null; if (!("1".equals(leaderFlag))) { @@ -182,7 +183,7 @@ } return checkRepetition; } - + */ void reConnectionMain(Socket echoSocket) { while (true) { try {
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/server/AcceptClient.java Fri Jan 17 12:43:25 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/server/AcceptClient.java Sat Jan 25 21:19:52 2014 +0900 @@ -179,7 +179,8 @@ } } } - + +/* private void replyNormalChildren(PrintStream os, BufferedReader is, String port, String treeNumber, boolean flag) throws IOException, InterruptedException { @@ -200,7 +201,8 @@ is.close(); os.close(); } - +*/ + private synchronized boolean replyCreateTree(PrintStream os, String port, String line) throws InterruptedException { if (addrRegistor == true) {
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/server/MyRfbProtoProxy.java Fri Jan 17 12:43:25 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/server/MyRfbProtoProxy.java Sat Jan 25 21:19:52 2014 +0900 @@ -313,7 +313,7 @@ blen.flip(); bufs.addFirst(blen); bufs.addFirst(header); - if(header.getShort(4)<1920) + //if(header.getShort(4)<1920) multicastqueue.put(bufs); // is.reset(); return;
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java Fri Jan 17 12:43:25 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java Sat Jan 25 21:19:52 2014 +0900 @@ -196,7 +196,7 @@ while (true) { try { Socket clientSocket = null; - ServerSocket echoServer = new ServerSocket(10001); + ServerSocket echoServer = new ServerSocket(10002); while (true) { clientSocket = echoServer.accept(); BufferedReader is = new BufferedReader(
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java Fri Jan 17 12:43:25 2014 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java Sat Jan 25 21:19:52 2014 +0900 @@ -807,6 +807,7 @@ }); kbdButtons.add(altButton); + JButton screenButton = buttonsBar.createButton("display", "change screen", new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -818,6 +819,7 @@ } }); kbdButtons.add(screenButton); + ModifierButtonEventListener modifierButtonListener = new ModifierButtonEventListener(); modifierButtonListener.addButton(KeyEvent.VK_CONTROL, ctrlButton);