From d696dabdaa03aa12ea1064ca61d459d5fb5f95ba Mon Sep 17 00:00:00 2001
From: beuc <beuc@7f0cb862-5218-0410-a997-914c9d46530a>
Date: Sat, 5 May 2012 11:32:05 +0000
Subject: [PATCH] Update documentation on MultiTouch

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1308 7f0cb862-5218-0410-a997-914c9d46530a
---
 freeglut/web-src/docs/android.php |  7 +++++--
 freeglut/web-src/docs/api.php     | 31 +++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

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