gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-27 12:38:53 -05:00
Code Issues Projects Releases Wiki Activity
2,850 Commits 23 Branches 15 Tags 16 MiB
Commit Graph

1805 Commits

Author SHA1 Message Date
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 aaac715060 Reverted 43095307da. 
The proposed fix broke for multiple displays of the same model.
 2014-03-19 23:25:03 +01:00
Camilla Berglund 8ebd135536 Fixed last use of wndconfig in EGL port. 2014-03-19 13:15:04 +01:00
Jonas Ådahl b2b3f170a9 Make EGL use ctxconfig instead of wndconfig 2014-03-18 21:35:50 +01:00
Camilla Berglund 2200f87492 Fixed glfwDestroyWindow not flushing the output buffer. 2014-03-12 20:53:57 +01:00
Camilla Berglund 5c23071a81 Fixed leak of display name. 2014-03-10 18:56:33 +01:00
Camilla Berglund 43095307da Cleanup of CGDisplayIOServicePort replacement. 2014-03-10 18:56:33 +01:00
Matthew Henry bebae14223 Replace CGDisplayIOServicePort with a workaround 
This could be cleaned up and refined a bit by comparing more display
attributes when available, but it gets the job done.

Closes #192.
 2014-03-10 18:56:33 +01:00
Camilla Berglund a859c10fa1 Formatting. 2014-03-10 13:55:23 +01:00
Camilla Berglund 78f1b8bd15 Fixed invalid video mode being restored. 2014-03-10 12:44:27 +01:00
Camilla Berglund 87dd7b89f5 Video mode detection cleanup. 2014-03-10 12:36:23 +01:00
Camilla Berglund 1ccc23268c Added glfwPostEmptyEvent. 2014-03-09 17:55:55 +01:00
Camilla Berglund 9309f75704 Fixed missing ICCCM protocol message checks. 2014-03-09 13:24:37 +01:00
Camilla Berglund 98552f1d75 Added caching of X11 NULL atom. 2014-03-09 13:18:58 +01:00
Camilla Berglund 27c5760b0c Updated broken RandR gamma comment. 2014-03-07 01:02:54 +01:00
Camilla Berglund 6e990b77d1 Removed stale comment. 2014-03-07 00:11:43 +01:00
Camilla Berglund 596b1e69ce Fixes for legacy MinGW 4.2. 2014-03-06 23:33:09 +01:00
Camilla Berglund d2205aa1a0 Added missing suffix for WNDCLASSW. 2014-03-06 23:21:13 +01:00
Camilla Berglund 76eefcc08a Moved some VC++ specific hacks to platform header. 2014-03-06 21:05:55 +01:00
Camilla Berglund 6d8e78cc95 Further separation of window and context. 
The context related parts of _GLFWwndconfig have been moved to
_GLFWctxconfig and given better names.  Window hint and attribute
members have been renamed to match.
 2014-03-06 20:07:58 +01:00
Camilla Berglund 0701d4ce6e Made use of Win32 W-suffixed symbols explicit. 2014-03-06 18:30:14 +01:00
Camilla Berglund d169557b00 Made GLX 1.3 the minimum supported version. 2014-03-06 16:45:40 +01:00
Camilla Berglund ae8393c06e Fixed refresh of debug context attribute. 2014-03-06 15:29:45 +01:00
Camilla Berglund e2d6f2761c Fixed constness of function parameters. 2014-03-06 14:37:13 +01:00
Michael Dickens 04b4e605a0 Removed C99-ism for the sake of OS X 10.6. 
Fixes #241.
 2014-02-13 20:58:48 +01:00
Camilla Berglund bf389f7183 Cleaned up RandR video mode handling. 2014-02-13 14:38:46 +01:00
Camilla Berglund 96433cdf19 Fixed meaningless Win32 video mode restore. 2014-02-13 14:25:55 +01:00
Camilla Berglund 2ec0acc972 Formatting (removed tab characters). 2014-02-13 13:30:15 +01:00
Camilla Berglund b3c461bd7e Cleaned up fix for #234. 
XFree may not be passed NULL.  An invalid window handle will cause
_glfwGetWindowProperty to not return 1.
 2014-02-13 13:30:12 +01:00
Camilla Berglund 69e10b88b0 Fixed uncaught BadWindow in EWMH check. 
Fixes #234.
 2014-02-11 15:50:19 +01:00
Camilla Berglund 7f4e947447 Fixed return value for WM_DROPFILES. 2014-02-11 00:56:52 +01:00
Camilla Berglund d0d2332193 WINVER fixes for MinGW and VC++. 2014-02-10 21:12:20 +01:00
Camilla Berglund 9beba1ba31 Fixed copypaste mistake. 2014-02-10 19:10:57 +01:00
Camilla Berglund c1446618cf Blurb nomenclature fix. 2014-02-10 15:33:41 +01:00
Camilla Berglund cf177905e5 Allowed drops from less privileged processes. 
By default, UAC will prevent less privileged processes from sending
these messages.  This resolves that on Windows 7 and later.  Windows
Vista is still affected by this issue, as it has UAC but lacks
ChangeWindowMessageFilterEx.

Fixes #227.
 2014-02-10 15:13:05 +01:00
Camilla Berglund 9cc8107c6b Fixed X11 drop support. 
This was broken by 8ae063bb1b.

Fixes #224.
 2014-02-10 14:19:35 +01:00
