Commit Graph

526 Commits

Author SHA1 Message Date
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
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
06c191feea Updated error codes to better reflect multi-API support. 2012-11-23 12:00:49 +01:00
Camilla Berglund
1e9383d039 Documentation work. 2012-11-23 11:41:53 +01:00
Camilla Berglund
2a166c5086 Removed glfwCopyContext to map better against EGL. 2012-11-22 20:16:48 +01:00
Camilla Berglund
06e7a96c61 Fixed documentation spelling errors. 2012-11-22 19:14:27 +01:00
Camilla Berglund
9ad1d979e9 Conservatively tagged functions confined to main thread. 2012-11-22 19:08:30 +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
bce2cd65e1 Begun outlining reference documentation. 2012-11-22 17:04:30 +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
Jari Vetoniemi
38c4a8ef2d Make it possible to use GLESv1 2012-11-10 00:08:44 +02:00
Camilla Berglund
1fd9428287 Merge branch 'master' into joystickname
Conflicts:
	src/x11_joystick.c
2012-11-08 15:55:25 +01:00
Camilla Berglund
7c426d1c92 Merge branch 'master' into multi-monitor
Conflicts:
	examples/wave.c
	src/init.c
	src/internal.h
	src/window.c
	tests/accuracy.c
	tests/events.c
	tests/reopen.c
2012-11-01 00:07:01 +01:00
Camilla Berglund
18d71c2b6d Made window-related callbacks per-window.
This makes polymorphic behaviour easier to implement and avoids the problem of
events being triggered before the GLFW window object is fully usable.
2012-10-29 13:36:01 +01:00
Camilla Berglund
5df4df6ca4 Added glfwDefaultWindowHints. 2012-10-22 03:16:14 +02:00
Camilla Berglund
2108360671 Removed 'screen' from monitor nomenclature. 2012-10-22 02:39:22 +02:00
Camilla Berglund
da31167193 Renamed glfwGetMonitorString to glfwGetMonitorName. 2012-10-18 23:01:41 +02:00
Camilla Berglund
26480901fd Added glfwGetWindowMonitor. 2012-10-02 17:24:18 +02:00
Camilla Berglund
ff09d3a343 Merge branch 'master' into multi-monitor 2012-10-02 03:11:32 +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
508c7fe0e6 Merge branch 'master' into multi-monitor
Conflicts:
	src/window.c
2012-09-27 23:32:26 +02:00
Camilla Berglund
410a4e29e1 Moved from gl3.h to glcorearb.h. 2012-09-27 22:28:04 +02:00
Camilla Berglund
1be1636326 Begun integrating monitor and window. 2012-09-27 21:38:35 +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
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
93a1d1c226 Added stubs, implemented on Linux and Cocoa. 2012-09-07 01:01:34 +02:00
Camilla Berglund
cbcab56a25 Merge branch 'master' into EGL
Conflicts:
	include/GL/glfw3.h
	src/opengl.c
	src/win32_opengl.c
	src/window.c
	src/x11_fullscreen.c
	src/x11_glx_opengl.c
	src/x11_platform.h
	src/x11_window.c
	tests/glfwinfo.c
2012-09-06 21:05:03 +02:00
Camilla Berglund
9a183090e0 Merge branch 'master' into showwindow
Conflicts:
	src/window.c
2012-09-06 15:11:50 +02:00
Camilla Berglund
a339098bc0 Formatting. 2012-09-02 15:22:56 +02:00
Camilla Berglund
89b42d084d Replaced glfwGetDesktopMode with glfwGetVideoMode. 2012-08-30 01:54:01 +02:00
Camilla Berglund
e0ce920191 Formatting. 2012-08-29 20:39:05 +02:00
Camilla Berglund
560b6b5a11 Merge branch 'master' into multi-monitor
Conflicts:
	src/CMakeLists.txt
	src/internal.h
	src/x11_platform.h
2012-08-29 20:36:07 +02:00
Camilla Berglund
2502e4d6f3 Renamed glfwGetJoystickPos to glfwGetJoystickAxes. 2012-08-29 18:58:16 +02:00
Camilla Berglund
d0ad28f174 Merge branch 'master' into showwindow 2012-08-28 17:52:31 +02:00
Camilla Berglund
f637722fa1 Removed MinGW-w64 hack. 2012-08-27 02:40:26 +02:00
Camilla Berglund
8bb5c59d2d Added GLFW_VISIBLE window hint and parameter. 2012-08-21 21:19:01 +02:00
Camilla Berglund
a2ca095b86 Renamed GLFW_WINDOW_RESIZABLE to GLFW_RESIZABLE.
This matches GLFW_ACTIVE and GLFW_ICONIFIED.
2012-08-21 20:28:36 +02:00
Riku Salminen
596132c3a1 Add glfwShowWindow, glfwHideWindow
Add glfwShowWindow and glfwHideWindow functions to allow explicit
control over show/hide window.

