Mercurial > hg > Applications > tvnjviewer

changeset 18:80b4d7efba08

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change arguments for new PUT API
author sugi
date Mon, 03 Nov 2014 17:14:28 +0900
parents 61d95bdc2bdb
children 6886a2e890cc
files src/main/java/com/glavsoft/rfb/encoding/decoder/RichCursorDecoder.java src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEDecoder.java src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java src/main/java/com/glavsoft/rfb/protocol/state/InitState.java src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java
diffstat 5 files changed, 16 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/com/glavsoft/rfb/encoding/decoder/RichCursorDecoder.java	Sun Nov 02 18:26:41 2014 +0900
+++ b/src/main/java/com/glavsoft/rfb/encoding/decoder/RichCursorDecoder.java	Mon Nov 03 17:14:28 2014 +0900
@@ -25,6 +25,7 @@
 package com.glavsoft.rfb.encoding.decoder;
 
 import alice.datasegment.DataSegment;
+import alice.datasegment.ReceiveData;
 
 import com.glavsoft.drawing.Renderer;
 import com.glavsoft.exceptions.TransportException;
@@ -64,7 +65,8 @@
         message.setRectangle(rect);
         message.buf = buffer.clone();
         message.bitmask = bitmask.clone();
-        DataSegment.getLocal().put("aliceVNCMessage", message, null);
+        ReceiveData rData = new ReceiveData(message, false, false);
+        DataSegment.getLocal().put("aliceVNCMessage", rData, null);
 		
 		sb = new StringBuilder(" ");
 		for (int i=0; i<bitmask.length; ++i) {
--- a/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEDecoder.java	Sun Nov 02 18:26:41 2014 +0900
+++ b/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEDecoder.java	Mon Nov 03 17:14:28 2014 +0900
@@ -25,6 +25,7 @@
 package com.glavsoft.rfb.encoding.decoder;
 
 import alice.datasegment.DataSegment;
+import alice.datasegment.ReceiveData;
 
 import com.glavsoft.drawing.Renderer;
 import com.glavsoft.exceptions.TransportException;
@@ -48,7 +49,9 @@
         message.setRectangle(rect);
         message.buf = bytes.clone();
         message.offset = offset;
-        DataSegment.getLocal().put("aliceVNCMessage", message, null);
+        
+        ReceiveData rData = new ReceiveData(message, false, false);
+        DataSegment.getLocal().put("aliceVNCMessage", rData, null);
         decode(renderer, rect, bytes, offset);
     }
 
--- a/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java	Sun Nov 02 18:26:41 2014 +0900
+++ b/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java	Mon Nov 03 17:14:28 2014 +0900
@@ -25,6 +25,7 @@
 package com.glavsoft.rfb.protocol;
 
 import alice.datasegment.DataSegment;
+import alice.datasegment.ReceiveData;
 
 import com.glavsoft.drawing.Renderer;
 import com.glavsoft.exceptions.CommonException;
@@ -183,7 +184,8 @@
 				AliceVNCMessage message = new AliceVNCMessage();
 				message.setRectangle(rect);
 				message.setPixelFormat(context.getPixelFormat());
-				DataSegment.getLocal().put("aliceVNCMessage", message, null);
+				ReceiveData rData = new ReceiveData(message, false, false);
+		        DataSegment.getLocal().put("aliceVNCMessage", rData, null);
 				
 				context.sendMessage(new FramebufferUpdateRequestMessage(0, 0, rect.width, rect.height, false));
 //				repaintController.repaintCursor();
--- a/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java	Sun Nov 02 18:26:41 2014 +0900
+++ b/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java	Mon Nov 03 17:14:28 2014 +0900
@@ -25,6 +25,7 @@
 package com.glavsoft.rfb.protocol.state;
 
 import alice.datasegment.DataSegment;
+import alice.datasegment.ReceiveData;
 
 import com.glavsoft.exceptions.AuthenticationFailedException;
 import com.glavsoft.exceptions.FatalException;
@@ -79,7 +80,8 @@
 	}
 
 	protected void completeContextData(ServerInitMessage serverInitMessage) {
-	    DataSegment.getLocal().put("ServerInitMessage", serverInitMessage, null);
+	    ReceiveData rData = new ReceiveData(serverInitMessage, false, false);
+	    DataSegment.getLocal().put("ServerInitMessage", rData, null);
 		context.setPixelFormat(serverInitMessage.getPixelFormat());
 		context.setFbWidth(serverInitMessage.getFrameBufferWidth());
 		context.setFbHeight(serverInitMessage.getFrameBufferHeight());
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java	Sun Nov 02 18:26:41 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java	Mon Nov 03 17:14:28 2014 +0900
@@ -25,6 +25,7 @@
 package com.glavsoft.viewer.swing;
 
 import alice.datasegment.DataSegment;
+import alice.datasegment.ReceiveData;
 
 import com.glavsoft.core.SettingsChangedEvent;
 import com.glavsoft.rfb.IChangeSettingsListener;
@@ -806,7 +807,8 @@
         JButton screenButton = buttonsBar.createButton("share", "Share my screen", new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                DataSegment.getLocal().put("Request", "Request", null);
+                ReceiveData rData = new ReceiveData("Request", false, false);
+                DataSegment.getLocal().put("Request", rData, null);
             }
         });
         kbdButtons.add(screenButton);