Members/riono/TreeVNC_ja_comment: src/viewer_swing/java/com/glavsoft/viewer/Viewer.java annotate

annotate src/viewer_swing/java/com/glavsoft/viewer/Viewer.java @ 461:b7d43b12651c

fix getFbRectangles x may have minus value now, but xFb is always plus

author	kono
date	Mon, 04 Jul 2016 18:41:14 +0900
parents	c6058c4e2a79
children	8d636adb292c

rev	line source
57 17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	1 // Copyright (C) 2010, 2011, 2012, 2013 GlavSoft LLC.
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	2 // All rights reserved.
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	3 //
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	4 //-------------------------------------------------------------------------
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	5 // This file is part of the TightVNC software. Please visit our Web site:
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	6 //
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	7 // http://www.tightvnc.com/
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	8 //
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	9 // This program is free software; you can redistribute it and/or modify
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	10 // it under the terms of the GNU General Public License as published by
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	11 // the Free Software Foundation; either version 2 of the License, or
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	12 // (at your option) any later version.
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	13 //
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	14 // This program is distributed in the hope that it will be useful,
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	15 // but WITHOUT ANY WARRANTY; without even the implied warranty of
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	16 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	17 // GNU General Public License for more details.
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	18 //
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	19 // You should have received a copy of the GNU General Public License along
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	20 // with this program; if not, write to the Free Software Foundation, Inc.,
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	21 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	22 //-------------------------------------------------------------------------
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	23 //
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	24
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	25 package com.glavsoft.viewer;
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	26
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	27 import com.glavsoft.rfb.protocol.ProtocolSettings;
383 7d55adebcacb impliment changeDirectConnectedWithSocket kkb parents: 379 diff changeset	28 import com.glavsoft.transport.Reader;
7d55adebcacb impliment changeDirectConnectedWithSocket kkb parents: 379 diff changeset	29 import com.glavsoft.transport.Writer;
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	30 import com.glavsoft.viewer.cli.Parser;
448 344a35b7c47f send both frame buffer size and selected screen size in Disktop size change (INIT_DATA) Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 441 diff changeset	31 import com.glavsoft.viewer.swing.ConnectionParams;
344a35b7c47f send both frame buffer size and selected screen size in Disktop size change (INIT_DATA) Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 441 diff changeset	32 import com.glavsoft.viewer.swing.ParametersHandler;
344a35b7c47f send both frame buffer size and selected screen size in Disktop size change (INIT_DATA) Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 441 diff changeset	33 import com.glavsoft.viewer.swing.SwingViewerWindow;
344a35b7c47f send both frame buffer size and selected screen size in Disktop size change (INIT_DATA) Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 441 diff changeset	34 import jp.ac.u_ryukyu.treevnc.CreateConnectionParam;
344a35b7c47f send both frame buffer size and selected screen size in Disktop size change (INIT_DATA) Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 441 diff changeset	35 import jp.ac.u_ryukyu.treevnc.TreeRFBProto;
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	36
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	37 import javax.swing.*;
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	38 import java.awt.*;
57 17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	39 import java.awt.event.WindowEvent;
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	40 import java.awt.event.WindowListener;
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	41 import java.io.IOException;
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	42 import java.io.InputStream;
456 34277b436cac Using retina scale to share screnn if minus postion Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 455 diff changeset	43 import java.lang.reflect.Field;
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	44 import java.net.Socket;
301 ae7deb002b5f send and receive single display size oc parents: 300 diff changeset	45 import java.util.ArrayList;
458 4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	46 import java.util.Comparator;
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	47 import java.util.jar.Attributes;
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	48 import java.util.jar.Manifest;
448 344a35b7c47f send both frame buffer size and selected screen size in Disktop size change (INIT_DATA) Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 441 diff changeset	49 import java.util.logging.ConsoleHandler;
344a35b7c47f send both frame buffer size and selected screen size in Disktop size change (INIT_DATA) Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 441 diff changeset	50 import java.util.logging.Handler;
344a35b7c47f send both frame buffer size and selected screen size in Disktop size change (INIT_DATA) Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 441 diff changeset	51 import java.util.logging.Level;
344a35b7c47f send both frame buffer size and selected screen size in Disktop size change (INIT_DATA) Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 441 diff changeset	52 import java.util.logging.Logger;
32 758d025ee24b add TextBox.java one parents: 11 diff changeset	53
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	54 @SuppressWarnings("serial")
179 c1b91dd27a13 on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 178 diff changeset	55 public class Viewer extends JApplet implements Runnable, WindowListener , ViewerInterface {
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	56
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	57 private Logger logger;
368 b60780e1fafc Add ServerChangeThread to inhelitClients method Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 366 diff changeset	58 public int paramsMask;
b60780e1fafc Add ServerChangeThread to inhelitClients method Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 366 diff changeset	59 public boolean allowAppletInteractiveConnections;
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	60
60 ac6f9e46566f proxy mode ok. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 59 diff changeset	61 public final ConnectionParams connectionParams;
368 b60780e1fafc Add ServerChangeThread to inhelitClients method Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 366 diff changeset	62 public String passwordFromParams;
b60780e1fafc Add ServerChangeThread to inhelitClients method Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 366 diff changeset	63 public boolean isSeparateFrame = true;
b60780e1fafc Add ServerChangeThread to inhelitClients method Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 366 diff changeset	64 public boolean isApplet = true;
b60780e1fafc Add ServerChangeThread to inhelitClients method Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 366 diff changeset	65 public final ProtocolSettings settings;
b60780e1fafc Add ServerChangeThread to inhelitClients method Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 366 diff changeset	66 public UiSettings uiSettings;
57 17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	67 private volatile boolean isAppletStopped = false;
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	68 private ConnectionPresenter connectionPresenter;
65 ffd7537cebfc cuiversion Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 61 diff changeset	69 boolean isTreeVNC = false;
368 b60780e1fafc Add ServerChangeThread to inhelitClients method Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 366 diff changeset	70 public TreeRFBProto myRfb;
b60780e1fafc Add ServerChangeThread to inhelitClients method Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 366 diff changeset	71 public boolean noConnection;
175 e1aa06b0d2ff on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 174 diff changeset	72 public int vncport = ConnectionParams.DEFAULT_RFB_PORT;
e1aa06b0d2ff on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 174 diff changeset	73 private int fbWidth;
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	74 private boolean showTree = false;
225 5e3594021e79 fix --width --height mode. oc parents: 224 diff changeset	75 public int width;
5e3594021e79 fix --width --height mode. oc parents: 224 diff changeset	76 public int height;
257 11b59b223222 add function of fixing display size oc parents: 256 diff changeset	77 public int fixingSizeWidth;
11b59b223222 add function of fixing display size oc parents: 256 diff changeset	78 public int fixingSizeHeight;
139 8798f36f732b wait for FIND_ROOT_REPLY. oc parents: 130 diff changeset	79
57 17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	80 public static void main(String[] args) {
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	81 Parser parser = new Parser();
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	82 ParametersHandler.completeParserOptions(parser);
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	83
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	84 parser.parse(args);
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	85 if (parser.isSet(ParametersHandler.ARG_HELP)) {
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	86 printUsage(parser.optionsUsage());
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	87 System.exit(0);
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	88 }
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	89 Viewer viewer = new Viewer(parser);
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	90 SwingUtilities.invokeLater(viewer);
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	91 }
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	92
57 17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	93 public static void printUsage(String additional) {
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	94 System.out.println("Usage: java -jar (progfilename) [hostname [port_number]] [Options]¥n" +
368 b60780e1fafc Add ServerChangeThread to inhelitClients method Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 366 diff changeset	95 " or¥n" +
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	96 " java -jar (progfilename) [Options]¥n" +
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	97 " or¥n java -jar (progfilename) -help¥n to view this help¥n¥n" +
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	98 "Where Options are:¥n" + additional +
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	99 "¥nOptions format: -optionName=optionValue. Ex. -host=localhost -port=5900 -viewonly=yes¥n" +
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	100 "Both option name and option value are case insensitive.");
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	101 }
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	102
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	103 public Viewer() {
57 17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	104 logger = Logger.getLogger(getClass().getName());
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	105 connectionParams = new ConnectionParams();
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	106 settings = ProtocolSettings.getDefaultSettings();
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	107 uiSettings = new UiSettings();
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	108 }
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	109
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	110 private Viewer(Parser parser) {
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	111 this();
57 17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	112 setLoggingLevel(parser.isSet(ParametersHandler.ARG_VERBOSE) ? Level.FINE :
402 73c96a1d4a3a Fix wasteful thread start Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 401 diff changeset	113 parser.isSet(ParametersHandler.ARG_VERBOSE_MORE) ? Level.FINER :
73c96a1d4a3a Fix wasteful thread start Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 401 diff changeset	114 Level.INFO);
57 17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	115
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	116 paramsMask = ParametersHandler.completeSettingsFromCLI(parser, connectionParams, settings, uiSettings);
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	117 passwordFromParams = parser.getValueFor(ParametersHandler.ARG_PASSWORD);
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	118 logger.info("TightVNC Viewer version " + ver());
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	119 isApplet = false;
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	120 }
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	121
57 17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	122 private void setLoggingLevel(Level levelToSet) {
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	123 final Logger appLogger = Logger.getLogger("com.glavsoft");
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	124 appLogger.setLevel(levelToSet);
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	125 ConsoleHandler ch = null;
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	126 for (Handler h : appLogger.getHandlers()) {
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	127 if (h instanceof ConsoleHandler) {
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	128 ch = (ConsoleHandler) h;
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	129 break;
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	130 }
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	131 }
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	132 if (null == ch) {
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	133 ch = new ConsoleHandler();
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	134 appLogger.addHandler(ch);
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	135 }
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	136 // ch.setFormatter(new SimpleFormatter());
57 17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	137 ch.setLevel(levelToSet);
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	138 }
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	139
4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	140
57 17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	141 @Override
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	142 public void windowClosing(WindowEvent e) {
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	143 if (e != null && e.getComponent() != null) {
57 17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	144 final Window w = e.getWindow();
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	145 if (w != null) {
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	146 w.setVisible(false);
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	147 w.dispose();
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	148 }
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	149 }
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	150 closeApp();
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	151 }
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	152
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	153 /**
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	154 * Closes App(lication) or stops App(let).
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	155 */
57 17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	156 public void closeApp() {
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	157 if (connectionPresenter != null) {
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	158 connectionPresenter.cancelConnection();
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	159 logger.info("Connections cancelled.");
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	160 }
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	161 if (isApplet) {
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	162 if ( ! isAppletStopped) {
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	163 logger.severe("Applet is stopped.");
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	164 isAppletStopped = true;
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	165 repaint();
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	166 stop();
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	167 }
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	168 } else {
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	169 System.exit(0);
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	170 }
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	171 }
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	172
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	173 @Override
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	174 public void paint(Graphics g) {
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	175 if ( ! isAppletStopped) {
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	176 super.paint(g);
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	177 } else {
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	178 getContentPane().removeAll();
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	179 g.clearRect(0, 0, getWidth(), getHeight());
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	180 g.drawString("Disconnected", 10, 20);
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	181 }
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	182 }
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	183
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	184 @Override
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	185 public void destroy() {
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	186 closeApp();
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	187 super.destroy();
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	188 }
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	189
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	190 @Override
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	191 public void init() {
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	192 paramsMask = ParametersHandler.completeSettingsFromApplet(this, connectionParams, settings, uiSettings);
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	193 isSeparateFrame = ParametersHandler.isSeparateFrame;
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	194 passwordFromParams = getParameter(ParametersHandler.ARG_PASSWORD);
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	195 isApplet = true;
57 17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	196 allowAppletInteractiveConnections = ParametersHandler.allowAppletInteractiveConnections;
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	197 repaint();
57 17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	198
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	199 try {
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	200 SwingUtilities.invokeAndWait(this);
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	201 } catch (Exception e) {
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	202 logger.severe(e.getMessage());
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	203 }
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	204 }
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	205
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	206 @Override
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	207 public void start() {
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	208 super.start();
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	209 }
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	210
368 b60780e1fafc Add ServerChangeThread to inhelitClients method Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 366 diff changeset	211 public boolean checkJsch() {
57 17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	212 try {
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	213 Class.forName("com.jcraft.jsch.JSch");
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	214 return true;
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	215 } catch (ClassNotFoundException e) {
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	216 return false;
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	217 }
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	218 }
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	219
85 432dac0b9dae delete Share Screen pop up in display mode. sugi parents: 79 diff changeset	220 public void setNoConnection(boolean c){
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	221 noConnection = c;
85 432dac0b9dae delete Share Screen pop up in display mode. sugi parents: 79 diff changeset	222 }
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	223
57 17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	224 @Override
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	225 public void run() {
57 17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	226 final boolean hasJsch = checkJsch();
17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	227 final boolean allowInteractive = allowAppletInteractiveConnections \|\| ! isApplet;
368 b60780e1fafc Add ServerChangeThread to inhelitClients method Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 366 diff changeset	228 connectionPresenter = new ConnectionPresenter(hasJsch, allowInteractive);
85 432dac0b9dae delete Share Screen pop up in display mode. sugi parents: 79 diff changeset	229 connectionPresenter.setNoConnection(noConnection);
57 17b702648079 version2.7.2 original version. Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 0 diff changeset	230 connectionPresenter.addModel("ConnectionParamsModel", connectionParams);
395 704ac9e79e25 Call startVNCConnectionWithSocket for directedServerChangeReqeust innparusu parents: 383 diff changeset	231 connectionPresenter.startVNCConnection(this, false, null, null);
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	232 }
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	233
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	234 @Override
370 2c61e6d434ff Fix VncConnectionWorkers innparusu parents: 369 diff changeset	235 public ConnectionPresenter getConnectionPresenter() {
2c61e6d434ff Fix VncConnectionWorkers innparusu parents: 369 diff changeset	236 return connectionPresenter;
363 bc5624e3e9c5 Add newVNCConnection method to Viewer innparusu parents: 345 diff changeset	237 }
bc5624e3e9c5 Add newVNCConnection method to Viewer innparusu parents: 345 diff changeset	238
bc5624e3e9c5 Add newVNCConnection method to Viewer innparusu parents: 345 diff changeset	239 @Override
370 2c61e6d434ff Fix VncConnectionWorkers innparusu parents: 369 diff changeset	240 public void setConnectionPresenter(ConnectionPresenter connectionPresenter) {
2c61e6d434ff Fix VncConnectionWorkers innparusu parents: 369 diff changeset	241 this.connectionPresenter = connectionPresenter;
369 2d01ec1c02d2 Fix ReConnectingFlag innparusu parents: 368 diff changeset	242 }
2d01ec1c02d2 Fix ReConnectingFlag innparusu parents: 368 diff changeset	243
2d01ec1c02d2 Fix ReConnectingFlag innparusu parents: 368 diff changeset	244 @Override
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	245 public void windowOpened(WindowEvent e) { /* nop */ }
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	246 @Override
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	247 public void windowClosed(WindowEvent e) { /* nop */ }
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	248 @Override
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	249 public void windowIconified(WindowEvent e) { /* nop */ }
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	250 @Override
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	251 public void windowDeiconified(WindowEvent e) { /* nop */ }
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	252 @Override
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	253 public void windowActivated(WindowEvent e) { /* nop */ }
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	254 @Override
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	255 public void windowDeactivated(WindowEvent e) { /* nop */ }
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	256
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	257 public static String ver() {
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	258 final InputStream mfStream = Viewer.class.getClassLoader().getResourceAsStream(
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	259 "META-INF/MANIFEST.MF");
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	260 if (null == mfStream) {
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	261 System.out.println("No Manifest file found.");
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	262 return "-1";
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	263 }
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	264 try {
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	265 Manifest mf = new Manifest();
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	266 mf.read(mfStream);
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	267 Attributes atts = mf.getMainAttributes();
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	268 return atts.getValue(Attributes.Name.IMPLEMENTATION_VERSION);
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	269 } catch (IOException e) {
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	270 return "-2";
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	271 }
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	272 }
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	273
59 433c79184c05 merge version2.7.2 Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 57 55 diff changeset	274
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	275 public void setSocket(Socket soc) {
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	276 connectionParams.setConnectionParam(soc.getInetAddress().getHostAddress(),soc.getPort());
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	277 }
59 433c79184c05 merge version2.7.2 Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 57 55 diff changeset	278
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	279 public void setOpenPort(int parseInt) {
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	280 }
59 433c79184c05 merge version2.7.2 Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 57 55 diff changeset	281
328 1a2ab6bd5ba3 add function lost child node, remove deadChild nodeList. oc parents: 327 diff changeset	282 public void setTerminationType(boolean b) {
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	283 myRfb.setTerminationType(b);
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	284 }
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	285
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	286 /**
174 2e1530139169 reorganization Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 159 diff changeset	287 * Start client with new parent (including reconnection)
2e1530139169 reorganization Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 159 diff changeset	288 * @param port
2e1530139169 reorganization Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 159 diff changeset	289 * @param hostname
2e1530139169 reorganization Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 159 diff changeset	290 * @throws IOException
2e1530139169 reorganization Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 159 diff changeset	291 */
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	292 @Override
334 dff2f92ae3ff change lost left/right child to lost child. oc parents: 328 diff changeset	293 public void connectToParenet(int port, String hostname) throws IOException {
328 1a2ab6bd5ba3 add function lost child node, remove deadChild nodeList. oc parents: 327 diff changeset	294 setTerminationType(false);
174 2e1530139169 reorganization Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 159 diff changeset	295 closeApp();
179 c1b91dd27a13 on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 178 diff changeset	296 connectionParams.setConnectionParam(hostname, port);
174 2e1530139169 reorganization Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 159 diff changeset	297 run();
2e1530139169 reorganization Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 159 diff changeset	298 }
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	299
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	300 public void setIsTreeVNC(boolean flag) {
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	301 isTreeVNC = flag;
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	302 }
65 ffd7537cebfc cuiversion Taninari YU <you@cr.ie.u-ryukyu.ac.jp> parents: 61 diff changeset	303
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	304 public TreeRFBProto getRfb() {
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	305 return myRfb;
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	306 }
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	307
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	308 public boolean getCuiVersion() {
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	309 return myRfb.getCuiVersion();
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	310 }
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	311 public void setCuiVersion(boolean flag) {
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	312 myRfb.setCuiVersion(flag);
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	313 }
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	314
377 877008c86e85 Add direct option innparusu parents: 375 diff changeset	315 public void setVncport(int vncport) {
877008c86e85 Add direct option innparusu parents: 375 diff changeset	316 this.vncport = vncport;
877008c86e85 Add direct option innparusu parents: 375 diff changeset	317 }
877008c86e85 Add direct option innparusu parents: 375 diff changeset	318
175 e1aa06b0d2ff on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 174 diff changeset	319 /**
e1aa06b0d2ff on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 174 diff changeset	320 * start new VNC server receiver with
e1aa06b0d2ff on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 174 diff changeset	321 * inherited clients
e1aa06b0d2ff on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 174 diff changeset	322 * @param hostName
369 2d01ec1c02d2 Fix ReConnectingFlag innparusu parents: 368 diff changeset	323 * @param newVNCServerId
428 f6a828dd37b0 Change timing for setting share screen info Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 427 diff changeset	324 * @param x
f6a828dd37b0 Change timing for setting share screen info Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 427 diff changeset	325 * @param y
f6a828dd37b0 Change timing for setting share screen info Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 427 diff changeset	326 * @param width
f6a828dd37b0 Change timing for setting share screen info Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 427 diff changeset	327 * @param height
f6a828dd37b0 Change timing for setting share screen info Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 427 diff changeset	328 * @param scale
175 e1aa06b0d2ff on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 174 diff changeset	329 */
176 fa6cfb85444e on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 175 diff changeset	330 @Override
428 f6a828dd37b0 Change timing for setting share screen info Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 427 diff changeset	331 public void inhelitClients(String hostName, short newVNCServerId, int x, int y, int width, int height, int scale) {
f6a828dd37b0 Change timing for setting share screen info Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 427 diff changeset	332 final ConnectionPresenter connectionPresenter = createNewConnectionPresenter(hostName, newVNCServerId, x, y, width, height, scale);
383 7d55adebcacb impliment changeDirectConnectedWithSocket kkb parents: 379 diff changeset	333 isApplet = true;
7d55adebcacb impliment changeDirectConnectedWithSocket kkb parents: 379 diff changeset	334 this.setNoConnection(false);
7d55adebcacb impliment changeDirectConnectedWithSocket kkb parents: 379 diff changeset	335 final Viewer v = this;
7d55adebcacb impliment changeDirectConnectedWithSocket kkb parents: 379 diff changeset	336 new Thread(new Runnable() {
7d55adebcacb impliment changeDirectConnectedWithSocket kkb parents: 379 diff changeset	337 @Override
7d55adebcacb impliment changeDirectConnectedWithSocket kkb parents: 379 diff changeset	338 public void run() {
395 704ac9e79e25 Call startVNCConnectionWithSocket for directedServerChangeReqeust innparusu parents: 383 diff changeset	339 connectionPresenter.startVNCConnection(v, false, null, null);
383 7d55adebcacb impliment changeDirectConnectedWithSocket kkb parents: 379 diff changeset	340 }
7d55adebcacb impliment changeDirectConnectedWithSocket kkb parents: 379 diff changeset	341 }, "ServerChangeThread").start();
7d55adebcacb impliment changeDirectConnectedWithSocket kkb parents: 379 diff changeset	342 }
7d55adebcacb impliment changeDirectConnectedWithSocket kkb parents: 379 diff changeset	343
428 f6a828dd37b0 Change timing for setting share screen info Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 427 diff changeset	344 public void changeToDirectConnectedServer(String hostName, Reader is, Writer os, int x, int y, int width, int height, int scale) {
f6a828dd37b0 Change timing for setting share screen info Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 427 diff changeset	345 final ConnectionPresenter connectionPresenter = createNewConnectionPresenter(hostName, (short) -1, x, y, width, height, scale);
395 704ac9e79e25 Call startVNCConnectionWithSocket for directedServerChangeReqeust innparusu parents: 383 diff changeset	346 connectionPresenter.startVNCConnection(this, true, is, os);
441 cee43ceac9b3 send thatscreen position INIT_DATA one parents: 428 diff changeset	347 }
383 7d55adebcacb impliment changeDirectConnectedWithSocket kkb parents: 379 diff changeset	348
428 f6a828dd37b0 Change timing for setting share screen info Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 427 diff changeset	349 private ConnectionPresenter createNewConnectionPresenter(String hostName, short newVNCServerId, int x, int y, int width, int height, int scale) {
368 b60780e1fafc Add ServerChangeThread to inhelitClients method Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 366 diff changeset	350 final boolean hasJsch = checkJsch();
b60780e1fafc Add ServerChangeThread to inhelitClients method Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 366 diff changeset	351 final boolean allowInteractive = allowAppletInteractiveConnections \|\| ! isApplet;
b60780e1fafc Add ServerChangeThread to inhelitClients method Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 366 diff changeset	352 final ConnectionPresenter connectionPresenter = new ConnectionPresenter(hasJsch, allowInteractive);
b60780e1fafc Add ServerChangeThread to inhelitClients method Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 366 diff changeset	353 connectionPresenter.setNoConnection(noConnection);
b60780e1fafc Add ServerChangeThread to inhelitClients method Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 366 diff changeset	354 ConnectionParams connectionParams = new ConnectionParams();
179 c1b91dd27a13 on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 178 diff changeset	355 connectionParams.setConnectionParam(hostName, vncport);
368 b60780e1fafc Add ServerChangeThread to inhelitClients method Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 366 diff changeset	356 connectionPresenter.addModel("ConnectionParamsModel", connectionParams);
369 2d01ec1c02d2 Fix ReConnectingFlag innparusu parents: 368 diff changeset	357 connectionPresenter.setConnectionParams(connectionParams);
2d01ec1c02d2 Fix ReConnectingFlag innparusu parents: 368 diff changeset	358 connectionPresenter.setReconnectingId(newVNCServerId);
370 2c61e6d434ff Fix VncConnectionWorkers innparusu parents: 369 diff changeset	359 connectionPresenter.setIsTreeVNC(true);
2c61e6d434ff Fix VncConnectionWorkers innparusu parents: 369 diff changeset	360 connectionPresenter.setNoConnection(false);
428 f6a828dd37b0 Change timing for setting share screen info Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 427 diff changeset	361 connectionPresenter.setX(x);
f6a828dd37b0 Change timing for setting share screen info Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 427 diff changeset	362 connectionPresenter.setY(y);
454 432e2967eaab All screen sharing request information is now in ConnectionPresenter only Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 451 diff changeset	363 connectionPresenter.setSingleWidth(width);
432e2967eaab All screen sharing request information is now in ConnectionPresenter only Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 451 diff changeset	364 connectionPresenter.setSingleHeight(height);
428 f6a828dd37b0 Change timing for setting share screen info Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 427 diff changeset	365 connectionPresenter.setRetinaScale(scale);
460 c6058c4e2a79 remove debug message mir3636 parents: 459 diff changeset	366 // System.out.println("Sarver change accepted from id :" + newVNCServerId);
383 7d55adebcacb impliment changeDirectConnectedWithSocket kkb parents: 379 diff changeset	367 return connectionPresenter;
174 2e1530139169 reorganization Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 159 diff changeset	368 }
2e1530139169 reorganization Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 159 diff changeset	369
343 f1721ec54899 add remoteRootStart oc parents: 334 diff changeset	370 /**
f1721ec54899 add remoteRootStart oc parents: 334 diff changeset	371 * start TreeVNC viewer
f1721ec54899 add remoteRootStart oc parents: 334 diff changeset	372 */
379 ea324e42bc78 Add arguments to startTreeViewer method innparusu parents: 377 diff changeset	373 public void startTreeViewer(String hostName, boolean cui, boolean addSerialNum) {
343 f1721ec54899 add remoteRootStart oc parents: 334 diff changeset	374 TreeRFBProto rfb = new TreeRFBProto(false, this);
f1721ec54899 add remoteRootStart oc parents: 334 diff changeset	375 rfb.setCuiVersion(cui);
379 ea324e42bc78 Add arguments to startTreeViewer method innparusu parents: 377 diff changeset	376 rfb.setAddSerialNum(addSerialNum);
343 f1721ec54899 add remoteRootStart oc parents: 334 diff changeset	377 rfb.setHasViewer(true);
f1721ec54899 add remoteRootStart oc parents: 334 diff changeset	378 rfb.createConnectionAndStart(this);
f1721ec54899 add remoteRootStart oc parents: 334 diff changeset	379 CreateConnectionParam cp = new CreateConnectionParam(rfb);
f1721ec54899 add remoteRootStart oc parents: 334 diff changeset	380 if (hostName!=null) {
f1721ec54899 add remoteRootStart oc parents: 334 diff changeset	381 cp.setHostName(hostName);
f1721ec54899 add remoteRootStart oc parents: 334 diff changeset	382 } else {
f1721ec54899 add remoteRootStart oc parents: 334 diff changeset	383 cp.findTreeVncRoot();
400 845698fd6fb6 Remove synchronized Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 399 diff changeset	384
401 94c520535ef1 Fix selection panel Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 400 diff changeset	385 // selected "Start Display Mode" or "Start as TreeVNC Root" for start selection panel
94c520535ef1 Fix selection panel Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 400 diff changeset	386 if (cp.isDisplayMode() \|\| cp.isRootMode()) {
400 845698fd6fb6 Remove synchronized Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 399 diff changeset	387 myRfb = rfb;
402 73c96a1d4a3a Fix wasteful thread start Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 401 diff changeset	388 myRfb.setIsTreeManager(true);
399 28d67bbfa9f1 Implement SelectionPanel processing Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 395 diff changeset	389 return;
28d67bbfa9f1 Implement SelectionPanel processing Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 395 diff changeset	390 }
343 f1721ec54899 add remoteRootStart oc parents: 334 diff changeset	391 }
f1721ec54899 add remoteRootStart oc parents: 334 diff changeset	392 cp.sendWhereToConnect(this);
f1721ec54899 add remoteRootStart oc parents: 334 diff changeset	393 isTreeVNC = true;
f1721ec54899 add remoteRootStart oc parents: 334 diff changeset	394 myRfb = rfb;
f1721ec54899 add remoteRootStart oc parents: 334 diff changeset	395 settings.setViewOnly(true); // too avoid unnecessary upward traffic
f1721ec54899 add remoteRootStart oc parents: 334 diff changeset	396 rfb.getAcceptThread().waitForShutdown();
f1721ec54899 add remoteRootStart oc parents: 334 diff changeset	397 }
f1721ec54899 add remoteRootStart oc parents: 334 diff changeset	398
455 6f3d3da40940 fix cui and hasViewer flag Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 454 diff changeset	399 public void proxyStart(String[] argv, String hostName, int width, int height, boolean showTree, boolean checkDelay, boolean addSerialNum, boolean fixingSize, boolean filterSingleDisplay, boolean hasViewer) {
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	400 fbWidth = width;
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	401 this.showTree = showTree;
175 e1aa06b0d2ff on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 174 diff changeset	402 Parser parser = new Parser();
e1aa06b0d2ff on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 174 diff changeset	403 ParametersHandler.completeParserOptions(parser);
e1aa06b0d2ff on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 174 diff changeset	404 if (fbWidth == 0)
e1aa06b0d2ff on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 174 diff changeset	405 parser.parse(argv);
e1aa06b0d2ff on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 174 diff changeset	406 if (parser.isSet(ParametersHandler.ARG_HELP)) {
e1aa06b0d2ff on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 174 diff changeset	407 printUsage(parser.optionsUsage());
e1aa06b0d2ff on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 174 diff changeset	408 System.exit(0);
e1aa06b0d2ff on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 174 diff changeset	409 }
402 73c96a1d4a3a Fix wasteful thread start Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 401 diff changeset	410
73c96a1d4a3a Fix wasteful thread start Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 401 diff changeset	411 // myRfb is null if use command line option "-d" "-p"
73c96a1d4a3a Fix wasteful thread start Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 401 diff changeset	412 // myRfb not null if use start panel
73c96a1d4a3a Fix wasteful thread start Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 401 diff changeset	413 if (myRfb == null) {
73c96a1d4a3a Fix wasteful thread start Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 401 diff changeset	414 myRfb = new TreeRFBProto(true, this);
73c96a1d4a3a Fix wasteful thread start Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 401 diff changeset	415 }
455 6f3d3da40940 fix cui and hasViewer flag Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 454 diff changeset	416 myRfb.setCuiVersion(!hasViewer);
6f3d3da40940 fix cui and hasViewer flag Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 454 diff changeset	417 myRfb.setHasViewer(hasViewer);
402 73c96a1d4a3a Fix wasteful thread start Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 401 diff changeset	418 myRfb.setShowTree(showTree);
73c96a1d4a3a Fix wasteful thread start Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 401 diff changeset	419 myRfb.setCheckDelay(checkDelay);
73c96a1d4a3a Fix wasteful thread start Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 401 diff changeset	420 myRfb.setAddSerialNum(addSerialNum);
73c96a1d4a3a Fix wasteful thread start Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 401 diff changeset	421 myRfb.setFixingSize(fixingSize);
266 17eb729d64be fix --fixingSize option correspondence -p option. oc parents: 257 diff changeset	422 if(fixingSize) {
402 73c96a1d4a3a Fix wasteful thread start Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 401 diff changeset	423 myRfb.fixingSizeWidth = fixingSizeWidth;
73c96a1d4a3a Fix wasteful thread start Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 401 diff changeset	424 myRfb.fixingSizeHeight = fixingSizeHeight;
266 17eb729d64be fix --fixingSize option correspondence -p option. oc parents: 257 diff changeset	425 }
402 73c96a1d4a3a Fix wasteful thread start Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 401 diff changeset	426 if (myRfb.getAcceptThread() == null) {
73c96a1d4a3a Fix wasteful thread start Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 401 diff changeset	427 myRfb.createConnectionAndStart(this);
73c96a1d4a3a Fix wasteful thread start Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 401 diff changeset	428 } else {
73c96a1d4a3a Fix wasteful thread start Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 401 diff changeset	429 myRfb.startTreeRootFindThread();
73c96a1d4a3a Fix wasteful thread start Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 401 diff changeset	430 }
179 c1b91dd27a13 on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 178 diff changeset	431 setIsTreeVNC(true);
377 877008c86e85 Add direct option innparusu parents: 375 diff changeset	432 if (hostName == null) {
877008c86e85 Add direct option innparusu parents: 375 diff changeset	433 hostName = "localhost";
877008c86e85 Add direct option innparusu parents: 375 diff changeset	434 }
877008c86e85 Add direct option innparusu parents: 375 diff changeset	435 connectionParams.setConnectionParam(hostName, vncport);
179 c1b91dd27a13 on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 178 diff changeset	436 isApplet = true;
449 d5bcae14c2cd reuse FrameUpdateRequest for all code Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 448 diff changeset	437 settings.setViewOnly(true); // to avoid unnecessary upward traffic
179 c1b91dd27a13 on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 178 diff changeset	438 run();
c1b91dd27a13 on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 178 diff changeset	439 }
c1b91dd27a13 on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 178 diff changeset	440
207 b31903e5b02d rename myRFBProto oc parents: 206 diff changeset	441 public void initRoot(TreeRFBProto myRfbProto, String hostName) {
179 c1b91dd27a13 on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 178 diff changeset	442 setIsTreeVNC(true);
c1b91dd27a13 on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 178 diff changeset	443 connectionParams.setConnectionParam(hostName, vncport);
c1b91dd27a13 on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 178 diff changeset	444 isApplet = true;
c1b91dd27a13 on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 178 diff changeset	445 myRfbProto.createConnectionAndStart(this);
c1b91dd27a13 on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 178 diff changeset	446 run();
175 e1aa06b0d2ff on going ... Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 174 diff changeset	447 }
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	448
192 aa00e4b2fc27 fix root viewer. oc parents: 188 diff changeset	449 @Override
aa00e4b2fc27 fix root viewer. oc parents: 188 diff changeset	450 public void setVisible(boolean b) {
366 2d83bea06f00 Check connectionPresenter innparusu parents: 363 diff changeset	451 if(connectionPresenter == null) return;
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	452 SwingViewerWindow v = connectionPresenter.getViewer();
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	453 if (v != null)
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	454 v.setVisible(b);
192 aa00e4b2fc27 fix root viewer. oc parents: 188 diff changeset	455 }
188 f176bffcdc4a add showTreeNode option. oc parents: 186 diff changeset	456
224 ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	457 @Override
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	458 public Socket getVNCSocket() {
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	459 return connectionPresenter.getSocket();
ccbc3a951961 fix indent, update mm. oc parents: 220 diff changeset	460 }
202 22676ca0dd97 get VNC Socket. oc parents: 192 diff changeset	461
204 d9d234715853 TreeManager for each interface Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 203 diff changeset	462 @Override
d9d234715853 TreeManager for each interface Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 203 diff changeset	463 public boolean getShowTree() {
d9d234715853 TreeManager for each interface Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 203 diff changeset	464 return showTree;
d9d234715853 TreeManager for each interface Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 203 diff changeset	465 }
d9d234715853 TreeManager for each interface Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 203 diff changeset	466
225 5e3594021e79 fix --width --height mode. oc parents: 224 diff changeset	467 @Override
5e3594021e79 fix --width --height mode. oc parents: 224 diff changeset	468 public void setWidth(int w) {
5e3594021e79 fix --width --height mode. oc parents: 224 diff changeset	469 width = w;
5e3594021e79 fix --width --height mode. oc parents: 224 diff changeset	470 }
5e3594021e79 fix --width --height mode. oc parents: 224 diff changeset	471
5e3594021e79 fix --width --height mode. oc parents: 224 diff changeset	472 @Override
5e3594021e79 fix --width --height mode. oc parents: 224 diff changeset	473 public void setHeight(int h) {
5e3594021e79 fix --width --height mode. oc parents: 224 diff changeset	474 height = h;
5e3594021e79 fix --width --height mode. oc parents: 224 diff changeset	475 }
5e3594021e79 fix --width --height mode. oc parents: 224 diff changeset	476
257 11b59b223222 add function of fixing display size oc parents: 256 diff changeset	477 @Override
11b59b223222 add function of fixing display size oc parents: 256 diff changeset	478 public void setFixingSize(int width, int height) {
11b59b223222 add function of fixing display size oc parents: 256 diff changeset	479 this.fixingSizeWidth = width;
11b59b223222 add function of fixing display size oc parents: 256 diff changeset	480 this.fixingSizeHeight = height;
11b59b223222 add function of fixing display size oc parents: 256 diff changeset	481 }
301 ae7deb002b5f send and receive single display size oc parents: 300 diff changeset	482
ae7deb002b5f send and receive single display size oc parents: 300 diff changeset	483 @Override
458 4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	484 public ArrayList<FbRectangle> getScreenRectangles() {
314 e95cb9a3dd9b change code, delete firstTime. oc parents: 306 diff changeset	485 // New screen server has one or more screens.
e95cb9a3dd9b change code, delete firstTime. oc parents: 306 diff changeset	486 // Screens are numbered in the order from left.
e95cb9a3dd9b change code, delete firstTime. oc parents: 306 diff changeset	487 // put screens in an ArrayList.
301 ae7deb002b5f send and receive single display size oc parents: 300 diff changeset	488 ArrayList<Rectangle> rectangles = new ArrayList<Rectangle>();
ae7deb002b5f send and receive single display size oc parents: 300 diff changeset	489 GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
ae7deb002b5f send and receive single display size oc parents: 300 diff changeset	490 GraphicsDevice[] gs = ge.getScreenDevices();
417 c225c7963778 Send screen position Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 402 diff changeset	491
314 e95cb9a3dd9b change code, delete firstTime. oc parents: 306 diff changeset	492 for (GraphicsDevice gd : gs) {
456 34277b436cac Using retina scale to share screnn if minus postion Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 455 diff changeset	493 int screenNumber = 0;
314 e95cb9a3dd9b change code, delete firstTime. oc parents: 306 diff changeset	494 for (GraphicsConfiguration r : gd.getConfigurations()) {
448 344a35b7c47f send both frame buffer size and selected screen size in Disktop size change (INIT_DATA) Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 441 diff changeset	495 Rectangle rect = r.getBounds();
456 34277b436cac Using retina scale to share screnn if minus postion Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 455 diff changeset	496 //System.out.println("screen "+ screenNumber +":"+rect);
448 344a35b7c47f send both frame buffer size and selected screen size in Disktop size change (INIT_DATA) Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 441 diff changeset	497 rectangles.add(rect);
456 34277b436cac Using retina scale to share screnn if minus postion Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 455 diff changeset	498 screenNumber++;
301 ae7deb002b5f send and receive single display size oc parents: 300 diff changeset	499 }
ae7deb002b5f send and receive single display size oc parents: 300 diff changeset	500 }
458 4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	501 Point offset = getScreenOffset(rectangles);
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	502 ArrayList<FbRectangle> fbRectangles = new ArrayList<FbRectangle>();
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	503 int screenNumber = 0;
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	504 for (Rectangle rect : rectangles) {
461 b7d43b12651c fix getFbRectangles x may have minus value now, but xFb is always plus kono parents: 460 diff changeset	505 FbRectangle fbrect = new FbRectangle(rect.x, rect.y, rect.width, rect.height, screenNumber, retinaScale(screenNumber));
b7d43b12651c fix getFbRectangles x may have minus value now, but xFb is always plus kono parents: 460 diff changeset	506 fbrect.setXfb(rect.x + offset.x);
b7d43b12651c fix getFbRectangles x may have minus value now, but xFb is always plus kono parents: 460 diff changeset	507 fbrect.setXfb(rect.y + offset.y);
b7d43b12651c fix getFbRectangles x may have minus value now, but xFb is always plus kono parents: 460 diff changeset	508 fbRectangles.add(fbrect);
458 4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	509 screenNumber++;
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	510 }
459 9f5cd8ca0ebc Without retina scale to calcoffset one parents: 458 diff changeset	511
458 4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	512 fbRectangles.sort(new Comparator<FbRectangle>() {
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	513 @Override
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	514 public int compare(FbRectangle t0, FbRectangle t1) {
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	515 return t0.getX() < t1.getX() ? -1 : t0.getX() == t1.getX() ? 0 : 1;
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	516 }
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	517 });
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	518
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	519 int retinaOffsetX = 0;
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	520 FbRectangle fbRectanglesPrev = fbRectangles.get(0);
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	521 for (int i = 1; i < fbRectangles.size(); i++) {
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	522 FbRectangle fbRect = fbRectangles.get(i);
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	523 if (fbRectanglesPrev.getRetinaScale() != 1) {
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	524 if (fbRectanglesPrev.getX() + fbRectanglesPrev.getWidth() + 1 == fbRect.getX() &&
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	525 (fbRectanglesPrev.getY() >= fbRect.getY() && fbRectanglesPrev.getY() <= fbRectanglesPrev.getY() + fbRectanglesPrev.getHeight()) \|\|
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	526 fbRectanglesPrev.getY() > fbRect.getY() + fbRect.getHeight() && fbRectanglesPrev.getY() + fbRectanglesPrev.getHeight() < fbRectanglesPrev.getY() + fbRectanglesPrev.getHeight()) {
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	527 // previous screen is touch with this screen, fix retina scale offset
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	528 retinaOffsetX += fbRectanglesPrev.getWidth() * (fbRectanglesPrev.retinaScale - 1);
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	529 }
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	530 }
461 b7d43b12651c fix getFbRectangles x may have minus value now, but xFb is always plus kono parents: 460 diff changeset	531 fbRect.setXfb((int) (fbRect.getXfb() + retinaOffsetX));
458 4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	532 fbRectanglesPrev = fbRect;
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	533 }
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	534
459 9f5cd8ca0ebc Without retina scale to calcoffset one parents: 458 diff changeset	535 fbRectangles.sort(new Comparator<FbRectangle>() {
9f5cd8ca0ebc Without retina scale to calcoffset one parents: 458 diff changeset	536 @Override
9f5cd8ca0ebc Without retina scale to calcoffset one parents: 458 diff changeset	537 public int compare(FbRectangle t0, FbRectangle t1) {
9f5cd8ca0ebc Without retina scale to calcoffset one parents: 458 diff changeset	538 return t0.getY() < t1.getY() ? -1 : t0.getY() == t1.getY() ? 0 : 1;
9f5cd8ca0ebc Without retina scale to calcoffset one parents: 458 diff changeset	539 }
9f5cd8ca0ebc Without retina scale to calcoffset one parents: 458 diff changeset	540 });
9f5cd8ca0ebc Without retina scale to calcoffset one parents: 458 diff changeset	541
458 4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	542 int retinaOffsetY = 0;
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	543 fbRectanglesPrev = fbRectangles.get(0);
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	544 for (int i = 1; i < fbRectangles.size(); i++) {
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	545 FbRectangle fbRect = fbRectangles.get(i);
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	546 if (fbRectanglesPrev.getRetinaScale() != 1) {
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	547 if (fbRectanglesPrev.getY() + fbRectanglesPrev.getHeight() + 1 == fbRect.getY() &&
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	548 (fbRectanglesPrev.getX() >= fbRect.getX() && fbRectanglesPrev.getX() <= fbRectanglesPrev.getX() + fbRectanglesPrev.getWidth()) \|\|
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	549 fbRectanglesPrev.getX() > fbRect.getX() + fbRect.getWidth() && fbRectanglesPrev.getX() + fbRectanglesPrev.getWidth() < fbRectanglesPrev.getX() + fbRectanglesPrev.getWidth()) {
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	550 // previous screen is touch with this screen, fix retina scale offset
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	551 retinaOffsetY += fbRectanglesPrev.getHeight() * (fbRectanglesPrev.retinaScale - 1);
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	552 }
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	553 }
461 b7d43b12651c fix getFbRectangles x may have minus value now, but xFb is always plus kono parents: 460 diff changeset	554 fbRect.setYfb((int) (fbRect.getYfb() + retinaOffsetY));
458 4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	555 fbRectanglesPrev = fbRect;
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	556 }
4ea47640942a intoroduce retina scaled frame buffer postion innparusu parents: 457 diff changeset	557 return fbRectangles;
301 ae7deb002b5f send and receive single display size oc parents: 300 diff changeset	558 }
ae7deb002b5f send and receive single display size oc parents: 300 diff changeset	559
448 344a35b7c47f send both frame buffer size and selected screen size in Disktop size change (INIT_DATA) Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 441 diff changeset	560 public Point getScreenOffset(ArrayList<Rectangle> rectangles) {
451 65ffb64cfb51 try to fix scroll y in fitScreen Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 449 diff changeset	561 // position of screen may negative, but RFBscreen position is always positive
448 344a35b7c47f send both frame buffer size and selected screen size in Disktop size change (INIT_DATA) Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 441 diff changeset	562 // compute offset to make them positive
344a35b7c47f send both frame buffer size and selected screen size in Disktop size change (INIT_DATA) Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 441 diff changeset	563 int offsetx = 0;
344a35b7c47f send both frame buffer size and selected screen size in Disktop size change (INIT_DATA) Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 441 diff changeset	564 int offsety = 0;
344a35b7c47f send both frame buffer size and selected screen size in Disktop size change (INIT_DATA) Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 441 diff changeset	565 for (Rectangle rect : rectangles) {
459 9f5cd8ca0ebc Without retina scale to calcoffset one parents: 458 diff changeset	566 if (rect.x < offsetx) offsetx = rect.x;
9f5cd8ca0ebc Without retina scale to calcoffset one parents: 458 diff changeset	567 if (rect.y < offsety) offsety = rect.y;
448 344a35b7c47f send both frame buffer size and selected screen size in Disktop size change (INIT_DATA) Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 441 diff changeset	568 }
344a35b7c47f send both frame buffer size and selected screen size in Disktop size change (INIT_DATA) Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 441 diff changeset	569 return new Point(-offsetx,-offsety);
344a35b7c47f send both frame buffer size and selected screen size in Disktop size change (INIT_DATA) Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 441 diff changeset	570 }
344a35b7c47f send both frame buffer size and selected screen size in Disktop size change (INIT_DATA) Shinji KONO <kono@ie.u-ryukyu.ac.jp> parents: 441 diff changeset	571
456 34277b436cac Using retina scale to share screnn if minus postion Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 455 diff changeset	572 public int retinaScale(int shareScreenNumber) {
34277b436cac Using retina scale to share screnn if minus postion Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 455 diff changeset	573 int scale = 1;
34277b436cac Using retina scale to share screnn if minus postion Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 455 diff changeset	574 GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment();
34277b436cac Using retina scale to share screnn if minus postion Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 455 diff changeset	575 final GraphicsDevice[] devices = env.getScreenDevices();
34277b436cac Using retina scale to share screnn if minus postion Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 455 diff changeset	576
34277b436cac Using retina scale to share screnn if minus postion Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 455 diff changeset	577 try {
34277b436cac Using retina scale to share screnn if minus postion Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 455 diff changeset	578 Field field = devices[shareScreenNumber].getClass().getDeclaredField("scale");
34277b436cac Using retina scale to share screnn if minus postion Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 455 diff changeset	579
34277b436cac Using retina scale to share screnn if minus postion Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 455 diff changeset	580 if (field != null) {
34277b436cac Using retina scale to share screnn if minus postion Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 455 diff changeset	581 field.setAccessible(true);
34277b436cac Using retina scale to share screnn if minus postion Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 455 diff changeset	582 Object retinaScale = field.get(devices[shareScreenNumber]);
34277b436cac Using retina scale to share screnn if minus postion Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 455 diff changeset	583
34277b436cac Using retina scale to share screnn if minus postion Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 455 diff changeset	584 if (retinaScale instanceof Integer) {
34277b436cac Using retina scale to share screnn if minus postion Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 455 diff changeset	585 scale = (Integer) retinaScale;
34277b436cac Using retina scale to share screnn if minus postion Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 455 diff changeset	586 return scale;
34277b436cac Using retina scale to share screnn if minus postion Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 455 diff changeset	587 }
34277b436cac Using retina scale to share screnn if minus postion Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 455 diff changeset	588 }
34277b436cac Using retina scale to share screnn if minus postion Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 455 diff changeset	589 } catch (Exception ignore) {}
34277b436cac Using retina scale to share screnn if minus postion Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 455 diff changeset	590 return scale;
34277b436cac Using retina scale to share screnn if minus postion Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> parents: 455 diff changeset	591 }
363 bc5624e3e9c5 Add newVNCConnection method to Viewer innparusu parents: 345 diff changeset	592
317 3c63bc88383e always fit screen, -d mode. oc parents: 314 diff changeset	593 @Override
3c63bc88383e always fit screen, -d mode. oc parents: 314 diff changeset	594 public void setFitScreen() {
3c63bc88383e always fit screen, -d mode. oc parents: 314 diff changeset	595 SwingViewerWindow v = connectionPresenter.getViewer();
3c63bc88383e always fit screen, -d mode. oc parents: 314 diff changeset	596 if (v != null) {
441 cee43ceac9b3 send thatscreen position INIT_DATA one parents: 428 diff changeset	597 v.fitScreen();
317 3c63bc88383e always fit screen, -d mode. oc parents: 314 diff changeset	598 }
3c63bc88383e always fit screen, -d mode. oc parents: 314 diff changeset	599 }
3c63bc88383e always fit screen, -d mode. oc parents: 314 diff changeset	600
0 4689cc86d6cb create TreeViewer2 Repository Yu Taninari <you@cr.ie.u-ryukyu.ac.jp> parents: diff changeset	601 }

Mercurial > hg > Members > riono > TreeVNC_ja_comment

annotate src/viewer_swing/java/com/glavsoft/viewer/Viewer.java @ 461:b7d43b12651c