Commit Graph

255 Commits

Author SHA1 Message Date
twinaphex 5c16cff2e7 Merge branch 'android-rgui' of https://github.com/Themaister/RetroArch into android-rgui
Conflicts:
	android/native/jni/input_android.c
2013-03-04 17:00:43 +01:00
twinaphex c2a78e86d1 (Android) Check explicitly for either LOOPER_ID_INPUT or LOOPER_ID_MAIN
in anroid_input_poll
2013-03-04 16:15:58 +01:00
twinaphex 2e68c61ea6 (Android) Make engine_handle_input a part of android_input_poll 2013-03-04 15:52:09 +01:00
twinaphex 1124ac8494 Make android_handle_events an implementation of input_poll function -
rely on HAVE_ASYNC_POLL whether or not input_async_poll_func or
input_poll_func is 'blanked out'
2013-03-04 14:12:04 +01:00
twinaphex e1d02ba837 (Android) Make function pointer engine_handle_dpad - use AMotionEven_getAxisValue
if we can use it (on Android 4.0 and up)
2013-03-04 11:18:22 +01:00
twinaphex 7fbe742d3d (Android) Dpad deadzones now configurable per pad 2013-03-04 02:19:11 +01:00
twinaphex b236fb47bf (Android) Better pad directional macros 2013-03-04 00:08:55 +01:00
twinaphex d79d15c79d (Android) Add AMotionEvent_getAxisValue dlsym hack - wll properly make
this suitable for Android 4.0 and up later
2013-03-03 23:17:16 +01:00
twinaphex 0f16bddb02 (Android) Try to do engine_handle_input more or less exactly like
this (xcept for 'predispatch events' which caused issues on Xperia
Play apparently) - http://ps3computing.blogspot.nl/2012/12/anr-application-not-responding.html
2013-03-03 20:57:14 +01:00
twinaphex afa04bd376 (Android) Make engine_handle_input inline 2013-03-03 20:45:13 +01:00
twinaphex ebd8b29399 (Android) Move android_handle_event to input_android.c 2013-03-03 20:17:00 +01:00
twinaphex 38ca77a8eb (Android) Nit 2013-03-03 13:27:26 +01:00
twinaphex 28c9f51913 (Android) Rewrite new input code some more 2013-03-03 11:22:59 +01:00
twinaphex ec114db356 (Android) Reimplemented input loop - better throughput/latency 2013-03-02 23:53:06 +01:00
twinaphex ff88dc759c (Android) Start moving most input code to input_android.c - split
up main input logic into engine_handle_input
2013-03-02 22:56:58 +01:00
twinaphex 857609b739 (Android) Solves ANR issues on Xperia Play after 30 secs 2013-03-02 22:11:09 +01:00
twinaphex 0c87437ea3 (Android) Fixes menu back button again on Xperia Play 2013-03-02 18:37:52 +01:00
twinaphex c65e85f3df (Android) Try to prevent race condition causing ANRs when two input devices
are being pressed at the same time - see http://ps3computing.blogspot.nl/2012/12/anr-application-not-responding.html
2013-03-02 16:47:13 +01:00
twinaphex 2d4d9d181e (Android) Add explicit runtime hack for Xperia Play so that
AKEYCODE_BACK behavior is not contingent on AKeyMeta (which
could produce problems on other pads). Hopefully should fix
some issues
2013-03-02 11:27:24 +01:00
ToadKing d28cb94717 start of RGUI port to Android
currently detects menu button to bring up RGUI, but GL does not draw it
yet and you cannot exit from the (invisible) RGUI menu yet
2013-02-27 20:20:29 -05:00
twinaphex 19fae3f52f (Android) Ability to use AKEYCODE_BACK for pads 2013-02-13 17:56:39 +01:00
ToadKing b03f1bc950 (Android) fix potential segfault 2013-02-10 18:59:24 -05:00
ToadKing 18d30fb441 (Android) fix up motion events incorrectly removing every active motion event 2013-02-10 18:52:46 -05:00
Themaister bdd67f1a3f (Android) Fix build breakage. 2013-02-05 21:55:20 +01:00
twinaphex bdf74174f1 (Android) Quick fix for input - bump up version to r10 2013-02-05 18:00:16 +01:00
twinaphex d80e0df9e9 (Android) Should fix touchscreen controls no longer responding
after inserting a pad that changes dpad_emulation
2013-02-05 04:24:05 +01:00
ToadKing 8b652298cd (Android) Xperia O button fix 2013-02-03 17:04:09 -05:00
ToadKing 514bfdd07d (Android) Xperia back button fix 2013-02-03 16:48:52 -05:00
ToadKing ece4064e52 (Android) try to fix Xperia Start/Select 2013-02-03 14:22:32 -05:00
twinaphex 9cfdd61103 (Android) Reimplement 'touchscreen is always player 1 and doesn't take
up a slot'
2013-02-03 19:42:55 +01:00
twinaphex 6638ee1257 Revert "(Android) touchpad is now always first controller"
This reverts commit 5bc5195bc4.

