Mercurial > hg > Applications > TreeVNC
changeset 380:aef5cbdd84ab
Fix compare SerialNumber flag
| author | innparusu |
|---|---|
| date | Wed, 02 Sep 2015 17:33:06 +0900 |
| parents | ea324e42bc78 |
| children | 47c018aed50e |
| files | .idea/workspace.xml src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java src/main/java/jp/ac/u_ryukyu/treevnc/SendCheckDelay.java src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java |
| diffstat | 5 files changed, 328 insertions(+), 262 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Tue Sep 01 16:50:40 2015 +0900 +++ b/.idea/workspace.xml Wed Sep 02 17:33:06 2015 +0900 @@ -2,10 +2,10 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="0a04b9e3-21eb-43ee-b441-59e664eecd89" name="Default" comment="setFitScreen in ReceiverTask"> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/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/main/java/jp/ac/u_ryukyu/treevnc/SendCheckDelay.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SendCheckDelay.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java" afterPath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> </list> <ignored path="TreeVNC.iws" /> @@ -31,24 +31,14 @@ <favorites_list name="TreeVNC" /> </component> <component name="FileEditorManager"> - <splitter split-orientation="horizontal" split-proportion="0.5"> + <splitter split-orientation="horizontal" split-proportion="0.55"> <split-first> <leaf> - <file leaf-file-name="Protocol.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="4773" max-vertical-offset="6762"> - <caret line="157" column="0" selection-start-line="157" selection-start-column="0" selection-end-line="157" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ReceiverTask.java" pinned="false" current-in-tab="false"> + <file leaf-file-name="ReceiverTask.java" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="2061" max-vertical-offset="8096"> - <caret line="221" column="5" selection-start-line="221" selection-start-column="5" selection-end-line="221" selection-end-column="5" /> + <state vertical-scroll-proportion="0.43816793" vertical-offset="4394" max-vertical-offset="8448"> + <caret line="232" column="34" selection-start-line="232" selection-start-column="34" selection-end-line="232" selection-end-column="34" /> <folding> <element signature="imports" expanded="true" /> </folding> @@ -56,11 +46,21 @@ </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"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="960"> + <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" /> + <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"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1566"> - <caret line="41" column="17" selection-start-line="41" selection-start-column="17" selection-end-line="41" selection-end-column="17" /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1344"> + <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" /> <folding /> </state> </provider> @@ -69,39 +69,75 @@ <file leaf-file-name="TreeVncCommandChannelListener.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="418" max-vertical-offset="5676"> - <caret line="47" column="0" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" /> + <state vertical-scroll-proportion="0.0" vertical-offset="760" max-vertical-offset="3870"> + <caret line="108" column="0" selection-start-line="108" selection-start-column="0" selection-end-line="108" selection-end-column="0" /> <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"> + <file leaf-file-name="SenderTask.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2235"> - <caret line="129" column="32" selection-start-line="129" selection-start-column="32" selection-end-line="129" selection-end-column="32" /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1656"> + <caret line="56" column="13" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" /> + <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"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="1646" max-vertical-offset="7680"> + <caret line="42" column="13" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="TreeViewer.java" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java"> + <file leaf-file-name="Protocol.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.39370078" vertical-offset="775" max-vertical-offset="5150"> - <caret line="56" column="37" selection-start-line="56" selection-start-column="37" selection-end-line="56" selection-end-column="37" /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4410"> + <caret line="157" column="0" selection-start-line="157" selection-start-column="0" selection-end-line="157" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="SendCheckDelay.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SendCheckDelay.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1276"> + <caret line="21" column="35" selection-start-line="21" selection-start-column="35" selection-end-line="21" selection-end-column="35" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="FindRoot.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java"> + <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="60" max-vertical-offset="2175"> - <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" /> - <folding /> + <state vertical-scroll-proportion="-15.925" vertical-offset="14435" max-vertical-offset="19824"> + <caret line="703" column="23" selection-start-line="703" selection-start-column="23" selection-end-line="703" selection-end-column="23" /> + <folding> + <element signature="e#3490#3491#0" expanded="true" /> + <element signature="e#3525#3526#0" expanded="true" /> + <element signature="e#27038#27050#0" expanded="true" /> + </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"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="394" max-vertical-offset="4117"> + <caret line="38" column="4" selection-start-line="38" selection-start-column="4" selection-end-line="38" selection-end-column="4" /> + <folding> + <element signature="e#0#6968#0" expanded="true" /> + </folding> </state> </provider> </entry> @@ -120,51 +156,21 @@ </provider> </entry> </file> - <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="4725" max-vertical-offset="4950"> - <caret line="381" column="21" selection-start-line="381" selection-start-column="21" selection-end-line="381" selection-end-column="21" /> - <folding> - <element signature="e#12726#12727#0" expanded="true" /> - <element signature="e#12765#12766#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="TreeRFBProto.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> + <file leaf-file-name="SendSound.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SendSound.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-73.6" vertical-offset="0" max-vertical-offset="18952"> - <caret line="156" column="51" selection-start-line="156" selection-start-column="51" selection-end-line="156" selection-end-column="51" /> + <state vertical-scroll-proportion="0.0" vertical-offset="105" max-vertical-offset="1965"> + <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="RichCursorDecoder.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/RichCursorDecoder.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="345" max-vertical-offset="885"> - <caret line="49" column="0" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" /> - <folding> - <element signature="e#0#2883#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#1518#1519#0" expanded="false" /> - <element signature="e#1540#1541#0" expanded="false" /> - <element signature="e#2836#2837#0" expanded="false" /> - <element signature="e#2878#2879#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - </file> <file leaf-file-name="Viewer.java" pinned="false" current-in-tab="true"> <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.36030534" vertical-offset="4640" max-vertical-offset="7470"> - <caret line="345" column="20" selection-start-line="345" selection-start-column="20" selection-end-line="345" selection-end-column="20" /> + <state vertical-scroll-proportion="-0.62900764" vertical-offset="8399" max-vertical-offset="10375"> + <caret line="364" column="24" selection-start-line="364" selection-start-column="24" selection-end-line="364" selection-end-column="24" /> <folding /> </state> </provider> @@ -175,7 +181,36 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="801" max-vertical-offset="2790"> <caret line="227" column="5" selection-start-line="227" selection-start-column="5" selection-end-line="227" selection-end-column="5" /> - <folding /> + <folding> + <element signature="e#0#7460#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#2476#2477#0" expanded="false" /> + <element signature="e#2522#2523#0" expanded="false" /> + <element signature="e#3235#3236#0" expanded="false" /> + <element signature="e#3271#3272#0" expanded="false" /> + <element signature="e#3427#3428#0" expanded="false" /> + <element signature="e#3497#3498#0" expanded="false" /> + <element signature="e#3546#3547#0" expanded="false" /> + <element signature="e#3591#3592#0" expanded="false" /> + <element signature="e#3637#3638#0" expanded="false" /> + <element signature="e#3678#3679#0" expanded="false" /> + <element signature="e#3715#3716#0" expanded="false" /> + <element signature="e#3790#3791#0" expanded="false" /> + <element signature="e#3835#3836#0" expanded="false" /> + <element signature="e#3871#3872#0" expanded="false" /> + <element signature="e#3902#3903#0" expanded="false" /> + <element signature="e#3972#3973#0" expanded="false" /> + <element signature="e#4006#4007#0" expanded="false" /> + <element signature="e#4042#4043#0" expanded="false" /> + <element signature="e#4080#4081#0" expanded="false" /> + <element signature="e#4119#4120#0" expanded="false" /> + <element signature="e#4173#4174#0" expanded="false" /> + <element signature="e#4219#4220#0" expanded="false" /> + <element signature="e#4257#4258#0" expanded="false" /> + <element signature="e#4296#4297#0" expanded="false" /> + <element signature="e#4350#4351#0" expanded="false" /> + <element signature="e#4396#4397#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -183,13 +218,23 @@ <file leaf-file-name="SoundPacketQueue.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SoundPacketQueue.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-4.125" vertical-offset="0" max-vertical-offset="375"> + <state vertical-scroll-proportion="0.0" vertical-offset="165" max-vertical-offset="375"> <caret line="14" column="51" selection-start-line="14" selection-start-column="51" selection-end-line="14" selection-end-column="51" /> <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"> + <state vertical-scroll-proportion="-13.75" vertical-offset="3674" max-vertical-offset="4944"> + <caret line="181" column="41" selection-start-line="181" selection-start-column="29" selection-end-line="181" selection-end-column="41" /> + <folding /> + </state> + </provider> + </entry> + </file> <file leaf-file-name="CreateConnectionParam.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java"> <provider selected="true" editor-type-id="text-editor"> @@ -213,7 +258,7 @@ <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="1114" max-vertical-offset="5832"> + <state vertical-scroll-proportion="0.0" vertical-offset="1350" max-vertical-offset="3645"> <caret line="133" column="23" selection-start-line="133" selection-start-column="23" selection-end-line="133" selection-end-column="23" /> <folding /> </state> @@ -504,16 +549,18 @@ <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/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> - <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java" /> - <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.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/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java" /> </list> </option> </component> <component name="ProjectFrameBounds"> - <option name="x" value="4" /> + <option name="x" value="16" /> <option name="y" value="23" /> <option name="width" value="3836" /> <option name="height" value="2137" /> @@ -542,7 +589,6 @@ </navigator> <panes> <pane id="PackagesPane" /> - <pane id="Scope" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -871,6 +917,7 @@ </PATH> </subPane> </pane> + <pane id="Scope" /> <pane id="Scratches" /> </panes> </component> @@ -905,7 +952,7 @@ </extension> <option name="MAIN_CLASS_NAME" value="com.glavsoft.viewer.TreeViewer" /> <option name="VM_PARAMETERS" value="" /> - <option name="PROGRAM_PARAMETERS" value="-d --addSerialNum" /> + <option name="PROGRAM_PARAMETERS" value="" /> <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" value="" /> @@ -1148,7 +1195,7 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="4" y="23" width="3836" height="2137" extended-state="6" /> + <frame x="16" 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" /> @@ -1169,9 +1216,9 @@ <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1350365" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13529718" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32791728" 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.13034411" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.16110532" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32988676" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> @@ -1259,24 +1306,12 @@ <option name="timeStamp" value="32" /> </line-breakpoint> <line-breakpoint type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java</url> - <line>26</line> - <properties /> - <option name="timeStamp" value="55" /> - </line-breakpoint> - <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> <line>320</line> <properties /> <option name="timeStamp" value="71" /> </line-breakpoint> <line-breakpoint type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>738</line> - <properties /> - <option name="timeStamp" value="73" /> - </line-breakpoint> - <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java</url> <line>156</line> <properties /> @@ -1284,13 +1319,13 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java</url> - <line>356</line> + <line>357</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>561</line> + <line>559</line> <properties /> <option name="timeStamp" value="76" /> </line-breakpoint> @@ -1308,7 +1343,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java</url> - <line>289</line> + <line>290</line> <properties /> <option name="timeStamp" value="79" /> </line-breakpoint> @@ -1320,7 +1355,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>825</line> + <line>827</line> <properties /> <option name="timeStamp" value="85" /> </line-breakpoint> @@ -1332,7 +1367,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>815</line> + <line>817</line> <properties /> <option name="timeStamp" value="90" /> </line-breakpoint> @@ -1348,35 +1383,36 @@ <properties /> <option name="timeStamp" value="92" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> + <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java</url> <line>116</line> <properties /> <option name="timeStamp" value="93" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> + <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java</url> <line>108</line> <properties /> <option name="timeStamp" value="97" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> + <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java</url> <line>47</line> <properties /> <option name="timeStamp" value="99" /> </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> + <condition disabled="true" expression="numberOfRectangles > 1" language="JAVA" custom="" /> <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java</url> - <line>226</line> + <line>228</line> <properties /> - <option name="timeStamp" value="101" /> + <option name="timeStamp" value="105" /> </line-breakpoint> </breakpoints> <breakpoints-dialog> <breakpoints-dialog /> </breakpoints-dialog> - <option name="time" value="102" /> + <option name="time" value="107" /> </breakpoint-manager> <watches-manager /> </component> @@ -1385,56 +1421,6 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/DecodersContainer.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.44217688" vertical-offset="0" max-vertical-offset="1323"> - <caret line="68" column="37" selection-start-line="68" selection-start-column="37" selection-end-line="68" selection-end-column="37" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/CopyRectDecoder.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.10204082" vertical-offset="0" max-vertical-offset="1323"> - <caret line="33" column="16" selection-start-line="33" selection-start-column="16" selection-end-line="33" selection-end-column="16" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.46757165" vertical-offset="0" max-vertical-offset="1989"> - <caret line="90" column="0" selection-start-line="90" selection-start-column="0" selection-end-line="90" selection-end-column="0" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/test/IsRetina.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="630"> - <caret line="38" column="0" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/IRfbSessionListener.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.15873016" vertical-offset="0" max-vertical-offset="1323"> - <caret line="36" column="9" selection-start-line="36" selection-start-column="9" selection-end-line="36" selection-end-column="9" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolContext.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.33919597" vertical-offset="0" max-vertical-offset="1592"> - <caret line="64" column="9" selection-start-line="64" selection-start-column="9" selection-end-line="64" selection-end-column="9" /> - </state> - </provider> - </entry> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/Thread.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="9775" max-vertical-offset="29460"> - <caret line="744" column="0" selection-start-line="744" selection-start-column="0" selection-end-line="745" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/mvp/Presenter.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.36299214" vertical-offset="2636" max-vertical-offset="4408"> @@ -1482,7 +1468,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="1476" max-vertical-offset="3749"> <caret line="121" column="58" selection-start-line="121" selection-start-column="58" selection-end-line="121" selection-end-column="58" /> - <folding /> </state> </provider> </entry> @@ -1490,7 +1475,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1215"> <caret line="61" column="38" selection-start-line="61" selection-start-column="38" selection-end-line="61" selection-end-column="38" /> - <folding /> </state> </provider> </entry> @@ -1498,14 +1482,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="885"> <caret line="49" column="0" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" /> - <folding> - <element signature="e#0#2883#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#1518#1519#0" expanded="false" /> - <element signature="e#1540#1541#0" expanded="false" /> - <element signature="e#2836#2837#0" expanded="false" /> - <element signature="e#2878#2879#0" expanded="false" /> - </folding> </state> </provider> </entry> @@ -1514,8 +1490,8 @@ <state vertical-scroll-proportion="0.0" vertical-offset="4661" max-vertical-offset="6270"> <caret line="381" column="21" selection-start-line="381" selection-start-column="21" selection-end-line="381" selection-end-column="21" /> <folding> - <element signature="e#12726#12727#0" expanded="true" /> - <element signature="e#12765#12766#0" expanded="true" /> + <element signature="e#12726#12727#0" expanded="false" /> + <element signature="e#12765#12766#0" expanded="false" /> </folding> </state> </provider> @@ -1629,14 +1605,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="1604" max-vertical-offset="7588"> - <caret line="112" column="13" selection-start-line="112" selection-start-column="13" selection-end-line="112" selection-end-column="13" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="14446" max-vertical-offset="16435"> @@ -1674,8 +1642,8 @@ <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="true" /> - <element signature="e#1393#1394#0" expanded="true" /> + <element signature="e#1352#1353#0" expanded="false" /> + <element signature="e#1393#1394#0" expanded="false" /> </folding> </state> </provider> @@ -1790,52 +1758,47 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="801" max-vertical-offset="2790"> <caret line="227" column="5" selection-start-line="227" selection-start-column="5" selection-end-line="227" selection-end-column="5" /> - <folding /> + <folding> + <element signature="e#0#7460#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#2476#2477#0" expanded="false" /> + <element signature="e#2522#2523#0" expanded="false" /> + <element signature="e#3235#3236#0" expanded="false" /> + <element signature="e#3271#3272#0" expanded="false" /> + <element signature="e#3427#3428#0" expanded="false" /> + <element signature="e#3497#3498#0" expanded="false" /> + <element signature="e#3546#3547#0" expanded="false" /> + <element signature="e#3591#3592#0" expanded="false" /> + <element signature="e#3637#3638#0" expanded="false" /> + <element signature="e#3678#3679#0" expanded="false" /> + <element signature="e#3715#3716#0" expanded="false" /> + <element signature="e#3790#3791#0" expanded="false" /> + <element signature="e#3835#3836#0" expanded="false" /> + <element signature="e#3871#3872#0" expanded="false" /> + <element signature="e#3902#3903#0" expanded="false" /> + <element signature="e#3972#3973#0" expanded="false" /> + <element signature="e#4006#4007#0" expanded="false" /> + <element signature="e#4042#4043#0" expanded="false" /> + <element signature="e#4080#4081#0" expanded="false" /> + <element signature="e#4119#4120#0" expanded="false" /> + <element signature="e#4173#4174#0" expanded="false" /> + <element signature="e#4219#4220#0" expanded="false" /> + <element signature="e#4257#4258#0" expanded="false" /> + <element signature="e#4296#4297#0" expanded="false" /> + <element signature="e#4350#4351#0" expanded="false" /> + <element signature="e#4396#4397#0" expanded="false" /> + </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SoundPacketQueue.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-4.125" vertical-offset="0" max-vertical-offset="375"> + <state vertical-scroll-proportion="0.0" vertical-offset="165" max-vertical-offset="375"> <caret line="14" column="51" selection-start-line="14" selection-start-column="51" selection-end-line="14" selection-end-column="51" /> <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.2528909" vertical-offset="1035" max-vertical-offset="3401"> - <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" /> - <folding> - <element signature="e#0#6968#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/RREDecoder.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.04524887" vertical-offset="0" max-vertical-offset="1989"> - <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="4773" max-vertical-offset="6762"> - <caret line="157" column="0" selection-start-line="157" selection-start-column="0" selection-end-line="157" selection-end-column="0" /> - <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="-73.6" vertical-offset="0" max-vertical-offset="18952"> - <caret line="156" column="51" selection-start-line="156" selection-start-column="51" selection-end-line="156" selection-end-column="51" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="2593" max-vertical-offset="4172"> @@ -1852,32 +1815,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1566"> - <caret line="41" column="17" selection-start-line="41" selection-start-column="17" selection-end-line="41" selection-end-column="17" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="418" max-vertical-offset="5676"> - <caret line="47" column="0" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" /> - <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.0" vertical-offset="2061" max-vertical-offset="8096"> - <caret line="221" column="5" selection-start-line="221" selection-start-column="5" selection-end-line="221" selection-end-column="5" /> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="1114" max-vertical-offset="5832"> @@ -1886,22 +1823,149 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/RREDecoder.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="480"> + <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" 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/Object.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.30467573" vertical-offset="4200" max-vertical-offset="9630"> + <caret line="294" column="29" selection-start-line="294" selection-start-column="29" selection-end-line="294" selection-end-column="29" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/MulticastQueue.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.44896933" vertical-offset="0" max-vertical-offset="2641"> + <caret line="51" column="14" selection-start-line="51" selection-start-column="14" selection-end-line="51" selection-end-column="14" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SendSound.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1965"> + <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SendCheckDelay.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1276"> + <caret line="21" column="35" selection-start-line="21" selection-start-column="35" selection-end-line="21" selection-end-column="35" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4410"> + <caret line="157" column="0" selection-start-line="157" selection-start-column="0" selection-end-line="157" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="1646" max-vertical-offset="7680"> + <caret line="42" column="13" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1656"> + <caret line="56" column="13" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="1604" max-vertical-offset="7588"> + <caret line="112" column="13" selection-start-line="112" selection-start-column="13" selection-end-line="112" selection-end-column="13" /> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.39370078" vertical-offset="775" max-vertical-offset="5150"> - <caret line="56" column="37" selection-start-line="56" selection-start-column="37" selection-end-line="56" selection-end-column="37" /> + <state vertical-scroll-proportion="-13.75" vertical-offset="3674" max-vertical-offset="4944"> + <caret line="181" column="41" selection-start-line="181" selection-start-column="29" selection-end-line="181" selection-end-column="41" /> <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.36030534" vertical-offset="4640" max-vertical-offset="7470"> - <caret line="345" column="20" selection-start-line="345" selection-start-column="20" selection-end-line="345" selection-end-column="20" /> + <state vertical-scroll-proportion="-0.62900764" vertical-offset="8399" max-vertical-offset="10375"> + <caret line="364" column="24" selection-start-line="364" selection-start-column="24" selection-end-line="364" selection-end-column="24" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="760" max-vertical-offset="3870"> + <caret line="108" column="0" selection-start-line="108" selection-start-column="0" selection-end-line="108" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/FramebufferUpdateRectangle.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="960"> + <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" /> <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="394" max-vertical-offset="4117"> + <caret line="38" column="4" selection-start-line="38" selection-start-column="4" selection-end-line="38" selection-end-column="4" /> + <folding> + <element signature="e#0#6968#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-15.925" vertical-offset="14435" max-vertical-offset="19824"> + <caret line="703" column="23" selection-start-line="703" selection-start-column="23" selection-end-line="703" selection-end-column="23" /> + <folding> + <element signature="e#3490#3491#0" expanded="true" /> + <element signature="e#3525#3526#0" expanded="true" /> + <element signature="e#27038#27050#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1344"> + <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" /> + <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.43816793" vertical-offset="4394" max-vertical-offset="8448"> + <caret line="232" column="34" selection-start-line="232" selection-start-column="34" selection-end-line="232" selection-end-column="34" /> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> </component> <component name="masterDetails"> <states>
--- a/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java Tue Sep 01 16:50:40 2015 +0900 +++ b/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java Wed Sep 02 17:33:06 2015 +0900 @@ -36,15 +36,13 @@ return; } else if (!rfb.getCuiVersion()) { rfb.readSendData(dataLen, reader, null, rect); - if (rfb.isAddSerialNum()) { - reader.reset(); - reader.skip(16); - } + reader.reset(); + reader.skip(16); decoder.decode(reader, renderer, rect); return; } } - rfb.readSendData(dataLen, reader, bytes, rect); + rfb.readSendData(dataLen, reader, bytes, rect); } private int getZrleLength(FramebufferUpdateRectangle rect, Reader reader)
--- a/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java Tue Sep 01 16:50:40 2015 +0900 +++ b/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java Wed Sep 02 17:33:06 2015 +0900 @@ -231,9 +231,10 @@ while (numberOfRectangles-- > 0) { FramebufferUpdateRectangle rect = new FramebufferUpdateRectangle(); rect.fill(reader); - long time = System.currentTimeMillis(); - if(rfb.isTreeManager() && rfb.checkDelay) + if(rfb.isTreeManager() && rfb.checkDelay) { + long time = System.currentTimeMillis(); System.out.println(time + " : size : " + rect.width * rect.height); + } Decoder decoder = decoders.getDecoderByType(rect.getEncodingType()); logger.finest(rect.toString() + (0 == numberOfRectangles ? "\n---" : "")); if (decoder != null) { @@ -365,7 +366,6 @@ int addSerialNumFlag = reader.readInt32(); long num = reader.readInt64(); if (addSerialNumFlag == 1) { - rfb.setAddSerialNum(true); if(num != ++checkCounter) { System.out.println("LostData" + (num - checkCounter)); checkCounter = num;
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/SendCheckDelay.java Tue Sep 01 16:50:40 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/SendCheckDelay.java Wed Sep 02 17:33:06 2015 +0900 @@ -19,7 +19,9 @@ LinkedList<ByteBuffer> checkdelay = new LinkedList<ByteBuffer>(); long time = System.currentTimeMillis(); checkdelay.add(new CheckDelay(0, 0, 0, 0, time, EncodingType.CHECK_DELAY).getMessage()); - rfb.addSerialNumber(checkdelay); + if (rfb.isAddSerialNum()) { + rfb.addSerialNumber(checkdelay); + } rfb.multicastqueue.put(checkdelay); System.out.println(time + " : send checkDelay"); }
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Tue Sep 01 16:50:40 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Wed Sep 02 17:33:06 2015 +0900 @@ -530,7 +530,9 @@ } else { desktopSize.add(new ChengeDesktopSize(width, height, EncodingType.INIT_DATA, context.getInitData(), id).getMessage()); } - addSerialNumber(desktopSize); + if (addSerialNum) { + addSerialNumber(desktopSize); + } multicastqueue.put(desktopSize); } @@ -542,11 +544,7 @@ public void addSerialNumber(LinkedList<ByteBuffer> bufs) { ByteBuffer serialNum = multicastqueue.allocate(4+8); // addSerialNum flag + SerialNum - if (this.addSerialNum) { - serialNum.putInt(1); - } else { - serialNum.putInt(0); - } + serialNum.putInt(1); serialNum.putLong(counter++); serialNum.flip(); bufs.addFirst(serialNum); @@ -715,7 +713,7 @@ // protocol, clients have to be modified. Deflater nDeflater = deflater; // new Deflater(); LinkedList<ByteBuffer> out = new LinkedList<ByteBuffer>(); - try { + try { unzip(inflater, inputs, 0, bytes, INFLATE_BUFSIZE); // dump32(inputs); out.add(ByteBuffer.wrap(bytes)); @@ -725,7 +723,9 @@ blen.flip(); bufs.addFirst(blen); bufs.addFirst(header); - addSerialNumber(bufs); + if (addSerialNum) { + addSerialNumber(bufs); + } if (filterSingleDisplay) { if (rect.x < singleWidth) { multicastqueue.put(bufs); @@ -743,13 +743,15 @@ // ZRLEE is already compressed bufs.add(header); + if (addSerialNum) { + this.addSerialNumber(bufs); + } if (dataLen > 16) { ByteBuffer b = multicastqueue.allocate(dataLen - 16); reader.readBytes(b.array(), 0, dataLen - 16); b.limit(dataLen - 16); bufs.add(b); } - this.addSerialNumber(bufs); multicastqueue.put(bufs); return;