Mercurial > hg > Members > riono > TreeVNC_ja_comment
changeset 435:4ac83ab4be81
find our screen on fitScreen
remove requestSingleScreenSize
| author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Sun, 12 Jun 2016 09:06:53 +0900 |
| parents | aad75cd6d9e2 |
| children | 9db8862ef200 |
| files | .idea/workspace.xml src/main/java/com/glavsoft/rfb/client/ClientToServerMessage.java src/main/java/jp/ac/u_ryukyu/treevnc/RequestSingleDisplaySize.java src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java src/main/java/jp/ac/u_ryukyu/treevnc/TreeRootFinderListener.java src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java |
| diffstat | 6 files changed, 207 insertions(+), 209 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Sat Jun 11 22:42:58 2016 +0900 +++ b/.idea/workspace.xml Sun Jun 12 09:06:53 2016 +0900 @@ -2,13 +2,11 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="8c014d34-63b7-4e87-8d9c-e9f73c2c3803" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java" afterPath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/RequestSingleDisplaySize.java" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/client/ClientToServerMessage.java" afterPath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/client/ClientToServerMessage.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" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRootFinderListener.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRootFinderListener.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/gradle.xml" afterPath="$PROJECT_DIR$/.idea/gradle.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> </list> <ignored path="TreeVNC.iws" /> @@ -50,44 +48,17 @@ <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="454" column="0" selection-start-line="454" selection-start-column="0" selection-end-line="454" selection-end-column="0" /> + <state vertical-scroll-proportion="-23.733334"> + <caret line="261" column="69" selection-start-line="261" selection-start-column="69" selection-end-line="261" selection-end-column="69" /> <folding> <element signature="imports" expanded="true" /> + <element signature="e#12298#12624#0" expanded="true" /> + <element signature="e#12623#12624#0" expanded="true" /> </folding> </state> </provider> </entry> </file> - <file leaf-file-name="TreeVncRootSelectionPanel.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="106" column="0" selection-start-line="106" selection-start-column="0" selection-end-line="106" selection-end-column="0" /> - <folding> - <element signature="e#1969#1970#0" expanded="true" /> - <element signature="e#1993#1994#0" expanded="true" /> - <element signature="e#2946#2947#0" expanded="true" /> - <element signature="e#2972#2973#0" expanded="true" /> - <element signature="e#3000#3001#0" expanded="true" /> - <element signature="e#3018#3019#0" expanded="true" /> - <element signature="e#4541#4542#0" expanded="true" /> - <element signature="e#4569#4570#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="TreeVncCommand.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="46" column="0" selection-start-line="46" selection-start-column="0" selection-end-line="46" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - </file> <file leaf-file-name="TreeVncProtocol.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncProtocol.java"> <provider selected="true" editor-type-id="text-editor"> @@ -98,13 +69,13 @@ </provider> </entry> </file> - <file leaf-file-name="SwingViewerWindow.java" pinned="false" current-in-tab="false"> + <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="1034" column="91" selection-start-line="1034" selection-start-column="91" selection-end-line="1034" selection-end-column="91" /> + <state vertical-scroll-proportion="0.4284546"> + <caret line="908" column="45" selection-start-line="908" selection-start-column="45" selection-end-line="908" selection-end-column="45" /> <folding> - <element signature="e#0#45566#0" expanded="true" /> + <element signature="e#0#45693#0" expanded="true" /> </folding> </state> </provider> @@ -115,36 +86,20 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="39" column="19" selection-start-line="39" selection-start-column="19" selection-end-line="39" selection-end-column="19" /> - <folding> - <element signature="e#2138#2139#0" expanded="true" /> - <element signature="e#2189#2190#0" expanded="true" /> - <element signature="e#4339#4340#0" expanded="true" /> - <element signature="e#4370#4371#0" expanded="true" /> - <element signature="e#4406#4407#0" expanded="true" /> - <element signature="e#4453#4454#0" expanded="true" /> - <element signature="e#4489#4490#0" expanded="true" /> - <element signature="e#4521#4522#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="TreeRootFinderListener.java" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRootFinderListener.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.9076043"> - <caret line="81" column="23" selection-start-line="81" selection-start-column="23" selection-end-line="81" selection-end-column="23" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="InitState.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java"> + <file leaf-file-name="TreeRootFinderListener.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRootFinderListener.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="33" column="2" selection-start-line="33" selection-start-column="2" selection-end-line="33" selection-end-column="2" /> - <folding /> + <state vertical-scroll-proportion="-19.266666"> + <caret line="63" column="45" selection-start-line="63" selection-start-column="45" selection-end-line="63" selection-end-column="45" /> + <folding> + <element signature="e#3076#3077#0" expanded="true" /> + <element signature="e#3098#3099#0" expanded="true" /> + </folding> </state> </provider> </entry> @@ -154,7 +109,25 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="43" column="59" selection-start-line="43" selection-start-column="59" selection-end-line="43" selection-end-column="59" /> - <folding /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#1886#1887#0" expanded="false" /> + <element signature="e#1913#1914#0" expanded="false" /> + <element signature="e#1941#1942#0" expanded="false" /> + <element signature="e#1974#1975#0" expanded="false" /> + <element signature="e#2009#2010#0" expanded="false" /> + <element signature="e#2040#2041#0" expanded="false" /> + <element signature="e#2073#2074#0" expanded="false" /> + <element signature="e#2095#2096#0" expanded="false" /> + <element signature="e#2127#2128#0" expanded="false" /> + <element signature="e#2149#2150#0" expanded="false" /> + <element signature="e#2185#2186#0" expanded="false" /> + <element signature="e#2213#2214#0" expanded="false" /> + <element signature="e#2248#2249#0" expanded="false" /> + <element signature="e#2273#2274#0" expanded="false" /> + <element signature="e#2312#2313#0" expanded="false" /> + <element signature="e#2327#2328#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -464,12 +437,13 @@ <list> <option value="$PROJECT_DIR$/Todo.txt" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" /> - <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java" /> - <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRootFinderListener.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/SwingViewerWindow.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/client/ClientToServerMessage.java" /> </list> </option> </component> @@ -772,6 +746,40 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="TreeVNC" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="TreeVNC" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="glavsoft" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="rfb" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="client" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> </subPane> </pane> <pane id="Scratches" /> @@ -1036,7 +1044,13 @@ <option name="project" value="LOCAL" /> <updated>1465388318542</updated> </task> - <option name="localTasksCounter" value="3" /> + <task id="LOCAL-00003" summary="Multicast joins both ipv4 and ipv6 now."> + <created>1465652578794</created> + <option name="number" value="00003" /> + <option name="project" value="LOCAL" /> + <updated>1465652578794</updated> + </task> + <option name="localTasksCounter" value="4" /> <servers /> </component> <component name="TestHistory"> @@ -1053,6 +1067,7 @@ <layout> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32953984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> @@ -1061,19 +1076,18 @@ <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1990244" 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" weight="0.32988048" 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" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32953984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22612569" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.084723674" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> </layout> </component> @@ -1090,7 +1104,8 @@ </component> <component name="VcsManagerConfiguration"> <MESSAGE value="trying to fix fitScreen" /> - <option name="LAST_COMMIT_MESSAGE" value="trying to fix fitScreen" /> + <MESSAGE value="Multicast joins both ipv4 and ipv6 now." /> + <option name="LAST_COMMIT_MESSAGE" value="Multicast joins both ipv4 and ipv6 now." /> </component> <component name="XDebuggerManager"> <breakpoint-manager> @@ -1116,6 +1131,8 @@ <caret line="454" column="0" selection-start-line="454" selection-start-column="0" selection-end-line="454" selection-end-column="0" /> <folding> <element signature="imports" expanded="true" /> + <element signature="e#12298#12624#0" expanded="true" /> + <element signature="e#12623#12624#0" expanded="true" /> </folding> </state> </provider> @@ -1124,16 +1141,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="106" column="0" selection-start-line="106" selection-start-column="0" selection-end-line="106" selection-end-column="0" /> - <folding> - <element signature="e#1969#1970#0" expanded="true" /> - <element signature="e#1993#1994#0" expanded="true" /> - <element signature="e#2946#2947#0" expanded="true" /> - <element signature="e#2972#2973#0" expanded="true" /> - <element signature="e#3000#3001#0" expanded="true" /> - <element signature="e#3018#3019#0" expanded="true" /> - <element signature="e#4541#4542#0" expanded="true" /> - <element signature="e#4569#4570#0" expanded="true" /> - </folding> + <folding /> </state> </provider> </entry> @@ -1158,7 +1166,7 @@ <state vertical-scroll-proportion="0.0"> <caret line="1034" column="91" selection-start-line="1034" selection-start-column="91" selection-end-line="1034" selection-end-column="91" /> <folding> - <element signature="e#0#45566#0" expanded="true" /> + <element signature="e#0#45693#0" expanded="true" /> </folding> </state> </provider> @@ -1167,16 +1175,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="39" column="19" selection-start-line="39" selection-start-column="19" selection-end-line="39" selection-end-column="19" /> - <folding> - <element signature="e#2138#2139#0" expanded="true" /> - <element signature="e#2189#2190#0" expanded="true" /> - <element signature="e#4339#4340#0" expanded="true" /> - <element signature="e#4370#4371#0" expanded="true" /> - <element signature="e#4406#4407#0" expanded="true" /> - <element signature="e#4453#4454#0" expanded="true" /> - <element signature="e#4489#4490#0" expanded="true" /> - <element signature="e#4521#4522#0" expanded="true" /> - </folding> + <folding /> </state> </provider> </entry> @@ -1184,7 +1183,10 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> + <folding> + <element signature="e#3076#3077#0" expanded="true" /> + <element signature="e#3098#3099#0" expanded="true" /> + </folding> </state> </provider> </entry> @@ -1200,7 +1202,25 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="43" column="59" selection-start-line="43" selection-start-column="59" selection-end-line="43" selection-end-column="59" /> - <folding /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#1886#1887#0" expanded="false" /> + <element signature="e#1913#1914#0" expanded="false" /> + <element signature="e#1941#1942#0" expanded="false" /> + <element signature="e#1974#1975#0" expanded="false" /> + <element signature="e#2009#2010#0" expanded="false" /> + <element signature="e#2040#2041#0" expanded="false" /> + <element signature="e#2073#2074#0" expanded="false" /> + <element signature="e#2095#2096#0" expanded="false" /> + <element signature="e#2127#2128#0" expanded="false" /> + <element signature="e#2149#2150#0" expanded="false" /> + <element signature="e#2185#2186#0" expanded="false" /> + <element signature="e#2213#2214#0" expanded="false" /> + <element signature="e#2248#2249#0" expanded="false" /> + <element signature="e#2273#2274#0" expanded="false" /> + <element signature="e#2312#2313#0" expanded="false" /> + <element signature="e#2327#2328#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -1208,6 +1228,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="33" column="0" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" /> + <folding /> </state> </provider> </entry> @@ -1217,6 +1238,8 @@ <caret line="827" column="34" selection-start-line="827" selection-start-column="34" selection-end-line="827" selection-end-column="34" /> <folding> <element signature="imports" expanded="true" /> + <element signature="e#12298#12624#0" expanded="true" /> + <element signature="e#12623#12624#0" expanded="true" /> </folding> </state> </provider> @@ -1240,7 +1263,7 @@ <state vertical-scroll-proportion="0.0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <folding> - <element signature="e#0#45566#0" expanded="true" /> + <element signature="e#0#45693#0" expanded="true" /> </folding> </state> </provider> @@ -1249,6 +1272,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="79" column="9" selection-start-line="79" selection-start-column="9" selection-end-line="79" selection-end-column="9" /> + <folding /> </state> </provider> </entry> @@ -1256,6 +1280,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="192" column="37" selection-start-line="192" selection-start-column="37" selection-end-line="192" selection-end-column="37" /> + <folding /> </state> </provider> </entry> @@ -1292,6 +1317,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="33" column="0" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" /> + <folding /> </state> </provider> </entry> @@ -1299,6 +1325,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="79" column="9" selection-start-line="79" selection-start-column="9" selection-end-line="79" selection-end-column="9" /> + <folding /> </state> </provider> </entry> @@ -1313,6 +1340,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="192" column="37" selection-start-line="192" selection-start-column="37" selection-end-line="192" selection-end-column="37" /> + <folding /> </state> </provider> </entry> @@ -1324,35 +1352,98 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="1034" column="91" selection-start-line="1034" selection-start-column="91" selection-end-line="1034" selection-end-column="91" /> + <caret line="43" column="59" selection-start-line="43" selection-start-column="59" selection-end-line="43" selection-end-column="59" /> <folding> - <element signature="e#0#45566#0" expanded="true" /> + <element signature="imports" expanded="false" /> + <element signature="e#1886#1887#0" expanded="false" /> + <element signature="e#1913#1914#0" expanded="false" /> + <element signature="e#1941#1942#0" expanded="false" /> + <element signature="e#1974#1975#0" expanded="false" /> + <element signature="e#2009#2010#0" expanded="false" /> + <element signature="e#2040#2041#0" expanded="false" /> + <element signature="e#2073#2074#0" expanded="false" /> + <element signature="e#2095#2096#0" expanded="false" /> + <element signature="e#2127#2128#0" expanded="false" /> + <element signature="e#2149#2150#0" expanded="false" /> + <element signature="e#2185#2186#0" expanded="false" /> + <element signature="e#2213#2214#0" expanded="false" /> + <element signature="e#2248#2249#0" expanded="false" /> + <element signature="e#2273#2274#0" expanded="false" /> + <element signature="e#2312#2313#0" expanded="false" /> + <element signature="e#2327#2328#0" expanded="false" /> </folding> </state> </provider> </entry> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/net/MulticastSocket.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.33278823"> + <caret line="82" column="6" selection-start-line="82" selection-start-column="6" selection-end-line="82" selection-end-column="6" /> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.09811938"> <caret line="33" column="2" selection-start-line="33" selection-start-column="2" selection-end-line="33" selection-end-column="2" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRootFinderListener.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-19.266666"> + <caret line="63" column="45" selection-start-line="63" selection-start-column="45" selection-end-line="63" selection-end-column="45" /> + <folding> + <element signature="e#3076#3077#0" expanded="true" /> + <element signature="e#3098#3099#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="43" column="59" selection-start-line="43" selection-start-column="59" selection-end-line="43" selection-end-column="59" /> + <caret line="39" column="19" selection-start-line="39" selection-start-column="19" selection-end-line="39" selection-end-column="19" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.04905969"> + <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" /> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.23957482"> + <caret line="106" column="0" selection-start-line="106" selection-start-column="0" selection-end-line="106" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-23.733334"> + <caret line="261" column="69" selection-start-line="261" selection-start-column="69" selection-end-line="261" selection-end-column="69" /> + <folding> + <element signature="imports" expanded="true" /> + <element signature="e#12298#12624#0" expanded="true" /> + <element signature="e#12623#12624#0" expanded="true" /> + </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"> + <state vertical-scroll-proportion="0.018541409"> <caret line="46" column="0" selection-start-line="46" selection-start-column="0" selection-end-line="46" selection-end-column="0" /> <folding /> </state> @@ -1366,66 +1457,24 @@ </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="454" column="0" selection-start-line="454" selection-start-column="0" selection-end-line="454" selection-end-column="0" /> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java"> + <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.0"> - <caret line="106" column="0" selection-start-line="106" selection-start-column="0" selection-end-line="106" selection-end-column="0" /> - <folding> - <element signature="e#1969#1970#0" expanded="true" /> - <element signature="e#1993#1994#0" expanded="true" /> - <element signature="e#2946#2947#0" expanded="true" /> - <element signature="e#2972#2973#0" expanded="true" /> - <element signature="e#3000#3001#0" expanded="true" /> - <element signature="e#3018#3019#0" expanded="true" /> - <element signature="e#4541#4542#0" expanded="true" /> - <element signature="e#4569#4570#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/net/MulticastSocket.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.33278823"> - <caret line="82" column="6" selection-start-line="82" selection-start-column="6" selection-end-line="82" selection-end-column="6" /> + <state vertical-scroll-proportion="0.14833127"> + <caret line="31" column="27" selection-start-line="31" selection-start-column="27" selection-end-line="31" selection-end-column="27" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java"> + <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="39" column="19" selection-start-line="39" selection-start-column="19" selection-end-line="39" selection-end-column="19" /> + <state vertical-scroll-proportion="0.4284546"> + <caret line="908" column="45" selection-start-line="908" selection-start-column="45" selection-end-line="908" selection-end-column="45" /> <folding> - <element signature="e#2138#2139#0" expanded="true" /> - <element signature="e#2189#2190#0" expanded="true" /> - <element signature="e#4339#4340#0" expanded="true" /> - <element signature="e#4370#4371#0" expanded="true" /> - <element signature="e#4406#4407#0" expanded="true" /> - <element signature="e#4453#4454#0" expanded="true" /> - <element signature="e#4489#4490#0" expanded="true" /> - <element signature="e#4521#4522#0" expanded="true" /> + <element signature="e#0#45693#0" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRootFinderListener.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.9076043"> - <caret line="81" column="23" selection-start-line="81" selection-start-column="23" selection-end-line="81" selection-end-column="23" /> - <folding /> - </state> - </provider> - </entry> </component> <component name="hg4idea.settings"> <option name="CHECK_INCOMING_OUTGOING" value="true" />
--- a/src/main/java/com/glavsoft/rfb/client/ClientToServerMessage.java Sat Jun 11 22:42:58 2016 +0900 +++ b/src/main/java/com/glavsoft/rfb/client/ClientToServerMessage.java Sun Jun 12 09:06:53 2016 +0900 @@ -36,7 +36,6 @@ byte CLIENT_CUT_TEXT = 6; byte SERVER_CHANGE_REQUEST = (byte) 240; // TreeVNC extension byte CHECK_DELAY_REPLY = 70; - byte REQUEST_SINGLE_DISPLAY_SIZE = 71; byte READY_SHARE_SOUND = 72; void send(Writer writer) throws TransportException;
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/RequestSingleDisplaySize.java Sat Jun 11 22:42:58 2016 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -package jp.ac.u_ryukyu.treevnc; - -import com.glavsoft.exceptions.TransportException; -import com.glavsoft.rfb.client.ClientToServerMessage; -import com.glavsoft.transport.Writer; - -import java.nio.ByteBuffer; -import java.nio.ByteOrder; - -/** - * Created by OcBookPro on 15/01/10. - */ -public class RequestSingleDisplaySize implements ClientToServerMessage { - - private short id; - - public RequestSingleDisplaySize() { - } - - @Override - public void send(Writer writer) throws TransportException { - ByteBuffer out = ByteBuffer.allocate(2); - out.order(ByteOrder.BIG_ENDIAN); - out.put(REQUEST_SINGLE_DISPLAY_SIZE); - out.put((byte)0); // padding - writer.write(out.array(), 0, out.position()); - writer.flush(); - } -}
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Sat Jun 11 22:42:58 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Sun Jun 12 09:06:53 2016 +0900 @@ -260,15 +260,6 @@ } }; context.sendMessage(serverChangeRequest); - } else if (b[0] == ClientToServerMessage.REQUEST_SINGLE_DISPLAY_SIZE) { - ClientToServerMessage requestSingeDisplayWidth = new ClientToServerMessage() { - @Override - public void send(Writer writer) - throws TransportException { - writer.write(b, 0, c); - } - }; - context.sendMessage(requestSingeDisplayWidth); } else if (b[0] == ClientToServerMessage.READY_SHARE_SOUND) { ClientToServerMessage readyShareSound = new ClientToServerMessage() { @Override
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRootFinderListener.java Sat Jun 11 22:42:58 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRootFinderListener.java Sun Jun 12 09:06:53 2016 +0900 @@ -99,19 +99,4 @@ public boolean isStopFlag() { return stopFlag; } - - /** - * getLocalHost() returns hostname's address. It may not connectable, but - * it gives readable hostname. Do not use it to connect. - * @return - */ - String getMyAddress () { - InetAddress addr = null; - try { - addr = InetAddress.getLocalHost(); - } catch (UnknownHostException e) { - return "localhost"; - } - return addr.getHostAddress(); - } }
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java Sat Jun 11 22:42:58 2016 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java Sun Jun 12 09:06:53 2016 +0900 @@ -884,11 +884,6 @@ @Override public void actionPerformed(ActionEvent e) { fitScreen(); - /* - if (!viewer.getRfb().isTreeManager()) { - context.sendMessage(new RequestSingleDisplaySize()); - } - */ } }); @@ -1008,7 +1003,15 @@ */ public void fitScreen() { ArrayList<Rectangle> rectangles = viewer.getScreenRectangles(); + if (rectangles.size()<=0) return; // no screens, nothing to do + + // find which screen we are on + Point thisScreenLocation = frame.getLocation(); int leftScreenNumber = 0; + for(Rectangle rect : rectangles) { + if ( rect.contains(thisScreenLocation) ) break; + leftScreenNumber++; + } int thisScreenWidth = (int) rectangles.get(leftScreenNumber).getWidth(); int thisScreenHeight = (int) rectangles.get(leftScreenNumber).getHeight();