Conflicts:
	android/native/jni/input_android.c
2013-02-03 19:06:54 +01:00
ToadKing 1064e56970 (Android) fix touch input for multi-touch 2013-02-01 18:47:11 -05:00
ToadKing 5bc5195bc4 (Android) touchpad is now always first controller
Xperia Play fixes
2013-01-31 20:40:47 -05:00
ToadKing ee8683396f (Android) fix back button binds acting up 2013-01-30 12:35:21 -05:00
twinaphex 630608a7fc (Android) Control if back button exits on a per-controller basis 2013-01-30 18:07:39 +01:00
ToadKing f65e64a638 (Android) custom input binding 2013-01-28 20:05:00 -05:00
twinaphex 3e0575b320 (Android) Fixed bug where device name was not being shown long enough
- useful for debugging input
2013-01-27 06:51:44 +01:00
twinaphex 5563fb3ea6 (Android) Decrease state_device_ids by size 2013-01-13 02:44:13 +01:00
Themaister 93c4682f99 Add RARCH_DEVICE_POINTER_SCREEN to Android. 2013-01-11 16:32:49 +01:00
twinaphex 6d755ae193 (Android) Rename android_glue.h into frontend_android.h and move it 2013-01-09 05:12:56 +01:00
Themaister 5832f849f0 Don't allow pressed fingers count to wrap around.
Play safe. Shouldn't happen, but you never know with Android.
2013-01-09 00:41:40 +01:00
Themaister c3ff164919 Increase MAX_TOUCH.
Ensure that we don't set data outside array.
Warn if this happens.
2013-01-09 00:40:38 +01:00
twinaphex 8c8c3cc10b (Android) Input tweaks/cleanups 2013-01-07 00:49:17 +01:00
twinaphex f8160fb2bd (Android) Cleanups 2013-01-06 06:10:24 +01:00
twinaphex aeebac522c (Android) Cleanups to the way messages are passed and pushed for
debug input key reporting
2013-01-05 17:35:50 +01:00
twinaphex 9a8e6a6432 (Android) Add debug input keycode reporting option 2013-01-05 17:09:13 +01:00
twinaphex cd46fc96a6 (Android) Refactor g_android 2013-01-05 07:38:59 +01:00
twinaphex fc55e48221 (Android) Cut down on g_android usage 2013-01-05 07:20:02 +01:00
twinaphex 4eeac9a1d7 (Android) Add autodetect_enable entry to settings 2013-01-05 04:58:30 +01:00
twinaphex 6f0360e6c4 (Android) Fixes a whole lot of issues - should force AKEYCODE_BACK
on touchscreen to always exit RetroArch - etc.
2013-01-02 23:53:40 +01:00
twinaphex 72b7d885b6 Revert "Revert "Don't assume device IDs won't collide.""
This reverts commit 4e3ffc0d72.
2013-01-02 22:24:36 +01:00
twinaphex 4e3ffc0d72 Revert "Don't assume device IDs won't collide."
This reverts commit ef5b656f23.
2013-01-02 21:21:06 +01:00
Themaister ef5b656f23 Don't assume device IDs won't collide. 2013-01-02 19:15:02 +01:00
twinaphex 6a6155affe (Android) Drop preDispatchEvent again 2013-01-02 19:08:18 +01:00
twinaphex 3a69f1f151 (Android) Some more checks in input code 2013-01-02 18:46:51 +01:00
twinaphex 6bbcc1eeda Revert "Remove preDispatch call."
This reverts commit 8bf6e5b5ee.
2013-01-02 18:03:53 +01:00
Themaister 8bf6e5b5ee Remove preDispatch call.
Fix possible segfault for ID table lookup.
2013-01-02 16:51:09 +01:00
Themaister 0b4cf2d053 Update license headers to 2013. 2013-01-01 01:41:15 +01:00
twinaphex c76ee4c6b4 (Android) Add more ccp IME app autodetection 2012-12-31 21:36:29 +01:00
twinaphex 0de110a274 (Android) Create separate input_autodetect.c input file 2012-12-31 18:02:20 +01:00
twinaphex e2163317d7 (Android/RARCH_CONSOLE) Move DPAD_EMULATION enums to general.h -
makes it easier from maintenance perspective
2012-12-31 17:50:47 +01:00
twinaphex 9f361de651 (Android) Autoconfigures IME app ccpcreations Wiimote pad 1 now 2012-12-31 17:39:04 +01:00
twinaphex ef42f6b58c (Android) Don't push message to queue if message is empty 2012-12-31 16:07:11 +01:00
twinaphex 33241abad2 (Android) Pass source to setup_keycode_lut too 2012-12-31 16:05:07 +01:00
twinaphex 71fe22f8ba (Android) Add some more alternative name detection rules for
PS3 pad
2012-12-31 04:19:45 +01:00
twinaphex f375f550af (Android) Add Saturn USB pad / Toodles Champ / Mayflash Wii Classic
USB pad binds
2012-12-31 04:06:43 +01:00
twinaphex 6240fb0076 (Android) Add PS Move Navi binds 2012-12-31 01:06:33 +01:00
twinaphex 1bc1b61938 (Android) Autoconfigures MOGA pad now 2012-12-30 23:37:49 +01:00
twinaphex 30bb3a150a (Android) Add 'unbound' message for pads which are not autoconfigured 2012-12-30 22:06:52 +01:00
twinaphex acefa9bfc4 (Android) Maps PS3 pad correctly now 2012-12-30 21:43:58 +01:00
twinaphex 45fa3d7ba7 (Android) PS3 pad detection - still need to sort out D-pad 2012-12-30 17:03:10 +01:00
twinaphex 813a659f8a (Android) Detects Dual Strike now 2012-12-30 16:53:24 +01:00
twinaphex b264700eaf (Android) First stab at autodetection code 2012-12-30 16:33:13 +01:00
Themaister c91e0e23f4 Add JNI device name query. 2012-12-30 15:04:02 +01:00
Themaister 4651dd935a Improve multitouch. 2012-12-27 23:03:35 +01:00
twinaphex 9f80f36c16 (Android) Small refinement to input 2012-12-27 21:10:18 +01:00
twinaphex 16ab406a1a (Android) First stab at multitouch - far from satisfactory 2012-12-27 17:08:46 +01:00
Themaister 7458f7888f Set up multitouch querying. 2012-12-27 12:26:13 +01:00
notaz b1e8c84f55 (Android) Enable and fix warnings. 2012-12-26 03:11:33 +02:00
twinaphex 480e36000e (Android/Phoenix) remove remnants 2012-12-24 15:23:06 +01:00
twinaphex e5e58912c1 (Android) Input - small nit changes 2012-12-24 15:05:59 +01:00
twinaphex 8f86172e3f (Android) Smaller 'overlay next' button for basic overlay
(Android) Mouse can be used to control overlay now too - is crash-prone
though after too many mouse clicks - reason unknown right now
2012-12-24 14:08:50 +01:00
twinaphex b03f5d8c4b (Android) Motion events now use correct pointer for event instead
of always pointer 0
2012-12-24 12:30:05 +01:00
twinaphex 97ab249625 (Android) Overlay next button should work now along with other
overlay state inputs
2012-12-23 15:29:54 +01:00
twinaphex 269698661a (Console/Android) Simplify input_key_pressed implementation 2012-12-23 14:44:46 +01:00
twinaphex 18bf8e2a16 (Android) Refactor JNI code 2012-12-23 07:30:15 +01:00
twinaphex 26c59ef649 (Android) Added autoconfiguration of Wiimote/Nunchuk/Wiimote - for
use with free Wii IME app from C.C.P. Cre@ions
2012-12-22 09:44:56 +01:00
twinaphex 7431bd5d22 (Android) Add more control schemes for USB gamepads 2012-12-22 07:13:32 +01:00
Toad King ff3ec9f8a5 (Android) minor cleanup 2012-12-21 19:00:18 -05:00
Toad King 462adce111 (Android) touch input fixes 2012-12-21 18:32:53 -05:00
twinaphex 75b36e6ba0 (Android) Tried with condition flag - still doesn't work 2012-12-21 08:08:50 +01:00
twinaphex 0df2eff66b (Android) Some input refactors 2012-12-21 04:14:47 +01:00
twinaphex 29ef7dc4ed (Android) Initial implementation of input overlay key input code -
not working yet due to need to determine whether or not touchscreen
is pressed in input_state_pressed
2012-12-21 01:31:01 +01:00
twinaphex 456593ddb1 (Android) Add way to tell where the event is coming from 2012-12-20 23:57:46 +01:00
twinaphex 909c392094 (Android) Build fix for building with input debug 2012-12-20 23:01:48 +01:00
twinaphex 3273ccb5d6 (Android) Add preDispatchEvent 2012-12-19 00:55:39 +01:00
twinaphex 60dd07364e (Android) Fix build 2012-12-18 20:56:33 +01:00
twinaphex 1c0fc0e65e (Android) Pack the LUT entries so that we can store eight 8-bit
values in them - this will allow for custom LUTs per controller
2012-12-18 18:56:16 +01:00
twinaphex 0210f8f72f (Android) Last input tweak for today 2012-12-17 20:53:36 +01:00
twinaphex 74ae6ecf57 (Android) Better deinit - will now deinit RetroArch and save game
RAM if you forcibly stop RetroArch
2012-12-17 18:45:26 +01:00
twinaphex dca1175854 (Android) Add performance counters for input poll 2012-12-16 17:13:49 +01:00
twinaphex 22f5f67522 (Android) Use AMotionEvent_getPointerCount() > 0 2012-12-16 16:35:49 +01:00
twinaphex 3eabba50f9 (Android) Onscreen input debugging 2012-12-16 15:46:53 +01:00
twinaphex 5f46f80b20 Revert "(Android) Simplify default binds - reduce code"
This reverts commit 68ab7e0372.
2012-12-16 06:54:49 +01:00
twinaphex 68ab7e0372 (Android) Simplify default binds - reduce code 2012-12-16 06:26:12 +01:00
twinaphex c54d4a6955 (Android) Volume keys work again with new input code - most
bound keyboard shortcuts should work now
2012-12-16 03:03:44 +01:00
twinaphex cf539edf91 (Android) android_input_poll now only reads and processes input
events - check_window polls for system messages once
2012-12-16 02:04:13 +01:00
twinaphex 7076685a1e (Android) First check if an event is in the event queue before
'getting' it
2012-12-16 00:08:30 +01:00
twinaphex 224eaab902 (Android) Input - only do motion event if type is of 'key down' 2012-12-15 23:05:21 +01:00
twinaphex 7a67348b3c Change 1 << for bitmasks to 1ULL << 2012-12-15 18:00:30 +01:00
twinaphex e1918b2ba6 (Android) Rename g_android.input_state to g_extern.lifecycle_state
- intend to use this for RMenu as well
2012-12-14 02:06:14 +01:00
twinaphex bb1e2a4677 (Android) Don't split up JNI functions into their own file -
assumed this is Android-specific for now
(Android) Some input improvements - don't call AKeyEvent_getKeyCode
unless type is of AINPUT_EVENT_TYPE_KEY
2012-12-13 17:05:07 +01:00
twinaphex 567f4ff471 (Android) Input optimization #2 2012-12-12 20:52:42 +01:00
twinaphex dd3ac28927 (Android) Input optimizations 2012-12-12 03:53:25 +01:00
twinaphex 0ba45d457e (Android) Use pollAll instead of pollOnce - fixes input issues
to do with pushing multiple  buttons simultaneously
2012-12-11 17:45:49 +01:00
twinaphex 966cc93b5e Refactor of driver function hooks 2012-11-27 00:50:56 +01:00
twinaphex da3ec111e8 (Android) Get rid of unnecessary input_android.h header 2012-11-17 21:36:22 +01:00
twinaphex 55562a96af (Android) Clean up native glue code + inline some stuff 2012-11-03 22:52:41 +01:00
twinaphex 9da9c8042b (Android) Use Griffin - faster 2012-11-03 08:42:33 +01:00
twinaphex 724206c348 (Android) reinsert native glue code 2012-11-03 07:17:55 +01:00
twinaphex faba5f4c13 (Android) Fixup input logs 2012-11-03 04:36:32 +01:00
twinaphex 1d31f7efa0 (Android) All keyboard hotkeys work now 2012-11-03 00:57:47 +01:00
twinaphex 0dbcdb087d (Android) Rewrite of input code 2012-11-03 00:31:05 +01:00
twinaphex 02f81a38c2 (Android) Create input_state for Android app - can now signal that a window
was created, or that we want to shutdown
2012-11-02 22:27:22 +01:00
twinaphex b240cfbc7e (RARCH_PERF) Rename benchmark.c to perforance.c
(MSVC2010) Rename incorrectly named MSVC2012 solution which was
really an MSVC 2010 solution
2012-11-01 06:21:18 +01:00
twinaphex 3837a503b7 (Android) Reimplement native glue code 2012-11-01 05:48:46 +01:00
twinaphex a4d1305838 (Android) Some native glue code optimizations 2012-10-31 22:22:29 +01:00
twinaphex a2ea556be5 (Android) Call process_cmd and process_input directly - try to get
rid of all these poll callbacks
2012-10-31 19:22:34 +01:00
twinaphex 0fe3ab8f2d (Android) Input - get rid of android_input_state_t struct - only
use a single uint64 array now for state
2012-10-31 16:18:58 +01:00
twinaphex ff599ac392 (Android) Change input process conditional to 'event' -also disable
PERF_TEST for regular usage
2012-10-31 16:04:40 +01:00
twinaphex 035713f124 (Android) performance counter for engine_handle_input 2012-10-31 15:18:47 +01:00
twinaphex 12f5434f3e (Android) use ALooper_pollOnce instead of ALooper_pollAll 2012-10-31 15:16:16 +01:00
twinaphex 94ccdd627b (Android) Input - now handles volume up/down and back buttons 2012-10-31 06:56:14 +01:00
twinaphex 0aa08c3b46 (Android) Input optimizations - this function has heavy overhead
depending on how many times you press buttons / input event activity
2012-10-31 04:01:17 +01:00
twinaphex 49cff6a46a (Android) Input - another cleanup 2012-10-31 01:59:15 +01:00
twinaphex 666e2910b3 (Android) Input - Small cleanups 2012-10-31 01:38:34 +01:00
twinaphex e426087ebc (Android) Input rewrite - should now be faster and support more
keycodes - keyboard keys are hooked up too for control with keyboard
2012-10-31 01:25:24 +01:00
twinaphex b204b55386 (Android) Remove unnecessary animating conditional block in gfx_ctx_check_window 2012-10-30 06:36:38 +01:00
twinaphex 1ff6175bd2 (Android) Move polling for events into Android input driver instead
of EGL context check_window function
2012-10-30 06:20:49 +01:00
twinaphex c2f49f1c53 (Android) Input control improvements 2012-10-30 05:57:12 +01:00
twinaphex fb25f31598 (Android/OpenSL) Bigger audio buffers - bigger latency/longer
delay in audio, but no audio breakup - also applied -O3 and -funroll-loops
for Android Makefile - seems to help
2012-10-30 05:25:14 +01:00
twinaphex 8123cb1013 (Android) Add alternate control layouts - will need to switch
between these with a button combo
2012-10-29 22:06:56 +01:00
twinaphex 6424513df8 (Android) Input - use custom binds 2012-10-29 14:45:25 +01:00
twinaphex 45142ed3d2 (Android) Get rid of do_pollblock - unnecessary now 2012-10-29 13:34:03 +01:00
twinaphex c2557e0d4f (Android) Input experiment 2012-10-29 05:09:10 +01:00
twinaphex db15975315 (Android) Small changes 2012-10-29 04:58:15 +01:00
twinaphex 50875ce46c (Android) Working (but hoky) controls 2012-10-29 01:28:15 +01:00
twinaphex 915f26cbd0 (Android) Initial work on input 2012-10-28 22:20:56 +01:00
twinaphex aefb3ee3af (GL) Fix build for HAVE_OPENGLES target
(Android) Input - add device ID per joypad
2012-10-28 03:14:50 +01:00
twinaphex 43602b97c9 (Android) Flesh out Android input 2012-10-28 02:21:09 +01:00