FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: add code to display multi-touch events

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1303 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
beuc 2012-05-04 19:59:36 +00:00
parent 1659102712
commit 5807ec617c
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
freeglut/freeglut/src/android/fg_cursor_android.c
View File

@ -28,7 +28,7 @@
void fgPlatformSetCursor ( SFG_Window *window, int cursorID ) void fgPlatformSetCursor ( SFG_Window *window, int cursorID )
{ {
// No-op: no visible cursor on touchscreens /* No-op: no visible cursor on touchscreens */
} }
void fgPlatformWarpPointer ( int x, int y ) void fgPlatformWarpPointer ( int x, int y )
@ -38,4 +38,5 @@ void fgPlatformWarpPointer ( int x, int y )
SFG_Window* window = fgStructure.CurrentWindow; SFG_Window* window = fgStructure.CurrentWindow;
window->State.MouseX = x; window->State.MouseX = x;
window->State.MouseY = y; window->State.MouseY = y;
/* TODO: this should simulate a fake motion event */
} }

5
freeglut/freeglut/src/android/fg_joystick_android.c
View File

@ -29,6 +29,11 @@
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "fg_internal.h" #include "fg_internal.h"
/**
* TODO: Android has no joysticks at the moment (only touchscreens/touchpads),
* but we could expose the accelerometer as a 3-axis joystick.
*/
void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes ) void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
{ {
fgWarning("fgPlatformJoystickRawRead: STUB\n"); fgWarning("fgPlatformJoystickRawRead: STUB\n");

23
freeglut/freeglut/src/android/fg_main_android.c
View File

@ -222,12 +222,26 @@ int32_t handle_input(struct android_app* app, AInputEvent* event) {
} }
} }
if (AInputEvent_getType(event) == AINPUT_EVENT_TYPE_MOTION) { int32_t source = AInputEvent_getSource(event);
int32_t action = AMotionEvent_getAction(event); if (AInputEvent_getType(event) == AINPUT_EVENT_TYPE_MOTION
&& source == AINPUT_SOURCE_TOUCHSCREEN) {
int32_t action = AMotionEvent_getAction(event) & AMOTION_EVENT_ACTION_MASK;
/* Pointer ID for clicks */
int32_t pidx = AMotionEvent_getAction(event) >> AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT;
/* TODO: Handle multi-touch; also handle multiple sources */
if (0) {
LOGI("motion action=%d index=%d source=%d", action, pidx, source);
int count = AMotionEvent_getPointerCount(event);
int i;
for (i = 0; i < count; i++) {
LOGI("multi(%d): %.01f,%.01f",
AMotionEvent_getPointerId(event, i),
AMotionEvent_getX(event, i), AMotionEvent_getY(event, i));
}
}
float x = AMotionEvent_getX(event, 0); float x = AMotionEvent_getX(event, 0);
float y = AMotionEvent_getY(event, 0); float y = AMotionEvent_getY(event, 0);
LOGI("motion %.01f,%.01f action=%d", x, y, AMotionEvent_getAction(event));
/* Virtual arrows PAD */ /* Virtual arrows PAD */
/* Don't interfere with existing mouse move event */ /* Don't interfere with existing mouse move event */
if (!touchscreen.in_mmotion) { if (!touchscreen.in_mmotion) {
@ -285,7 +299,6 @@ int32_t handle_input(struct android_app* app, AInputEvent* event) {
if (!touchscreen.vpad.on) { if (!touchscreen.vpad.on) {
window->State.MouseX = x; window->State.MouseX = x;
window->State.MouseY = y; window->State.MouseY = y;
LOGI("Changed mouse position: %f,%f", x, y);
if (action == AMOTION_EVENT_ACTION_DOWN && FETCH_WCB(*window, Mouse)) { if (action == AMOTION_EVENT_ACTION_DOWN && FETCH_WCB(*window, Mouse)) {
touchscreen.in_mmotion = true; touchscreen.in_mmotion = true;
INVOKE_WCB(*window, Mouse, (GLUT_LEFT_BUTTON, GLUT_DOWN, x, y)); INVOKE_WCB(*window, Mouse, (GLUT_LEFT_BUTTON, GLUT_DOWN, x, y));