Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-25 11:35:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,186 Commits 17 Branches 23 Tags 35 MiB
6e0ea02f17
Commit Graph

365 Commits

Author SHA1 Message Date
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
Camilla Berglund
9f94286c9a Merge branch 'master' into showwindow 
Conflicts:
	readme.html
 2012-09-08 21:20:45 +02:00
Camilla Berglund
93a1d1c226 Added stubs, implemented on Linux and Cocoa. 2012-09-07 01:01:34 +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
Camilla Berglund
c9896a2f75 Merge branch 'master' into tls 2012-08-12 16:47:40 +02:00
Camilla Berglund
8699399103 Merge branch 'master' of github.com:elmindreda/glfw 2012-08-12 16:45:27 +02:00
Camilla Berglund
4057885ac3 Decreased nesting in threads test. 2012-08-12 16:32:54 +02:00
Camilla Berglund
ac3a5e28c9 Made the leap to glfwWaitEvents. 2012-08-12 16:24:37 +02:00
Camilla Berglund
98c1c2fbf2 Added threading support to CMake files. 2012-08-12 16:18:59 +02:00
Camilla Berglund
cd37da470f Merge branch 'master' into tls 2012-08-12 15:35:06 +02:00
Camilla Berglund
06b5d0f665 Formatting. 2012-08-12 15:32:06 +02:00
Camilla Berglund
129598eb51 Merge branch 'master' of github.com:elmindreda/glfw 2012-08-12 15:31:34 +02:00
Camilla Berglund
7bdadcb671 Replaced inline defines with glext. 2012-08-12 15:31:15 +02:00
Camilla Berglund
5b95715bb1 Added simple silly stupid test. 2012-08-12 15:24:55 +02:00
Lambert Clara
c2729181a2 Fix various warnings reported by gcc 
Shadowed variables, const warnings
 2012-08-12 14:02:38 +02:00
Camilla Berglund
3162f290a6 Fixed float constant type mismatches. 2012-08-12 13:37:12 +02:00
Camilla Berglund
d8ccf5d272 Formatting. 2012-08-12 13:36:52 +02:00
Camilla Löwy Berglund
c8c36f6ec0 Merge pull request #16 from belkiss/master 
Replaced snprintf with sprintf due to MSVC.
 2012-08-12 03:48:19 -07:00
Camilla Berglund
5bbac6fe69 Moved Free Getopt files to support directory. 2012-08-12 12:44:23 +02:00
Lambert Clara
704e56fc81 Fix compilation with MSVC by using sprintf instead of snprintf 
snprintf is part of c99 standard, not supported by MS compilers
 2012-08-12 12:29:55 +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
ddcf5d471e Removed mirroring of default framebuffer attribs. 2012-08-10 13:28:58 +02:00
Camilla Berglund
3216661da7 Removed ill-advised use of glfwGetCurrentContext. 2012-08-07 21:40:40 +02:00
Camilla Berglund
d4e1f98394 Added output of initial window size. 2012-08-07 13:01:19 +02:00
Camilla Berglund
8ed66ea4d5 Removed calling of callbacks from setters. 2012-08-07 12:45:55 +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
13ff3eeca9 Test program swap interval toggling work. 2012-08-03 19:54:07 +02:00
Camilla Berglund
2972cdfeb1 Removed glfwIsWindow. 2012-08-03 16:20:52 +02:00
Camilla Berglund
854e634fec Merge branch 'master' into multi-monitor 
Conflicts:
	include/GL/glfw3.h
	src/CMakeLists.txt
	src/fullscreen.c
	src/internal.h
	src/win32_fullscreen.c
	src/win32_platform.h
	src/x11_fullscreen.c
	tests/modes.c
 2012-08-03 02:57:33 +02:00
Camilla Berglund
88fd170e64 Fixed type errors in modes test. 2012-08-02 18:22:11 +02:00
Camilla Berglund
871e1a70d7 Made video mode retrieval dynamic. 2012-08-02 18:03:43 +02:00
Camilla Berglund
c047bd2efe Merge branch 'master' of github.com:elmindreda/glfw 2012-08-02 01:42:26 +02:00
Camilla Berglund
3a72f33541 Removed GLFW_ACCELERATED window parameter. 2012-08-02 01:13:05 +02:00
Camilla Berglund
d1617bdd78 Made flag parsing output even more consistent. 2012-08-01 01:46:06 +02:00
Camilla Berglund
b00064902d Made flag parsing output more consistent. 2012-07-31 23:51:27 +02:00
Camilla Berglund
6c86149bad Improved output of OpenGL bitmasks. 2012-07-31 23:14:31 +02:00
Camilla Berglund
bd630c4e83 Added missing newline. 2012-07-11 00:33:32 +02:00
Camilla Berglund
247ee76b5c Added monitor physical dimensions to output. 2012-07-06 14:08:01 +02:00
Camilla Berglund
c06f838d88 Merge branch 'master' into multi-monitor 
Conflicts:
	.gitignore
	examples/CMakeLists.txt
	include/GL/glfw3.h
	src/CMakeLists.txt
	src/internal.h
	src/win32_platform.h
	src/win32_window.c
	src/x11_fullscreen.c
	src/x11_platform.h
	tests/listmodes.c
 2012-07-05 16:15:01 +02:00
