Merge branch 'main' into dev

TurboVNC · Sep 25, 2024 · 6d26cd1 · 6d26cd1
2 parents 22a8c85 + 06c6c2c
commit 6d26cd1
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -66,6 +66,13 @@ system log.
 3. Fixed a regression introduced by 2.2 beta1[7] that prevented the TurboVNC
 Server from being used as an inetd service.
 
+4. The "Tight Encoding Without Zlib" RFB extension, which was used unofficially
+by the Lossless Tight encoding method since TurboVNC v0.5, has been officially
+registered with IANA as an RFB pseudo-encoding. The TurboVNC Viewer now
+advertises support for the pseudo-encoding. (The next major release of the
+TurboVNC Server will forego using the extension unless the VNC viewer
+advertises support for it.)
+
 
 3.1.2
 =====

diff --git a/doc/index.html b/doc/index.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
 <meta name="language" content="en">
-<meta name="date" content="2024-08-03T10:35:39">
+<meta name="date" content="2024-09-25T15:04:57">
 <meta name="generator" content="deplate.rb 0.8.5">
 <title>User&rsquo;s Guide for TurboVNC 3.2</title>
 <link rel="start" href="index.html" title="Frontpage">
@@ -1291,7 +1291,7 @@ <h1 id="hd007"><a name="file007"></a>7&nbsp;Performance and Image Quality</h1>
  <td class="standard">30</td>
  <td class="standard">4x</td>
  <td class="standard">7</td>
- <td class="standard">For subrectangles that have a high number of unique colors, this encoding method produces very noticeable image compression artifacts. However, it performs optimally on low-bandwidth connections. If image quality is more critical than performance, then use one of the other encoding methods or take advantage of the <a href="#LR">Lossless Refresh feature</a><a name="idx0033"></a>. In addition to reducing the JPEG quality to a &ldquo;minimum usable&rdquo; level, this encoding method also enables interframe comparison and Compression Level 2. (CL 7 = CL 2 + interframe comparison.) Compression Level 2 can reduce bandwidth for low-color application workloads that are not good candidates for JPEG compression.</td>
+ <td class="standard">For subrectangles that have a high number of unique colors, this encoding method produces very noticeable image compression artifacts. However, it performs optimally on low-bandwidth connections. If image quality is more critical than performance, then use one of the other encoding methods or take advantage of the <a href="#LR">Lossless Refresh feature</a><a name="idx0033"></a>. In addition to reducing the JPEG quality to a &ldquo;minimum usable&rdquo; level, this encoding method also enables interframe comparison and Compression Level 2. (CL 7 = CL 2 + interframe comparison.) Compression Level 2 can reduce network usage for low-color application workloads that are not good candidates for JPEG compression.</td>
  </tr>
  <tr class="standard">
  <td class="standard">&ldquo;Lossless Tight&rdquo;</td>

diff --git a/doc/performance.txt b/doc/performance.txt
@@ -84,7 +84,7 @@ the most useful combinations of the image compression options described above:
  take advantage of the [[#LR][Lossless Refresh feature]]. In addition to \
  reducing the JPEG quality to a "minimum usable" level, this encoding method \
  also enables interframe comparison and Compression Level 2. (CL 7 = CL 2 + \
- interframe comparison.) Compression Level 2 can reduce bandwidth for \
+ interframe comparison.) Compression Level 2 can reduce network usage for \
  low-color application workloads that are not good candidates for JPEG \
  compression. |
 | "Lossless Tight" | No | N/A | N/A | 0 | \

diff --git a/java/com/turbovnc/rfb/CMsgWriter.java b/java/com/turbovnc/rfb/CMsgWriter.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012, 2015, 2017-2018, 2020-2023 D. R. Commander.
+/* Copyright (C) 2012, 2015, 2017-2018, 2020-2024 D. R. Commander.
  * All Rights Reserved.
  * Copyright 2009-2011, 2017-2019 Pierre Ossman for Cendio AB
  * Copyright (C) 2011, 2015 Brian P. Hinz
@@ -418,6 +418,7 @@ public synchronized void writeSetEncodings(int preferredEncoding,
  encodings[nEncodings++] = RFB.ENCODING_QEMU_LED_STATE;
  encodings[nEncodings++] = RFB.ENCODING_VMWARE_LED_STATE;
  }
+ encodings[nEncodings++] = RFB.ENCODING_TIGHT_WITHOUT_ZLIB;
 
  if (Decoder.supported(preferredEncoding)) {
  encodings[nEncodings++] = preferredEncoding;

diff --git a/java/com/turbovnc/rfb/RFB.java b/java/com/turbovnc/rfb/RFB.java
@@ -1,5 +1,5 @@
-/* Copyright (C) 2011-2012, 2015-2018, 2021-2022 D. R. Commander.
- * All Rights Reserved.
+/* Copyright (C) 2011-2012, 2015-2018, 2021-2022, 2024 D. R. Commander.
+ *  All Rights Reserved.
  * Copyright 2009, 2011, 2019 Pierre Ossman for Cendio AB
  * Copyright (C) 2011-2012 Brian P. Hinz
  * Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved.
@@ -217,6 +217,8 @@ public static String encodingName(int num) {
  public static final int ENCODING_FINE_QUALITY_LEVEL_0 = -512;
  public static final int ENCODING_FINE_QUALITY_LEVEL_100 = -412;
 
+ public static final int ENCODING_TIGHT_WITHOUT_ZLIB = -317;
+
  public static final int ENCODING_CONTINUOUS_UPDATES = -313;
  public static final int ENCODING_FENCE = -312;