Mercurial > hg > Applications > TreeVNC
changeset 391:6a8b661367c6
Fix serverChange desktop size
author | innparusu |
---|---|
date | Tue, 22 Sep 2015 19:09:22 +0900 |
parents | dc168770dbe3 |
children | 11e272c12092 |
files | .idea/workspace.xml src/main/java/com/glavsoft/rfb/protocol/Protocol.java src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java |
diffstat | 6 files changed, 676 insertions(+), 563 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Tue Sep 22 16:18:55 2015 +0900 +++ b/.idea/workspace.xml Tue Sep 22 19:09:22 2015 +0900 @@ -2,7 +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/jp/ac/u_ryukyu/treevnc/TreeVNCNetwork.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVNCNetwork.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java" afterPath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java" /> + <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/swing/Surface.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> </list> <ignored path="TreeVNC.iws" /> <ignored path=".idea/workspace.xml" /> @@ -27,115 +32,101 @@ <favorites_list name="TreeVNC" /> </component> <component name="FileEditorManager"> - <splitter split-orientation="horizontal" split-proportion="0.4635514"> + <splitter split-orientation="horizontal" split-proportion="0.49320754"> <split-first> <leaf> - <file leaf-file-name="ProtocolState.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/ProtocolState.java"> + <file leaf-file-name="ZRLEDecoder.java" pinned="false" current-in-tab="false"> + <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" vertical-offset="0" max-vertical-offset="615"> - <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ProtocolContext.java" pinned="false" current-in-tab="false"> - <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" vertical-offset="1155" max-vertical-offset="1515"> - <caret line="107" column="38" selection-start-line="107" selection-start-column="38" selection-end-line="107" selection-end-column="38" /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4239"> + <caret line="45" column="28" selection-start-line="45" selection-start-column="28" selection-end-line="45" selection-end-column="28" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="ZRLEESender.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java"> + <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="0.0" vertical-offset="300" max-vertical-offset="900"> - <caret line="29" column="23" selection-start-line="29" selection-start-column="23" selection-end-line="29" selection-end-column="23" /> + <state vertical-scroll-proportion="-29.5" vertical-offset="0" max-vertical-offset="4940"> + <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="ZRLEDecoder.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEDecoder.java"> + <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="2085" max-vertical-offset="2355"> - <caret line="163" column="0" selection-start-line="163" selection-start-column="0" selection-end-line="163" selection-end-column="0" /> - <folding /> + <state vertical-scroll-proportion="-10.35" vertical-offset="8199" max-vertical-offset="9747"> + <caret line="344" column="20" selection-start-line="344" selection-start-column="20" selection-end-line="344" selection-end-column="20" /> + <folding> + <element signature="imports" expanded="true" /> + <element signature="e#16800#16801#0" expanded="true" /> + <element signature="e#16833#16834#0" expanded="true" /> + </folding> </state> </provider> </entry> </file> - <file leaf-file-name="ZlibDecoder.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZlibDecoder.java"> + <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" vertical-offset="390" max-vertical-offset="720"> - <caret line="56" column="57" selection-start-line="56" selection-start-column="57" selection-end-line="56" selection-end-column="57" /> + <state vertical-scroll-proportion="0.0" vertical-offset="1410" max-vertical-offset="6720"> + <caret line="112" column="31" selection-start-line="112" selection-start-column="31" selection-end-line="112" selection-end-column="31" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="ProtocolSettings.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java"> + <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" vertical-offset="135" max-vertical-offset="5760"> - <caret line="42" column="21" selection-start-line="42" selection-start-column="20" selection-end-line="42" selection-end-column="21" /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2400"> + <caret line="42" column="11" selection-start-line="42" selection-start-column="11" selection-end-line="42" selection-end-column="11" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="FramebufferUpdateRectangle.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/FramebufferUpdateRectangle.java"> + <file leaf-file-name="Renderer.java" pinned="false" current-in-tab="false"> + <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.0" vertical-offset="420" max-vertical-offset="945"> - <caret line="54" column="41" selection-start-line="54" selection-start-column="41" selection-end-line="54" selection-end-column="41" /> + <state vertical-scroll-proportion="0.0" vertical-offset="406" max-vertical-offset="9280"> + <caret line="54" column="19" selection-start-line="54" selection-start-column="19" selection-end-line="54" selection-end-column="19" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="TreeManagement.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java"> + <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" vertical-offset="1485" max-vertical-offset="3930"> - <caret line="102" column="29" selection-start-line="102" selection-start-column="29" selection-end-line="102" selection-end-column="29" /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="840"> + <caret line="46" column="8" selection-start-line="46" selection-start-column="8" selection-end-line="46" selection-end-column="8" /> <folding> - <element signature="imports" expanded="false" /> - <element signature="e#250#263#0" expanded="false" /> - <element signature="e#5556#5557#0" expanded="false" /> - <element signature="e#5622#5623#0" expanded="false" /> - <element signature="e#8109#8110#0" expanded="false" /> - <element signature="e#8140#8141#0" expanded="false" /> - <element signature="e#8196#8197#0" expanded="false" /> - <element signature="e#8226#8227#0" expanded="false" /> - <element signature="e#8260#8261#0" expanded="false" /> - <element signature="e#8293#8294#0" expanded="false" /> + <element signature="e#1938#1939#0" expanded="true" /> + <element signature="e#1959#1960#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"> + <file leaf-file-name="SwingViewerWindow.java" pinned="false" current-in-tab="true"> + <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="420" max-vertical-offset="1035"> - <caret line="56" column="13" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" /> + <state vertical-scroll-proportion="0.5764431" vertical-offset="15711" max-vertical-offset="21675"> + <caret line="792" column="16" selection-start-line="792" selection-start-column="16" selection-end-line="792" selection-end-column="16" /> <folding /> </state> </provider> </entry> </file> - <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"> + <file leaf-file-name="FramebufferUpdateRequestMessage.java" pinned="false" current-in-tab="false"> + <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="1.6510904" vertical-offset="80" max-vertical-offset="5080"> - <caret line="153" column="40" selection-start-line="153" selection-start-column="40" selection-end-line="153" selection-end-column="40" /> + <state vertical-scroll-proportion="0.0" vertical-offset="48" max-vertical-offset="1488"> + <caret line="42" column="11" selection-start-line="42" selection-start-column="11" selection-end-line="42" selection-end-column="11" /> <folding /> </state> </provider> @@ -148,25 +139,12 @@ <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" vertical-offset="5580" max-vertical-offset="7200"> - <caret line="388" column="56" selection-start-line="388" selection-start-column="56" selection-end-line="388" selection-end-column="56" /> + <state vertical-scroll-proportion="0.0" vertical-offset="6791" max-vertical-offset="11208"> + <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#6823#6824#0" expanded="false" /> - <element signature="e#6852#6853#0" expanded="false" /> - <element signature="e#7108#7109#0" expanded="false" /> - <element signature="e#7140#7141#0" expanded="false" /> - <element signature="e#7676#7677#0" expanded="false" /> - <element signature="e#7718#7719#0" expanded="false" /> - <element signature="e#9152#9153#0" expanded="false" /> - <element signature="e#9195#9196#0" expanded="false" /> - <element signature="e#9621#9622#0" expanded="false" /> - <element signature="e#9653#9654#0" expanded="false" /> - <element signature="e#9755#9756#0" expanded="false" /> - <element signature="e#9799#9800#0" expanded="false" /> - <element signature="e#9845#9846#0" expanded="false" /> - <element signature="e#9886#9887#0" expanded="false" /> - <element signature="e#9929#9930#0" expanded="false" /> - <element signature="e#9967#9968#0" expanded="false" /> + <element signature="e#0#16299#0" expanded="true" /> + <element signature="imports" expanded="true" /> + <element signature="e#15752#15763#0" expanded="true" /> </folding> </state> </provider> @@ -175,8 +153,8 @@ <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" vertical-offset="189" max-vertical-offset="9045"> - <caret line="72" column="26" selection-start-line="72" selection-start-column="26" selection-end-line="72" selection-end-column="26" /> + <state vertical-scroll-proportion="0.0" vertical-offset="7680" max-vertical-offset="9045"> + <caret line="376" column="46" selection-start-line="376" selection-start-column="46" selection-end-line="376" selection-end-column="46" /> <folding> <element signature="e#3540#3541#0" expanded="true" /> <element signature="e#3596#3597#0" expanded="true" /> @@ -195,41 +173,6 @@ </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="180" max-vertical-offset="2445"> - <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> - </file> - <file leaf-file-name="TreeVncCommand.java" pinned="false" current-in-tab="false"> - <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" vertical-offset="2025" max-vertical-offset="2235"> - <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" /> - <element signature="e#4591#4592#0" expanded="false" /> - <element signature="e#4621#4622#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - </file> <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"> @@ -240,6 +183,26 @@ </provider> </entry> </file> + <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" vertical-offset="278" max-vertical-offset="1632"> + <caret line="78" column="53" selection-start-line="78" selection-start-column="53" selection-end-line="78" selection-end-column="53" /> + <folding /> + </state> + </provider> + </entry> + </file> + <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" vertical-offset="721" max-vertical-offset="2016"> + <caret line="88" column="22" selection-start-line="88" selection-start-column="22" selection-end-line="88" selection-end-column="22" /> + <folding /> + </state> + </provider> + </entry> + </file> <file leaf-file-name="VncProxyService.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/VncProxyService.java"> <provider selected="true" editor-type-id="text-editor"> @@ -250,108 +213,19 @@ </provider> </entry> </file> - <file leaf-file-name="Protocol.java" pinned="false" current-in-tab="false"> + <file leaf-file-name="Protocol.java" pinned="false" current-in-tab="true"> <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="98.525" vertical-offset="4501" max-vertical-offset="6320"> - <caret line="44" column="13" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" /> - <folding> - <element signature="e#0#12518#0" expanded="true" /> - </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="12810" max-vertical-offset="13005"> - <caret line="1015" column="22" selection-start-line="1015" selection-start-column="22" selection-end-line="1015" selection-end-column="22" /> + <state vertical-scroll-proportion="0.33333334" vertical-offset="6662" max-vertical-offset="9193"> + <caret line="284" column="16" selection-start-line="284" selection-start-column="16" selection-end-line="284" selection-end-column="16" /> <folding> - <element signature="e#0#40965#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#4639#5164#0" expanded="false" /> - <element signature="e#4943#5130#0" expanded="false" /> - <element signature="e#5129#5130#0" expanded="false" /> - <element signature="e#5163#5164#0" expanded="false" /> - <element signature="e#5533#5534#0" expanded="false" /> - <element signature="e#5598#5599#0" expanded="false" /> - <element signature="e#5670#5671#0" expanded="false" /> - <element signature="e#5735#5736#0" expanded="false" /> - <element signature="e#6165#6166#0" expanded="false" /> - <element signature="e#6230#6231#0" expanded="false" /> - <element signature="e#6302#6303#0" expanded="false" /> - <element signature="e#6367#6368#0" expanded="false" /> - <element signature="e#8119#8120#0" expanded="false" /> - <element signature="e#8161#8162#0" expanded="false" /> - <element signature="e#8228#8229#0" expanded="false" /> - <element signature="e#8283#8284#0" expanded="false" /> - <element signature="e#13646#13859#0" expanded="false" /> - <element signature="e#13858#13859#0" expanded="false" /> - <element signature="e#13931#14143#0" expanded="false" /> - <element signature="e#14142#14143#0" expanded="false" /> - <element signature="e#14220#14474#0" expanded="false" /> - <element signature="e#14473#14474#0" expanded="false" /> - <element signature="e#14582#15076#0" expanded="false" /> - <element signature="e#15075#15076#0" expanded="false" /> - <element signature="e#15191#15680#0" expanded="false" /> - <element signature="e#15679#15680#0" expanded="false" /> - <element signature="e#18487#18851#0" expanded="false" /> - <element signature="e#18850#18851#0" expanded="false" /> - <element signature="e#19337#19338#0" expanded="false" /> - <element signature="e#19391#19392#0" expanded="false" /> - <element signature="e#20835#20836#0" expanded="false" /> - <element signature="e#20865#20866#0" expanded="false" /> - <element signature="e#21224#21225#0" expanded="false" /> - <element signature="e#21303#21304#0" expanded="false" /> - <element signature="e#21730#21731#0" expanded="false" /> - <element signature="e#21792#21793#0" expanded="false" /> - <element signature="e#22379#22380#0" expanded="false" /> - <element signature="e#22436#22437#0" expanded="false" /> - <element signature="e#22469#22470#0" expanded="false" /> - <element signature="e#22527#22528#0" expanded="false" /> - <element signature="e#22561#22562#0" expanded="false" /> - <element signature="e#22651#22652#0" expanded="false" /> - <element signature="e#22686#22687#0" expanded="false" /> - <element signature="e#22758#22759#0" expanded="false" /> - <element signature="e#27362#27550#0" expanded="false" /> - <element signature="e#27549#27550#0" expanded="false" /> - <element signature="e#28094#28612#0" expanded="false" /> - <element signature="e#28244#28562#0" expanded="false" /> - <element signature="e#28561#28562#0" expanded="false" /> - <element signature="e#28611#28612#0" expanded="false" /> - <element signature="e#28761#28762#0" expanded="false" /> - <element signature="e#28814#28815#0" expanded="false" /> - <element signature="e#28858#28859#0" expanded="false" /> - <element signature="e#28911#28912#0" expanded="false" /> - <element signature="e#29198#29865#0" expanded="false" /> - <element signature="e#29864#29865#0" expanded="false" /> - <element signature="e#29958#30118#0" expanded="false" /> - <element signature="e#30117#30118#0" expanded="false" /> - <element signature="e#30365#30573#0" expanded="false" /> - <element signature="e#30572#30573#0" expanded="false" /> - <element signature="e#30641#30857#0" expanded="false" /> - <element signature="e#30856#30857#0" expanded="false" /> - <element signature="e#30957#31174#0" expanded="false" /> - <element signature="e#31173#31174#0" expanded="false" /> - <element signature="e#31390#31602#0" expanded="false" /> - <element signature="e#31601#31602#0" expanded="false" /> - <element signature="e#31739#31947#0" expanded="false" /> - <element signature="e#31946#31947#0" expanded="false" /> - <element signature="e#32088#32540#0" expanded="false" /> - <element signature="e#32539#32540#0" expanded="false" /> - <element signature="e#32679#33129#0" expanded="false" /> - <element signature="e#33128#33129#0" expanded="false" /> - <element signature="e#33251#34536#0" expanded="false" /> - <element signature="e#34535#34536#0" expanded="false" /> - <element signature="e#34676#34996#0" expanded="false" /> - <element signature="e#34995#34996#0" expanded="false" /> - <element signature="e#35136#35437#0" expanded="false" /> - <element signature="e#35436#35437#0" expanded="false" /> - <element signature="e#36093#36490#0" expanded="false" /> - <element signature="e#36489#36490#0" expanded="false" /> - <element signature="e#40480#40481#0" expanded="false" /> - <element signature="e#40515#40516#0" expanded="false" /> + <element signature="e#0#12477#0" expanded="true" /> + <element signature="e#4308#4309#0" expanded="true" /> + <element signature="e#4338#4339#0" expanded="true" /> + <element signature="e#4395#4396#0" expanded="true" /> + <element signature="e#4433#4434#0" expanded="true" /> + <element signature="e#4752#4753#0" expanded="true" /> + <element signature="e#4792#4793#0" expanded="true" /> </folding> </state> </provider> @@ -360,21 +234,31 @@ <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="0.0" vertical-offset="8933" max-vertical-offset="19320"> - <caret line="479" column="16" selection-start-line="479" selection-start-column="16" selection-end-line="479" selection-end-column="16" /> + <state vertical-scroll-proportion="-12.0" vertical-offset="9275" max-vertical-offset="19366"> + <caret line="507" column="37" selection-start-line="507" selection-start-column="37" selection-end-line="507" selection-end-column="37" /> <folding> <element signature="e#19848#19860#0" expanded="true" /> - <element signature="e#26002#26014#0" expanded="true" /> + <element signature="e#26146#26158#0" expanded="true" /> </folding> </state> </provider> </entry> </file> - <file leaf-file-name="TreeVNCNetwork.java" pinned="false" current-in-tab="true"> + <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" vertical-offset="0" max-vertical-offset="1008"> + <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.23130842" vertical-offset="0" max-vertical-offset="2403"> - <caret line="19" column="28" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" /> + <state vertical-scroll-proportion="0.0" vertical-offset="162" max-vertical-offset="2403"> + <caret line="34" column="38" selection-start-line="34" selection-start-column="38" selection-end-line="34" selection-end-column="38" /> <folding /> </state> </provider> @@ -655,14 +539,12 @@ <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/EncodingType.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/test/IsRetina.java" /> - <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java" /> <option value="$PROJECT_DIR$/README.txt" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SendCheckDelay.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/TreeVncCommandChannelListener.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/FramebufferUpdateRectangle.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZlibDecoder.java" /> @@ -674,14 +556,17 @@ <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/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/TreeVNCNetwork.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.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/TreeVNCNetwork.java" /> + <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java" /> </list> </option> </component> <component name="ProjectFrameBounds"> - <option name="x" value="4" /> + <option name="x" value="59" /> <option name="y" value="23" /> <option name="width" value="3836" /> <option name="height" value="2137" /> @@ -1372,8 +1257,8 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="4" y="23" width="3836" height="2137" extended-state="6" /> - <editor active="false" /> + <frame x="59" y="23" width="3836" height="2137" extended-state="6" /> + <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" /> @@ -1394,8 +1279,8 @@ <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.15745568" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> - <window_info id="Hierarchy" active="true" 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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.34071887" 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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3417036" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <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="false" weight="0.32940573" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> @@ -1484,19 +1369,19 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java</url> - <line>357</line> + <line>364</line> <properties /> <option name="timeStamp" value="75" /> </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>535</line> + <line>536</line> <properties /> <option name="timeStamp" value="76" /> </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java</url> - <line>314</line> + <line>313</line> <properties /> <option name="timeStamp" value="77" /> </line-breakpoint> @@ -1508,7 +1393,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>821</line> + <line>823</line> <properties /> <option name="timeStamp" value="85" /> </line-breakpoint> @@ -1569,7 +1454,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java</url> - <line>115</line> + <line>108</line> <properties /> <option name="timeStamp" value="113" /> </line-breakpoint> @@ -1617,19 +1502,13 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>796</line> + <line>798</line> <properties /> <option name="timeStamp" value="127" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java</url> - <line>286</line> - <properties /> - <option name="timeStamp" value="129" /> - </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java</url> - <line>187</line> + <line>180</line> <properties /> <option name="timeStamp" value="131" /> </line-breakpoint> @@ -1658,130 +1537,6 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/Class.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="8605" max-vertical-offset="53025"> - <caret line="680" column="0" selection-start-line="680" selection-start-column="0" selection-end-line="680" selection-end-column="0" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/transport/Writer.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="55" max-vertical-offset="2300"> - <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" /> - <folding> - <element signature="e#1352#1353#0" expanded="false" /> - <element signature="e#1393#1394#0" expanded="false" /> - </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" vertical-offset="0" max-vertical-offset="2880"> - <caret line="37" column="0" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" /> - <folding> - <element signature="e#1502#1503#0" expanded="false" /> - <element signature="e#1576#1577#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="506" max-vertical-offset="3335"> - <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" /> - <folding /> - </state> - </provider> - </entry> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/String.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="55774" max-vertical-offset="76450"> - <caret line="2326" column="24" selection-start-line="2326" selection-start-column="24" selection-end-line="2326" selection-end-column="24" /> - <folding> - <element signature="e#0#123952#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#4677#4678#0" expanded="false" /> - <element signature="e#4717#4718#0" expanded="false" /> - <element signature="e#5690#5691#0" expanded="false" /> - <element signature="e#5753#5754#0" expanded="false" /> - <element signature="e#12762#12763#0" expanded="false" /> - <element signature="e#12814#12815#0" expanded="false" /> - <element signature="e#18445#18446#0" expanded="false" /> - <element signature="e#18498#18499#0" expanded="false" /> - <element signature="e#20391#20392#0" expanded="false" /> - <element signature="e#20435#20436#0" expanded="false" /> - <element signature="e#21625#21626#0" expanded="false" /> - <element signature="e#21705#21706#0" expanded="false" /> - <element signature="e#22450#22451#0" expanded="false" /> - <element signature="e#22485#22486#0" expanded="false" /> - <element signature="e#22736#22737#0" expanded="false" /> - <element signature="e#22776#22777#0" expanded="false" /> - <element signature="e#29126#29127#0" expanded="false" /> - <element signature="e#29197#29198#0" expanded="false" /> - <element signature="e#36057#36058#0" expanded="false" /> - <element signature="e#36123#36124#0" expanded="false" /> - <element signature="e#38033#38034#0" expanded="false" /> - <element signature="e#38087#38088#0" expanded="false" /> - <element signature="e#47179#47180#0" expanded="false" /> - <element signature="e#47243#47244#0" expanded="false" /> - <element signature="e#55441#55442#0" expanded="false" /> - <element signature="e#55485#55486#0" expanded="false" /> - <element signature="e#56078#56079#0" expanded="false" /> - <element signature="e#56155#56156#0" expanded="false" /> - <element signature="e#58122#58123#0" expanded="false" /> - <element signature="e#58159#58160#0" expanded="false" /> - <element signature="e#62501#62502#0" expanded="false" /> - <element signature="e#62557#62558#0" expanded="false" /> - <element signature="e#66098#66099#0" expanded="false" /> - <element signature="e#66136#66137#0" expanded="false" /> - <element signature="e#70390#70391#0" expanded="false" /> - <element signature="e#70443#70444#0" expanded="false" /> - <element signature="e#77881#77882#0" expanded="false" /> - <element signature="e#77940#77941#0" expanded="false" /> - <element signature="e#82257#82258#0" expanded="false" /> - <element signature="e#82308#82309#0" expanded="false" /> - <element signature="e#82612#82613#0" expanded="false" /> - <element signature="e#82661#82662#0" expanded="false" /> - <element signature="e#104316#104317#0" expanded="false" /> - <element signature="e#104371#104372#0" expanded="false" /> - <element signature="e#110837#110838#0" expanded="false" /> - <element signature="e#110892#110893#0" expanded="false" /> - <element signature="e#112984#112985#0" expanded="false" /> - <element signature="e#113011#113012#0" expanded="false" /> - <element signature="e#117534#117535#0" expanded="false" /> - <element signature="e#117596#117597#0" expanded="false" /> - <element signature="e#118046#118047#0" expanded="false" /> - <element signature="e#118085#118086#0" expanded="false" /> - <element signature="e#119097#119098#0" expanded="false" /> - <element signature="e#119151#119152#0" expanded="false" /> - <element signature="e#119800#119801#0" expanded="false" /> - <element signature="e#119854#119855#0" expanded="false" /> - <element signature="e#120123#120124#0" expanded="false" /> - <element signature="e#120162#120163#0" expanded="false" /> - <element signature="e#120530#120531#0" expanded="false" /> - <element signature="e#120573#120574#0" expanded="false" /> - <element signature="e#121368#121369#0" expanded="false" /> - <element signature="e#121410#121411#0" expanded="false" /> - <element signature="e#121825#121826#0" expanded="false" /> - <element signature="e#121864#121865#0" expanded="false" /> - <element signature="e#122286#122287#0" expanded="false" /> - <element signature="e#122326#122327#0" expanded="false" /> - <element signature="e#122756#122757#0" expanded="false" /> - <element signature="e#122797#122798#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="175" max-vertical-offset="1700"> - <caret line="51" column="7" selection-start-line="50" selection-start-column="0" selection-end-line="58" selection-end-column="5" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.45038167" vertical-offset="2098" max-vertical-offset="3408"> @@ -1824,21 +1579,6 @@ </state> </provider> </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" vertical-offset="121" max-vertical-offset="1700"> - <caret line="89" column="25" selection-start-line="89" selection-start-column="25" selection-end-line="89" selection-end-column="25" /> - <folding /> - </state> - </provider> - </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.30339196" vertical-offset="0" max-vertical-offset="1592"> - <caret line="46" column="8" selection-start-line="46" selection-start-column="8" selection-end-line="46" selection-end-column="8" /> - </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" vertical-offset="0" max-vertical-offset="1452"> @@ -1891,25 +1631,405 @@ </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="3251" max-vertical-offset="6102"> - <caret line="182" column="13" selection-start-line="182" selection-start-column="13" selection-end-line="182" selection-end-column="13" /> - </state> - </provider> - </entry> <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/awt/Component.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="73566" max-vertical-offset="232416"> <caret line="3345" column="40" selection-start-line="3345" selection-start-column="40" selection-end-line="3345" selection-end-column="40" /> - </state> - </provider> - </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" vertical-offset="1972" max-vertical-offset="3938"> - <caret line="163" column="0" selection-start-line="163" selection-start-column="0" selection-end-line="163" selection-end-column="0" /> - <folding /> + <folding> + <element signature="e#0#377448#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#20741#20742#0" expanded="false" /> + <element signature="e#20774#20775#0" expanded="false" /> + <element signature="e#27745#27746#0" expanded="false" /> + <element signature="e#27812#27813#0" expanded="false" /> + <element signature="e#29358#29359#0" expanded="false" /> + <element signature="e#29419#29420#0" expanded="false" /> + <element signature="e#29475#29476#0" expanded="false" /> + <element signature="e#29543#29544#0" expanded="false" /> + <element signature="e#29815#29816#0" expanded="false" /> + <element signature="e#29870#29871#0" expanded="false" /> + <element signature="e#29949#29950#0" expanded="false" /> + <element signature="e#30010#30011#0" expanded="false" /> + <element signature="e#30067#30068#0" expanded="false" /> + <element signature="e#30135#30136#0" expanded="false" /> + <element signature="e#30205#30206#0" expanded="false" /> + <element signature="e#30257#30258#0" expanded="false" /> + <element signature="e#30473#30474#0" expanded="false" /> + <element signature="e#30540#30541#0" expanded="false" /> + <element signature="e#30733#30734#0" expanded="false" /> + <element signature="e#30792#30793#0" expanded="false" /> + <element signature="e#30851#30852#0" expanded="false" /> + <element signature="e#30907#30908#0" expanded="false" /> + <element signature="e#30961#30962#0" expanded="false" /> + <element signature="e#31029#31030#0" expanded="false" /> + <element signature="e#31088#31089#0" expanded="false" /> + <element signature="e#31136#31137#0" expanded="false" /> + <element signature="e#31206#31207#0" expanded="false" /> + <element signature="e#31254#31255#0" expanded="false" /> + <element signature="e#31313#31314#0" expanded="false" /> + <element signature="e#31390#31391#0" expanded="false" /> + <element signature="e#31452#31453#0" expanded="false" /> + <element signature="e#31509#31510#0" expanded="false" /> + <element signature="e#31559#31560#0" expanded="false" /> + <element signature="e#31608#31609#0" expanded="false" /> + <element signature="e#31659#31660#0" expanded="false" /> + <element signature="e#31709#31710#0" expanded="false" /> + <element signature="e#31755#31756#0" expanded="false" /> + <element signature="e#31800#31801#0" expanded="false" /> + <element signature="e#31846#31847#0" expanded="false" /> + <element signature="e#31891#31892#0" expanded="false" /> + <element signature="e#31948#31949#0" expanded="false" /> + <element signature="e#32002#32003#0" expanded="false" /> + <element signature="e#32059#32060#0" expanded="false" /> + <element signature="e#32113#32114#0" expanded="false" /> + <element signature="e#32187#32188#0" expanded="false" /> + <element signature="e#32247#32248#0" expanded="false" /> + <element signature="e#32297#32298#0" expanded="false" /> + <element signature="e#32363#32364#0" expanded="false" /> + <element signature="e#32430#32431#0" expanded="false" /> + <element signature="e#32482#32483#0" expanded="false" /> + <element signature="e#32701#32702#0" expanded="false" /> + <element signature="e#32763#32764#0" expanded="false" /> + <element signature="e#33174#33175#0" expanded="false" /> + <element signature="e#33229#33230#0" expanded="false" /> + <element signature="e#33321#33322#0" expanded="false" /> + <element signature="e#33368#33369#0" expanded="false" /> + <element signature="e#34813#34814#0" expanded="false" /> + <element signature="e#34860#34861#0" expanded="false" /> + <element signature="e#35174#35175#0" expanded="false" /> + <element signature="e#35203#35204#0" expanded="false" /> + <element signature="e#35420#35421#0" expanded="false" /> + <element signature="e#35467#35468#0" expanded="false" /> + <element signature="e#35690#35691#0" expanded="false" /> + <element signature="e#35717#35718#0" expanded="false" /> + <element signature="e#38201#38202#0" expanded="false" /> + <element signature="e#38238#38239#0" expanded="false" /> + <element signature="e#39573#39574#0" expanded="false" /> + <element signature="e#39600#39601#0" expanded="false" /> + <element signature="e#40173#40174#0" expanded="false" /> + <element signature="e#40212#40213#0" expanded="false" /> + <element signature="e#41173#41174#0" expanded="false" /> + <element signature="e#41219#41220#0" expanded="false" /> + <element signature="e#42274#42275#0" expanded="false" /> + <element signature="e#42314#42315#0" expanded="false" /> + <element signature="e#42743#42744#0" expanded="false" /> + <element signature="e#42790#42791#0" expanded="false" /> + <element signature="e#42835#42836#0" expanded="false" /> + <element signature="e#42865#42866#0" expanded="false" /> + <element signature="e#43181#43182#0" expanded="false" /> + <element signature="e#43264#43265#0" expanded="false" /> + <element signature="e#47536#47537#0" expanded="false" /> + <element signature="e#47571#47572#0" expanded="false" /> + <element signature="e#49065#49066#0" expanded="false" /> + <element signature="e#49103#49104#0" expanded="false" /> + <element signature="e#49258#49259#0" expanded="false" /> + <element signature="e#49288#49289#0" expanded="false" /> + <element signature="e#50094#50095#0" expanded="false" /> + <element signature="e#50119#50120#0" expanded="false" /> + <element signature="e#53054#53055#0" expanded="false" /> + <element signature="e#53082#53083#0" expanded="false" /> + <element signature="e#55232#55233#0" expanded="false" /> + <element signature="e#55255#55256#0" expanded="false" /> + <element signature="e#57027#57028#0" expanded="false" /> + <element signature="e#57064#57065#0" expanded="false" /> + <element signature="e#57110#57111#0" expanded="false" /> + <element signature="e#57178#57179#0" expanded="false" /> + <element signature="e#61184#61185#0" expanded="false" /> + <element signature="e#61227#61228#0" expanded="false" /> + <element signature="e#63292#63293#0" expanded="false" /> + <element signature="e#63335#63336#0" expanded="false" /> + <element signature="e#63604#63605#0" expanded="false" /> + <element signature="e#63649#63650#0" expanded="false" /> + <element signature="e#65989#65990#0" expanded="false" /> + <element signature="e#66026#66027#0" expanded="false" /> + <element signature="e#69348#69349#0" expanded="false" /> + <element signature="e#69381#69382#0" expanded="false" /> + <element signature="e#71158#71159#0" expanded="false" /> + <element signature="e#71204#71205#0" expanded="false" /> + <element signature="e#71249#71250#0" expanded="false" /> + <element signature="e#71287#71288#0" expanded="false" /> + <element signature="e#72045#72046#0" expanded="false" /> + <element signature="e#72071#72072#0" expanded="false" /> + <element signature="e#73038#73039#0" expanded="false" /> + <element signature="e#73075#73076#0" expanded="false" /> + <element signature="e#73601#73602#0" expanded="false" /> + <element signature="e#73630#73631#0" expanded="false" /> + <element signature="e#73778#73779#0" expanded="false" /> + <element signature="e#73829#73830#0" expanded="false" /> + <element signature="e#74351#74352#0" expanded="false" /> + <element signature="e#74388#74389#0" expanded="false" /> + <element signature="e#75252#75253#0" expanded="false" /> + <element signature="e#75277#75278#0" expanded="false" /> + <element signature="e#75442#75443#0" expanded="false" /> + <element signature="e#75484#75485#0" expanded="false" /> + <element signature="e#75865#75866#0" expanded="false" /> + <element signature="e#75896#75897#0" expanded="false" /> + <element signature="e#76048#76049#0" expanded="false" /> + <element signature="e#76105#76106#0" expanded="false" /> + <element signature="e#77012#77013#0" expanded="false" /> + <element signature="e#77056#77057#0" expanded="false" /> + <element signature="e#82938#82939#0" expanded="false" /> + <element signature="e#82992#82993#0" expanded="false" /> + <element signature="e#83382#83383#0" expanded="false" /> + <element signature="e#83406#83407#0" expanded="false" /> + <element signature="e#83796#83797#0" expanded="false" /> + <element signature="e#83820#83821#0" expanded="false" /> + <element signature="e#84190#84191#0" expanded="false" /> + <element signature="e#84218#84219#0" expanded="false" /> + <element signature="e#84593#84594#0" expanded="false" /> + <element signature="e#84622#84623#0" expanded="false" /> + <element signature="e#88309#88310#0" expanded="false" /> + <element signature="e#88368#88369#0" expanded="false" /> + <element signature="e#89626#89627#0" expanded="false" /> + <element signature="e#89660#89661#0" expanded="false" /> + <element signature="e#89901#89902#0" expanded="false" /> + <element signature="e#89939#89940#0" expanded="false" /> + <element signature="e#91798#91799#0" expanded="false" /> + <element signature="e#91831#91832#0" expanded="false" /> + <element signature="e#92067#92068#0" expanded="false" /> + <element signature="e#92103#92104#0" expanded="false" /> + <element signature="e#93996#93997#0" expanded="false" /> + <element signature="e#94029#94030#0" expanded="false" /> + <element signature="e#94829#94830#0" expanded="false" /> + <element signature="e#94868#94869#0" expanded="false" /> + <element signature="e#95247#95248#0" expanded="false" /> + <element signature="e#95286#95287#0" expanded="false" /> + <element signature="e#97756#97757#0" expanded="false" /> + <element signature="e#97807#97808#0" expanded="false" /> + <element signature="e#98063#98064#0" expanded="false" /> + <element signature="e#98087#98088#0" expanded="false" /> + <element signature="e#102003#102004#0" expanded="false" /> + <element signature="e#102044#102045#0" expanded="false" /> + <element signature="e#108442#108443#0" expanded="false" /> + <element signature="e#108489#108490#0" expanded="false" /> + <element signature="e#109269#109270#0" expanded="false" /> + <element signature="e#109308#109309#0" expanded="false" /> + <element signature="e#112003#112004#0" expanded="false" /> + <element signature="e#112027#112028#0" expanded="false" /> + <element signature="e#113128#113129#0" expanded="false" /> + <element signature="e#113152#113153#0" expanded="false" /> + <element signature="e#114014#114015#0" expanded="false" /> + <element signature="e#114061#114062#0" expanded="false" /> + <element signature="e#114727#114728#0" expanded="false" /> + <element signature="e#114775#114776#0" expanded="false" /> + <element signature="e#118877#118878#0" expanded="false" /> + <element signature="e#118901#118902#0" expanded="false" /> + <element signature="e#120005#120006#0" expanded="false" /> + <element signature="e#120029#120030#0" expanded="false" /> + <element signature="e#127614#127615#0" expanded="false" /> + <element signature="e#127674#127675#0" expanded="false" /> + <element signature="e#130347#130348#0" expanded="false" /> + <element signature="e#130405#130406#0" expanded="false" /> + <element signature="e#138564#138565#0" expanded="false" /> + <element signature="e#138601#138602#0" expanded="false" /> + <element signature="e#148312#148313#0" expanded="false" /> + <element signature="e#148352#148353#0" expanded="false" /> + <element signature="e#150476#150477#0" expanded="false" /> + <element signature="e#150524#150525#0" expanded="false" /> + <element signature="e#150672#150673#0" expanded="false" /> + <element signature="e#150724#150725#0" expanded="false" /> + <element signature="e#150928#150929#0" expanded="false" /> + <element signature="e#151005#151006#0" expanded="false" /> + <element signature="e#154922#154923#0" expanded="false" /> + <element signature="e#154957#154958#0" expanded="false" /> + <element signature="e#157914#157915#0" expanded="false" /> + <element signature="e#157954#157955#0" expanded="false" /> + <element signature="e#160105#160106#0" expanded="false" /> + <element signature="e#160153#160154#0" expanded="false" /> + <element signature="e#160661#160662#0" expanded="false" /> + <element signature="e#160714#160715#0" expanded="false" /> + <element signature="e#161644#161645#0" expanded="false" /> + <element signature="e#161697#161698#0" expanded="false" /> + <element signature="e#162460#162461#0" expanded="false" /> + <element signature="e#162500#162501#0" expanded="false" /> + <element signature="e#162554#162555#0" expanded="false" /> + <element signature="e#162589#162590#0" expanded="false" /> + <element signature="e#162633#162634#0" expanded="false" /> + <element signature="e#162677#162678#0" expanded="false" /> + <element signature="e#162717#162718#0" expanded="false" /> + <element signature="e#162753#162754#0" expanded="false" /> + <element signature="e#162797#162798#0" expanded="false" /> + <element signature="e#162833#162834#0" expanded="false" /> + <element signature="e#163675#163676#0" expanded="false" /> + <element signature="e#163725#163726#0" expanded="false" /> + <element signature="e#163943#163944#0" expanded="false" /> + <element signature="e#163979#163980#0" expanded="false" /> + <element signature="e#164421#164422#0" expanded="false" /> + <element signature="e#164456#164457#0" expanded="false" /> + <element signature="e#164612#164613#0" expanded="false" /> + <element signature="e#164686#164687#0" expanded="false" /> + <element signature="e#165116#165117#0" expanded="false" /> + <element signature="e#165157#165158#0" expanded="false" /> + <element signature="e#166243#166244#0" expanded="false" /> + <element signature="e#166278#166279#0" expanded="false" /> + <element signature="e#166442#166443#0" expanded="false" /> + <element signature="e#166493#166494#0" expanded="false" /> + <element signature="e#166747#166748#0" expanded="false" /> + <element signature="e#166794#166795#0" expanded="false" /> + <element signature="e#166968#166969#0" expanded="false" /> + <element signature="e#166996#166997#0" expanded="false" /> + <element signature="e#167304#167305#0" expanded="false" /> + <element signature="e#167340#167341#0" expanded="false" /> + <element signature="e#181686#181687#0" expanded="false" /> + <element signature="e#181731#181732#0" expanded="false" /> + <element signature="e#188454#188455#0" expanded="false" /> + <element signature="e#188514#188515#0" expanded="false" /> + <element signature="e#191025#191026#0" expanded="false" /> + <element signature="e#191081#191082#0" expanded="false" /> + <element signature="e#194580#194581#0" expanded="false" /> + <element signature="e#194640#194641#0" expanded="false" /> + <element signature="e#198856#198857#0" expanded="false" /> + <element signature="e#198880#198881#0" expanded="false" /> + <element signature="e#203947#203948#0" expanded="false" /> + <element signature="e#204001#204002#0" expanded="false" /> + <element signature="e#206482#206483#0" expanded="false" /> + <element signature="e#206538#206539#0" expanded="false" /> + <element signature="e#212050#212051#0" expanded="false" /> + <element signature="e#212111#212112#0" expanded="false" /> + <element signature="e#218458#218459#0" expanded="false" /> + <element signature="e#218485#218486#0" expanded="false" /> + <element signature="e#222684#222703#0" expanded="false" /> + <element signature="e#223683#223684#0" expanded="false" /> + <element signature="e#223772#223773#0" expanded="false" /> + <element signature="e#225586#225587#0" expanded="false" /> + <element signature="e#225627#225628#0" expanded="false" /> + <element signature="e#240839#240840#0" expanded="false" /> + <element signature="e#240867#240868#0" expanded="false" /> + <element signature="e#246552#246553#0" expanded="false" /> + <element signature="e#246580#246581#0" expanded="false" /> + <element signature="e#246767#246768#0" expanded="false" /> + <element signature="e#246795#246796#0" expanded="false" /> + <element signature="e#246974#246975#0" expanded="false" /> + <element signature="e#247002#247003#0" expanded="false" /> + <element signature="e#247189#247190#0" expanded="false" /> + <element signature="e#247217#247218#0" expanded="false" /> + <element signature="e#247399#247400#0" expanded="false" /> + <element signature="e#247427#247428#0" expanded="false" /> + <element signature="e#247608#247609#0" expanded="false" /> + <element signature="e#247636#247637#0" expanded="false" /> + <element signature="e#247806#247807#0" expanded="false" /> + <element signature="e#247834#247835#0" expanded="false" /> + <element signature="e#248002#248003#0" expanded="false" /> + <element signature="e#248030#248031#0" expanded="false" /> + <element signature="e#248260#248261#0" expanded="false" /> + <element signature="e#248288#248289#0" expanded="false" /> + <element signature="e#256331#256332#0" expanded="false" /> + <element signature="e#256359#256360#0" expanded="false" /> + <element signature="e#256539#256540#0" expanded="false" /> + <element signature="e#256567#256568#0" expanded="false" /> + <element signature="e#257418#257419#0" expanded="false" /> + <element signature="e#257461#257462#0" expanded="false" /> + <element signature="e#258426#258427#0" expanded="false" /> + <element signature="e#258508#258509#0" expanded="false" /> + <element signature="e#269717#269718#0" expanded="false" /> + <element signature="e#269765#269766#0" expanded="false" /> + <element signature="e#271448#271449#0" expanded="false" /> + <element signature="e#271495#271496#0" expanded="false" /> + <element signature="e#271553#271554#0" expanded="false" /> + <element signature="e#271614#271615#0" expanded="false" /> + <element signature="e#274925#274926#0" expanded="false" /> + <element signature="e#274983#274984#0" expanded="false" /> + <element signature="e#277514#277515#0" expanded="false" /> + <element signature="e#277569#277570#0" expanded="false" /> + <element signature="e#277635#277636#0" expanded="false" /> + <element signature="e#277697#277698#0" expanded="false" /> + <element signature="e#280950#280951#0" expanded="false" /> + <element signature="e#281009#281010#0" expanded="false" /> + <element signature="e#291507#291508#0" expanded="false" /> + <element signature="e#291557#291558#0" expanded="false" /> + <element signature="e#291771#291772#0" expanded="false" /> + <element signature="e#291798#291799#0" expanded="false" /> + <element signature="e#291939#291940#0" expanded="false" /> + <element signature="e#291975#291976#0" expanded="false" /> + <element signature="e#294689#294690#0" expanded="false" /> + <element signature="e#294733#294734#0" expanded="false" /> + <element signature="e#298870#298871#0" expanded="false" /> + <element signature="e#298903#298904#0" expanded="false" /> + <element signature="e#299165#299166#0" expanded="false" /> + <element signature="e#299216#299217#0" expanded="false" /> + <element signature="e#299263#299264#0" expanded="false" /> + <element signature="e#299313#299314#0" expanded="false" /> + <element signature="e#301954#301955#0" expanded="false" /> + <element signature="e#302025#302026#0" expanded="false" /> + <element signature="e#302242#302243#0" expanded="false" /> + <element signature="e#302277#302278#0" expanded="false" /> + <element signature="e#302546#302547#0" expanded="false" /> + <element signature="e#302574#302575#0" expanded="false" /> + <element signature="e#303366#303367#0" expanded="false" /> + <element signature="e#303394#303395#0" expanded="false" /> + <element signature="e#332438#332439#0" expanded="false" /> + <element signature="e#332481#332482#0" expanded="false" /> + <element signature="e#335264#335265#0" expanded="false" /> + <element signature="e#335323#335324#0" expanded="false" /> + <element signature="e#336370#336371#0" expanded="false" /> + <element signature="e#336410#336411#0" expanded="false" /> + <element signature="e#342195#342196#0" expanded="false" /> + <element signature="e#342240#342241#0" expanded="false" /> + <element signature="e#343179#343180#0" expanded="false" /> + <element signature="e#343231#343232#0" expanded="false" /> + <element signature="e#343523#343524#0" expanded="false" /> + <element signature="e#343582#343583#0" expanded="false" /> + <element signature="e#343902#343903#0" expanded="false" /> + <element signature="e#343971#343972#0" expanded="false" /> + <element signature="e#345100#345101#0" expanded="false" /> + <element signature="e#345174#345175#0" expanded="false" /> + <element signature="e#345561#345562#0" expanded="false" /> + <element signature="e#345627#345628#0" expanded="false" /> + <element signature="e#345906#345907#0" expanded="false" /> + <element signature="e#345975#345976#0" expanded="false" /> + <element signature="e#346138#346139#0" expanded="false" /> + <element signature="e#346195#346196#0" expanded="false" /> + <element signature="e#346480#346481#0" expanded="false" /> + <element signature="e#346515#346516#0" expanded="false" /> + <element signature="e#346809#346810#0" expanded="false" /> + <element signature="e#346870#346871#0" expanded="false" /> + <element signature="e#347163#347164#0" expanded="false" /> + <element signature="e#347218#347219#0" expanded="false" /> + <element signature="e#347460#347461#0" expanded="false" /> + <element signature="e#347521#347522#0" expanded="false" /> + <element signature="e#347721#347722#0" expanded="false" /> + <element signature="e#347776#347777#0" expanded="false" /> + <element signature="e#348021#348022#0" expanded="false" /> + <element signature="e#348078#348079#0" expanded="false" /> + <element signature="e#348468#348469#0" expanded="false" /> + <element signature="e#348524#348525#0" expanded="false" /> + <element signature="e#348761#348762#0" expanded="false" /> + <element signature="e#348816#348817#0" expanded="false" /> + <element signature="e#349005#349006#0" expanded="false" /> + <element signature="e#349054#349055#0" expanded="false" /> + <element signature="e#349733#349734#0" expanded="false" /> + <element signature="e#349790#349791#0" expanded="false" /> + <element signature="e#351304#351305#0" expanded="false" /> + <element signature="e#351361#351362#0" expanded="false" /> + <element signature="e#352836#352837#0" expanded="false" /> + <element signature="e#352893#352894#0" expanded="false" /> + <element signature="e#353362#353363#0" expanded="false" /> + <element signature="e#353419#353420#0" expanded="false" /> + <element signature="e#354444#354445#0" expanded="false" /> + <element signature="e#354503#354504#0" expanded="false" /> + <element signature="e#354689#354690#0" expanded="false" /> + <element signature="e#354742#354743#0" expanded="false" /> + <element signature="e#355135#355136#0" expanded="false" /> + <element signature="e#355192#355193#0" expanded="false" /> + <element signature="e#355548#355549#0" expanded="false" /> + <element signature="e#355599#355600#0" expanded="false" /> + <element signature="e#356158#356159#0" expanded="false" /> + <element signature="e#356213#356214#0" expanded="false" /> + <element signature="e#356430#356431#0" expanded="false" /> + <element signature="e#356479#356480#0" expanded="false" /> + <element signature="e#357066#357067#0" expanded="false" /> + <element signature="e#357135#357136#0" expanded="false" /> + <element signature="e#357349#357350#0" expanded="false" /> + <element signature="e#357415#357416#0" expanded="false" /> + <element signature="e#357520#357521#0" expanded="false" /> + <element signature="e#357573#357574#0" expanded="false" /> + <element signature="e#357805#357806#0" expanded="false" /> + <element signature="e#357863#357864#0" expanded="false" /> + <element signature="e#358115#358116#0" expanded="false" /> + <element signature="e#358176#358177#0" expanded="false" /> + <element signature="e#377393#377394#0" expanded="false" /> + <element signature="e#377443#377444#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -1973,6 +2093,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="-1.6173842" vertical-offset="2099" max-vertical-offset="3330"> <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" /> + <folding /> </state> </provider> </entry> @@ -2083,43 +2204,6 @@ </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" vertical-offset="5580" max-vertical-offset="7200"> - <caret line="388" column="56" selection-start-line="388" selection-start-column="56" selection-end-line="388" selection-end-column="56" /> - <folding> - <element signature="e#6823#6824#0" expanded="false" /> - <element signature="e#6852#6853#0" expanded="false" /> - <element signature="e#7108#7109#0" expanded="false" /> - <element signature="e#7140#7141#0" expanded="false" /> - <element signature="e#7676#7677#0" expanded="false" /> - <element signature="e#7718#7719#0" expanded="false" /> - <element signature="e#9152#9153#0" expanded="false" /> - <element signature="e#9195#9196#0" expanded="false" /> - <element signature="e#9621#9622#0" expanded="false" /> - <element signature="e#9653#9654#0" expanded="false" /> - <element signature="e#9755#9756#0" expanded="false" /> - <element signature="e#9799#9800#0" expanded="false" /> - <element signature="e#9845#9846#0" expanded="false" /> - <element signature="e#9886#9887#0" expanded="false" /> - <element signature="e#9929#9930#0" expanded="false" /> - <element signature="e#9967#9968#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <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.67518497" vertical-offset="7271" max-vertical-offset="8850"> - <caret line="356" column="16" selection-start-line="356" selection-start-column="16" selection-end-line="356" selection-end-column="16" /> - <folding> - <element signature="imports" expanded="true" /> - <element signature="e#16552#16553#0" expanded="true" /> - <element signature="e#16585#16586#0" expanded="true" /> - </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" vertical-offset="0" max-vertical-offset="615"> @@ -2128,99 +2212,6 @@ </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" vertical-offset="12810" max-vertical-offset="13005"> - <caret line="1015" column="22" selection-start-line="1015" selection-start-column="22" selection-end-line="1015" selection-end-column="22" /> - <folding> - <element signature="e#0#40965#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#4639#5164#0" expanded="false" /> - <element signature="e#4943#5130#0" expanded="false" /> - <element signature="e#5129#5130#0" expanded="false" /> - <element signature="e#5163#5164#0" expanded="false" /> - <element signature="e#5533#5534#0" expanded="false" /> - <element signature="e#5598#5599#0" expanded="false" /> - <element signature="e#5670#5671#0" expanded="false" /> - <element signature="e#5735#5736#0" expanded="false" /> - <element signature="e#6165#6166#0" expanded="false" /> - <element signature="e#6230#6231#0" expanded="false" /> - <element signature="e#6302#6303#0" expanded="false" /> - <element signature="e#6367#6368#0" expanded="false" /> - <element signature="e#8119#8120#0" expanded="false" /> - <element signature="e#8161#8162#0" expanded="false" /> - <element signature="e#8228#8229#0" expanded="false" /> - <element signature="e#8283#8284#0" expanded="false" /> - <element signature="e#13646#13859#0" expanded="false" /> - <element signature="e#13858#13859#0" expanded="false" /> - <element signature="e#13931#14143#0" expanded="false" /> - <element signature="e#14142#14143#0" expanded="false" /> - <element signature="e#14220#14474#0" expanded="false" /> - <element signature="e#14473#14474#0" expanded="false" /> - <element signature="e#14582#15076#0" expanded="false" /> - <element signature="e#15075#15076#0" expanded="false" /> - <element signature="e#15191#15680#0" expanded="false" /> - <element signature="e#15679#15680#0" expanded="false" /> - <element signature="e#18487#18851#0" expanded="false" /> - <element signature="e#18850#18851#0" expanded="false" /> - <element signature="e#19337#19338#0" expanded="false" /> - <element signature="e#19391#19392#0" expanded="false" /> - <element signature="e#20835#20836#0" expanded="false" /> - <element signature="e#20865#20866#0" expanded="false" /> - <element signature="e#21224#21225#0" expanded="false" /> - <element signature="e#21303#21304#0" expanded="false" /> - <element signature="e#21730#21731#0" expanded="false" /> - <element signature="e#21792#21793#0" expanded="false" /> - <element signature="e#22379#22380#0" expanded="false" /> - <element signature="e#22436#22437#0" expanded="false" /> - <element signature="e#22469#22470#0" expanded="false" /> - <element signature="e#22527#22528#0" expanded="false" /> - <element signature="e#22561#22562#0" expanded="false" /> - <element signature="e#22651#22652#0" expanded="false" /> - <element signature="e#22686#22687#0" expanded="false" /> - <element signature="e#22758#22759#0" expanded="false" /> - <element signature="e#27362#27550#0" expanded="false" /> - <element signature="e#27549#27550#0" expanded="false" /> - <element signature="e#28094#28612#0" expanded="false" /> - <element signature="e#28244#28562#0" expanded="false" /> - <element signature="e#28561#28562#0" expanded="false" /> - <element signature="e#28611#28612#0" expanded="false" /> - <element signature="e#28761#28762#0" expanded="false" /> - <element signature="e#28814#28815#0" expanded="false" /> - <element signature="e#28858#28859#0" expanded="false" /> - <element signature="e#28911#28912#0" expanded="false" /> - <element signature="e#29198#29865#0" expanded="false" /> - <element signature="e#29864#29865#0" expanded="false" /> - <element signature="e#29958#30118#0" expanded="false" /> - <element signature="e#30117#30118#0" expanded="false" /> - <element signature="e#30365#30573#0" expanded="false" /> - <element signature="e#30572#30573#0" expanded="false" /> - <element signature="e#30641#30857#0" expanded="false" /> - <element signature="e#30856#30857#0" expanded="false" /> - <element signature="e#30957#31174#0" expanded="false" /> - <element signature="e#31173#31174#0" expanded="false" /> - <element signature="e#31390#31602#0" expanded="false" /> - <element signature="e#31601#31602#0" expanded="false" /> - <element signature="e#31739#31947#0" expanded="false" /> - <element signature="e#31946#31947#0" expanded="false" /> - <element signature="e#32088#32540#0" expanded="false" /> - <element signature="e#32539#32540#0" expanded="false" /> - <element signature="e#32679#33129#0" expanded="false" /> - <element signature="e#33128#33129#0" expanded="false" /> - <element signature="e#33251#34536#0" expanded="false" /> - <element signature="e#34535#34536#0" expanded="false" /> - <element signature="e#34676#34996#0" expanded="false" /> - <element signature="e#34995#34996#0" expanded="false" /> - <element signature="e#35136#35437#0" expanded="false" /> - <element signature="e#35436#35437#0" expanded="false" /> - <element signature="e#36093#36490#0" expanded="false" /> - <element signature="e#36489#36490#0" expanded="false" /> - <element signature="e#40480#40481#0" expanded="false" /> - <element signature="e#40515#40516#0" expanded="false" /> - </folding> - </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" vertical-offset="0" max-vertical-offset="1185"> @@ -2229,20 +2220,38 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> + <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" vertical-offset="652" max-vertical-offset="4532"> + <caret line="40" column="26" selection-start-line="40" selection-start-column="26" selection-end-line="40" selection-end-column="26" /> + <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="98.525" vertical-offset="4501" max-vertical-offset="6320"> - <caret line="44" column="13" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" /> + <state vertical-scroll-proportion="0.0" vertical-offset="162" max-vertical-offset="2403"> + <caret line="34" column="38" selection-start-line="34" selection-start-column="38" selection-end-line="34" 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" vertical-offset="6791" max-vertical-offset="11208"> + <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#12518#0" expanded="true" /> + <element signature="e#0#16299#0" expanded="true" /> + <element signature="imports" expanded="true" /> + <element signature="e#15752#15763#0" 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="0.0" vertical-offset="54" max-vertical-offset="9045"> - <caret line="72" column="26" selection-start-line="72" selection-start-column="26" selection-end-line="72" selection-end-column="26" /> + <state vertical-scroll-proportion="0.0" vertical-offset="7680" max-vertical-offset="9045"> + <caret line="376" column="46" selection-start-line="376" selection-start-column="46" selection-end-line="376" selection-end-column="46" /> <folding> <element signature="e#3540#3541#0" expanded="true" /> <element signature="e#3596#3597#0" expanded="true" /> @@ -2260,41 +2269,144 @@ </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" vertical-offset="0" max-vertical-offset="989"> + <caret line="24" column="19" selection-start-line="24" selection-start-column="19" selection-end-line="24" selection-end-column="19" /> + <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="1.6510904" vertical-offset="80" max-vertical-offset="5080"> - <caret line="153" column="40" selection-start-line="153" selection-start-column="40" selection-end-line="153" selection-end-column="40" /> + <state vertical-scroll-proportion="-29.5" vertical-offset="0" max-vertical-offset="4940"> + <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" /> + <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" vertical-offset="48" max-vertical-offset="1488"> + <caret line="42" column="11" selection-start-line="42" selection-start-column="11" selection-end-line="42" selection-end-column="11" /> + <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.0" vertical-offset="406" max-vertical-offset="9280"> + <caret line="54" column="19" selection-start-line="54" selection-start-column="19" selection-end-line="54" selection-end-column="19" /> + <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="1410" max-vertical-offset="6720"> + <caret line="112" column="31" selection-start-line="112" selection-start-column="31" selection-end-line="112" selection-end-column="31" /> <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/swing/RendererImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2400"> + <caret line="42" column="11" selection-start-line="42" selection-start-column="11" selection-end-line="42" selection-end-column="11" /> + <folding /> + </state> + </provider> + </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" vertical-offset="0" max-vertical-offset="4239"> + <caret line="45" column="28" selection-start-line="45" selection-start-column="28" selection-end-line="45" selection-end-column="28" /> + <folding /> + </state> + </provider> + </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" vertical-offset="652" max-vertical-offset="4532"> - <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="0" max-vertical-offset="810"> + <caret line="46" column="8" selection-start-line="46" selection-start-column="8" selection-end-line="46" selection-end-column="8" /> + <folding> + <element signature="e#1938#1939#0" expanded="true" /> + <element signature="e#1959#1960#0" expanded="true" /> + </folding> + </state> + </provider> + </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" vertical-offset="278" max-vertical-offset="1632"> + <caret line="78" column="53" selection-start-line="78" selection-start-column="53" selection-end-line="78" selection-end-column="53" /> + <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" vertical-offset="0" max-vertical-offset="1008"> + <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/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="8933" max-vertical-offset="19320"> - <caret line="479" column="16" selection-start-line="479" selection-start-column="16" selection-end-line="479" selection-end-column="16" /> + <state vertical-scroll-proportion="-12.0" vertical-offset="9275" max-vertical-offset="19366"> + <caret line="507" column="37" selection-start-line="507" selection-start-column="37" selection-end-line="507" selection-end-column="37" /> <folding> <element signature="e#19848#19860#0" expanded="true" /> - <element signature="e#26002#26014#0" expanded="true" /> + <element signature="e#26146#26158#0" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVNCNetwork.java"> + <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="721" max-vertical-offset="2016"> + <caret line="88" column="22" selection-start-line="88" selection-start-column="22" selection-end-line="88" selection-end-column="22" /> + <folding /> + </state> + </provider> + </entry> + <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.23130842" vertical-offset="0" max-vertical-offset="2403"> - <caret line="19" column="28" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" /> + <state vertical-scroll-proportion="-10.35" vertical-offset="8199" max-vertical-offset="9747"> + <caret line="344" column="20" selection-start-line="344" selection-start-column="20" selection-end-line="344" selection-end-column="20" /> + <folding> + <element signature="imports" expanded="true" /> + <element signature="e#16800#16801#0" expanded="true" /> + <element signature="e#16833#16834#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.5764431" vertical-offset="15711" max-vertical-offset="21675"> + <caret line="792" column="16" selection-start-line="792" selection-start-column="16" selection-end-line="792" selection-end-column="16" /> <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.33333334" vertical-offset="6662" max-vertical-offset="9193"> + <caret line="284" column="16" selection-start-line="284" selection-start-column="16" selection-end-line="284" selection-end-column="16" /> + <folding> + <element signature="e#0#12477#0" expanded="true" /> + <element signature="e#4308#4309#0" expanded="true" /> + <element signature="e#4338#4339#0" expanded="true" /> + <element signature="e#4395#4396#0" expanded="true" /> + <element signature="e#4433#4434#0" expanded="true" /> + <element signature="e#4752#4753#0" expanded="true" /> + <element signature="e#4792#4793#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> </component> <component name="masterDetails"> <states>
--- a/src/main/java/com/glavsoft/rfb/protocol/Protocol.java Tue Sep 22 16:18:55 2015 +0900 +++ b/src/main/java/com/glavsoft/rfb/protocol/Protocol.java Tue Sep 22 19:09:22 2015 +0900 @@ -65,7 +65,6 @@ private boolean isTight; private String protocolVersion; private byte[] initData; - private boolean isRetina = false; private TreeRFBProto rfb; public Protocol(Reader reader, Writer writer, @@ -126,8 +125,7 @@ @Override public void setFbWidth(int fbWidth) { - if(!isRetina) - this.fbWidth = fbWidth; + this.fbWidth = fbWidth; } @Override @@ -147,8 +145,7 @@ @Override public void setFbHeight(int fbHeight) { - if(!isRetina) - this.fbHeight = fbHeight; + this.fbHeight = fbHeight; } @Override @@ -210,7 +207,9 @@ sendSupportedEncodingsMessage(settings); settings.addListener(this); // to support pixel format (color depth), and encodings changes settings.addListener(repaintController); - sendRefreshMessage(); + if (rfb.isTreeManager()) { + sendRefreshMessage(); + } senderTask = new SenderTask(messageQueue, writer, this); senderThread = new Thread(senderTask, "RfbSenderTask"); senderThread.start();
--- a/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java Tue Sep 22 16:18:55 2015 +0900 +++ b/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java Tue Sep 22 19:09:22 2015 +0900 @@ -288,9 +288,11 @@ byte[] initData = new byte[length]; reader.read(initData); String name = new String(initData, 24, length - 24, "UTF-8"); - rfb.getContext().setRemoteDesktopName(name); - rfb.getContext().setInitData(initData); - repaintController.updateRemoteDesktopName(rfb.getContext()); + context.setRemoteDesktopName(name); + context.setInitData(initData); + context.setFbWidth(rect.width); + context.setFbHeight(rect.height); + repaintController.updateRemoteDesktopName(context); reader.reset(); // All children multicastqueue should be discarded hear. // rfb.clearChildrenTransmission(); @@ -299,8 +301,11 @@ visible = (id != rfb.getId()); } synchronized (renderer.getLock()) { - if(!(rfb.getCuiVersion())) + if(!(rfb.getCuiVersion())) { renderer = repaintController.createRenderer(reader, rect.width, rect.height, context.getPixelFormat()); + + System.out.println("ReceiverTask INIT_DATA width =" +rect.width+ " height =" +rect.height); + } } if (rect.getEncodingType() == EncodingType.INIT_DATA) { repaintController.setVisible(visible); @@ -308,8 +313,10 @@ if (rfb.hasViewer()){ rfb.getViewer().setFitScreen(); } - context.sendMessage(new FramebufferUpdateRequestMessage(0, 0, rect.width, rect.height, false)); - // repaintController.repaintCursor(); + if (rfb.isTreeManager()) { + context.sendMessage(new FramebufferUpdateRequestMessage(0, 0, rect.width, rect.height, false)); + } + } else if (rect.getEncodingType() == EncodingType.CHECK_DELAY) { int checkDelaySize = 24; reader.reset();
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Tue Sep 22 16:18:55 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Tue Sep 22 19:09:22 2015 +0900 @@ -498,7 +498,8 @@ LinkedList<ByteBuffer> desktopSize = new LinkedList<ByteBuffer>(); int width = context.getFbWidth(); int height = context.getFbHeight(); - + System.out.println("SendDesktopSizeChange filterSingleDisplay =" +filterSingleDisplay + + " width =" +width+ " height =" +height); if (filterSingleDisplay) { originalInitData = createOriginalInitData(singleWidth, singleHeight, context.getRemoteDesktopName()); // desktopSize.add(new ChengeDesktopSize(singleWidth, singleHeight, EncodingType.INIT_DATA, originalInitData, id).getMessage()); @@ -791,7 +792,8 @@ this.frameSizeHeight = height; singleWidth = frameSizeWidth; singleHeight = frameSizeHeight; - + System.out.println("ChangeVNCServer filterSingleDisplay =" +filterSingleDisplay + + " width =" +singleWidth+ " height =" +singleHeight); if (newVNCServerId == -1) { // change to the tree vnc root on other network. vncProxyService.changeToDirectConnectedServer(hostName, is, os);
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java Tue Sep 22 16:18:55 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java Tue Sep 22 19:09:22 2015 +0900 @@ -114,7 +114,7 @@ synchronized (renderer.getLock()) { cursor = renderer.getCursor(); } -// init(renderer.getWidth(), renderer.getHeight()); + init(renderer.getWidth(), renderer.getHeight()); updateFrameSize(); return renderer; }
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java Tue Sep 22 16:18:55 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java Tue Sep 22 19:09:22 2015 +0900 @@ -102,13 +102,6 @@ presenter.showMessage(message); } - public void startVncConnectionWithSocket(Reader is, Writer os) { - workingProtocol = new Protocol(is, os, - new PasswordChooser(connectionString, parentWindow, this), - rfbSettings, myRfb); - startVNCConnection(); - } - @Override protected void done() { // EDT try {