aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Bug 1348: Fix X11 XI MultitouchSven Gothel2019-03-276-108/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I got access to a touchscreen laptop w/ Debian 9, hence I could fix and test the implementation. X11 DisplayDriver.java: - Store and pass through xi_opcode of XI extension, queried at initialization stage X11Window.c Fixes: - Initialize JavaWindow's xiTouchCoords[].id w/ -1, as required to track the pointer - Pass through xi_opcode as stored in X11 DisplayDriver X11Display.c Fixes: - sendTouchScreenEvent: Throw RuntimeException if 0 > actionId (Internal Error: based on xiTouchCoords[].id tracking) - DispatchMessages's windowPointer determination: -- Query potenial XI Event first: IF XI Event, must use XIDeviceEvent's event Window -- Only IF not an XI Event, we can use evt.xany.window as the event window - DispatchMessages's XI Event Handling: -- Always break deviceid search loop if id found, preserving index and time spend Works on my Debian 9 device, tested w/ com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT: - One pointer (finger) press, drag and release (click) - PinchToZoomGesture works - DoubleTabScrollGesture works +++ Potential Issues: JavaWindow's xiTouchCoords[].id accuracy is crucial to pointer tracking during XI_TouchBegin -> XI_TouchUpdate -> XI_TouchEnd. In the normal course of action: - XI_TouchBegin sets the id, assuming it is yet set - XI_TouchUpdate assumes it is set - XI_TouchEnd clears the id, assuming it is set This field in the JavaWindow array only gets reset to -1 once at native window creation. We may need to figure out when to reset this field to -1. If the XI_TouchEnd events would get lost for whatever reason, the above tracking state would be broken.
* Merge branch 'master' of github.com:sgothel/joglSven Gothel2019-03-271-8/+15
|\
| * Merge pull request #104 from gohai/bcm-fix-overscan-offsetSven Gothel2019-03-271-0/+7
| |\ | | | | | | Fix overlay/underlay position mismatch in X11UnderlayTracker (bug 1315)
| | * Fix overlay/underlay position mismatch in X11UnderlayTracker with overscan ↵gohai2017-03-051-0/+7
| | | | | | | | | | | | | | | | | | enabled With the overscan enabled by the Raspberry Pi firmware, which seems to be the default for some attached displays, the underlayWindow size will be e.g. 1888x1048 (retrieved from X11), whereas the overlayWindow size remains at 1920x1080 (retrieved from the Broadcom VC IV implementation). This causes the overlay window to be visually offset by a few pixels. Correct this by applying an offset when the two don't match. (Both displays are assumed to have the same center.)
| * | Merge pull request #103 from gohai/bcm-fix-mouse-buttonSven Gothel2019-03-271-8/+8
| |\ \ | | | | | | | | Fix mouse button reporting in X11UnderlayTracker
| | * | Fix mouse button reporting in X11UnderlayTrackergohai2017-02-161-8/+8
| | |/
* | / Bug 1348: X11 XI Multitouch: Refine commit ↵Sven Gothel2019-03-272-5/+12
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 746383476aa449e9cab4a25df27be85b61aa074b Add more verbose DBG_PRINT - @ CreateWindow: extension, scanning device/class, registered deviceid - @ DispatchMessage: XI_TouchBegin, XI_TouchUpdate and XI_TouchEnd On my test machine w/o a touchscreen I correctly: - detected extension - detected no XITouchClass device, hence no deviceid registered X11: [CreateWindow]: XI: Window 0x6600016, Extension 131 X11: [CreateWindow]: XI: Scan Window 0x6600016, device[1/13].class[1/7]: type 1 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[1/13].class[2/7]: type 2 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[1/13].class[3/7]: type 2 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[1/13].class[4/7]: type 2 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[1/13].class[5/7]: type 2 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[1/13].class[6/7]: type 3 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[1/13].class[7/7]: type 3 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[2/13].class[1/1]: type 0 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[3/13].class[1/3]: type 1 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[3/13].class[2/3]: type 2 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[3/13].class[3/3]: type 2 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[4/13].class[1/1]: type 0 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[5/13].class[1/1]: type 0 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[6/13].class[1/1]: type 0 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[7/13].class[1/1]: type 0 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[8/13].class[1/7]: type 1 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[8/13].class[2/7]: type 2 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[8/13].class[3/7]: type 2 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[8/13].class[4/7]: type 2 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[8/13].class[5/7]: type 2 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[8/13].class[6/7]: type 3 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[8/13].class[7/7]: type 3 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[9/13].class[1/7]: type 1 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[9/13].class[2/7]: type 2 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[9/13].class[3/7]: type 2 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[9/13].class[4/7]: type 2 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[9/13].class[5/7]: type 2 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[9/13].class[6/7]: type 3 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[9/13].class[7/7]: type 3 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[10/13].class[1/1]: type 0 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[11/13].class[1/1]: type 0 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[12/13].class[1/7]: type 1 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[12/13].class[2/7]: type 2 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[12/13].class[3/7]: type 2 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[12/13].class[4/7]: type 2 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[12/13].class[5/7]: type 2 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[12/13].class[6/7]: type 3 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[12/13].class[7/7]: type 3 (is XITouchClass 0) X11: [CreateWindow]: XI: Scan Window 0x6600016, device[13/13].class[1/1]: type 0 (is XITouchClass 0)
* | Bug 1348: X11 XI Multitouch: Fixes of previous commit ↵Sven Gothel2019-03-273-143/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge pull request #102 from Yodoga/feature_multitouch_x11_1348Sven Gothel2019-03-274-3/+213
|\ \ | | | | | | add touch event support for x11 server
| * | add touch event support for x11 serverDanny Koernig2016-11-174-3/+213
| |/
* | Merge pull request #100 from PissedCapslock/patch-2Sven Gothel2019-03-261-1/+1
|\ \ | | | | | | Typo in javadoc of GLDrawable#isRealized
| * | Typo in javadoc of GLDrawable#isRealizedRobin Stevens2016-05-041-1/+1
| |/
* | Merge pull request #99 from PissedCapslock/patch-1Sven Gothel2019-03-261-3/+3
|\ \ | | | | | | Improved layout of last paragraph in class javadoc
| * | Improved layout of last paragraph in class javadocRobin Stevens2016-05-041-3/+3
| |/
* | Bug 1288: GLBufferStateTracker needs to support ARB_indirect_parametersSven Gothel2019-03-261-3/+11
| | | | | | | | | | | | GLBufferStateTracker needs to support ARB_indirect_parameters, i.e. checkTargetName(target) and getQueryName(target) need to recognize GL4.GL_PARAMETER_BUFFER_ARB.
* | Merge pull request #97 from gohai/bcm-fix-viewportwuSven Gothel2019-03-261-2/+2
|\ \ | | | | | | Fix viewport height in BCM VC IV ScreenDriver
| * | Bug 1254: Fix viewport height in BCM VC IV ScreenDrivergohai2016-04-041-2/+2
| |/ | | | | | | This should fix https://jogamp.org/bugzilla/show_bug.cgi?id=1254, which leads to windowed sketches not being centered in Processing.
* | Merge pull request #90 from packet0/patch-1Sven Gothel2019-03-261-1/+2
|\ \ | | | | | | SWTAccessor: Cleanup disable debug messages
| * | SWTAccessor: Cleanup disable debug messagespacket02015-08-111-1/+2
| | |
* | | ShaderCode: Fixed constant usage (GL3 -> GL3ES3)Sven Gothel2019-03-261-15/+15
| | |
* | | Bug 1283: Remove shader include filename quotes if exists at start and end onlySven Gothel2019-03-263-10/+18
| | |
* | | Merge pull request #95 from elect86/patch-1Sven Gothel2019-03-261-1/+1
|\ \ \ | | | | | | | | Removing double quotes from included shaders
| * | | Removing also all the double quotesGiuseppe Barbieri2016-01-291-1/+1
| | |/ | |/| | | | https://jogamp.org/bugzilla/show_bug.cgi?id=1283
* | | Bug 1357 Related: GLRendererQuirks NoSetSwapIntervalPostRetarget and ↵Julien Gouesse2019-03-251-5/+9
| | | | | | | | | | | | NoDoubleBufferedPBuffer no more required for Mesa >= 18.2.2
* | | Merge branch 'master' of github.com:sgothel/joglSven Gothel2019-03-251-1/+1
|\ \ \
| * \ \ Merge pull request #105 from serebit/patch-1Sven Gothel2019-03-251-1/+1
| |\ \ \ | | | | | | | | | | Fix BugZilla bug 1357
| | * | | Update GLContextImpl.javaCampbell Jones2017-12-261-1/+1
| | |/ /
* | | | NewtCanvasJFX: Utilize JFXEDTUtil per default, supporting the Windows PlatformjavafxSven Gothel2019-03-211-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On [GNU/Linux] X11 JFXEDTUtil is not required, since X11 can handle multi-threaded native parenting, however, the Windows platform does require JFXEDTUtil. Currently the default is to use JFXEDTUtil, which operates solely on the JavaFX thread for windowing lifecycle and even-dispatch operations. This behavior can be toggled via the boolean property 'jogamp.newt.javafx.UseJFXEDT', which currently defaults to 'true' This behavior might be analyzed in more detail for a fine grained EDTUtil decision.
* | | | NewtCanvasJFX.NativeWindow: Delegate required child window canvas positionSven Gothel2019-03-215-76/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NewtCanvasJFX.NativeWindow shall pass through NewtCanvasJFX's Canvas position to properly position the NEWT child window inside the top level Window. NewtJFXReparentingKeyAdapter demonstrating manual reparenting demonstrates this case. TestGearsES2NewtCanvasAWT's default behavior is to use a surrounding border for the NEWTCanvasAWT child, similar to TestNewtCanvasJFXGLn.
* | | | TestNewtCanvasJFXGLn: Adding NEWTDemoListener and ↵Sven Gothel2019-03-201-0/+34
| | | | | | | | | | | | | | | | NewtJFXReparentingKeyAdapter functionality
* | | | Tests: Adding API Doc for test utilizing NEWTDemoListener and derivationsSven Gothel2019-03-209-17/+91
| | | |
* | | | Adding NativeWindowHolder extends NativeSurfaceHolder; API Doc for ↵Sven Gothel2019-03-208-51/+362
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NEWTDemoListener NativeWindowHolder abstracts access to is-a or has-a parent component's NativeWindow like NewtCanvasAWT, NewtCanvasJFX and NewtCanvasSWT Adding API Doc for NEWTDemoListener.
* | | | NewtCanvasSWT: Fix NOP WindowClosingProtocol.WindowClosingMode BehaviorSven Gothel2019-03-201-5/+7
| | | |
* | | | NewtCanvasJFX: Implement WindowClosingProtocol.WindowClosingMode BehaviorSven Gothel2019-03-202-9/+22
| | | |
* | | | NewtCanvasJFX: Clarify [dispose() -> destroy()] operationSven Gothel2019-03-201-8/+8
| | | | | | | | | | | | | | | | | | | | This is automatically issued when receiving the javafx.stage.WindowEvent#WINDOW_CLOSE_REQUEST from the attached top-level JavaFX Window
* | | | JavaFX: Add proper class doc for implementation and unit testSven Gothel2019-03-202-34/+64
| | | |
* | | | JavaFX: Remove JFXAccessor redundancySven Gothel2019-03-191-15/+13
| | | |
* | | | JavaFX: Fix API doc of JFXAccessorSven Gothel2019-03-191-6/+6
| | | |
* | | | JavaFX: Adding JavaFX Support for NEWT utilizing native Window parenting via ↵Sven Gothel2019-03-197-1/+1818
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NewtCanvasJFX NewtCanvasJFX, a JavaFX Canvas Node, allows attaching a native NEWT Window to the JavaFX Node's native Window (if attached). The mechanism is similar to NewtCanvasAWT. Current implementation supports placing the NEWT Window into the JavaFX scene of the native window correctly, as well as the following different lifecycles - attach NewtCanvasJFX to already visible group->scene->window - attach NewtCanvasJFX to not yet visible or attached group->scene->window - attach NEWT Window before or after NewtCanvasJFX's visibility The above is covered by unit test: TestNewtCanvasJFXGLn This is the initial commit for JavaFX support and has been tested on - OpenJDK 8 + OpenJFX 8 - GNU/Linux X11
* | | OSX/Newt: Catch NSRangeException on closing a windowSven Gothel2019-01-231-0/+5
| | | | | | | | | | | | rarely occurs on terminating or killing the process
* | | Bug 1290: Expand query whether BCM IV is being used, exclude '/dev/dri/card0'rcpulledSven Gothel2018-01-163-27/+87
| | | | | | | | | | | | Also refactor query to jogamp.nativewindow.BcmVCArtifacts
* | | Merge pull request #96 from gohai/vc4-moduleSven Gothel2018-01-152-2/+20
|\ \ \ | | | | | | | | Change BCM VC IV detection to handle presence of vc4 DRI module
| * | | Change library search order for Broadcom VC IV graphicsgohai2017-02-161-1/+17
| | | | | | | | | | | | | | | | When the VC4 DRM driver isn't loaded, we want to load the VC IV GLES2 driver, which is - unfortunately - only available as libGLESv2.so.
| * | | Change BCM VC IV detection to handle presence of vc4 DRI modulegohai2016-02-101-1/+3
| |/ / | | | | | | | | | The recent Raspbian release comes with a vc4 kernel module that can be activated with a device tree overlay. In this case, we want to use the DRI & Mesa / Gallium3D driver instead of the BCM VC IV one, whose userspace library remains in /opt/vc.
* | | Merge branch 'bug1294'Sven Gothel2018-01-151-2/+1
|\ \ \
| * | | Shows all information of the default graphics device in JoglVersion, bug 1294bug1294Julien Gouesse2016-04-051-2/+1
| |/ /
* | | Version Semantics Test: Bump for 2.4.0 -> 2.3.xSven Gothel2018-01-151-4/+4
| | | | | | | | | | | | We are still on the 2.3.x branch for the next release
* | | Merge remote-tracking branch 'remotes/hharrison/master'Sven Gothel2018-01-151-8/+8
|\ \ \
| * | | jogl: complete audit of code for unneeded calls to .intern()Harvey Harrison2015-12-071-8/+8
| |/ / | | | | | | | | | | | | | | | | | | Completes task from Bug1059. These calls are not needed as the VM implicitly interns String constants when a class is loaded. Signed-off-by: Harvey Harrison <[email protected]>
* / / Bug 1299: Fix Warning when using JOGL on Mac OS X El CapitanSven Gothel2018-01-151-1/+6
|/ / | | | | | | | | | | | | It turned out to be a missing CATransaction, i.e. the native create/destroy commands had to be encapsulated within [CATransaction begin] and [CATransaction commit] causing the uncommitted CATransaction.