Mercurial > hg > Members > riono > TreeVNC_ja_comment
changeset 395:704ac9e79e25
Call startVNCConnectionWithSocket for directedServerChangeReqeust
author | innparusu |
---|---|
date | Tue, 29 Sep 2015 18:46:45 +0900 |
parents | a8610fab6861 |
children | b344444aca13 |
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/RfbConnectionWorker.java src/viewer_swing/java/com/glavsoft/viewer/Viewer.java src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java |
diffstat | 7 files changed, 565 insertions(+), 357 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Sat Sep 26 17:58:50 2015 +0900 +++ b/.idea/workspace.xml Tue Sep 29 18:46:45 2015 +0900 @@ -2,8 +2,12 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="0a04b9e3-21eb-43ee-b441-59e664eecd89" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java" afterPath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.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/RfbConnectionWorker.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/RfbConnectionWorker.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/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/Viewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> </list> <ignored path="TreeVNC.iws" /> @@ -21,50 +25,53 @@ <component name="CreatePatchCommitExecutor"> <option name="PATCH_PATH" value="" /> </component> + <component name="DaemonCodeAnalyzer"> + <disable_hints /> + </component> <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="FavoritesManager"> <favorites_list name="TreeVNC" /> </component> <component name="FileEditorManager"> - <splitter split-orientation="horizontal" split-proportion="0.49320754"> + <splitter split-orientation="horizontal" split-proportion="0.40454724"> <split-first> <leaf> - <file leaf-file-name="SwingRfbConnectionWorker.java" pinned="false" current-in-tab="false"> + <file leaf-file-name="SwingRfbConnectionWorker.java" pinned="false" current-in-tab="true"> <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="0.0"> - <caret line="169" column="48" selection-start-line="169" selection-start-column="48" selection-end-line="169" selection-end-column="48" /> + <state vertical-scroll-proportion="0.7286759" vertical-offset="2967" max-vertical-offset="6394"> + <caret line="189" column="13" selection-start-line="189" selection-start-column="13" selection-end-line="189" selection-end-column="13" /> + <folding> + <element signature="e#0#11451#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="SwingConnectionWorkerFactory.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingConnectionWorkerFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="675"> + <caret line="61" column="39" selection-start-line="61" selection-start-column="39" selection-end-line="61" selection-end-column="39" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="SwingViewerWindowFactory.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindowFactory.java"> + <file leaf-file-name="RfbConnectionWorker.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/RfbConnectionWorker.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="30" column="36" selection-start-line="30" selection-start-column="36" selection-end-line="30" selection-end-column="36" /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="850"> + <caret line="49" column="0" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="ReceiverTask.java" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.30379745"> - <caret line="310" column="27" selection-start-line="310" selection-start-column="27" selection-end-line="310" selection-end-column="27" /> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> <file leaf-file-name="Reader.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/transport/Reader.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="1666" max-vertical-offset="2910"> <caret line="218" column="0" selection-start-line="218" selection-start-column="0" selection-end-line="218" selection-end-column="0" /> <folding /> </state> @@ -74,8 +81,62 @@ <file leaf-file-name="Surface.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="1635" max-vertical-offset="3450"> <caret line="145" column="54" selection-start-line="145" selection-start-column="54" selection-end-line="145" selection-end-column="54" /> + <folding> + <element signature="e#0#8895#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#3024#3025#0" expanded="false" /> + <element signature="e#3072#3073#0" expanded="false" /> + <element signature="e#5826#5827#0" expanded="false" /> + <element signature="e#5858#5859#0" expanded="false" /> + <element signature="e#5907#5908#0" expanded="false" /> + <element signature="e#5939#5940#0" expanded="false" /> + <element signature="e#6257#6258#0" expanded="false" /> + <element signature="e#6318#6319#0" expanded="false" /> + <element signature="e#8857#8858#0" expanded="false" /> + <element signature="e#8890#8891#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="TreeRFBProto.java" pinned="false" current-in-tab="false"> + <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="8.0" vertical-offset="420" max-vertical-offset="17120"> + <caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" /> + <folding> + <element signature="e#7167#13720#0" expanded="true" /> + <element signature="e#10887#11213#0" expanded="true" /> + <element signature="e#11212#11213#0" expanded="true" /> + <element signature="e#11458#11784#0" expanded="true" /> + <element signature="e#11783#11784#0" expanded="true" /> + <element signature="e#12015#12341#0" expanded="true" /> + <element signature="e#12340#12341#0" expanded="true" /> + <element signature="e#12563#12889#0" expanded="true" /> + <element signature="e#12888#12889#0" expanded="true" /> + <element signature="e#13719#13720#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="SenderTask.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1035"> + <caret line="88" column="18" selection-start-line="88" selection-start-column="18" selection-end-line="88" selection-end-column="18" /> + <folding /> + </state> + </provider> + </entry> + </file> + <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.0" vertical-offset="11791" max-vertical-offset="13035"> + <caret line="1016" column="12" selection-start-line="1016" selection-start-column="12" selection-end-line="1016" selection-end-column="12" /> <folding /> </state> </provider> @@ -84,49 +145,37 @@ <file leaf-file-name="RendererImpl.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/RendererImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1200"> <caret line="50" column="27" selection-start-line="50" selection-start-column="27" selection-end-line="50" selection-end-column="27" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="InitTightState.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitTightState.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="46" column="8" selection-start-line="46" selection-start-column="8" selection-end-line="46" selection-end-column="8" /> - <folding /> - </state> - </provider> - </entry> - </file> - <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.0"> - <caret line="1026" column="0" selection-start-line="1026" selection-start-column="0" selection-end-line="1026" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - </file> <file leaf-file-name="UiSettings.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/UiSettings.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="2190" max-vertical-offset="2730"> <caret line="189" column="0" selection-start-line="189" selection-start-column="0" selection-end-line="189" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="UiSettingsData.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/UiSettingsData.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="111" column="1" selection-start-line="111" selection-start-column="1" selection-end-line="111" selection-end-column="1" /> - <folding /> + <folding> + <element signature="e#0#7625#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#1874#1899#0" expanded="false" /> + <element signature="e#2442#2443#0" expanded="false" /> + <element signature="e#2495#2496#0" expanded="false" /> + <element signature="e#2739#2740#0" expanded="false" /> + <element signature="e#2769#2770#0" expanded="false" /> + <element signature="e#5027#5028#0" expanded="false" /> + <element signature="e#5073#5074#0" expanded="false" /> + <element signature="e#5301#5302#0" expanded="false" /> + <element signature="e#5360#5361#0" expanded="false" /> + <element signature="e#5674#5675#0" expanded="false" /> + <element signature="e#5712#5713#0" expanded="false" /> + <element signature="e#6390#6391#0" expanded="false" /> + <element signature="e#6442#6443#0" expanded="false" /> + <element signature="e#6481#6482#0" expanded="false" /> + <element signature="e#6518#6519#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -138,10 +187,22 @@ <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="0.0"> - <caret line="321" column="16" selection-start-line="321" selection-start-column="16" selection-end-line="321" selection-end-column="16" /> + <state vertical-scroll-proportion="-5.125" vertical-offset="7355" max-vertical-offset="11208"> + <caret line="336" column="64" selection-start-line="336" selection-start-column="64" selection-end-line="336" selection-end-column="64" /> <folding> - <element signature="e#0#16299#0" expanded="true" /> + <element signature="e#0#16331#0" expanded="true" /> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ReceiverTask.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="3096" max-vertical-offset="8736"> + <caret line="176" column="16" selection-start-line="176" selection-start-column="16" selection-end-line="176" selection-end-column="16" /> + <folding> <element signature="imports" expanded="true" /> </folding> </state> @@ -151,8 +212,31 @@ <file leaf-file-name="ConnectionPresenter.java" pinned="false" current-in-tab="false"> <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.0"> - <caret line="355" column="25" selection-start-line="355" selection-start-column="25" selection-end-line="355" selection-end-column="25" /> + <state vertical-scroll-proportion="-9.925" vertical-offset="822" max-vertical-offset="7475"> + <caret line="94" column="22" selection-start-line="94" selection-start-column="22" selection-end-line="94" selection-end-column="22" /> + <folding> + <element signature="e#13339#13340#0" expanded="true" /> + <element signature="e#13393#13394#0" expanded="true" /> + </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"> + <state vertical-scroll-proportion="0.0" vertical-offset="1604" max-vertical-offset="4890"> + <caret line="95" column="0" selection-start-line="95" selection-start-column="0" selection-end-line="95" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="CuiViewer.java" pinned="false" current-in-tab="true"> + <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.54589766" vertical-offset="1808" max-vertical-offset="5520"> + <caret line="145" column="95" selection-start-line="145" selection-start-column="95" selection-end-line="145" selection-end-column="95" /> <folding /> </state> </provider> @@ -161,8 +245,8 @@ <file leaf-file-name="TreeViewer.java" pinned="false" current-in-tab="false"> <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="40" column="26" selection-start-line="40" selection-start-column="26" selection-end-line="40" selection-end-column="26" /> + <state vertical-scroll-proportion="0.0" vertical-offset="759" max-vertical-offset="4738"> + <caret line="79" column="15" selection-start-line="79" selection-start-column="15" selection-end-line="79" selection-end-column="15" /> <folding /> </state> </provider> @@ -171,7 +255,7 @@ <file leaf-file-name="InitState.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="690" max-vertical-offset="1020"> <caret line="78" column="53" selection-start-line="78" selection-start-column="53" selection-end-line="78" selection-end-column="53" /> <folding /> </state> @@ -181,9 +265,22 @@ <file leaf-file-name="ServerInitMessage.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/ServerInitMessage.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1080"> <caret line="88" column="22" selection-start-line="88" selection-start-column="22" selection-end-line="88" selection-end-column="22" /> - <folding /> + <folding> + <element signature="e#0#2883#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#2021#2022#0" expanded="false" /> + <element signature="e#2051#2052#0" expanded="false" /> + <element signature="e#2089#2090#0" expanded="false" /> + <element signature="e#2120#2121#0" expanded="false" /> + <element signature="e#2160#2161#0" expanded="false" /> + <element signature="e#2185#2186#0" expanded="false" /> + <element signature="e#2218#2219#0" expanded="false" /> + <element signature="e#2240#2241#0" expanded="false" /> + <element signature="e#2268#2269#0" expanded="false" /> + <element signature="e#2286#2287#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -191,42 +288,23 @@ <file leaf-file-name="Protocol.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="66" column="0" selection-start-line="66" selection-start-column="0" selection-end-line="66" selection-end-column="0" /> + <state vertical-scroll-proportion="0.0" vertical-offset="5016" max-vertical-offset="6936"> + <caret line="316" column="32" selection-start-line="316" selection-start-column="32" selection-end-line="316" selection-end-column="32" /> <folding /> </state> </provider> </entry> </file> - <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.37682572"> - <caret line="792" column="8" selection-start-line="792" selection-start-column="8" selection-end-line="792" selection-end-column="8" /> - <folding> - <element signature="e#17842#17843#0" expanded="true" /> - <element signature="e#17885#17886#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> <file leaf-file-name="ChengeDesktopSize.java" pinned="false" current-in-tab="false"> <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"> + <state vertical-scroll-proportion="0.0" vertical-offset="165" max-vertical-offset="540"> <caret line="14" column="42" selection-start-line="14" selection-start-column="42" selection-end-line="14" selection-end-column="42" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="TreeVNCNetwork.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVNCNetwork.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="39" column="38" selection-start-line="39" selection-start-column="38" selection-end-line="39" selection-end-column="38" /> - <folding /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#873#874#0" expanded="false" /> + <element signature="e#899#900#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -517,32 +595,29 @@ <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZlibDecoder.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.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/RfbConnectionWorker.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/Viewer.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.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/TreeVNCNetwork.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/UiSettingsData.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/UiSettings.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/transport/Reader.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.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/TreeRFBProto.java" /> - <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.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/swing/SwingRfbConnectionWorker.java" /> + <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.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/CuiViewer.java" /> </list> </option> </component> - <component name="NamedScopeManager"> - <order /> - </component> <component name="ProjectFrameBounds"> <option name="x" value="4" /> <option name="y" value="23" /> - <option name="width" value="1916" /> - <option name="height" value="1177" /> + <option name="width" value="3836" /> + <option name="height" value="2109" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="true"> <OptionsSetting value="true" id="Add" /> @@ -567,8 +642,6 @@ <sortByType /> </navigator> <panes> - <pane id="PackagesPane" /> - <pane id="Scratches" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -922,6 +995,8 @@ </subPane> </pane> <pane id="Scope" /> + <pane id="PackagesPane" /> + <pane id="Scratches" /> </panes> </component> <component name="PropertiesComponent"> @@ -1002,26 +1077,6 @@ <option name="PROGRAM_PARAMETERS" /> <method /> </configuration> - <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application"> - <module name="" /> - <option name="ACTIVITY_CLASS" value="" /> - <option name="MODE" value="default_activity" /> - <option name="DEPLOY" value="true" /> - <option name="ARTIFACT_NAME" value="" /> - <option name="TARGET_SELECTION_MODE" value="EMULATOR" /> - <option name="USE_LAST_SELECTED_DEVICE" value="false" /> - <option name="PREFERRED_AVD" value="" /> - <option name="USE_COMMAND_LINE" value="true" /> - <option name="COMMAND_LINE" value="" /> - <option name="WIPE_USER_DATA" value="false" /> - <option name="DISABLE_BOOT_ANIMATION" value="false" /> - <option name="NETWORK_SPEED" value="full" /> - <option name="NETWORK_LATENCY" value="none" /> - <option name="CLEAR_LOGCAT" value="false" /> - <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> - <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> - <method /> - </configuration> <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests"> <module name="" /> <option name="TESTING_TYPE" value="0" /> @@ -1043,27 +1098,16 @@ <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> <method /> </configuration> - <configuration default="true" type="Applet" factoryName="Applet"> - <module /> - <option name="HTML_USED" value="false" /> - <option name="WIDTH" value="400" /> - <option name="HEIGHT" value="300" /> - <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <configuration default="true" type="Remote" factoryName="Remote"> + <option name="USE_SOCKET_TRANSPORT" value="true" /> + <option name="SERVER_MODE" value="false" /> + <option name="SHMEM_ADDRESS" value="javadebug" /> + <option name="HOST" value="localhost" /> + <option name="PORT" value="5005" /> <method /> </configuration> - <configuration default="true" type="Application" factoryName="Application"> + <configuration default="true" type="JarApplication" factoryName="JAR Application"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <option name="MAIN_CLASS_NAME" /> - <option name="VM_PARAMETERS" /> - <option name="PROGRAM_PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="ENABLE_SWING_INSPECTOR" value="false" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <module name="" /> <envs /> <method /> </configuration> @@ -1083,38 +1127,17 @@ </ExternalSystemSettings> <method /> </configuration> - <configuration default="true" type="JUnit" factoryName="JUnit"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> + <configuration default="true" type="Applet" factoryName="Applet"> <module name="" /> + <option name="MAIN_CLASS_NAME" /> + <option name="HTML_FILE_NAME" /> + <option name="HTML_USED" value="false" /> + <option name="WIDTH" value="400" /> + <option name="HEIGHT" value="300" /> + <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> + <option name="VM_PARAMETERS" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> - <option name="PACKAGE_NAME" /> - <option name="MAIN_CLASS_NAME" /> - <option name="METHOD_NAME" /> - <option name="TEST_OBJECT" value="class" /> - <option name="VM_PARAMETERS" value="-ea" /> - <option name="PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="singleModule" /> - </option> - <envs /> - <patterns /> - <method /> - </configuration> - <configuration default="true" type="JarApplication" factoryName="JAR Application"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <envs /> - <method /> - </configuration> - <configuration default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> <method /> </configuration> <configuration default="true" type="TestNG" factoryName="TestNG"> @@ -1145,6 +1168,62 @@ <listeners /> <method /> </configuration> + <configuration default="true" type="Application" factoryName="Application"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> + <option name="MAIN_CLASS_NAME" /> + <option name="VM_PARAMETERS" /> + <option name="PROGRAM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="ENABLE_SWING_INSPECTOR" value="false" /> + <option name="ENV_VARIABLES" /> + <option name="PASS_PARENT_ENVS" value="true" /> + <module name="" /> + <envs /> + <method /> + </configuration> + <configuration default="true" type="JUnit" factoryName="JUnit"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> + <module name="" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="PACKAGE_NAME" /> + <option name="MAIN_CLASS_NAME" /> + <option name="METHOD_NAME" /> + <option name="TEST_OBJECT" value="class" /> + <option name="VM_PARAMETERS" value="-ea" /> + <option name="PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" /> + <option name="ENV_VARIABLES" /> + <option name="PASS_PARENT_ENVS" value="true" /> + <option name="TEST_SEARCH_SCOPE"> + <value defaultName="singleModule" /> + </option> + <envs /> + <patterns /> + <method /> + </configuration> + <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application"> + <module name="" /> + <option name="ACTIVITY_CLASS" value="" /> + <option name="MODE" value="default_activity" /> + <option name="DEPLOY" value="true" /> + <option name="ARTIFACT_NAME" value="" /> + <option name="TARGET_SELECTION_MODE" value="EMULATOR" /> + <option name="USE_LAST_SELECTED_DEVICE" value="false" /> + <option name="PREFERRED_AVD" value="" /> + <option name="USE_COMMAND_LINE" value="true" /> + <option name="COMMAND_LINE" value="" /> + <option name="WIPE_USER_DATA" value="false" /> + <option name="DISABLE_BOOT_ANIMATION" value="false" /> + <option name="NETWORK_SPEED" value="full" /> + <option name="NETWORK_LATENCY" value="none" /> + <option name="CLEAR_LOGCAT" value="false" /> + <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> + <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> + <method /> + </configuration> <configuration default="false" name="TreeeViewer -d" type="Application" factoryName="Application"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <option name="MAIN_CLASS_NAME" value="com.glavsoft.viewer.TreeViewer" /> @@ -1158,7 +1237,13 @@ <option name="PASS_PARENT_ENVS" value="true" /> <module name="TreeVNC" /> <envs /> + <RunnerSettings RunnerId="Debug"> + <option name="DEBUG_PORT" value="" /> + <option name="TRANSPORT" value="0" /> + <option name="LOCAL" value="true" /> + </RunnerSettings> <RunnerSettings RunnerId="Run" /> + <ConfigurationWrapper RunnerId="Debug" /> <ConfigurationWrapper RunnerId="Run" /> <method /> </configuration> @@ -1212,33 +1297,33 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="4" y="23" width="1916" height="1177" extended-state="6" /> + <frame x="4" y="23" width="3836" height="2109" extended-state="0" /> <editor active="true" /> <layout> <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32988676" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32988676" sideWeight="0.5" order="7" 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" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.18172741" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32940573" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.15709811" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> - <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3417036" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.18326382" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.35796306" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.15172054" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3293944" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.18217626" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32940573" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> - <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> </layout> <layout-to-restore> @@ -1281,6 +1366,9 @@ <option name="myLimit" value="2678400000" /> </component> <component name="VcsManagerConfiguration"> + <option name="myTodoPanelSettings"> + <TodoPanelSettings /> + </option> <MESSAGE value="add ExtendetDesktopSize" /> <MESSAGE value="FramebufferUpdateRequestMessage to false" /> <MESSAGE value="setFitScreen in ReceiverTask" /> @@ -1453,14 +1541,8 @@ <option name="timeStamp" value="126" /> </line-breakpoint> <line-breakpoint type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>785</line> - <properties /> - <option name="timeStamp" value="127" /> - </line-breakpoint> - <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java</url> - <line>172</line> + <line>173</line> <properties /> <option name="timeStamp" value="131" /> </line-breakpoint> @@ -1470,17 +1552,29 @@ <properties /> <option name="timeStamp" value="133" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> + <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> <line>311</line> <properties /> <option name="timeStamp" value="134" /> </line-breakpoint> + <line-breakpoint type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> + <line>913</line> + <properties /> + <option name="timeStamp" value="136" /> + </line-breakpoint> + <line-breakpoint type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> + <line>932</line> + <properties /> + <option name="timeStamp" value="137" /> + </line-breakpoint> </breakpoints> <breakpoints-dialog> <breakpoints-dialog /> </breakpoints-dialog> - <option name="time" value="135" /> + <option name="time" value="141" /> </breakpoint-manager> <watches-manager /> </component> @@ -1491,69 +1585,92 @@ <component name="editorHistoryManager"> <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.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="424" column="19" selection-start-line="424" selection-start-column="16" selection-end-line="424" selection-end-column="19" /> <folding> - <element signature="e#17842#17843#0" expanded="true" /> - <element signature="e#17885#17886#0" expanded="true" /> + <element signature="e#7167#13720#0" expanded="true" /> + <element signature="e#10887#11213#0" expanded="true" /> + <element signature="e#11212#11213#0" expanded="true" /> + <element signature="e#11458#11784#0" expanded="true" /> + <element signature="e#11783#11784#0" expanded="true" /> + <element signature="e#12015#12341#0" expanded="true" /> + <element signature="e#12340#12341#0" expanded="true" /> + <element signature="e#12563#12889#0" expanded="true" /> + <element signature="e#12888#12889#0" expanded="true" /> + <element signature="e#13719#13720#0" expanded="true" /> </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"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="14" column="42" selection-start-line="14" selection-start-column="42" selection-end-line="14" selection-end-column="42" /> - <folding /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#873#874#0" expanded="false" /> + <element signature="e#899#900#0" expanded="false" /> + </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVNCNetwork.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="34" column="38" selection-start-line="34" selection-start-column="38" selection-end-line="34" selection-end-column="38" /> - <folding /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#400#424#0" expanded="false" /> + <element signature="e#537#538#0" expanded="false" /> + <element signature="e#565#566#0" expanded="false" /> + <element signature="e#613#614#0" expanded="false" /> + <element signature="e#647#648#0" expanded="false" /> + <element signature="e#3023#3024#0" expanded="false" /> + <element signature="e#3069#3070#0" expanded="false" /> + <element signature="e#3123#3124#0" expanded="false" /> + <element signature="e#3157#3158#0" expanded="false" /> + </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SendCheckDelay.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="21" column="35" selection-start-line="21" selection-start-column="35" selection-end-line="21" selection-end-column="35" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/AuthenticationState.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="57" column="9" selection-start-line="57" selection-start-column="9" selection-end-line="57" selection-end-column="9" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SoundPacketQueue.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.103643216"> + <state vertical-scroll-proportion="0.103643216" vertical-offset="0" max-vertical-offset="0"> <caret line="14" column="51" selection-start-line="14" selection-start-column="51" selection-end-line="14" selection-end-column="51" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="227" column="5" selection-start-line="227" selection-start-column="5" selection-end-line="227" selection-end-column="5" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SendSound.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="61" column="17" selection-start-line="61" selection-start-column="17" selection-end-line="61" selection-end-column="17" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/HandshakeState.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="56" column="0" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" /> <folding> <element signature="e#0#4038#0" expanded="false" /> @@ -1564,14 +1681,14 @@ </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVNCNode.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncProtocol.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="78" column="20" selection-start-line="78" selection-start-column="20" selection-end-line="78" selection-end-column="20" /> <folding /> </state> @@ -1579,7 +1696,7 @@ </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="29" column="23" selection-start-line="29" selection-start-column="23" selection-end-line="29" selection-end-column="23" /> <folding /> </state> @@ -1587,64 +1704,42 @@ </entry> <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"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="58" column="32" selection-start-line="58" selection-start-column="0" selection-end-line="59" selection-end-column="0" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/RfbConnectionWorker.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="44" column="30" selection-start-line="44" selection-start-column="30" selection-end-line="44" selection-end-column="30" /> - </state> - </provider> - </entry> - <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="160" column="0" selection-start-line="160" selection-start-column="0" selection-end-line="160" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingConnectionWorkerFactory.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="22" column="2" selection-start-line="22" selection-start-column="2" selection-end-line="22" selection-end-column="2" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/KeyEventListener.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-1.6173842"> + <state vertical-scroll-proportion="-1.6173842" vertical-offset="0" max-vertical-offset="0"> <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/LocalMouseCursorShape.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.1085209"> + <state vertical-scroll-proportion="0.1085209" vertical-offset="0" max-vertical-offset="0"> <caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/FramebufferUpdateRectangle.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="54" column="41" selection-start-line="54" selection-start-column="41" selection-end-line="54" selection-end-column="41" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="107" column="38" selection-start-line="107" selection-start-column="38" selection-end-line="107" selection-end-column="38" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.14947197"> + <state vertical-scroll-proportion="0.14947197" vertical-offset="0" max-vertical-offset="0"> <caret line="25" column="40" selection-start-line="25" selection-start-column="40" selection-end-line="25" selection-end-column="40" /> <folding> <element signature="e#900#916#0" expanded="false" /> @@ -1654,28 +1749,21 @@ </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZlibDecoder.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="56" column="57" selection-start-line="56" selection-start-column="57" selection-end-line="56" selection-end-column="57" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="102" column="29" selection-start-line="102" selection-start-column="29" selection-end-line="102" selection-end-column="29" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="56" column="13" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="143" column="24" selection-start-line="143" selection-start-column="24" selection-end-line="143" selection-end-column="24" /> <folding> <element signature="imports" expanded="false" /> @@ -1685,69 +1773,42 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingNetworkConnectionWorker.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="48" column="6" selection-start-line="48" selection-start-column="6" selection-end-line="48" selection-end-column="6" /> - <folding> - <element signature="e#0#8430#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#8042#8043#0" expanded="false" /> - <element signature="e#8098#8099#0" expanded="false" /> - <element signature="e#8175#8176#0" expanded="false" /> - <element signature="e#8217#8218#0" expanded="false" /> - <element signature="e#8290#8291#0" expanded="false" /> - <element signature="e#8340#8341#0" expanded="false" /> - <element signature="e#8385#8386#0" expanded="false" /> - <element signature="e#8426#8427#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/ProtocolState.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/VncProxyService.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVNCNetwork.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="39" column="38" selection-start-line="39" selection-start-column="38" selection-end-line="39" selection-end-column="38" /> - <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="0.0"> - <caret line="321" column="16" selection-start-line="321" selection-start-column="16" selection-end-line="321" selection-end-column="16" /> <folding> - <element signature="e#0#16299#0" expanded="true" /> - <element signature="imports" expanded="true" /> + <element signature="imports" expanded="false" /> + <element signature="e#400#424#0" expanded="false" /> + <element signature="e#537#538#0" expanded="false" /> + <element signature="e#565#566#0" expanded="false" /> + <element signature="e#613#614#0" expanded="false" /> + <element signature="e#647#648#0" expanded="false" /> + <element signature="e#3023#3024#0" expanded="false" /> + <element signature="e#3069#3070#0" expanded="false" /> + <element signature="e#3123#3124#0" expanded="false" /> + <element signature="e#3157#3158#0" expanded="false" /> </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="0.0"> - <caret line="355" column="25" selection-start-line="355" selection-start-column="25" selection-end-line="355" selection-end-column="25" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/client/FramebufferUpdateRequestMessage.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="42" column="11" selection-start-line="42" selection-start-column="11" selection-end-line="42" selection-end-column="11" /> <folding> <element signature="e#0#2596#0" expanded="false" /> @@ -1760,7 +1821,7 @@ </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEDecoder.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="45" column="28" selection-start-line="45" selection-start-column="28" selection-end-line="45" selection-end-column="28" /> <folding /> </state> @@ -1768,7 +1829,7 @@ </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitTightState.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="46" column="8" selection-start-line="46" selection-start-column="8" selection-end-line="46" selection-end-column="8" /> <folding /> </state> @@ -1776,7 +1837,7 @@ </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="78" column="53" selection-start-line="78" selection-start-column="53" selection-end-line="78" selection-end-column="53" /> <folding /> </state> @@ -1784,136 +1845,270 @@ </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"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="14" column="42" selection-start-line="14" selection-start-column="42" selection-end-line="14" selection-end-column="42" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/ServerInitMessage.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="88" column="22" selection-start-line="88" selection-start-column="22" selection-end-line="88" selection-end-column="22" /> - <folding /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#873#874#0" expanded="false" /> + <element signature="e#899#900#0" expanded="false" /> + </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindowFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="30" column="36" selection-start-line="30" selection-start-column="36" selection-end-line="30" selection-end-column="36" /> - <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="0.0"> - <caret line="169" column="48" selection-start-line="169" selection-start-column="48" selection-end-line="169" selection-end-column="48" /> - <folding /> + <folding> + <element signature="imports" expanded="false" /> + </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/drawing/Renderer.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.2742915"> + <state vertical-scroll-proportion="0.2742915" vertical-offset="0" max-vertical-offset="0"> <caret line="54" column="19" selection-start-line="54" selection-start-column="19" selection-end-line="54" selection-end-column="19" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/RendererImpl.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.07121212" vertical-offset="0" max-vertical-offset="0"> + <caret line="42" column="13" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/UiSettingsData.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> + <caret line="111" column="1" selection-start-line="111" selection-start-column="1" selection-end-line="111" selection-end-column="1" /> + <folding> + <element signature="e#0#3537#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#2091#2092#0" expanded="false" /> + <element signature="e#2126#2127#0" expanded="false" /> + <element signature="e#2402#2403#0" expanded="false" /> + <element signature="e#2441#2442#0" expanded="false" /> + <element signature="e#2762#2763#0" expanded="false" /> + <element signature="e#2795#2796#0" expanded="false" /> + <element signature="e#3045#3046#0" expanded="false" /> + <element signature="e#3085#3086#0" expanded="false" /> + <element signature="e#3152#3153#0" expanded="false" /> + <element signature="e#3210#3211#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/UiSettings.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="50" column="27" selection-start-line="50" selection-start-column="27" selection-end-line="50" selection-end-column="27" /> - <folding /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> + <caret line="189" column="0" selection-start-line="189" selection-start-column="0" selection-end-line="189" selection-end-column="0" /> + <folding> + <element signature="e#0#7625#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#1874#1899#0" expanded="false" /> + <element signature="e#2442#2443#0" expanded="false" /> + <element signature="e#2495#2496#0" expanded="false" /> + <element signature="e#2739#2740#0" expanded="false" /> + <element signature="e#2769#2770#0" expanded="false" /> + <element signature="e#5027#5028#0" expanded="false" /> + <element signature="e#5073#5074#0" expanded="false" /> + <element signature="e#5301#5302#0" expanded="false" /> + <element signature="e#5360#5361#0" expanded="false" /> + <element signature="e#5674#5675#0" expanded="false" /> + <element signature="e#5712#5713#0" expanded="false" /> + <element signature="e#6390#6391#0" expanded="false" /> + <element signature="e#6442#6443#0" expanded="false" /> + <element signature="e#6481#6482#0" expanded="false" /> + <element signature="e#6518#6519#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> + <caret line="145" column="54" selection-start-line="145" selection-start-column="54" selection-end-line="145" selection-end-column="54" /> + <folding> + <element signature="e#0#8895#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#3024#3025#0" expanded="false" /> + <element signature="e#3072#3073#0" expanded="false" /> + <element signature="e#5826#5827#0" expanded="false" /> + <element signature="e#5858#5859#0" expanded="false" /> + <element signature="e#5907#5908#0" expanded="false" /> + <element signature="e#5939#5940#0" expanded="false" /> + <element signature="e#6257#6258#0" expanded="false" /> + <element signature="e#6318#6319#0" expanded="false" /> + <element signature="e#8857#8858#0" expanded="false" /> + <element signature="e#8890#8891#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/ServerInitMessage.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> + <caret line="88" column="22" selection-start-line="88" selection-start-column="22" selection-end-line="88" selection-end-column="22" /> + <folding> + <element signature="e#0#2883#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#2021#2022#0" expanded="false" /> + <element signature="e#2051#2052#0" expanded="false" /> + <element signature="e#2089#2090#0" expanded="false" /> + <element signature="e#2120#2121#0" expanded="false" /> + <element signature="e#2160#2161#0" expanded="false" /> + <element signature="e#2185#2186#0" expanded="false" /> + <element signature="e#2218#2219#0" expanded="false" /> + <element signature="e#2240#2241#0" expanded="false" /> + <element signature="e#2268#2269#0" expanded="false" /> + <element signature="e#2286#2287#0" expanded="false" /> + </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="40" column="26" selection-start-line="40" selection-start-column="26" selection-end-line="40" selection-end-column="26" /> + <state vertical-scroll-proportion="0.0" vertical-offset="759" max-vertical-offset="4738"> + <caret line="79" column="15" selection-start-line="79" selection-start-column="15" selection-end-line="79" selection-end-column="15" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.07121212"> - <caret line="42" column="13" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1035"> + <caret line="88" column="18" selection-start-line="88" selection-start-column="18" selection-end-line="88" selection-end-column="18" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="66" column="0" selection-start-line="66" selection-start-column="0" selection-end-line="66" selection-end-column="0" /> + <state vertical-scroll-proportion="0.0" vertical-offset="5016" max-vertical-offset="6936"> + <caret line="316" column="32" selection-start-line="316" selection-start-column="32" selection-end-line="316" selection-end-column="32" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/UiSettingsData.java"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/RendererImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="111" column="1" selection-start-line="111" selection-start-column="1" selection-end-line="111" selection-end-column="1" /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> + <caret line="50" column="27" selection-start-line="50" selection-start-column="27" selection-end-line="50" selection-end-column="27" /> <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.0"> - <caret line="1026" column="0" selection-start-line="1026" selection-start-column="0" selection-end-line="1026" selection-end-column="0" /> + <state vertical-scroll-proportion="0.0" vertical-offset="11791" max-vertical-offset="13035"> + <caret line="1016" column="12" selection-start-line="1016" selection-start-column="12" selection-end-line="1016" selection-end-column="12" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/UiSettings.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="189" column="0" selection-start-line="189" selection-start-column="0" selection-end-line="189" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="145" column="54" selection-start-line="145" selection-start-column="54" selection-end-line="145" selection-end-column="54" /> - <folding /> + <state vertical-scroll-proportion="0.0" vertical-offset="3096" max-vertical-offset="8736"> + <caret line="176" column="16" selection-start-line="176" selection-start-column="16" selection-end-line="176" selection-end-column="16" /> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/transport/Reader.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="218" column="0" selection-start-line="218" selection-start-column="0" selection-end-line="218" selection-end-column="0" /> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/RfbConnectionWorker.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="850"> + <caret line="49" column="0" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingConnectionWorkerFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="675"> + <caret line="61" column="39" selection-start-line="61" selection-start-column="39" selection-end-line="61" selection-end-column="39" /> + <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.37682572"> - <caret line="792" column="8" selection-start-line="792" selection-start-column="8" selection-end-line="792" selection-end-column="8" /> + <state vertical-scroll-proportion="8.0" vertical-offset="420" max-vertical-offset="17120"> + <caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" /> <folding> - <element signature="e#17842#17843#0" expanded="true" /> - <element signature="e#17885#17886#0" expanded="true" /> + <element signature="e#7167#13720#0" expanded="true" /> + <element signature="e#10887#11213#0" expanded="true" /> + <element signature="e#11212#11213#0" expanded="true" /> + <element signature="e#11458#11784#0" expanded="true" /> + <element signature="e#11783#11784#0" expanded="true" /> + <element signature="e#12015#12341#0" expanded="true" /> + <element signature="e#12340#12341#0" expanded="true" /> + <element signature="e#12563#12889#0" expanded="true" /> + <element signature="e#12888#12889#0" expanded="true" /> + <element signature="e#13719#13720#0" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingNetworkConnectionWorker.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="1604" max-vertical-offset="4890"> + <caret line="95" column="0" selection-start-line="95" selection-start-column="0" selection-end-line="95" selection-end-column="0" /> + <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="0.30379745"> - <caret line="310" column="27" selection-start-line="310" selection-start-column="27" selection-end-line="310" selection-end-column="27" /> + <state vertical-scroll-proportion="0.7286759" vertical-offset="2967" max-vertical-offset="6394"> + <caret line="189" column="13" selection-start-line="189" selection-start-column="13" selection-end-line="189" selection-end-column="13" /> <folding> + <element signature="e#0#11451#0" expanded="true" /> + </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="-5.125" vertical-offset="7355" max-vertical-offset="11208"> + <caret line="336" column="64" selection-start-line="336" selection-start-column="64" selection-end-line="336" selection-end-column="64" /> + <folding> + <element signature="e#0#16331#0" expanded="true" /> <element signature="imports" expanded="true" /> </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="-9.925" vertical-offset="822" max-vertical-offset="7475"> + <caret line="94" column="22" selection-start-line="94" selection-start-column="22" selection-end-line="94" selection-end-column="22" /> + <folding> + <element signature="e#13339#13340#0" expanded="true" /> + <element signature="e#13393#13394#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <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.54589766" vertical-offset="1808" max-vertical-offset="5520"> + <caret line="145" column="95" selection-start-line="145" selection-start-column="95" selection-end-line="145" selection-end-column="95" /> + <folding /> + </state> + </provider> + </entry> </component> <component name="masterDetails"> <states>
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Sat Sep 26 17:58:50 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Tue Sep 29 18:46:45 2015 +0900 @@ -903,9 +903,9 @@ /** * server change to directed connected server - * server mayble on the diffrent network + * server maybe on the different network * so can not in whereToConnect message - * reuse dynamic connect sorcket us a new client + * reuse dynamic connect socket us a new client * reother server exchange socket when serverChangeRequest with id -1 * @param previousReader * @param previousWriter
--- a/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java Sat Sep 26 17:58:50 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java Tue Sep 29 18:46:45 2015 +0900 @@ -24,15 +24,15 @@ package com.glavsoft.viewer; -import com.glavsoft.rfb.protocol.Protocol; import com.glavsoft.rfb.protocol.ProtocolSettings; +import com.glavsoft.transport.Reader; +import com.glavsoft.transport.Writer; import com.glavsoft.utils.Strings; import com.glavsoft.viewer.mvp.Presenter; import com.glavsoft.viewer.mvp.View; import com.glavsoft.viewer.swing.*; import com.glavsoft.viewer.swing.gui.ConnectionView; import com.glavsoft.viewer.swing.gui.ConnectionsHistory; -import jp.ac.u_ryukyu.treevnc.TreeRFBProto; import java.net.Socket; import java.util.logging.Logger; @@ -92,7 +92,7 @@ logger = Logger.getLogger(getClass().getName()); } - public void startConnection(ProtocolSettings rfbSettings, UiSettings uiSettings, int paramSettingsMask, boolean exchangeSocket) + public void startConnection(ProtocolSettings rfbSettings, UiSettings uiSettings, int paramSettingsMask, boolean exchangeSocket, Reader is, Writer os) throws IllegalStateException { this.rfbSettings = rfbSettings; this.uiSettings = uiSettings; @@ -107,7 +107,7 @@ } if (exchangeSocket) { - rfbConnectionWorker.startVNCConnection(); + rfbConnectionWorker.startVNCConnectionWithSocket(is, os); return; } @@ -357,7 +357,7 @@ return rfbConnectionWorker.getSocket(); } - public void startVNCConnection(Viewer viewer, boolean exchangeSocket) { + public void startVNCConnection(Viewer viewer, boolean exchangeSocket, Reader is, Writer os) { this.viewer = viewer; final boolean hasJsch = viewer.checkJsch(); ConnectionView connectionView = new ConnectionView( @@ -379,6 +379,6 @@ setConnectionWorkerFactory( new SwingConnectionWorkerFactory(connectionView.getFrame(), viewer.passwordFromParams, this, viewerWindowFactory, viewer.myRfb)); setNeedReconnection(!viewer.noConnection); - startConnection(viewer.settings, viewer.uiSettings, viewer.paramsMask, exchangeSocket); + startConnection(viewer.settings, viewer.uiSettings, viewer.paramsMask, exchangeSocket, is, os); } }
--- a/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java Sat Sep 26 17:58:50 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java Tue Sep 29 18:46:45 2015 +0900 @@ -143,7 +143,7 @@ connectionPresenter.setConnectionWorkerFactory( new SwingConnectionWorkerFactory(null, passwordFromParams, connectionPresenter, null, myRfb)); connectionPresenter.setCuiVersion(true); - connectionPresenter.startConnection(settings, uiSettings, paramsMask, false); + connectionPresenter.startConnection(settings, uiSettings, paramsMask, false, null, null); } @Override
--- a/src/viewer_swing/java/com/glavsoft/viewer/RfbConnectionWorker.java Sat Sep 26 17:58:50 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/RfbConnectionWorker.java Tue Sep 29 18:46:45 2015 +0900 @@ -25,6 +25,8 @@ package com.glavsoft.viewer; import com.glavsoft.rfb.protocol.ProtocolSettings; +import com.glavsoft.transport.Reader; +import com.glavsoft.transport.Writer; import com.glavsoft.viewer.swing.SwingViewerWindow; import java.net.Socket; @@ -44,6 +46,8 @@ void startVNCConnection(); + void startVNCConnectionWithSocket(Reader is, Writer os); + SwingViewerWindow getViewer(); Socket getSocket();
--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Sat Sep 26 17:58:50 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Tue Sep 29 18:46:45 2015 +0900 @@ -223,7 +223,7 @@ connectionPresenter = new ConnectionPresenter(hasJsch, allowInteractive); connectionPresenter.setNoConnection(noConnection); connectionPresenter.addModel("ConnectionParamsModel", connectionParams); - connectionPresenter.startVNCConnection(this, false); + connectionPresenter.startVNCConnection(this, false, null, null); } @Override @@ -327,14 +327,14 @@ new Thread(new Runnable() { @Override public void run() { - connectionPresenter.startVNCConnection(v, false); + connectionPresenter.startVNCConnection(v, false, null, null); } }, "ServerChangeThread").start(); } public void changeToDirectConnectedServer(String hostName, Reader is, Writer os) { final ConnectionPresenter connectionPresenter = createNewConnectionPresenter(hostName, (short)-1); - connectionPresenter.startVNCConnection(this, true); + connectionPresenter.startVNCConnection(this, true, is, os); }; private ConnectionPresenter createNewConnectionPresenter(String hostName, short newVNCServerId) {
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java Sat Sep 26 17:58:50 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java Tue Sep 29 18:46:45 2015 +0900 @@ -159,6 +159,7 @@ } } + @Override public void startVNCConnection() { presenter.showMessage("Handshake established"); myRfb.newVNCConnection(workingProtocol, presenter); @@ -185,6 +186,14 @@ } @Override + public void startVNCConnectionWithSocket (Reader is, Writer os) { + workingProtocol = new Protocol(is, os, + new PasswordChooser(connectionString, parentWindow, this), + rfbSettings, myRfb); + startVNCConnection(); + } + + @Override public void rfbSessionStopped(final String reason) { if (workingProtocol != null) { workingProtocol.cleanUpSession();