Commit Graph

4096 Commits

Author SHA1 Message Date
Camilla Berglund
da02844457 Merge branch 'master' into EGL
Conflicts:
	readme.html
	src/win32_platform.h
	src/x11_platform.h
2012-12-02 16:17:59 +01:00
Camilla Berglund
8e5b2239d3 Updated changelog. 2012-12-02 16:14:49 +01:00
Camilla Berglund
69a900592e Added explicit support for sRGB framebuffers. 2012-12-02 16:10:00 +01:00
Camilla Berglund
a3ff29af36 Documentation updates. 2012-12-02 15:47:10 +01:00
Camilla Berglund
1a3d47d06d Added window position callback. 2012-11-30 13:58:05 +01:00
Camilla Berglund
5f68e12b52 Added some documentation for the monitor API. 2012-11-27 17:26:50 +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
Camilla Berglund
1eef0f0869 Renamed context module files. 2012-11-27 15:21:49 +01:00
Camilla Berglund
5ea3591586 Cocoa NSGL fixes. 2012-11-27 15:17:24 +01:00
Camilla Berglund
34d383399c Finished initial window/context backend split. 2012-11-27 15:02:26 +01:00
Camilla Berglund
4ce92262f7 Reverted bad edit. 2012-11-27 14:31:10 +01:00
Camilla Berglund
b49c78ed96 Added missing whitespace. 2012-11-27 14:02:48 +01:00
Camilla Berglund
10cc85343a Formatting. 2012-11-27 13:38:21 +01:00
Camilla Berglund
7e9286c1fa Removed unused stub. 2012-11-27 13:10:14 +01:00
Camilla Berglund
b934cdf573 Begun preparations for Win32 EGL support. 2012-11-27 13:07:26 +01:00
Camilla Berglund
0f0f7f7294 Merge branch 'EGL' of github.com:elmindreda/glfw into EGL
Conflicts:
	include/GL/glfw3.h
2012-11-27 12:23:25 +01:00
Camilla Berglund
e4ddcefc14 Merge branch 'master' into EGL
Conflicts:
	CMakeLists.txt
	include/GL/glfw3.h
	readme.html
	src/CMakeLists.txt
	src/cocoa_window.m
	src/config.h.in
	src/glx_opengl.c
	src/internal.h
	src/opengl.c
	src/window.c
	tests/glfwinfo.c
2012-11-27 12:21:54 +01:00
Camilla Berglund
fc69721807 Tagged comment. 2012-11-23 12:02:09 +01:00
Camilla Berglund
06c191feea Updated error codes to better reflect multi-API support. 2012-11-23 12:00:49 +01:00
Camilla Berglund
1e9383d039 Documentation work. 2012-11-23 11:41:53 +01:00
Camilla Berglund
2a166c5086 Removed glfwCopyContext to map better against EGL. 2012-11-22 20:16:48 +01:00
Camilla Berglund
06e7a96c61 Fixed documentation spelling errors. 2012-11-22 19:14:27 +01:00
Camilla Berglund
9ad1d979e9 Conservatively tagged functions confined to main thread. 2012-11-22 19:08:30 +01:00
Camilla Berglund
998cb5144e Made glfwSetCursorPos fail silently if lacking focus. 2012-11-22 17:20:16 +01:00
Camilla Berglund
c479124e69 Removed key repeat. 2012-11-22 17:14:50 +01:00
Camilla Berglund
ef1da2dde9 Added credit. 2012-11-22 17:06:04 +01:00
Camilla Berglund
b8c16e49f1 Removed window size DWIM. 2012-11-22 17:04:54 +01:00
Camilla Berglund
14355d692f Fixed active/focused nomenclature mixing. 2012-11-22 17:04:44 +01:00
Camilla Berglund
bce2cd65e1 Begun outlining reference documentation. 2012-11-22 17:04:30 +01:00
Camilla Berglund
26abe0a6e3 Merge branch 'master' of github.com:elmindreda/glfw 2012-11-11 02:09:08 +01:00
Camilla Berglund
5f862fbcd0 Merge pull request #24 from marcus256/legacy-api-cleanup
Legacy API cleanup.
2012-11-10 17:04:31 -08:00
m@bitsnbites.eu
1c21fc1383 Removed GLFW_SYSTEM_KEYS from the GLFW API
Rationale: Disabling system commands is inherently
dangerous, and should not be encouraged. Also, it's very
difficult to define and implement a reliable and
consistent cross-platform mechanism.
2012-11-10 22:20:47 +01:00
m@bitsnbites.eu
424e7c7b53 Removed glfwSetWindowPos and glfwGetWindowPos
glfwGetWindowPos is superseded by glfwGetWindowParam()
with GLFW_POSITION_X and GLFW_POSITION_Y as parameters.

glfwSetWindowPos can easily lead to bad practices
(moving windows around without the users consent), and
has been replaced with the GLFW_POSITION_X/Y window
hints that allow setting the window position for a
newly created window.
2012-11-10 22:19:55 +01:00
m@bitsnbites.eu
c9f4dedd96 Introduced window positioning hints and window position properties 2012-11-10 22:19:55 +01:00
Camilla Berglund
8d2043821f Merge pull request #23 from Cloudef/EGL
Added macro for inclusion of GLESv1 header.
2012-11-10 08:50:42 -08:00
Jari Vetoniemi
38c4a8ef2d Make it possible to use GLESv1 2012-11-10 00:08:44 +02:00
Camilla Berglund
0f93d24306 Added more details on connected monitors. 2012-11-08 18:20:31 +01:00
Camilla Berglund
e82683d498 Merge branch 'master' into multi-monitor 2012-11-08 16:29:56 +01:00
Camilla Berglund
875a169792 Added missing test for joystick presence. 2012-11-08 16:26:43 +01:00
Camilla Berglund
7eff6b1b1e Initial implementation of joystick name retrieval on Win32. 2012-11-08 16:26:15 +01:00
Camilla Berglund
a4b3a18755 Formatting. 2012-11-08 16:06:23 +01:00
Camilla Berglund
1fd9428287 Merge branch 'master' into joystickname
Conflicts:
	src/x11_joystick.c
2012-11-08 15:55:25 +01:00
Camilla Berglund
ad7bf4beba Replaced ad-hoc Linux detection with __linux__. 2012-11-05 16:19:11 +01:00
Camilla Berglund
2b4c556cd0 Merge branch 'master' of github.com:elmindreda/glfw 2012-11-01 16:43:40 +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
4fc32a4bbf Comment fix. 2012-10-31 16:11:09 +01:00
Camilla Berglund
a9d1fdfc44 Fixed VC++ warnings. 2012-10-30 17:37:34 +01:00
Camilla Berglund
4c5de7a7b0 Fixed selection flag not being used. 2012-10-30 17:20:16 +01:00
Camilla Berglund
18d71c2b6d Made window-related callbacks per-window.
This makes polymorphic behaviour easier to implement and avoids the problem of
events being triggered before the GLFW window object is fully usable.
2012-10-29 13:36: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