1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-23 10:48:51 -05:00
Commit Graph

897 Commits

Author SHA1 Message Date
Camilla Berglund 55f7813d68 Merge branch 'master' into multi-monitor 2012-12-13 01:50:09 +01:00
Camilla Berglund 94e9b3adff Added include required for free. 2012-12-12 13:59:53 +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 ccdb776cc3 Cleanup of configuration variable use. 2012-12-02 19:13:01 +01:00
Camilla Berglund 47c11b4ea6 Tweaked comment. 2012-12-02 19:02:32 +01:00
Camilla Berglund 5da8ed250a Cleanup of backend option strings. 2012-12-02 19:01:20 +01:00
Camilla Berglund 14e71833bd Merge branch 'master' into EGL 2012-12-02 17:11:17 +01:00
Camilla Berglund 0bac579506 Formatting. 2012-12-02 16:53:28 +01:00
Camilla Berglund 3a773342e8 Renamed struct member to match other platforms. 2012-12-02 16:52:40 +01:00
Camilla Berglund 821997ad55 Merge branch 'master' into joystickname 2012-12-02 16:36:44 +01:00
Camilla Berglund 280782a2a5 Added explicit non-support for sRGB on EGL. 2012-12-02 16:29:56 +01:00
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 69a900592e Added explicit support for sRGB framebuffers. 2012-12-02 16:10:00 +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 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 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 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 2a166c5086 Removed glfwCopyContext to map better against EGL. 2012-11-22 20:16:48 +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 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 26abe0a6e3 Merge branch 'master' of github.com:elmindreda/glfw 2012-11-11 02:09:08 +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 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 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
Camilla Berglund 5df4df6ca4 Added glfwDefaultWindowHints. 2012-10-22 03:16:14 +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 422618d67f Added missing X extension test. 2012-10-22 00:55:36 +02:00
Camilla Berglund 9f26500f32 Removed VidMode mode setting code path. 2012-10-22 00:53:34 +02:00
Camilla Berglund 7e225281af Fixed RandR per-monitor resolution enumeration. 2012-10-22 00:48:52 +02:00
Camilla Berglund 6fc6c93223 Implemented RandR monitor mode retrieval. 2012-10-22 00:05:55 +02:00
Camilla Berglund d75c06a994 Added missing screen resource cleanup. 2012-10-21 23:55:41 +02:00
Camilla Berglund 8176cae1bc Fixed position of fullscreen windows on X11. 2012-10-21 23:45:03 +02:00
Camilla Berglund 467d501621 Cleanup of context clearing during window destruction. 2012-10-21 21:57:29 +02:00
Camilla Berglund b87157ccc1 Merge branch 'master' of github.com:elmindreda/glfw 2012-10-21 21:32:51 +02:00
Camilla Berglund c1dcd29c71 Fixed potential clearing of wrong context. 2012-10-21 21:30:13 +02:00
Camilla Berglund c3195746d8 Formatting. 2012-10-21 16:23:36 +02:00
Camilla Berglund d0afa65813 Formatting. 2012-10-21 16:17:20 +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 ccec055ff7 Formatting. 2012-10-18 17:54:55 +02:00
Camilla Berglund 550b0c177d Added missing initial value. 2012-10-18 16:25:15 +02:00
Camilla Berglund e6556c7f34 Comment grammar fix. 2012-10-17 17:11:56 +02:00
Camilla Berglund d6210b11f3 Formatting. 2012-10-05 05:42:47 +02:00
Camilla Berglund 6ac7af38d9 Began using monitor position for window placement. 2012-10-05 04:10:42 +02:00
Camilla Berglund 2bb62a1467 Bug fix formatting. 2012-10-04 04:08:53 +02:00
Camilla Berglund ae5da60c18 Fixed test for wrong client API. 2012-10-04 04:05:37 +02:00
Camilla Berglund f236fc2f61 Fixed X11 hidden cursor mode. 2012-10-02 18:03:21 +02:00
Camilla Berglund ddeca47117 Removed executable flag from header. 2012-10-02 17:25:37 +02:00
Camilla Berglund 88fb5c1cf3 Merge branch 'master' into multi-monitor 2012-10-02 17:24:50 +02:00
Camilla Berglund 26480901fd Added glfwGetWindowMonitor. 2012-10-02 17:24:18 +02:00
Camilla Berglund 21a015778f Replaced malloc and memset with calloc. 2012-10-02 17:07:59 +02:00
Camilla Berglund ff09d3a343 Merge branch 'master' into multi-monitor 2012-10-02 03:11:32 +02:00
Camilla Berglund 5fcfcb2ddc Updated comment. 2012-09-30 15:53:20 +02:00
Camilla Berglund d00c194f4a Added 8 bits of stencil to defaults. 2012-09-30 15:51:59 +02:00
Camilla Berglund c764ae81e8 Added missing window parameter return. 2012-09-30 15:43:26 +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 bf8639e49f Removed unused struct member. 2012-09-30 14:54:58 +02:00
Camilla Berglund 508c7fe0e6 Merge branch 'master' into multi-monitor
Conflicts:
	src/window.c
2012-09-27 23:32:26 +02:00
Camilla Berglund 1be1636326 Begun integrating monitor and window. 2012-09-27 21:38:35 +02:00
Camilla Berglund fe0cc512a2 Added missing cast. 2012-09-27 15:18:57 +02:00
Camilla Berglund 7fa27f1e98 Fixed warnings on VC++. 2012-09-27 02:49:20 +02:00
Camilla Berglund c5f7eff190 Fixed use of functions missing on VC++. 2012-09-27 02:35:19 +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 9d6945a766 Merge branch 'master' into EGL
Conflicts:
	CMakeLists.txt
	include/GL/glfw3.h
	readme.html
	src/CMakeLists.txt
	src/internal.h
	src/window.c
2012-09-23 15:35:45 +02:00
Camilla Berglund 7aaeb6955b Merge branch 'master' into multi-monitor
Conflicts:
	src/x11_window.c
2012-09-23 15:26:53 +02:00
Camilla Berglund c0dcb5a056 Fixed fullscreen regressions. 2012-09-23 15:08:43 +02:00
Camilla Berglund 6a5ebbc870 Merge branch 'master' into multi-monitor 2012-09-23 14:44:56 +02:00
Camilla Berglund 718af531a3 Fixed order of operations. 2012-09-23 14:08:36 +02:00
Camilla Berglund d6d5fb2684 Simplified character input. 2012-09-19 13:17:53 +02:00
Camilla Berglund 14f00ffa67 Removed unused struct member. 2012-09-16 12:43:33 +02:00
Camilla Berglund b711b2fc72 Formatting. 2012-09-16 12:42:51 +02:00
Camilla Berglund a2dab25b06 Added fallback for X11 monitor size. 2012-09-13 22:04:01 +02:00
Camilla Berglund dbd4d1657e Formatting. 2012-09-13 21:57:42 +02:00
Camilla Berglund 20a49a7eee Improved handling of primary monitor. 2012-09-13 17:46:40 +02:00
Camilla Berglund a0305affeb Began implementing multi-monitor on Cocoa. 2012-09-13 16:37:06 +02:00
Camilla Berglund 633839502c Fixed various VC++ warnings. 2012-09-13 00:05:54 +02:00