diff options
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/SCsub | 2 | ||||
| -rw-r--r-- | platform/android/export/export.cpp | 10 | ||||
| -rw-r--r-- | platform/flash/dir_access_flash.cpp | 4 | ||||
| -rw-r--r-- | platform/javascript/javascript_main.cpp | 19 | ||||
| -rw-r--r-- | platform/javascript/os_javascript.cpp | 6 | ||||
| -rw-r--r-- | platform/javascript/os_javascript.h | 4 | ||||
| -rw-r--r-- | platform/osx/dir_access_osx.mm | 7 | ||||
| -rw-r--r-- | platform/osx/os_osx.mm | 2 | ||||
| -rw-r--r-- | platform/server/detect.py | 1 | ||||
| -rw-r--r-- | platform/x11/joystick_linux.h | 4 |
10 files changed, 47 insertions, 12 deletions
diff --git a/platform/android/SCsub b/platform/android/SCsub index 3d645de38f..fab8458b26 100644 --- a/platform/android/SCsub +++ b/platform/android/SCsub @@ -59,7 +59,7 @@ for x in env.android_dependencies: gradle_java_dirs_text="" for x in env.android_java_dirs: - gradle_java_dirs_text+=",'"+x+"'" + gradle_java_dirs_text+=",'"+x.replace("\\","/")+"'" gradle_res_dirs_text="" diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index d4755f4ed6..6fc78e3264 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -1493,6 +1493,16 @@ void EditorExportPlatformAndroid::_device_poll_thread(void *ud) { OS::get_singleton()->delay_usec(3000000); } + if (EditorSettings::get_singleton()->get("android/shutdown_adb_on_exit")) { + String adb=EditorSettings::get_singleton()->get("android/adb"); + if (!FileAccess::exists(adb)) { + return; //adb not configured + } + + List<String> args; + args.push_back("kill-server"); + OS::get_singleton()->execute(adb,args,true); + }; } Error EditorExportPlatformAndroid::run(int p_device, int p_flags) { diff --git a/platform/flash/dir_access_flash.cpp b/platform/flash/dir_access_flash.cpp index 443242fd99..ce9eed2c59 100644 --- a/platform/flash/dir_access_flash.cpp +++ b/platform/flash/dir_access_flash.cpp @@ -183,12 +183,12 @@ size_t DirAccessFlash::get_space_left() { Error DirAccessFlash::rename(String p_from, String p_to) { - return FAILED; + ERR_FAIL_V(ERR_UNAVAILABLE); }; Error DirAccessFlash::remove(String p_name) { - return FAILED; + ERR_FAIL_V(ERR_UNAVAILABLE); }; extern char* psp_drive; diff --git a/platform/javascript/javascript_main.cpp b/platform/javascript/javascript_main.cpp index e66110b655..632ef2b6b2 100644 --- a/platform/javascript/javascript_main.cpp +++ b/platform/javascript/javascript_main.cpp @@ -74,6 +74,15 @@ static void _glut_skey(bool pressed,int key) { case GLUT_KEY_INSERT: ev.key.scancode=KEY_INSERT; break; } + if (pressed) { + if (os->skey_pressed[key]) + ev.key.echo = true; + else + os->skey_pressed[key] = true; + } + else { + os->skey_pressed[key] = false; + } uint32_t m = glutGetModifiers(); ev.key.mod.alt=(m&GLUT_ACTIVE_ALT)!=0; @@ -107,6 +116,16 @@ static void _glut_key(bool pressed,unsigned char key) { default: { ev.key.unicode=key; } + + if (pressed) { + if (os->key_pressed[key]) + ev.key.echo = true; + else + os->key_pressed[key] = true; + } + else { + os->key_pressed[key] = false; + } } diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp index 562733ab89..413d88ee23 100644 --- a/platform/javascript/os_javascript.cpp +++ b/platform/javascript/os_javascript.cpp @@ -693,7 +693,11 @@ OS_JavaScript::OS_JavaScript(GFXInitFunc p_gfx_init_func,void*p_gfx_init_ud, Ope time_to_save_sync=-1; - + for (int i = 0; i < 256; i++) { + key_pressed[i] = false; + if (i < 121) + skey_pressed[i] = false; + } } OS_JavaScript::~OS_JavaScript() { diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h index ec3a6cf911..4a8265b9d9 100644 --- a/platform/javascript/os_javascript.h +++ b/platform/javascript/os_javascript.h @@ -56,10 +56,12 @@ public: Point2 pos; }; + bool skey_pressed[121]; + bool key_pressed[256]; + private: Vector<TouchPos> touch; - Point2 last_mouse; unsigned int last_id; GFXInitFunc gfx_init_func; diff --git a/platform/osx/dir_access_osx.mm b/platform/osx/dir_access_osx.mm index e345bea60a..29f8fda663 100644 --- a/platform/osx/dir_access_osx.mm +++ b/platform/osx/dir_access_osx.mm @@ -297,8 +297,11 @@ Error DirAccessOSX::rename(String p_path,String p_new_path) { } Error DirAccessOSX::remove(String p_path) { - p_path=fix_path(p_path); - + if (p_path.is_rel_path()) + p_path=get_current_dir().plus_file(p_path); + else + p_path=fix_path(p_path); + struct stat flags; if ((stat(p_path.utf8().get_data(),&flags)!=0)) return FAILED; diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index bb99e6ade7..4b339af6d4 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -813,7 +813,7 @@ static int translateKey(unsigned int key) InputEvent ev; ev.type=InputEvent::MOUSE_BUTTON; - ev.mouse_button.button_index=deltaX >0 ? BUTTON_WHEEL_RIGHT : BUTTON_WHEEL_LEFT; + ev.mouse_button.button_index=deltaX < 0 ? BUTTON_WHEEL_RIGHT : BUTTON_WHEEL_LEFT; ev.mouse_button.pressed=true; ev.mouse_button.x=mouse_x; ev.mouse_button.y=mouse_y; diff --git a/platform/server/detect.py b/platform/server/detect.py index e2d64c6545..15c5982b14 100644 --- a/platform/server/detect.py +++ b/platform/server/detect.py @@ -28,7 +28,6 @@ def get_flags(): return [ ('builtin_zlib', 'no'), - ('theora','no'), #use builtin openssl ] diff --git a/platform/x11/joystick_linux.h b/platform/x11/joystick_linux.h index e433f5e8e3..4f0533721b 100644 --- a/platform/x11/joystick_linux.h +++ b/platform/x11/joystick_linux.h @@ -49,13 +49,11 @@ private: JOYSTICKS_MAX = 16, MAX_ABS = 63, MAX_KEY = 767, // Hack because <linux/input.h> can't be included here - BT_MISC = 256, - HAT_MAX = 4, }; struct Joystick { InputDefault::JoyAxis curr_axis[MAX_ABS]; - int key_map[MAX_KEY - BT_MISC]; + int key_map[MAX_KEY]; int abs_map[MAX_ABS]; int dpad; int fd; |