mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-10 09:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,934 Commits 17 Branches 23 Tags 38 MiB
afcefcb5f7
Commit Graph

554 Commits

Author SHA1 Message Date
Camilla Berglund
3d62ff0e07 Fix implicit truncation to float in cursor test 
Fixes #565.
 2015-08-09 13:57:04 +02:00
Camilla Berglund
8a4e939a10 Fix glext.h regression in glfwinfo on OS X 
The glfwinfo program uses symbols not provided by the glext.h header in
every development environment.

Closes #572.
 2015-08-07 16:31:05 +02:00
Camilla Berglund
37e13361f5 Fixed last manual inclusion of glext.h. 2015-07-28 14:51:36 +02:00
Camilla Berglund
33c7c28dde Replaced the various cursor tests with a sane one. 2015-07-16 17:48:59 +02:00
Camilla Berglund
cf10e318d6 Formatting. 2015-07-01 14:58:43 +02:00
Camilla Berglund
1ab9dbab60 Removed test replaced by glfwinfo. 2015-07-01 14:50:46 +02:00
Camilla Berglund
4f0fc55385 Added version option to glfwinfo. 2015-07-01 14:48:20 +02:00
Camilla Berglund
23195693ed Added glfwinfo options for context and fb hints. 2015-07-01 14:45:48 +02:00
Camilla Berglund
a7fa41612c Fixed printing of GLFW version on usage and error. 2015-07-01 14:15:12 +02:00
Camilla Berglund
5f91ea34de Made glfwinfo options set hints directly. 2015-07-01 14:14:51 +02:00
Camilla Berglund
acaddf9cd9 Added decimals to DPI reported by monitor test. 2015-06-07 21:34:54 +02:00
Camilla Berglund
8503d53018 Improved tearing test. 
Added support for arbitrary swap intervals, including negative ones if
(GLX|WGL)_EXT_swap_control_tear is available.
 2015-06-07 20:54:25 +02:00
Camilla Berglund
8d4ba0aa83 Improved multi-window test. 
Fixed proper Windows colors.  Added support for Escape key.  Made
windows undecorated.  Added command-line option for decorated windows.
 2015-06-07 20:47:13 +02:00
Camilla Berglund
5abf7841f8 Improved glfwinfo tool. 
Added long options to glfwinfo.  Cleaned up code.
 2015-06-07 20:40:25 +02:00
Camilla Berglund
8247e6069d Fixed mode setting for tearing test. 2015-06-02 03:26:02 +02:00
Camilla Berglund
530fc5a431 Added full screen support to tearing test. 2015-05-27 16:14:15 +02:00
Camilla Berglund
22e9451192 Fixed accuracy test on Retina displays. 2015-05-21 00:43:52 +02:00
Camilla Berglund
a1641cdec9 Renamed MSAA test program. 2015-05-19 15:27:58 +02:00
Camilla Berglund
80a38c1e45 Updated Info.plist template file. 2015-05-13 15:59:09 +02:00
Camilla Berglund
9021e52a6f Fixed clipboard test OS X modifier. 2015-04-16 18:34:32 +02:00
Camilla Berglund
821f3e674a Enabled High DPI support with custom Info.plist. 
Fixes #422.
 2015-03-17 16:54:59 +01:00
Camilla Berglund
d79beb9539 Renamed monitor test program. 2015-03-15 15:47:15 +01:00
Camilla Berglund
46888206be Removed unused GLU dependency. 2015-03-12 01:33:48 +01:00
Camilla Berglund
93855ae6ab Fixed name of path drop list. 2015-02-16 15:40:08 +01:00
Camilla Berglund
f5c9265d1b Fixed test joystick drawing leaving holes. 
Fixes #437.
 2015-02-02 20:08:30 +01:00
Camilla Berglund
439417a22c Comment and string spell check pass. 2015-01-05 22:21:31 +01:00
Camilla Berglund
5f6aa9c34c Added IDE folders to CMake files. 
Fixes #328.
 2015-01-05 01:19:02 +01:00
Camilla Berglund
893e03e5d2 Added error message for missing MSAA extension. 2015-01-05 01:14:02 +01:00
Camilla Berglund
f9c1f85f02 Added cursor mode changes to peter test log. 2015-01-04 15:54:14 +01:00
Camilla Berglund
287514e849 Hack for msvcrt and mintty. 2014-12-31 22:32:07 +01:00
Camilla Berglund
a611144d0c Restored events locale setting for output. 2014-12-18 03:33:17 +01:00
Camilla Berglund
b2030f6d73 Fixed X11 character input for C locale. 
Fixes #396.
 2014-12-18 03:24:38 +01:00
