1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-10-08 15:17:25 -04:00
Commit Graph

1179 Commits

Author SHA1 Message Date
Camilla Berglund e666835ca6 Unified Win32 cursor clip rect setting. 2013-02-20 18:15:03 +01:00
Camilla Berglund 7b3783abe2 Made glfwGetMonitorPos immediate. 2013-02-20 18:15:03 +01:00
Camilla Berglund a591cdeba6 Removed platform-specific resources from monitor. 2013-02-20 18:15:03 +01:00
Camilla Berglund 719b60dd2b Added macros for library initialization check. 2013-02-20 18:15:03 +01:00
Noel Cower 45533bf149 Remove no-longer-used argument to _glfwCreateMonitor 2013-02-18 16:28:00 -07:00
Camilla Berglund 1961cecb7c Made glfwGetPrimaryMonitor always return a handle.
Replaced the primary flag with the convention of putting the primary
monitor first in the returned array.
2013-02-17 19:11:16 +01:00
Camilla Berglund 1130f1af3f Fixed uses of wrong loop variable. 2013-02-17 13:59:07 +01:00
Camilla Berglund 253e0d6b23 Added GLFW_REPEAT. 2013-02-15 13:21:11 +01:00
Camilla Berglund ec8273f249 Moved Cocoa joystick state to library struct. 2013-02-14 19:07:17 +01:00
Camilla Berglund 6f8084f061 Documentation work.
Enabled Doxygen tree view, added CMake options for native and internal
modules, improved internal and native documentation.
2013-02-14 17:26:27 +01:00
Camilla Berglund 666181d923 Version string fixes. 2013-02-14 13:13:07 +01:00
Camilla Berglund 92a71e07d3 Made gamma ramp functions per-monitor. 2013-02-12 14:03:51 +01:00
Camilla Berglund c9167ce233 Win32 display enum nomenclature fix. 2013-02-12 13:43:47 +01:00
Camilla Berglund 823022fdb2 Removed string for impossible configuration.
The GLX platform header throws an #error if no extension retrieval
mechanism is selected.
2013-02-12 12:51:23 +01:00
Camilla Berglund 5e976757ed Fixed various Cocoa editing slip-ups. 2013-02-11 23:10:49 +01:00
Camilla Berglund d97dddc8c4 Simplified function comment headers. 2013-02-11 19:43:22 +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 cb02a693b4 Moved function into correct category. 2013-02-04 12:33:10 +01:00
Camilla Berglund a910f53be2 Made glfwGetGammaRamp act directly. 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 2cea6e37cf Removed glfwGetScrollOffset.
Scroll events do not represent an absolute state, but rather an interpretation
of a relative change in state, like character input.  So, like character input,
there is no sane 'current state' to return.  The here removed solution, that of
accumulating an offset since the last call to event processing, is at best
mildly confusing.  If a user wishes to implement this solution, it is better for
it to be explicit in client code than implicit in GLFW calls.
2013-02-04 12:33:09 +01:00
Camilla Berglund c17a7dd464 Made glfwGetWindowSize immediate.
Conflicts:
	src/internal.h
