Camilla Berglund
0f93d24306
Added more details on connected monitors.
2012-11-08 18:20:31 +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
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
Camilla Berglund
0e170f4902
Merge branch 'master' into multi-monitor
2012-10-22 02:46:06 +02:00
Camilla Berglund
2108360671
Removed 'screen' from monitor nomenclature.
2012-10-22 02:39:22 +02:00
Camilla Berglund
73ca3bdbb6
Fixed order of operations in iconify test.
2012-10-22 00:56:23 +02:00
Camilla Berglund
bf43247aed
Fixed output of GLFW-parsed context profile by glfwinfo.
2012-10-21 22:13:14 +02:00
Camilla Berglund
dd941f5ae8
Added output of DPI.
2012-10-18 23:09:28 +02:00
Camilla Berglund
da31167193
Renamed glfwGetMonitorString to glfwGetMonitorName.
2012-10-18 23:01:41 +02:00
Camilla Berglund
c1bb1d8a6e
Merge branch 'master' into multi-monitor
...
Conflicts:
tests/iconify.c
2012-10-18 18:42:45 +02:00
Camilla Berglund
2c6f4329a4
Updated iconification test to use callbacks.
2012-10-05 04:00:27 +02:00
Camilla Berglund
ff09d3a343
Merge branch 'master' into multi-monitor
2012-10-02 03:11:32 +02:00
Camilla Berglund
937f137246
Improved error formatting.
2012-09-30 15:51:46 +02:00
Camilla Berglund
38cad9aff0
Added client API window hint.
...
This is cherry-picked from the EGL branch in preparation for the EGL backend.
2012-09-30 15:32:50 +02:00
Camilla Berglund
1be1636326
Begun integrating monitor and window.
2012-09-27 21:38:35 +02:00
Camilla Berglund
7fa27f1e98
Fixed warnings on VC++.
2012-09-27 02:49:20 +02:00
Camilla Berglund
6a5ebbc870
Merge branch 'master' into multi-monitor
2012-09-23 14:44:56 +02:00
Camilla Berglund
89018331f7
Fixed invalid uses of glfwDestroyWindow.
2012-09-13 17:29:07 +02:00
Camilla Berglund
d21e79642b
Added output of monitor position.
2012-09-13 16:47:59 +02:00
Camilla Berglund
633839502c
Fixed various VC++ warnings.
2012-09-13 00:05:54 +02:00
Camilla Berglund
4bcb1b38f9
Merge branch 'multi-monitor' of github.com:elmindreda/glfw into multi-monitor
2012-09-12 21:14:15 +02:00
Camilla Berglund
830f2b439c
Cleanup.
2012-09-12 20:41:14 +02:00
Camilla Berglund
83f5b920b9
Merge branch 'master' into multi-monitor
...
Conflicts:
.gitignore
src/CMakeLists.txt
src/x11_window.c
2012-09-12 06:04:17 +02:00
Camilla Berglund
d214bfdfde
Made defaults test window hidden.
2012-09-11 22:23:35 +02:00
Camilla Berglund
dcc3d67158
Merge branch 'showwindow'
2012-09-11 20:03:55 +02:00
Camilla Berglund
2b946289d8
Added direct dependency on librt for threads test on X11.
2012-09-09 01:31:23 +02:00
Camilla Berglund
9f94286c9a
Merge branch 'master' into showwindow
...
Conflicts:
readme.html
2012-09-08 21:20:45 +02:00
Camilla Berglund
8a948753df
Added printing of debug context window parameter.
2012-09-06 23:55:23 +02:00
Camilla Berglund
a3502a7f00
Merge branch 'tls' of github.com:elmindreda/glfw into tls
2012-09-06 15:41:47 +02:00
Camilla Berglund
5e23620c7f
Merge branch 'master' into tls
...
Conflicts:
src/x11_window.c
2012-09-06 15:40:18 +02:00
Camilla Berglund
9a183090e0
Merge branch 'master' into showwindow
...
Conflicts:
src/window.c
2012-09-06 15:11:50 +02:00
Camilla Berglund
1f05fa6945
Merge remote-tracking branch 'github/multi-monitor' into multi-monitor
2012-08-30 02:21:24 +02:00
Camilla Berglund
62cc39bd2a
Merge branch 'master' into multi-monitor
2012-08-30 02:17:37 +02:00
Camilla Berglund
733cd5372f
Fixed and separated GLFW version check.
2012-08-30 02:17:08 +02:00
Camilla Berglund
2b9f54d650
Improved output of modes test.
2012-08-30 02:12:02 +02:00
Camilla Berglund
89b42d084d
Replaced glfwGetDesktopMode with glfwGetVideoMode.
2012-08-30 01:54:01 +02:00
Camilla Berglund
560b6b5a11
Merge branch 'master' into multi-monitor
...
Conflicts:
src/CMakeLists.txt
src/internal.h
src/x11_platform.h
2012-08-29 20:36:07 +02:00
Camilla Berglund
2502e4d6f3
Renamed glfwGetJoystickPos to glfwGetJoystickAxes.
2012-08-29 18:58:16 +02:00
Camilla Berglund
f50d38f148
Moved glfwinfo version check to before glfwInit.
2012-08-28 22:56:35 +02:00
Camilla Berglund
f5bfe41456
Moved GLFW_VISIBLE hint use to glfwinfo.
2012-08-28 17:52:22 +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
b665903e14
Added testing of glfwShowWindow and GLFW_VISIBLE.
2012-08-21 21:19:33 +02:00
Camilla Berglund
06700e62bf
Don't call OpenGL functions until there's a context.
2012-08-19 02:21:47 +02:00
Camilla Berglund
12e00876d7
Formatting.
2012-08-15 20:26:09 +02:00
Camilla Berglund
2b0f8c2f1e
Removed 'device' from monitor callback.
2012-08-14 15:15:51 +02:00
Camilla Berglund
39c171a61d
Merge branch 'master' into multi-monitor
...
Conflicts:
tests/modes.c
2012-08-14 14:02:37 +02:00
Camilla Berglund
2e789e17e6
Made threads test a GUI program.
2012-08-13 19:52:49 +02:00
Camilla Berglund
86bcfb3e4e
Added multiple windows to threads test.
2012-08-13 19:37:39 +02:00
Camilla Berglund
c594bb4689
Made loop boolean volatile.
2012-08-12 22:36:10 +02:00