Finish v1.1.1

Author: pinhead84

CHANGELOG.md

@@ -1,6 +1,15 @@
 Changelog for Remote Support Tool
 =================================
 
+1.1.1 (22 Mar 2019)
+-------------------
+
+-   fixed [issue #28](https://github.com/OpenIndex/RemoteSupportTool/issues/28): Uppercase characters are printed in lowercase for Linux customers
+-   fixed [issue #29](https://github.com/OpenIndex/RemoteSupportTool/issues/29): Wrong mouse position on multi monitor setups
+-   fixed [issue #30](https://github.com/OpenIndex/RemoteSupportTool/issues/30): Wrong screen information shown in customer tool
+-   fixed [issue #31](https://github.com/OpenIndex/RemoteSupportTool/issues/31): Staff tool on macOS doesn't send characters typed with option key
+
+
 1.1.0 (20 Mar 2019)
 -------------------
 

Core/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <artifactId>RemoteSupportTool</artifactId>
         <groupId>de.openindex.support</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
 
     <artifactId>RemoteSupportTool-Core</artifactId>

Core/src/main/java/de/openindex/support/core/AppUtils.java

@@ -261,13 +261,6 @@ public static void initTruststore(File defaultTruststore, String defaultPassword
                 System.getProperty(TRUSTSTORE_PASSWORD), defaultPassword));
     }
 
-    public static boolean isAsciiCharacter(char character) {
-        return character == ' ' || // is space
-                (character >= 48 && character <= 57) || // is number
-                (character >= 65 && character <= 90) || // is upper case letter
-                (character >= 97 && character <= 122); // is lower case letter
-    }
-
     public static URL resource(String file) {
         return AppUtils.class.getResource("resources/" + file);
     }

Customer/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <artifactId>RemoteSupportTool</artifactId>
         <groupId>de.openindex.support</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
 
     <artifactId>RemoteSupportTool-Customer</artifactId>

Customer/src/main/java/de/openindex/support/customer/CustomerApplication.java

@@ -37,6 +37,7 @@
 import java.awt.Desktop;
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
+import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
@@ -430,13 +431,14 @@ public void processReceivedObject(Serializable object) {
                 } else if (object instanceof MouseMoveRequest) {
 
                     final MouseMoveRequest request = (MouseMoveRequest) object;
-                    final int x;
-                    final int y;
+                    final GraphicsConfiguration screenConfiguration = screen.getDefaultConfiguration();
+
+                    int x;
+                    int y;
 
                     // On Windows systems we need to convert the coordinates
                     // according to the current screen scaling factor.
                     if (SystemUtils.IS_OS_WINDOWS) {
-                        final GraphicsConfiguration screenConfiguration = screen.getDefaultConfiguration();
                         final AffineTransform transform = screenConfiguration.getDefaultTransform();
                         final double scaleX = (transform != null && transform.getScaleX() > 0) ?
                                 transform.getScaleX() : 1;
@@ -450,6 +452,16 @@ public void processReceivedObject(Serializable object) {
                         y = request.y;
                     }
 
+                    // Calculate absolute coordinates for the selected screen.
+                    // Required for multi monitor setups.
+                    Rectangle bounds = screenConfiguration.getBounds();
+                    //LOGGER.debug("screen bounds {} x {}", bounds.x, bounds.y);
+                    //LOGGER.debug("screen size   {} x {}", bounds.width, bounds.height);
+                    //LOGGER.debug("mouse coords  {} x {}", x, y);
+                    x += bounds.x;
+                    y += bounds.y;
+                    //LOGGER.debug("move mouse to {} x {}", x, y);
+
                     robot.mouseMove(x, y);
 
                 } else if (object instanceof MousePressRequest) {

Customer/src/main/java/de/openindex/support/customer/CustomerFrame.java

@@ -23,8 +23,10 @@
 import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.Font;
+import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
+import java.awt.Rectangle;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import javax.swing.BorderFactory;
@@ -153,8 +155,12 @@ public void changedUpdate(DocumentEvent e) {
             public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
                 final JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
                 final GraphicsDevice screen = (GraphicsDevice) value;
+                final GraphicsConfiguration cfg = screen.getDefaultConfiguration();
+                final Rectangle bounds = cfg.getBounds();
 
-                label.setText(screen.getIDstring() + " (" + screen.getDisplayMode().toString() + ")");
+                label.setText(screen.getIDstring() + " ("
+                        + bounds.width + "x" + bounds.height + "@" + cfg.getColorModel().getPixelSize() + "bpp; "
+                        + "x=" + bounds.x + "; y=" + bounds.y + ")");
                 return label;
             }
         });

Customer/src/main/java/de/openindex/support/customer/utils/LinuxUtils.java

@@ -19,7 +19,6 @@
 import com.sun.jna.NativeLong;
 import com.sun.jna.platform.unix.X11;
 import com.sun.jna.ptr.IntByReference;
-import de.openindex.support.core.AppUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -138,72 +137,59 @@ private static void sendTextViaX11(String text) throws LinuxException {
         X11.XFlush(display);
 
         for (int i = 0; i < text.length(); i++) {
-            char c = text.charAt(i);
-            //LOGGER.debug("printing " + c);
-
-
-            //int value = StandardCharsets.UTF_8.encode(String.valueOf(c)).getInt();
-            //LOGGER.debug("> value " + value);
-            String unicode = String.format("U%04x", (int) c);
-            //LOGGER.debug("> code " + unicode);
-
-            //X11.KeySym sym = X11.XStringToKeysym(String.valueOf(c));
-            X11.KeySym sym = X11.XStringToKeysym(unicode);
-
-            //int code = (sym != null) ? X11.XKeysymToKeycode(display, sym) : 0x00D1;
-            int code = X11.XKeysymToKeycode(display, sym);
-
-            X11.KeySym[] resetKeySym = null;
-            if (!AppUtils.isAsciiCharacter(c)) {
-                //LOGGER.debug("> use scratch");
-                //LOGGER.debug("> " + X11.XKeysymToString(sym));
-
-                resetKeySym = new X11.KeySym[keysymsPerKeycode.getValue()];
-                for (int j = 0; j < resetKeySym.length; j++) {
-                    resetKeySym[j] = X11.XKeycodeToKeysym(display, (byte) scratch_keycode, j);
-                }
-
-                X11.XChangeKeyboardMapping(
-                        display,
-                        scratch_keycode,
-                        2,
-                        new X11.KeySym[]{sym, sym},
-                        1);
-                code = scratch_keycode;
-            }
-
-            //LOGGER.debug("> " + code);
-
-            if (code > 0) {
-                //XTEST.XTestFakeKeyEvent(display, code, false, new NativeLong(0));
-                //X11.XFlush(display);
+            final char character = text.charAt(i);
+            //LOGGER.debug("printing {}", character);
 
-                XTEST.XTestFakeKeyEvent(display, code, true, new NativeLong(0));
-                //X11.XFlush(display);
-                X11.XSync(display, false);
+            // get unicode formatted string
+            final String unicode = String.format("U%04x", (int) character);
+            //LOGGER.debug("> code {}", unicode);
 
-                XTEST.XTestFakeKeyEvent(display, code, false, new NativeLong(0));
-                //X11.XFlush(display);
-                X11.XSync(display, false);
+            // get keysym for the unicode string
+            final X11.KeySym sym = X11.XStringToKeysym(unicode);
 
-                //noinspection CatchMayIgnoreException
-                try {
-                    Thread.sleep(100);
-                } catch (Exception ex) {
-                }
+            // remember the old value before the keysym is overwritten
+            final X11.KeySym[] resetKeySym = new X11.KeySym[keysymsPerKeycode.getValue()];
+            for (int j = 0; j < resetKeySym.length; j++) {
+                resetKeySym[j] = X11.XKeycodeToKeysym(display, (byte) scratch_keycode, j);
             }
 
-            if (resetKeySym != null) {
-                X11.XChangeKeyboardMapping(
-                        display,
-                        scratch_keycode,
-                        resetKeySym.length,
-                        resetKeySym,
-                        1);
-            }
+            // register keysym for the unicode string
+            X11.XChangeKeyboardMapping(
+                    display,
+                    scratch_keycode,
+                    2,
+                    new X11.KeySym[]{sym, sym},
+                    1);
+
+            //XTEST.XTestFakeKeyEvent(display, code, false, new NativeLong(0));
+            //X11.XFlush(display);
+
+            // post event for key press
+            XTEST.XTestFakeKeyEvent(display, scratch_keycode, true, new NativeLong(0));
+            //X11.XFlush(display);
+            X11.XSync(display, false);
+
+            // post event for key release
+            XTEST.XTestFakeKeyEvent(display, scratch_keycode, false, new NativeLong(0));
+            //X11.XFlush(display);
+            X11.XSync(display, false);
+
+            //noinspection CatchMayIgnoreException
+            //try {
+            //    Thread.sleep(50);
+            //} catch (Exception ex) {
+            //}
+
+            // reset the keysym to the old value before it was overwritten
+            X11.XChangeKeyboardMapping(
+                    display,
+                    scratch_keycode,
+                    resetKeySym.length,
+                    resetKeySym,
+                    1);
         }
 
-        //X11.XFlush(display);
+        X11.XFlush(display);
         //X11.XSync(display, false);
         X11.XCloseDisplay(display);
     }

README.md

@@ -1,4 +1,4 @@
-Remote Support Tool 1.1.0
+Remote Support Tool 1.1.1
 =========================
 
 *Remote Support Tool* is an easy single click solution for remote maintenance.
@@ -162,6 +162,8 @@ The following third party components are bundled into the application (in alphab
     [(LGPL 2.1)](https://web.archive.org/web/20101122171611/http://everaldo.com/crystal/?action=license)
 -   [imgscalr](https://github.com/rkalla/imgscalr) rev-8ed3644
     [(Apache License 2.0)](https://raw.githubusercontent.com/rkalla/imgscalr/master/LICENSE)
+-   [Java Native Access](https://github.com/java-native-access/jna) 5.2.0
+    [(Apache License 2.0)](https://raw.githubusercontent.com/java-native-access/jna/master/LICENSE)
 -   [JSch](http://www.jcraft.com/jsch/) 0.1.55
     [(BSD)](http://www.jcraft.com/jsch/LICENSE.txt)
 -   [JZlib](http://www.jcraft.com/jzlib/) 1.1.3

Staff/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <artifactId>RemoteSupportTool</artifactId>
         <groupId>de.openindex.support</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
 
     <artifactId>RemoteSupportTool-Staff</artifactId>

Staff/src/main/java/de/openindex/support/staff/StaffApplication.java

@@ -578,7 +578,7 @@ protected synchronized void doHandleKeyPress(KeyEvent e) {
             }
 
             // Press other keys, if they are pressed together with a modifier key.
-            else if (e.isControlDown() || e.isAltDown() || e.isMetaDown() || windowsKeyDown) {
+            else if (e.isControlDown() || e.isMetaDown() || windowsKeyDown || (!SystemUtils.IS_OS_MAC && e.isAltDown())) {
                 //LOGGER.debug("press key \"{}\" ({})", keyCode, KeyEvent.getKeyText(keyCode));
                 handler.sendKeyPress(keyCode);
                 if (!pressedKeys.contains(keyCode))
@@ -653,7 +653,7 @@ protected synchronized void doHandleKeyRelease(KeyEvent e) {
             }
 
             // Release other keys, if they are pressed together with a modifier key.
-            else if (e.isControlDown() || e.isAltDown() || e.isMetaDown() || windowsKeyDown || pressedKeys.contains(keyCode)) {
+            else if (e.isControlDown() || e.isMetaDown() || windowsKeyDown || (!SystemUtils.IS_OS_MAC && e.isAltDown()) || pressedKeys.contains(keyCode)) {
                 //LOGGER.debug("release key \"{}\" ({})", keyCode, KeyEvent.getKeyText(keyCode));
                 handler.sendKeyRelease(keyCode);
                 pressedKeys.remove((Integer) keyCode);
@@ -673,18 +673,20 @@ protected synchronized void doHandleKeyTyped(KeyEvent e) {
             if (handler == null) return;
             //LOGGER.debug("key typed: " + e.paramString());
             final char keyChar = e.getKeyChar();
-            final int keyValue = (int) keyChar;
 
             // Don't type non printable characters.
-            //if (keyValue < 33 || keyValue == 127 || keyChar == KeyEvent.CHAR_UNDEFINED)
-            if (keyChar == KeyEvent.CHAR_UNDEFINED || Character.isWhitespace(keyChar) || Character.isISOControl(keyChar) || Character.isIdentifierIgnorable(keyChar))
+            if (keyChar == KeyEvent.CHAR_UNDEFINED || Character.isWhitespace(keyChar) || Character.isISOControl(keyChar) || Character.isIdentifierIgnorable(keyChar)) {
+                //LOGGER.debug("non printable {} / {}", Character.isWhitespace(keyChar), Character.isISOControl(keyChar));
                 return;
+            }
 
             // Don't type a character, if a modifier key is pressed at the same time.
-            if (e.isControlDown() || e.isAltDown() || e.isMetaDown() || windowsKeyDown)
+            if (e.isControlDown() || e.isMetaDown() || windowsKeyDown || (!SystemUtils.IS_OS_MAC && e.isAltDown())) {
+                //LOGGER.debug("modifier {} / {} / {} / {}", e.isControlDown(), e.isAltDown(), e.isMetaDown(), windowsKeyDown);
                 return;
+            }
 
-            //LOGGER.debug("type character \"{}\" ({})", keyChar, keyValue);
+            //LOGGER.debug("type character \"{}\" ({})", keyChar, e.getKeyCode());
             handler.sendKeyType(keyChar);
             e.consume();
         }