Camilla Berglund 84377c6175 Added _GLFW_USE_RETINA. 2014-02-10 13:45:13 +01:00
Shane Liesegang b4c03b992c Fixing memory leak in cocoa_joystick 
Making sure that propsRef and valueRef get released no matter when we
break out of the loop.

Resolves #231.
 2014-02-06 23:18:43 +01:00
Camilla Berglund a70bcb97bb Added missing winmm loading errors. 2014-01-29 15:22:35 +01:00
Camilla Berglund 58db8622bd Cleanup. 2014-01-22 20:15:27 +01:00
Camilla Berglund 5ed23e593c Handle case of no available CRTCs. 2014-01-22 20:13:22 +01:00
Camilla Berglund dd02b96c94 Added flag for non-functional RandR monitor path. 2014-01-22 20:13:19 +01:00
Camilla Berglund 13156de8c3 Updated stale X11 gamma comments. 2014-01-22 16:37:27 +01:00
Camilla Berglund a4b8b0f114 Removed superfluous test for RandR version. 2014-01-22 16:37:27 +01:00
Camilla Berglund 611006af18 Updated API version in comment headers. 2014-01-22 01:32:00 +01:00
Camilla Berglund 0163bc05d6 Moved internal context function declarations. 2014-01-22 01:23:35 +01:00
Camilla Berglund 8f349e84ae Cleaned up drop callback design. 2014-01-21 18:23:25 +01:00
Camilla Berglund cd54dc84c4 Fixed off-by-one error. 2014-01-21 15:25:49 +01:00
Camilla Berglund 2b876da52d Fixed broken includes. 2014-01-21 15:25:49 +01:00
Camilla Berglund ad9f880d61 Fixed broken calls to memset. 2014-01-21 15:25:49 +01:00
Camilla Berglund 8ae063bb1b Cleanup. 2014-01-21 15:25:49 +01:00
arturo 89d0723ba3 Initial drag and drop support. 2014-01-21 15:25:49 +01:00
Camilla Berglund 0548c713e8 Renamed monitor helper functions for clarity. 2014-01-21 15:23:11 +01:00
Camilla Berglund beb7e5909f Added comment on headless Macs. 2014-01-21 15:17:28 +01:00
Camilla Berglund 6eec7970c1 Made NSScreen to CGDisplay matching fail softly. 2014-01-21 15:14:14 +01:00
Camilla Berglund 7bbd3943c9 Removed superfluous display sorting. 2014-01-21 15:07:26 +01:00
David Avedissian c789238741 Removed extra argument 2014-01-18 23:43:17 +00:00
David Avedissian 4658e72b84 Fixed link error introduced by previous commit 2014-01-18 21:32:18 +00:00
Camilla Berglund e0a26aa62f Cursor mode cleanup. 2014-01-15 14:23:34 +01:00
Camilla Berglund 54b8d0d3c8 Moved to XGrabPointer for cursor hiding. 2014-01-15 02:43:14 +01:00
Camilla Berglund 16eb97dbc3 Added native monitor handle access to native API. 2014-01-13 23:05:01 +01:00
Camilla Berglund 7341f8b635 Enlarged OS X invisible cursor. 
Fixes #206.
 2014-01-06 15:34:49 +01:00
Camilla Berglund 7e806a8567 Started 3.1. 2014-01-01 15:29:57 +01:00
Camilla Berglund d937b74b8f Fixed glfwSetWindowSize stealing focus. 2013-12-28 20:56:57 +01:00
Camilla Berglund 0e8dace18c Removed stray whitespace in version string. 2013-12-24 00:48:28 +01:00
Camilla Berglund 402189ba14 Fixed pthread.h not included by GLX header. 2013-12-10 00:47:19 +01:00
Camilla Berglund 61ccb034d0 Formatting. 2013-12-09 00:27:36 +01:00
Camilla Berglund 50c694fab4 Added errors for override redirect iconification. 2013-12-08 14:59:52 +01:00
Camilla Berglund 56e600d7a1 Fixed iconify callback not triggered by Alt+Tab. 2013-12-05 02:19:41 +01:00
Camilla Berglund 0c0bb28d39 Allow setting swap interval to zero on DWM. 2013-12-04 08:00:53 +01:00
Camilla Berglund ed98e06651 Clarified WGL missing OpenGL error. 2013-12-04 05:35:36 +01:00
Camilla Berglund 06289110e7 Documented utility functions. 2013-11-24 23:31:26 +01:00
Camilla Berglund 823cc38ac1 Cleanup. 2013-11-20 20:04:00 +01:00
Camilla Berglund 5ef4f77fb5 Added support for _NET_WM_BYPASS_COMPOSITOR. 2013-11-20 19:59:17 +01:00
Camilla Berglund 0ccbddf767 Moved version number macro to internal.h. 
This lets alternative build environments avoid having to manually keep
track of which version of GLFW is being built.
 2013-11-20 13:58:57 +01:00
Camilla Berglund 23021422f3 Added explicit configuration header macro. 2013-11-20 12:06:07 +01:00
Camilla Berglund 87e6417353 Added hack detecting ARB_compatibility. 2013-11-18 12:14:51 +01:00
Camilla Berglund 95c7029e19 Formatting. 2013-11-18 12:06:39 +01:00
Camilla Berglund a79b93f5bc Avoid X11 video mode setting if modes match. 
This matches the behavior of the Windows port.
 2013-11-14 12:59:08 +01:00
