1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-23 02:38:52 -05:00
Commit Graph

410 Commits

Author SHA1 Message Date
Camilla Berglund f966ff894a Added refresh rate calculation to tearing test. 2013-05-19 20:43:33 +02:00
Camilla Berglund e5a4bea4df Improved reopen test input. 2013-05-19 09:18:57 +02:00
Camilla Berglund c310d1c47c Restored explicit linking for threading test. 2013-05-07 22:38:34 +02:00
Camilla Berglund 807f1622ea Added threading library to link dependencies.
Since the GLX backend now uses explicit pthread calls, linking needs to
be explicit as well.
2013-05-07 21:39:09 +02:00
Camilla Berglund f06a700307 Renamed support directory to deps. 2013-04-17 15:42:21 +02:00
Camilla Berglund 1c4f7525d5 Added mintty/msvcrt fix to events test. 2013-04-17 15:31:20 +02:00
Camilla Berglund 129e94da2e Changed cursor pos to double. 2013-04-04 16:29:40 +02:00
Camilla Berglund 3897a174b5 Fixed VC++ warnings. 2013-03-08 14:19:40 +01:00
Camilla Berglund 64afb193e8 Removed return value of close callback. 2013-03-06 23:29:37 +01:00
Camilla Berglund 6fadf37bda Replaced window close parameter with mutable flag.
Replaced the GLFW_SHOULD_CLOSE window parameter with the
glfwWindowShouldClose and glfwSetWindowShouldClose functions, allowing
the setting of the close flag from any point in the program.
2013-03-01 14:13:45 +01:00
Camilla Berglund 182e0afe25 Made character unsigned. 2013-02-25 17:02:28 +01:00
SephiRok 1ae9ce1e0a Fixed print screen key input for all platforms. 2013-02-21 18:41:27 +01:00
Camilla Berglund 2e1bc043ef Fixed order of operations bug in gamma test. 2013-02-19 01:57:00 +01:00
Camilla Berglund 253e0d6b23 Added GLFW_REPEAT. 2013-02-15 13:21:11 +01:00
Camilla Berglund 94f5b28152 Made reopen test pick a monitor at random. 2013-02-14 17:27:37 +01:00
Camilla Berglund 92a71e07d3 Made gamma ramp functions per-monitor. 2013-02-12 14:03:51 +01:00
Camilla Berglund 20ccf0bc60 Replaced event poll with wait in gamma test. 2013-02-12 13:45:07 +01:00
Camilla Berglund 7c1932381b Reintroduced glfwGetWindowPos, glfwSetWindowPos. 2013-02-11 19:43:08 +01:00
Camilla Berglund ee5f30ea8f Replaced glfwGetMonitorParam with glfwGetMonitor*.
Having one way to retrieve the cursor position and another (more
verbose) way to retrieve the monitor position is inconsistent.  Having
them both work the same way is the least surprising thing.

The expected glfwGetMonitorSize function gets an added Physical in its
name so users won't confuse it with glfwGetVideoMode.
2013-02-04 12:33:10 +01:00
Camilla Berglund ac5fee4d20 Re-used POSITION_* tokens for monitor position. 2013-02-04 12:33:09 +01:00
Camilla Berglund f0f4af4287 Fixed warnings on VC++. 2013-01-06 21:02:57 +01:00
Camilla Berglund c3da8e417f Merge branch 'master' of github.com:elmindreda/glfw 2013-01-06 19:59:51 +01:00
Matt Arsenault 5162796094 Threads still need to be linked with static library 2013-01-06 12:31:47 -05:00
Camilla Berglund 316ee1d77d Made glfwGetVideoMode return a GLFWvidmode. 2013-01-05 22:07:06 +01:00
Camilla Berglund 9af960e2dd Made the pointer-ness of object handles explicit. 2013-01-05 21:13:28 +01:00
Camilla Berglund 46c1e4028f Begun integrating mode setting and monitor API. 2013-01-03 17:56:59 +01:00
Camilla Berglund 45459d5a34 Fixed invalid order of operations. 2013-01-02 00:50:57 +01:00
Camilla Berglund 835f00eb10 Merge branch 'master' into multi-monitor
Conflicts:
	include/GL/glfw3.h
	readme.html
	src/fullscreen.c
	src/internal.h
	src/window.c
	src/x11_fullscreen.c
2012-12-31 21:13:10 +01:00
Camilla Berglund 21f41a2bb7 Renamed GLFW_SAMPLES and GLFW_SHOULD_CLOSE. 2012-12-31 19:55:41 +01:00
Camilla Berglund 52dac79219 Ripped out horribly broken refresh rate mess. 2012-12-31 02:06:19 +01:00
Camilla Berglund 23c6def880 Merge branch 'master' into multi-monitor
Conflicts:
	src/cocoa_window.m
	src/init.c
	tests/iconify.c
	tests/reopen.c
2012-12-30 22:18:15 +01:00
Camilla Berglund 9cc8fc0d0a Removed glfwGetError and glfwErrorString.
The cached error code cannot be made per-thread unless it required
glfwInit (due to lack of __thread on OS X), which would be confusing and
partially defeats the purpose of it.

Beginners would use the generic error string facility instead of the
error callback and then be confused by its nondescript messages.

Storing the provided error code from within the error callback, whether
globally or per-thread, requires just a few lines of code and hands
control to the user without compromising thread safety.
2012-12-30 01:50:03 +01:00
Camilla Berglund f558563621 Merge branch 'master' into multi-monitor 2012-12-27 18:22:45 +01:00
Camilla Berglund cdcdf5763a Temporary fix for OPENGL_INCLUDE_DIR being NOTFOUND on OS X 10.8. 2012-12-27 18:04:24 +01:00
Camilla Berglund 3610f0d071 Added primary status to monitor listing. 2012-12-22 23:37:42 +01:00
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
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