From 746383476aa449e9cab4a25df27be85b61aa074b Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 27 Mar 2019 03:10:41 +0100
Subject: Bug 1348: X11 XI Multitouch: Fixes of previous commit
 92006e4baef57f1f3fb647dd307aed5989fd4c8d

Previous commit 92006e4baef57f1f3fb647dd307aed5989fd4c8d

(Note to Danny: I cannot test this now - please re-test and/or review)

X11Common::JavaWindow
- Owns XI extension's xiOpcode, selected xiTouchDeviceId and tracked XITouchPosition array

X11Window::CreateWindow
- Query XI extension only once @ window creation and earmark xiOpcode in JavaWindow instance

- Fix: Device selection code was "class->type != XITouchClass",
  but shouldn't it be 'XITouchClass == class->type' (as patched here)

- Fix: Free XIQueryDevice returned XIDeviceInfo array via XIFreeDeviceInfo

- Earmark deviceid in JavaWindow instance

X11Display
- Moved global static touch_coordinates to JavaWindow::xiTouchCoords instance

X11Display::DispatchMessage
- Changed event handling structure similar to https://keithp.com/blogs/Cursor_tracking/

- Fix: Free XGetEventData's optional memory allocation via XFreeEventData

- Reuse JavaWindow's queried xiOpcode

- Fix: Don't overrise windowPointer, instead validate and require a match. JavaWindow must match!

- Fix: Also validate chosen deviceid with JavaWindow's registered device

Newt Build:
- Added libXi in build recipe and doc
---
 make/build-newt.xml   | 10 ++++++++++
 make/scripts/tests.sh |  6 +++---
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'make')

diff --git a/make/build-newt.xml b/make/build-newt.xml
index b19aa8fc4..733d5aebd 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -302,6 +302,7 @@
         <syslibset libs="X11"/>
         <syslibset libs="Xrandr"/>
         <syslibset libs="Xcursor"/>
+        <syslibset libs="Xi"/>
       </linker>
 
       <linker id="linker.cfg.freebsd.amd64.newt.x11" extends="linker.cfg.freebsd.amd64">
@@ -309,6 +310,7 @@
         <syslibset libs="X11"/>
         <syslibset libs="Xrandr"/>
         <syslibset libs="Xcursor"/>
+        <syslibset libs="Xi"/>
       </linker>
 
       <linker id="linker.cfg.linux.newt.bcm_egl" extends="linker.cfg.linux">
@@ -329,6 +331,7 @@
         <syslibset libs="X11"/>
         <syslibset libs="Xrandr"/>
         <syslibset libs="Xcursor"/>
+        <syslibset libs="Xi"/>
         <!--syslibset libs="xcb" /-->
         <!--syslibset libs="X11-xcb" /-->
       </linker>
@@ -337,6 +340,7 @@
         <syslibset libs="X11"/>
         <syslibset libs="Xrandr"/>
         <syslibset libs="Xcursor"/>
+        <syslibset libs="Xi"/>
         <!--syslibset libs="xcb" /-->
         <!--syslibset libs="X11-xcb" /-->
       </linker>
@@ -345,6 +349,7 @@
         <syslibset libs="X11"/>
         <syslibset libs="Xrandr"/>
         <syslibset libs="Xcursor"/>
+        <syslibset libs="Xi"/>
         <!--syslibset libs="xcb" /-->
         <!--syslibset libs="X11-xcb" /-->
       </linker>
@@ -353,12 +358,14 @@
         <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" />
         <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrandr" />
         <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xcursor" />
+        <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xi" />
       </linker>
 
       <linker id="linker.cfg.linux.aarch64.newt.x11" extends="linker.cfg.linux.aarch64">
         <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" />
         <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrandr" />
         <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xcursor" />
+        <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xi" />
       </linker>
 
       <linker id="linker.cfg.android.newt" extends="linker.cfg.android">
@@ -369,6 +376,7 @@
         <syslibset libs="X11"/>
         <syslibset libs="Xrandr"/>
         <syslibset libs="Xcursor"/>
+        <syslibset libs="Xi"/>
       </linker>
 
       <linker id="linker.cfg.solaris.sparcv9.newt.x11" extends="linker.cfg.solaris.sparcv9">
@@ -376,6 +384,7 @@
         <syslibset libs="X11"/>
         <syslibset libs="Xrandr"/>
         <syslibset libs="Xcursor"/>
+        <syslibset libs="Xi"/>
       </linker>
 
       <linker id="linker.cfg.solaris.amd64.newt.x11" extends="linker.cfg.solaris.amd64">
@@ -383,6 +392,7 @@
         <syslibset libs="X11"/>
         <syslibset libs="Xrandr"/>
         <syslibset libs="Xcursor"/>
+        <syslibset libs="Xi"/>
       </linker>
 
       <linker id="linker.cfg.win32.mingw.newt" extends="linker.cfg.win32.mingw">
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 66dc7f300..ccd3a9871 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -150,7 +150,7 @@ function jrun() {
     #D_ARGS="-Dnativewindow.debug.JAWT"
     #D_ARGS="-Djogl.debug.GLContext.TraceSwitch"
     #D_ARGS="-Djogl.debug.GLContext -Djogl.debug.GLContext.TraceSwitch"
-    D_ARGS="-Djogl.debug.DebugGL -Djogl.debug.TraceGL -Djogl.debug.FixedFuncPipeline -Djogl.debug.GLSLState -Djogl.debug.GLSLCode"
+    #D_ARGS="-Djogl.debug.DebugGL -Djogl.debug.TraceGL -Djogl.debug.FixedFuncPipeline -Djogl.debug.GLSLState -Djogl.debug.GLSLCode"
     #D_ARGS="-Djogl.debug.FixedFuncPipeline -Djogl.debug.GLSLCode"
     #D_ARGS="-Djogl.debug.FixedFuncPipeline -Djogl.debug.GLSLState"
     #D_ARGS="-Djogl.debug.FixedFuncPipeline"
@@ -471,7 +471,7 @@ function testawtswt() {
 #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2GLJPanelsAWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasAWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestLandscapeES2NewtCanvasAWT $*
-#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
+testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestLandscapeES2NEWT $*
 #testawtswt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasSWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestElektronenMultipliziererNEWT $*
@@ -854,7 +854,7 @@ function testawtswt() {
 #
 #testnoawt com.jogamp.opengl.test.junit.jogl.util.TestImmModeSinkES1NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.util.TestImmModeSinkES2NEWT $*
-testnoawt com.jogamp.opengl.test.junit.jogl.util.TestES1FixedFunctionPipelineNEWT $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.util.TestES1FixedFunctionPipelineNEWT $*
 
 #
 # Texture / TextureUtils
-- 
cgit v1.2.3