Camilla Berglund a5b6a306ae Added note. 2013-11-13 12:47:44 +01:00
Camilla Berglund 109e3d13ed Fixed reporting of negative window positions. 
MSDN recommends LOWORD and HIWORD for WM_MOVE, but these do not
handle negative window positions correctly.

Fixes #172.
 2013-11-13 12:39:41 +01:00
Camilla Berglund 7af99bce88 Fixed cursor centering for odd window sizes. 2013-11-13 12:39:40 +01:00
Camilla Berglund 76afd41727 Added X error reporting to window creation failure. 2013-11-10 14:12:07 +01:00
Camilla Berglund bc625b21b3 Removed completed todo. 2013-11-10 14:03:34 +01:00
Camilla Berglund adbd52ba27 Formatted todos and notes. 2013-11-10 14:03:07 +01:00
Camilla Berglund b9d4875f3e Improved documentation of hacks. 2013-11-10 13:56:27 +01:00
Camilla Berglund b13c84f854 Removed joystick axis value negation on OS X. 2013-11-07 20:45:29 +01:00
Camilla Berglund 4013f733fe Reverted change of IOKit functions. 
The previously used set of functions caused a regression where no axes
or buttons were reported.  Fixes #78.
 2013-11-07 20:19:30 +01:00
Camilla Berglund a83d257ac6 Moved application activation to window showing. 
Fixes #93.
 2013-11-07 18:07:46 +01:00
Camilla Berglund ec5cb9c6f7 Moved to Cocoa for transformation and activation. 2013-11-07 18:03:39 +01:00
Camilla Berglund cc7f0bd532 Fixed crash retrieving the name of some displays. 2013-11-07 16:28:07 +01:00
Camilla Berglund 97ae40496d Added reporting of extension string retrieval failure. 2013-11-07 15:17:25 +01:00
Camilla Berglund 1cbd06c8a2 Fixed hidden window positioning on Metacity. 2013-11-03 13:51:34 +01:00
Camilla Berglund eabbb20d17 Added NULL test for glGetStringi. 2013-11-01 13:55:33 +01:00
Camilla Berglund 0153dab346 Clarified WGL re-creation comment. 2013-10-28 14:50:33 +01:00
Camilla Berglund 58045a5c07 Added Lion full scren menu item. 2013-10-28 13:01:58 +01:00
Camilla Berglund 7d1ae7aea7 Cleaned up Win32 timer. 2013-10-28 12:14:50 +01:00
Jack Moffitt 5be45d214b Fix build on Mac OS X 10.7 Lion. 
`CVDisplayLinkRef` needs an extra header file, and `NSAppKitVersionNumber10_7`
wasn't added until 10.8so use `> NSAppKitVersionNumber10_6` instead.
 2013-10-24 02:24:34 -06:00
Camilla Berglund bc8ff545ca Fixed mode enumeration for Thunderbolt monitors. 2013-10-17 20:43:39 +02:00
Camilla Berglund e576bdc894 Removed joystick axis value negation. 2013-10-17 20:09:00 +02:00
Camilla Berglund d78510457c Added hack for full screen focus on OS X. 2013-10-17 19:59:34 +02:00
Camilla Berglund 7ef7beb9fb Formatting. 2013-10-17 15:16:27 +02:00
Camilla Berglund 16e63adc40 Tenative setting of install_name. 2013-10-16 20:56:59 +02:00
Camilla Berglund 0041699048 Fixed glfw3.pc not using LIB_SUFFIX. 2013-10-12 20:22:48 +02:00
Camilla Berglund 2c920fbb8b Clarified character callback parameter. 2013-10-10 19:41:56 +02:00
Camilla Berglund 9c15e2ff86 Enabled Lion full screen. 2013-10-10 00:09:03 +02:00
Camilla Berglund 7775c87cd6 Cleanup and change log update. 2013-10-09 23:58:43 +02:00
Camilla Berglund 1047d5646d Merge pull request #139 from Pieroman/patch-1 
Fixed full screen windows blanking unused monitors.
 2013-10-09 14:47:41 -07:00
Camilla Berglund aab08712dd Fixed zero refresh rate on some monitors. 2013-10-09 19:45:39 +02:00
Andri Pálsson 99784fb8f0 Fixed hidden cursor positioning corner case. 2013-10-09 19:06:03 +02:00
Camilla Berglund e9694cca47 Merge pull request #152 from sjml/master 
Fixed minor Xcode 5 warnings.
 2013-10-08 10:43:55 -07:00
Shane Liesegang 9e0c07b7ba Fixing Xcode 5 warning 
Xcode 5 has gotten more pedantic about undeclared selectors, by
default.
 2013-10-08 10:49:00 -04:00
Shane Liesegang 209de7b56d Removing warnings when building Cocoa in 64-bit 
NSInteger is defined as the native integer width, so these changes
remove implicit conversions that were causing precision warnings.
 2013-10-08 10:42:17 -04:00
