mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-14 18:34:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,378 Commits 17 Branches 23 Tags 38 MiB
d5de48ab53
Commit Graph

527 Commits

Author SHA1 Message Date
Camilla Berglund
2085876da6 Documentation work. 2015-01-05 16:17:50 +01:00
Camilla Berglund
d459145d28 Made glfwGetCursorPos query system directly. 
Fixes #103.
Fixes #153.
Fixes #193.
Fixes #355.
Fixes #381.
 2015-01-04 16:54:19 +01:00
Camilla Berglund
b19fb4c24d Added caveat for context sharing on Windows. 
WGL prohibits sharing with contexts current on non-main threads.

Fixes #402.
 2014-12-27 22:47:07 +01:00
Camilla Berglund
b2030f6d73 Fixed X11 character input for C locale. 
Fixes #396.
 2014-12-18 03:24:38 +01:00
Camilla Berglund
44372b89f6 Documentation work. 2014-12-18 02:53:14 +01:00
Camilla Berglund
2a1375e97c Added glfwCreateStandardCursor. 
This function allows the creation of cursor objects using one of several
standard cursor shapes from the current system cursor theme.
 2014-12-15 21:58:44 +01:00
Camilla Berglund
49ec306a0a Added glfwGet*Adapter to native API. 2014-10-29 02:55:02 +01:00
Camilla Berglund
b140606a49 Added GLFW_INCLUDE_GLEXT for glext.h inclusion. 
Closes #365.
 2014-10-13 23:57:21 +02:00
Camilla Berglund
2d13eb0920 Documentation work. 2014-10-13 17:23:05 +02:00
Camilla Berglund
3afa831e28 Updated comments for DLL macros. 2014-10-13 15:48:40 +02:00
Camilla Berglund
96d230becb Documentation work. 2014-10-07 12:24:31 +02:00
Camilla Berglund
6be821c18b Documentation work. 2014-10-06 23:18:33 +02:00
Camilla Berglund
95654cfada Documentation work. 2014-10-06 15:01:58 +02:00
Camilla Berglund
4591ad2d64 Documentation work. 2014-09-22 11:08:33 +02:00
Camilla Berglund
e57b8212ce Removed duplicate words in documentation. 2014-09-17 15:19:56 +02:00
Camilla Berglund
58c390991c Made glfwGetX11Monitor return output, not CRTC. 2014-09-17 12:45:51 +02:00
Camilla Berglund
99cedceef5 Expose display device name as UTF-8. 
This makes interaction with libOVR simpler, as it provides the display
device name in the same encoding.
 2014-09-16 18:28:08 +02:00
Camilla Berglund
1b6d8a6ed6 Enabled enumeration of mirroring displays. 
This exposes all monitors in every mirroring group, which is needed for
robust detection of an Oculus Rift.
 2014-09-16 18:27:33 +02:00
Camilla Berglund
8d170c7f47 Merged clipboard code into input. 2014-09-09 16:36:41 +02:00
Camilla Berglund
2eb5ed33be Documented X11 cursor positioning caveat. 
Closes #129.
 2014-08-31 13:10:32 +02:00
Camilla Berglund
44c899ce70 Added support for GL_KHR_context_flush_control. 2014-08-21 19:29:04 +02:00
Camilla Berglund
9ccb966a3a Added APIENTRY hack to native header. 2014-08-21 19:29:04 +02:00
Camilla Berglund
036da0fb4e Added RandR header inclusion to native header. 
Fixes #222.
 2014-07-28 21:19:50 +02:00
Camilla Berglund
70fd348432 Fixed API version in header files. 2014-07-08 13:44:34 +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
e8e05d462c Documentation work. 
Fixes #276.
 2014-06-19 11:38:22 +02:00
Camilla Berglund
3ce7bfef07 Added GLFW_FLOATING. 
Fixes #23.
 2014-06-18 16:39:39 +02:00
