Mercurial > hg > Applications > TreeVNC

changeset 106:01c0fd20c0b4 server-change-works

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
share screen enable cui flag. but nobody clear it.
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Fri, 23 May 2014 11:25:43 +0900
parents 616a662384b1
children 660b296d4f75
files src/main/java/com/glavsoft/rfb/protocol/ProtocolContext.java src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java src/main/java/jp/ac/u_ryukyu/treevnc/client/MyRfbProtoClient.java src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java src/viewer_swing/java/com/glavsoft/viewer/Viewer.java src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java
diffstat 6 files changed, 19 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/com/glavsoft/rfb/protocol/ProtocolContext.java	Fri May 23 02:42:51 2014 +0900
+++ b/src/main/java/com/glavsoft/rfb/protocol/ProtocolContext.java	Fri May 23 11:25:43 2014 +0900
@@ -30,8 +30,7 @@
 import com.glavsoft.rfb.protocol.state.ProtocolState;
 import com.glavsoft.transport.Reader;
 import com.glavsoft.transport.Writer;
-
-import java.util.logging.Logger;
+// import java.util.logging.Logger;
 
 public interface ProtocolContext {
 
--- a/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java	Fri May 23 02:42:51 2014 +0900
+++ b/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java	Fri May 23 11:25:43 2014 +0900
@@ -47,7 +47,6 @@
 
 import jp.ac.u_ryukyu.treevnc.MyRfbProto;
 import jp.ac.u_ryukyu.treevnc.client.EchoClient;
-import jp.ac.u_ryukyu.treevnc.client.MyRfbProtoClient;
 
 public class ReceiverTask implements Runnable {
 	private static final byte FRAMEBUFFER_UPDATE = 0;
@@ -230,14 +229,15 @@
 				renderer.decodeCursorPosition(rect);
 				repaintController.repaintCursor();
 			} else if (rect.getEncodingType() == EncodingType.DESKTOP_SIZE) {
-				fullscreenFbUpdateIncrementalRequest =
-					new FramebufferUpdateRequestMessage(0, 0, rect.width, rect.height, true);
-				synchronized (renderer.getLock()) {
-					if(!(rfb.getCuiVersion()))
-						renderer = repaintController.createRenderer(reader, rect.width, rect.height,context.getPixelFormat());
-				}
-				context.sendMessage(new FramebufferUpdateRequestMessage(0, 0, rect.width, rect.height, false));
-//				repaintController.repaintCursor();
+			    fullscreenFbUpdateIncrementalRequest =
+			            new FramebufferUpdateRequestMessage(0, 0, rect.width, rect.height, true);
+                rfb.setCuiVersion(false);
+			    synchronized (renderer.getLock()) {
+			        if(!(rfb.getCuiVersion()))
+			            renderer = repaintController.createRenderer(reader, rect.width, rect.height,context.getPixelFormat());
+			    }
+			    context.sendMessage(new FramebufferUpdateRequestMessage(0, 0, rect.width, rect.height, false));
+			    //				repaintController.repaintCursor();
 			} else
 				throw new CommonException("Unprocessed encoding: " + rect.toString());
 		}
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/client/MyRfbProtoClient.java	Fri May 23 02:42:51 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/client/MyRfbProtoClient.java	Fri May 23 11:25:43 2014 +0900
@@ -108,7 +108,6 @@
 
 	void sendRfbVersion(OutputStream os) throws IOException {
 		os.write(versionMsg_3_856.getBytes());
-		// os.write(versionMsg_3_8.getBytes());
 	}
 
 	int readVersionMsg(InputStream is, OutputStream os) throws IOException {
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java	Fri May 23 02:42:51 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java	Fri May 23 11:25:43 2014 +0900
@@ -95,6 +95,12 @@
 		}
 	}
 	
+	/**
+	 * start new VNC server receiver with
+	 * inherited clients
+	 * @param vs
+	 * @param hostName
+	 */
 	private void inhelitClients(VncProxyService vs, String hostName) {
 		myRfb.setReadyReconnect(false);
 		setConnectionParam(hostName,vncport);
--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Fri May 23 02:42:51 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Fri May 23 11:25:43 2014 +0900
@@ -65,7 +65,6 @@
     private ConnectionPresenter connectionPresenter;
     boolean isTreeVNC = false;
     protected MyRfbProto myRfb;
-    private boolean cuiVersion;
 	private boolean noConnection;
 
     public static void main(String[] args) {
@@ -298,8 +297,8 @@
 	}
 	
 	public void startViewer(String hostName,boolean cui) {
-		cuiVersion = cui;
 		MyRfbProtoClient rfb = new MyRfbProtoClient();
+		rfb.setCuiVersion(cui);
 		CreateConnectionParam cp = new CreateConnectionParam(rfb);
 		cp.setHostName(hostName);
 		cp.createConnectionParam(this);
@@ -326,9 +325,9 @@
 	}
 
 	public boolean getCuiVersion() {
-		return cuiVersion;
+		return myRfb.getCuiVersion();
 	}
 	public void setCuiVersion(boolean flag) {
-		cuiVersion = flag;
+		myRfb.setCuiVersion(flag);
 	}
 }
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java	Fri May 23 02:42:51 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java	Fri May 23 11:25:43 2014 +0900
@@ -47,7 +47,6 @@
 
 import jp.ac.u_ryukyu.treevnc.MyRfbProto;
 import jp.ac.u_ryukyu.treevnc.client.MyRfbProtoClient;
-import jp.ac.u_ryukyu.treevnc.server.MyRfbProtoProxy;
 
 /**
 * @author dime at tightvnc.com