Camilla Berglund 16a8fafab2 Made disabled mode disable Win32 cursor image. 2013-10-07 16:28:19 +02:00
Camilla Berglund 6e68d89e0f Fixed focus for Win+D window restoration. 2013-10-07 16:12:23 +02:00
Camilla Berglund 9c5d9f8614 Fixed clip rect being set for unfocused windows. 2013-10-07 15:30:57 +02:00
Camilla Berglund 161065ac19 Clarified configuration header comments. 2013-10-06 11:45:28 +02:00
Andrew Corrigan 34f1c298b6 config.h.in --> glfw_config.h.in 2013-10-04 09:41:08 -04:00
Camilla Berglund 8194f1e2ae Added hack for setting WM_CLASS. 2013-10-04 13:41:19 +02:00
Camilla Berglund 5759d0fdf2 Fixed F13 being reported as PrtSc on OS X. 2013-09-26 19:58:35 +02:00
Camilla Berglund 201d0a78b1 Fixed Grave and World 1 being flipped. 2013-09-26 00:00:07 +02:00
Pieroman d3f22b8a04 Fixed Mac OS X bug where request for one fullscreen window blacks out other monitors 2013-09-19 21:33:44 +02:00
Camilla Berglund d3f3e2d6c5 Removed unused flag. 2013-09-19 01:12:50 +02:00
Camilla Berglund 546c794321 Fixed OS X cursor bugs #3, #72 and #88. 2013-09-19 01:05:51 +02:00
Camilla Berglund d69796d9e0 Updated menu label for minimization. 2013-09-16 15:58:05 +02:00
Camilla Berglund 3415f3ccde Conditionally define API version macros. 2013-09-13 12:27:43 +02:00
Camilla Berglund 57b8be1c24 Added support for mouse buttons 4-n. 2013-09-08 16:09:23 +02:00
Camilla Berglund b998d4fe01 Fixed _WIN32_WINNT not being set to Windows XP. 2013-09-03 13:38:16 +02:00
Camilla Berglund 3f74712540 Updated NSGL error tag. 2013-08-26 22:48:07 +02:00
Camilla Berglund 124bc392ab Removed stale comment. 2013-08-26 20:18:49 +02:00
Camilla Berglund f54b4e174d Fixed error code for missing GLES. 2013-08-21 11:56:48 +02:00
Camilla Berglund 83f57ff0ce Fixed potential segfault on init. 2013-08-21 10:15:52 +02:00
Camilla Berglund 9c20737b60 Allowed characters regardless of modifier keys. 2013-08-19 13:08:35 +02:00
Camilla Berglund 951f02acf3 Fixed keypad 5 release events. 2013-08-16 17:48:11 +02:00
Camilla Berglund 735bc2d815 Added NvOptimusEnablement. 2013-08-07 18:11:58 +02:00
Camilla Berglund a3ca7ad93a Removed cursor centering XFlush hack. 2013-08-06 20:48:31 +02:00
Camilla Berglund 261f290abf Fixed original video mode being overwritten. 2013-08-06 19:52:09 +02:00
Camilla Berglund 63a191eb8d Added clearing of callbacks on terminate. 2013-07-30 17:06:06 +02:00
arturo a6a5fa937c Fixed window position being incorrect on some WMs. 2013-07-30 15:52:47 +02:00
Camilla Berglund 3cfc400cf9 Simplified source file comment headers. 2013-07-30 14:46:52 +02:00
Camilla Berglund 6e85924bd3 Replaced selector test with NSAppKitVersionNumber. 2013-07-30 14:46:51 +02:00
Camilla Berglund f7282e86c0 Added pointer swap macro for callback setters. 2013-07-30 14:44:56 +02:00
Camilla Berglund 9d0e102135 Fixed glfwCreateWindow return value semantics. 2013-07-30 14:44:56 +02:00
Dmitri Shuralyov c99b7fe7da Fixed #if-guard logic and signature for hasPreciseScrollingDeltas. 2013-07-24 23:06:58 -07:00
Dmitri Shuralyov 5655e26315 Changed scrollWheel to use precise scrolling deltas when available. 
Use precise scrolling deltas only on supported versions of OS X;
hasPreciseScrollingDeltas, scrollingDeltaX, scrollingDeltaY are
available in OS X v10.7 and later.
Replaced a single occurence of a tab character with 4 spaces for
consistency in src/socoa_window.m.
 2013-07-17 19:36:43 -07:00
siavash 0463e196b4 Cleanup of size_t use. 2013-07-15 18:37:02 +02:00
siavash b12c973922 Moved X11 character translation failure test. 2013-07-15 18:28:09 +02:00
Camilla Berglund 45653c5549 Cleaned up X error handler work. 2013-07-11 01:32:46 +02:00
Camilla Berglund f67c7b49ab Merge pull request #86 from siavashserver/master 
Added utility functions for X11 error handler.
 2013-07-10 15:46:49 -07:00
Camilla Berglund 41a1374744 Updated references to OS X (previously Mac OS X). 2013-07-10 15:38:31 +02:00
Camilla Berglund c8b01f61d6 Enabled OpenGL 3.x and 4.x context on OS X 10.9. 2013-07-10 15:03:14 +02:00
siavash 3b4eb2f0a0 Added blank cursor creation error checking on X11. 2013-07-09 21:08:21 +04:30
Camilla Berglund d20aa0428a Fixed window positioning on OS X. 2013-07-09 17:08:26 +02:00
Camilla Berglund 1c80e99008 Added forcing of swap interval on DWM composition. 2013-07-08 00:32:23 +02:00
Niklas Behrens a55c3f48eb Fix incorrect cursor position 
When reactivating the cursor its position was updated visually but not
internally which caused glfwGetCursorPos to return wrong values.
 2013-07-07 22:05:29 +02:00