Camilla Berglund
c9808586b3 Added GLFW_DOUBLEBUFFER. 2014-06-18 16:36:53 +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
25e7ff1196 Added GLFW_AUTO_ICONIFY. 
By default, full screen windows that lose focus will be iconified and
the video mode will be restored.  This makes it impossible to create
applications spanning multiple monitors.  The GLFW_AUTO_ICONIFY window
hint will allow users to disable this behavior.

Fixes #143.
 2014-06-18 16:33:58 +02:00
Camilla Berglund
20b7ac0518 Formatting. 2014-06-12 22:08:37 +02:00
Camilla Berglund
eaff0f73d1 Documentation fix. 2014-04-07 16:28:11 +02:00
Camilla Berglund
8061bb54fe Formatting. 2014-03-30 17:13:41 +02:00
Camilla Berglund
eb3f75e03e Added glfwGetWindowFrameSize. 2014-03-30 10:57:32 +02:00
Camilla Berglund
5c8121e7a8 Clarified language for file drop callback. 2014-03-29 21:35:21 +01:00
Camilla Berglund
0e20577af4 Confined remaining functions to main thread. 2014-03-24 12:17:13 +01:00
Camilla Berglund
a9c7377e0a Clarified thread safety statement. 2014-03-24 11:40:44 +01:00
Camilla Berglund
8fa9cc0de3 Added GLFWimage struct. 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
7ebd10a868 Added GLFW_INCLUDE_ES31. 
Fixes #255.
 2014-03-19 23:02:47 +01:00
Camilla Berglund
1ccc23268c Added glfwPostEmptyEvent. 2014-03-09 17:55:55 +01:00
David Avedissian
128e678815 Fixed missing include in glfw3native.h for Cocoa. 
Fixes #240.
 2014-02-13 13:30:15 +01:00
Camilla Berglund
611006af18 Updated API version in comment headers. 2014-01-22 01:32:00 +01:00
Camilla Berglund
d73e15d08f Added mention of encoding to GLFWdropfun. 2014-01-21 20:59:54 +01:00
Camilla Berglund
8f349e84ae Cleaned up drop callback design. 2014-01-21 18:23:25 +01:00
arturo
89d0723ba3 Initial drag and drop support. 2014-01-21 15:25:49 +01:00
Camilla Berglund
75f916db44 Formatting. 2014-01-13 23:27:11 +01:00
Camilla Berglund
16eb97dbc3 Added native monitor handle access to native API. 2014-01-13 23:05:01 +01:00
Camilla Berglund
7e806a8567 Started 3.1. 2014-01-01 15:29:57 +01:00
Camilla Berglund
a18b187494 Expanded cursor mode descriptions. 2013-12-05 03:27:12 +01:00
Camilla Berglund
2ae46fa90a Added notes on window refresh. 2013-12-04 19:14:33 +01:00
Camilla Berglund
2db0401a57 Removed excuse. 2013-11-20 15:08:53 +01:00
Camilla Berglund
f18aef4aec Removed fixed @bug. 2013-11-03 14:17:03 +01:00
Camilla Berglund
b9fb45f408 Documentation updates. 2013-10-27 11:03:47 +01:00
Camilla Berglund
2c920fbb8b Clarified character callback parameter. 2013-10-10 19:41:56 +02:00
Camilla Berglund
6d9d85670f Clarified unit of cursor positions. 2013-09-28 22:12:50 +02:00
Camilla Berglund
521fa7d005 Added crossrefs for window and fb size. 2013-09-26 20:02:19 +02:00
Camilla Berglund
07db5daa61 Added note on GDI software OpenGL. 2013-09-26 19:15:45 +02:00
Camilla Berglund
59422ec980 Started 3.0.4. 2013-09-24 21:36:11 +02:00
Camilla Berglund
fd3813f0d9 Updated notes referring to Mac OS X. 2013-09-24 21:34:46 +02:00
Camilla Berglund
3af1c411ca Added notes on swap interval defaults. 2013-09-19 21:37:01 +02:00
Camilla Berglund
bb5581690d Documentation fixes for glfwSetCursorPos. 2013-09-09 23:31:59 +02:00
Camilla Berglund
c93b120252 Disabled stddef.h for GLFW_INCLUDE_NONE, cleanup. 2013-09-08 16:07:34 +02:00
Systemcluster
d0a0e37b2b Declared unnamed typedef structs as their types 
Without defining them as structs it was impossible to forward declare `GLFWgammaramp` and `GLFWvidmode`.
 2013-08-29 06:15:55 +02:00