2013-02-04 12:33:09 +01:00
Camilla Berglund 107e20233d Fixed incomplete function renaming. 2013-02-04 08:27:30 +01:00
Camilla Berglund 954d6383ee RandR monitor work.
Moved to CRTC plus usable output for native representation of monitors.
Moved to CRTCs for mode setting and simplified mode setting interface.
2013-02-01 18:03:02 +01:00
Camilla Berglund 065858e185 Removed declaration of removed function. 2013-02-01 18:03:02 +01:00
Camilla Berglund a0e4fad65a Added new OS X build options to version string. 2013-02-01 05:27:40 +01:00
Camilla Berglund 231ee1bdc7 Removed cached instance handle. 2013-02-01 04:05:12 +01:00
Camilla Berglund b872089fa9 Moved to Win32 monitor device string for public name. 2013-02-01 00:52:25 +01:00
Camilla Berglund cbb6d1ad7b Fixed hint overriding for fullscreen windows. 2013-01-31 08:36:49 +01:00
Camilla Berglund e209ac7a42 Fixed X11 clipboard regressions, event waiting. 2013-01-31 00:26:37 +01:00
Camilla Berglund f3e39ce680 Cleanup of clipboard and string atoms. 2013-01-29 02:45:08 +01:00
Camilla Berglund 82b8dd5040 Moved to XAnyEvent for mapping to _GLFWwindows. 2013-01-28 20:06:37 +01:00
Camilla Berglund 2d43238dc5 Added comment on use of select(1). 2013-01-28 20:06:37 +01:00
Camilla Berglund 14f352b9e3 Added missing config header macro to template. 2013-01-28 20:04:57 +01:00
Camilla Berglund 3e78570a31 Removed duplicate documentation.
The public, platform, native, event and utility functions are already
documented in-source.  Having duplicate documentation inevitably means
having them contradict one another.  Furthermore, most of the function
descriptions simply repeated the name of the function.
2013-01-25 01:25:40 +01:00
Camilla Berglund 75705ba2c5 Removed checks for clearly invalid NULL pointers. 2013-01-25 01:08:14 +01:00
Camilla Berglund 8c766b57e7 Renamed chdir option, added OS X menu bar option.
Some command-line programs want to render to hidden windows without any
visible UI.  This option makes this possible on OS X.
2013-01-25 00:53:38 +01:00
Camilla Berglund 6abb8e4c86 Fixed leak of wide string window title. 2013-01-25 00:44:41 +01:00
Camilla Berglund 2ece101f0e Added X error text to context creation failure. 2013-01-25 00:44:33 +01:00
Camilla Berglund b1ff42b7bb Moved to WM_STATE for iconify events. 2013-01-25 00:44:26 +01:00
Camilla Berglund e820284015 Renamed WM atom struct members for clarity. 2013-01-25 00:44:19 +01:00
Camilla Berglund ca07a067a8 Moved WM_DELETE_WINDOW retrieval to init. 2013-01-25 00:44:08 +01:00
Camilla Berglund 38aef53b0c Shortened window struct member. 2013-01-25 00:42:45 +01:00
Camilla Berglund bc150ac9c8 Forced resizable to true for fullscreen windows. 2013-01-25 00:42:20 +01:00
Camilla Berglund 52a79c6f3b Added error for no selected client library. 2013-01-25 00:41:02 +01:00
Camilla Berglund 6333a5caaf Added CMake option for glfwInit chdir on OS X. 2013-01-21 16:21:59 +01:00
Camilla Berglund 121ce7fbd6 Renamed X11 keysym to Unicode conversion file. 2013-01-17 18:59:35 +01:00
Camilla Berglund 355af57b91 Renamed internal macro to match conventions. 2013-01-17 18:59:35 +01:00
Camilla Berglund 20a4ecf175 Added missing WGL pixel format error check. 2013-01-17 18:59:35 +01:00
Camilla Berglund f479b1920f Formatting of internal.h. 2013-01-17 18:59:35 +01:00
Camilla Berglund 7f56269f66 Merge branch 'master' of github.com:elmindreda/glfw 2013-01-17 18:13:24 +01:00
Camilla Berglund c00839e4d7 Merge branch 'master' of github.com:elmindreda/glfw 2013-01-16 20:33:24 +01:00
Camilla Berglund 3a871b9edb Added EGL errors to output, added EGL init to Win32. 2013-01-16 20:10:17 +01:00
Camilla Berglund 9b6fb32dc2 Fixed copypaste errors in format selection. 2013-01-16 19:49:23 +01:00
Camilla Berglund 6107170ebb Updated EGL config error message. 2013-01-16 19:48:43 +01:00
Camilla Berglund e51e049ad5 Added error for no selected client library. 2013-01-16 06:38:17 +01:00
Camilla Berglund cc45a9e53d Updated native API and merged into related files. 2013-01-15 22:38:14 +01:00
Camilla Berglund 8d60214fac Put window callbacks in a substruct. 2013-01-15 21:34:26 +01:00
Camilla Berglund cb8c7740e6 Removed superfluous whitespace. 2013-01-15 20:56:08 +01:00
Camilla Berglund 38947b37af Renamed context API init/terminate functions. 2013-01-15 20:49:29 +01:00
Camilla Berglund a8ea120cae Removed internal fbconfig enum and selection. 2013-01-15 20:00:27 +01:00
Camilla Berglund 0517a82467 Added support for GLESv1_CM and GLESv2 client libraries. 2013-01-15 19:09:43 +01:00
Camilla Berglund f8df91d815 Inclusion guard fixes. 2013-01-15 02:00:03 +01:00
Camilla Berglund 9726597794 X11 event comment cleanup. 2013-01-12 21:11:41 +01:00
Camilla Berglund fcb96967ba Replaced repeat kluge with detectable auto repeat. 2013-01-12 21:01:44 +01:00
Camilla Berglund 6a4c175816 Made client-side RandR and Xf86VidMode required. 2013-01-12 19:23:53 +01:00
Camilla Berglund 747b6d8805 RandR and fallback path fixes. 2013-01-12 18:10:18 +01:00
Camilla Berglund be8856af65 Made the X keyboard extension required. 2013-01-07 18:14:26 +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
Camilla Berglund 11b646920b Merge pull request #31 from arsenm/master
Fixed silent failure when no monitors were found.
2013-01-06 10:56:03 -08:00
Camilla Berglund 6aa7c759aa Merge pull request #30 from Jonanin/master
Fixed build errors on Visual C++.
2013-01-06 10:51:40 -08:00
Matt Arsenault 6501a3007c No monitors should call error callback 2013-01-06 12:37:56 -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 279c32e3f9 Merge branch 'master' of github.com:elmindreda/glfw
Conflicts:
	CMakeLists.txt
	src/egl_context.c