siavash 763ec6cbcb Cleanup. 2013-07-05 14:29:12 +02:00
Camilla Berglund dcb4d8ee32 Fixed possible X11 screensaver race condition. 2013-07-04 17:52:15 +02:00
Camilla Berglund 58c69a9ac4 Enabled compilation on OS X 10.6 SDK. 2013-07-04 15:02:01 +02:00
Camilla Berglund 7a03ca8dbc Removed superflous casts of allocated memory. 2013-07-04 14:54:07 +02:00
Camilla Berglund d7512f529c Clarified names of gamma array helper functions. 2013-07-04 14:52:58 +02:00
Camilla Berglund 209a470a5f Replaced all uses of malloc with calloc. 2013-07-04 14:20:14 +02:00
Camilla Berglund 2656bf8f9f Added missing module handle freeing. 2013-06-26 14:04:07 +02:00
Camilla Berglund 194e22dbbe Fixed retrieval of OpenGL 1.0 and 1.1 on WGL. 2013-06-26 13:57:09 +02:00
Camilla Berglund 4883073b91 Cleanup. 2013-06-24 14:38:00 +02:00
Camilla Berglund 2ce9e8e6b2 Fixed clipboard string leaks. 
The clipboard string was not by the Win32 and Cocoa ports on terminate.
 2013-06-24 14:08:55 +02:00
Camilla Berglund 933005a022 Corrected comment. 2013-06-19 13:49:51 +02:00
Camilla Berglund 3be3f58a92 Cleanup. 2013-06-19 13:47:19 +02:00
Camilla Berglund e11a5e3973 Fixed resizing for full screen override redirect. 2013-06-19 13:47:19 +02:00
Jari Vetoniemi 5c54987285 Typecast EGL types to get rid of compile warnings 2013-06-17 19:25:41 +03:00
Camilla Berglund c10bf9ba9c Fixed incorrect hint default. 
The default for the GLFW_ALPHA_BITS hint was zero instead of 8.
 2013-06-17 17:42:25 +02:00
Camilla Berglund 10017b27bb Cleanup. 2013-06-17 12:46:51 +02:00
Camilla Berglund 01ccc56423 Added missing headers to library target. 2013-06-17 10:31:25 +02:00
Camilla Berglund 22e1aa6cfc Fixed process transform when no menu bar. 2013-06-16 20:30:36 +02:00
Kyle McDonald d5cd6ec8eb Restored support for Mac OS X 10.6. 
Modified during merge.
 2013-06-16 18:46:20 +02:00
Camilla Berglund eba8168a03 Fixed glfwGetFramebufferSize on OS X. 2013-06-16 18:32:16 +02:00
Camilla Berglund a7ff236b32 Fixed duplicate events being reported. 2013-06-16 18:29:46 +02:00
Camilla Berglund d31322cdcd Added option for disabling install. 2013-06-16 13:31:39 +02:00
Camilla Berglund 77e4c61190 Fixed broken WGL error detection. 
Context creation was attempted even if no valid pixel formats had been
found during enumeration.
 2013-06-13 18:29:21 +02:00
Camilla Berglund ccb810bed9 It's not an error. 2013-06-13 12:21:16 +02:00
Camilla Berglund 5da6a903f9 Fixed MinGW warning. 2013-06-12 23:08:01 +02:00
Camilla Berglund 3df0b4478b Fixed VC++ warnings. 2013-06-12 20:37:04 +02:00
Camilla Berglund 421810325a Win32 fixes. 2013-06-12 19:58:30 +02:00
Camilla Berglund 35c386b7bb Ignore CRTCs with no outputs. 2013-06-12 19:40:55 +02:00
Camilla Berglund 52354bf382 Added missing ramp array allocation. 2013-06-09 18:18:09 +02:00
Camilla Berglund 68b7ea86d2 Monitor enumeration fixes. 2013-06-09 13:10:21 +02:00
Camilla Berglund 8c069f3753 Fixed use of wrong variable. 2013-06-09 12:18:07 +02:00
Camilla Berglund 296b0a39a0 Added zeroing of DEVMODE. 2013-06-09 11:45:51 +02:00
Camilla Berglund 742a577230 Removed C99-ism. 2013-06-09 11:45:26 +02:00
Camilla Berglund 770daa19c8 Avoid mode re-enumeration, take two. 2013-06-07 15:11:26 +02:00
Camilla Berglund f4387139e0 Avoid mode re-enumeration. 2013-06-07 13:57:17 +02:00
Camilla Berglund f6a9338b06 Hooked up monitor callback on OS X. 2013-06-06 01:28:01 +02:00
Camilla Berglund 11615fcaf2 Added scancode to key callback. 2013-06-05 23:46:09 +02:00
Camilla Berglund 4c69535d72 Removed reconfiguration callback. 
The Core Graphics callback is called before the corresponding NSScreen
object for a newly connected monitor is created, thus making monitor
enumeration fail.
 2013-06-05 16:31:05 +02:00
