nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib/android: intro motion down_time
[nit.git]
/
lib
/
android
/
input_events.nit
diff --git
a/lib/android/input_events.nit
b/lib/android/input_events.nit
index
cbb10b1
..
5ee9d87
100644
(file)
--- a/
lib/android/input_events.nit
+++ b/
lib/android/input_events.nit
@@
-17,8
+17,8
@@
# Pointer and hardware key events
module input_events
# Pointer and hardware key events
module input_events
-import mnit_input
-import android
+import mnit::input
+import android::game
in "C header" `{
#include <android/log.h>
in "C header" `{
#include <android/log.h>
@@
-70,6
+70,8
@@
private extern class NativeAndroidMotionEvent `{AInputEvent *`}
`}
fun action: AMotionEventAction `{ return AMotionEvent_getAction(self); `}
`}
fun action: AMotionEventAction `{ return AMotionEvent_getAction(self); `}
+
+ fun native_down_time: Int `{ return AMotionEvent_getDownTime(self); `}
end
private extern class AMotionEventAction `{ int32_t `}
end
private extern class AMotionEventAction `{ int32_t `}
@@
-149,6
+151,11
@@
class AndroidMotionEvent
return null
end
end
return null
end
end
+
+ # Time when the user originally pressed down to start a stream of position events
+ #
+ # The return value is in the `java.lang.System.nanoTime()` time base.
+ fun down_time: Int do return native.native_down_time
end
# A pointer event
end
# A pointer event
@@
-185,12
+192,9
@@
class AndroidPointerEvent
return action.is_down or action.is_move or action.is_pointer_down
end
return action.is_down or action.is_move or action.is_pointer_down
end
- # Is this a move event?
- fun is_move: Bool do return motion_event.acting_pointer == self and
+ redef fun is_move do return motion_event.acting_pointer == self and
motion_event.native.action.is_move
motion_event.native.action.is_move
- redef fun depressed do return not pressed
-
# Does this pointer just began touching the screen?
fun just_went_down: Bool do return motion_event.acting_pointer == self and
motion_event.just_went_down
# Does this pointer just began touching the screen?
fun just_went_down: Bool do return motion_event.acting_pointer == self and
motion_event.just_went_down
@@
-216,7
+220,14
@@
extern class AndroidKeyEvent `{AInputEvent *`}
# Hardware code of the key raising this event
fun key_code: Int `{ return AKeyEvent_getKeyCode(self); `}
# Hardware code of the key raising this event
fun key_code: Int `{ return AKeyEvent_getKeyCode(self); `}
- redef fun to_c `{
+ redef fun to_c
+ do
+ var i = native_to_c
+ if i == 0 then return null
+ return i.code_point
+ end
+
+ private fun native_to_c: Int `{
int code = AKeyEvent_getKeyCode(self);
if (code >= AKEYCODE_0 && code <= AKEYCODE_9)
return '0'+code-AKEYCODE_0;
int code = AKeyEvent_getKeyCode(self);
if (code >= AKEYCODE_0 && code <= AKEYCODE_9)
return '0'+code-AKEYCODE_0;