Revision: 4822
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4822&view=rev
Author: bphinz
Date: 2011-12-04 22:58:48 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
oops, bad commit! I only meant to commit the changes to the TightDecoder.
Modified Paths:
--------------
trunk/java/com/tigervnc/rdr/InStream.java
trunk/java/com/tigervnc/rdr/JavaInStream.java
trunk/java/com/tigervnc/rdr/ZlibInStream.java
trunk/java/com/tigervnc/rfb/PixelBuffer.java
trunk/java/com/tigervnc/vncviewer/CConn.java
trunk/java/com/tigervnc/vncviewer/DesktopWindow.java
trunk/java/com/tigervnc/vncviewer/OptionsDialog.java
trunk/java/com/tigervnc/vncviewer/PixelBufferImage.java
trunk/java/com/tigervnc/vncviewer/VncViewer.java
Modified: trunk/java/com/tigervnc/rdr/InStream.java
===================================================================
--- trunk/java/com/tigervnc/rdr/InStream.java 2011-12-04 22:06:21 UTC (rev
4821)
+++ trunk/java/com/tigervnc/rdr/InStream.java 2011-12-04 22:58:48 UTC (rev
4822)
@@ -30,7 +30,6 @@
// maximum of nItems).
public int check(int itemSize, int nItems, boolean wait) {
-/*
int available = end - ptr;
if (itemSize * nItems > available) {
if (itemSize > available)
@@ -39,14 +38,6 @@
nItems = available / itemSize;
}
return nItems;
-*/
- if (ptr + itemSize * nItems > end) {
- if (ptr + itemSize > end)
- return overrun(itemSize, nItems, wait);
-
- nItems = (end - ptr) / itemSize;
- }
- return nItems;
}
public int check(int itemSize, int nItems) { return check(itemSize, nItems,
true); }
@@ -120,17 +111,14 @@
// no byte-ordering, we just use big-endian.
public final int readOpaque8() { return readU8(); }
- public final int readOpaque16() { check(2); int r0 = b[ptr++];
- int r1 = b[ptr++]; return r0 << 8 | r1; }
- public final int readOpaque32() { check(4); int r0 = b[ptr++]; int r1 =
b[ptr++];
- int r2 = b[ptr++]; int r3 = b[ptr++];
- return r0 << 24 | r1 << 16 | r2 << 8 | r3;
}
- public final int readOpaque24A() { check(3, 1, true); int r0 = b[ptr++];
- int r1 = b[ptr++]; int r2 = b[ptr++];
- return r0 << 24 | r1 << 16 | r2 << 8; }
- public final int readOpaque24B() { check(3, 1, true); int r0 = b[ptr++];
- int r1 = b[ptr++]; int r2 = b[ptr++];
- return r0 << 16 | r1 << 8 | r2; }
+ public final int readOpaque16() { return readU16(); }
+ public final int readOpaque32() { return readU32(); }
+ public final int readOpaque24A() { check(3, 1, true); int b0 = b[ptr++];
+ int b1 = b[ptr++]; int b2 = b[ptr++];
+ return b0 << 24 | b1 << 16 | b2 << 8; }
+ public final int readOpaque24B() { check(3, 1, true); int b0 = b[ptr++];
+ int b1 = b[ptr++]; int b2 = b[ptr++];
+ return b0 << 16 | b1 << 8 | b2; }
public final int readPixel(int bytesPerPixel, boolean bigEndian) {
byte[] pix = new byte[4];
@@ -202,5 +190,4 @@
protected byte[] b;
protected int ptr;
protected int end;
- protected int start;
}
Modified: trunk/java/com/tigervnc/rdr/JavaInStream.java
===================================================================
--- trunk/java/com/tigervnc/rdr/JavaInStream.java 2011-12-04 22:06:21 UTC
(rev 4821)
+++ trunk/java/com/tigervnc/rdr/JavaInStream.java 2011-12-04 22:58:48 UTC
(rev 4822)
@@ -21,37 +21,25 @@
//
package com.tigervnc.rdr;
-import java.io.InputStream;
-import java.io.DataInputStream;
public class JavaInStream extends InStream {
static final int defaultBufSize = 8192;
static final int minBulkSize = 1024;
- public JavaInStream(InputStream jis_, int bufSize_)
- {
- jis = new DataInputStream(jis_);
+ public JavaInStream(java.io.InputStream jis_, int bufSize_) {
+ jis = jis_;
bufSize = bufSize_;
b = new byte[bufSize];
- ptr = end = offset = start = 0;
+ ptr = end = offset = 0;
timing = false;
timeWaitedIn100us = 5;
timedKbits = 0;
}
- public JavaInStream(InputStream jis_)
- {
- this(jis_, defaultBufSize);
- }
+ public JavaInStream(java.io.InputStream jis_) { this(jis_, defaultBufSize); }
- public int pos()
- {
- return offset + ptr - start;
- }
-
- public void readBytes(byte[] data, int dataPtr, int length)
- {
+ public void readBytes(byte[] data, int dataPtr, int length) {
if (length < minBulkSize) {
super.readBytes(data, dataPtr, length);
return;
@@ -73,32 +61,56 @@
}
}
+ public int pos() { return offset + ptr; }
+
+ public void startTiming() {
+ timing = true;
+
+ // Carry over up to 1s worth of previous rate for smoothing.
+
+ if (timeWaitedIn100us > 10000) {
+ timedKbits = timedKbits * 10000 / timeWaitedIn100us;
+ timeWaitedIn100us = 10000;
+ }
+ }
+
+ public void stopTiming() {
+ timing = false;
+ if (timeWaitedIn100us < timedKbits/2)
+ timeWaitedIn100us = timedKbits/2; // upper limit 20Mbit/s
+ }
+
+ public long kbitsPerSecond() {
+ return timedKbits * 10000 / timeWaitedIn100us;
+ }
+
+ public long timeWaited() { return timeWaitedIn100us; }
+
protected int overrun(int itemSize, int nItems, boolean wait) {
if (itemSize > bufSize)
throw new Exception("JavaInStream overrun: max itemSize exceeded");
if (end - ptr != 0)
- System.arraycopy(b, ptr, b, start, end - ptr);
+ System.arraycopy(b, ptr, b, 0, end - ptr);
- offset += ptr - start;
- end -= ptr - start;
- ptr = start;
+ offset += ptr;
+ end -= ptr;
+ ptr = 0;
- int bytes_to_read;
- while (end < start + itemSize) {
- bytes_to_read = start + bufSize - end;
+ while (end < itemSize) {
+ int bytes_to_read = bufSize - end;
if (!timing) {
bytes_to_read = Math.min(bytes_to_read, Math.max(itemSize*nItems, 8));
}
int n = read(b, end, bytes_to_read, wait);
- if (n == 0) return 0;
+
end += n;
}
- if (itemSize * nItems > end - ptr)
- nItems = (end - ptr) / itemSize;
+ if (itemSize * nItems > end)
+ nItems = end / itemSize;
return nItems;
}
@@ -110,17 +122,7 @@
int n = -1;
try {
- //System.out.println("available: "+jis.available());
- //int available = jis.available();
- //if (!wait && (available == 0))
- // return 0;
- //if (available > 0 && available < len) {
- // n = jis.read(buf, bufPtr, available);
- //} else {
- n = jis.read(buf, bufPtr, len);
- //}
- } catch (java.net.SocketTimeoutException e) {
- return Math.max(n,0);
+ n = jis.read(buf, bufPtr, len);
} catch (java.io.IOException e) {
throw new IOException(e);
}
@@ -148,34 +150,9 @@
return n;
}
- private int read(byte[] buf, int bufPtr, int len) {
- return read(buf, bufPtr, len, true);
- }
+ private int read(byte[] buf, int bufPtr, int len) { return read(buf, bufPtr,
len, true); }
- public void startTiming() {
- timing = true;
-
- // Carry over up to 1s worth of previous rate for smoothing.
-
- if (timeWaitedIn100us > 10000) {
- timedKbits = timedKbits * 10000 / timeWaitedIn100us;
- timeWaitedIn100us = 10000;
- }
- }
-
- public void stopTiming() {
- timing = false;
- if (timeWaitedIn100us < timedKbits/2)
- timeWaitedIn100us = timedKbits/2; // upper limit 20Mbit/s
- }
-
- public long kbitsPerSecond() {
- return timedKbits * 10000 / timeWaitedIn100us;
- }
-
- public long timeWaited() { return timeWaitedIn100us; }
-
- private DataInputStream jis;
+ private java.io.InputStream jis;
private int offset;
private int bufSize;
Modified: trunk/java/com/tigervnc/rdr/ZlibInStream.java
===================================================================
--- trunk/java/com/tigervnc/rdr/ZlibInStream.java 2011-12-04 22:06:21 UTC
(rev 4821)
+++ trunk/java/com/tigervnc/rdr/ZlibInStream.java 2011-12-04 22:58:48 UTC
(rev 4822)
@@ -138,4 +138,5 @@
private int offset;
private com.jcraft.jzlib.ZStream zs;
private int bytesIn;
+ private int start;
}
Modified: trunk/java/com/tigervnc/rfb/PixelBuffer.java
===================================================================
--- trunk/java/com/tigervnc/rfb/PixelBuffer.java 2011-12-04 22:06:21 UTC
(rev 4821)
+++ trunk/java/com/tigervnc/rfb/PixelBuffer.java 2011-12-04 22:58:48 UTC
(rev 4822)
@@ -65,11 +65,6 @@
System.arraycopy(pix, (w * j), data, width_ * (y + j) + x, w);
}
- public void imageRect(int x, int y, int w, int h, byte[] pix) {
- for (int j = 0; j < h; j++)
- System.arraycopy(pix, (w * j), data, width_ * (y + j) + x, w);
- }
-
public void copyRect(int x, int y, int w, int h, int srcX, int srcY) {
int dest = (width_ * y) + x;
int src = (width_ * srcY) + srcX;
Modified: trunk/java/com/tigervnc/vncviewer/CConn.java
===================================================================
--- trunk/java/com/tigervnc/vncviewer/CConn.java 2011-12-04 22:06:21 UTC
(rev 4821)
+++ trunk/java/com/tigervnc/vncviewer/CConn.java 2011-12-04 22:58:48 UTC
(rev 4822)
@@ -181,10 +181,6 @@
cp.compressLevel = viewer.compressLevel.getValue();
cp.noJpeg = viewer.noJpeg.getValue();
cp.qualityLevel = viewer.qualityLevel.getValue();
- if (viewer.x509ca.getValue() != viewer.x509ca.getDefaultStr())
- CSecurityTLS.x509ca.setParam(viewer.x509ca.getValue());
- if (viewer.x509crl.getValue() != viewer.x509crl.getDefaultStr())
- CSecurityTLS.x509crl.setParam(viewer.x509crl.getValue());
initMenu();
if (sock != null) {
Modified: trunk/java/com/tigervnc/vncviewer/DesktopWindow.java
===================================================================
--- trunk/java/com/tigervnc/vncviewer/DesktopWindow.java 2011-12-04
22:06:21 UTC (rev 4821)
+++ trunk/java/com/tigervnc/vncviewer/DesktopWindow.java 2011-12-04
22:58:48 UTC (rev 4822)
@@ -282,17 +282,6 @@
showLocalCursor();
}
- final public void imageRect(int x, int y, int w, int h,
- byte[] pix) {
- if (overlapsCursor(x, y, w, h)) hideLocalCursor();
- synchronized (im) {
- im.imageRect(x, y, w, h, pix);
- }
- invalidate(x, y, w, h);
- if (softCursor == null)
- showLocalCursor();
- }
-
final public void copyRect(int x, int y, int w, int h,
int srcX, int srcY) {
if (overlapsCursor(x, y, w, h) || overlapsCursor(srcX, srcY, w, h))
Modified: trunk/java/com/tigervnc/vncviewer/OptionsDialog.java
===================================================================
--- trunk/java/com/tigervnc/vncviewer/OptionsDialog.java 2011-12-04
22:06:21 UTC (rev 4821)
+++ trunk/java/com/tigervnc/vncviewer/OptionsDialog.java 2011-12-04
22:58:48 UTC (rev 4822)
@@ -20,7 +20,6 @@
import java.awt.*;
import java.awt.event.*;
-import java.io.File;
import javax.swing.*;
import javax.swing.border.*;
Modified: trunk/java/com/tigervnc/vncviewer/PixelBufferImage.java
===================================================================
--- trunk/java/com/tigervnc/vncviewer/PixelBufferImage.java 2011-12-04
22:06:21 UTC (rev 4821)
+++ trunk/java/com/tigervnc/vncviewer/PixelBufferImage.java 2011-12-04
22:58:48 UTC (rev 4822)
@@ -62,8 +62,6 @@
width_ = w;
height_ = h;
- //source = new MemoryImageSource(w,h,cm,data,0,w);
- //source.setAnimated(true);
image = desktop.createImage(this);
image.setAccelerationPriority(1);
@@ -72,9 +70,6 @@
for (int i = 0; i < rowsToCopy; i++)
System.arraycopy(oldData, copyWidth * i,
data, width() * i, copyWidth);
- //source.newPixels(data, cm, 0, w);
- //source.newPixels(0, 0, w, h, true);
- //source.setFullBufferUpdates(true);
}
public PixelFormat getNativePF() {
@@ -108,7 +103,6 @@
public void put(int x, int y, int w, int h, Graphics g) {
if (ic != null) {
ic.setPixels(x, y, w, h, cm, data, width() * y + x, width());
- //source.newPixels(x, y, w, h, true);
g.setClip(x, y, w, h);
ic.imageComplete(ImageConsumer.SINGLEFRAMEDONE);
}
@@ -122,7 +116,6 @@
super.copyRect(x, y, w, h, srcX, srcY);
if (ic == null) return;
ic.setPixels(x, y, w, h, cm, data, width() * y + x, width());
- //source.newPixels(x, y, w, h, true);
g.setClip(x, y, w, h);
ic.imageComplete(ImageConsumer.SINGLEFRAMEDONE);
}
@@ -178,7 +171,6 @@
public void requestTopDownLeftRightResend(ImageConsumer c) {}
public void startProduction(ImageConsumer c) { addConsumer(c); }
- MemoryImageSource source;
Image image;
ImageConsumer ic;
Modified: trunk/java/com/tigervnc/vncviewer/VncViewer.java
===================================================================
--- trunk/java/com/tigervnc/vncviewer/VncViewer.java 2011-12-04 22:06:21 UTC
(rev 4821)
+++ trunk/java/com/tigervnc/vncviewer/VncViewer.java 2011-12-04 22:58:48 UTC
(rev 4822)
@@ -258,12 +258,6 @@
"Password file for VNC authentication", "");
AliasParameter passwd
= new AliasParameter("passwd", "Alias for PasswordFile", passwordFile);
- StringParameter x509crl
- = new StringParameter("X509crl",
- "Path to X509 CRL certificate file", "");
- StringParameter x509ca
- = new StringParameter("X509ca",
- "Path to X509 CA certificate file", "");
BoolParameter autoSelect
= new BoolParameter("AutoSelect",
"Auto select pixel format and encoding", true);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Tigervnc-commits mailing list
Tigervnc-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
