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
238da01770
Re-used profile name macros in glfwinfo.
2012-12-13 20:04:17 +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
a8a0585164
Updated debug context detection.
2012-12-13 17:33:08 +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
b30def90e4
...and the other half of making it const.
2012-12-02 21:18:01 +01:00
Camilla Berglund
73cdc34df7
Merge branch 'master' into multi-monitor
...
Conflicts:
CMakeLists.txt
readme.html
src/CMakeLists.txt
src/cocoa_platform.h
src/win32_platform.h
src/x11_platform.h
tests/events.c
2012-12-02 20:52:03 +01:00
Camilla Berglund
42c78fbe42
Merge branch 'master' into joystickname
2012-12-02 16:45:08 +01:00
Camilla Berglund
7be9e87ef1
Removed bad use of glfwGetCurrentContext.
2012-12-02 16:45:03 +01:00
Camilla Berglund
821997ad55
Merge branch 'master' into joystickname
2012-12-02 16:36:44 +01:00
Camilla Berglund
1a3d47d06d
Added window position callback.
2012-11-30 13:58:05 +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
2a166c5086
Removed glfwCopyContext to map better against EGL.
2012-11-22 20:16:48 +01:00
Camilla Berglund
c479124e69
Removed key repeat.
2012-11-22 17:14:50 +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
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
c9f4dedd96
Introduced window positioning hints and window position properties
2012-11-10 22:19:55 +01:00
Camilla Berglund
0f93d24306
Added more details on connected monitors.
2012-11-08 18:20:31 +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
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
85cfc6bdd0
Merge branch 'master' into joystickname
...
Conflicts:
src/x11_joystick.c
2012-09-23 15:46:42 +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
