Commit Graph

4616 Commits

Author SHA1 Message Date
Camilla Berglund
835f00eb10 Merge branch 'master' into multi-monitor
Conflicts:
	include/GL/glfw3.h
	readme.html
	src/fullscreen.c
	src/internal.h
	src/window.c
	src/x11_fullscreen.c
2012-12-31 21:13:10 +01:00
Camilla Berglund
1790194828 Renamed _glfwInputError and moved to event API. 2012-12-31 21:05:28 +01:00
Camilla Berglund
21f41a2bb7 Renamed GLFW_SAMPLES and GLFW_SHOULD_CLOSE. 2012-12-31 19:55:41 +01:00
Camilla Berglund
02598570cb Removed unused struct member. 2012-12-31 04:12:16 +01:00
Camilla Berglund
fc5235cd2e Added todo. 2012-12-31 04:06:01 +01:00
Camilla Berglund
cf42282cfb Added generic video mode selection. 2012-12-31 03:04:04 +01:00
Camilla Berglund
52dac79219 Ripped out horribly broken refresh rate mess. 2012-12-31 02:06:19 +01:00
Camilla Berglund
8db1528c74 Added explicit disabling of platform glext.h. 2012-12-30 23:19:38 +01:00
Camilla Berglund
23c6def880 Merge branch 'master' into multi-monitor
Conflicts:
	src/cocoa_window.m
	src/init.c
	tests/iconify.c
	tests/reopen.c
2012-12-30 22:18:15 +01:00
Camilla Berglund
9e9457767f Added workaround for broken Mesa GLX_ARB_create_context_profile. 2012-12-30 18:13:04 +01:00
Camilla Berglund
ea1ddfd7a4 Removed declarations of removed functions. 2012-12-30 02:28:52 +01:00
Camilla Berglund
9cc8fc0d0a Removed glfwGetError and glfwErrorString.
The cached error code cannot be made per-thread unless it required
glfwInit (due to lack of __thread on OS X), which would be confusing and
partially defeats the purpose of it.

Beginners would use the generic error string facility instead of the
error callback and then be confused by its nondescript messages.

Storing the provided error code from within the error callback, whether
globally or per-thread, requires just a few lines of code and hands
control to the user without compromising thread safety.
2012-12-30 01:50:03 +01:00
Camilla Berglund
9af61d06cf Removed return value of _glfwPlatformTerminate. 2012-12-30 01:15:48 +01:00
Camilla Berglund
0dd5d20c77 Merge branch 'master' of github.com:elmindreda/glfw 2012-12-30 01:01:56 +01:00
Camilla Berglund
a8403c10d3 Moved NSGL context creation to proper module. 2012-12-30 00:58:18 +01:00
Camilla Berglund
0a7a57b74f Moved internal API functions to correct section. 2012-12-30 00:45:22 +01:00
Camilla Berglund
20af66f271 Added OOM error reporting to X11 mode enumeration. 2012-12-29 20:01:33 +01:00
Camilla Berglund
18854d16db Removed legacy video mode generation. 2012-12-27 21:13:04 +01:00
Camilla Berglund
45df65eb91 Formatting. 2012-12-27 19:29:09 +01:00
Camilla Berglund
b66e1de97c Added saving of monitor mode count. 2012-12-27 18:37:55 +01:00
Camilla Berglund
948be592be Documented callback clearing at window destruction time. 2012-12-27 18:26:51 +01:00
Camilla Berglund
f558563621 Merge branch 'master' into multi-monitor 2012-12-27 18:22:45 +01:00
Camilla Berglund
cdcdf5763a Temporary fix for OPENGL_INCLUDE_DIR being NOTFOUND on OS X 10.8. 2012-12-27 18:04:24 +01:00
Camilla Berglund
be7ad339f7 Added clearing of callbacks on window destruction. 2012-12-23 16:08:17 +01:00
Camilla Berglund
ed9e403750 Documentation work. 2012-12-23 15:59:09 +01:00
Camilla Berglund
3610f0d071 Added primary status to monitor listing. 2012-12-22 23:37:42 +01:00
Camilla Berglund
648655aa5b Fixed RandR primary monitor detection. 2012-12-22 23:35:45 +01:00
Camilla Berglund
692f34b536 Merge branch 'master' into multi-monitor
Conflicts:
	include/GL/glfw3.h
	src/window.c
	tests/glfwinfo.c
2012-12-22 19:40:15 +01:00
Camilla Berglund
1395ec2269 Documentation work. 2012-12-22 19:21:35 +01:00
Camilla Berglund
f98d3a250f Added documentation cross-references to some tokens. 2012-12-22 18:40:35 +01:00
Camilla Berglund
b9acb777e5 EGL context creation cleanup. 2012-12-16 17:04:43 +01:00
Camilla Berglund
bd31ea0a69 WGL context option cleanup. 2012-12-13 22:50:55 +01:00
Camilla Berglund
cf38b34f45 GLX context option cleanup. 2012-12-13 21:35:59 +01:00
Camilla Berglund
238da01770 Re-used profile name macros in glfwinfo. 2012-12-13 20:04:17 +01:00
Camilla Berglund
d11558e7e4 Fixed corruption of robustness strategy hint. 2012-12-13 20:01:57 +01:00
Camilla Berglund
8c6511085a Corrected eglext.h path. 2012-12-13 19:35:11 +01:00
Camilla Berglund
4bb451f4a7 Removed outdated comment. 2012-12-13 19:33:42 +01:00
Camilla Berglund
11a4d01ea7 Added support for ARB_robustness to glfwinfo. 2012-12-13 19:29:18 +01:00
Camilla Berglund
9c0e19adca Made error message tags more consistent. 2012-12-13 19:18:04 +01:00
Camilla Berglund
9a659c287e Fixed context param readback. 2012-12-13 19:07:19 +01:00
Camilla Berglund
a8a0585164 Updated debug context detection. 2012-12-13 17:33:08 +01:00
Camilla Berglund
fd0f06de8a Formatting. 2012-12-13 17:22:56 +01:00
Camilla Berglund
7ab5e826dd Updated extension headers. 2012-12-13 17:19:16 +01:00
Camilla Berglund
247a875435 Updated version verification. 2012-12-13 17:13:10 +01:00
Camilla Berglund
d22d55ed02 Updated error message to match updated spec. 2012-12-13 02:36:18 +01:00
Camilla Berglund
7be7da16af Merge branch 'master' into multi-monitor
Conflicts:
	include/GL/glfw3.h
2012-12-13 02:23:38 +01:00
Camilla Berglund
3f5843f500 Renamed tokens used for other client APIs. 2012-12-13 02:22:39 +01:00
Camilla Berglund
052c587dd5 Shortened monitor-related tokens. 2012-12-13 01:56:33 +01:00
Camilla Berglund
55f7813d68 Merge branch 'master' into multi-monitor 2012-12-13 01:50:09 +01:00
Camilla Berglund
37904dc68a Documentation work. 2012-12-12 16:05:45 +01:00