[Scummvm-git-logs] scummvm master -> 97bc65e82f0f9efeb07d84a876ee2fd7f9b24780

sev- sev at scummvm.org
Tue Oct 25 19:43:54 CEST 2016 

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a0c2fca8e4 ANDROIDSDL: back button re-mapped to F13 keycode. F13 keycode assigned to call scummvm in-game menu. CONTROL key now can
55f37714ca ANDROIDSDL: default storage-sdcard directory location getting direct from libSDL wrapper
97bc65e82f Merge pull request #854 from lubomyr/master


Commit: a0c2fca8e4d20480d6cca002240c4cbaccd181ee
    https://github.com/scummvm/scummvm/commit/a0c2fca8e4d20480d6cca002240c4cbaccd181ee
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2016-10-23T14:00:25+03:00

Commit Message:
ANDROIDSDL: back button re-mapped to F13 keycode. F13 keycode assigned to call scummvm in-game menu. CONTROL key now can be uses with games

Changed paths:
    backends/events/androidsdl/androidsdl-events.cpp
    dists/androidsdl/scummvm/AndroidAppSettings.cfg
    dists/androidsdl/scummvm/AndroidAppSettings.cfg.in



diff --git a/backends/events/androidsdl/androidsdl-events.cpp b/backends/events/androidsdl/androidsdl-events.cpp
index c8a730a..0adcff8 100644
--- a/backends/events/androidsdl/androidsdl-events.cpp
+++ b/backends/events/androidsdl/androidsdl-events.cpp
@@ -66,9 +66,8 @@ bool AndroidSdlEventSource::handleMouseButtonDown(SDL_Event &ev, Common::Event &
 bool AndroidSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 	if (false) {}
 
-	if (ev.key.keysym.sym == SDLK_LCTRL) {
-		event.type = Common::EVENT_KEYDOWN;
-		event.kbd.keycode = Common::KEYCODE_F5;
+	if (ev.key.keysym.sym == SDLK_F13) {
+		event.type = Common::EVENT_MAINMENU;
 		return true;
 	} else {
 		// Let the events fall through if we didn't change them, this may not be the best way to
diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg b/dists/androidsdl/scummvm/AndroidAppSettings.cfg
index a4db290..c9b555b 100644
--- a/dists/androidsdl/scummvm/AndroidAppSettings.cfg
+++ b/dists/androidsdl/scummvm/AndroidAppSettings.cfg
@@ -125,7 +125,7 @@ NonBlockingSwapBuffers=n
 # SEARCH and CALL by default return same keycode as DPAD_CENTER - one of those keys is available on most devices
 # Use word NO_REMAP if you want to preserve native functionality for certain key (volume keys are 3-rd and 4-th)
 # Keys: TOUCHSCREEN (works only when AppUsesMouse=n), DPAD_CENTER/SEARCH, VOLUMEUP, VOLUMEDOWN, MENU, BACK, CAMERA
-RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP ESCAPE LCTRL F7 F4 F2 MOUSE_LEFT"
+RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP ESCAPE F13 F7 F4 F2 MOUSE_LEFT"
 
 # Number of virtual keyboard keys (currently 6 is maximum)
 AppTouchscreenKeyboardKeysAmount=0
@@ -134,10 +134,10 @@ AppTouchscreenKeyboardKeysAmount=0
 AppTouchscreenKeyboardKeysAmountAutoFire=0
 
 # Redefine on-screen keyboard keys to SDL keysyms - 6 keyboard keys + 4 multitouch gestures (zoom in/out and rotate left/right)
-RedefinedKeysScreenKb="MOUSE_RIGHT F7 LCTRL"
+RedefinedKeysScreenKb="MOUSE_RIGHT F7 F13"
 
 # Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu
-RedefinedKeysScreenKbNames="MOUSE_RIGHT F7 LCTRL"
+RedefinedKeysScreenKbNames="MOUSE_RIGHT F7 F13"
 
 # On-screen keys theme
 # 0 = Ultimate Droid by Sean Stieber (green, with gamepad joystick)
@@ -148,7 +148,7 @@ TouchscreenKeysTheme=1
 
 # Redefine gamepad keys to SDL keysyms, button order is:
 # A B X Y L1 R1 L2 R2 LThumb RThumb
-RedefinedKeysGamepad="MOUSE_RIGHT F7 LCTRL ESCAPE F5 SPACE RETURN MOUSE_LEFT"
+RedefinedKeysGamepad="MOUSE_RIGHT F7 F13 ESCAPE F5 SPACE RETURN MOUSE_LEFT"
 
 # How long to show startup menu button, in msec, 0 to disable startup menu
 StartupMenuButtonTimeout=3000
diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in b/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in
index dea6027..59bb429 100644
--- a/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in
+++ b/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in
@@ -125,7 +125,7 @@ NonBlockingSwapBuffers=n
 # SEARCH and CALL by default return same keycode as DPAD_CENTER - one of those keys is available on most devices
 # Use word NO_REMAP if you want to preserve native functionality for certain key (volume keys are 3-rd and 4-th)
 # Keys: TOUCHSCREEN (works only when AppUsesMouse=n), DPAD_CENTER/SEARCH, VOLUMEUP, VOLUMEDOWN, MENU, BACK, CAMERA
-RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP ESCAPE LCTRL F7 F4 F2 MOUSE_LEFT"
+RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP ESCAPE F13 F7 F4 F2 MOUSE_LEFT"
 
 # Number of virtual keyboard keys (currently 6 is maximum)
 AppTouchscreenKeyboardKeysAmount=0
@@ -134,10 +134,10 @@ AppTouchscreenKeyboardKeysAmount=0
 AppTouchscreenKeyboardKeysAmountAutoFire=0
 
 # Redefine on-screen keyboard keys to SDL keysyms - 6 keyboard keys + 4 multitouch gestures (zoom in/out and rotate left/right)
-RedefinedKeysScreenKb="MOUSE_RIGHT F7 LCTRL"
+RedefinedKeysScreenKb="MOUSE_RIGHT F7 F13"
 
 # Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu
-RedefinedKeysScreenKbNames="MOUSE_RIGHT F7 LCTRL"
+RedefinedKeysScreenKbNames="MOUSE_RIGHT F7 F13"
 
 # On-screen keys theme
 # 0 = Ultimate Droid by Sean Stieber (green, with gamepad joystick)
@@ -148,7 +148,7 @@ TouchscreenKeysTheme=1
 
 # Redefine gamepad keys to SDL keysyms, button order is:
 # A B X Y L1 R1 L2 R2 LThumb RThumb
-RedefinedKeysGamepad="MOUSE_RIGHT F7 LCTRL ESCAPE F5 SPACE RETURN MOUSE_LEFT"
+RedefinedKeysGamepad="MOUSE_RIGHT F7 F13 ESCAPE F5 SPACE RETURN MOUSE_LEFT"
 
 # How long to show startup menu button, in msec, 0 to disable startup menu
 StartupMenuButtonTimeout=3000


Commit: 55f37714cad5d990340b7fd2a9d4db4cba66d55c
    https://github.com/scummvm/scummvm/commit/55f37714cad5d990340b7fd2a9d4db4cba66d55c
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2016-10-23T14:07:15+03:00

Commit Message:
ANDROIDSDL: default storage-sdcard directory location getting direct from libSDL wrapper

Changed paths:
    backends/platform/androidsdl/androidsdl-sdl.cpp



diff --git a/backends/platform/androidsdl/androidsdl-sdl.cpp b/backends/platform/androidsdl/androidsdl-sdl.cpp
index 3d0429e..d045124 100644
--- a/backends/platform/androidsdl/androidsdl-sdl.cpp
+++ b/backends/platform/androidsdl/androidsdl-sdl.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_getenv(a)
+
 #include "common/config-manager.h"
 
 #include "backends/platform/androidsdl/androidsdl-sdl.h"
@@ -36,7 +38,7 @@ void OSystem_ANDROIDSDL::initBackend() {
 		_graphicsManager = new AndroidSdlGraphicsManager(_eventSource, _window);
 
 	if (!ConfMan.hasKey("browser_lastpath"))
-		ConfMan.set("browser_lastpath", "/storage");
+		ConfMan.set("browser_lastpath", getenv("SDCARD"));
 
 	if (!ConfMan.hasKey("gfx_mode"))
 		ConfMan.set("gfx_mode", "2x");


Commit: 97bc65e82f0f9efeb07d84a876ee2fd7f9b24780
    https://github.com/scummvm/scummvm/commit/97bc65e82f0f9efeb07d84a876ee2fd7f9b24780
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-10-25T19:43:50+02:00

Commit Message:
Merge pull request #854 from lubomyr/master

ANDROIDSDL: Changed logic for back button & getting sdcard storage location

Changed paths:
    backends/events/androidsdl/androidsdl-events.cpp
    backends/platform/androidsdl/androidsdl-sdl.cpp
    dists/androidsdl/scummvm/AndroidAppSettings.cfg
    dists/androidsdl/scummvm/AndroidAppSettings.cfg.in

More information about the Scummvm-git-logs mailing list