From 49acc7b115d457b63f01f86903a862bb74736153 Mon Sep 17 00:00:00 2001 From: AShiningRay Date: Thu, 12 Dec 2024 13:46:31 -0300 Subject: [PATCH] Treewide: Make "Nokia/Sony/Samsung" the standard input mapping At least this is far more standard than J2ME Canvas' input maps, and since Canvas was recently rewritten to map each vendor's keys to its own, i don't think there's much use for that old "Standard" mapping anymore. --- src/libretro/freej2me_libretro.c | 13 ++-- src/libretro/freej2me_libretro.h | 44 +++++++------- src/org/recompile/freej2me/AWTGUI.java | 52 +++------------- src/org/recompile/freej2me/Anbu.java | 2 - src/org/recompile/freej2me/Config.java | 8 +-- src/org/recompile/freej2me/FreeJ2ME.java | 2 - src/org/recompile/freej2me/Libretro.java | 22 +++---- src/org/recompile/mobile/Mobile.java | 75 ++++++++---------------- 8 files changed, 72 insertions(+), 146 deletions(-) diff --git a/src/libretro/freej2me_libretro.c b/src/libretro/freej2me_libretro.c index 4c0a5838..90321441 100755 --- a/src/libretro/freej2me_libretro.c +++ b/src/libretro/freej2me_libretro.c @@ -148,7 +148,7 @@ char** params; /* Char matrix containing launch arguments */ unsigned int optstrlen; /* length of the string above */ unsigned long int screenRes[2]; /* {width, height} */ int rotateScreen; /* Acts as a boolean */ -int phoneType; /* 0=J2ME Standard, 1=LG, 2=Motorola/SoftBank, 3=Motorola Triplets... refer to freej2me_libretro.h's "Phone Key Layout" */ +int phoneType = 0; /* 0=Standard (Nokia/Sony/Samsung), 1=LG, 2=Motorola/SoftBank, 3=Motorola Triplets... refer to freej2me_libretro.h's "Phone Key Layout" */ int gameFPS; /* Auto(0), 60, 30, 15 */ int soundEnabled; /* also acts as a boolean */ int customMidi; /* Also acts as a boolean */ @@ -315,16 +315,15 @@ static void check_variables(bool first_time_startup) var.key = "freej2me_phone"; if (Environ(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { - if (!strcmp(var.value, "J2ME Standard")) { phoneType = 0; } + if (!strcmp(var.value, "Nokia/Sony/Samsung")) { phoneType = 0; } else if (!strcmp(var.value, "LG")) { phoneType = 1; } else if (!strcmp(var.value, "Motorola/SoftBank")) { phoneType = 2; } else if (!strcmp(var.value, "Motorola Triplets")) { phoneType = 3; } else if (!strcmp(var.value, "Motorola V8")) { phoneType = 4; } - else if (!strcmp(var.value, "Nokia/Sony/Samsung")) { phoneType = 5; } - else if (!strcmp(var.value, "Nokia Keyboard")) { phoneType = 6; } - else if (!strcmp(var.value, "Sagem")) { phoneType = 7; } - else if (!strcmp(var.value, "Siemens")) { phoneType = 8; } - else if (!strcmp(var.value, "Siemens Old")) { phoneType = 9; } + else if (!strcmp(var.value, "Nokia Keyboard")) { phoneType = 5; } + else if (!strcmp(var.value, "Sagem")) { phoneType = 6; } + else if (!strcmp(var.value, "Siemens")) { phoneType = 7; } + else if (!strcmp(var.value, "Siemens Old")) { phoneType = 8; } } diff --git a/src/libretro/freej2me_libretro.h b/src/libretro/freej2me_libretro.h index b7a725f5..97d00c04 100644 --- a/src/libretro/freej2me_libretro.h +++ b/src/libretro/freej2me_libretro.h @@ -171,19 +171,18 @@ struct retro_core_option_v2_definition core_options[] = "Due to the different mobile phone manufacturers on the J2ME space, it's usual to have some games expecting a certain phone's key layout like Nokia's for example. If a game is not responding to the inputs correctly, try changing this option.", "system_settings", { - { "J2ME Standard", NULL }, - { "LG", NULL }, - { "Motorola/SoftBank", NULL }, - { "Motorola Triplets", NULL }, - { "Motorola V8", NULL }, - { "Nokia/Sony/Samsung", NULL }, - { "Nokia Keyboard", NULL }, - { "Sagem", NULL }, - { "Siemens", NULL }, - { "Siemens Old", NULL }, + { "LG", NULL }, + { "Motorola/SoftBank", NULL }, + { "Motorola Triplets", NULL }, + { "Motorola V8", NULL }, + { "Nokia/Sony/Samsung (Standard)", NULL }, + { "Nokia Keyboard", NULL }, + { "Sagem", NULL }, + { "Siemens", NULL }, + { "Siemens Old", NULL }, { NULL, NULL }, }, - "J2ME Standard" + "Nokia/Sony/Samsung (Standard)" }, { "freej2me_fps", @@ -463,19 +462,18 @@ struct retro_core_option_definition core_options_v1 [] = "Phone Key Layout", "Due to the different mobile phone manufacturers on the J2ME space, it's usual to have some games expecting a certain phone's key layout like Nokia's for example. If a game is not responding to the inputs correctly, try changing this option.", { - { "J2ME Standard", NULL }, - { "LG", NULL }, - { "Motorola/SoftBank", NULL }, - { "Motorola Triplets", NULL }, - { "Motorola V8", NULL }, - { "Nokia/Sony/Samsung", NULL }, - { "Nokia Keyboard", NULL }, - { "Sagem", NULL }, - { "Siemens", NULL }, - { "Siemens Old", NULL }, + { "LG", NULL }, + { "Motorola/SoftBank", NULL }, + { "Motorola Triplets", NULL }, + { "Motorola V8", NULL }, + { "Nokia/Sony/Samsung (Standard)", NULL }, + { "Nokia Keyboard", NULL }, + { "Sagem", NULL }, + { "Siemens", NULL }, + { "Siemens Old", NULL }, { NULL, NULL }, }, - "J2ME Standard" + "Nokia/Sony/Samsung (Standard)" }, { "freej2me_fps", @@ -667,7 +665,7 @@ static const struct retro_variable vars[] = }, { /* Phone Control Type */ "freej2me_phone", - "Phone Key Layout; J2ME Standard|LG|Motorola/SoftBank|Motorola Triplets|Motorola V8|Nokia/Sony/Samsung|Nokia Keyboard|Sagem|Siemens|Siemens Old" + "Phone Key Layout; Nokia/Sony/Samsung (Standard)|LG|Motorola/SoftBank|Motorola Triplets|Motorola V8|Nokia Keyboard|Sagem|Siemens|Siemens Old" }, { /* Game FPS limit */ "freej2me_fps", diff --git a/src/org/recompile/freej2me/AWTGUI.java b/src/org/recompile/freej2me/AWTGUI.java index 5d116092..8d2c73cc 100644 --- a/src/org/recompile/freej2me/AWTGUI.java +++ b/src/org/recompile/freej2me/AWTGUI.java @@ -156,12 +156,11 @@ public final class AWTGUI final CheckboxMenuItem enableRotation = new CheckboxMenuItem("Rotate Screen", false); final CheckboxMenuItem useCustomMidi = new CheckboxMenuItem("Use custom midi soundfont", false); - final CheckboxMenuItem stdLayout = new CheckboxMenuItem("J2ME Standard", true); final CheckboxMenuItem lgLayout = new CheckboxMenuItem("LG", false); final CheckboxMenuItem motorolaLayout = new CheckboxMenuItem("Motorola/SoftBank", false); final CheckboxMenuItem motov8Layout = new CheckboxMenuItem("Motorola V8", false); final CheckboxMenuItem tripletsLayout = new CheckboxMenuItem("Motorola Triplets", false); - final CheckboxMenuItem nokiaLayout = new CheckboxMenuItem("Nokia/Sony/Samsung", false); + final CheckboxMenuItem stdLayout = new CheckboxMenuItem("Nokia/Sony/Samsung (Standard)", true); final CheckboxMenuItem nokiaKbLayout = new CheckboxMenuItem("Nokia Keyboard", false); final CheckboxMenuItem sagemLayout = new CheckboxMenuItem("Sagem", false); final CheckboxMenuItem siemensLayout = new CheckboxMenuItem("Siemens", false); @@ -441,29 +440,6 @@ public void itemStateChanged(ItemEvent e) motorolaLayout.setState(false); motov8Layout.setState(false); tripletsLayout.setState(false); - nokiaLayout.setState(false); - nokiaKbLayout.setState(false); - sagemLayout.setState(false); - siemensLayout.setState(false); - siemensOldLayout.setState(false); - hasPendingChange = true; - } - } - }); - - nokiaLayout.addItemListener(new ItemListener() - { - public void itemStateChanged(ItemEvent e) - { - if(!nokiaLayout.getState()){ nokiaLayout.setState(true); } - if(nokiaLayout.getState()) - { - config.updatePhone("Nokia"); - stdLayout.setState(false); - lgLayout.setState(false); - motorolaLayout.setState(false); - motov8Layout.setState(false); - tripletsLayout.setState(false); nokiaKbLayout.setState(false); sagemLayout.setState(false); siemensLayout.setState(false); @@ -481,12 +457,11 @@ public void itemStateChanged(ItemEvent e) if(nokiaKbLayout.getState()) { config.updatePhone("NokiaKeyboard"); - stdLayout.setState(false); lgLayout.setState(false); motorolaLayout.setState(false); motov8Layout.setState(false); tripletsLayout.setState(false); - nokiaLayout.setState(false); + stdLayout.setState(false); sagemLayout.setState(false); siemensLayout.setState(false); siemensOldLayout.setState(false); @@ -503,12 +478,11 @@ public void itemStateChanged(ItemEvent e) if(siemensLayout.getState()) { config.updatePhone("Siemens"); - stdLayout.setState(false); lgLayout.setState(false); motorolaLayout.setState(false); motov8Layout.setState(false); tripletsLayout.setState(false); - nokiaLayout.setState(false); + stdLayout.setState(false); nokiaKbLayout.setState(false); sagemLayout.setState(false); siemensOldLayout.setState(false); @@ -525,11 +499,10 @@ public void itemStateChanged(ItemEvent e) if(motorolaLayout.getState()) { config.updatePhone("Motorola"); - stdLayout.setState(false); lgLayout.setState(false); motov8Layout.setState(false); tripletsLayout.setState(false); - nokiaLayout.setState(false); + stdLayout.setState(false); nokiaKbLayout.setState(false); sagemLayout.setState(false); siemensLayout.setState(false); @@ -547,11 +520,10 @@ public void itemStateChanged(ItemEvent e) if(lgLayout.getState()) { config.updatePhone("LG"); - stdLayout.setState(false); motorolaLayout.setState(false); motov8Layout.setState(false); tripletsLayout.setState(false); - nokiaLayout.setState(false); + stdLayout.setState(false); nokiaKbLayout.setState(false); sagemLayout.setState(false); siemensLayout.setState(false); @@ -569,11 +541,10 @@ public void itemStateChanged(ItemEvent e) if(motov8Layout.getState()) { config.updatePhone("MotoV8"); - stdLayout.setState(false); lgLayout.setState(false); motorolaLayout.setState(false); tripletsLayout.setState(false); - nokiaLayout.setState(false); + stdLayout.setState(false); nokiaKbLayout.setState(false); sagemLayout.setState(false); siemensLayout.setState(false); @@ -591,11 +562,10 @@ public void itemStateChanged(ItemEvent e) if(tripletsLayout.getState()) { config.updatePhone("MotoTriplets"); - stdLayout.setState(false); lgLayout.setState(false); motov8Layout.setState(false); motorolaLayout.setState(false); - nokiaLayout.setState(false); + stdLayout.setState(false); nokiaKbLayout.setState(false); sagemLayout.setState(false); siemensLayout.setState(false); @@ -613,11 +583,10 @@ public void itemStateChanged(ItemEvent e) if(sagemLayout.getState()) { config.updatePhone("Sagem"); - stdLayout.setState(false); lgLayout.setState(false); motov8Layout.setState(false); motorolaLayout.setState(false); - nokiaLayout.setState(false); + stdLayout.setState(false); nokiaKbLayout.setState(false); tripletsLayout.setState(false); siemensLayout.setState(false); @@ -635,11 +604,10 @@ public void itemStateChanged(ItemEvent e) if(siemensOldLayout.getState()) { config.updatePhone("SiemensOld"); - stdLayout.setState(false); lgLayout.setState(false); motov8Layout.setState(false); motorolaLayout.setState(false); - nokiaLayout.setState(false); + stdLayout.setState(false); nokiaKbLayout.setState(false); tripletsLayout.setState(false); siemensLayout.setState(false); @@ -958,7 +926,6 @@ private void buildMenuBar() phoneType.add(motorolaLayout); phoneType.add(tripletsLayout); phoneType.add(motov8Layout); - phoneType.add(nokiaLayout); phoneType.add(nokiaKbLayout); phoneType.add(sagemLayout); phoneType.add(siemensLayout); @@ -994,7 +961,6 @@ public void updateOptions() fpsCap60.setState(config.settings.get("fps").equals("60")); stdLayout.setState(config.settings.get("phone").equals("Standard")); - nokiaLayout.setState(config.settings.get("phone").equals("Nokia")); siemensLayout.setState(config.settings.get("phone").equals("Siemens")); siemensOldLayout.setState(config.settings.get("phone").equals("SiemensOld")); motov8Layout.setState(config.settings.get("phone").equals("MotoV8")); diff --git a/src/org/recompile/freej2me/Anbu.java b/src/org/recompile/freej2me/Anbu.java index 46d398a1..fb61e1c4 100644 --- a/src/org/recompile/freej2me/Anbu.java +++ b/src/org/recompile/freej2me/Anbu.java @@ -742,7 +742,6 @@ void settingsChanged() Mobile.motorola = false; Mobile.motoTriplets = false; Mobile.motoV8 = false; - Mobile.nokia = false; Mobile.nokiaKeyboard = false; Mobile.sagem = false; Mobile.siemens = false; @@ -750,7 +749,6 @@ void settingsChanged() if(phone.equals("Motorola")) { Mobile.motorola = true;} if(phone.equals("MotoTriplets")) { Mobile.motoTriplets = true;} if(phone.equals("MotoV8")) { Mobile.motoV8 = true;} - if(phone.equals("Nokia")) { Mobile.nokia = true;} if(phone.equals("NokiaKeyboard")) { Mobile.nokiaKeyboard = true;} if(phone.equals("Sagem")) { Mobile.sagem = true;} if(phone.equals("Siemens")) { Mobile.siemens = true;} diff --git a/src/org/recompile/freej2me/Config.java b/src/org/recompile/freej2me/Config.java index a7b5f6a7..171cdef6 100644 --- a/src/org/recompile/freej2me/Config.java +++ b/src/org/recompile/freej2me/Config.java @@ -120,12 +120,8 @@ public void init() parts[1] = parts[1].trim(); if(parts[0]!="" && parts[1]!="") { - //Compatibility with the deprecated "nokia" boolean setting - if(parts[0].equals("nokia")) - { - parts[0] = "phone"; - if(parts[1].equals("on")) { parts[1] = "Nokia"; } else { parts[0] = "Standard"; } - } + // Compatibility with the deprecated "Nokia" input mapping, which is now the Standard mapping (as Canvas was reworked to not need J2ME's default mappings) + if(parts[0].equals("phone") && parts[1].equals("Nokia") ) { parts[1] = "Standard"; } settings.put(parts[0], parts[1]); } } diff --git a/src/org/recompile/freej2me/FreeJ2ME.java b/src/org/recompile/freej2me/FreeJ2ME.java index fd558436..7176654f 100644 --- a/src/org/recompile/freej2me/FreeJ2ME.java +++ b/src/org/recompile/freej2me/FreeJ2ME.java @@ -366,7 +366,6 @@ private void settingsChanged() Mobile.motorola = false; Mobile.motoTriplets = false; Mobile.motoV8 = false; - Mobile.nokia = false; Mobile.nokiaKeyboard = false; Mobile.sagem = false; Mobile.siemens = false; @@ -375,7 +374,6 @@ private void settingsChanged() if(phone.equals("Motorola")) { Mobile.motorola = true;} if(phone.equals("MotoTriplets")) { Mobile.motoTriplets = true;} if(phone.equals("MotoV8")) { Mobile.motoV8 = true;} - if(phone.equals("Nokia")) { Mobile.nokia = true;} if(phone.equals("NokiaKeyboard")) { Mobile.nokiaKeyboard = true;} if(phone.equals("Sagem")) { Mobile.sagem = true;} if(phone.equals("Siemens")) { Mobile.siemens = true;} diff --git a/src/org/recompile/freej2me/Libretro.java b/src/org/recompile/freej2me/Libretro.java index f201a0a6..ebb85f45 100644 --- a/src/org/recompile/freej2me/Libretro.java +++ b/src/org/recompile/freej2me/Libretro.java @@ -104,7 +104,6 @@ public Libretro(String args[]) Mobile.motorola = false; Mobile.motoTriplets = false; Mobile.motoV8 = false; - Mobile.nokia = false; Mobile.nokiaKeyboard = false; Mobile.sagem = false; Mobile.siemens = false; @@ -114,11 +113,10 @@ public Libretro(String args[]) else if(Integer.parseInt(args[3]) == 2) { Mobile.motorola = true; } else if(Integer.parseInt(args[3]) == 3) { Mobile.motoTriplets = true; } else if(Integer.parseInt(args[3]) == 4) { Mobile.motoV8 = true; } - else if(Integer.parseInt(args[3]) == 5) { Mobile.nokia = true; } - else if(Integer.parseInt(args[3]) == 6) { Mobile.nokiaKeyboard = true; } - else if(Integer.parseInt(args[3]) == 7) { Mobile.sagem = true; } - else if(Integer.parseInt(args[3]) == 8) { Mobile.siemens = true; } - else if(Integer.parseInt(args[3]) == 9) { Mobile.siemensold = true; } + else if(Integer.parseInt(args[3]) == 5) { Mobile.nokiaKeyboard = true; } + else if(Integer.parseInt(args[3]) == 6) { Mobile.sagem = true; } + else if(Integer.parseInt(args[3]) == 7) { Mobile.siemens = true; } + else if(Integer.parseInt(args[3]) == 8) { Mobile.siemensold = true; } Mobile.limitFPS = Integer.parseInt(args[4]); @@ -285,7 +283,6 @@ public void run() else if(Mobile.motorola) { config.settings.put("phone", "Motorola"); } else if(Mobile.motoTriplets) { config.settings.put("phone", "MotoTriplets"); } else if(Mobile.motoV8) { config.settings.put("phone", "MotoV8"); } - else if(Mobile.nokia) { config.settings.put("phone", "Nokia"); } else if(Mobile.nokiaKeyboard) { config.settings.put("phone", "NokiaKeyboard"); } else if(Mobile.sagem) { config.settings.put("phone", "Sagem"); } else if(Mobile.siemens) { config.settings.put("phone", "Siemens"); } @@ -353,11 +350,10 @@ public void run() if(Integer.parseInt(cfgtokens[4])==2) { config.settings.put("phone", "Motorola"); } if(Integer.parseInt(cfgtokens[4])==3) { config.settings.put("phone", "MotoTriplets"); } if(Integer.parseInt(cfgtokens[4])==4) { config.settings.put("phone", "MotoV8"); } - if(Integer.parseInt(cfgtokens[4])==5) { config.settings.put("phone", "Nokia"); } - if(Integer.parseInt(cfgtokens[4])==6) { config.settings.put("phone", "NokiaKeyboard"); } - if(Integer.parseInt(cfgtokens[4])==7) { config.settings.put("phone", "Sagem"); } - if(Integer.parseInt(cfgtokens[4])==8) { config.settings.put("phone", "Siemens"); } - if(Integer.parseInt(cfgtokens[4])==9) { config.settings.put("phone", "SiemensOld"); } + if(Integer.parseInt(cfgtokens[4])==5) { config.settings.put("phone", "NokiaKeyboard"); } + if(Integer.parseInt(cfgtokens[4])==6) { config.settings.put("phone", "Sagem"); } + if(Integer.parseInt(cfgtokens[4])==7) { config.settings.put("phone", "Siemens"); } + if(Integer.parseInt(cfgtokens[4])==8) { config.settings.put("phone", "SiemensOld"); } config.settings.put("fps", ""+cfgtokens[5]); @@ -449,7 +445,6 @@ private void settingsChanged() Mobile.motorola = false; Mobile.motoTriplets = false; Mobile.motoV8 = false; - Mobile.nokia = false; Mobile.nokiaKeyboard = false; Mobile.sagem = false; Mobile.siemens = false; @@ -458,7 +453,6 @@ private void settingsChanged() if(phone.equals("Motorola")) { Mobile.motorola = true;} if(phone.equals("MotoTriplets")) { Mobile.motoTriplets = true;} if(phone.equals("MotoV8")) { Mobile.motoV8 = true;} - if(phone.equals("Nokia")) { Mobile.nokia = true;} if(phone.equals("NokiaKeyboard")) { Mobile.nokiaKeyboard = true;} if(phone.equals("Sagem")) { Mobile.sagem = true;} if(phone.equals("Siemens")) { Mobile.siemens = true;} diff --git a/src/org/recompile/mobile/Mobile.java b/src/org/recompile/mobile/Mobile.java index 07234b6e..09cd6a42 100644 --- a/src/org/recompile/mobile/Mobile.java +++ b/src/org/recompile/mobile/Mobile.java @@ -64,7 +64,6 @@ public class Mobile public static boolean motorola = false; public static boolean motoV8 = false; public static boolean motoTriplets = false; - public static boolean nokia = false; public static boolean nokiaKeyboard = false; public static boolean sagem = false; public static boolean siemens = false; @@ -283,19 +282,6 @@ public static final int getMobileKey(int keycode, boolean isLibretro) case 9: return MOTOV8_SOFT1; // Select } } - if(nokia) - { - switch(keycode) - { - case 0: return NOKIA_UP; // Up - case 1: return NOKIA_DOWN; // Down - case 2: return NOKIA_LEFT; // Left - case 3: return NOKIA_RIGHT; // Right - case 7: return NOKIA_SOFT3; // Y - case 8: return NOKIA_SOFT2; // Start - case 9: return NOKIA_SOFT1; // Select - } - } if(nokiaKeyboard) { switch(keycode) @@ -356,18 +342,18 @@ public static final int getMobileKey(int keycode, boolean isLibretro) case 9: return SIEMENS_SOFT1; // Select } } - - // J2ME Canvas standard keycodes, to match against any keys not covered above. + + // J2ME Canvas standard keycodes (not exactly standard, just the most common mappings), to match against any keys not covered above. switch(keycode) { - case 0: return GAME_UP; // Up - case 1: return GAME_DOWN; // Down - case 2: return GAME_LEFT; // Left - case 3: return GAME_RIGHT; // Right + case 0: return NOKIA_UP; // Up + case 1: return NOKIA_DOWN; // Down + case 2: return NOKIA_LEFT; // Left + case 3: return NOKIA_RIGHT; // Right case 4: return KEY_NUM9; // A case 5: return KEY_NUM7; // B case 6: return KEY_NUM0; // X - case 7: return GAME_FIRE; // Y + case 7: return NOKIA_SOFT3; // Y case 8: return NOKIA_SOFT2; // Start case 9: return NOKIA_SOFT1; // Select case 10: return KEY_NUM1; // L @@ -432,15 +418,6 @@ public static final int getGameAction(int keycode) case MOTOV8_FIRE: return Canvas.FIRE; // Y } } - if (nokia) { - switch (keycode) { - case NOKIA_UP: return Canvas.UP; // Up - case NOKIA_DOWN: return Canvas.DOWN; // Down - case NOKIA_LEFT: return Canvas.LEFT; // Left - case NOKIA_RIGHT: return Canvas.RIGHT; // Right - case NOKIA_SOFT3: return Canvas.FIRE; // Y - } - } if (nokiaKeyboard) { switch (keycode) @@ -486,27 +463,27 @@ public static final int getGameAction(int keycode) case SIEMENS_FIRE: return Canvas.FIRE; // Y } } - + // J2ME Canvas standard keycodes, to match against any keys not covered above (Canvas does not handle left/right soft keys). - switch (keycode) // This can probably be turned into a single 'return Canvas.getKeyCode(keycode)'' + switch (keycode) // TODO: This can probably be turned into a single 'return Canvas.getKeyCode(keycode)'' { - case GAME_UP: return Canvas.UP; - case GAME_DOWN: return Canvas.DOWN; - case GAME_LEFT: return Canvas.LEFT; - case GAME_RIGHT: return Canvas.RIGHT; - case KEY_NUM2: return Canvas.KEY_NUM2; - case KEY_NUM8: return Canvas.KEY_NUM8; - case KEY_NUM4: return Canvas.KEY_NUM4; - case KEY_NUM6: return Canvas.KEY_NUM6; - case KEY_NUM9: return Canvas.KEY_NUM9; - case KEY_NUM7: return Canvas.KEY_NUM7; - case KEY_NUM5: return Canvas.KEY_NUM5; - case KEY_NUM1: return Canvas.KEY_NUM1; - case KEY_NUM3: return Canvas.KEY_NUM3; - case KEY_NUM0: return Canvas.KEY_NUM0; - case KEY_STAR: return Canvas.KEY_STAR; + case NOKIA_UP: return Canvas.UP; + case NOKIA_DOWN: return Canvas.DOWN; + case NOKIA_LEFT: return Canvas.LEFT; + case NOKIA_RIGHT: return Canvas.RIGHT; + case KEY_NUM2: return Canvas.KEY_NUM2; + case KEY_NUM8: return Canvas.KEY_NUM8; + case KEY_NUM4: return Canvas.KEY_NUM4; + case KEY_NUM6: return Canvas.KEY_NUM6; + case KEY_NUM9: return Canvas.KEY_NUM9; + case KEY_NUM7: return Canvas.KEY_NUM7; + case KEY_NUM5: return Canvas.KEY_NUM5; + case KEY_NUM1: return Canvas.KEY_NUM1; + case KEY_NUM3: return Canvas.KEY_NUM3; + case KEY_NUM0: return Canvas.KEY_NUM0; + case KEY_STAR: return Canvas.KEY_STAR; case KEY_POUND: return Canvas.KEY_POUND; - case GAME_FIRE: return Canvas.FIRE; + case NOKIA_SOFT3: return Canvas.FIRE; } // If a matching key wasn't found, return 0; @@ -537,7 +514,7 @@ public static final void log(byte logLevel, String text) } // Log to console only if not libretro, as it won't be seen there anyway - if(!getPlatform().isLibretro) { System.out.println(text); } + if(!MobilePlatform.isLibretro) { System.out.println(text); } File logFile = new File(LOG_FILE);