Camilla Berglund 44e8401f7b Clarified default profile token name. 2013-06-05 16:15:20 +02:00
Camilla Berglund 11b7d17ea0 Added filtering of duplicate key releases. 2013-06-05 15:26:52 +02:00
Camilla Berglund edebf3b560 Clarified comment. 2013-06-05 15:17:16 +02:00
Camilla Berglund 36de6d3ce3 Fixed AltGr on Windows. 2013-06-05 13:11:00 +02:00
Camilla Berglund 180a4ee640 Fixed constness of joystick data. 2013-06-04 18:20:38 +02:00
Camilla Berglund f9d1a37621 Fixed unguarded calls to monitor callback. 2013-06-04 17:46:06 +02:00
Camilla Berglund 3498163da1 Separated window and framebuffer sizes. 2013-06-04 01:51:54 +02:00
Camilla Berglund 89588a4508 Cleanup. 2013-06-04 01:51:40 +02:00
Camilla Berglund 2b1192a3dd Formatting. 2013-05-31 00:09:37 +02:00
Camilla Berglund 80076e7b67 Fixed function visibility. 2013-05-31 00:02:03 +02:00
Camilla Berglund 2cd34386bc Added back refresh rate window hint. 2013-05-30 20:42:59 +02:00
Camilla Berglund 731812cfc1 Added refresh rate to GLFWvidmode. 2013-05-30 15:52:42 +02:00
Camilla Berglund 8a683c02aa Hooked up Quartz reconfiguration callback. 2013-05-30 14:14:30 +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 aaa955f51f Moved mode setting to after window re-creation. 2013-05-26 18:05:57 +02:00
Camilla Berglund a90389044d Fixed styles for undecorated windows on Windows. 2013-05-26 18:00:38 +02:00
Camilla Berglund ffc55c3509 Removed broken initial cursor pos kluges. 2013-05-26 17:19:13 +02:00
Camilla Berglund b4e0ee418e Made glfwGetMonitors work from monitor callback. 2013-05-24 15:08:23 +02:00
Noel Cower eff85f9500 Added super modifier bit. 
Edited during merge.
 2013-05-23 14:21:35 +02:00
Camilla Berglund 3bcffba24a Renamed control modifier bit to match key token. 2013-05-23 14:21:35 +02:00
Camilla Berglund 47b06e1fdc Removed C99-ism. 2013-05-23 00:18:11 +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 5d308db654 New gamma ramp API. 2013-05-22 21:56:14 +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 c4d856bcb2 Fixed window positioning on OS X. 2013-05-22 21:37:41 +02:00
Camilla Berglund 0b5de6dd28 Fixed cursor positioning on OS X. 2013-05-22 20:52:45 +02:00
Camilla Berglund 9fe71af79a Fixed broken test for broken RandR gamma. 2013-05-19 09:48:36 +02:00
Camilla Berglund 67e7d8ca5f Fixed window position for EWMH full screen. 
Also added flushing after setting window position and size.
 2013-05-19 09:08:42 +02:00
Camilla Berglund e20e8f9954 Comment fixes. 2013-05-14 01:11:28 +02:00
Camilla Berglund 1eac29d168 Ensured that count out parameter is always set. 2013-05-14 01:06:31 +02:00
Camilla Berglund 64630af362 CMake config file cleanup. 2013-05-14 01:03:51 +02:00
Camilla Berglund d82f068f7e Reintroduced manual framebuffer config selection. 
The default behavior of WGL, EGL and GLX is to choose a config that has
/at least/ the specified number of bits, whereas the GLFW 2 behavior was
to choose the closest match with very few hard constraints.  Moving the
responsibility of finding the supported minimum values to the client was
problematic, as there's no way to enumerate supported configurations,
forcing the client to perform multiple (and slow) window/context
creation attempts.  Not even the currently set defaults (24-bit color
and depth, 8-bit stencil) is universally supported, as bug reports show.
 2013-05-13 15:58:36 +02:00
Lambert Clara f6eccf145b Add glfwConfig module. 
This module allows cmake projects to find glfw with FIND_PACKAGE.
 2013-05-12 16:55:33 +02:00
Camilla Berglund 475d10d9d8 Formatting. 2013-05-02 23:06:59 +02:00
Camilla Berglund f27eca113e Moved OpenGL framework loading to NSGL module. 2013-05-02 23:06:59 +02:00
Camilla Berglund efe3ee8818 Initial OS X fullscreen iconification work. 
glfwIconifyWindow now pulls the view out of fullscreen mode and restores
the original display mode, reversing the process when deminiaturized.
 2013-05-02 18:24:37 +02:00
