Merge branch 'sdl_android' of github.com:pelya/commandergenius into sdl_android

Conflicts:
	project/jni/application/commandergenius/commandergenius

project/jni/application/ballfield/AndroidAppSettings.cfg

@@ -34,7 +34,7 @@ AppUsesMultitouch=y
 AppRecordsAudio=n
 NonBlockingSwapBuffers=n
 RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP SPACE ESCAPE"
-AppTouchscreenKeyboardKeysAmount=6
+AppTouchscreenKeyboardKeysAmount=1
 AppTouchscreenKeyboardKeysAmountAutoFire=0
 RedefinedKeysScreenKb="0 1 2 3 4 5 6 7 8 9"
 RedefinedKeysScreenKbNames="0 1 2 3 4 5 6 7 8 9"

project/jni/application/ballfield/ballfield.cpp

@@ -555,6 +555,14 @@ int main(int argc, char* argv[])
 
 	__android_log_print(ANDROID_LOG_INFO, "Ballfield", "sizeof(int) %d long %d long long %d size_t %d", sizeof(int), sizeof(long), sizeof(long long), sizeof(size_t));
 
+	__android_log_print(ANDROID_LOG_VERBOSE, "Ballfield", "On-screen buttons:");
+	for(i = 0; i < SDL_ANDROID_SCREENKEYBOARD_BUTTON_NUM; i++)
+	{
+		SDL_Rect r;
+		SDL_ANDROID_GetScreenKeyboardButtonPos(i, &r);
+		__android_log_print(ANDROID_LOG_VERBOSE, "Ballfield", "{ %d, %d, %d, %d },", r.x, r.y, r.x+r.h, r.y+r.w);
+	}
+	
 	while(1)
 	{
 		SDL_Rect r;

project/jni/application/openarena/AndroidAppSettings.cfg

@@ -34,7 +34,7 @@ AppUsesMultitouch=y
 AppRecordsAudio=y
 NonBlockingSwapBuffers=n
 RedefinedKeys="SPACE SPACE NO_REMAP NO_REMAP RETURN ESCAPE LCTRL"
-AppTouchscreenKeyboardKeysAmount=5
+AppTouchscreenKeyboardKeysAmount=6
 AppTouchscreenKeyboardKeysAmountAutoFire=0
 RedefinedKeysScreenKb="SLASH BACKSPACE TAB END LCTRL SPACE UNKNOWN UNKNOWN UNKNOWN UNKNOWN"
 RedefinedKeysScreenKbNames="Change_weapon Sniper_view Show_scores Center_view Fire Jump"