Camilla Berglund
8c1588b14e Started 3.0.3. 2013-08-26 16:22:06 +02:00
Camilla Berglund
3cfc400cf9 Simplified source file comment headers. 2013-07-30 14:46:52 +02:00
Camilla Berglund
bd2d571c31 Added explanation for #error. 2013-07-23 13:44:39 +02:00
Camilla Berglund
bea59f64b2 Enabled inclusion of stddef.h on all platforms. 
The OS X gl.h defines section macros that prevents glext.h from
including stddef.h, leaving it undeclared when it's later used.
 2013-07-23 00:20:23 +02:00
Camilla Berglund
6632cc7c1d Tagged close flag for use from secondary threads. 2013-07-11 02:00:48 +02:00
Camilla Berglund
4b7ae4918b Documentation work. 2013-07-07 12:59:30 +02:00
Bruce Mitchener
5f37d36d4a Fix typo. 2013-06-27 17:28:31 +07:00
Camilla Berglund
f5f55e3ff8 Documentation work. 2013-06-17 14:15:35 +02:00
Camilla Berglund
1de60a4ff7 Started 3.0.2. 2013-06-17 12:46:44 +02:00
Camilla Berglund
e93bade240 Fixed docs for glfwGetJoystickButtons. 2013-06-16 02:33:33 +02:00
Camilla Berglund
f1c88b41f2 Fixed bad reference in documentation. 2013-06-14 12:12:16 +02:00
Camilla Berglund
dbef5ea46b Grammar fix. 2013-06-13 12:06:51 +02:00
Camilla Berglund
c38f33adda Started 3.0.1. 2013-06-13 12:05:23 +02:00
Camilla Berglund
c347b07b20 Updated bug tag. 2013-06-12 20:58:13 +02:00
Camilla Berglund
e6bfbba429 Clarified sticky keys docs. 2013-06-12 16:06:21 +02:00
mewmew
cf2d260b2a Update parameter names in documentation of scroll callback. 2013-06-06 19:49:23 +02:00
Camilla Berglund
11615fcaf2 Added scancode to key callback. 2013-06-05 23:46:09 +02:00
Camilla Berglund
5fd409b679 Documentation work. 2013-06-05 19:42:59 +02:00
Camilla Berglund
44e8401f7b Clarified default profile token name. 2013-06-05 16:15:20 +02:00
Camilla Berglund
c3bb5c9e7b Documented not freeing returned values. 2013-06-05 16:04:04 +02:00
Camilla Berglund
128e5b4a73 Removed deprecated key aliases. 2013-06-05 15:39:19 +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
2cd34386bc Added back refresh rate window hint. 2013-05-30 20:42:59 +02:00
Camilla Berglund
53b39a61b9 Token value cleanup. 2013-05-30 18:55:45 +02:00
Camilla Berglund
731812cfc1 Added refresh rate to GLFWvidmode. 2013-05-30 15:52:42 +02:00
Camilla Berglund
95835af0ac Quartz lies. 2013-05-30 13:53:25 +02:00
Camilla Berglund
e991a0e7cc Removed tags for fixed bugs. 2013-05-29 22:09:27 +02:00
Camilla Berglund
c159411944 Added struct member descriptions. 2013-05-27 22:29:06 +02:00
Camilla Berglund
393e439ac3 Token value cleanup. 2013-05-27 22:16:59 +02:00
Camilla Berglund
1f5f20eeef Documentation work. 2013-05-27 17:10:34 +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
fdd4518ae5 Fixed documentation for glfwJoystickPresent. 2013-05-27 15:13:09 +02:00
Camilla Berglund
98cbf6fda1 Added documentation for modifier bits. 2013-05-23 14:53:33 +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
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
c00d057eda Documented that out parameters always get set. 2013-05-15 15:01:42 +02:00
John Bartholomew
93f4effd2b Do not export internal symbols from a unix shared library. 2013-05-01 13:08:09 +01:00
Camilla Berglund
3ec2925da4 Added note on coordinate truncation. 2013-04-25 18:03:15 +02:00
Camilla Berglund
9bc6b7f550 Removed addressed bug. 2013-04-24 22:34:09 +02:00
Camilla Berglund
4538a525f0 Added notes on synthetic release events. 2013-04-24 19:51:48 +02:00
Camilla Berglund
11a27de3d3 Added return by setters of previous callback. 2013-04-18 18:20:25 +02: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
948cc0488d Documentation work. 2013-04-16 19:58:48 +02:00
Camilla Berglund
608109c249 Documentation work. 2013-04-14 15:41:34 +02:00
Camilla Berglund
2e8446fe74 Fixed member order in GLFWvidmode. 2013-04-11 01:31:00 +02:00
Camilla Berglund
fa0cbd9a44 Documentation work. 2013-04-11 01:07:07 +02:00
Camilla Berglund
159f9b9526 Changed default cursor mode for fullscreen. 2013-04-11 01:04:13 +02:00
Camilla Berglund
8282a8fbe0 Documentation work. 2013-04-10 23:01:12 +02:00
Camilla Berglund
7b5b33ee3b Documented GLFW_DECORATED. 2013-04-08 15:28:38 +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
Camilla Berglund
e248fb6056 Documentation work. 2013-04-08 03:26:54 +02:00
Camilla Berglund
13ccf7d9de Fixed bullet lists. 2013-04-07 13:50:53 +02:00
Camilla Berglund
129e94da2e Changed cursor pos to double. 2013-04-04 16:29:40 +02: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
2d5fb77c90 Documentation work. 
Added window hints table, added detailed description of all public
functions, added project brief and added missing language to transition
guide.
 2013-03-18 19:11:02 +01:00