Camilla Berglund
cef9dea1d2 Unified nomenclature for cursor positions. 2012-06-22 13:57:25 +02:00
Camilla Berglund
9cc0abffc5 Rewrote joystick test. 2012-06-06 02:04:15 +02:00
Camilla Berglund
2213450840 Renamed GLFW_NO_GLU to GLFW_INCLUDE_GLU. 2012-06-05 23:55:10 +02:00
Camilla Berglund
6059523b6d Simplified mode printing. 2012-05-07 01:30:55 +02:00
Camilla Berglund
5527e52f58 Added hilighting of desktop mode. 2012-05-07 01:13:07 +02:00
Camilla Berglund
d109d8a6d2 Restructured modes test for better encapsulation. 2012-05-07 01:12:08 +02:00
Camilla Berglund
eeed6394c0 Added abort via escape key. 2012-05-07 00:44:39 +02:00
Camilla Berglund
e55b5fc27c Removed listmodes test. 2012-05-07 00:34:40 +02:00
Camilla Berglund
93c3d52716 Formatting. 2012-05-07 00:33:21 +02:00
Camilla Berglund
dd1a46af43 Added header to more closely match output of older test. 2012-05-07 00:32:03 +02:00
Camilla Berglund
3d5a574e3b Made listing the default for modes test. 2012-05-07 00:29:36 +02:00
Lambert Clara
7a5c2d5f75 Fix clang warning : self-comparison always evaluates to false 2012-04-21 11:47:58 +02:00
Camilla Berglund
141b56afc0 Added libm as direct dependency for tests and examples. 2012-04-19 16:57:44 +02:00
Camilla Berglund
351f2b2664 Fixed build setup for clipboard test. 2012-04-13 12:57:04 +02:00
Camilla Berglund
f8a726371e Fixed test description. 2012-04-12 18:42:56 +02:00
Camilla Berglund
9ace27f97b Updated clipboard test. 2012-04-12 17:28:58 +02:00
Camilla Berglund
f868712f02 Simplified clipboard API. 2012-04-12 00:51:58 +02:00
Camilla Berglund
67a3f5dc8f Added error callback. 2012-04-09 17:41:17 +02:00
Camilla Berglund
bf1ada029b Added window parameter to clipboard API. 2012-04-09 16:00:54 +02:00
Camilla Berglund
7044ed6f06 Simplified and made clipboard API more type safe. 2012-04-09 15:54:36 +02:00
Camilla Berglund
2ad5764f06 Formatting. 2012-03-29 13:44:55 +02:00
Camilla Berglund
cca6b52120 Formatting. 2012-03-29 13:31:19 +02:00
Camilla Berglund
e49f1b8801 Fixed broken example. 2012-03-29 13:30:40 +02:00
Camilla Berglund
92d4c02e07 Merge branch 'master' into clipboard 
Conflicts:
	src/CMakeLists.txt
 2012-03-29 13:29:28 +02:00
Camilla Berglund
4ef9aec7e0 Made scrolling deltas floating point. 2012-03-28 21:54:09 +02:00
Camilla Berglund
a1d5fc039d Added support for right control key. 2012-03-28 15:07:47 +02:00
Camilla Berglund
d022e54934 Merge branch 'master' into clipboard 2012-03-28 14:58:03 +02:00
Camilla Berglund
466246670f Merge branch 'master' into cursor-enter-leave 2012-03-26 13:54:28 +02:00
Camilla Berglund
865aa05ec1 Merge branch 'master' into clipboard 
Conflicts:
	src/CMakeLists.txt
	src/libglfw.pc.cmake
 2012-03-26 03:04:29 +02:00
Camilla Berglund
1eb24ff261 Executable dependency list fixes. 2012-03-25 17:07:43 +02:00
Camilla Berglund
23776f67e3 Formatting. 2012-03-25 13:58:07 +02:00
Camilla Berglund
7b46a184cb Added standard option to switch between static and dynamic library, dropped dynamic test. 2012-03-25 13:55:39 +02:00
Camilla Berglund
08942fcabe Removed call to non-portable function. 2012-03-22 23:28:43 +01:00
Camilla Berglund
8109470e72 Merge branch 'master' into cursor-enter-leave 2012-03-22 12:06:00 +01:00
Camilla Berglund
18efa516a2 Added modes test. 2012-03-08 01:01:42 +01:00
Camilla Berglund
c286c716cd Formatting. 2012-03-05 23:41:05 +01:00
Camilla Berglund
adf4899f4c Added name and version to test and example bundles. 2012-03-05 22:37:48 +01:00
Camilla Berglund
4b21ccbe19 Output fix. 2012-03-05 20:22:23 +01:00
Camilla Berglund
cd7b9b1568 CMake file formatting. 2012-02-29 20:15:39 +01:00
Tai Chi Minh Ralph Eastwood
5937af089e Merge branch 'master' of github.com:raedwulf/glfw into clipboard 
Conflicts:
	src/CMakeLists.txt
	tests/CMakeLists.txt
 2012-02-19 06:29:48 +00:00
Tai Chi Minh Ralph Eastwood
d561e3a0b0 Merge branch 'master' of github.com:raedwulf/glfw into clipboard 
Conflicts:
	tests/CMakeLists.txt
 2012-02-19 06:17:52 +00:00
Tai Chi Minh Ralph Eastwood
f332e0009d Add mising clipboard test program. 2012-02-19 05:39:21 +00:00
Camilla Berglund
e23eed7e27 Merge branch 'master' of github.com:elmindreda/glfw 2012-02-14 23:14:44 +01:00
Camilla Berglund
9760c2ad5a Tearing test cleanup. 2012-02-09 02:25:25 +01:00
Camilla Berglund
da86ba8062 Added logging of window size. 2012-02-09 02:07:43 +01:00
Camilla Berglund
62e8d07f4f Added swap interval toggling to tearing test. 2012-02-09 00:49:11 +01:00
Camilla Berglund
30ae9bdd47 Formatting. 2012-02-07 17:19:38 +01:00
Camilla Berglund
5159cfc2b0 Added window close control. 2012-02-07 16:40:26 +01:00
Camilla Berglund
0c3b1b5a0e Removed allocator. 2012-02-07 14:58:58 +01:00