diff --git a/freeglut/web-src/docs/android.php b/freeglut/web-src/docs/android.php
index 283e25d..b4d9cc5 100644
--- a/freeglut/web-src/docs/android.php
+++ b/freeglut/web-src/docs/android.php
@@ -173,8 +173,7 @@ Done:
TODO:
-- Open new windows (if that's possible)
-- Joystick support (xperia play...)
+- Multi-touch support (glutMultiMotionFunc & al.)
- Display translucent keys on virtual keypad
- API to access raw JVM structure and raw Activity(ies?)
structure
@@ -182,11 +181,15 @@ TODO:
- API (or configuration file?) to disable assets extraction
- Callback to reload OpenGL resources lost during a pause
- Callback for pause/resume notifications
+- Accelerometer?
Possibly implemented later:
- Support for menus and basic fonts
+- Open new windows (if that's possible)
+- Joystick support (note: xperia play doesn't have a joystick, but a
+ touchpad)
diff --git a/freeglut/web-src/docs/api.php b/freeglut/web-src/docs/api.php
index 47c6676..dd7f9ee 100644
--- a/freeglut/web-src/docs/api.php
+++ b/freeglut/web-src/docs/api.php
@@ -209,6 +209,14 @@ contained herein.
glutCopyColormap
+ MultiTouch Functions
+
+ - glutMultiEntryFunc(id, GLUT_ENTERED|GLUT_LEFT)
+ - glutMultiButtonFunc(id, x, y, button, GLUT_DOWN|GLUT_UP)
+ - glutMultiMotionFunc(id, x, y)
+ - glutMultiPassiveFunc(id, x, y)
+
+
Miscellaneous Functions
- glutIgnoreKeyRepeat, glutSetKeyRepeat
@@ -2134,6 +2142,29 @@ glutStopVideoResizing
18.2 glutCopyColormap
+MultiTouch Functions
+
+MultiTouch callbacks are used to handle environments with multiple
+inputs, such as a multi-touch touchpad.
+
+TODO: it seems this supports multiple mouses on X11
+(id=XIDeviceEvent->deviceid
), as opposed to multiple
+contact points on Windows (id=TOUCHINPUT->id
).
+
+glutMultiEntryFunc(id, GLUT_ENTERED|GLUT_LEFT)
+glutMultiButtonFunc(id, x, y, button, GLUT_DOWN|GLUT_UP)
+glutMultiMotionFunc(id, x, y)
+glutMultiPassiveFunc(id, x, y)
+
+These functions work like their non-multi variants, with an additional
+'deviceid' parameter describing the current input device.
+
+Exception: in MultiButtonFunc, the order of callback parameters is
+different (x,y,button,state instead of button,state,x,y).
+
+The non-multi callback variants are also called on X11.
+TODO: are both callbacks called on Windows as well?
+
19. Miscellaneous Functions
19.1 glutIgnoreKeyRepeat, glutSetKeyRepeat