Camilla Berglund
23f6176fbf Expanded docs on init and terminate. 2013-03-14 00:00:37 +01:00
Camilla Berglund
378c75d153 Added GLFW_INCLUDE_NONE. 2013-03-13 20:44:00 +01:00
Camilla Berglund
39fe1f1ea6 Documented input modes. 2013-03-12 19:39:36 +01:00
Camilla Berglund
bb10cae0be Added note on outstanding bug. 2013-03-12 19:39:25 +01:00
Camilla Berglund
401033c257 Begun adding notes on API changes. 2013-03-12 19:17:07 +01:00
Camilla Berglund
67df2ce98d Removed fixed bug from list. 2013-03-12 18:58:27 +01:00
Camilla Berglund
71d2b574f8 Converted docs to hybrid Markdown. 2013-03-12 15:33:05 +01:00
Camilla Berglund
64afb193e8 Removed return value of close callback. 2013-03-06 23:29:37 +01:00
Camilla Berglund
a59c82c71e Documentation tag fix. 2013-03-01 15:20:29 +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
f8f81e5754 Documentation work. 2013-02-28 21:49:24 +01:00
Camilla Berglund
5d6256c649 Documented error return values. 2013-02-25 17:53:02 +01:00
Camilla Berglund
182e0afe25 Made character unsigned. 2013-02-25 17:02:28 +01:00
Camilla Berglund
fb8f3fd521 Added external documentation files. 
Added initial quick tutorial, compatibility appendix, transition guide
and external main page.
 2013-02-25 14:09:57 +01:00