2013-01-05 18:37:12 +01:00
Jon Morton 7cb6b245e8 Fix invalid variable declarations in win32_monitor.c
This fixes build errors in visual studio on windows.
2013-01-04 19:14:27 -06:00
Camilla Berglund 478347004d Cleanup. 2013-01-04 07:46:44 +01:00
Camilla Berglund baf3feb86d Removed panning hack only needed by Xxf86vm. 2013-01-04 07:12:15 +01:00
Camilla Berglund 68098f44db Cleanup. 2013-01-04 07:11:30 +01:00
Camilla Berglund 7ff86576e3 Removed EGL dlopen. 2013-01-04 06:59:07 +01:00
Camilla Berglund 2757b0fa6f Removed unused code and duplicate variables. 2013-01-04 06:42:37 +01:00
Camilla Berglund b35855cfb5 Formatting. 2013-01-04 03:56:33 +01:00
Camilla Berglund 1aa34606e7 Fixes for use with the AMD EGL/GLES SDK. 2013-01-04 03:54:52 +01:00
Camilla Berglund 0d7c2f73fc Merge branch 'master' of github.com:elmindreda/glfw 2013-01-04 00:08:49 +01:00
Camilla Berglund dad152b3f6 Removed broken RandR event selection. 2013-01-03 21:07:11 +01:00
Camilla Berglund 7049f73b7d Connected monitor API with Cocoa mode setting. 2013-01-03 20:11:41 +01:00
Camilla Berglund 4ab93ee155 Removed use of removed token. 2013-01-03 20:01:56 +01:00
Camilla Berglund 46c1e4028f Begun integrating mode setting and monitor API. 2013-01-03 17:56:59 +01:00
Camilla Berglund 1bc91bfe5b Formatting. 2013-01-02 17:07:04 +01:00
Camilla Berglund 3817771a40 Started adding documentation for internal APIs. 2013-01-02 03:42:20 +01:00
Camilla Berglund d1132cb3d1 Fixed Win32 joystick name memory leak. 2013-01-02 01:52:28 +01:00
Camilla Berglund b72a97d531 Renamed global struct and substructs.
Renamed _glfwLibrary to _glfw and made all substructs lower-case, making
global variable names easier to read and type.  Partially inspired by the
internal naming conventions of glwt.
2013-01-02 01:44:57 +01:00
Camilla Berglund 4305c76049 Removed monitor user pointer. 2013-01-02 00:41:37 +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 1790194828 Renamed _glfwInputError and moved to event API. 2012-12-31 21:05:28 +01:00
Camilla Berglund 21f41a2bb7 Renamed GLFW_SAMPLES and GLFW_SHOULD_CLOSE. 2012-12-31 19:55:41 +01:00
Camilla Berglund 02598570cb Removed unused struct member. 2012-12-31 04:12:16 +01:00
Camilla Berglund fc5235cd2e Added todo. 2012-12-31 04:06:01 +01:00
Camilla Berglund cf42282cfb Added generic video mode selection. 2012-12-31 03:04:04 +01:00
Camilla Berglund 52dac79219 Ripped out horribly broken refresh rate mess. 2012-12-31 02:06:19 +01:00
Camilla Berglund 8db1528c74 Added explicit disabling of platform glext.h. 2012-12-30 23:19:38 +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 9e9457767f Added workaround for broken Mesa GLX_ARB_create_context_profile. 2012-12-30 18:13:04 +01:00
Camilla Berglund ea1ddfd7a4 Removed declarations of removed functions. 2012-12-30 02:28:52 +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 9af61d06cf Removed return value of _glfwPlatformTerminate. 2012-12-30 01:15:48 +01:00
Camilla Berglund a8403c10d3 Moved NSGL context creation to proper module. 2012-12-30 00:58:18 +01:00
Camilla Berglund 0a7a57b74f Moved internal API functions to correct section. 2012-12-30 00:45:22 +01:00
Camilla Berglund 20af66f271 Added OOM error reporting to X11 mode enumeration. 2012-12-29 20:01:33 +01:00
Camilla Berglund 18854d16db Removed legacy video mode generation. 2012-12-27 21:13:04 +01:00
Camilla Berglund 45df65eb91 Formatting. 2012-12-27 19:29:09 +01:00
Camilla Berglund b66e1de97c Added saving of monitor mode count. 2012-12-27 18:37:55 +01:00
Camilla Berglund f558563621 Merge branch 'master' into multi-monitor 2012-12-27 18:22:45 +01:00
Camilla Berglund be7ad339f7 Added clearing of callbacks on window destruction. 2012-12-23 16:08:17 +01:00
Camilla Berglund 648655aa5b Fixed RandR primary monitor detection. 2012-12-22 23:35:45 +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 b9acb777e5 EGL context creation cleanup. 2012-12-16 17:04:43 +01:00
Camilla Berglund bd31ea0a69 WGL context option cleanup. 2012-12-13 22:50:55 +01:00
Camilla Berglund cf38b34f45 GLX context option cleanup. 2012-12-13 21:35:59 +01:00
Camilla Berglund d11558e7e4 Fixed corruption of robustness strategy hint. 2012-12-13 20:01:57 +01:00
Camilla Berglund 8c6511085a Corrected eglext.h path. 2012-12-13 19:35:11 +01:00
Camilla Berglund 9c0e19adca Made error message tags more consistent. 2012-12-13 19:18:04 +01:00
Camilla Berglund 9a659c287e Fixed context param readback. 2012-12-13 19:07:19 +01:00
Camilla Berglund a8a0585164 Updated debug context detection. 2012-12-13 17:33:08 +01:00
Camilla Berglund fd0f06de8a Formatting. 2012-12-13 17:22:56 +01:00
Camilla Berglund 247a875435 Updated version verification. 2012-12-13 17:13:10 +01:00
Camilla Berglund d22d55ed02 Updated error message to match updated spec. 2012-12-13 02:36:18 +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 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
Camilla Berglund 5bbbf8640e Formatting. 2012-09-12 23:03:15 +02:00
Camilla Berglund b4493dd3bc Removed paranoid error check. 2012-09-12 23:03:07 +02:00
Camilla Berglund 4f8f6c7d89 Fixed monitor enumeration on Win32. 2012-09-12 22:51:55 +02:00
Camilla Berglund 1071966d55 Merge branch 'master' into multi-monitor
Conflicts:
	src/CMakeLists.txt
	src/fullscreen.c