Camilla Berglund
2b62858770 Added multi-window support to iconify test. 
Added -a option for creating one window per monitor.  Added -n option
for disabling auto-iconification. Added option descriptions to usage.
 2014-12-11 16:08:56 +01:00
Camilla Berglund
b4c4ba0439 Fixed regression due to stale OS X glext header. 
Fixes regression caused by b140606a49.
 2014-10-22 13:57:54 +02:00
Camilla Berglund
b140606a49 Added GLFW_INCLUDE_GLEXT for glext.h inclusion. 
Closes #365.
 2014-10-13 23:57:21 +02:00
Camilla Berglund
2488c67798 Improved grammar of charmods event reporting. 2014-09-22 11:32:10 +02:00
Camilla Berglund
44c899ce70 Added support for GL_KHR_context_flush_control. 2014-08-21 19:29:04 +02:00
Camilla Berglund
77d2a2131d Fixed fallthrough bug in glfwinfo. 2014-08-21 19:29:04 +02:00
Camilla Berglund
452e95d02a CMake path quoting fixes. 2014-08-15 15:16:45 +02:00
Camilla Berglund
6e0ea02f17 Quoted all CMake paths with substitution. 
Fixes #258.
 2014-08-11 20:26:37 +02:00
Camilla Berglund
cd93df4fe0 Made events test monitor callback static. 2014-07-07 23:23:46 +02:00
Camilla Berglund
46a56ea742 Clarified charmods in events test. 2014-06-24 13:04:50 +02:00
Camilla Berglund
96b12ee504 Added character with modifiers callback. 
The undefined behaviour changed with #40 has been reverted, making the
character-only callback again behave like a system text field.  This
behavior has now been documentated.

Fixes #203.
Fixes #305.
 2014-06-24 10:50:05 +02:00
Camilla Berglund
35fd08f594 Made windows test show all windows at once. 2014-06-18 16:39:41 +02:00
Camilla Berglund
11587f1dde Added position testing to windows test. 2014-06-18 16:39:40 +02:00
Camilla Berglund
281013002d Added GLFW_DONT_CARE. 
This changes the behavior of framebuffer hints set to zero.  Before,
zero meant that any value was acceptable.  This changes zero to be an
explicit preference and adds GLFW_DONT_CARE to mean that any value is
equally acceptable.

Fixes #70.
 2014-06-18 16:36:22 +02:00
Camilla Berglund
cb9d194f86 Removed uses of GLU in tests. 2014-06-10 15:04:32 +02:00
Rok Breulj
093029c2f5 Start reopen test in fullscreen. 2014-06-10 03:39:40 +02:00
Camilla Berglund
60eeaeee69 4. 2014-04-24 07:57:33 +02:00
Camilla Berglund
df1c895076 Added window hiding before thrd_join. 2014-04-06 14:41:04 +02:00
Camilla Berglund
ebb7145ccc Fixed VC++ warnings. 2014-03-31 22:33:22 +02:00
Camilla Berglund
40f69d7abf Added use of frame size to multi-window test. 2014-03-30 11:30:40 +02:00
Camilla Berglund
5b5717e539 Removed superfluous cast. 2014-03-24 13:31:01 +01:00
Camilla Berglund
7ac3d85126 Formatting. 2014-03-20 11:30:27 +01:00
Camilla Berglund
8fa9cc0de3 Added GLFWimage struct. 2014-03-20 11:30:27 +01:00
Camilla Berglund
608de57358 Cleanup. 2014-03-20 11:30:27 +01:00
urraka
40c04a7565 Added support for custom system cursors. 
This adds 3 functions to the GLFW API: glfwCreateCursor,
glfwDestroyCursor and glfwSetCursor.
 2014-03-20 11:30:27 +01:00
