From 21409fddf212e9bbd64348c4d3eebe49af920010 Mon Sep 17 00:00:00 2001 From: beuc Date: Sat, 9 Jun 2012 17:29:10 +0000 Subject: [PATCH] Add pointers to discussion on multi-touch git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1332 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/include/GL/freeglut_ext.h | 2 ++ freeglut/freeglut/src/android/fg_main_android.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/freeglut/freeglut/include/GL/freeglut_ext.h b/freeglut/freeglut/include/GL/freeglut_ext.h index 2c71737..0800345 100644 --- a/freeglut/freeglut/include/GL/freeglut_ext.h +++ b/freeglut/freeglut/include/GL/freeglut_ext.h @@ -182,6 +182,8 @@ FGAPI GLUTproc FGAPIENTRY glutGetProcAddress( const char *procName ); #define GLUT_HAS_MULTI 1 +/* TODO: add device_id paramater, + cf. http://sourceforge.net/mailarchive/forum.php?thread_name=20120518071314.GA28061%40perso.beuc.net&forum_name=freeglut-developer */ FGAPI void FGAPIENTRY glutMultiEntryFunc( void (* callback)( int, int ) ); FGAPI void FGAPIENTRY glutMultiButtonFunc( void (* callback)( int, int, int, int, int ) ); FGAPI void FGAPIENTRY glutMultiMotionFunc( void (* callback)( int, int, int ) ); diff --git a/freeglut/freeglut/src/android/fg_main_android.c b/freeglut/freeglut/src/android/fg_main_android.c index 37d3a21..84513a6 100644 --- a/freeglut/freeglut/src/android/fg_main_android.c +++ b/freeglut/freeglut/src/android/fg_main_android.c @@ -228,7 +228,8 @@ int32_t handle_input(struct android_app* app, AInputEvent* event) { 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 */ + /* TODO: Handle multi-touch; also handle multiple sources/devices */ + /* cf. http://sourceforge.net/mailarchive/forum.php?thread_name=20120518071314.GA28061%40perso.beuc.net&forum_name=freeglut-developer */ if (0) { LOGI("motion action=%d index=%d source=%d", action, pidx, source); int count = AMotionEvent_getPointerCount(event);