Camilla Berglund
854e634fec
Merge branch 'master' into multi-monitor
...
Conflicts:
include/GL/glfw3.h
src/CMakeLists.txt
src/fullscreen.c
src/internal.h
src/win32_fullscreen.c
src/win32_platform.h
src/x11_fullscreen.c
tests/modes.c
2012-08-03 02:57:33 +02:00
Camilla Berglund
4b9e616cf8
Fixed indexing bug in Cocoa video mode enumeration.
2012-08-02 19:26:00 +02:00
Camilla Berglund
ae586e65d8
Fixed typo.
2012-08-02 19:14:58 +02:00
Camilla Berglund
5f26deaf59
Merge branch 'master' of github.com:elmindreda/glfw
2012-08-02 19:02:42 +02:00
Camilla Berglund
b03e62f6ac
Made X11 resolution enumeration a separate function.
2012-08-02 18:54:47 +02:00
Camilla Löwy Berglund
255e79918e
Merge pull request #11 from arturjpv/master
...
Fixed updateTrackingAreas not calling super.
2012-08-02 09:49:28 -07:00
Camilla Berglund
871e1a70d7
Made video mode retrieval dynamic.
2012-08-02 18:03:43 +02:00
Arturo J. Pérez
287e94cd6b
Behavior differences under Lion and Snow Leopard in updateTrackingAreas.
...
super call added.
According to documentation (NSView Class Reference -> Instance Methods -> updateTrackingAreas):
You should override this method to remove out of date tracking areas and add recomputed tracking areas; your implementation should call super.
2012-08-02 17:45:52 +02:00
Camilla Berglund
957ecdc9a0
Renamed no current context error to match function.
2012-08-02 15:36:15 +02:00
Camilla Berglund
a916997c86
Simplified call to platform-specific extension check.
2012-08-02 15:32:39 +02:00
Camilla Berglund
1bad573c10
Tightened scope of some local variables.
2012-08-02 15:31:08 +02:00
Camilla Berglund
ee3304c09a
Removed check for invalid user, added error setting.
2012-08-02 15:29:13 +02:00
Camilla Berglund
bfc746a847
Error message grammar fix.
2012-08-02 15:14:38 +02:00
Camilla Berglund
ba941b2fc8
Added formatting to error string.
2012-08-02 15:13:57 +02:00
Camilla Berglund
208377d08e
Imported version parsing from EGL branch.
2012-08-02 14:48:06 +02:00
Camilla Berglund
59896c327a
Context property fixes.
2012-08-02 14:42:24 +02:00
Camilla Berglund
f274b329d1
Fixed check for GL_ARB_multisample.
2012-08-02 14:16:07 +02:00
Camilla Berglund
053737e660
Use OpenGL to get default framebuffer properties.
2012-08-02 01:37:08 +02:00
Camilla Berglund
3a72f33541
Removed GLFW_ACCELERATED window parameter.
2012-08-02 01:13:05 +02:00
Camilla Berglund
302037d5b4
Added stub debug context detection.
2012-07-31 23:52:23 +02:00
Camilla Berglund
669c40f102
Fixed debug context being a hard constraint on WGL.
2012-07-31 23:07:18 +02:00
Camilla Berglund
fc74a5533e
Moved WGL context logic into OpenGL module.
2012-07-31 22:48:28 +02:00
Camilla Berglund
6c37c84d91
Reduced the number of conditional blocks.
2012-07-30 20:15:34 +02:00
John Bartholomew
0f0e42b975
Use SOVERSION for shared libraries on Unix-like systems.
2012-07-30 01:04:08 +01:00
John Bartholomew
93ec9fa901
Changed library output name to "glfw3", and pkg-config name to libglfw3.
...
Since the headers are already named differently, this allows
side-by-side installation of GLFW 2.x and GLFW 3.x.
2012-07-30 00:14:09 +01:00
Camilla Berglund
b28298f329
Fixed call to CGPointMake.
2012-07-29 14:07:01 +02:00
Camilla Berglund
52ebc0db85
Fixed use of wrong point type.
2012-07-23 00:50:52 +02:00
Camilla Berglund
dd298ab908
Fixed copypaste errors.
2012-07-23 00:48:30 +02:00
Camilla Berglund
d83119a874
Added explicit access to native handles.
2012-07-22 15:26:15 +02:00
Camilla Berglund
f4880b9206
Merge branch 'multi-monitor' of github.com:elmindreda/glfw into multi-monitor
2012-07-20 01:05:57 +02:00
Camilla Berglund
f559b217af
Merge branch 'master' into multi-monitor
2012-07-20 01:05:09 +02:00
Simon Voordouw
173e321ea6
fix MESA_swap_control copy-pasta
2012-07-17 08:28:43 +02:00
Camilla Berglund
aa328c0bbd
Added support for GLX_MESA_swap_interval.
2012-07-15 16:49:05 +02:00
Camilla Berglund
a0429e4b6e
Removed duplicate type declarations.
2012-07-11 00:33:19 +02:00
Camilla Berglund
9498ac52b9
Simplified Win32 video mode enumeration.
2012-07-06 22:52:53 +02:00
Camilla Berglund
c68a4aa2ef
Formatting.
2012-07-06 17:47:09 +02:00
Camilla Berglund
e188f6c4e1
Replaced manual duplication with strdup.
2012-07-06 14:37:02 +02:00
Camilla Berglund
73622a2f3c
Formatting.
2012-07-06 14:36:29 +02:00
Camilla Berglund
db066b4f46
Win32 Unicode fixes.
2012-07-06 14:04:57 +02:00
Camilla Berglund
78bc624ba9
Fixed use of removed functions.
2012-07-05 18:52:06 +02:00
Camilla Berglund
c06f838d88
Merge branch 'master' into multi-monitor
...
Conflicts:
.gitignore
examples/CMakeLists.txt
include/GL/glfw3.h
src/CMakeLists.txt
src/internal.h
src/win32_platform.h
src/win32_window.c
src/x11_fullscreen.c
src/x11_platform.h
tests/listmodes.c
2012-07-05 16:15:01 +02:00
Camilla Berglund
34c93a5124
Disabled window restoration on Cocoa.
2012-07-02 15:38:29 +02:00
Camilla Berglund
e7c4e77214
Fixed cursor positioning in fullscreen on Cocoa.
2012-07-02 15:23:36 +02:00
Camilla Berglund
ee66e5fa10
Merged fix for bug #3528964 .
2012-07-02 00:36:20 +02:00
Camilla Berglund
cef9dea1d2
Unified nomenclature for cursor positions.
2012-06-22 13:57:25 +02:00
Camilla Berglund
cea0e30499
Fixed cursor centering using wrong mode.
2012-06-21 13:35:35 +02:00
Camilla Berglund
14bcc51f3b
Removed config macro values.
2012-06-12 03:00:16 +02:00
Camilla Berglund
41be34eadf
Fixed window position on Win32.
2012-06-12 02:29:18 +02:00
Camilla Berglund
31b06a0ae0
Win32 window position work.
2012-06-11 14:02:25 +02:00
Camilla Berglund
ed9890f110
Fixed typecast warning.
2012-06-11 13:47:06 +02:00
Camilla Berglund
bf42c3cfbc
Made glfwGetProcAddress return a function pointer.
2012-06-05 00:16:40 +02:00
Camilla Berglund
bc8860dc6a
Made fbconfig conversion more readable.
2012-06-03 16:54:06 +02:00
Camilla Berglund
ae2c63b580
Made fbconfig conversion more readable.
2012-06-03 16:40:54 +02:00
Camilla Berglund
19744bc5de
Added needed include.
2012-06-03 16:33:48 +02:00
Camilla Berglund
fbb2f24ebb
Merge branch 'context-window-split'
...
Conflicts:
src/x11_init.c
src/x11_platform.h
src/x11_window.c
2012-06-03 16:31:56 +02:00
Camilla Berglund
7b4f9f02ca
Commented workaround.
2012-06-03 16:12:35 +02:00
Camilla Berglund
9d5a95add8
Merge branch 'master' of github.com:elmindreda/glfw
2012-06-03 16:09:41 +02:00
Camilla Berglund
fc07e1d7eb
Added workaround for missing window bit in VB GL.
2012-06-03 16:09:13 +02:00
Braden Pellett
6cb89175a7
Emit an error when gamma ramp cannot be get/set due to size not being GLFW_GAMMA_RAMP_SIZE.
2012-06-01 00:08:34 -07:00
Braden Pellett
2558da0b59
Ignore gamma ramp get/set capabilities if size is not GLFW_GAMMA_RAMP_SIZE, similar to what happens currently for the Cocoa implementation.
2012-05-31 17:01:24 -07:00
Camilla Berglund
322407ae9f
Moved X11 gamma ramp termination to gamma module.
2012-05-31 01:34:21 +02:00
Camilla Berglund
20fccd4aa3
Removed unsupported target.
2012-05-24 11:48:50 +02:00
Camilla Berglund
79bef68511
Only restore gamma ramp if it has been changed.
2012-05-24 11:46:51 +02:00
Camilla Berglund
f5eb79ed28
Removed gamma API warning prints.
2012-05-24 11:39:16 +02:00
Camilla Berglund
1a37788143
Moved X11 gamma ramp init to gamma module.
2012-05-24 11:36:43 +02:00
Camilla Berglund
6ff3936101
Fixed source file having executable flag set.
2012-05-07 00:20:53 +02:00
Camilla Berglund
d717c0a5ba
Added bug fix from 2.7.6.
2012-05-07 00:13:38 +02:00
Camilla Berglund
26fc5cacda
Formatting.
2012-05-07 00:11:51 +02:00
Camilla Berglund
904db4c605
Merge branch 'master' of github.com:elmindreda/glfw
2012-04-30 01:59:45 +02:00
Camilla Berglund
a22fbf7e9b
Moved remaining X visual management into opengl module.
2012-04-23 22:31:55 +02:00
Camilla Berglund
f77c8f8b21
Made GLX extension management global instead of per-window.
2012-04-23 13:08:34 +02:00
Camilla Berglund
9614b9b22f
Moved OpenGL init and terminate to opengl module.
2012-04-23 13:00:49 +02:00
Camilla Berglund
49dfbe86b2
Moved the majority of GLX code into opengl module.
2012-04-23 12:50:04 +02:00
Camilla Berglund
1a99827432
Moved the type declarations.
2012-04-22 21:49:38 +02:00
Camilla Berglund
21e77fe1a6
Split platform-specific global data.
2012-04-22 15:53:02 +02:00
Camilla Berglund
2ac8da7465
Merged patch #3519669 .
2012-04-22 12:58:05 +02:00
Camilla Berglund
68122f8134
Merge branch 'master' of github.com:elmindreda/glfw
2012-04-19 16:58:19 +02:00
Camilla Berglund
53fab2f16b
Fixed VC++ errors.
2012-04-17 17:55:11 +02:00
quarnster
a73b45b7a7
Need to include sys/param.h for MAXPATHLEN.
2012-04-16 12:33:34 +03:00
Camilla Berglund
a7d19ed77e
Removed superfluous comment.
2012-04-15 00:40:50 +02:00
Camilla Berglund
4994acb7e1
Removed superfluous test.
2012-04-14 23:01:35 +02:00
Camilla Berglund
bf5b436ca5
Removed unused variables.
2012-04-12 00:55:30 +02:00
Camilla Berglund
f868712f02
Simplified clipboard API.
2012-04-12 00:51:58 +02:00
Camilla Berglund
721e0a7fd0
Clarified comment.
2012-04-11 23:53:47 +02:00
Camilla Berglund
f231ed37f0
Re-worked and fixed X11 clipboard support.
2012-04-11 23:32:50 +02:00
Camilla Berglund
ad48c0e5ef
Added string for new error.
2012-04-10 18:22:15 +02:00
Camilla Berglund
e0c4d81e46
Added function for processing only pending events.
2012-04-10 01:15:50 +02:00
Camilla Berglund
0e9e37bfc4
Simplified string storage.
2012-04-10 00:52:21 +02:00
Camilla Berglund
15e8af1f79
Added initial implementation for Cocoa.
2012-04-10 00:34:08 +02:00
Camilla Berglund
8390121869
Fixed legacy C warnings.
2012-04-09 23:56:14 +02:00
Camilla Berglund
8fe46ac1fe
Formatting.
2012-04-09 23:27:06 +02:00
Camilla Berglund
ab40dab235
Formatting.
2012-04-09 18:00:22 +02:00
Camilla Berglund
ad18589c6c
Added initial implementation for Win32.
2012-04-09 17:55:54 +02:00
Camilla Berglund
877c6337c3
Updated remaining ports.
2012-04-09 16:19:54 +02:00
Camilla Berglund
bf1ada029b
Added window parameter to clipboard API.
2012-04-09 16:00:54 +02:00
Camilla Berglund
7044ed6f06
Simplified and made clipboard API more type safe.
2012-04-09 15:54:36 +02:00
Camilla Berglund
2bc8d442f4
Formatting.
2012-04-09 15:36:39 +02:00
Camilla Berglund
952c6b7e82
Merge branch 'master' into clipboard
2012-04-09 15:33:03 +02:00
Camilla Berglund
fcd67c69ec
Simplified clipboard cache layout.
2012-04-09 15:27:32 +02:00
Camilla Berglund
b8676f01db
Clarified clipboard format atom use.
2012-04-09 15:21:54 +02:00