Camilla Berglund 58ae11778a Replaced expensive IOKit function. 2013-05-02 18:02:52 +02:00
Camilla Berglund b0e66c925c Explicitly choose closest policy. 2013-05-02 17:35:09 +02:00
Camilla Berglund fa35d701a7 Fixed sharing between windowed and fullscreen windows. 2013-05-02 17:30:57 +02:00
Camilla Berglund cdfbe68a96 Cleanup. 2013-05-02 17:01:19 +02:00
Camilla Berglund 4a2a00766c TLS key cleanup. 2013-05-02 16:48:11 +02:00
Camilla Berglund 6b7f5671f8 Merged GLX error code into library struct. 2013-05-02 16:37:55 +02:00
Camilla Berglund be28914732 Added setting of _NET_WM_PID. 2013-05-02 16:31:27 +02:00
Camilla Berglund 161c73ea66 Removed centered flag. 2013-05-01 16:34:11 +02:00
Camilla Berglund 7ecd2eb53b Fixed NSBeep on certain chords. 2013-04-30 19:02:31 +02:00
Camilla Berglund 296632c8d2 Fixed joystick state not being initialized. 2013-04-30 17:03:09 +02:00
Camilla Berglund aa3364a73e Fixed jitter in captured cursor mode. 2013-04-30 15:50:01 +02:00
Camilla Berglund d6030808eb Cleanup of clipboard manager work. 2013-04-30 15:07:02 +02:00
Camilla Berglund affb62514a Cleanup of clipboard manager work. 2013-04-29 21:06:54 +02:00
Camilla Berglund 179194a687 Added support for clipboard manager. 2013-04-29 13:16:56 +02:00
Camilla Berglund 1b34887e10 Formatting. 2013-04-29 13:01:30 +02:00
Camilla Berglund ae1532670c Separated formats from targets. 2013-04-29 13:01:30 +02:00
Camilla Berglund dab22c4c53 Cleanup. 2013-04-29 13:01:30 +02:00
Camilla Berglund 822eb1c986 Added support for MULTIPLE target. 2013-04-29 13:01:26 +02:00
Camilla Berglund 7012d97958 Removed clipboard format index macros. 2013-04-29 00:23:59 +02:00
Camilla Berglund 0046b210e2 Merged hints into library struct. 2013-04-24 23:47:08 +02:00
Camilla Berglund 72277846bd Removed stale comment. 2013-04-24 22:34:09 +02:00
Camilla Berglund 3ec843a1da Fixed captured cursor mode on OS X. 2013-04-24 19:29:28 +02:00
Camilla Berglund 7423cfa5bf Corrected type of cursor coordinates. 2013-04-22 16:04:24 +02:00
Camilla Berglund 7405bc48cd Added proper monitor comparison. 2013-04-22 14:44:45 +02:00
Camilla Berglund 2891c9629f Fixed hidden cursor mode on OS X. 2013-04-22 00:12:25 +02:00
Camilla Berglund a2745574c8 OS X hidden cursor cleanup. 2013-04-21 22:46:35 +02:00
Camilla Berglund 74d6a5d883 Nomenclature fix. 2013-04-21 21:54:33 +02:00
Camilla Berglund f5ba0d9f22 Video mode setting cleanup. 2013-04-21 21:28:07 +02:00
Camilla Berglund b0ae7a6957 Added refresh event for resize on OS X. 2013-04-21 17:39:10 +02:00
Camilla Berglund ace0a8ef28 Fixed type for cached cursor coords. 2013-04-21 16:28:46 +02:00
Camilla Berglund 6fd396f766 Removed C99-ism. 2013-04-21 16:28:08 +02:00
Camilla Berglund f175b2dddc Only apply cursor mode to focused windows. 2013-04-19 00:19:59 +02:00
Camilla Berglund 11a27de3d3 Added return by setters of previous callback. 2013-04-18 18:20:25 +02:00
Camilla Berglund 37a137559e Monitor enumeration cleanup. 2013-04-18 15:30:34 +02:00
Camilla Berglund dc58dd1bef Merge pull request #52 from nilium/osx-cursor-hidden-patch 
Added support for hidden cursor mode on OS X.
 2013-04-18 06:22:53 -07:00
Camilla Berglund 57751a5494 Added initial NSScreen integration. 
This (tentatively) fixes the bug of full screen windows on OS X always
opening on the primary monitor.
 2013-04-17 23:11:04 +02:00
Camilla Berglund 130f07d8c3 Added include required for XUniqueContext. 2013-04-17 17:31:29 +02:00
Camilla Berglund f06a700307 Renamed support directory to deps. 2013-04-17 15:42:21 +02:00
Camilla Berglund e9712739ba Formatting. 2013-04-17 15:29:17 +02:00
Camilla Berglund 1fe21b22a3 Assume that malloc works. 2013-04-17 15:14:42 +02:00
Noel Cower 662958ef11 Make resetMouseCursor consistent with setCursorMode 2013-04-16 16:49:43 -06:00
Noel Cower 1ba8fd05c0 Add GLFW_CURSOR_HIDDEN. 
Uses addCursorRect:cursor: as discussed.. well, too long ago. Anyhow,
this will effectively hide the cursor while it is inside a window with
GLFW_CURSOR_HIDDEN or GLFW_CURSOR_CAPTURED enabled. This shouldn't mess
up cursor retain counts either, unlike previous uses of the hide/unhide
methods on NSCursor.

It does allocate a small, single-pixel image for an invisible cursor,
as well as the cursor itself, but that shouldn't be too much trouble.
 2013-04-16 16:46:55 -06:00
Noel Cower 1f148f2bd6 Keep cursor centered in window while captured. 
Previously, cmd-tabbing out would result in the cursor position maybe
ending up outside the window, so if one cmd-tabbed back in with the
cursor still outside, any click would go outside the window and cause
it to lose focus. Not really a good thing. So, this is a bit of a hack,
but it works.
 2013-04-16 16:46:49 -06:00
Camilla Berglund 94853a3a05 Made context creation use correct CGDisplay. 2013-04-16 23:33:49 +02:00
Camilla Berglund 1ffd8f667f Cleanup. 2013-04-16 23:33:35 +02:00
Camilla Berglund 7b7ef1e07b Cleanup of Win32 mouse button handling. 2013-04-16 22:50:19 +02:00
Camilla Berglund c12759880d Fixed Win32 cursor mode switch jitter. 2013-04-16 20:50:59 +02:00
Camilla Berglund 008376d450 Restore cursor position on capture mode exit. 2013-04-16 20:46:58 +02:00
Camilla Berglund 648c8e7371 Put synthetic key releases after defocus event. 
This allows the application to separate actual from synthetic key
release events.
 2013-04-16 19:58:49 +02:00
