Mercurial > hg > Applications > tvnjviewer

changeset 31:59cdd271f79c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change compressed DSM only pixel data
author Nozomi Teruya <e125769@ie.u-ryukyu.ac.jp>
date Mon, 16 Nov 2015 23:02:29 +0900
parents e2de671a155d
children 13af160c3ae4
files .idea/gradle.xml .idea/modules.xml .idea/vcs.xml build.gradle 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/Protocol.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/Viewer.java src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java
diffstat 11 files changed, 65 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/gradle.xml	Mon Nov 16 23:02:29 2015 +0900
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="distributionType" value="LOCAL" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="/usr/local/Cellar/gradle/2.2.1/libexec" />
+        <option name="gradleJvm" value="1.8" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+          </set>
+        </option>
+        <option name="myModules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/modules.xml	Mon Nov 16 23:02:29 2015 +0900
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/tvnjviewer.iml" filepath="$PROJECT_DIR$/tvnjviewer.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/vcs.xml	Mon Nov 16 23:02:29 2015 +0900
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="hg4idea" />
+  </component>
+</project>
\ No newline at end of file
--- a/build.gradle	Mon Dec 08 15:55:38 2014 +0900
+++ b/build.gradle	Mon Nov 16 23:02:29 2015 +0900
@@ -33,7 +33,7 @@
 
 repositories {
     maven(){
-        url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/ba8551c1a5c2/'
+        url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/19878c89c434/'
     }
     flatDir {
         dirs 'src/libs/'
@@ -42,8 +42,8 @@
 
 dependencies {
     compile fileTree(dir: 'src/libs', include: '*.jar')
-    compile group: 'cr.ie.u_ryukyu.ac.jp', name: 'Alice', version: '1.0', ext: 'jar'
-    viewerSwingCompile group: 'cr.ie.u_ryukyu.ac.jp', name: 'Alice', version: '1.0', ext: 'jar'
+    compile group: 'cr.ie.u_ryukyu.ac.jp', name: 'Alice', version: '1.1', ext: 'jar'
+    viewerSwingCompile group: 'cr.ie.u_ryukyu.ac.jp', name: 'Alice', version: '1.1', ext: 'jar'
     viewerSwingCompile group: 'com.jcraft', name: 'jsch', version: '0.1.+', ext: 'jar'
     viewerSwingRuntime configurations.viewerSwingCompile
 }
@@ -82,7 +82,7 @@
 }
 
 ext {
-    mavenRepository = System.getenv()['HOME']+'/workspace/maven'
+    mavenRepository = System.getenv()['HOME']+'/Development/CR/maven'
 }
 
 uploadArchives {
--- a/src/main/java/com/glavsoft/rfb/encoding/decoder/RichCursorDecoder.java	Mon Dec 08 15:55:38 2014 +0900
+++ b/src/main/java/com/glavsoft/rfb/encoding/decoder/RichCursorDecoder.java	Mon Nov 16 23:02:29 2015 +0900
@@ -66,10 +66,10 @@
         message.setRectangle(rect);
         message.bitmask = bitmask.clone();
         
-        ReceiveData rData = new ReceiveData(buffer.clone(), false, false);
-        DataSegment.getLocal().put("pixelData", rData, null);
-        rData = new ReceiveData(message, false, false);
-        DataSegment.getLocal().put("updateRectangle", rData, null);
+        ReceiveData rData = new ReceiveData(buffer.clone());
+        DataSegment.getCompressedLocal().put("pixelData", rData, false);
+        rData = new ReceiveData(message);
+        DataSegment.getLocal().put("updateRectangle", rData, false);
 		
 		sb = new StringBuilder(" ");
 		for (int i=0; i<bitmask.length; ++i) {
--- a/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEDecoder.java	Mon Dec 08 15:55:38 2014 +0900
+++ b/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEDecoder.java	Mon Nov 16 23:02:29 2015 +0900
@@ -53,10 +53,10 @@
         message.setRectangle(rect);
         message.encodingTypeId = EncodingType.ZRLEE.getId();
 
-        ReceiveData rData = new ReceiveData(bytes.clone(), false, false);
-        DataSegment.getLocal().put("pixelData", rData, null);
-        rData = new ReceiveData(message, false, false);
-        DataSegment.getLocal().put("updateRectangle", rData, null);
+        ReceiveData rData = new ReceiveData(bytes.clone());
+        DataSegment.getCompressedLocal().put("pixelData", rData, false);
+        rData = new ReceiveData(message);
+        DataSegment.getLocal().put("updateRectangle", rData, false);
         decode(renderer, rect, bytes, 0);
     }
 
--- a/src/main/java/com/glavsoft/rfb/protocol/Protocol.java	Mon Dec 08 15:55:38 2014 +0900
+++ b/src/main/java/com/glavsoft/rfb/protocol/Protocol.java	Mon Nov 16 23:02:29 2015 +0900
@@ -195,8 +195,8 @@
 		receiverThread = new Thread(receiverTask, "RfbReceiverTask");
 		receiverThread.start();
 		// add
-		ReceiveData rData = new ReceiveData(this, false, false);
-		DataSegment.getLocal().put("protocol", rData, null);
+		ReceiveData rData = new ReceiveData(this);
+		DataSegment.getLocal().put("protocol", rData, false);
 	}
 
     private void correctServerPixelFormat() {
--- a/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java	Mon Dec 08 15:55:38 2014 +0900
+++ b/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java	Mon Nov 16 23:02:29 2015 +0900
@@ -186,10 +186,10 @@
 				message.setRectangle(rect);
 				message.setPixelFormat(context.getPixelFormat());
 
-				ReceiveData rData = new ReceiveData("dummy", false, false);
-                DataSegment.getLocal().put("pixelData", rData, null);
-				rData = new ReceiveData(message, false, false);
-		        DataSegment.getLocal().put("updateRectangle", rData, null);
+				ReceiveData rData = new ReceiveData("dummy");
+                DataSegment.getCompressedLocal().put("pixelData", rData, false);
+				rData = new ReceiveData(message);
+		        DataSegment.getLocal().put("updateRectangle", rData, false);
 
 				context.sendMessage(new FramebufferUpdateRequestMessage(0, 0, rect.width, rect.height, false));
 //				repaintController.repaintCursor();
--- a/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java	Mon Dec 08 15:55:38 2014 +0900
+++ b/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java	Mon Nov 16 23:02:29 2015 +0900
@@ -85,15 +85,15 @@
 	protected void completeContextData(ServerInitMessage serverInitMessage) {
 	    DecodeInfomation mes = new DecodeInfomation();
 	    mes.setServerInitMessage(serverInitMessage);
-	    ReceiveData rData = new ReceiveData(mes, false, false);
-	    DataSegment.getLocal().put("initMessage", rData, null);
+	    ReceiveData rData = new ReceiveData(mes);
+	    DataSegment.getLocal().put("initMessage", rData, false);
 
-	    rData = new ReceiveData(mes, false, false);
+	    rData = new ReceiveData(mes);
 	    mes.encodingTypeId = EncodingType.DESKTOP_SIZE.getId();
-	    DataSegment.getLocal().put("updateRectangle", rData, null);
+	    DataSegment.getLocal().put("updateRectangle", rData, false);
 
-	    rData = new ReceiveData("dummy", false, false);
-	    DataSegment.getLocal().put("pixelData", rData, null);
+	    rData = new ReceiveData("dummy");
+	    DataSegment.getCompressedLocal().put("pixelData", rData, false);
 
 		context.setPixelFormat(serverInitMessage.getPixelFormat());
 		context.setFbWidth(serverInitMessage.getFrameBufferWidth());
--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Mon Dec 08 15:55:38 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Mon Nov 16 23:02:29 2015 +0900
@@ -110,8 +110,8 @@
             if ("localhost".equals(parser.getPlainOptionAt(0))) {
                 connectionParams.hostName = "localhost";
                 isApplet = true;
-                ReceiveData rData = new ReceiveData(this, false, false);
-                DataSegment.getLocal().put("viewer", rData, null);
+                ReceiveData rData = new ReceiveData(this);
+                DataSegment.getLocal().put("viewer", rData, false);
                 this.needReconnect = false;
                 this.hideJFrame = true;
             };
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java	Mon Dec 08 15:55:38 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java	Mon Nov 16 23:02:29 2015 +0900
@@ -807,8 +807,8 @@
         JButton shareButton = buttonsBar.createButton("share", "Share my screen", new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                ReceiveData rData = new ReceiveData("Request", false, false);
-                DataSegment.getLocal().put("Request", rData, null);
+                ReceiveData rData = new ReceiveData("Request");
+                DataSegment.getLocal().put("Request", rData, false);
             }
         });
         kbdButtons.add(shareButton);