Mercurial > hg > Applications > TreeVNC
changeset 405:cdab1354e227
Add multiscreen Share Filtering flag
| author | Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Mon, 09 Nov 2015 01:06:11 +0900 |
| parents | 92b22cad660b |
| children | 0eea469c6349 |
| 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/swing/SwingViewerWindow.java |
| diffstat | 5 files changed, 733 insertions(+), 776 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Sun Nov 08 01:27:18 2015 +0900 +++ b/.idea/workspace.xml Mon Nov 09 01:06:11 2015 +0900 @@ -2,12 +2,11 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="0a04b9e3-21eb-43ee-b441-59e664eecd89" name="Default" comment="settingsChanged"> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.hgignore" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/encodings.xml" afterPath="$PROJECT_DIR$/.idea/encodings.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/gradle.xml" afterPath="$PROJECT_DIR$/.idea/gradle.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" /> <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/ConnectionPresenter.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.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/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" /> @@ -25,6 +24,16 @@ <option name="PATCH_PATH" value="" /> </component> <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> + <component name="ExternalProjectsManager"> + <system id="GRADLE"> + <state> + <task path="$PROJECT_DIR$"> + <activation /> + </task> + <projects_view /> + </state> + </system> + </component> <component name="FavoritesManager"> <favorites_list name="TreeVNC" /> </component> @@ -36,10 +45,8 @@ <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="70" column="0" selection-start-line="70" selection-start-column="0" selection-end-line="70" selection-end-column="0" /> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <caret line="194" column="0" selection-start-line="194" selection-start-column="0" selection-end-line="194" selection-end-column="0" /> + <folding /> </state> </provider> </entry> @@ -47,92 +54,93 @@ <file leaf-file-name="Protocol.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-9.444445"> + <caret line="55" column="23" selection-start-line="55" selection-start-column="23" selection-end-line="55" selection-end-column="23" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="MessageQueue.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/MessageQueue.java"> + <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="90" column="0" selection-start-line="90" selection-start-column="0" selection-end-line="90" selection-end-column="0" /> + <caret line="52" column="34" selection-start-line="52" selection-start-column="34" selection-end-line="52" selection-end-column="34" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="Viewer.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java"> + <file leaf-file-name="SenderTask.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="310" column="31" selection-start-line="310" selection-start-column="31" selection-end-line="310" selection-end-column="31" /> + <caret line="64" column="28" selection-start-line="64" selection-start-column="28" selection-end-line="64" selection-end-column="28" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="TreeRFBProto.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-20.666666"> + <caret line="231" column="64" selection-start-line="231" selection-start-column="64" selection-end-line="231" selection-end-column="64" /> <folding> - <element signature="e#0#16876#0" expanded="true" /> - <element signature="imports" expanded="true" /> - <element signature="e#7700#7701#0" expanded="true" /> - <element signature="e#7742#7743#0" expanded="true" /> - <element signature="e#9176#9177#0" expanded="true" /> - <element signature="e#9219#9220#0" expanded="true" /> - <element signature="e#9645#9646#0" expanded="true" /> - <element signature="e#9677#9678#0" expanded="true" /> - <element signature="e#9713#9714#0" expanded="true" /> - <element signature="e#9741#9742#0" expanded="true" /> - <element signature="e#9779#9780#0" expanded="true" /> - <element signature="e#9823#9824#0" expanded="true" /> - <element signature="e#9869#9870#0" expanded="true" /> - <element signature="e#9910#9911#0" expanded="true" /> - <element signature="e#9953#9954#0" expanded="true" /> - <element signature="e#9991#9992#0" expanded="true" /> - <element signature="e#10476#10648#0" expanded="true" /> - <element signature="e#10647#10648#0" expanded="true" /> - <element signature="e#15482#15483#0" expanded="true" /> - <element signature="e#15536#15537#0" expanded="true" /> + <element signature="e#34221#34222#0" expanded="true" /> + <element signature="e#34261#34262#0" expanded="true" /> </folding> </state> </provider> </entry> </file> - <file leaf-file-name="HandshakeState.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/HandshakeState.java"> + <file leaf-file-name="ReceiverTask.java" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="56" column="0" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" /> + <state vertical-scroll-proportion="0.68421054"> + <caret line="250" column="50" selection-start-line="250" selection-start-column="50" selection-end-line="250" selection-end-column="50" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="CuiViewer.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java"> + <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="145" column="97" selection-start-line="145" selection-start-column="97" selection-end-line="145" selection-end-column="97" /> + <caret line="54" column="11" selection-start-line="54" selection-start-column="11" selection-end-line="54" selection-end-column="11" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="ConnectionPresenter.java" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> + <file leaf-file-name="Surface.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.41466346"> - <caret line="115" column="73" selection-start-line="110" selection-start-column="15" selection-end-line="115" selection-end-column="73" /> + <state vertical-scroll-proportion="0.0"> + <caret line="184" column="0" selection-start-line="184" selection-start-column="0" selection-end-line="184" selection-end-column="0" /> <folding> - <element signature="e#13881#13882#0" expanded="true" /> - <element signature="e#13935#13936#0" expanded="true" /> + <element signature="e#6257#6258#0" expanded="true" /> </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"> + <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="67" column="97" selection-start-line="67" selection-start-column="97" selection-end-line="67" selection-end-column="97" /> + <caret line="54" column="53" selection-start-line="54" selection-start-column="53" selection-end-line="54" selection-end-column="53" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="SwingConnectionWorkerFactory.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingConnectionWorkerFactory.java"> + <file leaf-file-name="ConnectionPresenter.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="49" column="36" selection-start-line="49" selection-start-column="36" selection-end-line="49" selection-end-column="36" /> + <caret line="52" column="84" selection-start-line="52" selection-start-column="84" selection-end-line="52" selection-end-column="84" /> <folding /> </state> </provider> @@ -142,190 +150,109 @@ </split-first> <split-second> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="TreeRFBProto.java" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> + <file leaf-file-name="InitState.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-0.037259616"> - <caret line="216" column="50" selection-start-line="216" selection-start-column="50" selection-end-line="216" selection-end-column="50" /> + <state vertical-scroll-proportion="-26.666666"> + <caret line="80" column="0" selection-start-line="80" selection-start-column="0" selection-end-line="80" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="TreeVncCommandChannelListener.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="58" column="17" selection-start-line="58" selection-start-column="17" selection-end-line="58" selection-end-column="17" /> <folding> - <element signature="e#4597#7194#0" expanded="true" /> - <element signature="e#7193#7194#0" expanded="true" /> - <element signature="e#7361#13914#0" expanded="true" /> - <element signature="e#11081#11407#0" expanded="true" /> - <element signature="e#11406#11407#0" expanded="true" /> - <element signature="e#11652#11978#0" expanded="true" /> - <element signature="e#11977#11978#0" expanded="true" /> - <element signature="e#12209#12535#0" expanded="true" /> - <element signature="e#12534#12535#0" expanded="true" /> - <element signature="e#12757#13083#0" expanded="true" /> - <element signature="e#13082#13083#0" expanded="true" /> - <element signature="e#13913#13914#0" expanded="true" /> - <element signature="e#16232#16233#0" expanded="true" /> - <element signature="e#16273#16274#0" expanded="true" /> - <element signature="e#16326#16327#0" expanded="true" /> - <element signature="e#16364#16365#0" expanded="true" /> - <element signature="e#16405#16406#0" expanded="true" /> - <element signature="e#16438#16439#0" expanded="true" /> - <element signature="e#16503#16504#0" expanded="true" /> - <element signature="e#16544#16545#0" expanded="true" /> - <element signature="e#17774#17775#0" expanded="true" /> - <element signature="e#17800#17801#0" expanded="true" /> - <element signature="e#17842#17843#0" expanded="true" /> - <element signature="e#17871#17872#0" expanded="true" /> - <element signature="e#18036#18037#0" expanded="true" /> - <element signature="e#18079#18080#0" expanded="true" /> - <element signature="e#18122#18123#0" expanded="true" /> - <element signature="e#18162#18163#0" expanded="true" /> - <element signature="e#18820#18821#0" expanded="true" /> - <element signature="e#18853#18854#0" expanded="true" /> - <element signature="e#18895#18896#0" expanded="true" /> - <element signature="e#18932#18933#0" expanded="true" /> - <element signature="e#18971#18972#0" expanded="true" /> - <element signature="e#19004#19005#0" expanded="true" /> - <element signature="e#19052#19053#0" expanded="true" /> - <element signature="e#19085#19086#0" expanded="true" /> - <element signature="e#20107#20119#0" expanded="true" /> - <element signature="e#21639#21640#0" expanded="true" /> - <element signature="e#21677#21678#0" expanded="true" /> - <element signature="e#22521#22522#0" expanded="true" /> - <element signature="e#22553#22554#0" expanded="true" /> - <element signature="e#26260#26272#0" expanded="true" /> - <element signature="e#27359#27371#0" expanded="true" /> - <element signature="e#27804#27816#0" expanded="true" /> - <element signature="e#29758#29759#0" expanded="true" /> - <element signature="e#29786#29787#0" expanded="true" /> - <element signature="e#29814#29815#0" expanded="true" /> - <element signature="e#29839#29840#0" expanded="true" /> - <element signature="e#29979#29980#0" expanded="true" /> - <element signature="e#30015#30016#0" expanded="true" /> - <element signature="e#30048#30049#0" expanded="true" /> - <element signature="e#30077#30078#0" expanded="true" /> - <element signature="e#30148#30149#0" expanded="true" /> - <element signature="e#30198#30199#0" expanded="true" /> - <element signature="e#31926#31927#0" expanded="true" /> - <element signature="e#31961#31962#0" expanded="true" /> - <element signature="e#32044#32045#0" expanded="true" /> - <element signature="e#32087#32088#0" expanded="true" /> - <element signature="e#32144#32145#0" expanded="true" /> - <element signature="e#32169#32170#0" expanded="true" /> - <element signature="e#32203#32204#0" expanded="true" /> - <element signature="e#32235#32236#0" expanded="true" /> - <element signature="e#32278#32279#0" expanded="true" /> - <element signature="e#32307#32308#0" expanded="true" /> - <element signature="e#32356#32357#0" expanded="true" /> - <element signature="e#32400#32401#0" expanded="true" /> - <element signature="e#32453#32454#0" expanded="true" /> - <element signature="e#32497#32498#0" expanded="true" /> - <element signature="e#32554#32555#0" expanded="true" /> - <element signature="e#32603#32604#0" expanded="true" /> - <element signature="e#33059#33060#0" expanded="true" /> - <element signature="e#33103#33104#0" expanded="true" /> - <element signature="e#33174#33175#0" expanded="true" /> - <element signature="e#33236#33237#0" expanded="true" /> - <element signature="e#33842#33843#0" expanded="true" /> - <element signature="e#33876#33877#0" expanded="true" /> - <element signature="e#33912#33913#0" expanded="true" /> - <element signature="e#33947#33948#0" expanded="true" /> - <element signature="e#33981#33982#0" expanded="true" /> - <element signature="e#34012#34013#0" expanded="true" /> + <element signature="e#2134#2391#0" expanded="true" /> + <element signature="e#2390#2391#0" expanded="true" /> </folding> </state> </provider> </entry> </file> - <file leaf-file-name="Reader.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/transport/Reader.java"> + <file leaf-file-name="ServerInitMessage.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/ServerInitMessage.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="44" column="26" selection-start-line="44" selection-start-column="26" selection-end-line="44" selection-end-column="26" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ProtocolState.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/ProtocolState.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="185" column="0" selection-start-line="185" selection-start-column="0" selection-end-line="185" selection-end-column="0" /> + <caret line="34" column="15" selection-start-line="34" selection-start-column="15" selection-end-line="34" selection-end-column="15" /> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="MulticastQueue.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/MulticastQueue.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="70" column="24" selection-start-line="70" selection-start-column="24" selection-end-line="70" selection-end-column="24" /> + <folding> + <element signature="imports" expanded="true" /> + <element signature="e#1388#1389#0" expanded="true" /> + <element signature="e#1421#1422#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="68" column="38" selection-start-line="68" selection-start-column="38" selection-end-line="68" selection-end-column="38" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="Writer.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/transport/Writer.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="110" column="0" selection-start-line="110" selection-start-column="0" selection-end-line="110" selection-end-column="0" /> <folding> - <element signature="e#0#3226#0" expanded="false" /> <element signature="imports" expanded="false" /> - <element signature="e#1352#1353#0" expanded="false" /> - <element signature="e#1393#1394#0" expanded="false" /> + <element signature="e#4591#4592#0" expanded="false" /> + <element signature="e#4621#4622#0" expanded="false" /> </folding> </state> </provider> </entry> </file> - <file leaf-file-name="TreeVNCNetwork.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVNCNetwork.java"> + <file leaf-file-name="SwingViewerWindow.java" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.3114035"> + <caret line="861" column="41" selection-start-line="861" selection-start-column="41" selection-end-line="861" selection-end-column="41" /> + <folding> + <element signature="e#0#41038#0" expanded="true" /> + <element signature="imports" expanded="true" /> + <element signature="e#33252#34617#0" expanded="true" /> + <element signature="e#34616#34617#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ScreenChangeRequest.java" pinned="false" current-in-tab="false"> + <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="76" column="32" selection-start-line="76" selection-start-column="32" selection-end-line="76" selection-end-column="32" /> + <caret line="26" column="111" selection-start-line="26" selection-start-column="111" selection-end-line="26" selection-end-column="111" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="SwingViewerWindow.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="1012" column="12" selection-start-line="1012" selection-start-column="12" selection-end-line="1012" selection-end-column="12" /> - <folding /> - </state> - </provider> - </entry> - </file> - <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"> + <file leaf-file-name="SwingViewerWindowFactory.java" pinned="false" current-in-tab="false"> + <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="176" column="16" selection-start-line="176" selection-start-column="16" selection-end-line="176" selection-end-column="16" /> - <folding> - <element signature="e#0#17406#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#16926#16927#0" expanded="false" /> - <element signature="e#16959#16960#0" expanded="false" /> - <element signature="e#17000#17001#0" expanded="false" /> - <element signature="e#17038#17039#0" expanded="false" /> - </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="44" column="20" selection-start-line="44" selection-start-column="20" selection-end-line="44" selection-end-column="20" /> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="TreeViewer.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="91" column="19" selection-start-line="91" selection-start-column="19" selection-end-line="91" selection-end-column="19" /> + <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" /> <folding> <element signature="imports" expanded="false" /> - <element signature="e#9064#9065#0" expanded="false" /> - <element signature="e#9130#9131#0" expanded="false" /> </folding> </state> </provider> @@ -609,7 +536,6 @@ <option value="$PROJECT_DIR$/README.txt" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SendCheckDelay.java" /> - <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/FramebufferUpdateRectangle.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZlibDecoder.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java" /> @@ -618,7 +544,6 @@ <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/UiSettings.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/transport/Reader.java" /> - <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/OptionsDialog.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/test/TestTextBox.java" /> @@ -632,11 +557,14 @@ <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/RfbConnectionWorker.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/TreeVncCommand.java" /> - <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/FramebufferUpdateRectangle.java" /> + <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> - <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.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/ReceiverTask.java" /> </list> </option> </component> @@ -670,8 +598,6 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="PackagesPane" /> - <pane id="Scratches" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -843,10 +769,114 @@ <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> + <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="protocol" /> + <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="protocol" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="state" /> + <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> </subPane> </pane> + <pane id="PackagesPane" /> <pane id="Scope" /> + <pane id="Scratches" /> </panes> </component> <component name="PropertiesComponent"> @@ -859,7 +889,6 @@ <property name="last_opened_file_path" value="$PROJECT_DIR$" /> <property name="recentsLimit" value="5" /> <property name="dynamic.classpath" value="false" /> - <property name="restartRequiresConfirmation" value="true" /> <property name="extract.method.default.visibility" value="private" /> <property name="OverrideImplement.combined" value="true" /> <property name="OverrideImplement.overriding.sorted" value="false" /> @@ -868,7 +897,6 @@ <property name="project.structure.side.proportion" value="0.2" /> <property name="settings.editor.selected.configurable" value="preferences.editor" /> <property name="settings.editor.splitter.proportion" value="0.2" /> - <property name="FullScreen" value="false" /> </component> <component name="RunManager" selected="Application.TreeeViewer -d"> <configuration default="false" name="TreeViewer" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> @@ -883,7 +911,7 @@ <option name="PROGRAM_PARAMETERS" value="" /> <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" value="" /> + <option name="ALTERNATIVE_JRE_PATH" /> <option name="ENABLE_SWING_INSPECTOR" value="false" /> <option name="ENV_VARIABLES" /> <option name="PASS_PARENT_ENVS" value="true" /> @@ -1173,7 +1201,7 @@ <option name="PROGRAM_PARAMETERS" value="-d --showTree" /> <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" value="" /> + <option name="ALTERNATIVE_JRE_PATH" /> <option name="ENABLE_SWING_INSPECTOR" value="false" /> <option name="ENV_VARIABLES" /> <option name="PASS_PARENT_ENVS" value="true" /> @@ -1189,10 +1217,45 @@ <ConfigurationWrapper RunnerId="Run" /> <method /> </configuration> - <list size="3"> + <configuration default="false" name="TreeViewer -d --filterSingleDisplay" type="Application" factoryName="Application"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> + <option name="MAIN_CLASS_NAME" value="com.glavsoft.viewer.TreeViewer" /> + <option name="VM_PARAMETERS" value="" /> + <option name="PROGRAM_PARAMETERS" value="-d --filterSingleDisplay" /> + <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="ENABLE_SWING_INSPECTOR" value="false" /> + <option name="ENV_VARIABLES" /> + <option name="PASS_PARENT_ENVS" value="true" /> + <module name="TreeVNC" /> + <envs /> + <method /> + </configuration> + <configuration default="false" name="gradle build" type="GradleRunConfiguration" factoryName="Gradle"> + <ExternalSystemSettings> + <option name="executionName" /> + <option name="externalProjectPath" value="$PROJECT_DIR$" /> + <option name="externalSystemIdString" value="GRADLE" /> + <option name="scriptParameters" value="" /> + <option name="taskDescriptions"> + <list /> + </option> + <option name="taskNames"> + <list> + <option value="build" /> + </list> + </option> + <option name="vmOptions" value="" /> + </ExternalSystemSettings> + <method /> + </configuration> + <list size="5"> <item index="0" class="java.lang.String" itemvalue="Application.TreeeViewer -d" /> - <item index="1" class="java.lang.String" itemvalue="Application.TreeViewer" /> - <item index="2" class="java.lang.String" itemvalue="Application.IsRetina" /> + <item index="1" class="java.lang.String" itemvalue="Application.TreeViewer -d --filterSingleDisplay" /> + <item index="2" class="java.lang.String" itemvalue="Application.TreeViewer" /> + <item index="3" class="java.lang.String" itemvalue="Application.IsRetina" /> + <item index="4" class="java.lang.String" itemvalue="Gradle.gradle build" /> </list> <recent_temporary> <list size="2"> @@ -1235,7 +1298,7 @@ </component> <component name="ToolWindowManager"> <frame x="0" y="23" width="1920" height="1177" extended-state="6" /> - <editor active="true" /> + <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" /> @@ -1244,17 +1307,17 @@ <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="3" 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="7" 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.31700554" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.31700554" 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="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="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" show_stripe_button="true" weight="0.18125" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> - <window_info id="Hierarchy" active="true" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1078125" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1078125" 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="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" 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="2" side_tool="true" 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.18022181" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18022181" 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" /> @@ -1319,7 +1382,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java</url> - <line>887</line> + <line>888</line> <properties /> <option name="timeStamp" value="31" /> </line-breakpoint> @@ -1331,19 +1394,13 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java</url> - <line>170</line> - <properties /> - <option name="timeStamp" value="74" /> - </line-breakpoint> - <line-breakpoint type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java</url> - <line>383</line> + <line>387</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>522</line> + <line>524</line> <properties /> <option name="timeStamp" value="76" /> </line-breakpoint> @@ -1372,13 +1429,6 @@ <option name="timeStamp" value="93" /> </line-breakpoint> <line-breakpoint type="java-line"> - <condition disabled="true" expression="numberOfRectangles > 1" language="JAVA" custom="" /> - <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java</url> - <line>248</line> - <properties /> - <option name="timeStamp" value="105" /> - </line-breakpoint> - <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java</url> <line>116</line> <properties /> @@ -1409,30 +1459,12 @@ <option name="timeStamp" value="115" /> </line-breakpoint> <line-breakpoint type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java</url> - <line>247</line> - <properties /> - <option name="timeStamp" value="119" /> - </line-breakpoint> - <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEDecoder.java</url> <line>163</line> <properties /> <option name="timeStamp" value="120" /> </line-breakpoint> <line-breakpoint type="java-line"> - <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java</url> - <line>869</line> - <properties /> - <option name="timeStamp" value="123" /> - </line-breakpoint> - <line-breakpoint type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>192</line> - <properties /> - <option name="timeStamp" value="126" /> - </line-breakpoint> - <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java</url> <line>173</line> <properties /> @@ -1445,12 +1477,6 @@ <option name="timeStamp" value="133" /> </line-breakpoint> <line-breakpoint type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>310</line> - <properties /> - <option name="timeStamp" value="134" /> - </line-breakpoint> - <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java</url> <line>57</line> <properties /> @@ -1480,113 +1506,149 @@ <properties /> <option name="timeStamp" value="185" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> + <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>914</line> + <line>922</line> <properties /> <option name="timeStamp" value="186" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> + <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>933</line> + <line>941</line> <properties /> <option name="timeStamp" value="187" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> + <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java</url> <line>189</line> <properties /> <option name="timeStamp" value="188" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> + <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> <line>335</line> <properties /> <option name="timeStamp" value="189" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> + <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java</url> <line>205</line> <properties /> <option name="timeStamp" value="197" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> + <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java</url> <line>168</line> <properties /> <option name="timeStamp" value="198" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> + <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingNetworkConnectionWorker.java</url> <line>119</line> <properties /> <option name="timeStamp" value="201" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> + <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> <line>329</line> <properties /> <option name="timeStamp" value="203" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> + <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java</url> <line>70</line> <properties /> <option name="timeStamp" value="205" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> + <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java</url> <line>106</line> <properties /> <option name="timeStamp" value="207" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> + <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java</url> <line>90</line> <properties /> <option name="timeStamp" value="208" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> + <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>918</line> + <line>926</line> <properties /> <option name="timeStamp" value="209" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> + <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>281</line> - <properties /> - <option name="timeStamp" value="210" /> - </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>488</line> + <line>490</line> <properties /> <option name="timeStamp" value="212" /> </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>795</line> - <properties /> - <option name="timeStamp" value="215" /> - </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> + <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java</url> <line>110</line> <properties /> <option name="timeStamp" value="216" /> </line-breakpoint> + <line-breakpoint type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> + <line>952</line> + <properties /> + <option name="timeStamp" value="217" /> + </line-breakpoint> + <line-breakpoint type="java-line"> + <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindowFactory.java</url> + <line>30</line> + <properties /> + <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/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java</url> + <line>861</line> + <properties /> + <option name="timeStamp" value="222" /> + </line-breakpoint> + <line-breakpoint type="java-line"> + <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java</url> + <line>1012</line> + <properties /> + <option name="timeStamp" value="224" /> + </line-breakpoint> + <line-breakpoint type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> + <line>321</line> + <properties /> + <option name="timeStamp" value="228" /> + </line-breakpoint> + <line-breakpoint type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> + <line>800</line> + <properties /> + <option name="timeStamp" value="230" /> + </line-breakpoint> + <line-breakpoint type="java-line"> + <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java</url> + <line>183</line> + <properties /> + <option name="timeStamp" value="237" /> + </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>944</line> + <line>203</line> <properties /> - <option name="timeStamp" value="217" /> + <option name="timeStamp" value="244" /> </line-breakpoint> </breakpoints> <breakpoints-dialog> <breakpoints-dialog /> </breakpoints-dialog> - <option name="time" value="218" /> + <option name="time" value="247" /> </breakpoint-manager> <watches-manager /> </component> @@ -1595,298 +1657,6 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="447" column="0" selection-start-line="447" selection-start-column="0" selection-end-line="447" selection-end-column="0" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/UiSettings.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="186" column="29" selection-start-line="186" selection-start-column="0" selection-end-line="189" selection-end-column="0" /> - <folding> - <element signature="e#0#7625#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#1874#1899#0" expanded="false" /> - <element signature="e#2442#2443#0" expanded="false" /> - <element signature="e#2495#2496#0" expanded="false" /> - <element signature="e#2739#2740#0" expanded="false" /> - <element signature="e#2769#2770#0" expanded="false" /> - <element signature="e#5027#5028#0" expanded="false" /> - <element signature="e#5073#5074#0" expanded="false" /> - <element signature="e#5301#5302#0" expanded="false" /> - <element signature="e#5360#5361#0" expanded="false" /> - <element signature="e#5674#5675#0" expanded="false" /> - <element signature="e#5712#5713#0" expanded="false" /> - <element signature="e#6390#6391#0" expanded="false" /> - <element signature="e#6442#6443#0" expanded="false" /> - <element signature="e#6481#6482#0" expanded="false" /> - <element signature="e#6518#6519#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/ConnectionView.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="435" column="6" selection-start-line="435" selection-start-column="6" selection-end-line="435" selection-end-column="6" /> - <folding> - <element signature="e#0#17422#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#3371#3712#0" expanded="false" /> - <element signature="e#3711#3712#0" expanded="false" /> - <element signature="e#7414#7793#0" expanded="false" /> - <element signature="e#7792#7793#0" expanded="false" /> - <element signature="e#7925#9008#0" expanded="false" /> - <element signature="e#9007#9008#0" expanded="false" /> - <element signature="e#9151#9511#0" expanded="false" /> - <element signature="e#9510#9511#0" expanded="false" /> - <element signature="e#9736#9989#0" expanded="false" /> - <element signature="e#9988#9989#0" expanded="false" /> - <element signature="e#11599#11882#0" expanded="false" /> - <element signature="e#11881#11882#0" expanded="false" /> - <element signature="e#12846#12847#0" expanded="false" /> - <element signature="e#12891#12892#0" expanded="false" /> - <element signature="e#12940#12941#0" expanded="false" /> - <element signature="e#13007#13008#0" expanded="false" /> - <element signature="e#13044#13045#0" expanded="false" /> - <element signature="e#13092#13093#0" expanded="false" /> - <element signature="e#14663#14664#0" expanded="false" /> - <element signature="e#14722#14723#0" expanded="false" /> - <element signature="e#15360#15361#0" expanded="false" /> - <element signature="e#15398#15399#0" expanded="false" /> - <element signature="e#15876#15877#0" expanded="false" /> - <element signature="e#15929#15930#0" expanded="false" /> - <element signature="e#15961#15962#0" expanded="false" /> - <element signature="e#15988#15989#0" expanded="false" /> - <element signature="e#17136#17137#0" expanded="false" /> - <element signature="e#17197#17198#0" expanded="false" /> - <element signature="e#17265#17266#0" expanded="false" /> - <element signature="e#17309#17310#0" expanded="false" /> - <element signature="e#17373#17374#0" expanded="false" /> - <element signature="e#17418#17419#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/IChangeSettingsListener.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="32" column="24" selection-start-line="32" selection-start-column="9" selection-end-line="32" selection-end-column="24" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/OptionsDialog.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="143" column="17" selection-start-line="143" selection-start-column="17" selection-end-line="143" selection-end-column="17" /> - <folding> - <element signature="e#0#17972#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#2728#2729#0" expanded="false" /> - <element signature="e#2756#2757#0" expanded="false" /> - <element signature="e#8927#8928#0" expanded="false" /> - <element signature="e#8952#8953#0" expanded="false" /> - <element signature="e#8993#8994#0" expanded="false" /> - <element signature="e#9023#9024#0" expanded="false" /> - <element signature="e#9261#9262#0" expanded="false" /> - <element signature="e#9282#9283#0" expanded="false" /> - <element signature="e#10298#10299#0" expanded="false" /> - <element signature="e#10347#10348#0" expanded="false" /> - <element signature="e#11535#11536#0" expanded="false" /> - <element signature="e#11572#11573#0" expanded="false" /> - <element signature="e#16751#16752#0" expanded="false" /> - <element signature="e#16778#16779#0" expanded="false" /> - <element signature="e#16806#16807#0" expanded="false" /> - <element signature="e#16827#16828#0" expanded="false" /> - <element signature="e#17189#17190#0" expanded="false" /> - <element signature="e#17227#17228#0" expanded="false" /> - <element signature="e#17880#17881#0" expanded="false" /> - <element signature="e#17918#17919#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionErrorException.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="38" column="29" selection-start-line="38" selection-start-column="29" selection-end-line="38" selection-end-column="29" /> - </state> - </provider> - </entry> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/src.zip!/java/net/DatagramSocket.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="5.2276316"> - <caret line="653" column="16" selection-start-line="653" selection-start-column="16" selection-end-line="653" selection-end-column="16" /> - </state> - </provider> - </entry> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/src.zip!/java/net/MulticastSocket.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.33289474"> - <caret line="82" column="6" selection-start-line="82" selection-start-column="6" selection-end-line="82" selection-end-column="6" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/mvp/Presenter.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="61" column="20" selection-start-line="61" selection-start-column="20" selection-end-line="61" selection-end-column="20" /> - </state> - </provider> - </entry> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/src.zip!/javax/swing/JFrame.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.3322034"> - <caret line="667" column="21" selection-start-line="667" selection-start-column="21" selection-end-line="667" selection-end-column="21" /> - </state> - </provider> - </entry> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/src.zip!/java/lang/Object.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.33239436"> - <caret line="270" column="29" selection-start-line="270" selection-start-column="29" selection-end-line="270" selection-end-column="29" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="75" column="0" selection-start-line="75" selection-start-column="0" selection-end-line="75" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/src.zip!/java/util/concurrent/LinkedBlockingQueue.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.33239436"> - <caret line="455" column="13" selection-start-line="455" selection-start-column="13" selection-end-line="455" selection-end-column="13" /> - </state> - </provider> - </entry> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/src.zip!/java/net/AbstractPlainDatagramSocketImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.27473807"> - <caret line="178" column="0" selection-start-line="178" selection-start-column="0" selection-end-line="178" selection-end-column="0" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/ConnectionsHistory.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="257" column="57" selection-start-line="257" selection-start-column="57" selection-end-line="257" selection-end-column="57" /> - <folding> - <element signature="imports" expanded="false" /> - <element signature="e#5490#5491#0" expanded="false" /> - <element signature="e#5515#5516#0" expanded="false" /> - <element signature="e#5587#5588#0" expanded="false" /> - <element signature="e#5637#5638#0" expanded="false" /> - <element signature="e#5705#5706#0" expanded="false" /> - <element signature="e#5753#5754#0" expanded="false" /> - <element signature="e#14383#14384#0" expanded="false" /> - <element signature="e#14433#14434#0" expanded="false" /> - <element signature="e#14671#14672#0" expanded="false" /> - <element signature="e#14715#14716#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/rt.jar!/sun/misc/Unsafe.class"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-10.592592"> - <caret line="348" column="23" selection-start-line="348" selection-start-column="23" selection-end-line="348" selection-end-column="23" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/RequestScreenThread.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.13969733"> - <caret line="9" column="28" selection-start-line="9" selection-start-column="28" selection-end-line="9" selection-end-column="28" /> - <folding> - <element signature="e#277#278#0" expanded="false" /> - <element signature="e#294#295#0" expanded="false" /> - </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.29577464"> - <caret line="22" column="28" selection-start-line="22" selection-start-column="28" selection-end-line="22" selection-end-column="28" /> - <folding> - <element signature="e#738#739#0" expanded="false" /> - <element signature="e#766#767#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/test/TestTextBox.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" /> - <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="71" column="32" selection-start-line="71" selection-start-column="32" selection-end-line="71" selection-end-column="32" /> - <folding> - <element signature="e#0#3515#0" expanded="false" /> - <element signature="imports" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="42" column="66" selection-start-line="42" selection-start-column="64" selection-end-line="42" selection-end-column="66" /> - <folding> - <element signature="imports" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="91" column="29" selection-start-line="91" selection-start-column="29" selection-end-line="91" selection-end-column="29" /> - <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" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="27" column="35" selection-start-line="27" selection-start-column="35" selection-end-line="27" selection-end-column="35" /> - <folding> - <element signature="imports" expanded="false" /> - <element signature="e#426#427#0" expanded="false" /> - <element signature="e#456#457#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> @@ -1899,27 +1669,19 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="176" column="16" selection-start-line="176" selection-start-column="16" selection-end-line="176" selection-end-column="16" /> - <folding> - <element signature="e#0#17406#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#16926#16927#0" expanded="false" /> - <element signature="e#16959#16960#0" expanded="false" /> - <element signature="e#17000#17001#0" expanded="false" /> - <element signature="e#17038#17039#0" expanded="false" /> - </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.0"> <caret line="44" column="20" selection-start-line="44" selection-start-column="20" selection-end-line="44" selection-end-column="20" /> <folding> - <element signature="imports" expanded="true" /> + <element signature="e#1904#1905#0" expanded="false" /> + <element signature="e#1928#1929#0" expanded="false" /> + <element signature="e#2996#2997#0" expanded="false" /> + <element signature="e#3022#3023#0" expanded="false" /> + <element signature="e#3050#3051#0" expanded="false" /> + <element signature="e#3068#3069#0" expanded="false" /> + <element signature="e#4557#4558#0" expanded="false" /> + <element signature="e#4585#4586#0" expanded="false" /> </folding> </state> </provider> @@ -1928,7 +1690,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.1826793"> <caret line="33" column="17" selection-start-line="33" selection-start-column="17" selection-end-line="33" selection-end-column="17" /> - <folding /> </state> </provider> </entry> @@ -1937,24 +1698,15 @@ <state vertical-scroll-proportion="0.0"> <caret line="118" column="16" selection-start-line="118" selection-start-column="16" selection-end-line="118" selection-end-column="16" /> <folding> - <element signature="imports" expanded="true" /> + <element signature="imports" expanded="false" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/ProtocolState.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.64952636"> - <caret line="60" column="26" selection-start-line="60" selection-start-column="26" selection-end-line="60" selection-end-column="26" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionWorker.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.32476318"> <caret line="38" column="9" selection-start-line="38" selection-start-column="9" selection-end-line="38" selection-end-column="9" /> - <folding /> </state> </provider> </entry> @@ -1962,7 +1714,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.16238159"> <caret line="30" column="44" selection-start-line="30" selection-start-column="44" selection-end-line="30" selection-end-column="44" /> - <folding /> </state> </provider> </entry> @@ -1970,7 +1721,17 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="76" column="32" selection-start-line="76" selection-start-column="32" selection-end-line="76" selection-end-column="32" /> - <folding /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#537#538#0" expanded="false" /> + <element signature="e#565#566#0" expanded="false" /> + <element signature="e#613#614#0" expanded="false" /> + <element signature="e#647#648#0" expanded="false" /> + <element signature="e#3023#3024#0" expanded="false" /> + <element signature="e#3069#3070#0" expanded="false" /> + <element signature="e#3123#3124#0" expanded="false" /> + <element signature="e#3157#3158#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -1978,7 +1739,6 @@ <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> @@ -1986,7 +1746,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="2.6193247"> <caret line="187" column="13" selection-start-line="187" selection-start-column="13" selection-end-line="187" selection-end-column="13" /> - <folding /> </state> </provider> </entry> @@ -2002,20 +1761,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="110" column="0" selection-start-line="110" selection-start-column="0" selection-end-line="110" selection-end-column="0" /> - <folding> - <element signature="e#0#3226#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#1352#1353#0" expanded="false" /> - <element signature="e#1393#1394#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/HandshakeState.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="56" column="0" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -2023,7 +1768,12 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="49" column="36" selection-start-line="49" selection-start-column="36" selection-end-line="49" selection-end-column="36" /> - <folding /> + <folding> + <element signature="e#0#2687#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#2623#2624#0" expanded="false" /> + <element signature="e#2683#2684#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -2031,7 +1781,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.2619325"> <caret line="42" column="46" selection-start-line="42" selection-start-column="46" selection-end-line="42" selection-end-column="46" /> - <folding /> </state> </provider> </entry> @@ -2039,23 +1788,18 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="67" column="97" selection-start-line="67" selection-start-column="97" selection-end-line="67" selection-end-column="97" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.8603027"> - <caret line="57" column="9" selection-start-line="57" selection-start-column="9" selection-end-line="57" selection-end-column="9" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="1012" column="12" selection-start-line="1012" selection-start-column="12" selection-end-line="1012" selection-end-column="12" /> - <folding /> + <folding> + <element signature="e#0#8430#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#8042#8043#0" expanded="false" /> + <element signature="e#8098#8099#0" expanded="false" /> + <element signature="e#8175#8176#0" expanded="false" /> + <element signature="e#8217#8218#0" expanded="false" /> + <element signature="e#8290#8291#0" expanded="false" /> + <element signature="e#8340#8341#0" expanded="false" /> + <element signature="e#8385#8386#0" expanded="false" /> + <element signature="e#8426#8427#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -2063,7 +1807,27 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="145" column="97" selection-start-line="145" selection-start-column="97" selection-end-line="145" selection-end-column="97" /> - <folding /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#5233#5234#0" expanded="false" /> + <element signature="e#5275#5276#0" expanded="false" /> + <element signature="e#6846#6847#0" expanded="false" /> + <element signature="e#6889#6890#0" expanded="false" /> + <element signature="e#7588#7589#0" expanded="false" /> + <element signature="e#7616#7617#0" expanded="false" /> + <element signature="e#7654#7655#0" expanded="false" /> + <element signature="e#7687#7688#0" expanded="false" /> + <element signature="e#8519#8520#0" expanded="false" /> + <element signature="e#8573#8574#0" expanded="false" /> + <element signature="e#8623#8624#0" expanded="false" /> + <element signature="e#8654#8655#0" expanded="false" /> + <element signature="e#8703#8704#0" expanded="false" /> + <element signature="e#8728#8729#0" expanded="false" /> + <element signature="e#8778#8779#0" expanded="false" /> + <element signature="e#8804#8805#0" expanded="false" /> + <element signature="e#8961#8962#0" expanded="false" /> + <element signature="e#8988#8989#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -2075,28 +1839,189 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java"> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_66.jdk/Contents/Home/src.zip!/java/awt/GraphicsEnvironment.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.3329453"> + <caret line="55" column="22" selection-start-line="55" selection-start-column="22" selection-end-line="55" selection-end-column="22" /> + </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" /> + <folding /> + </state> + </provider> + </entry> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_66.jdk/Contents/Home/src.zip!/java/util/concurrent/locks/AbstractQueuedSynchronizer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="835" column="0" selection-start-line="835" selection-start-column="0" selection-end-line="835" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_66.jdk/Contents/Home/jre/lib/rt.jar!/sun/misc/Unsafe.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-10.592592"> + <caret line="354" column="23" selection-start-line="354" selection-start-column="23" selection-end-line="354" selection-end-column="23" /> + </state> + </provider> + </entry> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_66.jdk/Contents/Home/src.zip!/java/util/concurrent/locks/LockSupport.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="174" column="0" selection-start-line="174" selection-start-column="0" selection-end-line="174" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/HandshakeState.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="70" column="0" selection-start-line="70" selection-start-column="0" selection-end-line="70" selection-end-column="0" /> + <caret line="48" column="0" selection-start-line="48" selection-start-column="0" selection-end-line="48" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.4062864"> + <caret line="32" column="16" selection-start-line="32" selection-start-column="16" selection-end-line="32" selection-end-column="16" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="481" column="0" selection-start-line="481" selection-start-column="0" selection-end-line="481" selection-end-column="0" /> <folding> - <element signature="imports" expanded="true" /> + <element signature="e#6835#6836#0" expanded="false" /> + <element signature="e#6864#6865#0" expanded="false" /> + <element signature="e#7120#7121#0" expanded="false" /> + <element signature="e#7152#7153#0" expanded="false" /> + <element signature="e#7700#7701#0" expanded="false" /> + <element signature="e#7742#7743#0" expanded="false" /> + <element signature="e#9176#9177#0" expanded="false" /> + <element signature="e#9219#9220#0" expanded="false" /> + <element signature="e#9645#9646#0" expanded="false" /> + <element signature="e#9677#9678#0" expanded="false" /> + <element signature="e#9779#9780#0" expanded="false" /> + <element signature="e#9823#9824#0" expanded="false" /> + <element signature="e#9869#9870#0" expanded="false" /> + <element signature="e#9910#9911#0" expanded="false" /> + <element signature="e#9953#9954#0" expanded="false" /> + <element signature="e#9991#9992#0" expanded="false" /> + <element signature="e#10545#10546#0" expanded="false" /> + <element signature="e#10637#10638#0" expanded="false" /> + <element signature="e#15482#15483#0" expanded="false" /> + <element signature="e#15536#15537#0" expanded="false" /> + <element signature="e#15586#15587#0" expanded="false" /> + <element signature="e#15617#15618#0" expanded="false" /> + <element signature="e#15666#15667#0" expanded="false" /> + <element signature="e#15691#15692#0" expanded="false" /> + <element signature="e#15741#15742#0" expanded="false" /> + <element signature="e#15767#15768#0" expanded="false" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="226" column="0" selection-start-line="226" selection-start-column="0" selection-end-line="226" selection-end-column="0" /> + <folding> + <element signature="e#8951#8952#0" 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.0"> + <caret line="13" column="11" selection-start-line="13" selection-start-column="11" selection-end-line="13" selection-end-column="11" /> + <folding> + <element signature="imports" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitTightState.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="90" column="0" selection-start-line="90" selection-start-column="0" selection-end-line="90" selection-end-column="0" /> + <caret line="63" column="36" selection-start-line="63" selection-start-column="36" selection-end-line="63" selection-end-column="36" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/ProtocolState.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="34" column="15" selection-start-line="34" selection-start-column="15" selection-end-line="34" selection-end-column="15" /> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/MulticastQueue.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="70" column="24" selection-start-line="70" selection-start-column="24" selection-end-line="70" selection-end-column="24" /> + <folding> + <element signature="imports" expanded="true" /> + <element signature="e#1388#1389#0" expanded="true" /> + <element signature="e#1421#1422#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"> <caret line="68" column="38" selection-start-line="68" selection-start-column="38" selection-end-line="68" selection-end-column="38" /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#4591#4592#0" expanded="false" /> + <element signature="e#4621#4622#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <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="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" /> + <folding> + <element signature="imports" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_66.jdk/Contents/Home/src.zip!/java/awt/Component.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="11.725739"> + <caret line="3354" column="16" selection-start-line="3354" selection-start-column="16" selection-end-line="3354" selection-end-column="16" /> + <folding> + <element signature="e#116250#116251#0" expanded="true" /> + <element signature="e#116297#116298#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="58" column="17" selection-start-line="58" selection-start-column="17" selection-end-line="58" selection-end-column="17" /> + <folding> + <element signature="e#2134#2391#0" expanded="true" /> + <element signature="e#2390#2391#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/HextileDecoder.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="95" column="30" selection-start-line="95" selection-start-column="30" selection-end-line="95" selection-end-column="30" /> <folding /> </state> </provider> @@ -2104,142 +2029,158 @@ <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/transport/Reader.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="185" column="0" selection-start-line="185" selection-start-column="0" selection-end-line="185" selection-end-column="0" /> + <caret line="37" column="21" selection-start-line="37" selection-start-column="21" selection-end-line="37" selection-end-column="21" /> + <folding> + <element signature="e#1502#1503#0" expanded="true" /> + <element signature="e#1576#1577#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="194" column="0" selection-start-line="194" selection-start-column="0" selection-end-line="194" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="184" column="0" selection-start-line="184" selection-start-column="0" selection-end-line="184" selection-end-column="0" /> + <folding> + <element signature="e#6257#6258#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="54" column="53" selection-start-line="54" selection-start-column="53" selection-end-line="54" selection-end-column="53" /> + <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"> + <caret line="54" column="11" selection-start-line="54" selection-start-column="11" selection-end-line="54" selection-end-column="11" /> + <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="52" column="84" selection-start-line="52" selection-start-column="84" selection-end-line="52" selection-end-column="84" /> + <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="-9.444445"> + <caret line="55" column="23" selection-start-line="55" selection-start-column="23" selection-end-line="55" selection-end-column="23" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/MessageQueue.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="52" column="34" selection-start-line="52" selection-start-column="34" selection-end-line="52" selection-end-column="34" /> + <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="64" column="28" selection-start-line="64" selection-start-column="28" selection-end-line="64" selection-end-column="28" /> + <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="-26.666666"> + <caret line="80" column="0" selection-start-line="80" selection-start-column="0" selection-end-line="80" selection-end-column="0" /> + <folding /> + </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="26" selection-start-line="44" selection-start-column="26" selection-end-line="44" selection-end-column="26" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/client/ClientToServerMessage.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.2742616"> + <caret line="36" column="27" selection-start-line="36" selection-start-column="27" selection-end-line="36" selection-end-column="27" /> + <folding /> + </state> + </provider> + </entry> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_66.jdk/Contents/Home/src.zip!/java/nio/ByteBuffer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-1.9451476"> + <caret line="857" column="28" selection-start-line="857" selection-start-column="28" selection-end-line="857" selection-end-column="28" /> + <folding> + <element signature="e#25207#25208#0" expanded="true" /> + <element signature="e#25253#25254#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="26" column="111" selection-start-line="26" selection-start-column="111" selection-end-line="26" selection-end-column="111" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-0.037259616"> - <caret line="216" column="50" selection-start-line="216" selection-start-column="50" selection-end-line="216" selection-end-column="50" /> + <state vertical-scroll-proportion="-20.666666"> + <caret line="231" column="64" selection-start-line="231" selection-start-column="64" selection-end-line="231" selection-end-column="64" /> <folding> - <element signature="e#4597#7194#0" expanded="true" /> - <element signature="e#7193#7194#0" expanded="true" /> - <element signature="e#7361#13914#0" expanded="true" /> - <element signature="e#11081#11407#0" expanded="true" /> - <element signature="e#11406#11407#0" expanded="true" /> - <element signature="e#11652#11978#0" expanded="true" /> - <element signature="e#11977#11978#0" expanded="true" /> - <element signature="e#12209#12535#0" expanded="true" /> - <element signature="e#12534#12535#0" expanded="true" /> - <element signature="e#12757#13083#0" expanded="true" /> - <element signature="e#13082#13083#0" expanded="true" /> - <element signature="e#13913#13914#0" expanded="true" /> - <element signature="e#16232#16233#0" expanded="true" /> - <element signature="e#16273#16274#0" expanded="true" /> - <element signature="e#16326#16327#0" expanded="true" /> - <element signature="e#16364#16365#0" expanded="true" /> - <element signature="e#16405#16406#0" expanded="true" /> - <element signature="e#16438#16439#0" expanded="true" /> - <element signature="e#16503#16504#0" expanded="true" /> - <element signature="e#16544#16545#0" expanded="true" /> - <element signature="e#17774#17775#0" expanded="true" /> - <element signature="e#17800#17801#0" expanded="true" /> - <element signature="e#17842#17843#0" expanded="true" /> - <element signature="e#17871#17872#0" expanded="true" /> - <element signature="e#18036#18037#0" expanded="true" /> - <element signature="e#18079#18080#0" expanded="true" /> - <element signature="e#18122#18123#0" expanded="true" /> - <element signature="e#18162#18163#0" expanded="true" /> - <element signature="e#18820#18821#0" expanded="true" /> - <element signature="e#18853#18854#0" expanded="true" /> - <element signature="e#18895#18896#0" expanded="true" /> - <element signature="e#18932#18933#0" expanded="true" /> - <element signature="e#18971#18972#0" expanded="true" /> - <element signature="e#19004#19005#0" expanded="true" /> - <element signature="e#19052#19053#0" expanded="true" /> - <element signature="e#19085#19086#0" expanded="true" /> - <element signature="e#20107#20119#0" expanded="true" /> - <element signature="e#21639#21640#0" expanded="true" /> - <element signature="e#21677#21678#0" expanded="true" /> - <element signature="e#22521#22522#0" expanded="true" /> - <element signature="e#22553#22554#0" expanded="true" /> - <element signature="e#26260#26272#0" expanded="true" /> - <element signature="e#27359#27371#0" expanded="true" /> - <element signature="e#27804#27816#0" expanded="true" /> - <element signature="e#29758#29759#0" expanded="true" /> - <element signature="e#29786#29787#0" expanded="true" /> - <element signature="e#29814#29815#0" expanded="true" /> - <element signature="e#29839#29840#0" expanded="true" /> - <element signature="e#29979#29980#0" expanded="true" /> - <element signature="e#30015#30016#0" expanded="true" /> - <element signature="e#30048#30049#0" expanded="true" /> - <element signature="e#30077#30078#0" expanded="true" /> - <element signature="e#30148#30149#0" expanded="true" /> - <element signature="e#30198#30199#0" expanded="true" /> - <element signature="e#31926#31927#0" expanded="true" /> - <element signature="e#31961#31962#0" expanded="true" /> - <element signature="e#32044#32045#0" expanded="true" /> - <element signature="e#32087#32088#0" expanded="true" /> - <element signature="e#32144#32145#0" expanded="true" /> - <element signature="e#32169#32170#0" expanded="true" /> - <element signature="e#32203#32204#0" expanded="true" /> - <element signature="e#32235#32236#0" expanded="true" /> - <element signature="e#32278#32279#0" expanded="true" /> - <element signature="e#32307#32308#0" expanded="true" /> - <element signature="e#32356#32357#0" expanded="true" /> - <element signature="e#32400#32401#0" expanded="true" /> - <element signature="e#32453#32454#0" expanded="true" /> - <element signature="e#32497#32498#0" expanded="true" /> - <element signature="e#32554#32555#0" expanded="true" /> - <element signature="e#32603#32604#0" expanded="true" /> - <element signature="e#33059#33060#0" expanded="true" /> - <element signature="e#33103#33104#0" expanded="true" /> - <element signature="e#33174#33175#0" expanded="true" /> - <element signature="e#33236#33237#0" expanded="true" /> - <element signature="e#33842#33843#0" expanded="true" /> - <element signature="e#33876#33877#0" expanded="true" /> - <element signature="e#33912#33913#0" expanded="true" /> - <element signature="e#33947#33948#0" expanded="true" /> - <element signature="e#33981#33982#0" expanded="true" /> - <element signature="e#34012#34013#0" expanded="true" /> + <element signature="e#34221#34222#0" expanded="true" /> + <element signature="e#34261#34262#0" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.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="310" column="31" selection-start-line="310" selection-start-column="31" selection-end-line="310" selection-end-column="31" /> + <state vertical-scroll-proportion="0.3114035"> + <caret line="861" column="41" selection-start-line="861" selection-start-column="41" selection-end-line="861" selection-end-column="41" /> <folding> - <element signature="e#0#16876#0" expanded="true" /> + <element signature="e#0#41038#0" expanded="true" /> <element signature="imports" expanded="true" /> - <element signature="e#7700#7701#0" expanded="true" /> - <element signature="e#7742#7743#0" expanded="true" /> - <element signature="e#9176#9177#0" expanded="true" /> - <element signature="e#9219#9220#0" expanded="true" /> - <element signature="e#9645#9646#0" expanded="true" /> - <element signature="e#9677#9678#0" expanded="true" /> - <element signature="e#9713#9714#0" expanded="true" /> - <element signature="e#9741#9742#0" expanded="true" /> - <element signature="e#9779#9780#0" expanded="true" /> - <element signature="e#9823#9824#0" expanded="true" /> - <element signature="e#9869#9870#0" expanded="true" /> - <element signature="e#9910#9911#0" expanded="true" /> - <element signature="e#9953#9954#0" expanded="true" /> - <element signature="e#9991#9992#0" expanded="true" /> - <element signature="e#10476#10648#0" expanded="true" /> - <element signature="e#10647#10648#0" expanded="true" /> - <element signature="e#15482#15483#0" expanded="true" /> - <element signature="e#15536#15537#0" expanded="true" /> + <element signature="e#33252#34617#0" expanded="true" /> + <element signature="e#34616#34617#0" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.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="0.41466346"> - <caret line="115" column="73" selection-start-line="110" selection-start-column="15" selection-end-line="115" selection-end-column="73" /> - <folding> - <element signature="e#13881#13882#0" expanded="true" /> - <element signature="e#13935#13936#0" expanded="true" /> - </folding> + <state vertical-scroll-proportion="0.68421054"> + <caret line="250" column="50" selection-start-line="250" selection-start-column="50" selection-end-line="250" selection-end-column="50" /> + <folding /> </state> </provider> </entry> </component> <component name="hg4idea.settings"> + <option name="CHECK_INCOMING_OUTGOING" value="true" /> <option name="RECENT_HG_ROOT_PATH" value="$PROJECT_DIR$" /> </component> <component name="masterDetails">
--- a/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java Sun Nov 08 01:27:18 2015 +0900 +++ b/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java Mon Nov 09 01:06:11 2015 +0900 @@ -248,7 +248,11 @@ try { decoder.decode(reader, renderer, rect); // TreeVNC processing here if (rfb.getCuiVersion()) continue; - if (rfb.filterSingleDisplay && rect.x >= rfb.getSingleWidth()) 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 Sun Nov 08 01:27:18 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java Mon Nov 09 01:06:11 2015 +0900 @@ -22,13 +22,15 @@ private int frameSizeWidth; private int frameSizeHeight; private int port; + private int shareScreenNumber; - public ScreenChangeRequest(String adr, int port, short id, int width, int height) { + public ScreenChangeRequest(String adr, int port, short id, int width, int height, int shareScreenNumber) { this.bytes = adr; this.port = port; this.id = id; this.frameSizeWidth = width; this.frameSizeHeight = height; + this.shareScreenNumber = shareScreenNumber; System.out.println("Client send change screen server request :" + adr); } @@ -44,6 +46,7 @@ out.putInt(frameSizeWidth); out.putInt(frameSizeHeight); out.putInt(port); + out.putInt(shareScreenNumber); writer.write(out.array(), 0, out.position()); writer.flush(); }
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Sun Nov 08 01:27:18 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Mon Nov 09 01:06:11 2015 +0900 @@ -71,9 +71,10 @@ public int fixingSizeWidth; public int fixingSizeHeight; + private int singleWidth = 0; private int singleHeight = 0; - + private int shareScreenNumber; private DatagramSocket socket = null; private byte[] originalInitData = null; @@ -214,8 +215,9 @@ int frameSizeWidth = buf.getInt(); int frameSizeHeight = buf.getInt(); int port = buf.getInt(); + int shareScreenNumber = buf.getInt(); System.out.println("Root server change request :" + newHostName + " : " + port); - changeVNCServer(viewer, newHostName, port, frameSizeWidth, frameSizeHeight, id, is, os); + changeVNCServer(viewer, newHostName, port, frameSizeWidth, frameSizeHeight, shareScreenNumber, id, is, os); } else { continue; } @@ -781,22 +783,24 @@ /** * change VNCServer is called when host change. - * @param vncProxyService + * @param vncProxyService * @param hostName * HostAddress * @param width - * FrameWidth +* FrameWidth * @param height * FrameHeight + * @param shareScreenNumber * @param newVNCServerId * @param is * @param os */ - public void changeVNCServer(ViewerInterface vncProxyService, String hostName, int port, int width, int height, short newVNCServerId, Reader is, Writer os) + public void changeVNCServer(ViewerInterface vncProxyService, String hostName, int port, int width, int height, int shareScreenNumber, short newVNCServerId, Reader is, Writer os) throws IOException { this.frameSizeWidth = width; this.frameSizeHeight = height; + this.shareScreenNumber = shareScreenNumber; singleWidth = frameSizeWidth; singleHeight = frameSizeHeight; if (newVNCServerId == -1) { @@ -902,6 +906,10 @@ return singleHeight; } + public int getShareScreenNumber() { + return shareScreenNumber; + } + public boolean hasParent() { return id != -1; } @@ -917,7 +925,7 @@ */ public void exchangeDirectConnectedServer(Reader previousReader, Writer previousWriter) { String adr = viewer.getRfb().getMyAddress(); - ScreenChangeRequest scr = new ScreenChangeRequest(adr, ConnectionParams.DEFAULT_VNC_ROOT, (short) -1, singleWidth, singleHeight); + ScreenChangeRequest scr = new ScreenChangeRequest(adr, ConnectionParams.DEFAULT_VNC_ROOT, (short) -1, singleWidth, singleHeight, shareScreenNumber); try { scr.send(previousWriter); } catch (TransportException e) {
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java Sun Nov 08 01:27:18 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java Mon Nov 09 01:06:11 2015 +0900 @@ -859,14 +859,15 @@ int singleWidth = (int) (rectangles.get(leftScreenNumber).getWidth() * scaleFactor); int singleHeight = (int) (rectangles.get(leftScreenNumber).getHeight() * scaleFactor); viewer.getRfb().setSingleDisplaySize(singleWidth, singleHeight); + int shareScreenNumber = 0; if (viewer.getRfb().hasParent()) { String adr = viewer.getRfb().getMyAddress(); - // -1 means reqeust to reverse direct connection sorcket + // -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)); + context.sendMessage(new ScreenChangeRequest(adr, ConnectionParams.DEFAULT_VNC_ROOT, id, singleWidth, singleHeight, shareScreenNumber)); } if (viewer.getRfb().isTreeManager()) { - changeVncServer(viewer, singleWidth, singleHeight, viewer.getRfb().getId()); + changeVncServer(viewer, singleWidth, singleHeight, shareScreenNumber, viewer.getRfb().getId()); return; } } @@ -1008,10 +1009,10 @@ frame.setVisible(b); } - private void changeVncServer(ViewerInterface viewer, int width, int height, short id) { + private void changeVncServer(ViewerInterface viewer, int width, int height, int shareScreenNumber, short id) { String localhost = "127.0.0.1"; // InetAddress.getLocalHost().getHostName() try { - viewer.getRfb().changeVNCServer(viewer, localhost, ConnectionParams.DEFAULT_RFB_PORT, width, height, id, null, null); + viewer.getRfb().changeVNCServer(viewer, localhost, ConnectionParams.DEFAULT_RFB_PORT, width, height, shareScreenNumber, id, null, null); } catch (Exception e1) { System.out.println("can't change server :" + e1.getMessage()); }