Camilla Berglund
8954af61d3 Documented known bugs. 2013-02-20 19:45:52 +01:00
Camilla Berglund
253e0d6b23 Added GLFW_REPEAT. 2013-02-15 13:21:11 +01:00
Camilla Berglund
a933d8c109 Added GLFW_INCLUDE_ES3. 2013-02-14 19:28:59 +01:00
Camilla Berglund
b48128f339 Tagged functions one may not call from callbacks. 2013-02-14 19:08:34 +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
92a71e07d3 Made gamma ramp functions per-monitor. 2013-02-12 14:03:51 +01:00
Camilla Berglund
52f718d026 Fixed inconsistent coordinate parameter names. 2013-02-12 12:31:41 +01:00
Camilla Berglund
984539cbd4 Documentation formatting. 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
dba2d80009 Documentation work. 2013-02-04 12:33:09 +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
2fca5c5df1 Formatted public header, removed per-token docs. 
Some tokens are used for more than one purpose, making it difficult to write
good documentation on the token itself.  These tokens should instead be
described in the documentation for each function or callback that uses them.
 2013-01-25 00:43:07 +01:00
Camilla Berglund
d406b48007 Added constraints subheading. 2013-01-17 18:59:35 +01:00
Camilla Berglund
9492fc5cc1 Documentation work (fixed all Doxygen warnings). 2013-01-17 18:59:35 +01:00
Camilla Berglund
cc45a9e53d Updated native API and merged into related files. 2013-01-15 22:38:14 +01:00
Camilla Berglund
f8df91d815 Inclusion guard fixes. 2013-01-15 02:00:03 +01:00
Camilla Berglund
1856251ffe Added documentation for native API. 2013-01-15 01:41:58 +01:00
Camilla Berglund
1bd59844c8 Documentation work. 2013-01-13 22:06:57 +01:00
Camilla Berglund
9bfb925d1a Documentation updates. 2013-01-07 17:22:02 +01: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
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
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
948be592be Documented callback clearing at window destruction time. 2012-12-27 18:26:51 +01:00
Camilla Berglund
f558563621 Merge branch 'master' into multi-monitor 2012-12-27 18:22:45 +01:00
Camilla Berglund
ed9e403750 Documentation work. 2012-12-23 15:59:09 +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
1395ec2269 Documentation work. 2012-12-22 19:21:35 +01:00
Camilla Berglund
f98d3a250f Added documentation cross-references to some tokens. 2012-12-22 18:40:35 +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
37904dc68a Documentation work. 2012-12-12 16:05:45 +01:00
Camilla Berglund
e38b752465 Made arrays returned by public API const. 2012-12-02 21:08:26 +01:00
Camilla Berglund
1b59002682 Formatting. 2012-12-02 21:07:23 +01:00
Camilla Berglund
deb0b3d693 Added more monitor API documentation. 2012-12-02 21:00:15 +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
0aaa120f12 Merge branch 'EGL' 2012-12-02 19:02:49 +01:00
Camilla Berglund
d4a08b10fd Documented joystick name caveat. 2012-12-02 17:13:41 +01:00
Camilla Berglund
14e71833bd Merge branch 'master' into EGL 2012-12-02 17:11:17 +01:00
Camilla Berglund
7d9b5c0127 Added documentation for glfwGetJoystickName. 2012-12-02 16:55:09 +01:00
Camilla Berglund
821997ad55 Merge branch 'master' into joystickname 2012-12-02 16:36:44 +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
a3ff29af36 Documentation updates. 2012-12-02 15:47:10 +01:00
Camilla Berglund
1a3d47d06d Added window position callback. 2012-11-30 13:58:05 +01:00
Camilla Berglund
5f68e12b52 Added some documentation for the monitor API. 2012-11-27 17:26:50 +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
4ce92262f7 Reverted bad edit. 2012-11-27 14:31:10 +01:00
Camilla Berglund
10cc85343a Formatting. 2012-11-27 13:38:21 +01:00
Camilla Berglund
0f0f7f7294 Merge branch 'EGL' of github.com:elmindreda/glfw into EGL 
Conflicts:
	include/GL/glfw3.h
 2012-11-27 12:23:25 +01:00