Camilla Berglund
a7f93060dd Killed lab escapee. 2014-03-18 21:40:02 +01:00
Camilla Berglund
c84bd6d393 Formatting. 2014-03-11 12:53:00 +01:00
Camilla Berglund
d2cc815009 Only set the monitor callback once. 2014-03-10 18:56:33 +01:00
Camilla Berglund
4889b4ceee Added missing detection of invalid flags. 2014-03-10 13:15:50 +01:00
Camilla Berglund
d7c42c8132 Added window creation intent printing. 2014-03-10 13:12:03 +01:00
Camilla Berglund
41fd1655bd Added test for posting of empty event. 2014-03-09 20:05:27 +01:00
Camilla Berglund
91e069f979 Desktop mode full screen fixes for tests. 2014-02-13 13:30:15 +01:00
Camilla Berglund
135ee0d93f Added multi-window support to events test. 2014-02-12 00:49:26 +01:00
Camilla Berglund
8f349e84ae Cleaned up drop callback design. 2014-01-21 18:23:25 +01:00
Camilla Berglund
ed4c8b27f1 Added drop reporting to events test. 2014-01-21 15:25:50 +01:00
Camilla Berglund
c64d2787f8 Revamped cursor mode test. 2014-01-18 23:10:05 +01:00
Camilla Berglund
45368f410a Fixed warnings from Clang static analysis. 2013-11-14 13:42:29 +01:00
Camilla Berglund
cc4c7167fd Fixed joysticks test segfault. 2013-11-07 19:29:33 +01:00
Camilla Berglund
785e68bb0d Added flag descriptions to glfwinfo -h. 2013-11-03 13:38:45 +01:00
Camilla Berglund
86e50b1044 Placed glfwinfo version test after getopt. 2013-11-03 13:29:21 +01:00
Camilla Berglund
dbdf01d4a0 Added getopt dependency to events text. 2013-10-17 15:35:01 +02:00
Camilla Berglund
e85455719d Point made. 2013-10-16 20:33:28 +02:00
Camilla Berglund
2c920fbb8b Clarified character callback parameter. 2013-10-10 19:41:56 +02:00
Camilla Berglund
7dd8770e6f Added full screen option to events test. 2013-10-10 00:17:53 +02:00
Camilla Berglund
10017b27bb Cleanup. 2013-06-17 12:46:51 +02:00
Camilla Berglund
3df0b4478b Fixed VC++ warnings. 2013-06-12 20:37:04 +02:00
Camilla Berglund
11615fcaf2 Added scancode to key callback. 2013-06-05 23:46:09 +02:00
Camilla Berglund
180a4ee640 Fixed constness of joystick data. 2013-06-04 18:20:38 +02:00
Camilla Berglund
3498163da1 Separated window and framebuffer sizes. 2013-06-04 01:51:54 +02:00
Camilla Berglund
f5dc6e4007 Added random seed init. 2013-05-30 20:41:39 +02:00
Camilla Berglund
731812cfc1 Added refresh rate to GLFWvidmode. 2013-05-30 15:52:42 +02:00
Camilla Berglund
525b4151f0 Fixed invalid pointer use. 2013-05-29 22:35:58 +02:00
Camilla Berglund
ad1f6f0341 Renamed glfwGetWindowParam to glfwGetWindowAttrib. 
Parameters are something specified at creation time and are often
immutable, while many of the values returned by glfwGetWindowParam
reflected current state not controlled by any parameter or hint.
 2013-05-27 15:30:32 +02:00
Camilla Berglund
1f0122e05c Fixed uses of renamed symbol. 2013-05-23 14:41:43 +02:00
Noel Cower
eff85f9500 Added super modifier bit. 
Edited during merge.
 2013-05-23 14:21:35 +02:00
Camilla Berglund
15ed715f4e Moved public headers to the GLFW directory. 2013-05-22 22:46:34 +02:00
Camilla Berglund
ce1e84def6 Made glfwGetVideoMode consistent with getters. 2013-05-22 22:16:43 +02:00
Camilla Berglund
6df692b61e Renamed CURSOR_CAPTURED to CURSOR_DISABLED. 2013-05-22 21:56:14 +02:00
Camilla Berglund
9264b5da0e Removed double mode for cursor mode. 2013-05-22 21:56:14 +02:00
Camilla Berglund
2d1b835711 Added a conservative set of key modifiers. 2013-05-22 21:56:14 +02:00
Camilla Berglund
7f2eb7b15b New joystick API. 2013-05-22 21:56:14 +02:00
Camilla Berglund
9a5feaad05 Dropped fsfocus test. 2013-05-20 12:45:41 +02:00
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