Merge branch 'obsolete-showDotCursor-rfb-option' of github.com:ThinLinc-Zeijlon/noVNC

This has been deprecated for around six years now. Let's remove the
deprecation warning and disable setting showDotCursor via the options
parameter.

app/error-handler.js

@@ -6,7 +6,7 @@
  * See README.md for usage and integration instructions.
  */
 
-// Fallback for all uncought errors
+// Fallback for all uncaught errors
 function handleError(event, err) {
     try {
         const msg = document.getElementById('noVNC_fallback_errormsg');

app/locale/pt_BR.json

@@ -19,7 +19,7 @@
     "Keyboard": "Teclado",
     "Show keyboard": "Mostrar teclado",
     "Extra keys": "Teclas adicionais",
-    "Show extra keys": "Mostar teclas adicionais",
+    "Show extra keys": "Mostrar teclas adicionais",
     "Ctrl": "Ctrl",
     "Toggle Ctrl": "Pressionar/soltar Ctrl",
     "Alt": "Alt",

app/styles/base.css

@@ -475,15 +475,6 @@ html {
     margin: 5px;
 }
 
-.noVNC_panel button,
-.noVNC_panel select,
-.noVNC_panel textarea,
-.noVNC_panel input:not([type=checkbox]):not([type=radio]) {
-    margin-left: 6px;
-    /* Prevent inputs in panels from being too wide */
-    max-width: calc(100% - 6px - var(--input-xpadding) * 2);
-}
-
 .noVNC_panel .noVNC_heading {
     background-color: var(--novnc-blue);
     border-radius: 6px;
@@ -621,6 +612,15 @@ html {
     list-style: none;
     padding: 0px;
 }
+#noVNC_settings button,
+#noVNC_settings select,
+#noVNC_settings textarea,
+#noVNC_settings input:not([type=checkbox]):not([type=radio]) {
+    margin-left: 6px;
+    /* Prevent inputs in settings from being too wide */
+    max-width: calc(100% - 6px - var(--input-xpadding) * 2);
+}
+
 #noVNC_setting_port {
     width: 80px;
 }

core/rfb.js

@@ -300,10 +300,6 @@ export default class RFB extends EventTargetMixin {
         this._resizeSession = false;
 
         this._showDotCursor = false;
-        if (options.showDotCursor !== undefined) {
-            Log.Warn("Specifying showDotCursor as a RFB constructor argument is deprecated");
-            this._showDotCursor = options.showDotCursor;
-        }
 
         this._qualityLevel = 6;
         this._compressionLevel = 2;

core/util/browser.js

@@ -117,7 +117,7 @@ async function _checkWebCodecsH264DecodeSupport() {
     let error = null;
 
     let decoder = new VideoDecoder({
-        output: (frame) => { gotframe = true; },
+        output: (frame) => { gotframe = true; frame.close(); },
         error: (e) => { error = e; },
     });
     let chunk = new EncodedVideoChunk({

docs/EMBEDDING.md

@@ -25,8 +25,27 @@ server and setting up a WebSocket proxy to the VNC server.
 
 ## Parameters
 
-The noVNC application can be controlled by including certain settings in the
-query string. Currently the following options are available:
+The noVNC application can be controlled via a number of settings. All of
+them are available in the UI for the user to change, but they can also
+be set via other means:
+
+* Via the URL, either as a query parameter:
+
+  ```
+  https://www.example.com/vnc.html?reconnect=0&shared=1
+  ```
+
+  or as a fragment:
+
+  ```
+  https://www.example.com/vnc.html#reconnect=0&shared=1
+  ```
+
+  The latter might be preferred as it is not sent to the server.
+
+* Via the files `defaults.json` and `mandatory.json`
+
+Currently, the following options are available:
 
 * `autoconnect` - Automatically connect as soon as the page has finished
   loading.
@@ -37,13 +56,18 @@ query string. Currently the following options are available:
 * `reconnect_delay` - How long to wait in milliseconds before attempting to
   reconnect.
 
-* `host` - The WebSocket host to connect to.
+* `host` - The WebSocket host to connect to. This setting is deprecated
+  in favor of specifying a URL in `path`.
 
-* `port` - The WebSocket port to connect to.
+* `port` - The WebSocket port to connect to. This setting is deprecated
+  in favor of specifying a URL in `path`.
 
-* `encrypt` - If TLS should be used for the WebSocket connection.
+* `encrypt` - If TLS should be used for the WebSocket connection. This
+  setting is deprecated in favor of specifying a URL in `path`.
 
-* `path` - The WebSocket path to use.
+* `path` - The WebSocket URL to use. It can be either an absolute URL,
+  or a URL relative vnc.html. If `host` is specified, then `path` will
+  be interpreted as the path component in the URL instead.
 
 * `password` - The password sent to the server, if required.
 

po/po2js

@@ -32,6 +32,8 @@ let po = pofile.parse(data);
 const bodyPart = po.items
     .filter(item => item.msgid !== "")
     .filter(item => item.msgstr[0] !== "")
+    .filter(item => !item.flags.fuzzy)
+    .filter(item => !item.obsolete)
     .map(item => "    " + JSON.stringify(item.msgid) + ": " + JSON.stringify(item.msgstr[0]))
     .join(",\n");
 

po/pt_BR.po

@@ -100,7 +100,7 @@ msgstr "Teclas adicionais"
 
 #: ../vnc.html:89
 msgid "Show extra keys"
-msgstr "Mostar teclas adicionais"
+msgstr "Mostrar teclas adicionais"
 
 #: ../vnc.html:94
 msgid "Ctrl"