kappaOne
f528f38c60
Fix OS X CALayer positioning and workaround Java 7 bug
...
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7172187
2013-04-20 23:21:01 +01:00
kappaOne
5628e751bf
Revert "Fix OS X CALayer positioning and workaround Java 7 bug http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7172187 "
...
This reverts commit 1cceacb3cd
.
2013-04-19 21:34:57 +01:00
kappaOne
1cceacb3cd
Fix OS X CALayer positioning and workaround Java 7 bug
...
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7172187
2013-04-19 21:32:31 +01:00
Ioannis Tsakpinis
6fd210fdb3
[Windows] Wait for the big icon to update on setIcon. This normally happens asynchronously, but we block until it's done and only then return from setIcon.
2013-04-19 19:05:23 +03:00
Ioannis Tsakpinis
9a895b1dba
Attempt to fix focus transfer issue between Display and AWT components in JDK 7:
...
- Instead of grabbing focus directly to our window, we call requestFocus on the Canvas component. This will clear focus from any other AWT component.
- When the parent Canvas gets focus, we detect it in update and that's when we grab focus to our window. We can't use a listener, setFocus must be called in our thread.
- Alt-tabbing out/in also works because focus goes to the Canvas. The above check will trigger again and our window will be refocused.
2013-04-18 17:02:48 +03:00
Ioannis Tsakpinis
c0b19b7743
Another attempt to fix focus problems with Display.setParent on Windows:
...
- Reverted to WS_CHILD in window flags.
- Added WM_MOUSEACTIVATE handling: Focus the display + return MA_NOACTIVATE.
- Removed unnecessary appActivate calls in WM_ACTIVATE. We don't receive WM_ACTIVATE with WS_CHILD and the focus events do the job just fine.
- Detect parent window focus in update and force focus the display. This is useful when we alt-tab to the parent window and we don't receive any events.
2013-04-17 22:19:38 +03:00
kappaOne
1f81b30f66
map horizontal scroll wheel events to vertical scroll wheel events,
...
should fix the no event issue when using shift + scroll wheel
2013-04-14 15:19:49 +01:00
kappaOne
5378a48083
Bump OS X native version
2013-04-14 14:56:00 +01:00
kappaOne
0c07657edf
Fix a resizing issue with AWTGLCanvas on OS X
2013-04-14 14:54:11 +01:00
kappaOne
a7c704ae2f
Workaround Nvidia driver bug which crashed the OS when releasing a
...
shared context by not releasing shared contexts.
2013-04-14 14:14:36 +01:00
kappaOne
529acd40ff
Clean up used resources when destroying an OS X / CALayer
2013-04-14 13:19:57 +01:00
kappaOne
f3dc48ba6e
Merge branch 'master' of https://github.com/LWJGL/lwjgl.git
2013-04-13 18:18:53 -07:00
kappaOne
2bbd7ebe5b
Fix a crash with CALayers/OSX when running on Java 7
2013-04-13 18:14:32 -07:00
Brian Matzon
18285fa832
Merge pull request #22 from DziNeIT/patch-1
...
Fixed JavaDoc for Mouse#next()
2013-04-11 14:43:07 -07:00
Ollie
5631c5a3ba
Fixed JavaDoc for Mouse#next()
...
Mouse does not contain a getEventDZ() method, so the JavaDoc was invalid.
Signed-off-by: Ollie <dzineit@live.co.uk>
2013-04-11 23:02:11 +02:00
kappaOne
ca39cb3cdb
fix a crash which occurs sometimes when setting the window title
2013-04-09 15:29:02 -07:00
kappaOne
79b5f755d7
Update to latest build of OpenAL-Soft 1.15.1
...
43b406ad9bb32ebde78d26255a2a4f4a09a29926
2013-04-06 23:58:40 +01:00
kappaOne
f45f1e79d9
Fix OSX/CALayer issue where it is not initially visible when running on
...
Java 7
2013-04-05 01:36:07 +01:00
Ioannis Tsakpinis
c9a057db73
Fixed CL_GL_NUM_SAMPLES value.
2013-04-03 15:18:15 +03:00
Ioannis Tsakpinis
a9c15cd1b0
Added missing CL12 tokens.
2013-03-29 01:12:26 +02:00
Ioannis Tsakpinis
523fab4417
cl_device_type is a cl_bitfield, ie. long.
2013-03-28 14:22:55 +02:00
Ioannis Tsakpinis
82fc3bf6bf
Merge branch 'master' of https://github.com/LWJGL/lwjgl
2013-03-27 13:11:51 +02:00
Ioannis Tsakpinis
b83264e296
Added 4.3 in GL versions.
2013-03-27 13:11:29 +02:00
kappaOne
27f66983fc
bump OS X JNI version
2013-03-25 23:08:45 +00:00
kappaOne
76f02c9187
Fix the now infamous "Could not get the JAWT interface" exception when
...
running on OS X and Java 7
2013-03-25 22:55:46 +00:00
kappaOne
38612a402d
third attempt to revert changes and fix nightly build server, gah!
2013-03-25 22:14:17 +00:00
kappaOne
bc7061717e
Another attempt to try fix nightly builds
2013-03-25 14:06:42 +00:00
kappaOne
b83f27e970
undo some changes to the OS X build.xml file as it broke the nightly
...
build server
2013-03-25 12:35:06 +00:00
kappaOne
c53e957833
Remove dependency on Java Native Foundation framework, remove non
...
working JAWT manually loading, change to use headers from
JavaVM.framework when compiling due to JDK7 bug
2013-03-24 20:49:23 +00:00
kappaOne
14de6c518d
Fix crash on close of the Display when using Java 7 on OS X
2013-03-24 17:39:39 +00:00
Ioannis Tsakpinis
7b955ee86b
Merge branch 'master' of https://github.com/LWJGL/lwjgl
2013-03-22 21:31:33 +02:00
Ioannis Tsakpinis
ead1abc2b8
Made glBitmap buffer parameter nullable.
2013-03-22 21:31:22 +02:00
kappaOne
58932fcdbf
tweak how glViewport is set when using Display.setParent/AWTGLCanvas
2013-03-15 01:17:24 +00:00
kappaOne
5738477a7b
Merge pull request #19 from LWJGL/osx-java7
...
LWJGL OS X Java 7 Branch is Ready!
2013-03-14 04:49:43 -07:00
kappaOne
d8297e7583
set correct size on glViewport when using CALayer
2013-03-14 02:58:14 +00:00
kappaOne
d462208c4c
Implement AWTGLCanvas, fix initial glViewport size when using
...
Display.setParent
2013-03-13 00:51:32 +00:00
Ioannis Tsakpinis
50688c825d
Merge branch 'master' of https://github.com/LWJGL/lwjgl
2013-03-09 21:41:52 +02:00
Ioannis Tsakpinis
3509384629
clCreateImage fixes:
...
- Corrected image_desc byte-size calculation on x64.
- Allow null host_ptr.
2013-03-09 21:41:40 +02:00
Ioannis Tsakpinis
96d65d716e
Merge pull request #17 from Lekensteyn/master
...
Fix build error on Linux.
On some Linux distributions, there is no static libXxf86vm.a, only a shared library. In order to succeed a build, link against the shared library. Since the linker options are the same for 32-bit installations and Solaris, merge the options.
2013-02-22 09:19:11 -08:00
Peter Wu
6642ab736c
Fix Linux build error w.r.t. Xxf86vm linking
2013-02-22 17:55:13 +01:00
Ioannis Tsakpinis
8faf5f4f35
Reverted commit b333b029
that affected GLX extension detection. Fixes #16 .
...
We now only query glXQueryExtensionsString instead of the server & client
GLX_EXTENSIONS strings.
2013-02-22 18:22:22 +02:00
kappaOne
0cbe94d9e3
Tweak to fix a crash on exit, attempt to fix missing jawt error on
...
Java 7
2013-02-20 22:20:23 +00:00
kappaOne
6cd860525f
fix potential crash on exit when closing the Display window
2013-02-19 22:28:14 +00:00
kappaOne
f381eb1f35
Simplify code in AWTSurfaceLock for CALayer support
2013-02-17 16:50:56 +00:00
kappaOne
af1ae935d8
fix CALayer/Display.setParent driver crash on resize
2013-02-17 15:09:31 +00:00
kappaOne
6663ee037c
Attempt fix for no JAWT on OS X Java 7 issue
2013-02-16 14:07:16 +00:00
kappaOne
d28381e1cd
minor tweak to comments
2013-02-16 00:31:10 +00:00
kappaOne
e67d717c4e
simplify mouse code a little
2013-02-15 21:49:19 +00:00
kappaOne
10b8d633d0
push
2013-02-15 21:40:33 +00:00
kappaOne
1b48b704bc
Move entire Display nCreate and nDestroy onto the Main Thread 0
2013-02-15 21:35:12 +00:00
kappaOne
817cada066
move nswindow close to main thread 0 to fix a potential crash on exit
2013-02-12 22:00:11 +00:00
kappaOne
ed9ab95419
fix crash on startup when creating a second window Display after a
...
destroy in the same app
2013-02-12 21:53:49 +00:00
kappaOne
e725ca7d34
further tweak to pbuffer support
2013-02-12 21:41:47 +00:00
kappaOne
e28f8554f9
tweak to pbuffer support
2013-02-12 21:40:48 +00:00
kappaOne
e0a52b20c3
fix and reimplement pbuffer support
2013-02-10 21:33:28 +00:00
kappaOne
9929d0fac9
release mouse grab when destroying the Mouse or Display
2013-02-10 20:32:07 +00:00
kappaOne
93bfa246c6
reduce use of window specific code in the context implementation code
2013-02-10 17:57:52 +00:00
kappaOne
f6c0f17c79
Fix freeze/hang when calling AL.create() before Display.create()
2013-02-09 00:59:11 +00:00
kappaOne
4e0c593644
Tweak native cursor behaviour
2013-02-08 23:55:45 +00:00
kappaOne
db4eb9c5c8
Replace AWT code for getAvailableDisplayMode and other DisplayModes
...
stuff to use pure native Cococa code.
2013-02-08 23:29:15 +00:00
kappaOne
409b3fea6d
Correctly catch quit events instead of manually catching OS X hotkeys
2013-02-07 21:55:53 +00:00
kappaOne
93a169b27b
Catch Command+Q shortcut and get it to call Display.isCloseRequested()
2013-02-05 21:28:08 +00:00
kappaOne
e15d172087
report Mouse.getX()/getY() values correctly on initial display creation.
2013-02-03 20:55:33 +00:00
kappaOne
c57c27abaf
remove nsview on main thread to avoid thread issues
2013-02-03 20:54:27 +00:00
kappaOne
f6a2bc8327
Detect correctly if mouse is inside or outside the Display on
...
creation and resize.
2013-02-03 18:58:00 +00:00
kappaOne
c328463776
Implement Cursor.destroy and release memory used by native cursors
2013-02-03 17:47:09 +00:00
kappaOne
bf13ed9cc3
Restore default mouse cursor on mouse destroy
2013-02-03 16:52:45 +00:00
kappaOne
65beebb379
fix crash related to mouse being dragging whilst Display is destroyed.
2013-02-03 16:39:02 +00:00
kappaOne
2d43265d10
Fix Display.getWidth()/getHeight() to return size of NSView instead of
...
NSWindow, fix a crash on exit
2013-02-02 20:30:12 +00:00
kappaOne
a5c7ec0017
Return correct OS X Cursor.getCapabilities() value
2013-02-02 19:58:18 +00:00
kappaOne
4e1d539095
Further fix Native Mouse Cursor behaviour
2013-02-02 01:15:41 +00:00
kappaOne
abeb9f389c
Fix Mouse.isInsideWindow() when starting in fullscreen mode
2013-02-01 22:28:10 +00:00
kappaOne
549f07fd28
Release NSView object on Display.destroy()
2013-01-31 23:47:50 +00:00
kappaOne
b27754089a
Fix Display.setParent() on Java 7 by forcing CALayer usage as
...
classic NSView method is no long available.
2013-01-31 23:01:19 +00:00
kappaOne
0d25914029
Fix colors on OS X native cursors
2013-01-31 22:44:43 +00:00
Ioannis Tsakpinis
1c671598aa
Reverted warning level to 2, until we modify the generator to emit explicit casts.
2013-01-30 02:07:40 +02:00
kappaOne
4e023eec16
Implement animated cursor support on OS X
2013-01-29 22:59:40 +00:00
Ioannis Tsakpinis
5400bb27db
Misc fixes and improvements on Windows:
...
- Cleaned up cl flags and enabled parallel compilation. Native compilation
is now multiple times faster.
- Fixed all /W3 compilation warnings.
- Changed window flag from WS_CHILDWINDOW to WS_POPUP when Display.setParent
is used, in an attempt to fix focus-related issues.
2013-01-29 22:53:11 +02:00
kappaOne
27cfdf646e
Improve native cursor behaviour
2013-01-27 23:45:08 +00:00
kappaOne
6c090f1f61
Implement Mouse.isInsideWindow() on OS X
2013-01-27 23:01:21 +00:00
kappaOne
f0219aed1a
Fix native cursor global handle passing
2013-01-26 22:47:36 +00:00
Ioannis Tsakpinis
62b8d36002
Changed Get(Async)KeyState return type to short.
2013-01-25 15:28:17 +02:00
Ioannis Tsakpinis
6b68ff17b8
Added missing null-termination checks.
2013-01-25 15:26:55 +02:00
kappaOne
fc2889cc27
Fix ARGB order on Native Cursors
2013-01-25 01:03:13 +00:00
kappaOne
486ff0edea
Added initial work towards getting native cursors working, not
...
implemented yet
2013-01-25 00:28:26 +00:00
kappaOne
4735a6040f
Fix crash when dragging mouse and switching from fullscreen to windowed
...
mode
2013-01-16 22:37:50 +00:00
kappaOne
fbb490bb3a
Reenable the AWT Robot for CALayer mode
2013-01-16 19:02:09 +00:00
kappaOne
b8ba6ee6e5
Fix a small memory leak when using CALayer mode
2013-01-16 18:39:19 +00:00
kappaOne
fc9e4f4bda
Tweak CALayer mode to active correctly
2013-01-15 23:09:03 +00:00
kappaOne
02c0e80fb6
fix crash when switching to/from fullscreen when using CALayer mode.
2013-01-15 22:34:50 +00:00
Ioannis Tsakpinis
d721194cf3
Corrected JavaDoc param order.
2013-01-15 22:59:46 +02:00
Ioannis Tsakpinis
074f6f2d63
Fixed typos.
2013-01-15 17:51:19 +02:00
kappaOne
fe2f06f36e
Implement Keyboard and Mouse input when using CALayer mode
2013-01-14 23:35:46 +00:00
kappaOne
f2ad9f470d
Tweak CALayer resizing behavior
2013-01-13 18:37:20 +00:00
kappaOne
03b669fb4d
Fix garbage being displayed when resizing in CALayer mode
2013-01-13 16:13:13 +00:00
kappaOne
0dda33cd2d
Implement CALayer rendering, no input yet
2013-01-13 15:34:24 +00:00
Ioannis Tsakpinis
d1c1fcb01e
Fixed DrawIndirect buffer size checks and removed null-termination checks (ARB_base_instance changes the reservedMustBeZero field to the baseInstance offset).
2013-01-12 20:49:26 +02:00
kappaOne
790f895220
Set CALayer OpenGL Context to be shared with the current LWJGL context.
...
Make code OS X 10.5 compatible (change from NSOpenGLLayer to
CAOpenGLLayer)
2013-01-04 00:11:12 +00:00
Ioannis Tsakpinis
517d6cfb3b
Properly escape '_' in native method stubs.
2013-01-01 18:12:53 +02:00
Ioannis Tsakpinis
76ba12ad38
Fixed depth_buffer_float tokens to use the ARB values instead of the NV ones.
2012-12-30 16:15:22 +02:00