Mercurial > hg > Members > riono > TreeVNC_ja_comment
changeset 417:c225c7963778
Send screen position
| author | Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Mon, 14 Dec 2015 16:20:20 +0900 |
| parents | b554dcc915c9 |
| children | 0543c380308c |
| files | .idea/workspace.xml src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java src/viewer_swing/java/com/glavsoft/viewer/Viewer.java src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java |
| diffstat | 6 files changed, 358 insertions(+), 274 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Tue Nov 24 12:12:47 2015 +0900 +++ b/.idea/workspace.xml Mon Dec 14 16:20:20 2015 +0900 @@ -2,8 +2,11 @@ <project version="4"> <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/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/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/ScreenChangeRequest.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> </list> <ignored path="TreeVNC.iws" /> <ignored path=".idea/workspace.xml" /> @@ -42,7 +45,7 @@ <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="64" column="29" selection-start-line="64" selection-start-column="29" selection-end-line="64" selection-end-column="29" /> + <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" /> <folding /> </state> </provider> @@ -64,8 +67,12 @@ <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="329" column="37" selection-start-line="329" selection-start-column="37" selection-end-line="329" selection-end-column="37" /> - <folding /> + <caret line="481" column="0" selection-start-line="481" selection-start-column="0" selection-end-line="481" selection-end-column="0" /> + <folding> + <element signature="e#15666#15667#0" expanded="true" /> + <element signature="e#15691#15692#0" expanded="true" /> + <element signature="e#16329#16340#0" expanded="true" /> + </folding> </state> </provider> </entry> @@ -84,7 +91,7 @@ <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="142" column="21" selection-start-line="142" selection-start-column="13" selection-end-line="142" selection-end-column="21" /> + <caret line="285" column="0" selection-start-line="285" selection-start-column="0" selection-end-line="285" selection-end-column="0" /> <folding> <element signature="e#4653#4654#0" expanded="true" /> <element signature="e#4693#4694#0" expanded="true" /> @@ -96,10 +103,21 @@ <file leaf-file-name="TreeRFBProto.java" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="1.07685"> - <caret line="230" column="59" selection-start-line="230" selection-start-column="59" selection-end-line="230" selection-end-column="59" /> + <state vertical-scroll-proportion="0.38134205"> + <caret line="201" column="0" selection-start-line="201" selection-start-column="0" selection-end-line="201" selection-end-column="0" /> <folding> <element signature="imports" expanded="true" /> + <element signature="e#27867#27879#0" expanded="true" /> + <element signature="e#35223#35224#0" expanded="true" /> + <element signature="e#35247#35248#0" expanded="true" /> + <element signature="e#35272#35273#0" expanded="true" /> + <element signature="e#35296#35297#0" expanded="true" /> + <element signature="e#35331#35332#0" expanded="true" /> + <element signature="e#35365#35366#0" expanded="true" /> + <element signature="e#35401#35402#0" expanded="true" /> + <element signature="e#35436#35437#0" expanded="true" /> + <element signature="e#35553#35554#0" expanded="true" /> + <element signature="e#35587#35588#0" expanded="true" /> </folding> </state> </provider> @@ -109,21 +127,11 @@ </split-first> <split-second> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="ZlibDecoder.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZlibDecoder.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="40" column="21" selection-start-line="40" selection-start-column="21" selection-end-line="40" selection-end-column="21" /> - <folding /> - </state> - </provider> - </entry> - </file> <file leaf-file-name="SwingNetworkConnectionWorker.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingNetworkConnectionWorker.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="120" column="0" selection-start-line="120" selection-start-column="0" selection-end-line="120" selection-end-column="0" /> + <state vertical-scroll-proportion="-16.333334"> + <caret line="175" column="39" selection-start-line="175" selection-start-column="39" selection-end-line="175" selection-end-column="39" /> <folding> <element signature="imports" expanded="true" /> </folding> @@ -131,11 +139,11 @@ </provider> </entry> </file> - <file leaf-file-name="SwingRfbConnectionWorker.java" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java"> + <file leaf-file-name="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.24193548"> - <caret line="180" column="17" selection-start-line="180" selection-start-column="17" selection-end-line="180" selection-end-column="17" /> + <state vertical-scroll-proportion="0.0"> + <caret line="64" column="36" selection-start-line="64" selection-start-column="36" selection-end-line="64" selection-end-column="36" /> <folding /> </state> </provider> @@ -145,7 +153,32 @@ <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="40" column="66" selection-start-line="40" selection-start-column="66" selection-end-line="40" selection-end-column="66" /> + <caret line="44" column="66" selection-start-line="44" selection-start-column="66" selection-end-line="44" selection-end-column="66" /> + <folding /> + </state> + </provider> + </entry> + </file> + <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.023510972"> + <caret line="870" column="0" selection-start-line="870" selection-start-column="0" selection-end-line="912" selection-end-column="40" /> + <folding> + <element signature="e#32602#33052#0" expanded="true" /> + <element signature="e#33051#33052#0" expanded="true" /> + <element signature="e#33227#33948#0" expanded="true" /> + <element signature="e#33947#33948#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ScreenChangeSelectionPanel.java" pinned="false" current-in-tab="false"> + <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> @@ -176,16 +209,28 @@ <file leaf-file-name="ReceiverTask.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="329" column="58" selection-start-line="329" selection-start-column="58" selection-end-line="329" selection-end-column="58" /> + <state vertical-scroll-proportion="-21.037037"> + <caret line="360" column="77" selection-start-line="360" selection-start-column="77" selection-end-line="360" selection-end-column="77" /> <folding> - <element signature="e#0#18212#0" expanded="true" /> + <element signature="e#0#17911#0" expanded="true" /> <element signature="imports" expanded="true" /> + <marker date="1450076761000" expanded="true" signature="16179:16279" placeholder="{...}" /> + <marker date="1450076761000" expanded="true" signature="16314:16956" placeholder="{...}" /> </folding> </state> </provider> </entry> </file> + <file leaf-file-name="FramebufferUpdateRequestMessage.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/client/FramebufferUpdateRequestMessage.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="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> + </file> <file leaf-file-name="DecodersContainer.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/DecodersContainer.java"> <provider selected="true" editor-type-id="text-editor"> @@ -198,26 +243,6 @@ </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"> - <caret line="59" column="16" selection-start-line="59" selection-start-column="16" selection-end-line="59" selection-end-column="16" /> - <folding /> - </state> - </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="31" column="25" selection-start-line="31" selection-start-column="25" selection-end-line="31" selection-end-column="25" /> - <folding /> - </state> - </provider> - </entry> - </file> </leaf> </split-second> </splitter> @@ -526,18 +551,18 @@ <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/ConnectionView.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeSelectionPanel.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/test/IsRetina.java" /> - <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/EncodingType.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ChildNodeAnnounce.java" /> - <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingNetworkConnectionWorker.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CheckDelay.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/CheckDelayReply.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" /> + <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> - <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java" /> + <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> </list> </option> </component> @@ -545,7 +570,7 @@ <option name="x" value="4" /> <option name="y" value="23" /> <option name="width" value="1916" /> - <option name="height" value="1177" /> + <option name="height" value="1057" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="true"> <OptionsSetting value="true" id="Add" /> @@ -573,7 +598,6 @@ </navigator> <panes> <pane id="Scope" /> - <pane id="PackagesPane" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -889,6 +913,7 @@ </subPane> </pane> <pane id="Scratches" /> + <pane id="PackagesPane" /> </panes> </component> <component name="PropertiesComponent"> @@ -908,7 +933,7 @@ <property name="settings.editor.selected.configurable" value="preferences.editor" /> <property name="settings.editor.splitter.proportion" value="0.2" /> </component> - <component name="RunManager" selected="Application.TreeeViewer -d --checkDelay"> + <component name="RunManager" selected="Application.TreeeViewer -d"> <configuration default="false" name="TreeViewer" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea"> <pattern> @@ -1323,36 +1348,64 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="4" y="23" width="1916" height="1177" extended-state="0" /> - <editor active="true" /> + <frame x="4" y="23" width="1916" height="1057" extended-state="6" /> + <editor active="false" /> <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.32902032" 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="false" show_stripe_button="true" weight="0.32120582" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32988676" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18006264" 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.123695195" sideWeight="0.5" order="2" 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="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.30769232" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <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.11770833" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3077634" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <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="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32902032" sideWeight="0.5" order="12" 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="100" y="123" width="1720" height="977" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28743067" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32928017" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> </layout> + <layout-to-restore> + <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <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="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="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="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="7" side_tool="false" content_ui="tabs" /> + <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" 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.12356479" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> + <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="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3077634" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <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="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.32902032" 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="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="5" side_tool="false" content_ui="tabs" x="100" y="123" width="1720" height="977" /> + <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> + <window_info id="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="false" show_stripe_button="true" weight="0.28558224" 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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18862766" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32928017" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" 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" /> + </layout-to-restore> </component> <component name="Vcs.Log.UiProperties"> <option name="RECENTLY_FILTERED_USER_GROUPS"> @@ -1382,7 +1435,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java</url> - <line>878</line> + <line>877</line> <properties /> <option name="timeStamp" value="31" /> </line-breakpoint> @@ -1394,13 +1447,13 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java</url> - <line>396</line> + <line>391</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>526</line> + <line>532</line> <properties /> <option name="timeStamp" value="76" /> </line-breakpoint> @@ -1508,13 +1561,13 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>946</line> + <line>960</line> <properties /> <option name="timeStamp" value="186" /> </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>966</line> + <line>980</line> <properties /> <option name="timeStamp" value="187" /> </line-breakpoint> @@ -1568,13 +1621,13 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>950</line> + <line>964</line> <properties /> <option name="timeStamp" value="209" /> </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>492</line> + <line>498</line> <properties /> <option name="timeStamp" value="212" /> </line-breakpoint> @@ -1586,7 +1639,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>977</line> + <line>991</line> <properties /> <option name="timeStamp" value="217" /> </line-breakpoint> @@ -1597,14 +1650,8 @@ <option name="timeStamp" value="218" /> </line-breakpoint> <line-breakpoint type="java-line"> - <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> - <line>481</line> - <properties /> - <option name="timeStamp" value="220" /> - </line-breakpoint> - <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>817</line> + <line>824</line> <properties /> <option name="timeStamp" value="230" /> </line-breakpoint> @@ -1615,12 +1662,6 @@ <option name="timeStamp" value="237" /> </line-breakpoint> <line-breakpoint type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>202</line> - <properties /> - <option name="timeStamp" value="248" /> - </line-breakpoint> - <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java</url> <line>224</line> <properties /> @@ -1640,7 +1681,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>640</line> + <line>646</line> <properties /> <option name="timeStamp" value="264" /> </line-breakpoint> @@ -1662,12 +1703,6 @@ <properties /> <option name="timeStamp" value="277" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java</url> - <line>120</line> - <properties /> - <option name="timeStamp" value="281" /> - </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/FramebufferUpdateRectangle.java</url> <line>65</line> @@ -1676,45 +1711,39 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>737</line> + <line>743</line> <properties /> <option name="timeStamp" value="290" /> </line-breakpoint> <line-breakpoint enabled="true" 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="293" /> - </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java</url> - <line>321</line> + <line>316</line> <properties /> <option name="timeStamp" value="294" /> </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java</url> - <line>372</line> + <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java</url> + <line>914</line> <properties /> - <option name="timeStamp" value="295" /> + <option name="timeStamp" value="302" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> + <line>481</line> + <properties /> + <option name="timeStamp" value="303" /> </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>323</line> + <line>206</line> <properties /> - <option name="timeStamp" value="297" /> - </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>695</line> - <properties /> - <option name="timeStamp" value="298" /> + <option name="timeStamp" value="304" /> </line-breakpoint> </breakpoints> <breakpoints-dialog> <breakpoints-dialog /> </breakpoints-dialog> - <option name="time" value="299" /> + <option name="time" value="308" /> </breakpoint-manager> <watches-manager /> </component> @@ -1723,35 +1752,6 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/ProtocolState.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="34" column="15" selection-start-line="34" selection-start-column="15" selection-end-line="34" selection-end-column="15" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindowFactory.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="27" column="35" selection-start-line="27" selection-start-column="35" selection-end-line="27" selection-end-column="35" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingConnectionWorkerFactory.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" /> - </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.3329453"> - <caret line="58" column="9" selection-start-line="58" selection-start-column="9" selection-end-line="58" selection-end-column="9" /> - </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.10477299"> @@ -1815,13 +1815,6 @@ </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="23" selection-start-line="58" selection-start-column="22" selection-end-line="58" selection-end-column="23" /> - </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"> @@ -1887,33 +1880,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="982" column="0" selection-start-line="982" selection-start-column="0" selection-end-line="982" 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="142" column="21" selection-start-line="142" selection-start-column="13" selection-end-line="142" selection-end-column="21" /> - <folding> - <element signature="e#4653#4654#0" expanded="true" /> - <element signature="e#4693#4694#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="329" column="37" selection-start-line="329" selection-start-column="37" selection-end-line="329" selection-end-column="37" /> - <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.33333334"> @@ -1981,24 +1947,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/ServerInitMessage.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="44" column="24" selection-start-line="44" selection-start-column="24" selection-end-line="44" selection-end-column="24" /> - <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"> - <caret line="66" column="67" selection-start-line="66" selection-start-column="67" selection-end-line="66" selection-end-column="67" /> - <folding> - <element signature="imports" expanded="true" /> - </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.41608876"> @@ -2015,16 +1963,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="57" column="50" selection-start-line="57" selection-start-column="50" selection-end-line="57" selection-end-column="50" /> - <folding> - <element signature="imports" expanded="true" /> - </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"> @@ -2033,14 +1971,50 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ChildNodeAnnounce.java"> + <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.020188425"> + <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/CheckDelayReply.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="31" column="25" selection-start-line="31" selection-start-column="25" selection-end-line="31" selection-end-column="25" /> + <folding> + <element signature="imports" expanded="false" /> + </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="22" column="20" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="20" /> + <caret line="180" column="17" selection-start-line="180" selection-start-column="17" selection-end-line="180" selection-end-column="17" /> + <folding /> + </state> + </provider> + </entry> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_66.jdk/Contents/Home/src.zip!/java/awt/GraphicsDevice.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.41608876"> + <caret line="80" column="23" selection-start-line="80" selection-start-column="23" selection-end-line="80" selection-end-column="23" /> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="57" column="50" selection-start-line="57" selection-start-column="50" selection-end-line="57" selection-end-column="50" /> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> <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.0"> @@ -2051,37 +2025,81 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java"> + <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/jp/ac/u_ryukyu/treevnc/ChildNodeAnnounce.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="40" column="66" selection-start-line="40" selection-start-column="66" selection-end-line="40" selection-end-column="66" /> + <caret line="22" column="20" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="20" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/IRepaintController.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.20134228"> + <caret line="36" column="9" selection-start-line="36" selection-start-column="9" selection-end-line="36" selection-end-column="9" /> <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.3328859"> + <caret line="182" column="16" selection-start-line="182" selection-start-column="16" selection-end-line="182" selection-end-column="16" /> + <folding> + <element signature="e#6257#6258#0" expanded="true" /> + <element signature="e#6318#6319#0" expanded="true" /> + </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="-16.333334"> + <caret line="175" column="39" selection-start-line="175" selection-start-column="39" selection-end-line="175" selection-end-column="39" /> + <folding> + <element signature="imports" expanded="true" /> + </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"> - <caret line="45" column="14" selection-start-line="45" selection-start-column="14" selection-end-line="45" selection-end-column="14" /> + <caret line="64" column="36" selection-start-line="64" selection-start-column="36" selection-end-line="64" selection-end-column="36" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> + <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"> - <caret line="329" column="58" selection-start-line="329" selection-start-column="58" selection-end-line="329" selection-end-column="58" /> + <caret line="66" column="67" selection-start-line="66" selection-start-column="67" selection-end-line="66" selection-end-column="67" /> <folding> - <element signature="e#0#18212#0" expanded="true" /> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SendSound.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/ServerInitMessage.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.020188425"> - <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" /> + <state vertical-scroll-proportion="0.0"> + <caret line="44" column="24" selection-start-line="44" selection-start-column="24" selection-end-line="44" selection-end-column="24" /> + <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="66" selection-start-line="44" selection-start-column="66" selection-end-line="44" selection-end-column="66" /> <folding /> </state> </provider> @@ -2089,47 +2107,89 @@ <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="64" column="29" selection-start-line="64" selection-start-column="29" selection-end-line="64" selection-end-column="29" /> + <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" 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="285" column="0" selection-start-line="285" selection-start-column="0" selection-end-line="285" selection-end-column="0" /> + <folding> + <element signature="e#4653#4654#0" expanded="true" /> + <element signature="e#4693#4694#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.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/CheckDelayReply.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-21.037037"> + <caret line="360" column="77" selection-start-line="360" selection-start-column="77" selection-end-line="360" selection-end-column="77" /> + <folding> + <element signature="e#0#17911#0" expanded="true" /> + <element signature="imports" expanded="true" /> + <marker date="1450076761000" expanded="true" signature="16179:16279" placeholder="{...}" /> + <marker date="1450076761000" expanded="true" signature="16314:16956" placeholder="{...}" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="31" column="25" selection-start-line="31" selection-start-column="25" selection-end-line="31" selection-end-column="25" /> - <folding /> + <caret line="481" column="0" selection-start-line="481" selection-start-column="0" selection-end-line="481" selection-end-column="0" /> + <folding> + <element signature="e#15666#15667#0" expanded="true" /> + <element signature="e#15691#15692#0" expanded="true" /> + <element signature="e#16329#16340#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.023510972"> + <caret line="870" column="0" selection-start-line="870" selection-start-column="0" selection-end-line="912" selection-end-column="40" /> + <folding> + <element signature="e#32602#33052#0" expanded="true" /> + <element signature="e#33051#33052#0" expanded="true" /> + <element signature="e#33227#33948#0" expanded="true" /> + <element signature="e#33947#33948#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="1.07685"> - <caret line="230" column="59" selection-start-line="230" selection-start-column="59" selection-end-line="230" selection-end-column="59" /> + <state vertical-scroll-proportion="0.38134205"> + <caret line="201" column="0" selection-start-line="201" selection-start-column="0" selection-end-line="201" selection-end-column="0" /> <folding> <element signature="imports" expanded="true" /> + <element signature="e#27867#27879#0" expanded="true" /> + <element signature="e#35223#35224#0" expanded="true" /> + <element signature="e#35247#35248#0" expanded="true" /> + <element signature="e#35272#35273#0" expanded="true" /> + <element signature="e#35296#35297#0" expanded="true" /> + <element signature="e#35331#35332#0" expanded="true" /> + <element signature="e#35365#35366#0" expanded="true" /> + <element signature="e#35401#35402#0" expanded="true" /> + <element signature="e#35436#35437#0" expanded="true" /> + <element signature="e#35553#35554#0" expanded="true" /> + <element signature="e#35587#35588#0" expanded="true" /> </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="120" column="0" selection-start-line="120" selection-start-column="0" selection-end-line="120" selection-end-column="0" /> - <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.24193548"> - <caret line="180" column="17" selection-start-line="180" selection-start-column="17" selection-end-line="180" selection-end-column="17" /> - <folding /> - </state> - </provider> - </entry> </component> <component name="hg4idea.settings"> <option name="CHECK_INCOMING_OUTGOING" value="true" />
--- a/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java Tue Nov 24 12:12:47 2015 +0900 +++ b/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java Mon Dec 14 16:20:20 2015 +0900 @@ -239,11 +239,6 @@ try { decoder.decode(reader, renderer, rect); // TreeVNC processing here if (rfb.getCuiVersion()) continue; - if (rect.x >= rfb.getSingleWidth() && rfb.getShareScreenNumber() == 1) { - continue; - } else if(rect.x < rfb.getSingleWidth() && rfb.getShareScreenNumber() == 2) { - continue; - } repaintController.repaintBitmap(rect); } catch (Exception e) { throw e;
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java Tue Nov 24 12:12:47 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java Mon Dec 14 16:20:20 2015 +0900 @@ -19,16 +19,20 @@ public class ScreenChangeRequest implements ClientToServerMessage { final String bytes; private final int scale; + private final int x; + private final int y; private short id; private int frameSizeWidth; private int frameSizeHeight; private int port; private int shareScreenNumber; - public ScreenChangeRequest(String adr, int port, short id, int width, int height, int shareScreenNumber, int scale) { + public ScreenChangeRequest(String adr, int port, short id, int x, int y, int width, int height, int shareScreenNumber, int scale) { this.bytes = adr; this.port = port; this.id = id; + this.x = x; + this.y = y; this.frameSizeWidth = width; this.frameSizeHeight = height; this.shareScreenNumber = shareScreenNumber; @@ -38,13 +42,15 @@ @Override public void send(Writer writer) throws TransportException { - ByteBuffer out = ByteBuffer.allocate(bytes.length()+29); + ByteBuffer out = ByteBuffer.allocate(bytes.length()+37); out.order(ByteOrder.BIG_ENDIAN); out.put(SERVER_CHANGE_REQUEST); out.put((byte)0); // padding out.putShort(id); out.putInt(bytes.length()); out.put(bytes.getBytes()); + out.putInt(x); + out.putInt(y); out.putInt(frameSizeWidth); out.putInt(frameSizeHeight); out.putInt(port);
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Tue Nov 24 12:12:47 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Mon Dec 14 16:20:20 2015 +0900 @@ -81,6 +81,10 @@ private boolean childrenMulticast = true; private int retinaScale = 1; + + private int x; + private int y; + public TreeRFBProto(boolean isTreeManager, ViewerInterface viewer) { rThread = new RequestScreenThread(this); nets.setMyRfb(this); @@ -213,13 +217,15 @@ byte[] byteAddress = new byte[length]; buf.get(byteAddress); String newHostName = new String(byteAddress, "UTF-8"); + int x = buf.getInt(); + int y = buf.getInt(); int frameSizeWidth = buf.getInt(); int frameSizeHeight = buf.getInt(); int port = buf.getInt(); int shareScreenNumber = buf.getInt(); int scale = buf.getInt(); System.out.println("Root server change request :" + newHostName + " : " + port); - changeVNCServer(viewer, newHostName, port, frameSizeWidth, frameSizeHeight, shareScreenNumber, scale, id, is, os); + changeVNCServer(viewer, newHostName, port, x, y, frameSizeWidth, frameSizeHeight, shareScreenNumber, scale, id, is, os); } else { continue; } @@ -812,9 +818,10 @@ * @param is * @param os */ - public void changeVNCServer(ViewerInterface vncProxyService, String hostName, int port, int width, int height, int shareScreenNumber, int scale, short newVNCServerId, Reader is, Writer os) + public void changeVNCServer(ViewerInterface vncProxyService, String hostName, int port, int x, int y, int width, int height, int shareScreenNumber, int scale, short newVNCServerId, Reader is, Writer os) throws IOException { - + this.x = x; + this.y = y; this.frameSizeWidth = width; this.frameSizeHeight = height; this.shareScreenNumber = shareScreenNumber; @@ -915,6 +922,13 @@ this.singleHeight = singleHeight; } + public int getX() { + return x; + } + + public int getY() { + return y; + } public int getSingleWidth() { return singleWidth; @@ -950,7 +964,9 @@ public void exchangeDirectConnectedServer(Reader previousReader, Writer previousWriter) { String adr = viewer.getRfb().getMyAddress(); int scale = viewer.getRfb().getRetinaScale(); - ScreenChangeRequest scr = new ScreenChangeRequest(adr, ConnectionParams.DEFAULT_VNC_ROOT, (short) -1, singleWidth, singleHeight, shareScreenNumber, scale); + int x = 0; + int y = 0; + ScreenChangeRequest scr = new ScreenChangeRequest(adr, ConnectionParams.DEFAULT_VNC_ROOT, (short) -1, x, y, singleWidth, singleHeight, shareScreenNumber, scale); try { scr.send(previousWriter); } catch (TransportException e) {
--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Tue Nov 24 12:12:47 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Mon Dec 14 16:20:20 2015 +0900 @@ -486,6 +486,7 @@ ArrayList<Rectangle> rectangles = new ArrayList<Rectangle>(); GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); GraphicsDevice[] gs = ge.getScreenDevices(); + for (GraphicsDevice gd : gs) { for (GraphicsConfiguration r : gd.getConfigurations()) { rectangles.add(r.getBounds());
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java Tue Nov 24 12:12:47 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java Mon Dec 14 16:20:20 2015 +0900 @@ -856,9 +856,8 @@ screenChangeRequest(context, 0); } else if (rectangles.size() == 2){ // dual display ScreenChangeSelectionPanel selectionPanel = new ScreenChangeSelectionPanel(viewerWindow, context); - selectionPanel.checkBox("all screen"); - selectionPanel.checkBox("left screen"); - selectionPanel.checkBox("right screen"); + selectionPanel.checkBox("0"); + selectionPanel.checkBox("1"); selectionPanel.setButton(); selectionPanel.visible(); } @@ -912,39 +911,55 @@ } public void screenChangeRequest(ProtocolContext context, int shareScreenNumber) { - float scaleFactor = getMyDisplayScaleFactor(); - ArrayList<Rectangle> rectangles = viewer.getScreenRectangles(); - int leftScreenNumber = 0; - int singleWidth = (int) (rectangles.get(leftScreenNumber).getWidth() * scaleFactor); - int singleHeight = (int) (rectangles.get(leftScreenNumber).getHeight() * scaleFactor); - int scale = retinaScale(); + ArrayList<Rectangle> rectangles = viewer.getScreenRectangles(); + int singleWidth = (int) (rectangles.get(shareScreenNumber).getWidth()); + int singleHeight = (int) (rectangles.get(shareScreenNumber).getHeight()); viewer.getRfb().setSingleDisplaySize(singleWidth, singleHeight); + int x = (int) (rectangles.get(shareScreenNumber).getX()); + int y = (int) (rectangles.get(shareScreenNumber).getY()); + + // Fix invalid x, y position. + if(x == 0 && y == 0) { + for (Rectangle rectangle : rectangles) { + if (rectangle.getX() < 0) { + x = Math.abs((int) rectangle.getX()); + } + if (rectangle.getY() < 0) { + y = Math.abs((int) rectangle.getY()); + } + } + } else { + x = x < 0 ? 0 : x; + y = y < 0 ? 0 : y; + } + + int scale = retinaScale(shareScreenNumber); if (viewer.getRfb().hasParent()) { String adr = viewer.getRfb().getMyAddress(); - //if (scanPort(adr, ConnectionParams.DEFAULT_RFB_PORT)) { + if (scanPort(adr, ConnectionParams.DEFAULT_RFB_PORT)) { // -1 means request to reverse direct connection socket short id = viewer.getRfb().isTreeManager()? (short)-1 : viewer.getRfb().getId(); - context.sendMessage(new ScreenChangeRequest(adr, ConnectionParams.DEFAULT_VNC_ROOT, id, singleWidth, singleHeight, shareScreenNumber, scale)); - //} + context.sendMessage(new ScreenChangeRequest(adr, ConnectionParams.DEFAULT_VNC_ROOT, id, x, y, singleWidth, singleHeight, shareScreenNumber, scale)); + } } if (viewer.getRfb().isTreeManager()) { - changeVncServer(viewer, singleWidth, singleHeight, shareScreenNumber, scale, viewer.getRfb().getId()); + changeVncServer(viewer, x, y, singleWidth, singleHeight, shareScreenNumber, scale, viewer.getRfb().getId()); return; } } - private int retinaScale() { + private int retinaScale(int shareScreenNumber) { int scale = 1; GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment(); - final GraphicsDevice device = env.getDefaultScreenDevice(); + final GraphicsDevice[] devices = env.getScreenDevices(); try { - Field field = device.getClass().getDeclaredField("scale"); + Field field = devices[shareScreenNumber].getClass().getDeclaredField("scale"); if (field != null) { field.setAccessible(true); - Object retinaScale = field.get(device); + Object retinaScale = field.get(devices[shareScreenNumber]); if (retinaScale instanceof Integer) { scale = (int)retinaScale; @@ -970,15 +985,6 @@ } } - - - private float getMyDisplayScaleFactor() { - final String CONTENT_SCALE_FACTOR = "java.awt.contentScaleFactor"; - Float scaleFactor = (Float) Toolkit.getDefaultToolkit().getDesktopProperty(CONTENT_SCALE_FACTOR); - - return scaleFactor == null ? 1.0f : scaleFactor; - } - public void fitScreen() { ArrayList<Rectangle> rectangles = viewer.getScreenRectangles(); int leftScreenNumber = 0; @@ -1062,10 +1068,10 @@ frame.setVisible(b); } - private void changeVncServer(ViewerInterface viewer, int width, int height, int shareScreenNumber, int scale, short id) { + private void changeVncServer(ViewerInterface viewer, int x, int y, int width, int height, int shareScreenNumber, int scale, short id) { String localhost = "127.0.0.1"; // InetAddress.getLocalHost().getHostName() try { - viewer.getRfb().changeVNCServer(viewer, localhost, ConnectionParams.DEFAULT_RFB_PORT, width, height, shareScreenNumber, scale, id, null, null); + viewer.getRfb().changeVNCServer(viewer, localhost, ConnectionParams.DEFAULT_RFB_PORT, x, y, width, height, shareScreenNumber, scale, id, null, null); } catch (Exception e1) { System.out.println("can't change server :" + e1.getMessage()); }