fix wrong case shift of typed characters for Linux customers

fixes ##28

(cherry picked from commit 3a23f54)

Author: pinhead84

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/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);
     }