Remove platform specific show window code from _glfwPlatformCreateWindow
but call glfwShowWindow from glfwCreateWindow to avoid breaking things
(for now).
2012-08-21 21:01:57 +03:00
Camilla Berglund
2b0f8c2f1e Removed 'device' from monitor callback. 2012-08-14 15:15:51 +02:00
Camilla Berglund
39c171a61d Merge branch 'master' into multi-monitor
Conflicts:
	tests/modes.c
2012-08-14 14:02:37 +02:00
Camilla Berglund
2410e2aaf4 Replaced automatic closing with window parameter. 2012-08-10 13:31:15 +02:00
Camilla Berglund
2212cd94bf Moved glfwWindowHint to the top of its block. 2012-08-10 13:29:45 +02:00
Camilla Berglund
ddcf5d471e Removed mirroring of default framebuffer attribs. 2012-08-10 13:28:58 +02:00
Camilla Berglund
585a840329 Added window parameter to glfwSwapBuffers. 2012-08-06 18:13:37 +02:00
Camilla Berglund
aff30d0baa Renamed window creation/destruction functions.
Renamed glfwOpenWindow to glfwCreateWindow.
Renamed glfwCloseWindow to glfwDestroyWindow.
Renamed glfwOpenWindowHint to glfwWindowHint.
2012-08-06 17:59:34 +02:00
Camilla Berglund
2972cdfeb1 Removed glfwIsWindow. 2012-08-03 16:20:52 +02:00
Camilla Berglund
854e634fec Merge branch 'master' into multi-monitor
Conflicts:
	include/GL/glfw3.h
	src/CMakeLists.txt
	src/fullscreen.c
	src/internal.h
	src/win32_fullscreen.c
	src/win32_platform.h
	src/x11_fullscreen.c
	tests/modes.c
2012-08-03 02:57:33 +02:00
Camilla Berglund
3c912cbc3c Replaced declaration of wchar_t with stddef.h header. 2012-08-02 21:25:00 +02:00
Camilla Berglund
871e1a70d7 Made video mode retrieval dynamic. 2012-08-02 18:03:43 +02:00
Camilla Berglund
957ecdc9a0 Renamed no current context error to match function. 2012-08-02 15:36:15 +02:00
Camilla Berglund
7d222030da Merge branch 'master' into EGL
Conflicts:
	src/internal.h
	src/opengl.c
	tests/glfwinfo.c
2012-08-02 02:50:17 +02:00
Camilla Berglund
3a72f33541 Removed GLFW_ACCELERATED window parameter. 2012-08-02 01:13:05 +02:00
Camilla Berglund
03d526097d Comment fix. 2012-07-23 00:48:18 +02:00
Camilla Berglund
3f9fa39564 Merge branch 'master' into EGL
Conflicts:
	src/CMakeLists.txt
2012-07-22 16:19:24 +02:00
Camilla Berglund
d83119a874 Added explicit access to native handles. 2012-07-22 15:26:15 +02:00
Camilla Berglund
3b6ec4e775 Added client API window hint. 2012-07-22 01:16:53 +02:00
Camilla Berglund
3fd17741bc Added macro for including the GLES2 header. 2012-07-19 23:20:47 +02:00
Camilla Berglund
c06f838d88 Merge branch 'master' into multi-monitor
Conflicts:
	.gitignore
	examples/CMakeLists.txt
	include/GL/glfw3.h
	src/CMakeLists.txt
	src/internal.h
	src/win32_platform.h
	src/win32_window.c
	src/x11_fullscreen.c
	src/x11_platform.h
	tests/listmodes.c