Camilla Berglund 2caee225ea Fixed hidden cursor mode for focus events. 2013-04-16 19:58:48 +02:00
Camilla Berglund 26756b9ae1 Moved to use X11 context manager. 2013-04-15 02:24:43 +02:00
Camilla Berglund 32273c5d96 Formatting. 2013-04-14 16:33:20 +02:00
Camilla Berglund 52ade53553 Removed stale comment. 2013-04-14 16:10:16 +02:00
Camilla Berglund 6164eb603b Added tracking of cursor visibility. 2013-04-14 15:41:34 +02:00
Camilla Berglund 082306b1db Added support for WM_UNICHAR. 2013-04-11 01:08:02 +02:00
Camilla Berglund 159f9b9526 Changed default cursor mode for fullscreen. 2013-04-11 01:04:13 +02:00
Camilla Berglund 49db3b2a9e Formatting. 2013-04-08 15:24:24 +02:00
NathanSweet 8e2e7b37a1 Undecorated window support on win/mac/linux. 2013-04-08 15:24:24 +02:00
NathanSweet 85b64edcf0 Fix modifier keys. 
The wrong mask was used making all modifier keys not be recognized.
 2013-04-08 15:23:10 +02:00
Camilla Berglund d4a61bbd36 Removed unused type. 2013-04-08 13:59:04 +02:00
Camilla Berglund cd2b6eb83c Replaced __declspec(thread) with TlsAlloc. 
Variables created within a DLL with __declspec(thread) may not get a TLS
slot on Windows XP, leading to segfaults on use.  Moving to TlsAlloc
works around this.
 2013-04-08 03:57:27 +02:00
Camilla Berglund 98063d2957 Replaced NULL with EGL_DEFAULT_DISPLAY. 2013-04-08 03:25:05 +02:00
Camilla Berglund 28bf3f700d Fixed uninitialized variable. 2013-04-08 03:25:04 +02:00
Jay Weisskopf 83b26c9160 Fixed dlopen entry point retrieval mechanism. 
Added missing dlopen macro to config header template.
 2013-04-06 05:28:36 -04:00
Camilla Berglund 953b7f52e5 No characters from Ctrl and Alt chords. 
This makes the behavior on X11 consistent with Win32 and Cocoa.
 2013-04-04 18:17:41 +02:00
Camilla Berglund 810d889539 Fixed function signature on OS X. 2013-03-28 00:30:08 +01:00
Camilla Berglund f41d85a209 Added initial XInput2 cursor motion. 2013-04-04 16:48:58 +02:00
Camilla Berglund 129e94da2e Changed cursor pos to double. 2013-04-04 16:29:40 +02:00
Camilla Berglund 4c0e946da3 Added possible ES3 bit. 2013-03-21 01:18:07 +01:00
Camilla Berglund 7915e8d778 Added setting of EGL_RENDERABLE_TYPE. 2013-03-21 01:12:07 +01:00
Camilla Berglund 8fe816d248 Removed GLFW_NO_ERROR. 
As glfwGetError was removed (due to a race between glfwInit error
reporting and manual TLS setup on OS X), this token has no purpose.
 2013-03-18 19:23:21 +01:00
Camilla Berglund 0356aa620d Fixed resize mode setting on Windows. 2013-03-12 17:25:33 +01:00
Camilla Berglund 71d2b574f8 Converted docs to hybrid Markdown. 2013-03-12 15:33:05 +01:00
Camilla Berglund 200e07027c Implemented hidden cursor on Windows. 2013-03-11 22:57:39 +01:00
Camilla Berglund 26e8fde8fb Assume malloc works. 2013-03-11 21:30:01 +01:00
Camilla Berglund 51ee3a5c0a No swap interval on composition. 2013-03-11 21:07:29 +01:00
Camilla Berglund 54d1d14f59 Added setting of Windows DPI-aware flag. 2013-03-11 19:01:33 +01:00
Camilla Berglund 3897a174b5 Fixed VC++ warnings. 2013-03-08 14:19:40 +01:00
Camilla Berglund 6a7dbfee29 Simplified Cocoa key input. 2013-03-07 17:37:07 +01:00
Camilla Berglund aec952e8dc Fixed and clarified invalid char tests. 2013-03-07 17:12:43 +01:00
Camilla Berglund 64afb193e8 Removed return value of close callback. 2013-03-06 23:29:37 +01:00
Camilla Berglund d0e4c874c3 Moved sticky state. 2013-03-01 15:18:53 +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 e3182a4f44 Formatting. 2013-02-25 17:22:33 +01:00
Camilla Berglund 182e0afe25 Made character unsigned. 2013-02-25 17:02:28 +01:00
Camilla Berglund ad4f9f1520 Added missing version string API tag. 2013-02-25 15:10:43 +01:00
Camilla Berglund cd78d70b25 Put findAppName under _GLFW_USE_MENUBAR. 2013-02-24 22:04:54 +01:00
Camilla Berglund 8dde39b3e0 Formatting. 2013-02-24 21:14:44 +01:00
Keith Pitt 34ce04a122 Added fading to Cocoa display mode setting. 2013-02-24 21:12:21 +01:00
SephiRok 1ae9ce1e0a Fixed print screen key input for all platforms. 2013-02-21 18:41:27 +01:00
Camilla Berglund 941a671bfa Minor cleanup of Win32 window code. 2013-02-20 18:15:03 +01:00
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