Camilla Berglund
9a183090e0
Merge branch 'master' into showwindow
...
Conflicts:
src/window.c
2012-09-06 15:11:50 +02:00
Camilla Berglund
52c27113d3
Shortened PC boolean name.
2012-09-02 15:21:40 +02:00
Camilla Berglund
2502e4d6f3
Renamed glfwGetJoystickPos to glfwGetJoystickAxes.
2012-08-29 18:58:16 +02:00
Camilla Berglund
38e4cc3dad
Removed superfluous comments.
2012-08-29 17:29:46 +02:00
Camilla Berglund
cdcf3be462
Removed event debug printfs.
2012-08-29 17:26:54 +02:00
Camilla Berglund
54f1a57f8d
Added channel bit depth hint defaults.
2012-08-29 16:00:54 +02:00
Camilla Berglund
d5ede06859
Removed WS_VISIBLE from creation flags.
2012-08-28 21:37:07 +02:00
Camilla Berglund
54fceaaf64
Clarified result comparison.
2012-08-28 20:24:37 +02:00
Camilla Berglund
53245d754e
Added detection of joystick disconnect on X11.
2012-08-28 20:16:43 +02:00
Camilla Berglund
d0ad28f174
Merge branch 'master' into showwindow
2012-08-28 17:52:31 +02:00
Camilla Berglund
e10d935efe
API tag and error message cleanup.
2012-08-28 15:03:57 +02:00
Camilla Berglund
9696321334
Fixed return value of glfwGetCurrentContext.
2012-08-27 13:52:10 +02:00
Camilla Berglund
2a8b2ccef4
Split internal prototypes into APIs.
2012-08-27 03:55:45 +02:00
Camilla Berglund
035a8f4a49
Merge branch 'master' into tls
...
Conflicts:
src/x11_window.c
2012-08-26 21:56:55 +02:00
Camilla Berglund
bb635729ec
Fixed spelling of GLFW.
2012-08-26 21:29:39 +02:00
Camilla Berglund
aaaac00aa5
Comment fixes.
2012-08-26 21:29:26 +02:00
Camilla Berglund
bd5ff15769
Moved error handling to init module.
2012-08-26 18:49:39 +02:00
Camilla Berglund
85ca7ee184
Shortened comment.
2012-08-26 18:42:59 +02:00
Camilla Berglund
5d52ad1548
Replaced GLFWGLOBAL and _init_c_ with extern.
2012-08-26 18:42:15 +02:00
Camilla Berglund
1839c1c73d
Added joystick API error checks for shared and Linux code.
2012-08-26 18:28:30 +02:00
Camilla Berglund
c28fb4ca0c
Cleaned up Linux joystick code.
2012-08-26 18:15:47 +02:00
Camilla Berglund
2b6080fc20
Merge branch 'master' of github.com:elmindreda/glfw
2012-08-26 15:39:10 +02:00
Camilla Berglund
bf3486f077
Comment updates and formatting.
2012-08-26 15:38:18 +02:00
Camilla Berglund
f6a1bbf782
Added GLFW_VISIBLE to glfwWindowParam.
2012-08-21 21:57:13 +02:00
Camilla Berglund
0e63488b40
Cocoa window visibility fixes.
2012-08-21 21:35:42 +02:00
Camilla Berglund
8bb5c59d2d
Added GLFW_VISIBLE window hint and parameter.
2012-08-21 21:19:01 +02:00
Camilla Berglund
3d2722dc4c
Fixed broken call to glfwShowWindow.
2012-08-21 20:32:44 +02:00
Camilla Berglund
a2ca095b86
Renamed GLFW_WINDOW_RESIZABLE to GLFW_RESIZABLE.
...
This matches GLFW_ACTIVE and GLFW_ICONIFIED.
2012-08-21 20:28:36 +02:00
Riku Salminen
596132c3a1
Add glfwShowWindow, glfwHideWindow
...
Add glfwShowWindow and glfwHideWindow functions to allow explicit
control over show/hide window.
Remove platform specific show window code from _glfwPlatformCreateWindow
but call glfwShowWindow from glfwCreateWindow to avoid breaking things
(for now).
2012-08-21 21:01:57 +03:00
Camilla Berglund
b77bdea734
Merge pull request #18 from madcad/master
...
Fixed compilation issues on OS X.
2012-08-19 18:28:10 -07:00
Camilla Berglund
3f34b091b8
Gave MinGW link library a .a suffix.
2012-08-16 19:23:54 +02:00
Torsten Walluhn
3f39c5ae42
Fixed compiling issues on mac os x with llvm-gcc 4.2
2012-08-14 23:34:26 +02:00
Camilla Berglund
0c92fb8500
Added clearing of global joystick data.
2012-08-14 22:00:11 +02:00
Camilla Berglund
ac653761b9
Formatting.
2012-08-14 21:58:22 +02:00
Camilla Berglund
9af03e141b
Merge branch 'master' into tls
2012-08-14 14:00:19 +02:00
Camilla Berglund
6399fb19fd
Included malloc.h from files using malloc on Win32.
2012-08-14 13:52:48 +02:00
Camilla Berglund
18a5aba8f1
Implemented TLS for all platforms.
2012-08-13 16:03:44 +02:00
Camilla Berglund
a9ed5b141e
Merge branch 'master' of github.com:elmindreda/glfw
2012-08-12 22:32:55 +02:00
Camilla Berglund
b7be8d90d8
Renamed libglfw3.pc to glfw3.pc.
2012-08-12 22:31:47 +02:00
Camilla Berglund
c9896a2f75
Merge branch 'master' into tls
2012-08-12 16:47:40 +02:00
Camilla Berglund
5ce704e60c
Added missing include.
2012-08-12 16:46:29 +02:00
Camilla Berglund
6c449e6e8f
Formatting.
2012-08-12 16:22:18 +02:00
Camilla Berglund
fd125f7e54
Moved inclusion directive to proper location.
2012-08-12 16:06:22 +02:00
Camilla Berglund
f66e6a6916
Re-enabled cursor re-centering.
2012-08-12 16:05:43 +02:00
Camilla Berglund
208b7f0bb8
Formatting.
2012-08-12 16:04:03 +02:00
Riku Salminen
3d6221c490
Added support for multithreaded use of Xlib.
2012-08-12 15:57:52 +02:00
Camilla Berglund
cd37da470f
Merge branch 'master' into tls
2012-08-12 15:35:06 +02:00
Camilla Berglund
129598eb51
Merge branch 'master' of github.com:elmindreda/glfw
2012-08-12 15:31:34 +02:00
Camilla Berglund
d03c8507e6
Merge branch 'master' into tls
2012-08-12 15:28:26 +02:00
Camilla Berglund
cb447bee81
Cleanup of window resizable flag setting.
2012-08-12 15:28:12 +02:00
Camilla Berglund
25c7ad1706
Removed superfluous MakeContextCurrent.
2012-08-12 14:14:03 +02:00
Camilla Berglund
9e4bc36dd8
Initial TLS implementation (Cocoa broken).
2012-08-12 14:13:18 +02:00
Lambert Clara
c2729181a2
Fix various warnings reported by gcc
...
Shadowed variables, const warnings
2012-08-12 14:02:38 +02:00
Camilla Berglund
ab373308b0
Removed mistaken comment.
2012-08-12 12:50:44 +02:00
jonathan MERCIER
31c0212c25
Able to install to lib64 if LIB_SUFFIX var is set to 64
2012-08-11 17:50:56 +02:00
Camilla Berglund
2f095cc9e3
Removed implicit glfwMakeCurrentContext.
...
Implicitly making the context current makes sense in a
single-window API but less sense in a multi-window one.
2012-08-10 15:29:45 +02:00
Camilla Berglund
2410e2aaf4
Replaced automatic closing with window parameter.
2012-08-10 13:31:15 +02:00
Camilla Berglund
ddcf5d471e
Removed mirroring of default framebuffer attribs.
2012-08-10 13:28:58 +02:00
Camilla Berglund
f71daaa14b
Removed executable flag from source file.
2012-08-07 13:09:31 +02:00
Camilla Berglund
8ed66ea4d5
Removed calling of callbacks from setters.
2012-08-07 12:45:55 +02:00
Riku Salminen
99031a43a2
X11: remove _glfwProcessPendingEvents
...
Remove _glfwProcessPendingEvents, do not call event handlers from
glfwCreateWindow. It is dangerous.
Do not wait for MapNotify event in glfwCreateWindow under X11.
2012-08-06 21:24:53 +03:00
Camilla Berglund
585a840329
Added window parameter to glfwSwapBuffers.
2012-08-06 18:13:37 +02:00
Camilla Berglund
aff30d0baa
Renamed window creation/destruction functions.
...
Renamed glfwOpenWindow to glfwCreateWindow.
Renamed glfwCloseWindow to glfwDestroyWindow.
Renamed glfwOpenWindowHint to glfwWindowHint.
2012-08-06 17:59:34 +02:00
Camilla Berglund
2972cdfeb1
Removed glfwIsWindow.
2012-08-03 16:20:52 +02:00
Camilla Berglund
1736132bb2
Fixed window parameter refresh.
2012-08-03 15:21:49 +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
a182acd585
Removed EGL-specific context param refresh.
2012-08-02 03:01:31 +02:00
Camilla Berglund
7d222030da
Merge branch 'master' into EGL
...
Conflicts:
src/internal.h
src/opengl.c
tests/glfwinfo.c
2012-08-02 02:50:17 +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
0f1ab5317f
Formatting.
2012-08-01 01:07:08 +02:00
Camilla Berglund
76bd8b79b6
Merge branch 'master' into EGL
...
Conflicts:
src/win32_window.c
tests/glfwinfo.c
2012-08-01 01:04:14 +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
331aa26503
Formatting.
2012-07-31 19:13:27 +02:00
Camilla Berglund
b1de4d6fed
Fixed client API version parsing.
2012-07-31 19:06:48 +02:00
Camilla Berglund
0b25bba5b5
Merge branch 'master' into EGL
2012-07-31 18:55:00 +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
a3c4b96c91
Removed commented-out code, added error reporting.
2012-07-23 18:40:31 +02:00
Camilla Berglund
3bb04b3a76
Merge branch 'master' into EGL
2012-07-23 18:04:32 +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
f457223bdf
Minor context creation fixes.
2012-07-22 17:06:37 +02:00
Camilla Berglund
3f9fa39564
Merge branch 'master' into EGL
...
Conflicts:
src/CMakeLists.txt
2012-07-22 16:19:24 +02:00
Camilla Berglund
d83119a874
Added explicit access to native handles.
2012-07-22 15:26:15 +02:00
Camilla Berglund
b069391cc0
Formatting.
2012-07-22 02:01:42 +02:00
Camilla Berglund
ccca5d71fe
Use EGL_KHR_create_context with GLES as well.
2012-07-22 02:00:00 +02:00
Camilla Berglund
bddc95c017
Removed references to GLX in EGL port.
2012-07-22 01:38:15 +02:00
Camilla Berglund
edd554c115
Added support for EGL_KHR_create_context.
2012-07-22 01:33:42 +02:00
Camilla Berglund
3b6ec4e775
Added client API window hint.
2012-07-22 01:16:53 +02:00
Camilla Berglund
e9c82a82b2
Added eglext.h header.
2012-07-21 23:51:44 +02:00
Camilla Berglund
b78fd85e11
Moved glext.h inclusion back.
2012-07-21 23:51:08 +02:00
Camilla Berglund
bd179634dc
Formatting.
2012-07-20 18:11:26 +02:00
Camilla Berglund
ea1506ba67
Fixed EGLConfig nomenclature, simplified refresh.
2012-07-20 18:04:43 +02:00
Camilla Berglund
0f4cdd5194
Fixed invalid attribute list terminator.
2012-07-20 17:40:20 +02:00
Camilla Berglund
2796ecb556
Updated platform API tags.
2012-07-20 03:28:03 +02:00
Camilla Berglund
5417130f96
Added new options to version string.
2012-07-20 03:05:06 +02:00
Camilla Berglund
546124f1fb
Fixed invalid file mode.
2012-07-20 02:10:59 +02:00
Camilla Berglund
1a05d6db70
Renamed GLX implementation file.
2012-07-20 02:10:39 +02:00
Camilla Berglund
c9c94e44d2
Formatting.
2012-07-20 02:08:01 +02:00
Camilla Berglund
ddb497c5d5
Removed hard-coded EGL config limit.
2012-07-20 02:02:20 +02:00
Camilla Berglund
fd688e0332
Formatting.
2012-07-20 00:24:42 +02:00
Camilla Berglund
fd4967b01a
Removed superfluous casts.
2012-07-20 00:17:58 +02:00
Camilla Berglund
d3d972aa9d
Fixed typo in dlopen macro.
2012-07-20 00:15:36 +02:00
Camilla Berglund
251964f84f
Began decoupling EGL code from X11.
2012-07-20 00:14:52 +02:00
Camilla Berglund
26a843043c
Formatting, removed trivial comments.
2012-07-19 23:55:41 +02:00
Camilla Berglund
be12cbca15
Added separate platform headers for EGL and GLX.
2012-07-19 23:06:15 +02:00
Camilla Berglund
311b9df102
Added error for unsupported call.
2012-07-19 22:11:45 +02:00
Jari Vetoniemi
6b1344af3c
Use GLFWglproc return type
2012-07-17 23:06:30 +03:00
Jari Vetoniemi
db0a4b599d
Fix GLubyte warning, by casting to (char*)
2012-07-17 22:29:09 +03:00
Jari Vetoniemi
739be03373
Obey the OPENGL_ES2_PROFILE hint
2012-07-17 22:27:01 +03:00
Jari Vetoniemi
2e7d91ea5a
Only consider OpenGL ES contexes
...
EGL_WINDOW_BIT is compared agaist wrong attribute
2012-07-17 22:27:01 +03:00
Cloudef
5cf8b8d3fa
Remove useless define
2012-07-17 22:27:01 +03:00
Cloudef
2815630688
Reflect X visual changes to EGL code
2012-07-17 22:27:01 +03:00
Cloudef
819b09d479
Add member struct defines for window's context members so code can be shared
2012-07-17 22:25:47 +03:00
Cloudef
478eac2fe0
Create window surface and add fallback for visual info retival
2012-07-17 22:25:47 +03:00
Cloudef
e06515eaa0
Improve OpenGL version parsing from string
2012-07-17 22:25:47 +03:00
Cloudef
28db982d0a
Add x11_fullscreen.c to the source list
2012-07-17 22:25:47 +03:00
Cloudef
d99e2385c1
Add temporary #ifdef in x11_fullscreen so EGL compiles
2012-07-17 22:25:47 +03:00
Cloudef
c878281487
Add EGL platform opengl implentation
2012-07-17 22:25:47 +03:00
Cloudef
812ebe200d
Add EGL X11 platform header
2012-07-17 22:25:47 +03:00
Cloudef
778a76683a
Add EGL X11 platform header
2012-07-17 22:25:47 +03:00
Cloudef
85067ede2e
Add EGL related configurations
2012-07-17 22:25:47 +03:00
Cloudef
1327c124a4
Seperate Context from Window in CMakeLists, add option to build for EGL
2012-07-17 22:25:47 +03: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
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