From 0a5e6baf395fbd5e34b37a792d24198a8bc08433 Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Tue, 18 Aug 2020 10:04:02 -0700
Subject: [PATCH] KVMext improvements.

---
 amt-desktop-0.0.2.js | 10 ++++++----
 index.html           | 20 +++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/amt-desktop-0.0.2.js b/amt-desktop-0.0.2.js
index 6d2a600..bed30d5 100644
--- a/amt-desktop-0.0.2.js
+++ b/amt-desktop-0.0.2.js
@@ -182,8 +182,10 @@ var CreateAmtRemoteDesktop = function (divid, scrolldiv) {
                 obj.ox = -1; // Old mouse x position
                 // ###END###{DesktopFocus}
                 // ###BEGIN###{DesktopInband}
-                obj.sendKvmExtCmd(2, obj.graymode?1:0); // Set Decimation State
-                obj.sendKvmExtCmd(4, obj.useZLib?1:0); // Set ZLib state
+                if (obj.kvmExtChanged != null) {
+                    obj.sendKvmExtCmd(2, obj.graymode ? 1 : 0); // Set Decimation State
+                    obj.sendKvmExtCmd(4, obj.useZLib ? 1 : 0); // Set ZLib state
+                }
                 // ###END###{DesktopInband}
                 _SendRefresh();
 
@@ -776,9 +778,9 @@ var CreateAmtRemoteDesktop = function (divid, scrolldiv) {
             } else if ((d.length >= 13) && (d.substring(0, 11) == '\0KvmExtCmd\0')) {
                 var cmd = d.charCodeAt(11), val = d.charCodeAt(12);
                 console.log('Received KvmExtCmd', cmd, val);
-                if (cmd == 1) { obj.kvmext.decimation = val; if (obj.kvmExtChanged != null) { obj.kvmExtChanged(1, val); } }
+                if (cmd == 1) { obj.kvmExt.decimation = val; if (obj.kvmExtChanged != null) { obj.kvmExtChanged(1, val); } }
                 if (cmd == 2) { obj.sendKvmExtCmd(1); }
-                if (cmd == 3) { obj.kvmext.compression = val; if (obj.kvmExtChanged != null) { obj.kvmExtChanged(3, val); } }
+                if (cmd == 3) { obj.kvmExt.compression = val; if (obj.kvmExtChanged != null) { obj.kvmExtChanged(3, val); } }
                 if (cmd == 4) { obj.sendKvmExtCmd(3); }
             } else {
                 console.log('Got KVM clipboard data:', d);
diff --git a/index.html b/index.html
index dbbd99e..5189933 100644
--- a/index.html
+++ b/index.html
@@ -1336,8 +1336,8 @@
                     <select id="idx_d7desktopmode" style="float:right;width:200px">
                         <!-- Flags: 1 = RAW, 2 = 16bit, 4 = Gray, 8 = ZLib -->
                         <!-- ###BEGIN###{DesktopInband} -->
-                        <option id="d7exm1" value="5">RLE8G, Gray (Fast)</option>
-                        <option id="d7exm2" value="7">RLE16G, Gray</option>
+                        <option id="d7exm1" value="5">RLE4G, Gray (Fast)</option>
+                        <option id="d7exm2" value="7">RLE8G, Gray</option>
                         <!-- ###END###{DesktopInband} -->
                         <option value="1">RLE8, Color</option>
                         <option value="3">RLE16, Color</option>
@@ -1891,9 +1891,6 @@
             // Setup the remote desktop
             desktop = CreateAmtRedirect(CreateAmtRemoteDesktop('Desk', Q('id_mainarea')));
             desktop.onStateChanged = onDesktopStateChange;
-            // ###BEGIN###{DesktopInband}
-            desktop.kvmExtChanged = updateDesktopState;
-            // ###END###{DesktopInband}
             QE('idx_connectbutton1', true);
             try { t = localStorage.getItem('desktopsettings'); } catch (ex) {}
             if (t) { desktopsettings = JSON.parse(t); }
@@ -8280,6 +8277,7 @@
                         }
                     }
                 };
+                if ((amtversion > 15) || urlvars['kvmext']) { desktop.m.kvmExtChanged = updateDesktopState; } else { desktop.m.kvmExtChanged = null; }
                 // ###END###{DesktopInband}
                 desktop.m.frameRateDelay = ((desktopsettings.limitFrameRate == true)?200:0);
                 desktop.m.noMouseRotate = desktopsettings.noMouseRotate;
@@ -8493,12 +8491,12 @@
             if (desktopsettings.quality) { d7bitmapquality.value = desktopsettings.quality; }
             if (desktopsettings.scaling) { d7bitmapscaling.value = desktopsettings.scaling; }
             QV('d7softkvmsettings', amtversion >= 12);
-            QV('d7exm1', amtversion > 14);
-            QV('d7exm2', amtversion > 14);
-            QV('d7exm3', amtversion > 14);
-            QV('d7exm4', amtversion > 14);
-            QV('d7exm5', amtversion > 14);
-            QV('d7exm6', amtversion > 14);
+            QV('d7exm1', (amtversion > 15) || urlvars['kvmext']);
+            QV('d7exm2', (amtversion > 15) || urlvars['kvmext']);
+            QV('d7exm3', (amtversion > 15) || urlvars['kvmext']);
+            QV('d7exm4', (amtversion > 15) || urlvars['kvmext']);
+            QV('d7exm5', (amtversion > 15) || urlvars['kvmext']);
+            QV('d7exm6', (amtversion > 15) || urlvars['kvmext']);
             // ###END###{DesktopInband}
             // ###BEGIN###{DesktopFocus}
             QV('idx_deskFocusBtn', desktopsettings.showfocus);