2012-07-05 16:15:01 +02:00
Camilla Berglund
cef9dea1d2 Unified nomenclature for cursor positions. 2012-06-22 13:57:25 +02:00
Camilla Berglund
2213450840 Renamed GLFW_NO_GLU to GLFW_INCLUDE_GLU. 2012-06-05 23:55:10 +02:00
Camilla Berglund
bf42c3cfbc Made glfwGetProcAddress return a function pointer. 2012-06-05 00:16:40 +02:00
Camilla Berglund
88ce656b1e Removed unused header. 2012-04-13 12:52:07 +02:00
Camilla Berglund
f868712f02 Simplified clipboard API. 2012-04-12 00:51:58 +02:00
Camilla Berglund
3bd54e0b60 Added inclusion of declaration of size_t. 2012-04-09 23:55:44 +02:00
Camilla Berglund
1214fa1157 Formatting. 2012-04-09 16:03:14 +02:00
Camilla Berglund
bf1ada029b Added window parameter to clipboard API. 2012-04-09 16:00:54 +02:00
Camilla Berglund
7044ed6f06 Simplified and made clipboard API more type safe. 2012-04-09 15:54:36 +02:00
Camilla Berglund
490c472328 Removed unused error. 2012-04-09 15:38:26 +02:00
Camilla Berglund
2bc8d442f4 Formatting. 2012-04-09 15:36:39 +02:00
Camilla Berglund
92d4c02e07 Merge branch 'master' into clipboard
Conflicts:
	src/CMakeLists.txt
2012-03-29 13:29:28 +02:00
Camilla Berglund
4ef9aec7e0 Made scrolling deltas floating point. 2012-03-28 21:54:09 +02:00
Camilla Berglund
d022e54934 Merge branch 'master' into clipboard 2012-03-28 14:58:03 +02:00
Camilla Berglund
466246670f Merge branch 'master' into cursor-enter-leave 2012-03-26 13:54:28 +02:00
Camilla Berglund
865aa05ec1 Merge branch 'master' into clipboard
Conflicts:
	src/CMakeLists.txt
	src/libglfw.pc.cmake
2012-03-26 03:04:29 +02:00
Camilla Berglund
cc5d7cda64 Added configuration error check. 2012-03-25 17:43:02 +02:00
Camilla Berglund
2588c9be17 Renamed GLFW_BUILD_DLL to _GLFW_BUILD_DLL. 2012-03-25 17:40:30 +02:00
Camilla Berglund
8d2c2791c2 Added initial Linux MinGW-w64 support. 2012-03-22 16:57:38 +01:00
Camilla Berglund
8109470e72 Merge branch 'master' into cursor-enter-leave 2012-03-22 12:06:00 +01:00
Camilla Berglund
b5a3249f2e Removed unused header. 2012-03-01 03:51:35 +01:00
Tai Chi Minh Ralph Eastwood
5937af089e Merge branch 'master' of github.com:raedwulf/glfw into clipboard
Conflicts:
	src/CMakeLists.txt
	tests/CMakeLists.txt
2012-02-19 06:29:48 +00:00
Camilla Berglund
0c3b1b5a0e Removed allocator. 2012-02-07 14:58:58 +01:00
Camilla Berglund
6b98a04d17 Merge branch 'utf8' into multi-monitor
Conflicts:
	src/CMakeLists.txt
2012-02-04 20:12:28 +01:00
Camilla Berglund
b997db3a8b Removed GLFWthreadmodel and glfwInitWithModels. 2012-02-04 01:38:00 +01:00
Camilla Berglund
609c008a19 Moved input mode functions to top. 2012-02-04 01:34:12 +01:00
Camilla Berglund
ce288a8939 Transformed glfwEnable/Disable/SetCursorMode into glfwGetInputMode/SetInputMode. 2012-02-04 00:51:35 +01:00
Camilla Berglund
c4806b9532 Merged cursor enter/leave callbacks. 2012-01-30 22:59:38 +01:00
Camilla Berglund
1ddafc25a6 Moved new cursor input code to other cursor input code. 2012-01-30 22:30:40 +01:00
Hanmac
0b752b84c3 Added API and X11 implementation of cursor enter and leave callbacks. 2012-01-30 22:19:39 +01:00
Marcel Metz
c7a5474bfc Merged with master. 2012-01-24 18:00:51 +01:00
Camilla Berglund
d0ae6cbe8a Keep APIENTRY public (used by GL_ARB_debug_output). 2012-01-18 17:50:51 +01:00
Camilla Berglund
e81b2decac Removed NULL already defined by stddef.h header. 2011-12-18 17:22:58 +01:00
Marcel Metz
4c6681bad6 Merge branch 'master' into multi-display-support
Conflicts:
	src/CMakeLists.txt
	src/input.c
2011-11-22 16:06:24 +01:00
Camilla Berglund
a18cd1b14c Renamed GLFW_WINDOW_NO_RESIZE to GLFW_WINDOW_RESIZABLE. 2011-11-02 16:56:34 +01:00
Marcel Metz
719962817e Added hexadecimal prefix 0x0006 to monitor related constants. 2011-10-07 00:15:42 -04:00
Camilla Berglund
9738728298 Reshuffling, formatting and shortening. 2011-10-06 23:28:56 +02:00