2012-09-12 21:42:21 +02:00
Camilla Berglund 4408d2134c Added use of standard lParam macros. 2012-09-12 21:37:36 +02:00
Camilla Berglund 18392837ac Formatting. 2012-09-12 21:34:23 +02:00
Camilla Berglund 1d6d6bc3c6 Moved display closing to after GL terminate. 2012-09-12 21:25:52 +02:00
Camilla Berglund c4d5da0090 Moved DllMain into Win32 init module. 2012-09-12 21:23:04 +02:00
Camilla Berglund 6ac58da26e Narrowed criteria for non-standard inclusion. 2012-09-12 21:18:59 +02:00
Camilla Berglund 55419bda67 Merged fullscreen and monitor modules. 2012-09-12 21:04:24 +02:00
Camilla Berglund c87829ea61 Added allocation failure check. 2012-09-12 20:54:45 +02:00
Camilla Berglund ea664c8a39 Added comments. 2012-09-12 20:54:12 +02:00
Camilla Berglund c83b336a4c Formatting. 2012-09-12 20:53:57 +02:00
Camilla Berglund fa4f6b43f6 Added monitor stubs for Cocoa. 2012-09-12 20:44:08 +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 64c677be9e Renamed config macro to match convention. 2012-09-12 03:17:50 +02:00
Camilla Berglund e15e92b583 Fixed function grouping. 2012-09-11 23:56:44 +02:00