gwh/emu48android-linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the USB keyboard mapping issues (Github Fix: #6).

Browse source
This commit is contained in:
dgis 2019-06-29 15:42:04 +02:00
parent 81fd5a04b9
commit ca0e34e30e
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/src/main/java/org/emulator/calculator/MainScreenView.java
View file

@ -38,6 +38,7 @@ public class MainScreenView extends PanAndScaleView {
private Paint paint = new Paint(); private Paint paint = new Paint();
private Bitmap bitmapMainScreen; private Bitmap bitmapMainScreen;
private HashMap<Integer, Integer> vkmap; private HashMap<Integer, Integer> vkmap;
private HashMap<Character, Integer> charmap;
private int kmlBackgroundColor = Color.BLACK; private int kmlBackgroundColor = Color.BLACK;
private boolean useKmlBackgroundColor = false; private boolean useKmlBackgroundColor = false;
private int fallbackBackgroundColorType = 0; private int fallbackBackgroundColorType = 0;
@ -62,6 +63,12 @@ public class MainScreenView extends PanAndScaleView {
bitmapMainScreen.eraseColor(Color.BLACK); bitmapMainScreen.eraseColor(Color.BLACK);
enableZoomKeyboard = false; enableZoomKeyboard = false;
charmap = new HashMap<>();
charmap.put('+', 0x6B); // VK_ADD
charmap.put('-', 0x6D); // VK_SUBTRACT
charmap.put('*', 0x6A); // VK_MULTIPLY
charmap.put('/', 0x6F); // VK_DIVIDE
vkmap = new HashMap<>(); vkmap = new HashMap<>();
//vkmap.put(KeyEvent.KEYCODE_BACK, 0x08); // VK_BACK //vkmap.put(KeyEvent.KEYCODE_BACK, 0x08); // VK_BACK
vkmap.put(KeyEvent.KEYCODE_TAB, 0x09); // VK_TAB vkmap.put(KeyEvent.KEYCODE_TAB, 0x09); // VK_TAB
@ -71,9 +78,9 @@ public class MainScreenView extends PanAndScaleView {
vkmap.put(KeyEvent.KEYCODE_FORWARD_DEL, 0x2E); // VK_DELETE vkmap.put(KeyEvent.KEYCODE_FORWARD_DEL, 0x2E); // VK_DELETE
vkmap.put(KeyEvent.KEYCODE_INSERT, 0x2D); // VK_INSERT vkmap.put(KeyEvent.KEYCODE_INSERT, 0x2D); // VK_INSERT
vkmap.put(KeyEvent.KEYCODE_SHIFT_LEFT, 0x10); // VK_SHIFT vkmap.put(KeyEvent.KEYCODE_SHIFT_LEFT, 0x10); // VK_SHIFT
vkmap.put(KeyEvent.KEYCODE_SHIFT_RIGHT, 0x10); // VK_SHIFT // vkmap.put(KeyEvent.KEYCODE_SHIFT_RIGHT, 0x10); // VK_SHIFT
vkmap.put(KeyEvent.KEYCODE_CTRL_LEFT, 0x11); // VK_CONTROL vkmap.put(KeyEvent.KEYCODE_CTRL_LEFT, 0x11); // VK_CONTROL
vkmap.put(KeyEvent.KEYCODE_CTRL_RIGHT, 0x11); // VK_CONTROL // vkmap.put(KeyEvent.KEYCODE_CTRL_RIGHT, 0x11); // VK_CONTROL
vkmap.put(KeyEvent.KEYCODE_ESCAPE, 0x1B); // VK_ESCAPE vkmap.put(KeyEvent.KEYCODE_ESCAPE, 0x1B); // VK_ESCAPE
vkmap.put(KeyEvent.KEYCODE_SPACE, 0x20); // VK_SPACE vkmap.put(KeyEvent.KEYCODE_SPACE, 0x20); // VK_SPACE
vkmap.put(KeyEvent.KEYCODE_DPAD_LEFT, 0x25); // VK_LEFT vkmap.put(KeyEvent.KEYCODE_DPAD_LEFT, 0x25); // VK_LEFT
@ -142,6 +149,7 @@ public class MainScreenView extends PanAndScaleView {
vkmap.put(KeyEvent.KEYCODE_NUMPAD_SUBTRACT, 0x6D); // VK_SUBTRACT vkmap.put(KeyEvent.KEYCODE_NUMPAD_SUBTRACT, 0x6D); // VK_SUBTRACT
vkmap.put(KeyEvent.KEYCODE_MINUS, 0x6D); // VK_SUBTRACT vkmap.put(KeyEvent.KEYCODE_MINUS, 0x6D); // VK_SUBTRACT
vkmap.put(KeyEvent.KEYCODE_NUMPAD_DOT, 0x6E); // VK_DECIMAL vkmap.put(KeyEvent.KEYCODE_NUMPAD_DOT, 0x6E); // VK_DECIMAL
vkmap.put(KeyEvent.KEYCODE_SLASH, 0x6F); // VK_DIVIDE
vkmap.put(KeyEvent.KEYCODE_NUMPAD_DIVIDE, 0x6F); // VK_DIVIDE vkmap.put(KeyEvent.KEYCODE_NUMPAD_DIVIDE, 0x6F); // VK_DIVIDE
// vkmap.put(KeyEvent.KEYCODE_SEMICOLON, 0xBA); // VK_OEM_1 (:);) // vkmap.put(KeyEvent.KEYCODE_SEMICOLON, 0xBA); // VK_OEM_1 (:);)
vkmap.put(KeyEvent.KEYCODE_COMMA, 0xBC); // VK_OEM_COMMA vkmap.put(KeyEvent.KEYCODE_COMMA, 0xBC); // VK_OEM_COMMA
@ -227,7 +235,11 @@ public class MainScreenView extends PanAndScaleView {
@Override @Override
public boolean onKeyDown(int keyCode, KeyEvent event) { public boolean onKeyDown(int keyCode, KeyEvent event) {
if((event.getFlags() & KeyEvent.FLAG_VIRTUAL_HARD_KEY) == 0) { if((event.getFlags() & KeyEvent.FLAG_VIRTUAL_HARD_KEY) == 0) {
Integer windowsKeycode = vkmap.get(keyCode); char pressedKey = (char) event.getUnicodeChar();
Log.d(TAG, "onKeyDown is: " + pressedKey);
Integer windowsKeycode = charmap.get(pressedKey);
if(windowsKeycode == null)
windowsKeycode = vkmap.get(keyCode);
if (windowsKeycode != null) if (windowsKeycode != null)
NativeLib.keyDown(windowsKeycode); NativeLib.keyDown(windowsKeycode);
else else
@ -241,7 +253,11 @@ public class MainScreenView extends PanAndScaleView {
@Override @Override
public boolean onKeyUp(int keyCode, KeyEvent event) { public boolean onKeyUp(int keyCode, KeyEvent event) {
if((event.getFlags() & KeyEvent.FLAG_VIRTUAL_HARD_KEY) == 0) { if((event.getFlags() & KeyEvent.FLAG_VIRTUAL_HARD_KEY) == 0) {
Integer windowsKeycode = vkmap.get(keyCode); char pressedKey = (char) event.getUnicodeChar();
Log.d(TAG, "onKeyUp is: " + pressedKey);
Integer windowsKeycode = charmap.get(pressedKey);
if(windowsKeycode == null)
windowsKeycode = vkmap.get(keyCode);
if (windowsKeycode != null) if (windowsKeycode != null)
NativeLib.keyUp(windowsKeycode); NativeLib.keyUp(windowsKeycode);
else else