1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-27 04:28:52 -05:00
Commit Graph

28 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 21f41a2bb7 Renamed GLFW_SAMPLES and GLFW_SHOULD_CLOSE. 2012-12-31 19:55:41 +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 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 41bc0d18f4 Merge branch 'master' into multi-monitor
Conflicts:
	include/GL/glfw3.h
	readme.html
	src/CMakeLists.txt
	src/win32_window.c
	src/window.c
	src/x11_window.c
	tests/clipboard.c
	tests/defaults.c
	tests/events.c
	tests/fsfocus.c
	tests/glfwinfo.c
	tests/joysticks.c
	tests/peter.c
	tests/sharing.c
	tests/tearing.c
	tests/title.c
	tests/windows.c
2012-11-27 16:55:04 +01:00
m@bitsnbites.eu c9f4dedd96 Introduced window positioning hints and window position properties 2012-11-10 22:19:55 +01:00
Camilla Berglund 7c426d1c92 Merge branch 'master' into multi-monitor
Conflicts:
	examples/wave.c
	src/init.c
	src/internal.h
	src/window.c
	tests/accuracy.c
	tests/events.c
	tests/reopen.c
2012-11-01 00:07:01 +01:00
Camilla Berglund d68acb78bf Removed registering glfwTerminate with atexit.
Functions registered with atexit are called from the thread calling exit.
glfwTerminate should only be called from the main thread.  Mistakes should be
explicit.
2012-10-22 03:20:16 +02:00
Camilla Berglund 1be1636326 Begun integrating monitor and window. 2012-09-27 21:38:35 +02:00
Camilla Berglund 3162f290a6 Fixed float constant type mismatches. 2012-08-12 13:37:12 +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 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 2f7f7ca06f Fixed color of window. 2011-10-05 00:46:56 +02:00
Camilla Berglund 4afc67c1df Various Windows and VC++ 2010 fixes. 2011-07-27 17:09:17 +02:00
Camilla Berglund c1ab73b979 Renamed context-related functions to more closely match underlying APIs. 2011-07-27 16:01:27 +02:00
Camilla Berglund 99ddce3214 Added context sharing. 2010-10-04 18:17:53 +02:00
Camilla Berglund f06489d6cb Fixed flipped error messages, added window positioning, made color calc more weird. 2010-09-16 05:23:02 +02:00
Camilla Berglund e244ad3d41 Updated example and test programs to new API. 2010-09-14 03:10:59 +02:00
Camilla Berglund abaac3ea99 Added GLFW error strings to test programs, various tweaks. 2010-09-11 14:32:05 +02:00
Camilla Berglund 484a2714fc Renamed GLFW_WINDOW to GLFW_WINDOWED. 2010-09-10 13:24:19 +02:00
Camilla Berglund cfbafc5b39 Renamed glfw.h to glfw3.h to avoid conflicts. 2010-09-10 13:16:03 +02:00
Camilla Berglund 06142786b9 Formatting. 2010-09-10 01:07:18 +02:00
Camilla Berglund 107b769ada Formatting. 2010-09-10 00:36:52 +02:00
Camilla Berglund 025f8c9518 Made windows have different titles. 2010-09-10 00:36:18 +02:00
Camilla Berglund e8209c5a0c Added simple multi-window example. 2010-09-10 00:31:22 +02:00