Mercurial > hg > Members > riono > TreeVNC_ja_comment
changeset 428:f6a828dd37b0
Change timing for setting share screen info
| author | Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Mon, 01 Feb 2016 05:57:18 +0900 |
| parents | ed15f0bd8dfa |
| children | e16fb899620f |
| files | .idea/workspace.xml src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java src/viewer_swing/java/com/glavsoft/viewer/Viewer.java src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java |
| diffstat | 6 files changed, 301 insertions(+), 157 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Mon Feb 01 04:39:53 2016 +0900 +++ b/.idea/workspace.xml Mon Feb 01 05:57:18 2016 +0900 @@ -3,14 +3,11 @@ <component name="ChangeListManager"> <list default="true" id="0a04b9e3-21eb-43ee-b441-59e664eecd89" name="Default" comment="settingsChanged"> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> </list> <ignored path="TreeVNC.iws" /> <ignored path=".idea/workspace.xml" /> @@ -131,18 +128,38 @@ </provider> </entry> </file> - <file leaf-file-name="ConnectionPresenter.java" pinned="false" current-in-tab="false"> + <file leaf-file-name="ConnectionPresenter.java" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-161.11111"> - <caret line="385" column="0" selection-start-line="385" selection-start-column="0" selection-end-line="385" selection-end-column="0" /> + <state vertical-scroll-proportion="0.2271605"> + <caret line="384" column="5" selection-start-line="384" selection-start-column="5" selection-end-line="384" selection-end-column="5" /> <folding> - <element signature="e#0#14863#0" expanded="true" /> + <element signature="e#0#15751#0" expanded="true" /> <element signature="imports" expanded="true" /> - <element signature="e#3215#3216#0" expanded="true" /> - <element signature="e#3252#3253#0" expanded="true" /> - <element signature="e#3311#3312#0" expanded="true" /> - <element signature="e#3363#3364#0" expanded="true" /> + <element signature="e#3351#3352#0" expanded="true" /> + <element signature="e#3388#3389#0" expanded="true" /> + <element signature="e#3447#3448#0" expanded="true" /> + <element signature="e#3499#3500#0" expanded="true" /> + <element signature="e#13641#13642#0" expanded="true" /> + <element signature="e#13693#13694#0" expanded="true" /> + <element signature="e#13752#13753#0" expanded="true" /> + <element signature="e#13806#13807#0" expanded="true" /> + <element signature="e#13857#13858#0" expanded="true" /> + <element signature="e#13903#13904#0" expanded="true" /> + <element signature="e#13934#13935#0" expanded="true" /> + <element signature="e#13960#13961#0" expanded="true" /> + <element signature="e#13991#13992#0" expanded="true" /> + <element signature="e#14017#14018#0" expanded="true" /> + <element signature="e#14055#14056#0" expanded="true" /> + <element signature="e#14092#14093#0" expanded="true" /> + <element signature="e#14131#14132#0" expanded="true" /> + <element signature="e#14169#14170#0" expanded="true" /> + <element signature="e#14204#14205#0" expanded="true" /> + <element signature="e#14238#14239#0" expanded="true" /> + <element signature="e#14263#14264#0" expanded="true" /> + <element signature="e#14287#14288#0" expanded="true" /> + <element signature="e#14312#14313#0" expanded="true" /> + <element signature="e#14336#14337#0" expanded="true" /> </folding> </state> </provider> @@ -151,20 +168,21 @@ <file leaf-file-name="Viewer.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-13.962963"> - <caret line="76" column="32" selection-start-line="76" selection-start-column="32" selection-end-line="76" selection-end-column="32" /> + <state vertical-scroll-proportion="0.0"> + <caret line="339" column="113" selection-start-line="339" selection-start-column="113" selection-end-line="339" selection-end-column="113" /> <folding> - <element signature="e#0#16960#0" expanded="true" /> + <element signature="e#0#17368#0" expanded="true" /> <element signature="imports" expanded="true" /> + <element signature="e#1732#1759#0" expanded="true" /> </folding> </state> </provider> </entry> </file> - <file leaf-file-name="SwingViewerWindow.java" pinned="false" current-in-tab="true"> + <file leaf-file-name="SwingViewerWindow.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.17077799"> + <state vertical-scroll-proportion="-28.333334"> <caret line="916" column="0" selection-start-line="916" selection-start-column="0" selection-end-line="916" selection-end-column="0" /> <folding /> </state> @@ -205,7 +223,7 @@ <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="201" column="12" selection-start-line="201" selection-start-column="12" selection-end-line="201" selection-end-column="12" /> + <caret line="54" column="56" selection-start-line="54" selection-start-column="56" selection-end-line="54" selection-end-column="56" /> <folding /> </state> </provider> @@ -214,18 +232,72 @@ <file leaf-file-name="TreeRFBProto.java" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.5673624"> - <caret line="227" column="60" selection-start-line="227" selection-start-column="60" selection-end-line="227" selection-end-column="60" /> + <state vertical-scroll-proportion="0.962963"> + <caret line="180" column="32" selection-start-line="180" selection-start-column="32" selection-end-line="180" selection-end-column="32" /> <folding> <element signature="imports" expanded="true" /> - <element signature="e#16951#16952#0" expanded="true" /> - <element signature="e#16992#16993#0" expanded="true" /> - <element signature="e#28183#28195#0" expanded="true" /> + <element signature="e#16946#16947#0" expanded="true" /> + <element signature="e#16987#16988#0" expanded="true" /> + <element signature="e#18487#18488#0" expanded="true" /> + <element signature="e#18513#18514#0" expanded="true" /> + <element signature="e#28178#28190#0" expanded="true" /> + <element signature="e#33390#33391#0" expanded="true" /> + <element signature="e#33425#33426#0" expanded="true" /> + <element signature="e#33508#33509#0" expanded="true" /> + <element signature="e#33550#33551#0" expanded="true" /> + <element signature="e#33607#33608#0" expanded="true" /> + <element signature="e#33632#33633#0" expanded="true" /> + <element signature="e#33666#33667#0" expanded="true" /> + <element signature="e#33698#33699#0" expanded="true" /> + <element signature="e#33741#33742#0" expanded="true" /> + <element signature="e#33770#33771#0" expanded="true" /> + <element signature="e#33819#33820#0" expanded="true" /> + <element signature="e#33863#33864#0" expanded="true" /> + <element signature="e#33916#33917#0" expanded="true" /> + <element signature="e#33960#33961#0" expanded="true" /> + <element signature="e#34017#34018#0" expanded="true" /> + <element signature="e#34065#34066#0" expanded="true" /> + <element signature="e#34523#34524#0" expanded="true" /> + <element signature="e#34567#34568#0" expanded="true" /> + <element signature="e#34638#34639#0" expanded="true" /> + <element signature="e#34700#34701#0" expanded="true" /> + <element signature="e#35295#35296#0" expanded="true" /> + <element signature="e#35319#35320#0" expanded="true" /> + <element signature="e#35344#35345#0" expanded="true" /> + <element signature="e#35368#35369#0" expanded="true" /> + <element signature="e#35403#35404#0" expanded="true" /> + <element signature="e#35437#35438#0" expanded="true" /> + <element signature="e#35473#35474#0" expanded="true" /> + <element signature="e#35508#35509#0" expanded="true" /> + <element signature="e#35543#35544#0" expanded="true" /> + <element signature="e#35577#35578#0" expanded="true" /> + <element signature="e#35612#35613#0" expanded="true" /> + <element signature="e#35643#35644#0" expanded="true" /> </folding> </state> </provider> </entry> </file> + <file leaf-file-name="CuiViewer.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="42" column="22" selection-start-line="42" selection-start-column="22" selection-end-line="42" selection-end-column="22" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ViewerInterface.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="57" column="126" selection-start-line="57" selection-start-column="126" selection-end-line="57" selection-end-column="126" /> + <folding /> + </state> + </provider> + </entry> + </file> <file leaf-file-name="ScreenChangeRequest.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java"> <provider selected="true" editor-type-id="text-editor"> @@ -246,16 +318,6 @@ </provider> </entry> </file> - <file leaf-file-name="CuiViewer.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="176" column="60" selection-start-line="176" selection-start-column="60" selection-end-line="176" selection-end-column="60" /> - <folding /> - </state> - </provider> - </entry> - </file> <file leaf-file-name="SwingNetworkConnectionWorker.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingNetworkConnectionWorker.java"> <provider selected="true" editor-type-id="text-editor"> @@ -269,8 +331,8 @@ <file leaf-file-name="SwingRfbConnectionWorker.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-8.222222"> - <caret line="165" column="17" selection-start-line="165" selection-start-column="17" selection-end-line="165" selection-end-column="17" /> + <state vertical-scroll-proportion="-7.111111"> + <caret line="166" column="21" selection-start-line="166" selection-start-column="21" selection-end-line="166" selection-end-column="21" /> <folding /> </state> </provider> @@ -590,7 +652,6 @@ <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/RfbConnectionWorker.java" /> - <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/FramebufferUpdateRectangle.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java" /> @@ -613,15 +674,16 @@ <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/transport/Writer.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java" /> - <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java" /> + <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java" /> + <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" /> + <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java" /> - <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> - <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> + <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> - <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java" /> </list> </option> </component> @@ -1386,7 +1448,7 @@ </component> <component name="ToolWindowManager"> <frame x="3" y="23" width="1920" height="1177" extended-state="6" /> - <editor active="false" /> + <editor active="true" /> <layout> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> @@ -1395,11 +1457,12 @@ <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> - <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4621072" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22550832" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32988676" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19270833" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15729167" sideWeight="0.49499285" order="2" side_tool="false" content_ui="combo" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32902032" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> @@ -1414,7 +1477,6 @@ <window_info id="Documentation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" x="2020" y="181" width="1720" height="977" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.123173274" sideWeight="0.50500715" order="7" side_tool="true" content_ui="tabs" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32902032" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> </layout> <layout-to-restore> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> @@ -1468,7 +1530,7 @@ <breakpoints> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> - <line>503</line> + <line>508</line> <properties /> <option name="timeStamp" value="25" /> </line-breakpoint> @@ -1480,13 +1542,13 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> - <line>434</line> + <line>439</line> <properties /> <option name="timeStamp" value="32" /> </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>540</line> + <line>535</line> <properties /> <option name="timeStamp" value="76" /> </line-breakpoint> @@ -1504,7 +1566,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> - <line>256</line> + <line>252</line> <properties /> <option name="timeStamp" value="89" /> </line-breakpoint> @@ -1575,12 +1637,6 @@ <option name="timeStamp" value="185" /> </line-breakpoint> <line-breakpoint type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>981</line> - <properties /> - <option name="timeStamp" value="187" /> - </line-breakpoint> - <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java</url> <line>198</line> <properties /> @@ -1588,7 +1644,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java</url> - <line>168</line> + <line>173</line> <properties /> <option name="timeStamp" value="198" /> </line-breakpoint> @@ -1600,25 +1656,25 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>506</line> + <line>501</line> <properties /> <option name="timeStamp" value="212" /> </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java</url> - <line>110</line> + <line>115</line> <properties /> <option name="timeStamp" value="216" /> </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java</url> - <line>224</line> + <line>229</line> <properties /> <option name="timeStamp" value="252" /> </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java</url> - <line>161</line> + <line>166</line> <properties /> <option name="timeStamp" value="253" /> </line-breakpoint> @@ -1630,13 +1686,13 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>650</line> + <line>645</line> <properties /> <option name="timeStamp" value="264" /> </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> - <line>156</line> + <line>152</line> <properties /> <option name="timeStamp" value="272" /> </line-breakpoint> @@ -1660,7 +1716,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> - <line>485</line> + <line>490</line> <properties /> <option name="timeStamp" value="303" /> </line-breakpoint> @@ -1672,7 +1728,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>532</line> + <line>527</line> <properties /> <option name="timeStamp" value="329" /> </line-breakpoint> @@ -1697,13 +1753,13 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>300</line> + <line>295</line> <properties /> <option name="timeStamp" value="449" /> </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>280</line> + <line>275</line> <properties /> <option name="timeStamp" value="462" /> </line-breakpoint> @@ -1715,17 +1771,11 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>422</line> + <line>417</line> <properties /> <option name="timeStamp" value="470" /> </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>965</line> - <properties /> - <option name="timeStamp" value="487" /> - </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingNetworkConnectionWorker.java</url> <line>174</line> <properties /> @@ -1733,19 +1783,13 @@ </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>837</line> - <properties /> - <option name="timeStamp" value="500" /> - </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>132</line> + <line>127</line> <properties /> <option name="timeStamp" value="509" /> </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java</url> - <line>385</line> + <line>430</line> <properties /> <option name="timeStamp" value="510" /> </line-breakpoint> @@ -2152,18 +2196,42 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ChengeDesktopSize.java"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-28.333334"> + <caret line="916" column="0" selection-start-line="916" selection-start-column="0" selection-end-line="916" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="15" column="25" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" /> + <caret line="26" column="25" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="54" column="56" selection-start-line="54" selection-start-column="56" selection-end-line="54" selection-end-column="56" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-8.222222"> - <caret line="165" column="17" selection-start-line="165" selection-start-column="17" selection-end-line="165" selection-end-column="17" /> + <state vertical-scroll-proportion="-7.111111"> + <caret line="166" column="21" selection-start-line="166" selection-start-column="21" selection-end-line="166" selection-end-column="21" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ChengeDesktopSize.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="15" column="25" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" /> <folding /> </state> </provider> @@ -2179,82 +2247,113 @@ <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="176" column="60" selection-start-line="176" selection-start-column="60" selection-end-line="176" selection-end-column="60" /> + <caret line="42" column="22" selection-start-line="42" selection-start-column="22" selection-end-line="42" selection-end-column="22" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-161.11111"> - <caret line="385" column="0" selection-start-line="385" selection-start-column="0" selection-end-line="385" selection-end-column="0" /> - <folding> - <element signature="e#0#14863#0" expanded="true" /> - <element signature="imports" expanded="true" /> - <element signature="e#3215#3216#0" expanded="true" /> - <element signature="e#3252#3253#0" expanded="true" /> - <element signature="e#3311#3312#0" expanded="true" /> - <element signature="e#3363#3364#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="201" column="12" selection-start-line="201" selection-start-column="12" selection-end-line="201" selection-end-column="12" /> + <caret line="57" column="126" selection-start-line="57" selection-start-column="126" selection-end-line="57" selection-end-column="126" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-13.962963"> - <caret line="76" column="32" selection-start-line="76" selection-start-column="32" selection-end-line="76" selection-end-column="32" /> + <state vertical-scroll-proportion="0.0"> + <caret line="339" column="113" selection-start-line="339" selection-start-column="113" selection-end-line="339" selection-end-column="113" /> <folding> - <element signature="e#0#16960#0" expanded="true" /> + <element signature="e#0#17368#0" expanded="true" /> <element signature="imports" expanded="true" /> + <element signature="e#1732#1759#0" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.33333334"> - <caret line="31" column="16" selection-start-line="31" selection-start-column="16" selection-end-line="31" selection-end-column="16" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="26" column="25" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" /> - <folding /> + <state vertical-scroll-proportion="0.2271605"> + <caret line="384" column="5" selection-start-line="384" selection-start-column="5" selection-end-line="384" selection-end-column="5" /> + <folding> + <element signature="e#0#15751#0" expanded="true" /> + <element signature="imports" expanded="true" /> + <element signature="e#3351#3352#0" expanded="true" /> + <element signature="e#3388#3389#0" expanded="true" /> + <element signature="e#3447#3448#0" expanded="true" /> + <element signature="e#3499#3500#0" expanded="true" /> + <element signature="e#13641#13642#0" expanded="true" /> + <element signature="e#13693#13694#0" expanded="true" /> + <element signature="e#13752#13753#0" expanded="true" /> + <element signature="e#13806#13807#0" expanded="true" /> + <element signature="e#13857#13858#0" expanded="true" /> + <element signature="e#13903#13904#0" expanded="true" /> + <element signature="e#13934#13935#0" expanded="true" /> + <element signature="e#13960#13961#0" expanded="true" /> + <element signature="e#13991#13992#0" expanded="true" /> + <element signature="e#14017#14018#0" expanded="true" /> + <element signature="e#14055#14056#0" expanded="true" /> + <element signature="e#14092#14093#0" expanded="true" /> + <element signature="e#14131#14132#0" expanded="true" /> + <element signature="e#14169#14170#0" expanded="true" /> + <element signature="e#14204#14205#0" expanded="true" /> + <element signature="e#14238#14239#0" expanded="true" /> + <element signature="e#14263#14264#0" expanded="true" /> + <element signature="e#14287#14288#0" expanded="true" /> + <element signature="e#14312#14313#0" expanded="true" /> + <element signature="e#14336#14337#0" expanded="true" /> + </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.5673624"> - <caret line="227" column="60" selection-start-line="227" selection-start-column="60" selection-end-line="227" selection-end-column="60" /> + <state vertical-scroll-proportion="0.962963"> + <caret line="180" column="32" selection-start-line="180" selection-start-column="32" selection-end-line="180" selection-end-column="32" /> <folding> <element signature="imports" expanded="true" /> - <element signature="e#16951#16952#0" expanded="true" /> - <element signature="e#16992#16993#0" expanded="true" /> - <element signature="e#28183#28195#0" expanded="true" /> + <element signature="e#16946#16947#0" expanded="true" /> + <element signature="e#16987#16988#0" expanded="true" /> + <element signature="e#18487#18488#0" expanded="true" /> + <element signature="e#18513#18514#0" expanded="true" /> + <element signature="e#28178#28190#0" expanded="true" /> + <element signature="e#33390#33391#0" expanded="true" /> + <element signature="e#33425#33426#0" expanded="true" /> + <element signature="e#33508#33509#0" expanded="true" /> + <element signature="e#33550#33551#0" expanded="true" /> + <element signature="e#33607#33608#0" expanded="true" /> + <element signature="e#33632#33633#0" expanded="true" /> + <element signature="e#33666#33667#0" expanded="true" /> + <element signature="e#33698#33699#0" expanded="true" /> + <element signature="e#33741#33742#0" expanded="true" /> + <element signature="e#33770#33771#0" expanded="true" /> + <element signature="e#33819#33820#0" expanded="true" /> + <element signature="e#33863#33864#0" expanded="true" /> + <element signature="e#33916#33917#0" expanded="true" /> + <element signature="e#33960#33961#0" expanded="true" /> + <element signature="e#34017#34018#0" expanded="true" /> + <element signature="e#34065#34066#0" expanded="true" /> + <element signature="e#34523#34524#0" expanded="true" /> + <element signature="e#34567#34568#0" expanded="true" /> + <element signature="e#34638#34639#0" expanded="true" /> + <element signature="e#34700#34701#0" expanded="true" /> + <element signature="e#35295#35296#0" expanded="true" /> + <element signature="e#35319#35320#0" expanded="true" /> + <element signature="e#35344#35345#0" expanded="true" /> + <element signature="e#35368#35369#0" expanded="true" /> + <element signature="e#35403#35404#0" expanded="true" /> + <element signature="e#35437#35438#0" expanded="true" /> + <element signature="e#35473#35474#0" expanded="true" /> + <element signature="e#35508#35509#0" expanded="true" /> + <element signature="e#35543#35544#0" expanded="true" /> + <element signature="e#35577#35578#0" expanded="true" /> + <element signature="e#35612#35613#0" expanded="true" /> + <element signature="e#35643#35644#0" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.17077799"> - <caret line="916" column="0" selection-start-line="916" selection-start-column="0" selection-end-line="916" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> </component> <component name="hg4idea.settings"> <option name="CHECK_INCOMING_OUTGOING" value="true" />
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Mon Feb 01 04:39:53 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Mon Feb 01 05:57:18 2016 +0900 @@ -71,17 +71,12 @@ public int frameSizeHeight; public int fixingSizeWidth; public int fixingSizeHeight; - - private int singleWidth = 0; private int singleHeight = 0; private DatagramSocket socket = null; - private byte[] originalInitData = null; private boolean childrenMulticast = true; private int retinaScale = 1; - - private int x; private int y; @@ -826,20 +821,13 @@ */ public void changeVNCServer(ViewerInterface vncProxyService, String hostName, int port, int x, int y, int width, int height, int scale, short newVNCServerId, Reader is, Writer os) throws IOException { - this.x = x; - this.y = y; - this.frameSizeWidth = width; - this.frameSizeHeight = height; - this.singleWidth = frameSizeWidth; - this.singleHeight = frameSizeHeight; - this.retinaScale = scale; if (newVNCServerId == -1) { // change to the tree vnc root on other network. - vncProxyService.changeToDirectConnectedServer(hostName, is, os); + vncProxyService.changeToDirectConnectedServer(hostName, is, os, x, y, width, height, scale); return; } // serverChangeの処理 - vncProxyService.inhelitClients(hostName, newVNCServerId); + vncProxyService.inhelitClients(hostName, newVNCServerId, x, y, width, height, scale); // after connecting VNC server, rfb send SEND_INIT_DATA command and wakes me up if necessary // stop reader stop } @@ -991,6 +979,13 @@ setProtocolContext(workingProtocol); connectionPresenter.viewer.setConnectionPresenter(connectionPresenter); connectionPresenter.viewer.getConnectionPresenter().addModel("ConnectionParamsModel", connectionPresenter.getConnectionParams()); + this.x = connectionPresenter.getX(); + this.y = connectionPresenter.getY(); + this.frameSizeWidth = connectionPresenter.getFrameSizeWidth(); + this.frameSizeHeight = connectionPresenter.getFrameSizeHeight(); + this.singleWidth = frameSizeWidth; + this.singleHeight = frameSizeHeight; + this.retinaScale = connectionPresenter.getRetinaScale(); if (previousContext != null && isTreeManager() && hasParent()) { Reader previousReader = previousContext.getReader(); Writer previousWriter = previousContext.getWriter();
--- a/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java Mon Feb 01 04:39:53 2016 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java Mon Feb 01 05:57:18 2016 +0900 @@ -69,6 +69,11 @@ public ViewerInterface viewer; private ConnectionParams connectionParams; private short reconnectingId = -1; + private int frameSizeWidth; + private int frameSizeHeight; + private int retinaScale = 1; + private int x; + private int y; public short getReconnectingId() { return reconnectingId; @@ -355,6 +360,46 @@ cuiVersion = b; } + public void setFrameSizeWidth(int frameSizeWidth) { + this.frameSizeWidth = frameSizeWidth; + } + + public void setFrameSizeHeight(int frameSizeHeight) { + this.frameSizeHeight = frameSizeHeight; + } + + public void setRetinaScale(int retinaScale) { + this.retinaScale = retinaScale; + } + + public void setX(int x) { + this.x = x; + } + + public void setY(int y) { + this.y = y; + } + + public int getFrameSizeWidth() { + return frameSizeWidth; + } + + public int getFrameSizeHeight() { + return frameSizeHeight; + } + + public int getRetinaScale() { + return retinaScale; + } + + public int getX() { + return x; + } + + public int getY() { + return y; + } + public SwingViewerWindow getViewer() { if (rfbConnectionWorker != null) { return rfbConnectionWorker.getViewer();
--- a/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java Mon Feb 01 04:39:53 2016 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java Mon Feb 01 05:57:18 2016 +0900 @@ -157,7 +157,7 @@ } @Override - public void changeToDirectConnectedServer(String hostName, Reader is, Writer os) { + public void changeToDirectConnectedServer(String hostName, Reader is, Writer os, int x, int y, int width, int height, int scale) { } @@ -254,7 +254,7 @@ } @Override - public void inhelitClients(String hostName, short newVNCServerId) { + public void inhelitClients(String hostName, short newVNCServerId, int x, int y, int width, int height, int scale) { }
--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Mon Feb 01 04:39:53 2016 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Mon Feb 01 05:57:18 2016 +0900 @@ -71,10 +71,6 @@ public int height; public int fixingSizeWidth; public int fixingSizeHeight; - private int x; - private int y; - private int frameSizeWidth; - private int frameSizeHeight; public static void main(String[] args) { Parser parser = new Parser(); @@ -318,13 +314,17 @@ /** * start new VNC server receiver with * inherited clients - * @param vs * @param hostName * @param newVNCServerId + * @param x + * @param y + * @param width + * @param height + * @param scale */ @Override - public void inhelitClients(String hostName, short newVNCServerId) { - final ConnectionPresenter connectionPresenter = createNewConnectionPresenter(hostName, newVNCServerId); + public void inhelitClients(String hostName, short newVNCServerId, int x, int y, int width, int height, int scale) { + final ConnectionPresenter connectionPresenter = createNewConnectionPresenter(hostName, newVNCServerId, x, y, width, height, scale); isApplet = true; this.setNoConnection(false); final Viewer v = this; @@ -336,12 +336,12 @@ }, "ServerChangeThread").start(); } - public void changeToDirectConnectedServer(String hostName, Reader is, Writer os) { - final ConnectionPresenter connectionPresenter = createNewConnectionPresenter(hostName, (short) -1); + public void changeToDirectConnectedServer(String hostName, Reader is, Writer os, int x, int y, int width, int height, int scale) { + final ConnectionPresenter connectionPresenter = createNewConnectionPresenter(hostName, (short) -1, x, y, width, height, scale); connectionPresenter.startVNCConnection(this, true, is, os); }; - private ConnectionPresenter createNewConnectionPresenter(String hostName, short newVNCServerId) { + private ConnectionPresenter createNewConnectionPresenter(String hostName, short newVNCServerId, int x, int y, int width, int height, int scale) { final boolean hasJsch = checkJsch(); final boolean allowInteractive = allowAppletInteractiveConnections || ! isApplet; final ConnectionPresenter connectionPresenter = new ConnectionPresenter(hasJsch, allowInteractive); @@ -353,6 +353,11 @@ connectionPresenter.setReconnectingId(newVNCServerId); connectionPresenter.setIsTreeVNC(true); connectionPresenter.setNoConnection(false); + connectionPresenter.setX(x); + connectionPresenter.setY(y); + connectionPresenter.setFrameSizeWidth(width); + connectionPresenter.setFrameSizeHeight(height); + connectionPresenter.setRetinaScale(scale); return connectionPresenter; }
--- a/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java Mon Feb 01 04:39:53 2016 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java Mon Feb 01 05:57:18 2016 +0900 @@ -29,7 +29,7 @@ public void connectToParenet(int port, String hostname) throws IOException; - public void inhelitClients(String hostName, short newVNCServerId); + public void inhelitClients(String hostName, short newVNCServerId, int x, int y, int width, int height, int scale); public void proxyStart(String[] args, String hostName, int width, int height, boolean showTree, boolean checkDelay, boolean addSerialNum, boolean fixingSize, boolean filterSingleDisplay); @@ -55,5 +55,5 @@ public void setConnectionPresenter(ConnectionPresenter connectionPresenter); - void changeToDirectConnectedServer(String hostName, Reader is, Writer os); + void changeToDirectConnectedServer(String hostName, Reader is, Writer os, int x, int y, int width, int height, int scale); }