Merge branch 'main' into dev

ChangeLog.md

@@ -118,6 +118,9 @@ sized, if multi-screen spanning was enabled, the scaled remote desktop was
 larger than the viewer window, and "Displays have separate Spaces" was enabled
 in the system settings.
 
+6. The Windows TurboVNC Viewer now sends Alt-F4 keystrokes to the VNC server
+if keyboard grabbing is enabled.
+
 
 3.1.3
 =====

java/com/turbovnc/rfb/Helper.java

@@ -52,12 +52,10 @@ private static synchronized void printMissingFeatures() {
       vlog.info("  - Keyboard grabbing");
     if (Utils.osEID())
       vlog.info("  - Extended input device support");
-    if (Utils.isX11()) {
+    if (Utils.isX11())
       vlog.info("  - Multi-screen spanning in full-screen mode");
-    }
-    if (Utils.isMac()) {
+    if (Utils.isMac())
       vlog.info("  - Multi-screen spanning");
-    }
     if (Utils.isWindows())
       vlog.info("  - Pageant support");
     else

java/com/turbovnc/rfb/Params.java

@@ -859,8 +859,8 @@ public void save(String node) {
   "\"Primary\" when in windowed mode and the same effect as \"All\" when in " +
   "full-screen mode." +
   (Utils.isX11() ? "  Due to general issues with spanning windows across " +
-  "multiple monitors in X11, this parameter has no effect on Un*x/X11 " +
-  "platforms except in full-screen mode." : "") +
+   "multiple monitors in X11, this parameter has no effect on Un*x/X11 " +
+   "platforms except in full-screen mode." : "") +
   (Utils.isMac() ? "  This parameter has no effect on macOS unless " +
    "\"Displays have separate Spaces\" is disabled in the system settings." :
    ""), SpanParameter.AUTO);

java/com/turbovnc/vncviewer/DesktopWindow.java

@@ -102,9 +102,13 @@ class DesktopWindow extends JPanel implements Runnable, MouseListener,
       private final KeyEventDispatcher keyEventDispatcher =
         new KeyEventDispatcher() {
         public boolean dispatchKeyEvent(KeyEvent e) {
-          if ((e.getKeyCode() == 18 &&
+          if ((e.getKeyCode() == KeyEvent.VK_ALT &&
                e.getKeyLocation() == KeyEvent.KEY_LOCATION_LEFT) ||
-              e.getKeyCode() == 121) {
+              e.getKeyCode() == KeyEvent.VK_F10 ||
+              // Also send Alt-F4 to the VNC server if the keyboard is grabbed.
+              (Utils.isWindows() && VncViewer.isKeyboardGrabbed(cc.viewport) &&
+               e.getKeyCode() == KeyEvent.VK_F4 &&
+               e.getModifiersEx() == KeyEvent.ALT_DOWN_MASK)) {
             if (e.getID() == KeyEvent.KEY_PRESSED)
               cc.desktop.keyPressed(e);
             else if (e.getID() == KeyEvent.KEY_RELEASED)