Menu
▾
▴
java-game-lib-cvs — Commits to the repository will be send to this list.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(134) |
Sep
(52) |
Oct
(13) |
Nov
(342) |
Dec
(163) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(44) |
Feb
(62) |
Mar
(158) |
Apr
(38) |
May
(70) |
Jun
(58) |
Jul
(104) |
Aug
(207) |
Sep
(83) |
Oct
(122) |
Nov
(23) |
Dec
(49) |
| 2004 |
Jan
(119) |
Feb
(132) |
Mar
(192) |
Apr
(140) |
May
(77) |
Jun
(74) |
Jul
(201) |
Aug
(63) |
Sep
(102) |
Oct
(70) |
Nov
(173) |
Dec
(78) |
| 2005 |
Jan
(174) |
Feb
(197) |
Mar
(105) |
Apr
(59) |
May
(77) |
Jun
(43) |
Jul
(21) |
Aug
(18) |
Sep
(47) |
Oct
(37) |
Nov
(74) |
Dec
(50) |
| 2006 |
Jan
(44) |
Feb
(19) |
Mar
(32) |
Apr
(24) |
May
(31) |
Jun
(55) |
Jul
(138) |
Aug
(28) |
Sep
(12) |
Oct
(41) |
Nov
(58) |
Dec
(24) |
| 2007 |
Jan
(28) |
Feb
(14) |
Mar
(10) |
Apr
(68) |
May
(30) |
Jun
(26) |
Jul
(18) |
Aug
(63) |
Sep
(19) |
Oct
(29) |
Nov
(20) |
Dec
(10) |
| 2008 |
Jan
(38) |
Feb
(7) |
Mar
(37) |
Apr
(120) |
May
(41) |
Jun
(36) |
Jul
(39) |
Aug
(24) |
Sep
(28) |
Oct
(30) |
Nov
(36) |
Dec
(75) |
| 2009 |
Jan
(46) |
Feb
(22) |
Mar
(50) |
Apr
(70) |
May
(134) |
Jun
(105) |
Jul
(75) |
Aug
(34) |
Sep
(38) |
Oct
(34) |
Nov
(19) |
Dec
(20) |
| 2010 |
Jan
(11) |
Feb
(20) |
Mar
(65) |
Apr
(83) |
May
(104) |
Jun
(73) |
Jul
(78) |
Aug
(57) |
Sep
(43) |
Oct
(35) |
Nov
(9) |
Dec
(4) |
| 2011 |
Jan
(21) |
Feb
(11) |
Mar
(18) |
Apr
(10) |
May
(18) |
Jun
(15) |
Jul
(48) |
Aug
(25) |
Sep
(17) |
Oct
(45) |
Nov
(15) |
Dec
(12) |
| 2012 |
Jan
(21) |
Feb
(9) |
Mar
(12) |
Apr
(9) |
May
(9) |
Jun
(5) |
Jul
(1) |
Aug
(10) |
Sep
(12) |
Oct
(1) |
Nov
(28) |
Dec
(5) |
| 2013 |
Jan
(4) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2015 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
| 2016 |
Jan
(2) |
Feb
(1) |
Mar
(1) |
Apr
(1) |
May
(2) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
1
|
2
(14) |
3
|
4
(5) |
5
(3) |
|
6
|
7
(1) |
8
|
9
|
10
(3) |
11
|
12
|
|
13
|
14
|
15
(1) |
16
(2) |
17
|
18
|
19
|
|
20
(4) |
21
(18) |
22
(10) |
23
(6) |
24
(3) |
25
|
26
|
|
27
|
28
(4) |
29
|
30
|
|
|
|
|
From: Brian M. <ma...@us...> - 2005-11-28 22:12:20
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31817/src/native/common/fmod3 Modified Files: org_lwjgl_fmod3_FMOD.c Log Message: fixed version mismatch (!!!!) Index: org_lwjgl_fmod3_FMOD.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- org_lwjgl_fmod3_FMOD.c 19 May 2005 22:32:30 -0000 1.13 +++ org_lwjgl_fmod3_FMOD.c 28 Nov 2005 22:12:06 -0000 1.14 @@ -33,7 +33,7 @@ #include "org_lwjgl_fmod3_FMOD.h" #include "extfmod3.h" -static const char* VERSION = "0.97"; +static const char* VERSION = "0.98"; /* * Class: org_lwjgl_fmod3_FMOD |
|
From: Brian M. <ma...@us...> - 2005-11-28 22:11:30
|
Update of /cvsroot/java-game-lib/LWJGL/www/changelogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31642/www/changelogs Modified Files: full-changelog.txt Added Files: 0.98-changelog.txt Log Message: missing changelog comit on 98 (!) --- NEW FILE: 0.98-changelog.txt --- 2005-08-18 15:55 matzon * src/java/org/lwjgl/: test/WindowCreationTest.java, util/XPMFile.java: fixed XPMFile to use InputStream load method too 2005-08-18 15:48 matzon * doc/README: updated readme to include jinput 2005-08-18 15:48 matzon * build.xml: include jinput in release target 2005-08-18 13:27 matzon * src/java/org/lwjgl/util/WaveData.java: added everything but the kitchen sink 2005-08-18 00:05 matzon * build.xml, src/native/common/common_tools.c, src/java/org/lwjgl/Sys.java, src/java/org/lwjgl/fmod3/FMOD.java: 0.98 version string 2005-08-08 18:00 elias_naur * src/native/win32/: extgl_wgl.c, org_lwjgl_opengl_Win32ContextImplementation.c: Win32: Fixed SIS/VIA crashes 2005-08-07 14:19 elias_naur * src/java/org/lwjgl/opengl/: Context.java, GLContext.java: Added fast path to GLContext.getCapabilities() optimized for single threaded applications 2005-07-22 17:28 matzon * www/projects.php: make elias stop whine 2005-07-22 00:17 matzon * www/: projects.php, _gfx/projects/cultris_1.jpg, _gfx/projects/cultris_2.jpg, _gfx/projects/cultris_3.jpg, _gfx/projects/cultris_small_1.jpg, _gfx/projects/cultris_small_2.jpg, _gfx/projects/cultris_small_3.jpg, _gfx/projects/keith_goes_painting_1.jpg, _gfx/projects/keith_goes_painting_2.jpg, _gfx/projects/keith_goes_painting_3.jpg, _gfx/projects/keith_goes_painting_small_1.jpg, _gfx/projects/keith_goes_painting_small_2.jpg, _gfx/projects/keith_goes_painting_small_3.jpg: added Cultris added Keith Goes Painting fixed StarShip2D path 2005-07-20 09:30 matzon * src/java/org/lwjgl/opengl/Pbuffer.java: fix for matrox parhelia, they wont accept NULL buffer, despite the specs saying it's legit. Bugfinding: Javazoid 2005-07-19 21:32 matzon * build.xml: add jinput to classpath when building org.lwjgl.* instead, since input is dragged into the compile via Sys.java 2005-07-16 13:27 kevglass * src/native/win32/org_lwjgl_opengl_Display.c: Fix for alpha based icons under win32. 2005-07-16 13:15 matzon * src/java/org/lwjgl/opengl/Display.java: caching of window icon 2005-07-16 12:37 kevglass * src/java/org/lwjgl/test/WindowCreationTest.java: LWJGL icon used as window icon in test. 2005-07-16 12:36 kevglass * src/java/org/lwjgl/util/XPMFile.java: Fix for compilation on 1.4, remove autoboxing 2005-07-16 12:30 kevglass * src/native/win32/org_lwjgl_opengl_Display.c: Fix win32 icon alpha mask 2005-07-16 11:13 matzon * res/: lwjgl_16x16.xpm, lwjgl_32x32.xpm: temp XPM logo files 2005-07-16 11:11 matzon * src/java/org/lwjgl/util/XPMFile.java: XPM File reader 2005-07-11 19:05 matzon * src/java/org/lwjgl/test/WindowCreationTest.java: way simple icon test 2005-07-10 22:16 kevglass * src/native/win32/org_lwjgl_opengl_Display.c: Fix native code to work with RGBA rather than RBGR. 2005-07-10 22:15 kevglass * src/java/org/lwjgl/opengl/: LinuxDisplay.java, Win32Display.java: Fix size check bug in icon setting. Divide by four to get the size of the buffer in pixels. 2005-07-06 21:46 kevglass * src/native/linux/org_lwjgl_opengl_Display.c: Added Linux native code for window icon setting. 2005-07-06 00:09 kevglass * src/java/org/lwjgl/opengl/Win32Display.java: Updated Win32 native interface to use IntBuffers rather than ByteBuffers 2005-07-06 00:08 kevglass * src/native/win32/org_lwjgl_opengl_Display.c: Updated to actually convert the passed int buffer 2005-07-05 23:54 kevglass * src/java/org/lwjgl/opengl/: Display.java, DisplayImplementation.java, LinuxDisplay.java, MacOSXDisplay.java, Win32Display.java: Added methods to set the window icon. MacOS implementation added using AWT images. 2005-07-05 23:46 kevglass * src/native/linux/org_lwjgl_opengl_Display.c: Added empty implementation of the window icon setting code in preperation for adding the Linux version. 2005-07-05 23:45 kevglass * src/native/win32/org_lwjgl_opengl_Display.c: Added function to set the window icon on win32 2005-06-29 22:48 matzon * src/java/org/lwjgl/opengl/Display.java: automatic polling via Display.update(); 2005-06-29 22:47 matzon * src/java/org/lwjgl/input/Controllers.java: support isCreated and destroy (destroy currently ignored) 2005-06-29 22:38 matzon * src/java/org/lwjgl/input/: JInputController.java, ControllerEvent.java: decrease visibility of classes 2005-06-29 22:32 matzon * libs/: linux/libIL.so, linux/libILU.so, linux/libILUT.so, linux/libopenal.so, macosx/libIL.dylib, macosx/libILU.dylib, macosx/libILUT.dylib, macosx/openal.dylib, win32/DevIL.dll, win32/ILU.dll, win32/ILUT.dll, win32/lwjglaudio.dll: added 3rd party native libs 2005-06-29 22:16 matzon * doc/3rdparty/: jinput_license.txt, openal_license.txt, openil_license.txt: added licenses 2005-06-29 22:16 matzon * doc/CREDITS: added comment about 3rd party library usage and dependency 2005-06-29 22:13 kevglass * build.xml: Initial controller input checkin. Updates to add classpath to javac task for building input. 2005-06-29 22:11 kevglass * src/java/org/lwjgl/: input/Controller.java, input/ControllerEvent.java, input/Controllers.java, input/JInputController.java, test/input/TestControllers.java: Initial controller input checkin. Source for the wrapper round JInput including the test tool. 2005-06-29 22:08 kevglass * libs/linux/libjinput-linux.so: Initial controller input checkin. JInput native for linux. 2005-06-29 22:04 kevglass * libs/win32/jinput-dxplugin.dll: Initial controller input checkin. JInput native for win32 2005-06-29 22:03 kevglass * libs/macosx/libjinput.jnilib: Initial controller input checkin. JInput native for macosx 2005-06-29 22:00 kevglass * libs/jinput.jar: Initial controller input checkin. Jar for jinput. 2005-06-29 09:39 elias_naur * src/: java/org/lwjgl/openal/AL10.java, java/org/lwjgl/opengl/ARBBufferObject.java, java/org/lwjgl/opengl/ARBColorBufferFloat.java, java/org/lwjgl/opengl/ARBDepthTexture.java, java/org/lwjgl/opengl/ARBDrawBuffers.java, java/org/lwjgl/opengl/ARBFragmentProgram.java, java/org/lwjgl/opengl/ARBFragmentShader.java, java/org/lwjgl/opengl/ARBHalfFloatPixel.java, java/org/lwjgl/opengl/ARBImaging.java, java/org/lwjgl/opengl/ARBMatrixPalette.java, java/org/lwjgl/opengl/ARBMultisample.java, java/org/lwjgl/opengl/ARBMultitexture.java, java/org/lwjgl/opengl/ARBOcclusionQuery.java, java/org/lwjgl/opengl/ARBPixelBufferObject.java, java/org/lwjgl/opengl/ARBPointParameters.java, java/org/lwjgl/opengl/ARBPointSprite.java, java/org/lwjgl/opengl/ARBProgram.java, java/org/lwjgl/opengl/ARBShaderObjects.java, java/org/lwjgl/opengl/ARBShadow.java, java/org/lwjgl/opengl/ARBTextureCompression.java, java/org/lwjgl/opengl/ARBTextureCubeMap.java, java/org/lwjgl/opengl/ARBTextureEnvCombine.java, java/org/lwjgl/opengl/ARBTextureEnvDot3.java, java/org/lwjgl/opengl/ARBTextureFloat.java, java/org/lwjgl/opengl/ARBTextureRectangle.java, java/org/lwjgl/opengl/ARBTransposeMatrix.java, java/org/lwjgl/opengl/ARBVertexBlend.java, java/org/lwjgl/opengl/ARBVertexBufferObject.java, java/org/lwjgl/opengl/ARBVertexProgram.java, java/org/lwjgl/opengl/ARBVertexShader.java, java/org/lwjgl/opengl/ARBWindowPos.java, java/org/lwjgl/opengl/ATIDrawBuffers.java, java/org/lwjgl/opengl/ATIElementArray.java, java/org/lwjgl/opengl/ATIEnvmapBumpmap.java, java/org/lwjgl/opengl/ATIFragmentShader.java, java/org/lwjgl/opengl/ATIMapObjectBuffer.java, java/org/lwjgl/opengl/ATIPnTriangles.java, java/org/lwjgl/opengl/ATISeparateStencil.java, java/org/lwjgl/opengl/ATITextureFloat.java, java/org/lwjgl/opengl/ATITextureMirrorOnce.java, java/org/lwjgl/opengl/ATIVertexArrayObject.java, java/org/lwjgl/opengl/ATIVertexAttribArrayObject.java, java/org/lwjgl/opengl/ATIVertexStreams.java, java/org/lwjgl/opengl/ContextCapabilities.java, java/org/lwjgl/opengl/EXTBgra.java, java/org/lwjgl/opengl/EXTBlendEquationSeparate.java, java/org/lwjgl/opengl/EXTBlendFuncSeparate.java, java/org/lwjgl/opengl/EXTBlendSubtract.java, java/org/lwjgl/opengl/EXTCgShader.java, java/org/lwjgl/opengl/EXTCompiledVertexArray.java, java/org/lwjgl/opengl/EXTDepthBoundsTest.java, java/org/lwjgl/opengl/EXTDrawRangeElements.java, java/org/lwjgl/opengl/EXTFogCoord.java, java/org/lwjgl/opengl/EXTFramebufferObject.java, java/org/lwjgl/opengl/EXTPackedPixels.java, java/org/lwjgl/opengl/EXTPalettedTexture.java, java/org/lwjgl/opengl/EXTPixelBufferObject.java, java/org/lwjgl/opengl/EXTPointParameters.java, java/org/lwjgl/opengl/EXTSecondaryColor.java, java/org/lwjgl/opengl/EXTSeparateSpecularColor.java, java/org/lwjgl/opengl/EXTStencilTwoSide.java, java/org/lwjgl/opengl/EXTStencilWrap.java, java/org/lwjgl/opengl/EXTTextureCompressionS3TC.java, java/org/lwjgl/opengl/EXTTextureEnvCombine.java, java/org/lwjgl/opengl/EXTTextureEnvDot3.java, java/org/lwjgl/opengl/EXTTextureFilterAnisotropic.java, java/org/lwjgl/opengl/EXTTextureLODBias.java, java/org/lwjgl/opengl/EXTTextureMirrorClamp.java, java/org/lwjgl/opengl/EXTTextureRectangle.java, java/org/lwjgl/opengl/EXTVertexShader.java, java/org/lwjgl/opengl/EXTVertexWeighting.java, java/org/lwjgl/opengl/GL11.java, java/org/lwjgl/opengl/GL12.java, java/org/lwjgl/opengl/GL13.java, java/org/lwjgl/opengl/GL14.java, java/org/lwjgl/opengl/GL15.java, java/org/lwjgl/opengl/GL20.java, java/org/lwjgl/opengl/HPOcclusionTest.java, java/org/lwjgl/opengl/MouseEventQueue.java, java/org/lwjgl/opengl/NVCopyDepthToColor.java, java/org/lwjgl/opengl/NVEvaluators.java, java/org/lwjgl/opengl/NVFence.java, java/org/lwjgl/opengl/NVFloatBuffer.java, java/org/lwjgl/opengl/NVFogDistance.java, java/org/lwjgl/opengl/NVFragmentProgram.java, java/org/lwjgl/opengl/NVFragmentProgram2.java, java/org/lwjgl/opengl/NVHalfFloat.java, java/org/lwjgl/opengl/NVLightMaxExponent.java, java/org/lwjgl/opengl/NVOcclusionQuery.java, java/org/lwjgl/opengl/NVPackedDepthStencil.java, java/org/lwjgl/opengl/NVPixelDataRange.java, java/org/lwjgl/opengl/NVPointSprite.java, java/org/lwjgl/opengl/NVPrimitiveRestart.java, java/org/lwjgl/opengl/NVProgram.java, java/org/lwjgl/opengl/NVRegisterCombiners.java, java/org/lwjgl/opengl/NVRegisterCombiners2.java, java/org/lwjgl/opengl/NVTexgenReflection.java, java/org/lwjgl/opengl/NVTextureCompressionVTC.java, java/org/lwjgl/opengl/NVTextureEnvCombine4.java, java/org/lwjgl/opengl/NVTextureRectangle.java, java/org/lwjgl/opengl/NVTextureShader.java, java/org/lwjgl/opengl/NVTextureShader2.java, java/org/lwjgl/opengl/NVTextureShader3.java, java/org/lwjgl/opengl/NVVertexArrayRange.java, java/org/lwjgl/opengl/NVVertexProgram.java, java/org/lwjgl/opengl/NVVertexProgram2Option.java, java/org/lwjgl/opengl/References.java, native/common/org_lwjgl_openal_AL10.c, native/common/org_lwjgl_opengl_GL11.c, native/common/org_lwjgl_opengl_GL12.c, native/common/org_lwjgl_opengl_GL13.c, native/common/org_lwjgl_opengl_GL14.c, native/common/org_lwjgl_opengl_GL15.c, native/common/org_lwjgl_opengl_GL20.c, native/common/arb/org_lwjgl_opengl_ARBBufferObject.c, native/common/arb/org_lwjgl_opengl_ARBImaging.c, native/common/arb/org_lwjgl_opengl_ARBMatrixPalette.c, native/common/arb/org_lwjgl_opengl_ARBMultitexture.c, native/common/arb/org_lwjgl_opengl_ARBOcclusionQuery.c, native/common/arb/org_lwjgl_opengl_ARBPointParameters.c, native/common/arb/org_lwjgl_opengl_ARBProgram.c, native/common/arb/org_lwjgl_opengl_ARBShaderObjects.c, native/common/arb/org_lwjgl_opengl_ARBTextureCompression.c, native/common/arb/org_lwjgl_opengl_ARBTransposeMatrix.c, native/common/arb/org_lwjgl_opengl_ARBVertexBlend.c, native/common/arb/org_lwjgl_opengl_ARBVertexProgram.c, native/common/arb/org_lwjgl_opengl_ARBVertexShader.c, native/common/arb/org_lwjgl_opengl_ARBWindowPos.c, native/common/ati/org_lwjgl_opengl_ATIElementArray.c, native/common/ati/org_lwjgl_opengl_ATIEnvmapBumpmap.c, native/common/ati/org_lwjgl_opengl_ATIFragmentShader.c, native/common/ati/org_lwjgl_opengl_ATIMapObjectBuffer.c, native/common/ati/org_lwjgl_opengl_ATIPnTriangles.c, native/common/ati/org_lwjgl_opengl_ATISeparateStencil.c, native/common/ati/org_lwjgl_opengl_ATIVertexArrayObject.c, native/common/ati/org_lwjgl_opengl_ATIVertexAttribArrayObject.c, native/common/ati/org_lwjgl_opengl_ATIVertexStreams.c, native/common/ext/org_lwjgl_opengl_EXTCompiledVertexArray.c, native/common/ext/org_lwjgl_opengl_EXTFogCoord.c, native/common/ext/org_lwjgl_opengl_EXTFramebufferObject.c, native/common/ext/org_lwjgl_opengl_EXTPalettedTexture.c, native/common/ext/org_lwjgl_opengl_EXTPointParameters.c, native/common/ext/org_lwjgl_opengl_EXTSecondaryColor.c, native/common/ext/org_lwjgl_opengl_EXTVertexShader.c, native/common/ext/org_lwjgl_opengl_EXTVertexWeighting.c, native/common/nv/org_lwjgl_opengl_NVEvaluators.c, native/common/nv/org_lwjgl_opengl_NVFence.c, native/common/nv/org_lwjgl_opengl_NVFragmentProgram.c, native/common/nv/org_lwjgl_opengl_NVHalfFloat.c, native/common/nv/org_lwjgl_opengl_NVOcclusionQuery.c, native/common/nv/org_lwjgl_opengl_NVPixelDataRange.c, native/common/nv/org_lwjgl_opengl_NVPointSprite.c, native/common/nv/org_lwjgl_opengl_NVPrimitiveRestart.c, native/common/nv/org_lwjgl_opengl_NVProgram.c, native/common/nv/org_lwjgl_opengl_NVRegisterCombiners.c, native/common/nv/org_lwjgl_opengl_NVRegisterCombiners2.c, native/common/nv/org_lwjgl_opengl_NVVertexArrayRange.c, native/common/nv/org_lwjgl_opengl_NVVertexProgram.c: Mac OS X: Handle MouseEvent.NOBUTTON case 2005-06-28 17:19 elias_naur * src/native/linux/org_lwjgl_opengl_Display.c: Linux: Added library unload destructor that resets keyboard repeat mode 2005-06-17 11:59 matzon * www/faq.php: fixed path to forum 2005-06-16 22:59 elias_naur * src/java/org/lwjgl/opengl/Display.java: Check for null pixel format in Display.create 2005-06-16 16:39 matzon * www/_include/header.php: fixed overflow added channel id 2005-06-16 16:03 matzon * www/: index.php, _include/header.php: now displaying adsense 2005-06-16 13:18 matzon * src/java/org/lwjgl/opengl/glu/MipMap.java: patch as per: http://lwjgl.org/forum/viewtopic.php?t=1130 2005-06-09 20:08 spasi * src/templates/org/lwjgl/opengl/: ARB_half_float_pixel.java, ARB_pixel_buffer_object.java, ARB_texture_float.java: Added missing GL_ prefixes 2005-06-07 12:33 spasi * src/java/org/lwjgl/test/opengl/pbuffers/PbufferTest.java: Fixed mode parameter 2005-06-07 11:27 spasi * src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java: Added missing GL_ prefixes 2005-06-06 22:51 spasi * src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java: EXT_fbo spec changes 2005-06-05 14:12 matzon * build.xml: added missing shaders to lwjgl_test.jar added changelog target 2005-06-05 13:50 matzon * src/java/org/lwjgl/test/opengl/shaders/ShadersTest.java: set displaymode when it isn't null! 2005-06-04 23:14 elias_naur * src/native/linux/org_lwjgl_opengl_Pbuffer.c: Linux: Added missing NULL check 2005-06-03 10:26 elias_naur * src/native/macosx/context.m: Mac OS X: Use NSOpenGLPFAMinimumPolicy when selecting pixel formats 2005-06-01 09:18 elias_naur * src/java/org/lwjgl/opengl/MacOSXDisplay.java: Added doPrivileged to MacOSXDisplay.setCursorPosition() 2005-05-30 18:21 elias_naur * src/: java/org/lwjgl/LWJGLUtil.java, java/org/lwjgl/LinuxSysImplementation.java, java/org/lwjgl/MacOSXSysImplementation.java, java/org/lwjgl/Sys.java, java/org/lwjgl/opengl/Display.java, java/org/lwjgl/opengl/GLContext.java, java/org/lwjgl/opengl/LinuxCanvasImplementation.java, java/org/lwjgl/opengl/MacOSXDisplay.java, java/org/lwjgl/opengl/MacOSXFrame.java, native/common/common_tools.c: Added AccessController.doPrivileged where needed 2005-05-30 00:16 matzon * src/java/org/lwjgl/devil/IL.java: javadoc 2005-05-30 00:14 matzon * src/java/org/lwjgl/devil/IL.java: added getILType(filename) 2005-05-29 23:53 matzon * build.xml: fixed lib includes for mac os x on release 2005-05-29 23:24 matzon * src/native/common/devil/: extil.c, extilu.c, extilut.c: use dlopen to load dynamic libraries 2005-05-28 10:48 matzon * src/java/org/lwjgl/opengl/glu/MipMap.java: added UlfJacks GL_FLOAT patch for gluScaleImage 2005-05-27 13:50 elias_naur * src/: java/org/lwjgl/opengl/LinuxAWTGLCanvasPeerInfo.java, java/org/lwjgl/opengl/LinuxCanvasImplementation.java, java/org/lwjgl/opengl/Win32CanvasImplementation.java, native/linux/org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c: Linux AWT: in case we're not on a SUN jdk, try to determine values instead of bombing out. This should help us compile and run on gcj 2005-05-22 14:12 matzon * src/java/org/lwjgl/: examples/Game.java, examples/spaceinvaders/Game.java, test/DisplayTest.java, test/SysTest.java, test/WindowCreationTest.java, test/devil/BasicTest.java, test/fmod3/CDDAPlayer.java, test/fmod3/CDPlayer.java, test/fmod3/DSPTest.java, test/fmod3/MusicPlayer.java, test/fmod3/NetTest.java, test/fmod3/StreamPlayer.java, test/fmod3/StreamPlayerMemory.java, test/fmod3/StreamTest.java, test/fmod3/SyncTest.java, test/fmod3/TagFieldTest.java, test/input/HWCursorTest.java, test/input/KeyboardTest.java, test/input/MouseCreationTest.java, test/input/MouseTest.java, test/openal/ALCTest.java, test/openal/MovingSoundTest.java, test/openal/OpenALCreationTest.java, test/openal/PlayTest.java, test/openal/PlayTestMemory.java, test/openal/PositionTest.java, test/openal/SourceLimitTest.java, test/openal/StressTest.java, test/opengl/FullScreenWindowedTest.java, test/opengl/Gears.java, test/opengl/PbufferTest.java, test/opengl/VBOIndexTest.java, test/opengl/VBOTest.java, test/opengl/awt/AWTGears.java, test/opengl/awt/AWTTest.java, test/opengl/awt/DemoBox.java, test/opengl/pbuffers/PbufferTest.java, test/opengl/shaders/ShadersTest.java: added System.exit so that vm instances gets nuked in webstart 2005-05-22 13:14 matzon * src/native/common/devil/: extilu.c, extilut.c: using .dylibs for devil on mac 2005-05-22 13:09 matzon * src/java/org/lwjgl/devil/: IL.java, ILU.java, ILUT.java: using .dylibs for devil on mac 2005-05-20 00:31 matzon * src/: java/org/lwjgl/fmod3/FMOD.java, native/common/fmod3/org_lwjgl_fmod3_FMOD.c: fixed fmod webstart loading 2005-05-20 00:30 matzon * build.xml: sign target 2005-05-19 18:18 matzon * www/: changelog.php, download.php, index.php, changelogs/0.97-changelog.txt, changelogs/full-changelog.txt: 0.97 updates Index: full-changelog.txt =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/www/changelogs/full-changelog.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- full-changelog.txt 19 May 2005 16:18:28 -0000 1.8 +++ full-changelog.txt 28 Nov 2005 22:11:21 -0000 1.9 @@ -1,3 +1,545 @@ +2005-08-18 15:55 matzon + + * src/java/org/lwjgl/: test/WindowCreationTest.java, + util/XPMFile.java: fixed XPMFile to use InputStream load method + too + +2005-08-18 15:48 matzon + + * doc/README: updated readme to include jinput + +2005-08-18 15:48 matzon + + * build.xml: include jinput in release target + +2005-08-18 13:27 matzon + + * src/java/org/lwjgl/util/WaveData.java: added everything but the + kitchen sink + +2005-08-18 00:05 matzon + + * build.xml, src/native/common/common_tools.c, + src/java/org/lwjgl/Sys.java, src/java/org/lwjgl/fmod3/FMOD.java: + 0.98 version string + +2005-08-08 18:00 elias_naur + + * src/native/win32/: extgl_wgl.c, + org_lwjgl_opengl_Win32ContextImplementation.c: Win32: Fixed + SIS/VIA crashes + +2005-08-07 14:19 elias_naur + + * src/java/org/lwjgl/opengl/: Context.java, GLContext.java: Added + fast path to GLContext.getCapabilities() optimized for single + threaded applications + +2005-07-22 17:28 matzon + + * www/projects.php: make elias stop whine + +2005-07-22 00:17 matzon + + * www/: projects.php, _gfx/projects/cultris_1.jpg, + _gfx/projects/cultris_2.jpg, _gfx/projects/cultris_3.jpg, + _gfx/projects/cultris_small_1.jpg, + _gfx/projects/cultris_small_2.jpg, + _gfx/projects/cultris_small_3.jpg, + _gfx/projects/keith_goes_painting_1.jpg, + _gfx/projects/keith_goes_painting_2.jpg, + _gfx/projects/keith_goes_painting_3.jpg, + _gfx/projects/keith_goes_painting_small_1.jpg, + _gfx/projects/keith_goes_painting_small_2.jpg, + _gfx/projects/keith_goes_painting_small_3.jpg: added Cultris + added Keith Goes Painting fixed StarShip2D path + +2005-07-20 09:30 matzon + + * src/java/org/lwjgl/opengl/Pbuffer.java: fix for matrox parhelia, + they wont accept NULL buffer, despite the specs saying it's + legit. Bugfinding: Javazoid + +2005-07-19 21:32 matzon + + * build.xml: add jinput to classpath when building org.lwjgl.* + instead, since input is dragged into the compile via Sys.java + +2005-07-16 13:27 kevglass + + * src/native/win32/org_lwjgl_opengl_Display.c: Fix for alpha based + icons under win32. + +2005-07-16 13:15 matzon + + * src/java/org/lwjgl/opengl/Display.java: caching of window icon + +2005-07-16 12:37 kevglass + + * src/java/org/lwjgl/test/WindowCreationTest.java: LWJGL icon used + as window icon in test. + +2005-07-16 12:36 kevglass + + * src/java/org/lwjgl/util/XPMFile.java: Fix for compilation on 1.4, + remove autoboxing + +2005-07-16 12:30 kevglass + + * src/native/win32/org_lwjgl_opengl_Display.c: Fix win32 icon alpha + mask + +2005-07-16 11:13 matzon + + * res/: lwjgl_16x16.xpm, lwjgl_32x32.xpm: temp XPM logo files + +2005-07-16 11:11 matzon + + * src/java/org/lwjgl/util/XPMFile.java: XPM File reader + +2005-07-11 19:05 matzon + + * src/java/org/lwjgl/test/WindowCreationTest.java: way simple icon + test + +2005-07-10 22:16 kevglass + + * src/native/win32/org_lwjgl_opengl_Display.c: Fix native code to + work with RGBA rather than RBGR. + +2005-07-10 22:15 kevglass + + * src/java/org/lwjgl/opengl/: LinuxDisplay.java, Win32Display.java: + Fix size check bug in icon setting. Divide by four to get the + size of the buffer in pixels. + +2005-07-06 21:46 kevglass + + * src/native/linux/org_lwjgl_opengl_Display.c: Added Linux native + code for window icon setting. + +2005-07-06 00:09 kevglass + + * src/java/org/lwjgl/opengl/Win32Display.java: Updated Win32 native + interface to use IntBuffers rather than ByteBuffers + +2005-07-06 00:08 kevglass + + * src/native/win32/org_lwjgl_opengl_Display.c: Updated to actually + convert the passed int buffer + +2005-07-05 23:54 kevglass + + * src/java/org/lwjgl/opengl/: Display.java, + DisplayImplementation.java, LinuxDisplay.java, + MacOSXDisplay.java, Win32Display.java: Added methods to set the + window icon. MacOS implementation added using AWT images. + +2005-07-05 23:46 kevglass + + * src/native/linux/org_lwjgl_opengl_Display.c: Added empty + implementation of the window icon setting code in preperation for + adding the Linux version. + +2005-07-05 23:45 kevglass + + * src/native/win32/org_lwjgl_opengl_Display.c: Added function to + set the window icon on win32 + +2005-06-29 22:48 matzon + + * src/java/org/lwjgl/opengl/Display.java: automatic polling via + Display.update(); + +2005-06-29 22:47 matzon + + * src/java/org/lwjgl/input/Controllers.java: support isCreated and + destroy (destroy currently ignored) + +2005-06-29 22:38 matzon + + * src/java/org/lwjgl/input/: JInputController.java, + ControllerEvent.java: decrease visibility of classes + +2005-06-29 22:32 matzon + + * libs/: linux/libIL.so, linux/libILU.so, linux/libILUT.so, + linux/libopenal.so, macosx/libIL.dylib, macosx/libILU.dylib, + macosx/libILUT.dylib, macosx/openal.dylib, win32/DevIL.dll, + win32/ILU.dll, win32/ILUT.dll, win32/lwjglaudio.dll: added 3rd + party native libs + +2005-06-29 22:16 matzon + + * doc/3rdparty/: jinput_license.txt, openal_license.txt, + openil_license.txt: added licenses + +2005-06-29 22:16 matzon + + * doc/CREDITS: added comment about 3rd party library usage and + dependency + +2005-06-29 22:13 kevglass + + * build.xml: Initial controller input checkin. Updates to add + classpath to javac task for building input. + +2005-06-29 22:11 kevglass + + * src/java/org/lwjgl/: input/Controller.java, + input/ControllerEvent.java, input/Controllers.java, + input/JInputController.java, test/input/TestControllers.java: + Initial controller input checkin. Source for the wrapper round + JInput including the test tool. + +2005-06-29 22:08 kevglass + + * libs/linux/libjinput-linux.so: Initial controller input checkin. + JInput native for linux. + +2005-06-29 22:04 kevglass + + * libs/win32/jinput-dxplugin.dll: Initial controller input checkin. + JInput native for win32 + +2005-06-29 22:03 kevglass + + * libs/macosx/libjinput.jnilib: Initial controller input checkin. + JInput native for macosx + +2005-06-29 22:00 kevglass + + * libs/jinput.jar: Initial controller input checkin. Jar for + jinput. + +2005-06-29 09:39 elias_naur + + * src/: java/org/lwjgl/openal/AL10.java, + java/org/lwjgl/opengl/ARBBufferObject.java, + java/org/lwjgl/opengl/ARBColorBufferFloat.java, + java/org/lwjgl/opengl/ARBDepthTexture.java, + java/org/lwjgl/opengl/ARBDrawBuffers.java, + java/org/lwjgl/opengl/ARBFragmentProgram.java, + java/org/lwjgl/opengl/ARBFragmentShader.java, + java/org/lwjgl/opengl/ARBHalfFloatPixel.java, + java/org/lwjgl/opengl/ARBImaging.java, + java/org/lwjgl/opengl/ARBMatrixPalette.java, + java/org/lwjgl/opengl/ARBMultisample.java, + java/org/lwjgl/opengl/ARBMultitexture.java, + java/org/lwjgl/opengl/ARBOcclusionQuery.java, + java/org/lwjgl/opengl/ARBPixelBufferObject.java, + java/org/lwjgl/opengl/ARBPointParameters.java, + java/org/lwjgl/opengl/ARBPointSprite.java, + java/org/lwjgl/opengl/ARBProgram.java, + java/org/lwjgl/opengl/ARBShaderObjects.java, + java/org/lwjgl/opengl/ARBShadow.java, + java/org/lwjgl/opengl/ARBTextureCompression.java, + java/org/lwjgl/opengl/ARBTextureCubeMap.java, + java/org/lwjgl/opengl/ARBTextureEnvCombine.java, + java/org/lwjgl/opengl/ARBTextureEnvDot3.java, + java/org/lwjgl/opengl/ARBTextureFloat.java, + java/org/lwjgl/opengl/ARBTextureRectangle.java, + java/org/lwjgl/opengl/ARBTransposeMatrix.java, + java/org/lwjgl/opengl/ARBVertexBlend.java, + java/org/lwjgl/opengl/ARBVertexBufferObject.java, + java/org/lwjgl/opengl/ARBVertexProgram.java, + java/org/lwjgl/opengl/ARBVertexShader.java, + java/org/lwjgl/opengl/ARBWindowPos.java, + java/org/lwjgl/opengl/ATIDrawBuffers.java, + java/org/lwjgl/opengl/ATIElementArray.java, + java/org/lwjgl/opengl/ATIEnvmapBumpmap.java, + java/org/lwjgl/opengl/ATIFragmentShader.java, + java/org/lwjgl/opengl/ATIMapObjectBuffer.java, + java/org/lwjgl/opengl/ATIPnTriangles.java, + java/org/lwjgl/opengl/ATISeparateStencil.java, + java/org/lwjgl/opengl/ATITextureFloat.java, + java/org/lwjgl/opengl/ATITextureMirrorOnce.java, + java/org/lwjgl/opengl/ATIVertexArrayObject.java, + java/org/lwjgl/opengl/ATIVertexAttribArrayObject.java, + java/org/lwjgl/opengl/ATIVertexStreams.java, + java/org/lwjgl/opengl/ContextCapabilities.java, + java/org/lwjgl/opengl/EXTBgra.java, + java/org/lwjgl/opengl/EXTBlendEquationSeparate.java, + java/org/lwjgl/opengl/EXTBlendFuncSeparate.java, + java/org/lwjgl/opengl/EXTBlendSubtract.java, + java/org/lwjgl/opengl/EXTCgShader.java, + java/org/lwjgl/opengl/EXTCompiledVertexArray.java, + java/org/lwjgl/opengl/EXTDepthBoundsTest.java, + java/org/lwjgl/opengl/EXTDrawRangeElements.java, + java/org/lwjgl/opengl/EXTFogCoord.java, + java/org/lwjgl/opengl/EXTFramebufferObject.java, + java/org/lwjgl/opengl/EXTPackedPixels.java, + java/org/lwjgl/opengl/EXTPalettedTexture.java, + java/org/lwjgl/opengl/EXTPixelBufferObject.java, + java/org/lwjgl/opengl/EXTPointParameters.java, + java/org/lwjgl/opengl/EXTSecondaryColor.java, + java/org/lwjgl/opengl/EXTSeparateSpecularColor.java, + java/org/lwjgl/opengl/EXTStencilTwoSide.java, + java/org/lwjgl/opengl/EXTStencilWrap.java, + java/org/lwjgl/opengl/EXTTextureCompressionS3TC.java, + java/org/lwjgl/opengl/EXTTextureEnvCombine.java, + java/org/lwjgl/opengl/EXTTextureEnvDot3.java, + java/org/lwjgl/opengl/EXTTextureFilterAnisotropic.java, + java/org/lwjgl/opengl/EXTTextureLODBias.java, + java/org/lwjgl/opengl/EXTTextureMirrorClamp.java, + java/org/lwjgl/opengl/EXTTextureRectangle.java, + java/org/lwjgl/opengl/EXTVertexShader.java, + java/org/lwjgl/opengl/EXTVertexWeighting.java, + java/org/lwjgl/opengl/GL11.java, java/org/lwjgl/opengl/GL12.java, + java/org/lwjgl/opengl/GL13.java, java/org/lwjgl/opengl/GL14.java, + java/org/lwjgl/opengl/GL15.java, java/org/lwjgl/opengl/GL20.java, + java/org/lwjgl/opengl/HPOcclusionTest.java, + java/org/lwjgl/opengl/MouseEventQueue.java, + java/org/lwjgl/opengl/NVCopyDepthToColor.java, + java/org/lwjgl/opengl/NVEvaluators.java, + java/org/lwjgl/opengl/NVFence.java, + java/org/lwjgl/opengl/NVFloatBuffer.java, + java/org/lwjgl/opengl/NVFogDistance.java, + java/org/lwjgl/opengl/NVFragmentProgram.java, + java/org/lwjgl/opengl/NVFragmentProgram2.java, + java/org/lwjgl/opengl/NVHalfFloat.java, + java/org/lwjgl/opengl/NVLightMaxExponent.java, + java/org/lwjgl/opengl/NVOcclusionQuery.java, + java/org/lwjgl/opengl/NVPackedDepthStencil.java, + java/org/lwjgl/opengl/NVPixelDataRange.java, + java/org/lwjgl/opengl/NVPointSprite.java, + java/org/lwjgl/opengl/NVPrimitiveRestart.java, + java/org/lwjgl/opengl/NVProgram.java, + java/org/lwjgl/opengl/NVRegisterCombiners.java, + java/org/lwjgl/opengl/NVRegisterCombiners2.java, + java/org/lwjgl/opengl/NVTexgenReflection.java, + java/org/lwjgl/opengl/NVTextureCompressionVTC.java, + java/org/lwjgl/opengl/NVTextureEnvCombine4.java, + java/org/lwjgl/opengl/NVTextureRectangle.java, + java/org/lwjgl/opengl/NVTextureShader.java, + java/org/lwjgl/opengl/NVTextureShader2.java, + java/org/lwjgl/opengl/NVTextureShader3.java, + java/org/lwjgl/opengl/NVVertexArrayRange.java, + java/org/lwjgl/opengl/NVVertexProgram.java, + java/org/lwjgl/opengl/NVVertexProgram2Option.java, + java/org/lwjgl/opengl/References.java, + native/common/org_lwjgl_openal_AL10.c, + native/common/org_lwjgl_opengl_GL11.c, + native/common/org_lwjgl_opengl_GL12.c, + native/common/org_lwjgl_opengl_GL13.c, + native/common/org_lwjgl_opengl_GL14.c, + native/common/org_lwjgl_opengl_GL15.c, + native/common/org_lwjgl_opengl_GL20.c, + native/common/arb/org_lwjgl_opengl_ARBBufferObject.c, + native/common/arb/org_lwjgl_opengl_ARBImaging.c, + native/common/arb/org_lwjgl_opengl_ARBMatrixPalette.c, + native/common/arb/org_lwjgl_opengl_ARBMultitexture.c, + native/common/arb/org_lwjgl_opengl_ARBOcclusionQuery.c, + native/common/arb/org_lwjgl_opengl_ARBPointParameters.c, + native/common/arb/org_lwjgl_opengl_ARBProgram.c, + native/common/arb/org_lwjgl_opengl_ARBShaderObjects.c, + native/common/arb/org_lwjgl_opengl_ARBTextureCompression.c, + native/common/arb/org_lwjgl_opengl_ARBTransposeMatrix.c, + native/common/arb/org_lwjgl_opengl_ARBVertexBlend.c, + native/common/arb/org_lwjgl_opengl_ARBVertexProgram.c, + native/common/arb/org_lwjgl_opengl_ARBVertexShader.c, + native/common/arb/org_lwjgl_opengl_ARBWindowPos.c, + native/common/ati/org_lwjgl_opengl_ATIElementArray.c, + native/common/ati/org_lwjgl_opengl_ATIEnvmapBumpmap.c, + native/common/ati/org_lwjgl_opengl_ATIFragmentShader.c, + native/common/ati/org_lwjgl_opengl_ATIMapObjectBuffer.c, + native/common/ati/org_lwjgl_opengl_ATIPnTriangles.c, + native/common/ati/org_lwjgl_opengl_ATISeparateStencil.c, + native/common/ati/org_lwjgl_opengl_ATIVertexArrayObject.c, + native/common/ati/org_lwjgl_opengl_ATIVertexAttribArrayObject.c, + native/common/ati/org_lwjgl_opengl_ATIVertexStreams.c, + native/common/ext/org_lwjgl_opengl_EXTCompiledVertexArray.c, + native/common/ext/org_lwjgl_opengl_EXTFogCoord.c, + native/common/ext/org_lwjgl_opengl_EXTFramebufferObject.c, + native/common/ext/org_lwjgl_opengl_EXTPalettedTexture.c, + native/common/ext/org_lwjgl_opengl_EXTPointParameters.c, + native/common/ext/org_lwjgl_opengl_EXTSecondaryColor.c, + native/common/ext/org_lwjgl_opengl_EXTVertexShader.c, + native/common/ext/org_lwjgl_opengl_EXTVertexWeighting.c, + native/common/nv/org_lwjgl_opengl_NVEvaluators.c, + native/common/nv/org_lwjgl_opengl_NVFence.c, + native/common/nv/org_lwjgl_opengl_NVFragmentProgram.c, + native/common/nv/org_lwjgl_opengl_NVHalfFloat.c, + native/common/nv/org_lwjgl_opengl_NVOcclusionQuery.c, + native/common/nv/org_lwjgl_opengl_NVPixelDataRange.c, + native/common/nv/org_lwjgl_opengl_NVPointSprite.c, + native/common/nv/org_lwjgl_opengl_NVPrimitiveRestart.c, + native/common/nv/org_lwjgl_opengl_NVProgram.c, + native/common/nv/org_lwjgl_opengl_NVRegisterCombiners.c, + native/common/nv/org_lwjgl_opengl_NVRegisterCombiners2.c, + native/common/nv/org_lwjgl_opengl_NVVertexArrayRange.c, + native/common/nv/org_lwjgl_opengl_NVVertexProgram.c: Mac OS X: + Handle MouseEvent.NOBUTTON case + +2005-06-28 17:19 elias_naur + + * src/native/linux/org_lwjgl_opengl_Display.c: Linux: Added library + unload destructor that resets keyboard repeat mode + +2005-06-17 11:59 matzon + + * www/faq.php: fixed path to forum + +2005-06-16 22:59 elias_naur + + * src/java/org/lwjgl/opengl/Display.java: Check for null pixel + format in Display.create + +2005-06-16 16:39 matzon + + * www/_include/header.php: fixed overflow added channel id + +2005-06-16 16:03 matzon + + * www/: index.php, _include/header.php: now displaying adsense + +2005-06-16 13:18 matzon + + * src/java/org/lwjgl/opengl/glu/MipMap.java: patch as per: + http://lwjgl.org/forum/viewtopic.php?t=1130 + +2005-06-09 20:08 spasi + + * src/templates/org/lwjgl/opengl/: ARB_half_float_pixel.java, + ARB_pixel_buffer_object.java, ARB_texture_float.java: Added + missing GL_ prefixes + +2005-06-07 12:33 spasi + + * src/java/org/lwjgl/test/opengl/pbuffers/PbufferTest.java: Fixed + mode parameter + +2005-06-07 11:27 spasi + + * src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java: Added + missing GL_ prefixes + +2005-06-06 22:51 spasi + + * src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java: + EXT_fbo spec changes + +2005-06-05 14:12 matzon + + * build.xml: added missing shaders to lwjgl_test.jar added + changelog target + +2005-06-05 13:50 matzon + + * src/java/org/lwjgl/test/opengl/shaders/ShadersTest.java: set + displaymode when it isn't null! + +2005-06-04 23:14 elias_naur + + * src/native/linux/org_lwjgl_opengl_Pbuffer.c: Linux: Added missing + NULL check + +2005-06-03 10:26 elias_naur + + * src/native/macosx/context.m: Mac OS X: Use + NSOpenGLPFAMinimumPolicy when selecting pixel formats + +2005-06-01 09:18 elias_naur + + * src/java/org/lwjgl/opengl/MacOSXDisplay.java: Added doPrivileged + to MacOSXDisplay.setCursorPosition() + +2005-05-30 18:21 elias_naur + + * src/: java/org/lwjgl/LWJGLUtil.java, + java/org/lwjgl/LinuxSysImplementation.java, + java/org/lwjgl/MacOSXSysImplementation.java, + java/org/lwjgl/Sys.java, java/org/lwjgl/opengl/Display.java, + java/org/lwjgl/opengl/GLContext.java, + java/org/lwjgl/opengl/LinuxCanvasImplementation.java, + java/org/lwjgl/opengl/MacOSXDisplay.java, + java/org/lwjgl/opengl/MacOSXFrame.java, + native/common/common_tools.c: Added AccessController.doPrivileged + where needed + +2005-05-30 00:16 matzon + + * src/java/org/lwjgl/devil/IL.java: javadoc + +2005-05-30 00:14 matzon + + * src/java/org/lwjgl/devil/IL.java: added getILType(filename) + +2005-05-29 23:53 matzon + + * build.xml: fixed lib includes for mac os x on release + +2005-05-29 23:24 matzon + + * src/native/common/devil/: extil.c, extilu.c, extilut.c: use + dlopen to load dynamic libraries + +2005-05-28 10:48 matzon + + * src/java/org/lwjgl/opengl/glu/MipMap.java: added UlfJacks + GL_FLOAT patch for gluScaleImage + +2005-05-27 13:50 elias_naur + + * src/: java/org/lwjgl/opengl/LinuxAWTGLCanvasPeerInfo.java, + java/org/lwjgl/opengl/LinuxCanvasImplementation.java, + java/org/lwjgl/opengl/Win32CanvasImplementation.java, + native/linux/org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c: Linux + AWT: in case we're not on a SUN jdk, try to determine values + instead of bombing out. This should help us compile and run on + gcj + +2005-05-22 14:12 matzon + + * src/java/org/lwjgl/: examples/Game.java, + examples/spaceinvaders/Game.java, test/DisplayTest.java, + test/SysTest.java, test/WindowCreationTest.java, + test/devil/BasicTest.java, test/fmod3/CDDAPlayer.java, + test/fmod3/CDPlayer.java, test/fmod3/DSPTest.java, + test/fmod3/MusicPlayer.java, test/fmod3/NetTest.java, + test/fmod3/StreamPlayer.java, test/fmod3/StreamPlayerMemory.java, + test/fmod3/StreamTest.java, test/fmod3/SyncTest.java, + test/fmod3/TagFieldTest.java, test/input/HWCursorTest.java, + test/input/KeyboardTest.java, test/input/MouseCreationTest.java, + test/input/MouseTest.java, test/openal/ALCTest.java, + test/openal/MovingSoundTest.java, + test/openal/OpenALCreationTest.java, test/openal/PlayTest.java, + test/openal/PlayTestMemory.java, test/openal/PositionTest.java, + test/openal/SourceLimitTest.java, test/openal/StressTest.java, + test/opengl/FullScreenWindowedTest.java, test/opengl/Gears.java, + test/opengl/PbufferTest.java, test/opengl/VBOIndexTest.java, + test/opengl/VBOTest.java, test/opengl/awt/AWTGears.java, + test/opengl/awt/AWTTest.java, test/opengl/awt/DemoBox.java, + test/opengl/pbuffers/PbufferTest.java, + test/opengl/shaders/ShadersTest.java: added System.exit so that + vm instances gets nuked in webstart + +2005-05-22 13:14 matzon + + * src/native/common/devil/: extilu.c, extilut.c: using .dylibs for + devil on mac + +2005-05-22 13:09 matzon + + * src/java/org/lwjgl/devil/: IL.java, ILU.java, ILUT.java: using + .dylibs for devil on mac + +2005-05-20 00:31 matzon + + * src/: java/org/lwjgl/fmod3/FMOD.java, + native/common/fmod3/org_lwjgl_fmod3_FMOD.c: fixed fmod webstart + loading + +2005-05-20 00:30 matzon + + * build.xml: sign target + +2005-05-19 18:18 matzon + + * www/: changelog.php, download.php, index.php, + changelogs/0.97-changelog.txt, changelogs/full-changelog.txt: + 0.97 updates + 2005-05-19 17:50 matzon * build.xml: jars target for elias |
Update of /cvsroot/java-game-lib/LWJGL/www/_gfx/projects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31519/www/_gfx/projects Added Files: monstrumo_small_4.jpg monstrumo_1.jpg monstrumo_2.jpg monstrumo_small_2.jpg monstrumo_small_1.jpg monstrumo_3.jpg Log Message: added monstrumo --- NEW FILE: monstrumo_small_1.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: monstrumo_2.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: monstrumo_1.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: monstrumo_3.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: monstrumo_small_4.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: monstrumo_small_2.jpg --- (This appears to be a binary file; contents omitted.) |
|
From: Brian M. <ma...@us...> - 2005-11-28 22:10:05
|
Update of /cvsroot/java-game-lib/LWJGL/www In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31362/www Modified Files: projects.php Log Message: added monstrumo Index: projects.php =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/www/projects.php,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- projects.php 2 Nov 2005 16:35:03 -0000 1.15 +++ projects.php 28 Nov 2005 22:09:56 -0000 1.16 @@ -196,7 +196,23 @@ 'big' => 'strategic_tetris_2.jpg'), 2 => array( 'small' => 'strategic_tetris_small_3.jpg', - 'big' => 'strategic_tetris_3.jpg'))); + 'big' => 'strategic_tetris_3.jpg'))); + + $projects[] = array( + 'name' => 'Monstrumo', + 'url' => 'http://hvor.madpage.com', + 'type' => 'The game is currently freeware', + 'desc' => 'In Monstrumo, a player takes role of an unfortunate character that was turned into zombie with powerful voodoo magic. The story is connected with an isolated islands which are presented in several levels. In order to regain his human state, a player needs to steal life essence from other beings, so he attacks pirate nests in search for his humanity. There are other zombies around on island, so things are more difficult for you!', + 'screens' => array( + 0 => array( + 'small' => 'monstrumo_small_1.jpg', + 'big' => 'monstrumo_1.jpg'), + 1 => array( + 'small' => 'monstrumo_small_2.jpg', + 'big' => 'monstrumo_2.jpg'), + 2 => array( + 'small' => 'monstrumo_small_3.jpg', + 'big' => 'monstrumo_3.jpg'))); function displayProjects() { |
|
From: Elias N. <eli...@us...> - 2005-11-24 11:31:34
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27762/src/native/win32 Modified Files: context.c context.h org_lwjgl_opengl_Pbuffer.c org_lwjgl_opengl_Win32DisplayPeerInfo.c org_lwjgl_opengl_Win32PeerInfo.c Log Message: Added support for native formatted exception messages Index: org_lwjgl_opengl_Win32PeerInfo.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Win32PeerInfo.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_Win32PeerInfo.c 21 Feb 2005 14:46:47 -0000 1.1 +++ org_lwjgl_opengl_Win32PeerInfo.c 24 Nov 2005 11:31:26 -0000 1.2 @@ -53,8 +53,6 @@ int pixel_format_id = findPixelFormat(env, origin_x, origin_y, pixel_format, pixel_format_caps, use_hdc_bpp, window, pbuffer, double_buffer); if (pixel_format_id == -1) return; - if (!applyPixelFormat(peer_info->format_hdc, pixel_format_id)) { - throwException(env, "Could not apply pixel format"); - return; - } + // Let it throw + applyPixelFormat(env, peer_info->format_hdc, pixel_format_id); } Index: org_lwjgl_opengl_Pbuffer.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Pbuffer.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- org_lwjgl_opengl_Pbuffer.c 12 May 2005 07:47:07 -0000 1.16 +++ org_lwjgl_opengl_Pbuffer.c 24 Nov 2005 11:31:26 -0000 1.17 @@ -71,9 +71,8 @@ return false; } dummy_hdc = GetDC(dummy_hwnd); - if (!applyPixelFormat(dummy_hdc, pixel_format_id)) { + if (!applyPixelFormat(env, dummy_hdc, pixel_format_id)) { closeWindow(&dummy_hwnd, &dummy_hdc); - throwException(env, "Could not apply pixel format"); return false; } dummy_context = wglCreateContext(dummy_hdc); Index: context.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/context.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- context.c 24 Nov 2005 10:28:32 -0000 1.9 +++ context.c 24 Nov 2005 11:31:26 -0000 1.10 @@ -40,6 +40,7 @@ */ #include <malloc.h> +#include <jni.h> #include "common_tools.h" #include "extgl.h" #include "extgl_wgl.h" @@ -78,14 +79,16 @@ return DefWindowProc(hwnd, msg, wParam, lParam); } -bool applyPixelFormat(HDC hdc, int iPixelFormat) { +bool applyPixelFormat(JNIEnv *env, HDC hdc, int iPixelFormat) { PIXELFORMATDESCRIPTOR desc; if (DescribePixelFormat(hdc, iPixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &desc) == 0) { + throwFormattedException(env, "DescribePixelFormat failed (%d)", GetLastError()); return false; } // make that the pixel format of the device context if (SetPixelFormat(hdc, iPixelFormat, &desc) == FALSE) { + throwFormattedException(env, "SetPixelFormat failed (%d)", GetLastError()); return false; } return true; @@ -358,8 +361,7 @@ bool use_arb_selection = samples > 0 || pbuffer || pixelFormatCaps != NULL; pixel_format_id = findPixelFormatDefault(env, hdc, pixel_format, use_hdc_bpp, double_buffer); if (use_arb_selection) { - if (!applyPixelFormat(hdc, pixel_format_id)) { - throwException(env, "Could not apply pixel format to window"); + if (!applyPixelFormat(env, hdc, pixel_format_id)) { return -1; } dummy_hglrc = wglCreateContext(hdc); Index: context.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/context.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- context.h 29 Apr 2005 15:08:16 -0000 1.3 +++ context.h 24 Nov 2005 11:31:26 -0000 1.4 @@ -43,6 +43,7 @@ #define __LWJGL_CONTEXT_H #include <windows.h> +#include <jni.h> #include "common_tools.h" #include "extgl.h" #include "extgl_wgl.h" @@ -67,7 +68,7 @@ */ extern bool registerWindow(); -extern bool applyPixelFormat(HDC hdc, int iPixelFormat); +extern bool applyPixelFormat(JNIEnv *env, HDC hdc, int iPixelFormat); /* * Close the window Index: org_lwjgl_opengl_Win32DisplayPeerInfo.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Win32DisplayPeerInfo.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_Win32DisplayPeerInfo.c 21 Feb 2005 14:46:47 -0000 1.1 +++ org_lwjgl_opengl_Win32DisplayPeerInfo.c 24 Nov 2005 11:31:26 -0000 1.2 @@ -73,6 +73,6 @@ throwException(env, "Could not get pixel format from dummy hdc"); return; } - if (!applyPixelFormat(peer_info->drawable_hdc, pixel_format)) - throwException(env, "Could not apply pixel format to drawable"); + // If applyPixelFormat fails, just let it throw + applyPixelFormat(env, peer_info->drawable_hdc, pixel_format); } |
|
From: Elias N. <eli...@us...> - 2005-11-24 11:31:34
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27762/src/native/common Modified Files: common_tools.c Log Message: Added support for native formatted exception messages Index: common_tools.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/common_tools.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- common_tools.c 22 Nov 2005 14:03:51 -0000 1.27 +++ common_tools.c 24 Nov 2005 11:31:26 -0000 1.28 @@ -78,27 +78,33 @@ return debug; } -void printfDebugJava(JNIEnv *env, const char *format, ...) { - #define BUFFER_SIZE 4000 +static jstring sprintfJavaString(JNIEnv *env, const char *format, va_list ap) { +#define BUFFER_SIZE 4000 char buffer[BUFFER_SIZE]; jstring str; +#ifdef WIN32 + _vsnprintf(buffer, BUFFER_SIZE, format, ap); +#else + vsnprintf(buffer, BUFFER_SIZE, format, ap); +#endif + buffer[BUFFER_SIZE - 1] = '\0'; + str = (*env)->NewStringUTF(env, buffer); + return str; +} + +void printfDebugJava(JNIEnv *env, const char *format, ...) { + jstring str; jclass org_lwjgl_LWJGLUtil_class; jmethodID log_method; va_list ap; - va_start(ap, format); if (isDebugEnabled()) { - #ifdef WIN32 - _vsnprintf(buffer, BUFFER_SIZE, format, ap); - #else - vsnprintf(buffer, BUFFER_SIZE, format, ap); - #endif - buffer[BUFFER_SIZE - 1] = '\0'; - str = (*env)->NewStringUTF(env, buffer); + va_start(ap, format); + str = sprintfJavaString(env, format, ap); + va_end(ap); org_lwjgl_LWJGLUtil_class = (*env)->FindClass(env, "org/lwjgl/LWJGLUtil"); log_method = (*env)->GetStaticMethodID(env, org_lwjgl_LWJGLUtil_class, "log", "(Ljava/lang/String;)V"); (*env)->CallStaticVoidMethod(env, org_lwjgl_LWJGLUtil_class, log_method, str); } - va_end(ap); } void printfDebug(const char *format, ...) { @@ -169,6 +175,21 @@ return num_events; } +static void throwFormattedGeneralException(JNIEnv * env, const char *exception_name, const char *format, va_list ap) { + jclass cls; + jstring str; + jmethodID exception_constructor; + jobject exception; + + if ((*env)->ExceptionCheck(env) == JNI_TRUE) + return; // The JVM crashes if we try to throw two exceptions from one native call + str = sprintfJavaString(env, format, ap); + cls = (*env)->FindClass(env, exception_name); + exception_constructor = (*env)->GetMethodID(env, cls, "<init>", "(Ljava/lang/String;)V"); + exception = (*env)->NewObject(env, cls, exception_constructor, str); + (*env)->Throw(env, exception); +} + void throwGeneralException(JNIEnv * env, const char *exception_name, const char * err) { jclass cls; @@ -176,13 +197,19 @@ return; // The JVM crashes if we try to throw two exceptions from one native call cls = (*env)->FindClass(env, exception_name); (*env)->ThrowNew(env, cls, err); - (*env)->DeleteLocalRef(env, cls); } void throwFMODException(JNIEnv * env, const char * err) { throwGeneralException(env, "org/lwjgl/fmod3/FMODException", err); } +void throwFormattedException(JNIEnv * env, const char *format, ...) { + va_list ap; + va_start(ap, format); + throwFormattedGeneralException(env, "org/lwjgl/LWJGLException", format, ap); + va_end(ap); +} + void throwException(JNIEnv * env, const char * err) { throwGeneralException(env, "org/lwjgl/LWJGLException", err); } |
|
From: Elias N. <eli...@us...> - 2005-11-24 10:28:40
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17060/src/native/win32 Modified Files: context.c Log Message: Win32: Removed unused variable from context.c Index: context.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/context.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- context.c 6 May 2005 09:40:36 -0000 1.8 +++ context.c 24 Nov 2005 10:28:32 -0000 1.9 @@ -255,7 +255,6 @@ int alpha = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "alpha", "I")); int depth = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "depth", "I")); int stencil = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "stencil", "I")); - int samples = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "samples", "I")); int num_aux_buffers = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "num_aux_buffers", "I")); int accum_bpp = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "accum_bpp", "I")); int accum_alpha = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "accum_alpha", "I")); |
|
From: Elias N. <eli...@us...> - 2005-11-23 17:08:35
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26126 Modified Files: org_lwjgl_input_Keyboard.c Log Message: Linux: use the correct KEYBOARD_SIZE Index: org_lwjgl_input_Keyboard.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Keyboard.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- org_lwjgl_input_Keyboard.c 21 Nov 2005 13:22:52 -0000 1.22 +++ org_lwjgl_input_Keyboard.c 23 Nov 2005 17:08:17 -0000 1.23 @@ -53,10 +53,9 @@ #include "org_lwjgl_opengl_LinuxDisplay.h" #define KEYBOARD_BUFFER_SIZE 50 -#define KEYBOARD_SIZE 256 #define KEY_EVENT_BACKLOG 40 -static unsigned char key_buf[KEYBOARD_SIZE]; +static jbyte key_buf[org_lwjgl_input_Keyboard_KEYBOARD_SIZE]; static int numlock_mask; static int modeswitch_mask; static int caps_lock_mask; @@ -125,7 +124,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nCreateKeyboard (JNIEnv * env, jclass clazz, jint window_mode) { - memset(key_buf, 0, KEYBOARD_SIZE*sizeof(unsigned char)); + memset(key_buf, 0, org_lwjgl_input_Keyboard_KEYBOARD_SIZE*sizeof(jbyte)); created = true; keyboard_grabbed = false; initEventQueue(&event_queue, 3); @@ -660,7 +659,7 @@ } } -static unsigned char eventState(XKeyEvent *event) { +static jbyte eventState(XKeyEvent *event) { if (event->type == KeyPress) { return 1; } else if (event->type == KeyRelease) { @@ -677,14 +676,14 @@ void handleKeyEvent(XKeyEvent *event) { unsigned char keycode = getKeycode(event); - unsigned char state = eventState(event); + jbyte state = eventState(event); key_buf[keycode] = state; bufferEvent(event); } JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nPollKeyboard(JNIEnv * env, jclass clazz, jobject buffer) { - unsigned char *new_keyboard_buffer = (unsigned char *)(*env)->GetDirectBufferAddress(env, buffer); - memcpy(new_keyboard_buffer, key_buf, KEYBOARD_SIZE*sizeof(unsigned char)); + jbyte *new_keyboard_buffer = (jbyte *)(*env)->GetDirectBufferAddress(env, buffer); + memcpy(new_keyboard_buffer, key_buf, org_lwjgl_input_Keyboard_KEYBOARD_SIZE*sizeof(jbyte)); } JNIEXPORT int JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nReadKeyboard(JNIEnv * env, jclass clazz, jobject buffer, jint buffer_position) { |
|
From: Elias N. <eli...@us...> - 2005-11-23 15:57:14
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8948 Modified Files: org_lwjgl_opengl_Display.c Log Message: Linux: Removed unused vsync_enabled from Display.c Index: org_lwjgl_opengl_Display.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- org_lwjgl_opengl_Display.c 23 Nov 2005 15:30:53 -0000 1.44 +++ org_lwjgl_opengl_Display.c 23 Nov 2005 15:56:57 -0000 1.45 @@ -80,7 +80,6 @@ static bool input_released; static bool dirty; -static bool vsync_enabled; static bool minimized; static bool focused; static bool closerequested; @@ -366,7 +365,6 @@ focused = true; minimized = false; closerequested = false; - vsync_enabled = false; grab = false; Window root_win; Window win; |
|
From: Elias N. <eli...@us...> - 2005-11-23 15:36:32
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4465 Modified Files: org_lwjgl_input_Mouse.c Log Message: Linux: Removed redundant initEventQueue from Mouse.c Index: org_lwjgl_input_Mouse.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- org_lwjgl_input_Mouse.c 22 Nov 2005 14:30:00 -0000 1.42 +++ org_lwjgl_input_Mouse.c 23 Nov 2005 15:36:21 -0000 1.43 @@ -222,7 +222,6 @@ created = true; pointer_grabbed = false; updatePointerGrab(window_mode); - initEventQueue(&event_queue, EVENT_SIZE); } JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nDestroyMouse |
|
From: Elias N. <eli...@us...> - 2005-11-23 15:32:38
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3120 Modified Files: org_lwjgl_opengl_Display.c Log Message: Linux: Removed redundant global variables from Display.c Index: org_lwjgl_opengl_Display.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- org_lwjgl_opengl_Display.c 23 Nov 2005 15:18:34 -0000 1.43 +++ org_lwjgl_opengl_Display.c 23 Nov 2005 15:30:53 -0000 1.44 @@ -73,8 +73,6 @@ static Atom delete_atom; static Colormap cmap; static Window current_win; -static int current_height; -static int current_width; static int current_depth; static Visual *current_visual; @@ -376,8 +374,6 @@ int attribmask; input_released = false; - current_width = width; - current_height = height; root_win = RootWindow(getDisplay(), getCurrentScreen()); XVisualInfo *vis_info = getVisualInfoFromPeerInfo(env, peer_info); if (vis_info == NULL) |
|
From: Elias N. <eli...@us...> - 2005-11-23 15:18:44
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32498 Modified Files: org_lwjgl_opengl_Display.c Log Message: Linux: Made setIcon in Display.c static since it is not called elsewhere Index: org_lwjgl_opengl_Display.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- org_lwjgl_opengl_Display.c 22 Nov 2005 14:30:00 -0000 1.42 +++ org_lwjgl_opengl_Display.c 23 Nov 2005 15:18:34 -0000 1.43 @@ -519,7 +519,7 @@ jawt.Unlock(env); } -int setIcon(char *data,int width,int height) { +static int setIcon(char *data,int width,int height) { XWMHints* win_hints; int x = 0; int y = 5; |
|
From: Elias N. <eli...@us...> - 2005-11-23 15:10:20
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30748 Modified Files: Makefile display.c org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c Log Message: Linux: Added -lm and -std=c99 to fix the warning abount round(). Removed some unnecessary headers Index: display.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/display.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- display.c 22 Nov 2005 13:53:13 -0000 1.24 +++ display.c 23 Nov 2005 15:10:05 -0000 1.25 @@ -279,7 +279,7 @@ int i; for (i = 0; i < length; i++) { float scaled_gamma = ramp_ptr[i]*0xffff; - short scaled_gamma_short = (unsigned short)round(scaled_gamma); + short scaled_gamma_short = (unsigned short)roundf(scaled_gamma); native_ramp_ptr[i] = scaled_gamma_short; native_ramp_ptr[i + length] = scaled_gamma_short; native_ramp_ptr[i + length*2] = scaled_gamma_short; Index: Makefile =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/Makefile,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- Makefile 10 Oct 2005 12:50:10 -0000 1.23 +++ Makefile 23 Nov 2005 15:10:05 -0000 1.24 @@ -4,8 +4,8 @@ LINKER=gcc STRIP=strip CFLAGS_LINK=-shared -Wall -LIBS=-L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lpthread -L$(JAVA_HOME)/jre/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-call_shared -CFLAGS_O=-fPIC -O2 -D_X11 -Wall -pthread -c -I../common -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I$(AL_HOME)/include +LIBS=-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lpthread -L$(JAVA_HOME)/jre/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-call_shared +CFLAGS_O=-fPIC -O2 -D_X11 -Wall -std=c99 -pthread -c -I../common -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I$(AL_HOME)/include SRC=$(wildcard *.c) $(wildcard ../common/*.c) $(wildcard ../generated/*c) OBJECTS=$(subst .c,.o,$(SRC)) LIBRARY=liblwjgl.so Index: org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c 27 May 2005 11:50:13 -0000 1.2 +++ org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c 23 Nov 2005 15:10:05 -0000 1.3 @@ -45,9 +45,7 @@ #include <X11/Xutil.h> #include "awt_tools.h" #include "org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.h" -#include "extgl_glx.h" #include "context.h" -#include "Window.h" JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo_nInitHandle (JNIEnv *env, jclass clazz, int screen, jobject lock_buffer_handle, jobject peer_info_handle) { |
|
From: Elias N. <eli...@us...> - 2005-11-22 14:30:22
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28193/src/native/linux Modified Files: org_lwjgl_input_Mouse.c org_lwjgl_opengl_Display.c Log Message: Linux: Ignore events from old windows Index: org_lwjgl_opengl_Display.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- org_lwjgl_opengl_Display.c 22 Nov 2005 13:53:13 -0000 1.41 +++ org_lwjgl_opengl_Display.c 22 Nov 2005 14:30:00 -0000 1.42 @@ -246,12 +246,13 @@ void handleMessages(JNIEnv *env, jint extension, jint window_mode, jobject saved_gamma, jobject current_gamma, jobject saved_mode, jobject current_mode) { XEvent event; -/* Window win; - int revert_mode;*/ while (XPending(getDisplay()) > 0) { XNextEvent(getDisplay(), &event); if (XFilterEvent(&event, None) == True) continue; + // Ignore events from old windows + if (event.xany.window != getCurrentWindow()) + continue; switch (event.type) { case ClientMessage: if (event.xclient.message_type == warp_atom) { @@ -259,16 +260,6 @@ } else if ((event.xclient.format == 32) && ((Atom)event.xclient.data.l[0] == delete_atom)) closerequested = true; break; -/* case FocusOut: - XGetInputFocus(getDisplay(), &win, &revert_mode); - if (win != current_win) { - releaseInput(); - focused = false; - } - break; - case FocusIn: - checkInput(); - break;*/ case MapNotify: dirty = true; minimized = false; Index: org_lwjgl_input_Mouse.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- org_lwjgl_input_Mouse.c 22 Nov 2005 11:06:21 -0000 1.41 +++ org_lwjgl_input_Mouse.c 22 Nov 2005 14:30:00 -0000 1.42 @@ -184,6 +184,7 @@ static void doWarpPointer(int center_x, int center_y) { XEvent warp_event; warp_event.type = ClientMessage; + warp_event.xclient.window = getCurrentWindow(); warp_event.xclient.message_type = getWarpAtom(); warp_event.xclient.format = 32; warp_event.xclient.data.l[0] = center_x; @@ -316,7 +317,7 @@ } void handlePointerMotion(XMotionEvent *event) { - doHandlePointerMotion(event->root, event->window, event->x_root, event->y_root, event->x, event->y); + doHandlePointerMotion(event->root, getCurrentWindow(), event->x_root, event->y_root, event->x, event->y); } JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nPollMouse(JNIEnv * env, jclass clazz, jobject coord_buffer_obj, jobject button_buffer_obj) { |
|
From: Elias N. <eli...@us...> - 2005-11-22 14:04:04
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18784/src/native/linux Modified Files: extgl_glx.c Log Message: Converted some static local variables to stack localvariables Index: extgl_glx.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/extgl_glx.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- extgl_glx.c 20 Nov 2005 13:20:40 -0000 1.9 +++ extgl_glx.c 22 Nov 2005 14:03:52 -0000 1.10 @@ -151,7 +151,7 @@ bool extgl_Open(JNIEnv *env) { #define BUFFER_SIZE 2000 - static char buffer[BUFFER_SIZE]; + char buffer[BUFFER_SIZE]; if (lib_gl_handle != NULL) return true; lib_gl_handle = dlopen("libGL.so.1", RTLD_LAZY | RTLD_GLOBAL); |
|
From: Elias N. <eli...@us...> - 2005-11-22 14:04:04
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18784/src/native/common Modified Files: common_tools.c Log Message: Converted some static local variables to stack localvariables Index: common_tools.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/common_tools.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- common_tools.c 17 Aug 2005 22:05:12 -0000 1.26 +++ common_tools.c 22 Nov 2005 14:03:51 -0000 1.27 @@ -80,7 +80,7 @@ void printfDebugJava(JNIEnv *env, const char *format, ...) { #define BUFFER_SIZE 4000 - static char buffer[BUFFER_SIZE]; + char buffer[BUFFER_SIZE]; jstring str; jclass org_lwjgl_LWJGLUtil_class; jmethodID log_method; |
|
From: Elias N. <eli...@us...> - 2005-11-22 13:53:21
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15159/src/native/linux Modified Files: display.c display.h org_lwjgl_opengl_Display.c Log Message: Linux: More native code refactoring Index: display.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/display.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- display.h 22 Nov 2005 11:23:37 -0000 1.14 +++ display.h 22 Nov 2005 13:53:13 -0000 1.15 @@ -45,7 +45,7 @@ #include <jni.h> #include "common_tools.h" -extern void resetDisplayMode(JNIEnv *env, int screen, jint extension, jobject gamma_ramp, jobject saved_mode); -extern void temporaryRestoreMode(JNIEnv *env, int screen, jint extension, jobject gamma_ramp, jobject saved_mode); +extern bool switchDisplayMode(JNIEnv * env, int screen, jint extension, jobject mode); +extern void setGammaRamp(JNIEnv *env, int screen, jobject gamma_ramp_buffer); #endif Index: display.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/display.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- display.c 22 Nov 2005 11:23:37 -0000 1.23 +++ display.c 22 Nov 2005 13:53:13 -0000 1.24 @@ -68,11 +68,11 @@ int event_base, error_base; if (!XF86VidModeQueryExtension(disp, &event_base, &error_base)) { - printfDebugJava(env, "XF86VidMode extension not available"); + throwException(env, "XF86VidMode extension not available"); return false; } if (!XF86VidModeQueryVersion(disp, major, minor)) { - printfDebugJava(env, "Could not query XF86VidMode version"); + throwException(env, "Could not query XF86VidMode version"); return false; } printfDebugJava(env, "XF86VidMode extension version %i.%i", *major, *minor); @@ -83,11 +83,11 @@ int event_base, error_base; if (!XRRQueryExtension(disp, &event_base, &error_base)) { - printfDebugJava(env, "Xrandr extension not available"); + throwException(env, "Xrandr extension not available"); return false; } if (!XRRQueryVersion(disp, major, minor)) { - printfDebugJava(env, "Could not query Xrandr version"); + throwException(env, "Could not query Xrandr version"); return false; } printfDebugJava(env, "Xrandr extension version %i.%i", *major, *minor); @@ -108,12 +108,12 @@ return major_ver >= 2; } -JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_LinuxDisplay_isXrandrSupported(JNIEnv *env, jclass unused) { +JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nIsXrandrSupported(JNIEnv *env, jclass unused) { jboolean result = isXrandrSupported(env, getDisplay()) ? JNI_TRUE : JNI_FALSE; return result; } -JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_LinuxDisplay_isXF86VidModeSupported(JNIEnv *env, jclass unused) { +JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nIsXF86VidModeSupported(JNIEnv *env, jclass unused) { jboolean result = isXF86VidModeSupported(env, getDisplay()) ? JNI_TRUE : JNI_FALSE; return result; } @@ -262,7 +262,7 @@ static int getGammaRampLengthOfDisplay(JNIEnv *env, Display *disp, int screen) { int ramp_size; if (XF86VidModeGetGammaRampSize(disp, screen, &ramp_size) == False) { - printfDebugJava(env, "XF86VidModeGetGammaRampSize call failed"); + throwException(env, "XF86VidModeGetGammaRampSize call failed"); return 0; } return ramp_size; @@ -304,6 +304,8 @@ } static void setGamma(JNIEnv *env, Display *disp, int screen, jobject ramp_buffer) { + if (ramp_buffer == NULL) + return; unsigned short *ramp_ptr = (unsigned short *)(*env)->GetDirectBufferAddress(env, ramp_buffer); jlong capacity = (*env)->GetDirectBufferCapacity(env, ramp_buffer); int size = capacity/(sizeof(unsigned short)*3); @@ -314,7 +316,7 @@ } } -static void setGammaRamp(JNIEnv *env, int screen, jobject gamma_ramp_buffer) { +void setGammaRamp(JNIEnv *env, int screen, jobject gamma_ramp_buffer) { Display * disp = XOpenDisplay(NULL); if (disp == NULL) { throwException(env, "Could not open display"); @@ -324,7 +326,7 @@ XCloseDisplay(disp); } -static bool switchDisplayMode(JNIEnv * env, int screen, jint extension, jobject mode) { +bool switchDisplayMode(JNIEnv * env, int screen, jint extension, jobject mode) { if (mode == NULL) { throwException(env, "mode must be non-null"); return false; @@ -350,18 +352,6 @@ return true; } -void temporaryRestoreMode(JNIEnv *env, int screen, jint extension, jobject current_gamma_ramp, jobject current_mode) { - switchDisplayMode(env, screen, extension, current_mode); - // Don't propagate error to caller - setGammaRamp(env, screen, current_gamma_ramp); -} - -void resetDisplayMode(JNIEnv *env, int screen, jint extension, jobject saved_gamma_ramp, jobject saved_mode) { - if (!switchDisplayMode(env, screen, extension, saved_mode)) - return; - setGammaRamp(env, screen, saved_gamma_ramp); -} - static jobjectArray getAvailableDisplayModes(JNIEnv * env, Display *disp, int screen, jint extension) { int num_modes, i; mode_info *avail_modes; @@ -393,10 +383,6 @@ switchDisplayMode(env, getCurrentScreen(), extension, mode); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nResetDisplayMode(JNIEnv *env, jclass clazz, jint extension, jobject gamma_ramp, jobject saved_mode) { - resetDisplayMode(env, getCurrentScreen(), extension, gamma_ramp, saved_mode); -} - JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nGetGammaRampLength(JNIEnv *env, jclass clazz) { return (jint)getGammaRampLengthOfDisplay(env, getDisplay(), getCurrentScreen()); } Index: org_lwjgl_opengl_Display.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- org_lwjgl_opengl_Display.c 22 Nov 2005 11:23:37 -0000 1.40 +++ org_lwjgl_opengl_Display.c 22 Nov 2005 13:53:13 -0000 1.41 @@ -190,7 +190,8 @@ updateInputGrab(window_mode); if (window_mode == org_lwjgl_opengl_LinuxDisplay_FULLSCREEN_NETWM) { XIconifyWindow(getDisplay(), getCurrentWindow(), getCurrentScreen()); - resetDisplayMode(env, getCurrentScreen(), extension, gamma_ramp, saved_mode); + switchDisplayMode(env, getCurrentScreen(), extension, saved_mode); + setGammaRamp(env, getCurrentScreen(), gamma_ramp); } return true; } @@ -202,7 +203,8 @@ setRepeatMode(env, AutoRepeatModeOff); updateInputGrab(window_mode); if (window_mode == org_lwjgl_opengl_LinuxDisplay_FULLSCREEN_NETWM) { - temporaryRestoreMode(env, getCurrentScreen(), extension, gamma_ramp, mode); + switchDisplayMode(env, getCurrentScreen(), extension, mode); + setGammaRamp(env, getCurrentScreen(), gamma_ramp); } } @@ -345,7 +347,7 @@ Atom netwm_supported_atom = XInternAtom(getDisplay(), "_NET_SUPPORTED", False); int result = XGetWindowProperty(getDisplay(), RootWindow(getDisplay(), getCurrentScreen()), netwm_supported_atom, 0, 10000, False, AnyPropertyType, &actual_type, &actual_format, &nitems, &bytes_after, (void *)&supported_list); if (result != Success) { - printfDebugJava(env, "Unable to query _NET_SUPPORTED window property"); + throwException(env, "Unable to query _NET_SUPPORTED window property"); return false; } Atom fullscreen_atom = XInternAtom(getDisplay(), "_NET_WM_STATE_FULLSCREEN", False); |
|
From: Elias N. <eli...@us...> - 2005-11-22 13:53:21
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15159/src/java/org/lwjgl/opengl Modified Files: LinuxDisplay.java Log Message: Linux: More native code refactoring Index: LinuxDisplay.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- LinuxDisplay.java 22 Nov 2005 11:23:36 -0000 1.36 +++ LinuxDisplay.java 22 Nov 2005 13:53:13 -0000 1.37 @@ -95,7 +95,7 @@ if (isXF86VidModeSupported()) return nGetCurrentGammaRamp(); else - return BufferUtils.createByteBuffer(0); + return null; } finally { decDisplay(); } @@ -105,29 +105,58 @@ } private static native ByteBuffer nGetCurrentGammaRamp() throws LWJGLException; - private static int getBestDisplayModeExtension() throws LWJGLException { + private static int getBestDisplayModeExtension() { + int result; + if (isXrandrSupported()) { + LWJGLUtil.log("Using Xrandr for display mode switching"); + result = XRANDR; + } else if (isXF86VidModeSupported()) { + LWJGLUtil.log("Using XF86VidMode for display mode switching"); + result = XF86VIDMODE; + } else { + LWJGLUtil.log("No display mode extensions available"); + result = NONE; + } + return result; + } + + private static boolean isXrandrSupported() { + if (System.getenv("LWJGL_DISABLE_XRANDR") != null) + return false; lockAWT(); try { incDisplay(); - int result; - if (System.getenv("LWJGL_DISABLE_XRANDR") == null && isXrandrSupported()) { - LWJGLUtil.log("Using Xrandr for display mode switching"); - result = XRANDR; - } else if (isXF86VidModeSupported()) { - LWJGLUtil.log("Using XF86VidMode for display mode switching"); - result = XF86VIDMODE; - } else { - LWJGLUtil.log("No display mode extensions available"); - result = NONE; + try { + return nIsXrandrSupported(); + } finally { + decDisplay(); } - decDisplay(); - return result; + } catch (LWJGLException e) { + LWJGLUtil.log("Got exception while querying Xrandr support: " + e); + return false; } finally { unlockAWT(); } } - private static native boolean isXrandrSupported(); - private static native boolean isXF86VidModeSupported(); + private static native boolean nIsXrandrSupported() throws LWJGLException; + + private static boolean isXF86VidModeSupported() { + lockAWT(); + try { + incDisplay(); + try { + return nIsXF86VidModeSupported(); + } finally { + decDisplay(); + } + } catch (LWJGLException e) { + LWJGLUtil.log("Got exception while querying XF86VM support: " + e); + return false; + } finally { + unlockAWT(); + } + } + private static native boolean nIsXF86VidModeSupported() throws LWJGLException; private static boolean isNetWMFullscreenSupported() throws LWJGLException { if (System.getenv("LWJGL_DISABLE_NETWM") != null) @@ -135,14 +164,19 @@ lockAWT(); try { incDisplay(); - boolean supported = nIsNetWMFullscreenSupported(); - decDisplay(); - return supported; + try { + return nIsNetWMFullscreenSupported(); + } finally { + decDisplay(); + } + } catch (LWJGLException e) { + LWJGLUtil.log("Got exception while querying NetWM support: " + e); + return false; } finally { unlockAWT(); } } - private static native boolean nIsNetWMFullscreenSupported(); + private static native boolean nIsNetWMFullscreenSupported() throws LWJGLException; /* Since Xlib is not guaranteed to be thread safe, we need a way to synchronize LWJGL * Xlib calls with AWT Xlib calls. Fortunately, JAWT implements Lock()/Unlock() to @@ -250,8 +284,8 @@ public void switchDisplayMode(DisplayMode mode) throws LWJGLException { lockAWT(); try { + nSwitchDisplayMode(current_displaymode_extension, mode); current_mode = mode; - nSwitchDisplayMode(current_displaymode_extension, current_mode); } finally { unlockAWT(); } @@ -261,27 +295,31 @@ public void resetDisplayMode() { lockAWT(); try { - nResetDisplayMode(current_displaymode_extension, saved_gamma, saved_mode); + switchDisplayMode(saved_mode); + if (isXF86VidModeSupported()) + doSetGamma(saved_gamma); } catch (LWJGLException e) { LWJGLUtil.log("Caught exception while resetting mode: " + e); } finally { unlockAWT(); } } - private static native void nResetDisplayMode(int extension, ByteBuffer gamma_ramp, DisplayMode saved_mode) throws LWJGLException; public int getGammaRampLength() { + if (!isXF86VidModeSupported()) + return 0; lockAWT(); try { try { incDisplay(); - int length; - if (isXF86VidModeSupported()) { - length = nGetGammaRampLength(); - } else - length = 0; - decDisplay(); - return length; + try { + return nGetGammaRampLength(); + } catch (LWJGLException e) { + LWJGLUtil.log("Got exception while querying gamma length: " + e); + return 0; + } finally { + decDisplay(); + } } catch (LWJGLException e) { LWJGLUtil.log("Failed to get gamma ramp length: " + e); return 0; @@ -290,18 +328,19 @@ unlockAWT(); } } - private static native int nGetGammaRampLength(); + private static native int nGetGammaRampLength() throws LWJGLException; public void setGammaRamp(FloatBuffer gammaRamp) throws LWJGLException { + if (!isXF86VidModeSupported()) + throw new LWJGLException("No gamma ramp support (Missing XF86VM extension)"); + doSetGamma(convertToNativeRamp(gammaRamp)); + } + + private static void doSetGamma(ByteBuffer native_gamma) throws LWJGLException { lockAWT(); try { - incDisplay(); - boolean xf86_support = isXF86VidModeSupported(); - decDisplay(); - if (!xf86_support) - throw new LWJGLException("No gamma ramp support (Missing XF86VM extension)"); - current_gamma = convertToNativeRamp(gammaRamp); - nSetGammaRamp(current_gamma); + nSetGammaRamp(native_gamma); + current_gamma = native_gamma; } finally { unlockAWT(); } |
|
From: Elias N. <eli...@us...> - 2005-11-22 11:23:59
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7412/src/native/linux Modified Files: display.c display.h org_lwjgl_opengl_Display.c Log Message: Linux: Removed current_* mode cache from display.c Index: display.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/display.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- display.h 22 Nov 2005 09:32:15 -0000 1.13 +++ display.h 22 Nov 2005 11:23:37 -0000 1.14 @@ -45,7 +45,7 @@ #include <jni.h> #include "common_tools.h" -extern void resetDisplayMode(JNIEnv *env, int screen, jint extension, jobject gamma_ramp, jobject saved_mode, bool temporary); -extern void temporaryRestoreMode(JNIEnv *env, int screen, jint extension, jobject gamma_ramp); +extern void resetDisplayMode(JNIEnv *env, int screen, jint extension, jobject gamma_ramp, jobject saved_mode); +extern void temporaryRestoreMode(JNIEnv *env, int screen, jint extension, jobject gamma_ramp, jobject saved_mode); #endif Index: display.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/display.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- display.c 22 Nov 2005 09:32:15 -0000 1.22 +++ display.c 22 Nov 2005 11:23:37 -0000 1.23 @@ -64,10 +64,6 @@ } mode_data; } mode_info; -static int current_width; -static int current_height; -static int current_freq; - static bool getXF86VidModeVersion(JNIEnv *env, Display *disp, int *major, int *minor) { int event_base, error_base; @@ -226,7 +222,7 @@ return false; } -static bool setMode(JNIEnv *env, Display *disp, int screen, jint extension, int width, int height, int freq, bool temporary) { +static bool setMode(JNIEnv *env, Display *disp, int screen, jint extension, int width, int height, int freq) { int num_modes, i; mode_info *avail_modes = getDisplayModes(disp, screen, extension, &num_modes); if (avail_modes == NULL) { @@ -255,11 +251,6 @@ continue; } result = true; - if (!temporary) { - current_width = width; - current_height = height; - current_freq = freq; - } break; } } @@ -323,7 +314,7 @@ } } -static void setGammaRamp(JNIEnv *env, jobject gamma_ramp_buffer, int screen) { +static void setGammaRamp(JNIEnv *env, int screen, jobject gamma_ramp_buffer) { Display * disp = XOpenDisplay(NULL); if (disp == NULL) { throwException(env, "Could not open display"); @@ -333,20 +324,7 @@ XCloseDisplay(disp); } -void temporaryRestoreMode(JNIEnv *env, int screen, jint extension, jobject saved_gamma_ramp) { - Display *disp = XOpenDisplay(NULL); - if (disp == NULL) { - printfDebugJava(env, "Could not open display"); - return; - } - if (!setMode(env, disp, screen, extension, current_width, current_height, current_freq, false)) - printfDebugJava(env, "Could not restore mode"); - XCloseDisplay(disp); - // Don't propagate error to caller - setGammaRamp(env, saved_gamma_ramp, screen); -} - -static bool switchDisplayMode(JNIEnv * env, int screen, jint extension, jobject mode, bool temporary) { +static bool switchDisplayMode(JNIEnv * env, int screen, jint extension, jobject mode) { if (mode == NULL) { throwException(env, "mode must be non-null"); return false; @@ -363,7 +341,7 @@ throwException(env, "Could not open display"); return false; } - if (!setMode(env, disp, screen, extension, width, height, freq, temporary)) { + if (!setMode(env, disp, screen, extension, width, height, freq)) { XCloseDisplay(disp); throwException(env, "Could not switch mode."); return false; @@ -372,10 +350,16 @@ return true; } -void resetDisplayMode(JNIEnv *env, int screen, jint extension, jobject gamma_ramp, jobject saved_mode, bool temporary) { - if (!switchDisplayMode(env, screen, extension, saved_mode, temporary)) +void temporaryRestoreMode(JNIEnv *env, int screen, jint extension, jobject current_gamma_ramp, jobject current_mode) { + switchDisplayMode(env, screen, extension, current_mode); + // Don't propagate error to caller + setGammaRamp(env, screen, current_gamma_ramp); +} + +void resetDisplayMode(JNIEnv *env, int screen, jint extension, jobject saved_gamma_ramp, jobject saved_mode) { + if (!switchDisplayMode(env, screen, extension, saved_mode)) return; - setGammaRamp(env, gamma_ramp, screen); + setGammaRamp(env, screen, saved_gamma_ramp); } static jobjectArray getAvailableDisplayModes(JNIEnv * env, Display *disp, int screen, jint extension) { @@ -406,11 +390,11 @@ } JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nSwitchDisplayMode(JNIEnv *env, jclass clazz, jint extension, jobject mode) { - switchDisplayMode(env, getCurrentScreen(), extension, mode, false); + switchDisplayMode(env, getCurrentScreen(), extension, mode); } JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nResetDisplayMode(JNIEnv *env, jclass clazz, jint extension, jobject gamma_ramp, jobject saved_mode) { - resetDisplayMode(env, getCurrentScreen(), extension, gamma_ramp, saved_mode, false); + resetDisplayMode(env, getCurrentScreen(), extension, gamma_ramp, saved_mode); } JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nGetGammaRampLength(JNIEnv *env, jclass clazz) { @@ -418,6 +402,6 @@ } JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nSetGammaRamp(JNIEnv *env, jclass clazz, jobject gamma_buffer) { - setGammaRamp(env, gamma_buffer, getCurrentScreen()); + setGammaRamp(env, getCurrentScreen(), gamma_buffer); } Index: org_lwjgl_opengl_Display.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- org_lwjgl_opengl_Display.c 22 Nov 2005 10:32:17 -0000 1.39 +++ org_lwjgl_opengl_Display.c 22 Nov 2005 11:23:37 -0000 1.40 @@ -190,19 +190,19 @@ updateInputGrab(window_mode); if (window_mode == org_lwjgl_opengl_LinuxDisplay_FULLSCREEN_NETWM) { XIconifyWindow(getDisplay(), getCurrentWindow(), getCurrentScreen()); - resetDisplayMode(env, getCurrentScreen(), extension, gamma_ramp, saved_mode, true); + resetDisplayMode(env, getCurrentScreen(), extension, gamma_ramp, saved_mode); } return true; } -static void acquireInput(JNIEnv *env, jint extension, jint window_mode, jobject gamma_ramp) { +static void acquireInput(JNIEnv *env, jint extension, jint window_mode, jobject gamma_ramp, jobject mode) { if (isLegacyFullscreen(window_mode) || !input_released) return; input_released = false; setRepeatMode(env, AutoRepeatModeOff); updateInputGrab(window_mode); if (window_mode == org_lwjgl_opengl_LinuxDisplay_FULLSCREEN_NETWM) { - temporaryRestoreMode(env, getCurrentScreen(), extension, gamma_ramp); + temporaryRestoreMode(env, getCurrentScreen(), extension, gamma_ramp, mode); } } @@ -229,12 +229,12 @@ } } -static void checkInput(JNIEnv *env, jint extension, jint window_mode, jobject saved_gamma, jobject current_gamma, jobject saved_mode) { +static void checkInput(JNIEnv *env, jint extension, jint window_mode, jobject saved_gamma, jobject current_gamma, jobject saved_mode, jobject current_mode) { Window win; int revert_mode; XGetInputFocus(getDisplay(), &win, &revert_mode); if (win == current_win) { - acquireInput(env, extension, window_mode, current_gamma); + acquireInput(env, extension, window_mode, current_gamma, current_mode); focused = true; } else { releaseInput(env, extension, window_mode, saved_gamma, saved_mode); @@ -242,7 +242,7 @@ } } -void handleMessages(JNIEnv *env, jint extension, jint window_mode, jobject saved_gamma, jobject current_gamma, jobject saved_mode) { +void handleMessages(JNIEnv *env, jint extension, jint window_mode, jobject saved_gamma, jobject current_gamma, jobject saved_mode, jobject current_mode) { XEvent event; /* Window win; int revert_mode;*/ @@ -293,7 +293,7 @@ break; } } - checkInput(env, extension, window_mode, saved_gamma, current_gamma, saved_mode); + checkInput(env, extension, window_mode, saved_gamma, current_gamma, saved_mode, current_mode); } static void setWindowTitle(const char *title) { @@ -446,9 +446,9 @@ } JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nUpdate - (JNIEnv *env, jclass clazz, jint extension, jint window_mode, jobject saved_gamma, jobject current_gamma, jobject saved_mode) + (JNIEnv *env, jclass clazz, jint extension, jint window_mode, jobject saved_gamma, jobject current_gamma, jobject saved_mode, jobject current_mode) { - handleMessages(env, extension, window_mode, saved_gamma, current_gamma, saved_mode); + handleMessages(env, extension, window_mode, saved_gamma, current_gamma, saved_mode, current_mode); } JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nCreateWindow(JNIEnv *env, jclass clazz, jobject peer_info_handle, jobject mode, jint window_mode, jint x, jint y) { |
|
From: Elias N. <eli...@us...> - 2005-11-22 11:23:56
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7412/src/java/org/lwjgl/opengl Modified Files: LinuxDisplay.java Log Message: Linux: Removed current_* mode cache from display.c Index: LinuxDisplay.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- LinuxDisplay.java 21 Nov 2005 22:21:28 -0000 1.35 +++ LinuxDisplay.java 22 Nov 2005 11:23:36 -0000 1.36 @@ -85,6 +85,7 @@ /** Saved mode to restore with */ private static DisplayMode saved_mode; + private static DisplayMode current_mode; private static ByteBuffer getCurrentGammaRamp() throws LWJGLException { lockAWT(); @@ -249,7 +250,8 @@ public void switchDisplayMode(DisplayMode mode) throws LWJGLException { lockAWT(); try { - nSwitchDisplayMode(current_displaymode_extension, mode); + current_mode = mode; + nSwitchDisplayMode(current_displaymode_extension, current_mode); } finally { unlockAWT(); } @@ -329,6 +331,7 @@ if (modes == null || modes.length == 0) throw new LWJGLException("No modes available"); saved_mode = modes[0]; + current_mode = saved_mode; saved_gamma = getCurrentGammaRamp(); current_gamma = saved_gamma; return saved_mode; @@ -386,13 +389,13 @@ public void update() { lockAWT(); try { - nUpdate(current_displaymode_extension, current_window_mode, saved_gamma, current_gamma, saved_mode); + nUpdate(current_displaymode_extension, current_window_mode, saved_gamma, current_gamma, saved_mode, current_mode); } catch (LWJGLException e) { LWJGLUtil.log("Caught exception while processing messages: " + e); } unlockAWT(); } - private static native void nUpdate(int extension, int current_window_mode, ByteBuffer saved_gamma, ByteBuffer current_gamma, DisplayMode saved_mode) throws LWJGLException; + private static native void nUpdate(int extension, int current_window_mode, ByteBuffer saved_gamma, ByteBuffer current_gamma, DisplayMode saved_mode, DisplayMode current_mode) throws LWJGLException; public void reshape(int x, int y, int width, int height) { lockAWT(); |
|
From: Elias N. <eli...@us...> - 2005-11-22 11:06:36
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3508/src/native/linux Modified Files: org_lwjgl_input_Mouse.c Log Message: Linux: Fixed a mouse cursor position issue in grabbed mode Index: org_lwjgl_input_Mouse.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- org_lwjgl_input_Mouse.c 22 Nov 2005 10:32:17 -0000 1.40 +++ org_lwjgl_input_Mouse.c 22 Nov 2005 11:06:21 -0000 1.41 @@ -106,7 +106,7 @@ static void resetCursor(int x, int y) { last_x = x; - last_y = y; + last_y = transformY(y); } static bool blankCursor(JNIEnv *env) { @@ -286,7 +286,6 @@ setCursorPos(win_x, win_y); if (!pointer_grabbed || !shouldGrab()) return; - // find the window position in root coordinates XWindowAttributes window_attributes; XGetWindowAttributes(getDisplay(), root_window, &window_attributes); int root_window_width = window_attributes.width; @@ -295,6 +294,7 @@ int window_width = window_attributes.width; int window_height = window_attributes.height; + // find the window position in root coordinates int win_left = root_x - win_x; int win_top = root_y - win_y; int win_right = win_left + window_width; |
|
From: Elias N. <eli...@us...> - 2005-11-22 10:32:25
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28739/src/native/linux Modified Files: Window.h org_lwjgl_input_Mouse.c org_lwjgl_opengl_Display.c Log Message: Linux: removed getWindowWidth/Height from native side Index: Window.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/Window.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- Window.h 21 Nov 2005 13:22:52 -0000 1.27 +++ Window.h 22 Nov 2005 10:32:17 -0000 1.28 @@ -66,16 +66,6 @@ extern bool shouldGrab(void); /* - * get the current window width - */ - extern int getWindowWidth(void); - - /* - * get the current window height - */ - extern int getWindowHeight(void); - - /* * get the current display */ extern Display *getDisplay(void); Index: org_lwjgl_opengl_Display.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- org_lwjgl_opengl_Display.c 21 Nov 2005 21:59:11 -0000 1.38 +++ org_lwjgl_opengl_Display.c 22 Nov 2005 10:32:17 -0000 1.39 @@ -445,14 +445,6 @@ return current_win; } -int getWindowWidth(void) { - return current_width; -} - -int getWindowHeight(void) { - return current_height; -} - JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nUpdate (JNIEnv *env, jclass clazz, jint extension, jint window_mode, jobject saved_gamma, jobject current_gamma, jobject saved_mode) { Index: org_lwjgl_input_Mouse.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- org_lwjgl_input_Mouse.c 22 Nov 2005 09:32:15 -0000 1.39 +++ org_lwjgl_input_Mouse.c 22 Nov 2005 10:32:17 -0000 1.40 @@ -84,7 +84,9 @@ } static int transformY(int y) { - return getWindowHeight() - 1 - y; + XWindowAttributes window_attributes; + XGetWindowAttributes(getDisplay(), getCurrentWindow(), &window_attributes); + return window_attributes.height - 1 - y; } static void setCursorPos(int x, int y) { @@ -280,22 +282,28 @@ return v1 < v2 ? v1 : v2; } -static void doHandlePointerMotion(Window root_window, int root_x, int root_y, int win_x, int win_y) { +static void doHandlePointerMotion(Window root_window, Window window, int root_x, int root_y, int win_x, int win_y) { setCursorPos(win_x, win_y); if (!pointer_grabbed || !shouldGrab()) return; // find the window position in root coordinates + XWindowAttributes window_attributes; + XGetWindowAttributes(getDisplay(), root_window, &window_attributes); + int root_window_width = window_attributes.width; + int root_window_height = window_attributes.height; + XGetWindowAttributes(getDisplay(), window, &window_attributes); + int window_width = window_attributes.width; + int window_height = window_attributes.height; + int win_left = root_x - win_x; int win_top = root_y - win_y; - int win_right = win_left + getWindowWidth(); - int win_bottom = win_top + getWindowHeight(); + int win_right = win_left + window_width; + int win_bottom = win_top + window_height; // cap the window position to the screen dimensions int border_left = max(0, win_left); int border_top = max(0, win_top); - XWindowAttributes root_attributes; - XGetWindowAttributes(getDisplay(), root_window, &root_attributes); - int border_right = min(root_attributes.width, win_right); - int border_bottom = min(root_attributes.height, win_bottom); + int border_right = min(root_window_width, win_right); + int border_bottom = min(root_window_height, win_bottom); // determine whether the cursor is outside the bounds bool outside_limits = root_x < border_left + POINTER_WARP_BORDER || root_y < border_top + POINTER_WARP_BORDER || root_x > border_right - POINTER_WARP_BORDER || root_y > border_bottom - POINTER_WARP_BORDER; @@ -308,7 +316,7 @@ } void handlePointerMotion(XMotionEvent *event) { - doHandlePointerMotion(event->root, event->x_root, event->y_root, event->x, event->y); + doHandlePointerMotion(event->root, event->window, event->x_root, event->y_root, event->x, event->y); } JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nPollMouse(JNIEnv * env, jclass clazz, jobject coord_buffer_obj, jobject button_buffer_obj) { @@ -355,5 +363,5 @@ setGrab(window_mode, new_grab == JNI_TRUE ? true : false); reset(); XQueryPointer(getDisplay(), getCurrentWindow(), &root_return, &child_return, &root_x, &root_y, &win_x, &win_y, &mask_return); - doHandlePointerMotion(root_return, root_x, root_y, win_x, win_y); + doHandlePointerMotion(root_return, getCurrentWindow(), root_x, root_y, win_x, win_y); } |
|
From: Elias N. <eli...@us...> - 2005-11-22 09:32:23
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14371/src/native/linux Modified Files: display.c display.h org_lwjgl_input_Mouse.c Log Message: Linux: Removed getScreenModeWidth/Height from display.c Index: display.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/display.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- display.h 21 Nov 2005 21:59:11 -0000 1.12 +++ display.h 22 Nov 2005 09:32:15 -0000 1.13 @@ -45,8 +45,6 @@ #include <jni.h> #include "common_tools.h" -extern int getScreenModeWidth(void); -extern int getScreenModeHeight(void); extern void resetDisplayMode(JNIEnv *env, int screen, jint extension, jobject gamma_ramp, jobject saved_mode, bool temporary); extern void temporaryRestoreMode(JNIEnv *env, int screen, jint extension, jobject gamma_ramp); Index: display.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/display.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- display.c 21 Nov 2005 22:37:14 -0000 1.21 +++ display.c 22 Nov 2005 09:32:15 -0000 1.22 @@ -68,14 +68,6 @@ static int current_height; static int current_freq; -int getScreenModeWidth(void) { - return current_width; -} - -int getScreenModeHeight(void) { - return current_height; -} - static bool getXF86VidModeVersion(JNIEnv *env, Display *disp, int *major, int *minor) { int event_base, error_base; Index: org_lwjgl_input_Mouse.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- org_lwjgl_input_Mouse.c 21 Nov 2005 13:22:52 -0000 1.38 +++ org_lwjgl_input_Mouse.c 22 Nov 2005 09:32:15 -0000 1.39 @@ -280,7 +280,7 @@ return v1 < v2 ? v1 : v2; } -static void doHandlePointerMotion(int root_x, int root_y, int win_x, int win_y) { +static void doHandlePointerMotion(Window root_window, int root_x, int root_y, int win_x, int win_y) { setCursorPos(win_x, win_y); if (!pointer_grabbed || !shouldGrab()) return; @@ -292,8 +292,10 @@ // cap the window position to the screen dimensions int border_left = max(0, win_left); int border_top = max(0, win_top); - int border_right = min(getScreenModeWidth(), win_right); - int border_bottom = min(getScreenModeHeight(), win_bottom); + XWindowAttributes root_attributes; + XGetWindowAttributes(getDisplay(), root_window, &root_attributes); + int border_right = min(root_attributes.width, win_right); + int border_bottom = min(root_attributes.height, win_bottom); // determine whether the cursor is outside the bounds bool outside_limits = root_x < border_left + POINTER_WARP_BORDER || root_y < border_top + POINTER_WARP_BORDER || root_x > border_right - POINTER_WARP_BORDER || root_y > border_bottom - POINTER_WARP_BORDER; @@ -306,7 +308,7 @@ } void handlePointerMotion(XMotionEvent *event) { - doHandlePointerMotion(event->x_root, event->y_root, event->x, event->y); + doHandlePointerMotion(event->root, event->x_root, event->y_root, event->x, event->y); } JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nPollMouse(JNIEnv * env, jclass clazz, jobject coord_buffer_obj, jobject button_buffer_obj) { @@ -353,5 +355,5 @@ setGrab(window_mode, new_grab == JNI_TRUE ? true : false); reset(); XQueryPointer(getDisplay(), getCurrentWindow(), &root_return, &child_return, &root_x, &root_y, &win_x, &win_y, &mask_return); - doHandlePointerMotion(root_x, root_y, win_x, win_y); + doHandlePointerMotion(root_return, root_x, root_y, win_x, win_y); } |
|
From: Elias N. <eli...@us...> - 2005-11-21 22:37:22
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1773/src/native/linux Modified Files: display.c Log Message: Linux: fixed an issue with Xrandr timestamps Index: display.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/display.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- display.c 21 Nov 2005 22:21:29 -0000 1.20 +++ display.c 21 Nov 2005 22:37:14 -0000 1.21 @@ -206,7 +206,8 @@ Status status; Drawable root_window = RootWindow(disp, screen); XRRScreenConfiguration *screen_configuration = XRRGetScreenInfo(disp, root_window); - XRRConfigTimes(screen_configuration, timestamp); + Time config_time; + *timestamp = XRRConfigTimes(screen_configuration, &config_time); Rotation current_rotation; XRRConfigRotations(screen_configuration, ¤t_rotation); status = XRRSetScreenConfigAndRate(disp, screen_configuration, root_window, mode->mode_data.size_index, current_rotation, mode->freq, *timestamp); @@ -241,7 +242,7 @@ return false; } bool result = false; - for ( i = 0; i < num_modes; ++i ) { + for (i = 0; i < num_modes; ++i) { printfDebugJava(env, "Mode %d: %dx%d @%d", i, avail_modes[i].width, avail_modes[i].height, avail_modes[i].freq); if (avail_modes[i].width == width && avail_modes[i].height == height && avail_modes[i].freq == freq) { switch (extension) { |
|
From: Elias N. <eli...@us...> - 2005-11-21 22:21:43
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30869/src/native/linux Modified Files: display.c Log Message: Linux: let exceptions from display.c propagate to LinuxDisplay.java Index: display.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/display.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- display.c 21 Nov 2005 21:59:11 -0000 1.19 +++ display.c 21 Nov 2005 22:21:29 -0000 1.20 @@ -319,30 +319,24 @@ return ramp_buffer; } -static void setGamma(JNIEnv *env, Display *disp, int screen, jobject ramp_buffer, bool throw_on_error) { +static void setGamma(JNIEnv *env, Display *disp, int screen, jobject ramp_buffer) { unsigned short *ramp_ptr = (unsigned short *)(*env)->GetDirectBufferAddress(env, ramp_buffer); jlong capacity = (*env)->GetDirectBufferCapacity(env, ramp_buffer); int size = capacity/(sizeof(unsigned short)*3); if (size == 0) return; if (XF86VidModeSetGammaRamp(disp, screen, size, ramp_ptr, ramp_ptr + size, ramp_ptr + size*2) == False) { - if (throw_on_error) - throwException(env, "Could not set gamma ramp."); - else - printfDebugJava(env, "Could not set gamma ramp."); + throwException(env, "Could not set gamma ramp."); } } -static void setGammaRamp(JNIEnv *env, jobject gamma_ramp_buffer, int screen, bool throw_on_error) { +static void setGammaRamp(JNIEnv *env, jobject gamma_ramp_buffer, int screen) { Display * disp = XOpenDisplay(NULL); if (disp == NULL) { - if (throw_on_error) - throwException(env, "Could not open display"); - else - printfDebugJava(env, "Could not open display"); + throwException(env, "Could not open display"); return; } - setGamma(env, disp, screen, gamma_ramp_buffer, throw_on_error); + setGamma(env, disp, screen, gamma_ramp_buffer); XCloseDisplay(disp); } @@ -356,15 +350,12 @@ printfDebugJava(env, "Could not restore mode"); XCloseDisplay(disp); // Don't propagate error to caller - setGammaRamp(env, saved_gamma_ramp, screen, false); + setGammaRamp(env, saved_gamma_ramp, screen); } -static bool switchDisplayMode(JNIEnv * env, int screen, jint extension, jobject mode, bool temporary, bool throw_on_error) { +static bool switchDisplayMode(JNIEnv * env, int screen, jint extension, jobject mode, bool temporary) { if (mode == NULL) { - if (throw_on_error) - throwException(env, "mode must be non-null"); - else - printfDebugJava(env, "Ignored null mode"); + throwException(env, "mode must be non-null"); return false; } jclass cls_displayMode = (*env)->GetObjectClass(env, mode); @@ -376,18 +367,12 @@ int freq = (*env)->GetIntField(env, mode, fid_freq); Display *disp = XOpenDisplay(NULL); if (disp == NULL) { - if (throw_on_error) - throwException(env, "Could not open display"); - else - printfDebugJava(env, "Could not open display"); + throwException(env, "Could not open display"); return false; } if (!setMode(env, disp, screen, extension, width, height, freq, temporary)) { XCloseDisplay(disp); - if (throw_on_error) - throwException(env, "Could not switch mode."); - else - printfDebugJava(env, "Could not switch mode"); + throwException(env, "Could not switch mode."); return false; } XCloseDisplay(disp); @@ -395,9 +380,9 @@ } void resetDisplayMode(JNIEnv *env, int screen, jint extension, jobject gamma_ramp, jobject saved_mode, bool temporary) { - if (!switchDisplayMode(env, screen, extension, saved_mode, temporary, false)) + if (!switchDisplayMode(env, screen, extension, saved_mode, temporary)) return; - setGammaRamp(env, gamma_ramp, screen, false); + setGammaRamp(env, gamma_ramp, screen); } static jobjectArray getAvailableDisplayModes(JNIEnv * env, Display *disp, int screen, jint extension) { @@ -428,7 +413,7 @@ } JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nSwitchDisplayMode(JNIEnv *env, jclass clazz, jint extension, jobject mode) { - switchDisplayMode(env, getCurrentScreen(), extension, mode, false, true); + switchDisplayMode(env, getCurrentScreen(), extension, mode, false); } JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nResetDisplayMode(JNIEnv *env, jclass clazz, jint extension, jobject gamma_ramp, jobject saved_mode) { @@ -440,6 +425,6 @@ } JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nSetGammaRamp(JNIEnv *env, jclass clazz, jobject gamma_buffer) { - setGammaRamp(env, gamma_buffer, getCurrentScreen(), true); + setGammaRamp(env, gamma_buffer, getCurrentScreen()); } |
