Mercurial > hg > Members > riono > TreeVNC_ja_comment
changeset 421:cafbff8d5b09
Fix invalid x y Display position
| author | Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Tue, 19 Jan 2016 17:41:46 +0900 |
| parents | 0ad52aac3bc3 |
| children | 752788fdae03 |
| files | .idea/workspace.xml src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java |
| diffstat | 2 files changed, 324 insertions(+), 342 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Mon Jan 18 17:37:58 2016 +0900 +++ b/.idea/workspace.xml Tue Jan 19 17:41:46 2016 +0900 @@ -3,9 +3,6 @@ <component name="ChangeListManager"> <list default="true" id="0a04b9e3-21eb-43ee-b441-59e664eecd89" name="Default" comment="settingsChanged"> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/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/com/glavsoft/rfb/protocol/SenderTask.java" afterPath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> </list> <ignored path="TreeVNC.iws" /> @@ -41,7 +38,7 @@ <favorites_list name="TreeVNC" /> </component> <component name="FileEditorManager"> - <splitter split-orientation="horizontal" split-proportion="0.4553276"> + <splitter split-orientation="horizontal" split-proportion="0.45689654"> <split-first> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <file leaf-file-name="SenderTask.java" pinned="false" current-in-tab="false"> @@ -54,18 +51,6 @@ </provider> </entry> </file> - <file leaf-file-name="CheckDelayReply.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CheckDelayReply.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" /> - <folding> - <element signature="imports" expanded="false" /> - </folding> - </state> - </provider> - </entry> - </file> <file leaf-file-name="CheckDelay.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CheckDelay.java"> <provider selected="true" editor-type-id="text-editor"> @@ -80,35 +65,86 @@ </provider> </entry> </file> - <file leaf-file-name="FramebufferUpdateRequestMessage.java" pinned="false" current-in-tab="false"> + <file leaf-file-name="FramebufferUpdateRequestMessage.java" pinned="false" current-in-tab="true"> <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"> - <caret line="42" column="11" selection-start-line="42" selection-start-column="11" selection-end-line="42" selection-end-column="11" /> + <state vertical-scroll-proportion="0.31111112"> + <caret line="56" column="32" selection-start-line="56" selection-start-column="32" selection-end-line="56" selection-end-column="32" /> <folding /> </state> </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"> + <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"> + <caret line="957" column="0" selection-start-line="957" selection-start-column="0" selection-end-line="957" selection-end-column="0" /> + <folding> + <element signature="imports" expanded="true" /> + <element signature="e#35849#35850#0" expanded="true" /> + <element signature="e#35873#35874#0" expanded="true" /> + <element signature="e#35898#35899#0" expanded="true" /> + <element signature="e#35922#35923#0" expanded="true" /> + <element signature="e#36213#36214#0" expanded="true" /> + </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"> - <caret line="368" column="30" selection-start-line="368" selection-start-column="30" selection-end-line="368" selection-end-column="30" /> + <caret line="56" column="39" selection-start-line="56" selection-start-column="39" selection-end-line="56" selection-end-column="39" /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#426#427#0" expanded="false" /> + <element signature="e#456#457#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ReceiveSound.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ReceiveSound.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="18" column="21" selection-start-line="18" selection-start-column="21" selection-end-line="18" selection-end-column="21" /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#2254#2255#0" expanded="false" /> + <element signature="e#2288#2289#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="Viewer.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="448" column="12" selection-start-line="448" selection-start-column="12" selection-end-line="448" selection-end-column="12" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="TreeRFBProto.java" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> + <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"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="24.196667"> - <caret line="961" column="28" selection-start-line="961" selection-start-column="19" selection-end-line="961" selection-end-column="28" /> + <state vertical-scroll-proportion="0.0"> + <caret line="102" column="22" selection-start-line="102" selection-start-column="22" selection-end-line="102" selection-end-column="22" /> <folding> - <element signature="imports" expanded="true" /> - <element signature="e#36248#36249#0" expanded="true" /> - <element signature="e#36279#36280#0" expanded="true" /> + <element signature="imports" expanded="false" /> + <element signature="e#5554#5555#0" expanded="false" /> + <element signature="e#5620#5621#0" expanded="false" /> + <element signature="e#8107#8108#0" expanded="false" /> + <element signature="e#8138#8139#0" expanded="false" /> + <element signature="e#8194#8195#0" expanded="false" /> + <element signature="e#8224#8225#0" expanded="false" /> + <element signature="e#8258#8259#0" expanded="false" /> + <element signature="e#8291#8292#0" expanded="false" /> </folding> </state> </provider> @@ -118,7 +154,7 @@ <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"> - <caret line="24" column="16" selection-start-line="24" selection-start-column="16" selection-end-line="24" selection-end-column="16" /> + <caret line="73" column="16" selection-start-line="73" selection-start-column="16" selection-end-line="73" selection-end-column="16" /> <folding /> </state> </provider> @@ -134,32 +170,48 @@ </provider> </entry> </file> - <file leaf-file-name="MulticastQueue.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/MulticastQueue.java"> + </leaf> + </split-first> + <split-second> + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> + <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"> - <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" /> + <state vertical-scroll-proportion="2.488889"> + <caret line="194" column="19" selection-start-line="194" selection-start-column="19" selection-end-line="194" selection-end-column="19" /> <folding /> </state> </provider> </entry> </file> - </leaf> - </split-first> - <split-second> - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <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"> + <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"> + <caret line="121" column="33" selection-start-line="121" selection-start-column="33" selection-end-line="121" selection-end-column="33" /> + <folding /> + </state> + </provider> + </entry> + </file> + <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="-328.37036"> - <caret line="860" column="75" selection-start-line="860" selection-start-column="75" selection-end-line="860" selection-end-column="75" /> + <state vertical-scroll-proportion="0.0"> + <caret line="182" column="28" selection-start-line="182" selection-start-column="28" selection-end-line="182" selection-end-column="28" /> + <folding /> + </state> + </provider> + </entry> + </file> + <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"> + <caret line="264" column="8" selection-start-line="264" selection-start-column="8" selection-end-line="264" selection-end-column="8" /> <folding> - <element signature="e#4864#5051#0" expanded="true" /> - <element signature="e#5050#5051#0" expanded="true" /> - <element signature="e#33227#34236#0" expanded="true" /> - <element signature="e#34235#34236#0" expanded="true" /> - <element signature="e#35670#36067#0" expanded="true" /> - <element signature="e#36066#36067#0" expanded="true" /> + <element signature="e#8857#8858#0" expanded="true" /> + <element signature="e#8890#8891#0" expanded="true" /> </folding> </state> </provider> @@ -169,7 +221,7 @@ <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeSelectionPanel.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="56" column="45" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" /> + <caret line="58" column="0" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" /> <folding /> </state> </provider> @@ -180,7 +232,19 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="16" column="35" selection-start-line="16" selection-start-column="35" selection-end-line="16" selection-end-column="35" /> - <folding /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#2021#2022#0" expanded="false" /> + <element signature="e#2051#2052#0" expanded="false" /> + <element signature="e#2089#2090#0" expanded="false" /> + <element signature="e#2120#2121#0" expanded="false" /> + <element signature="e#2160#2161#0" expanded="false" /> + <element signature="e#2185#2186#0" expanded="false" /> + <element signature="e#2218#2219#0" expanded="false" /> + <element signature="e#2240#2241#0" expanded="false" /> + <element signature="e#2268#2269#0" expanded="false" /> + <element signature="e#2286#2287#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -189,9 +253,8 @@ <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="55" column="18" selection-start-line="55" selection-start-column="18" selection-end-line="55" selection-end-column="18" /> + <caret line="238" column="0" selection-start-line="238" selection-start-column="0" selection-end-line="238" selection-end-column="0" /> <folding> - <element signature="e#8521#8522#0" expanded="true" /> <element signature="e#8562#8563#0" expanded="true" /> </folding> </state> @@ -202,20 +265,21 @@ <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/MessageQueue.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="54" column="5" selection-start-line="54" selection-start-column="5" selection-end-line="54" selection-end-column="5" /> + <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="ReceiverTask.java" pinned="false" current-in-tab="true"> + <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.175"> - <caret line="121" column="44" selection-start-line="121" selection-start-column="44" selection-end-line="121" selection-end-column="44" /> + <state vertical-scroll-proportion="0.0"> + <caret line="124" column="0" selection-start-line="124" selection-start-column="0" selection-end-line="124" selection-end-column="0" /> <folding> <element signature="e#0#18438#0" expanded="true" /> <element signature="imports" expanded="true" /> + <element signature="e#5429#5736#0" expanded="true" /> <element signature="e#5735#5736#0" expanded="true" /> </folding> </state> @@ -227,74 +291,11 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="54" column="17" selection-start-line="54" selection-start-column="17" selection-end-line="54" selection-end-column="17" /> - <folding> - <element signature="e#0#3688#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#3580#3581#0" expanded="false" /> - <element signature="e#3608#3609#0" expanded="false" /> - <element signature="e#3646#3647#0" expanded="false" /> - <element signature="e#3683#3684#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="RawDecoder.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/RawDecoder.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="30" column="35" selection-start-line="30" selection-start-column="35" selection-end-line="30" selection-end-column="35" /> - <folding> - <element signature="e#0#2017#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#1395#1396#0" expanded="false" /> - <element signature="e#1417#1418#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="Reader.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/transport/Reader.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="43" column="35" selection-start-line="43" selection-start-column="35" selection-end-line="43" selection-end-column="35" /> <folding /> </state> </provider> </entry> </file> - <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"> - <caret line="277" column="36" selection-start-line="277" selection-start-column="36" selection-end-line="277" selection-end-column="36" /> - <folding> - <element signature="e#0#12018#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#9974#9975#0" expanded="false" /> - <element signature="e#10009#10010#0" expanded="false" /> - <element signature="e#10074#10075#0" expanded="false" /> - <element signature="e#10140#10141#0" expanded="false" /> - <element signature="e#10198#10199#0" expanded="false" /> - <element signature="e#10257#10258#0" expanded="false" /> - <element signature="e#10294#10295#0" expanded="false" /> - <element signature="e#10343#10344#0" expanded="false" /> - <element signature="e#10381#10382#0" expanded="false" /> - <element signature="e#10431#10432#0" expanded="false" /> - <element signature="e#10473#10474#0" expanded="false" /> - <element signature="e#10527#10528#0" expanded="false" /> - <element signature="e#10833#10834#0" expanded="false" /> - <element signature="e#10861#10862#0" expanded="false" /> - <element signature="e#10968#10969#0" expanded="false" /> - <element signature="e#10997#10998#0" expanded="false" /> - <element signature="e#11744#11745#0" expanded="false" /> - <element signature="e#11771#11772#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - </file> </leaf> </split-second> </splitter> @@ -621,8 +622,8 @@ </option> </component> <component name="ProjectFrameBounds"> - <option name="x" value="51" /> - <option name="y" value="23" /> + <option name="x" value="39" /> + <option name="y" value="-1057" /> <option name="width" value="1916" /> <option name="height" value="1057" /> </component> @@ -651,6 +652,7 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> + <pane id="Scope" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -897,9 +899,8 @@ </PATH> </subPane> </pane> - <pane id="Scope" /> + <pane id="PackagesPane" /> <pane id="Scratches" /> - <pane id="PackagesPane" /> </panes> </component> <component name="PropertiesComponent"> @@ -1334,31 +1335,31 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="51" y="23" width="1916" height="1057" extended-state="0" /> + <frame x="39" y="-1057" width="1916" height="1057" extended-state="0" /> <editor active="true" /> <layout> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32848233" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32809612" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3191268" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3180873" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32988676" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.088541664" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.124739036" sideWeight="0.49499285" order="2" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.081419624" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.26923078" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" x="1924" y="434" width="1916" height="296" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26923078" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" x="1924" y="434" width="1916" height="296" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.12447917" sideWeight="0.49499285" order="2" side_tool="false" content_ui="combo" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> <window_info id="Documentation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" x="2020" y="181" width="1720" height="977" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> @@ -1560,12 +1561,6 @@ <option name="timeStamp" value="188" /> </line-breakpoint> <line-breakpoint type="java-line"> - <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> - <line>335</line> - <properties /> - <option name="timeStamp" value="189" /> - </line-breakpoint> - <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java</url> <line>205</line> <properties /> @@ -1578,12 +1573,6 @@ <option name="timeStamp" value="198" /> </line-breakpoint> <line-breakpoint type="java-line"> - <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> - <line>329</line> - <properties /> - <option name="timeStamp" value="203" /> - </line-breakpoint> - <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java</url> <line>70</line> <properties /> @@ -1735,22 +1724,16 @@ <option name="timeStamp" value="385" /> </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>764</line> + <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java</url> + <line>925</line> <properties /> - <option name="timeStamp" value="407" /> - </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java</url> - <line>78</line> - <properties /> - <option name="timeStamp" value="422" /> + <option name="timeStamp" value="426" /> </line-breakpoint> </breakpoints> <breakpoints-dialog> <breakpoints-dialog /> </breakpoints-dialog> - <option name="time" value="424" /> + <option name="time" value="432" /> </breakpoint-manager> <watches-manager> <configuration name="Application"> @@ -1767,20 +1750,6 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_66.jdk/Contents/Home/src.zip!/java/io/BufferedInputStream.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.19254659"> - <caret line="245" column="32" selection-start-line="245" selection-start-column="32" selection-end-line="245" selection-end-column="32" /> - </state> - </provider> - </entry> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_66.jdk/Contents/Home/src.zip!/java/io/DataInputStream.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.44411325"> - <caret line="194" column="29" selection-start-line="194" selection-start-column="29" selection-end-line="194" selection-end-column="29" /> - </state> - </provider> - </entry> <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/src.zip!/java/util/concurrent/BlockingQueue.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.3323398"> @@ -1857,17 +1826,6 @@ </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.3490364"> - <caret line="188" column="12" selection-start-line="188" selection-start-column="12" selection-end-line="188" selection-end-column="12" /> - <folding> - <element signature="e#6257#6258#0" expanded="false" /> - <element signature="e#6318#6319#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZlibDecoder.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.46573874"> @@ -1893,14 +1851,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"> - <caret line="358" column="27" selection-start-line="358" selection-start-column="27" selection-end-line="358" selection-end-column="27" /> - <folding /> - </state> - </provider> - </entry> <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/src.zip!/java/util/concurrent/CountDownLatch.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.33297643"> @@ -1908,22 +1858,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncProtocol.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.55813956"> - <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="2.3023255"> - <caret line="102" column="27" selection-start-line="102" selection-start-column="27" selection-end-line="102" selection-end-column="27" /> - <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.5182013"> @@ -1932,22 +1866,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"> - <caret line="35" column="28" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.33333334"> - <caret line="32" column="16" selection-start-line="32" selection-start-column="16" selection-end-line="32" selection-end-column="16" /> - <folding /> - </state> - </provider> - </entry> <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/rt.jar!/sun/swing/AccumulativeRunnable.class"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.36514118"> @@ -1972,14 +1890,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="368" column="30" selection-start-line="368" selection-start-column="30" selection-end-line="368" selection-end-column="30" /> - <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.0"> @@ -2004,31 +1914,10 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/RendererImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="54" column="17" selection-start-line="54" selection-start-column="17" selection-end-line="54" selection-end-column="17" /> - <folding> - <element signature="e#0#3688#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#3580#3581#0" expanded="false" /> - <element signature="e#3608#3609#0" expanded="false" /> - <element signature="e#3646#3647#0" expanded="false" /> - <element signature="e#3683#3684#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/RawDecoder.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="30" column="35" selection-start-line="30" selection-start-column="35" selection-end-line="30" selection-end-column="35" /> - <folding> - <element signature="e#0#2017#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#1395#1396#0" expanded="false" /> - <element signature="e#1417#1418#0" expanded="false" /> - </folding> </state> </provider> </entry> @@ -2036,7 +1925,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="43" column="35" selection-start-line="43" selection-start-column="35" selection-end-line="43" selection-end-column="35" /> - <folding /> </state> </provider> </entry> @@ -2044,28 +1932,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="277" column="36" selection-start-line="277" selection-start-column="36" selection-end-line="277" selection-end-column="36" /> - <folding> - <element signature="e#0#12018#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#9974#9975#0" expanded="false" /> - <element signature="e#10009#10010#0" expanded="false" /> - <element signature="e#10074#10075#0" expanded="false" /> - <element signature="e#10140#10141#0" expanded="false" /> - <element signature="e#10198#10199#0" expanded="false" /> - <element signature="e#10257#10258#0" expanded="false" /> - <element signature="e#10294#10295#0" expanded="false" /> - <element signature="e#10343#10344#0" expanded="false" /> - <element signature="e#10381#10382#0" expanded="false" /> - <element signature="e#10431#10432#0" expanded="false" /> - <element signature="e#10473#10474#0" expanded="false" /> - <element signature="e#10527#10528#0" expanded="false" /> - <element signature="e#10833#10834#0" expanded="false" /> - <element signature="e#10861#10862#0" expanded="false" /> - <element signature="e#10968#10969#0" expanded="false" /> - <element signature="e#10997#10998#0" expanded="false" /> - <element signature="e#11744#11745#0" expanded="false" /> - <element signature="e#11771#11772#0" expanded="false" /> - </folding> </state> </provider> </entry> @@ -2081,14 +1947,6 @@ </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"> - <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/client/ClientToServerMessage.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.408472"> @@ -2097,14 +1955,6 @@ </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.43175852"> - <caret line="174" column="8" selection-start-line="174" selection-start-column="8" selection-end-line="174" selection-end-column="8" /> - <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"> @@ -2117,7 +1967,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.34557822"> <caret line="348" column="23" selection-start-line="348" selection-start-column="23" selection-end-line="348" selection-end-column="23" /> - <folding /> </state> </provider> </entry> @@ -2129,25 +1978,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="55" column="18" selection-start-line="55" selection-start-column="18" selection-end-line="55" selection-end-column="18" /> - <folding> - <element signature="e#8521#8522#0" expanded="true" /> - <element signature="e#8562#8563#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="44" column="0" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" /> - <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="2.049336"> @@ -2156,30 +1986,107 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="44" column="0" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="102" column="22" selection-start-line="102" selection-start-column="22" selection-end-line="102" selection-end-column="22" /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#5554#5555#0" expanded="false" /> + <element signature="e#5620#5621#0" expanded="false" /> + <element signature="e#8107#8108#0" expanded="false" /> + <element signature="e#8138#8139#0" expanded="false" /> + <element signature="e#8194#8195#0" expanded="false" /> + <element signature="e#8224#8225#0" expanded="false" /> + <element signature="e#8258#8259#0" expanded="false" /> + <element signature="e#8291#8292#0" expanded="false" /> + </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"> - <caret line="24" column="16" selection-start-line="24" selection-start-column="16" selection-end-line="24" selection-end-column="16" /> + <caret line="73" column="16" selection-start-line="73" selection-start-column="16" selection-end-line="73" selection-end-column="16" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncProtocol.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.33333334"> + <caret line="66" column="16" selection-start-line="66" selection-start-column="16" selection-end-line="66" selection-end-column="16" /> + <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.38118023"> + <caret line="99" column="38" selection-start-line="99" selection-start-column="38" selection-end-line="99" selection-end-column="38" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.33333334"> + <caret line="32" column="16" selection-start-line="32" selection-start-column="16" selection-end-line="32" selection-end-column="16" /> + <folding /> + </state> + </provider> + </entry> + <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="24.196667"> - <caret line="961" column="28" selection-start-line="961" selection-start-column="19" selection-end-line="961" selection-end-column="28" /> + <state vertical-scroll-proportion="0.0"> + <caret line="54" column="17" selection-start-line="54" selection-start-column="17" selection-end-line="54" selection-end-column="17" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="264" column="8" selection-start-line="264" selection-start-column="8" selection-end-line="264" selection-end-column="8" /> <folding> - <element signature="imports" expanded="true" /> - <element signature="e#36248#36249#0" expanded="true" /> - <element signature="e#36279#36280#0" expanded="true" /> + <element signature="e#8857#8858#0" expanded="true" /> + <element signature="e#8890#8891#0" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeSelectionPanel.java"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="448" column="12" selection-start-line="448" selection-start-column="12" selection-end-line="448" selection-end-column="12" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ReceiveSound.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="56" column="45" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" /> + <caret line="18" column="21" selection-start-line="18" selection-start-column="21" selection-end-line="18" selection-end-column="21" /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#2254#2255#0" expanded="false" /> + <element signature="e#2288#2289#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingNetworkConnectionWorker.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="121" column="33" selection-start-line="121" selection-start-column="33" selection-end-line="121" selection-end-column="33" /> <folding /> </state> </provider> @@ -2188,42 +2095,109 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="16" column="35" selection-start-line="16" selection-start-column="35" selection-end-line="16" selection-end-column="35" /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#2021#2022#0" expanded="false" /> + <element signature="e#2051#2052#0" expanded="false" /> + <element signature="e#2089#2090#0" expanded="false" /> + <element signature="e#2120#2121#0" expanded="false" /> + <element signature="e#2160#2161#0" expanded="false" /> + <element signature="e#2185#2186#0" expanded="false" /> + <element signature="e#2218#2219#0" expanded="false" /> + <element signature="e#2240#2241#0" expanded="false" /> + <element signature="e#2268#2269#0" expanded="false" /> + <element signature="e#2286#2287#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeSelectionPanel.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="58" column="0" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" /> <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"> + <caret line="56" column="39" selection-start-line="56" selection-start-column="39" selection-end-line="56" selection-end-column="39" /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#426#427#0" expanded="false" /> + <element signature="e#456#457#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/MessageQueue.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="54" column="5" selection-start-line="54" selection-start-column="5" selection-end-line="54" selection-end-column="5" /> + <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="238" column="0" selection-start-line="238" selection-start-column="0" selection-end-line="238" selection-end-column="0" /> + <folding> + <element signature="e#8562#8563#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="957" column="0" selection-start-line="957" selection-start-column="0" selection-end-line="957" selection-end-column="0" /> + <folding> + <element signature="imports" expanded="true" /> + <element signature="e#35849#35850#0" expanded="true" /> + <element signature="e#35873#35874#0" expanded="true" /> + <element signature="e#35898#35899#0" expanded="true" /> + <element signature="e#35922#35923#0" expanded="true" /> + <element signature="e#36213#36214#0" expanded="true" /> + </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"> + <caret line="124" column="0" selection-start-line="124" selection-start-column="0" selection-end-line="124" selection-end-column="0" /> + <folding> + <element signature="e#0#18438#0" expanded="true" /> + <element signature="imports" expanded="true" /> + <element signature="e#5429#5736#0" expanded="true" /> + <element signature="e#5735#5736#0" expanded="true" /> + </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.31111112"> + <caret line="56" column="32" selection-start-line="56" selection-start-column="32" selection-end-line="56" selection-end-column="32" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="182" column="28" selection-start-line="182" selection-start-column="28" selection-end-line="182" selection-end-column="28" /> <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="-328.37036"> - <caret line="860" column="75" selection-start-line="860" selection-start-column="75" selection-end-line="860" selection-end-column="75" /> - <folding> - <element signature="e#4864#5051#0" expanded="true" /> - <element signature="e#5050#5051#0" expanded="true" /> - <element signature="e#33227#34236#0" expanded="true" /> - <element signature="e#34235#34236#0" expanded="true" /> - <element signature="e#35670#36067#0" expanded="true" /> - <element signature="e#36066#36067#0" expanded="true" /> - </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.175"> - <caret line="121" column="44" selection-start-line="121" selection-start-column="44" selection-end-line="121" selection-end-column="44" /> - <folding> - <element signature="e#0#18438#0" expanded="true" /> - <element signature="imports" expanded="true" /> - <element signature="e#5735#5736#0" expanded="true" /> - </folding> + <state vertical-scroll-proportion="2.488889"> + <caret line="194" column="19" selection-start-line="194" selection-start-column="19" selection-end-line="194" selection-end-column="19" /> + <folding /> </state> </provider> </entry>
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java Mon Jan 18 17:37:58 2016 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java Tue Jan 19 17:41:46 2016 +0900 @@ -923,19 +923,27 @@ int y = (int) (rectangles.get(shareScreenNumber).getY()); // Fix invalid x, y position. - if(x == 0 && y == 0) { - for (Rectangle rectangle : rectangles) { + if (x == 0 && y == 0) { + for (int i = 0; i < rectangles.size(); i++) { + Rectangle rectangle = rectangles.get(i); + int scale = retinaScale(i); if (rectangle.getX() < 0) { - x = Math.abs((int) rectangle.getX()); + x = Math.abs((int) rectangle.getX()) * scale; } if (rectangle.getY() < 0) { - y = Math.abs((int) rectangle.getY()); + y = Math.abs((int) rectangle.getY()) * scale; } } } else { - x = x < 0 ? 0 : x; - y = y < 0 ? 0 : y; + for (int i = 0; i < rectangles.size(); i++) { + if(i != shareScreenNumber) { + x = x * retinaScale(i); + y = y * retinaScale(i); + } + } } + x = x < 0 ? 0 : x; + y = y < 0 ? 0 : y; int scale = retinaScale(shareScreenNumber);