Camilla Berglund
316ee1d77d
Made glfwGetVideoMode return a GLFWvidmode.
2013-01-05 22:07:06 +01:00
Camilla Berglund
9af960e2dd
Made the pointer-ness of object handles explicit.
2013-01-05 21:13:28 +01:00
Camilla Berglund
279c32e3f9
Merge branch 'master' of github.com:elmindreda/glfw
...
Conflicts:
CMakeLists.txt
src/egl_context.c
2013-01-05 18:37:12 +01:00
Jon Morton
7cb6b245e8
Fix invalid variable declarations in win32_monitor.c
...
This fixes build errors in visual studio on windows.
2013-01-04 19:14:27 -06:00
Camilla Berglund
478347004d
Cleanup.
2013-01-04 07:46:44 +01:00
Camilla Berglund
baf3feb86d
Removed panning hack only needed by Xxf86vm.
2013-01-04 07:12:15 +01:00
Camilla Berglund
68098f44db
Cleanup.
2013-01-04 07:11:30 +01:00
Camilla Berglund
7ff86576e3
Removed EGL dlopen.
2013-01-04 06:59:07 +01:00
Camilla Berglund
2757b0fa6f
Removed unused code and duplicate variables.
2013-01-04 06:42:37 +01:00
Camilla Berglund
b35855cfb5
Formatting.
2013-01-04 03:56:33 +01:00
Camilla Berglund
1aa34606e7
Fixes for use with the AMD EGL/GLES SDK.
2013-01-04 03:54:52 +01:00
Camilla Berglund
0d7c2f73fc
Merge branch 'master' of github.com:elmindreda/glfw
2013-01-04 00:08:49 +01:00
Camilla Berglund
dad152b3f6
Removed broken RandR event selection.
2013-01-03 21:07:11 +01:00
Camilla Berglund
7049f73b7d
Connected monitor API with Cocoa mode setting.
2013-01-03 20:11:41 +01:00
Camilla Berglund
4ab93ee155
Removed use of removed token.
2013-01-03 20:01:56 +01:00
Camilla Berglund
46c1e4028f
Begun integrating mode setting and monitor API.
2013-01-03 17:56:59 +01:00
Camilla Berglund
1bc91bfe5b
Formatting.
2013-01-02 17:07:04 +01:00
Camilla Berglund
3817771a40
Started adding documentation for internal APIs.
2013-01-02 03:42:20 +01:00
Camilla Berglund
d1132cb3d1
Fixed Win32 joystick name memory leak.
2013-01-02 01:52:28 +01:00
Camilla Berglund
b72a97d531
Renamed global struct and substructs.
...
Renamed _glfwLibrary to _glfw and made all substructs lower-case, making
global variable names easier to read and type. Partially inspired by the
internal naming conventions of glwt.
2013-01-02 01:44:57 +01:00
Camilla Berglund
4305c76049
Removed monitor user pointer.
2013-01-02 00:41:37 +01:00
Camilla Berglund
835f00eb10
Merge branch 'master' into multi-monitor
...
Conflicts:
include/GL/glfw3.h
readme.html
src/fullscreen.c
src/internal.h
src/window.c
src/x11_fullscreen.c
2012-12-31 21:13:10 +01:00
Camilla Berglund
1790194828
Renamed _glfwInputError and moved to event API.
2012-12-31 21:05:28 +01:00
Camilla Berglund
21f41a2bb7
Renamed GLFW_SAMPLES and GLFW_SHOULD_CLOSE.
2012-12-31 19:55:41 +01:00
Camilla Berglund
02598570cb
Removed unused struct member.
2012-12-31 04:12:16 +01:00
Camilla Berglund
fc5235cd2e
Added todo.
2012-12-31 04:06:01 +01:00
Camilla Berglund
cf42282cfb
Added generic video mode selection.
2012-12-31 03:04:04 +01:00
Camilla Berglund
52dac79219
Ripped out horribly broken refresh rate mess.
2012-12-31 02:06:19 +01:00
Camilla Berglund
8db1528c74
Added explicit disabling of platform glext.h.
2012-12-30 23:19:38 +01:00
Camilla Berglund
23c6def880
Merge branch 'master' into multi-monitor
...
Conflicts:
src/cocoa_window.m
src/init.c
tests/iconify.c
tests/reopen.c
2012-12-30 22:18:15 +01:00
Camilla Berglund
9e9457767f
Added workaround for broken Mesa GLX_ARB_create_context_profile.
2012-12-30 18:13:04 +01:00
Camilla Berglund
ea1ddfd7a4
Removed declarations of removed functions.
2012-12-30 02:28:52 +01:00
Camilla Berglund
9cc8fc0d0a
Removed glfwGetError and glfwErrorString.
...
The cached error code cannot be made per-thread unless it required
glfwInit (due to lack of __thread on OS X), which would be confusing and
partially defeats the purpose of it.
Beginners would use the generic error string facility instead of the
error callback and then be confused by its nondescript messages.
Storing the provided error code from within the error callback, whether
globally or per-thread, requires just a few lines of code and hands
control to the user without compromising thread safety.
2012-12-30 01:50:03 +01:00
Camilla Berglund
9af61d06cf
Removed return value of _glfwPlatformTerminate.
2012-12-30 01:15:48 +01:00
Camilla Berglund
a8403c10d3
Moved NSGL context creation to proper module.
2012-12-30 00:58:18 +01:00
Camilla Berglund
0a7a57b74f
Moved internal API functions to correct section.
2012-12-30 00:45:22 +01:00
Camilla Berglund
20af66f271
Added OOM error reporting to X11 mode enumeration.
2012-12-29 20:01:33 +01:00
Camilla Berglund
18854d16db
Removed legacy video mode generation.
2012-12-27 21:13:04 +01:00
Camilla Berglund
45df65eb91
Formatting.
2012-12-27 19:29:09 +01:00
Camilla Berglund
b66e1de97c
Added saving of monitor mode count.
2012-12-27 18:37:55 +01:00
Camilla Berglund
f558563621
Merge branch 'master' into multi-monitor
2012-12-27 18:22:45 +01:00
Camilla Berglund
be7ad339f7
Added clearing of callbacks on window destruction.
2012-12-23 16:08:17 +01:00
Camilla Berglund
648655aa5b
Fixed RandR primary monitor detection.
2012-12-22 23:35:45 +01:00
Camilla Berglund
692f34b536
Merge branch 'master' into multi-monitor
...
Conflicts:
include/GL/glfw3.h
src/window.c
tests/glfwinfo.c
2012-12-22 19:40:15 +01:00
Camilla Berglund
b9acb777e5
EGL context creation cleanup.
2012-12-16 17:04:43 +01:00
Camilla Berglund
bd31ea0a69
WGL context option cleanup.
2012-12-13 22:50:55 +01:00
Camilla Berglund
cf38b34f45
GLX context option cleanup.
2012-12-13 21:35:59 +01:00
Camilla Berglund
d11558e7e4
Fixed corruption of robustness strategy hint.
2012-12-13 20:01:57 +01:00
Camilla Berglund
8c6511085a
Corrected eglext.h path.
2012-12-13 19:35:11 +01:00
Camilla Berglund
9c0e19adca
Made error message tags more consistent.
2012-12-13 19:18:04 +01:00
Camilla Berglund
9a659c287e
Fixed context param readback.
2012-12-13 19:07:19 +01:00
Camilla Berglund
a8a0585164
Updated debug context detection.
2012-12-13 17:33:08 +01:00
Camilla Berglund
fd0f06de8a
Formatting.
2012-12-13 17:22:56 +01:00
Camilla Berglund
247a875435
Updated version verification.
2012-12-13 17:13:10 +01:00
Camilla Berglund
d22d55ed02
Updated error message to match updated spec.
2012-12-13 02:36:18 +01:00
Camilla Berglund
7be7da16af
Merge branch 'master' into multi-monitor
...
Conflicts:
include/GL/glfw3.h
2012-12-13 02:23:38 +01:00
Camilla Berglund
3f5843f500
Renamed tokens used for other client APIs.
2012-12-13 02:22:39 +01:00
Camilla Berglund
052c587dd5
Shortened monitor-related tokens.
2012-12-13 01:56:33 +01:00
Camilla Berglund
55f7813d68
Merge branch 'master' into multi-monitor
2012-12-13 01:50:09 +01:00
Camilla Berglund
94e9b3adff
Added include required for free.
2012-12-12 13:59:53 +01:00
Camilla Berglund
b30def90e4
...and the other half of making it const.
2012-12-02 21:18:01 +01:00
Camilla Berglund
73cdc34df7
Merge branch 'master' into multi-monitor
...
Conflicts:
CMakeLists.txt
readme.html
src/CMakeLists.txt
src/cocoa_platform.h
src/win32_platform.h
src/x11_platform.h
tests/events.c
2012-12-02 20:52:03 +01:00
Camilla Berglund
ccdb776cc3
Cleanup of configuration variable use.
2012-12-02 19:13:01 +01:00
Camilla Berglund
47c11b4ea6
Tweaked comment.
2012-12-02 19:02:32 +01:00
Camilla Berglund
5da8ed250a
Cleanup of backend option strings.
2012-12-02 19:01:20 +01:00
Camilla Berglund
14e71833bd
Merge branch 'master' into EGL
2012-12-02 17:11:17 +01:00
Camilla Berglund
0bac579506
Formatting.
2012-12-02 16:53:28 +01:00
Camilla Berglund
3a773342e8
Renamed struct member to match other platforms.
2012-12-02 16:52:40 +01:00
Camilla Berglund
821997ad55
Merge branch 'master' into joystickname
2012-12-02 16:36:44 +01:00
Camilla Berglund
280782a2a5
Added explicit non-support for sRGB on EGL.
2012-12-02 16:29:56 +01:00
Camilla Berglund
da02844457
Merge branch 'master' into EGL
...
Conflicts:
readme.html
src/win32_platform.h
src/x11_platform.h
2012-12-02 16:17:59 +01:00
Camilla Berglund
69a900592e
Added explicit support for sRGB framebuffers.
2012-12-02 16:10:00 +01:00
Camilla Berglund
1a3d47d06d
Added window position callback.
2012-11-30 13:58:05 +01:00
Camilla Berglund
41bc0d18f4
Merge branch 'master' into multi-monitor
...
Conflicts:
include/GL/glfw3.h
readme.html
src/CMakeLists.txt
src/win32_window.c
src/window.c
src/x11_window.c
tests/clipboard.c
tests/defaults.c
tests/events.c
tests/fsfocus.c
tests/glfwinfo.c
tests/joysticks.c
tests/peter.c
tests/sharing.c
tests/tearing.c
tests/title.c
tests/windows.c
2012-11-27 16:55:04 +01:00
Camilla Berglund
1eef0f0869
Renamed context module files.
2012-11-27 15:21:49 +01:00
Camilla Berglund
5ea3591586
Cocoa NSGL fixes.
2012-11-27 15:17:24 +01:00
Camilla Berglund
34d383399c
Finished initial window/context backend split.
2012-11-27 15:02:26 +01:00
Camilla Berglund
10cc85343a
Formatting.
2012-11-27 13:38:21 +01:00
Camilla Berglund
7e9286c1fa
Removed unused stub.
2012-11-27 13:10:14 +01:00
Camilla Berglund
b934cdf573
Begun preparations for Win32 EGL support.
2012-11-27 13:07:26 +01:00
Camilla Berglund
e4ddcefc14
Merge branch 'master' into EGL
...
Conflicts:
CMakeLists.txt
include/GL/glfw3.h
readme.html
src/CMakeLists.txt
src/cocoa_window.m
src/config.h.in
src/glx_opengl.c
src/internal.h
src/opengl.c
src/window.c
tests/glfwinfo.c
2012-11-27 12:21:54 +01:00
Camilla Berglund
fc69721807
Tagged comment.
2012-11-23 12:02:09 +01:00
Camilla Berglund
06c191feea
Updated error codes to better reflect multi-API support.
2012-11-23 12:00:49 +01:00
Camilla Berglund
2a166c5086
Removed glfwCopyContext to map better against EGL.
2012-11-22 20:16:48 +01:00
Camilla Berglund
998cb5144e
Made glfwSetCursorPos fail silently if lacking focus.
2012-11-22 17:20:16 +01:00
Camilla Berglund
c479124e69
Removed key repeat.
2012-11-22 17:14:50 +01:00
Camilla Berglund
b8c16e49f1
Removed window size DWIM.
2012-11-22 17:04:54 +01:00
Camilla Berglund
14355d692f
Fixed active/focused nomenclature mixing.
2012-11-22 17:04:44 +01:00
Camilla Berglund
26abe0a6e3
Merge branch 'master' of github.com:elmindreda/glfw
2012-11-11 02:09:08 +01:00
m@bitsnbites.eu
1c21fc1383
Removed GLFW_SYSTEM_KEYS from the GLFW API
...
Rationale: Disabling system commands is inherently
dangerous, and should not be encouraged. Also, it's very
difficult to define and implement a reliable and
consistent cross-platform mechanism.
2012-11-10 22:20:47 +01:00
m@bitsnbites.eu
424e7c7b53
Removed glfwSetWindowPos and glfwGetWindowPos
...
glfwGetWindowPos is superseded by glfwGetWindowParam()
with GLFW_POSITION_X and GLFW_POSITION_Y as parameters.
glfwSetWindowPos can easily lead to bad practices
(moving windows around without the users consent), and
has been replaced with the GLFW_POSITION_X/Y window
hints that allow setting the window position for a
newly created window.
2012-11-10 22:19:55 +01:00
m@bitsnbites.eu
c9f4dedd96
Introduced window positioning hints and window position properties
2012-11-10 22:19:55 +01:00
Camilla Berglund
e82683d498
Merge branch 'master' into multi-monitor
2012-11-08 16:29:56 +01:00
Camilla Berglund
875a169792
Added missing test for joystick presence.
2012-11-08 16:26:43 +01:00
Camilla Berglund
7eff6b1b1e
Initial implementation of joystick name retrieval on Win32.
2012-11-08 16:26:15 +01:00
Camilla Berglund
a4b3a18755
Formatting.
2012-11-08 16:06:23 +01:00
Camilla Berglund
1fd9428287
Merge branch 'master' into joystickname
...
Conflicts:
src/x11_joystick.c
2012-11-08 15:55:25 +01:00
Camilla Berglund
ad7bf4beba
Replaced ad-hoc Linux detection with __linux__.
2012-11-05 16:19:11 +01:00
Camilla Berglund
2b4c556cd0
Merge branch 'master' of github.com:elmindreda/glfw
2012-11-01 16:43:40 +01:00
Camilla Berglund
7c426d1c92
Merge branch 'master' into multi-monitor
...
Conflicts:
examples/wave.c
src/init.c
src/internal.h
src/window.c
tests/accuracy.c
tests/events.c
tests/reopen.c
2012-11-01 00:07:01 +01:00
Camilla Berglund
4fc32a4bbf
Comment fix.
2012-10-31 16:11:09 +01:00
Camilla Berglund
a9d1fdfc44
Fixed VC++ warnings.
2012-10-30 17:37:34 +01:00
Camilla Berglund
4c5de7a7b0
Fixed selection flag not being used.
2012-10-30 17:20:16 +01:00
Camilla Berglund
18d71c2b6d
Made window-related callbacks per-window.
...
This makes polymorphic behaviour easier to implement and avoids the problem of
events being triggered before the GLFW window object is fully usable.
2012-10-29 13:36:01 +01:00
Camilla Berglund
d68acb78bf
Removed registering glfwTerminate with atexit.
...
Functions registered with atexit are called from the thread calling exit.
glfwTerminate should only be called from the main thread. Mistakes should be
explicit.
2012-10-22 03:20:16 +02:00
Camilla Berglund
5df4df6ca4
Added glfwDefaultWindowHints.
2012-10-22 03:16:14 +02:00
Camilla Berglund
0e170f4902
Merge branch 'master' into multi-monitor
2012-10-22 02:46:06 +02:00
Camilla Berglund
2108360671
Removed 'screen' from monitor nomenclature.
2012-10-22 02:39:22 +02:00
Camilla Berglund
422618d67f
Added missing X extension test.
2012-10-22 00:55:36 +02:00
Camilla Berglund
9f26500f32
Removed VidMode mode setting code path.
2012-10-22 00:53:34 +02:00
Camilla Berglund
7e225281af
Fixed RandR per-monitor resolution enumeration.
2012-10-22 00:48:52 +02:00
Camilla Berglund
6fc6c93223
Implemented RandR monitor mode retrieval.
2012-10-22 00:05:55 +02:00
Camilla Berglund
d75c06a994
Added missing screen resource cleanup.
2012-10-21 23:55:41 +02:00
Camilla Berglund
8176cae1bc
Fixed position of fullscreen windows on X11.
2012-10-21 23:45:03 +02:00
Camilla Berglund
467d501621
Cleanup of context clearing during window destruction.
2012-10-21 21:57:29 +02:00
Camilla Berglund
b87157ccc1
Merge branch 'master' of github.com:elmindreda/glfw
2012-10-21 21:32:51 +02:00
Camilla Berglund
c1dcd29c71
Fixed potential clearing of wrong context.
2012-10-21 21:30:13 +02:00
Camilla Berglund
c3195746d8
Formatting.
2012-10-21 16:23:36 +02:00
Camilla Berglund
d0afa65813
Formatting.
2012-10-21 16:17:20 +02:00
Camilla Berglund
da31167193
Renamed glfwGetMonitorString to glfwGetMonitorName.
2012-10-18 23:01:41 +02:00
Camilla Berglund
c1bb1d8a6e
Merge branch 'master' into multi-monitor
...
Conflicts:
tests/iconify.c
2012-10-18 18:42:45 +02:00
Camilla Berglund
ccec055ff7
Formatting.
2012-10-18 17:54:55 +02:00
Camilla Berglund
550b0c177d
Added missing initial value.
2012-10-18 16:25:15 +02:00
Camilla Berglund
e6556c7f34
Comment grammar fix.
2012-10-17 17:11:56 +02:00
Camilla Berglund
d6210b11f3
Formatting.
2012-10-05 05:42:47 +02:00
Camilla Berglund
6ac7af38d9
Began using monitor position for window placement.
2012-10-05 04:10:42 +02:00
Camilla Berglund
2bb62a1467
Bug fix formatting.
2012-10-04 04:08:53 +02:00
Camilla Berglund
ae5da60c18
Fixed test for wrong client API.
2012-10-04 04:05:37 +02:00
Camilla Berglund
f236fc2f61
Fixed X11 hidden cursor mode.
2012-10-02 18:03:21 +02:00
Camilla Berglund
ddeca47117
Removed executable flag from header.
2012-10-02 17:25:37 +02:00
Camilla Berglund
88fb5c1cf3
Merge branch 'master' into multi-monitor
2012-10-02 17:24:50 +02:00
Camilla Berglund
26480901fd
Added glfwGetWindowMonitor.
2012-10-02 17:24:18 +02:00
Camilla Berglund
21a015778f
Replaced malloc and memset with calloc.
2012-10-02 17:07:59 +02:00
Camilla Berglund
ff09d3a343
Merge branch 'master' into multi-monitor
2012-10-02 03:11:32 +02:00
Camilla Berglund
5fcfcb2ddc
Updated comment.
2012-09-30 15:53:20 +02:00
Camilla Berglund
d00c194f4a
Added 8 bits of stencil to defaults.
2012-09-30 15:51:59 +02:00
Camilla Berglund
c764ae81e8
Added missing window parameter return.
2012-09-30 15:43:26 +02:00
Camilla Berglund
38cad9aff0
Added client API window hint.
...
This is cherry-picked from the EGL branch in preparation for the EGL backend.
2012-09-30 15:32:50 +02:00
Camilla Berglund
bf8639e49f
Removed unused struct member.
2012-09-30 14:54:58 +02:00
Camilla Berglund
508c7fe0e6
Merge branch 'master' into multi-monitor
...
Conflicts:
src/window.c
2012-09-27 23:32:26 +02:00
Camilla Berglund
1be1636326
Begun integrating monitor and window.
2012-09-27 21:38:35 +02:00
Camilla Berglund
fe0cc512a2
Added missing cast.
2012-09-27 15:18:57 +02:00
Camilla Berglund
7fa27f1e98
Fixed warnings on VC++.
2012-09-27 02:49:20 +02:00
Camilla Berglund
c5f7eff190
Fixed use of functions missing on VC++.
2012-09-27 02:35:19 +02:00
Camilla Berglund
85cfc6bdd0
Merge branch 'master' into joystickname
...
Conflicts:
src/x11_joystick.c
2012-09-23 15:46:42 +02:00
Camilla Berglund
9d6945a766
Merge branch 'master' into EGL
...
Conflicts:
CMakeLists.txt
include/GL/glfw3.h
readme.html
src/CMakeLists.txt
src/internal.h
src/window.c
2012-09-23 15:35:45 +02:00
Camilla Berglund
7aaeb6955b
Merge branch 'master' into multi-monitor
...
Conflicts:
src/x11_window.c
2012-09-23 15:26:53 +02:00
Camilla Berglund
c0dcb5a056
Fixed fullscreen regressions.
2012-09-23 15:08:43 +02:00
Camilla Berglund
6a5ebbc870
Merge branch 'master' into multi-monitor
2012-09-23 14:44:56 +02:00
Camilla Berglund
718af531a3
Fixed order of operations.
2012-09-23 14:08:36 +02:00
Camilla Berglund
d6d5fb2684
Simplified character input.
2012-09-19 13:17:53 +02:00
Camilla Berglund
14f00ffa67
Removed unused struct member.
2012-09-16 12:43:33 +02:00
Camilla Berglund
b711b2fc72
Formatting.
2012-09-16 12:42:51 +02:00
Camilla Berglund
a2dab25b06
Added fallback for X11 monitor size.
2012-09-13 22:04:01 +02:00
Camilla Berglund
dbd4d1657e
Formatting.
2012-09-13 21:57:42 +02:00
Camilla Berglund
20a49a7eee
Improved handling of primary monitor.
2012-09-13 17:46:40 +02:00
Camilla Berglund
a0305affeb
Began implementing multi-monitor on Cocoa.
2012-09-13 16:37:06 +02:00
Camilla Berglund
633839502c
Fixed various VC++ warnings.
2012-09-13 00:05:54 +02:00
Camilla Berglund
5bbbf8640e
Formatting.
2012-09-12 23:03:15 +02:00
Camilla Berglund
b4493dd3bc
Removed paranoid error check.
2012-09-12 23:03:07 +02:00
Camilla Berglund
4f8f6c7d89
Fixed monitor enumeration on Win32.
2012-09-12 22:51:55 +02:00
Camilla Berglund
1071966d55
Merge branch 'master' into multi-monitor
...
Conflicts:
src/CMakeLists.txt
src/fullscreen.c
2012-09-12 21:42:21 +02:00
Camilla Berglund
4408d2134c
Added use of standard lParam macros.
2012-09-12 21:37:36 +02:00
Camilla Berglund
18392837ac
Formatting.
2012-09-12 21:34:23 +02:00
Camilla Berglund
1d6d6bc3c6
Moved display closing to after GL terminate.
2012-09-12 21:25:52 +02:00
Camilla Berglund
c4d5da0090
Moved DllMain into Win32 init module.
2012-09-12 21:23:04 +02:00
Camilla Berglund
6ac58da26e
Narrowed criteria for non-standard inclusion.
2012-09-12 21:18:59 +02:00
Camilla Berglund
55419bda67
Merged fullscreen and monitor modules.
2012-09-12 21:04:24 +02:00
Camilla Berglund
c87829ea61
Added allocation failure check.
2012-09-12 20:54:45 +02:00
Camilla Berglund
ea664c8a39
Added comments.
2012-09-12 20:54:12 +02:00
Camilla Berglund
c83b336a4c
Formatting.
2012-09-12 20:53:57 +02:00
Camilla Berglund
fa4f6b43f6
Added monitor stubs for Cocoa.
2012-09-12 20:44:08 +02:00
Camilla Berglund
830f2b439c
Cleanup.
2012-09-12 20:41:14 +02:00
Camilla Berglund
83f5b920b9
Merge branch 'master' into multi-monitor
...
Conflicts:
.gitignore
src/CMakeLists.txt
src/x11_window.c
2012-09-12 06:04:17 +02:00
Camilla Berglund
64c677be9e
Renamed config macro to match convention.
2012-09-12 03:17:50 +02:00
Camilla Berglund
e15e92b583
Fixed function grouping.
2012-09-11 23:56:44 +02:00
Camilla Berglund
0e2b12be43
Corrected comment.
2012-09-11 23:53:10 +02:00
Camilla Berglund
023b816bcc
Disallowed hiding of fullscreen windows.
2012-09-11 23:51:45 +02:00
Camilla Berglund
dcc3d67158
Merge branch 'showwindow'
2012-09-11 20:03:55 +02:00
Camilla Berglund
7be55239e7
Disabled native API by default.
2012-09-11 20:02:13 +02:00
Camilla Berglund
0272ce2e98
Merge branch 'master' into EGL
...
Conflicts:
src/glx_opengl.c
src/opengl.c
tests/glfwinfo.c
2012-09-09 19:52:33 +02:00
Camilla Berglund
7493bbe0c8
Removed X11 prefix from EGL and GLX files.
2012-09-09 19:33:40 +02:00
Camilla Berglund
74488bec67
Further isolated X11-specific parts of EGL code.
2012-09-09 19:21:14 +02:00
Camilla Berglund
0ca1e67d7a
Moved X11-specific defines to X11 header.
2012-09-09 19:03:17 +02:00
Camilla Berglund
dd69985649
Fixed API error tags.
2012-09-09 19:01:48 +02:00
Camilla Berglund
feef05f839
Removed superfluous inclusion.
2012-09-09 14:22:14 +02:00
Camilla Berglund
9f94286c9a
Merge branch 'master' into showwindow
...
Conflicts:
readme.html
2012-09-08 21:20:45 +02:00
Camilla Berglund
bd70e53352
Added missing flags for size hints.
2012-09-08 21:13:31 +02:00
Camilla Berglund
b4d0223faa
Formatting.
2012-09-07 15:48:03 +02:00
Camilla Berglund
4cb569b5b3
Replaced guessing with dirent and regex.
2012-09-07 15:27:41 +02:00
Camilla Berglund
e70ced5e05
Fixed bad editing in Cocoa joystick code.
2012-09-07 02:15:54 +02:00
Camilla Berglund
93a1d1c226
Added stubs, implemented on Linux and Cocoa.
2012-09-07 01:01:34 +02:00
Camilla Berglund
8cf093a19d
Linux joystick fixes.
2012-09-07 01:01:17 +02:00
Camilla Berglund
1653541aca
Formatting.
2012-09-06 23:03:54 +02:00
Camilla Berglund
ea7ab3e01b
Fixed broken selector signature.
2012-09-06 23:02:33 +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
a3502a7f00
Merge branch 'tls' of github.com:elmindreda/glfw into tls
2012-09-06 15:41:47 +02:00
Camilla Berglund
5e23620c7f
Merge branch 'master' into tls
...
Conflicts:
src/x11_window.c
2012-09-06 15:40:18 +02:00
Camilla Berglund
67390ac2f4
Merge branch 'showwindow' of github.com:elmindreda/glfw into showwindow
2012-09-06 15:33:26 +02:00
Camilla Berglund
9a183090e0
Merge branch 'master' into showwindow
...
Conflicts:
src/window.c
2012-09-06 15:11:50 +02:00
Camilla Berglund
52c27113d3
Shortened PC boolean name.
2012-09-02 15:21:40 +02:00
Camilla Berglund
89b42d084d
Replaced glfwGetDesktopMode with glfwGetVideoMode.
2012-08-30 01:54:01 +02:00
Camilla Berglund
560b6b5a11
Merge branch 'master' into multi-monitor
...
Conflicts:
src/CMakeLists.txt
src/internal.h
src/x11_platform.h
2012-08-29 20:36:07 +02:00
Camilla Berglund
2502e4d6f3
Renamed glfwGetJoystickPos to glfwGetJoystickAxes.
2012-08-29 18:58:16 +02:00
Camilla Berglund
38e4cc3dad
Removed superfluous comments.
2012-08-29 17:29:46 +02:00
Camilla Berglund
cdcf3be462
Removed event debug printfs.
2012-08-29 17:26:54 +02:00
Camilla Berglund
54f1a57f8d
Added channel bit depth hint defaults.
2012-08-29 16:00:54 +02:00
Camilla Berglund
d5ede06859
Removed WS_VISIBLE from creation flags.
2012-08-28 21:37:07 +02:00
Camilla Berglund
54fceaaf64
Clarified result comparison.
2012-08-28 20:24:37 +02:00
Camilla Berglund
53245d754e
Added detection of joystick disconnect on X11.
2012-08-28 20:16:43 +02:00
Camilla Berglund
d0ad28f174
Merge branch 'master' into showwindow
2012-08-28 17:52:31 +02:00
Camilla Berglund
e10d935efe
API tag and error message cleanup.
2012-08-28 15:03:57 +02:00
Camilla Berglund
9696321334
Fixed return value of glfwGetCurrentContext.
2012-08-27 13:52:10 +02:00
Camilla Berglund
2a8b2ccef4
Split internal prototypes into APIs.
2012-08-27 03:55:45 +02:00
Camilla Berglund
035a8f4a49
Merge branch 'master' into tls
...
Conflicts:
src/x11_window.c
2012-08-26 21:56:55 +02:00
Camilla Berglund
bb635729ec
Fixed spelling of GLFW.
2012-08-26 21:29:39 +02:00
Camilla Berglund
aaaac00aa5
Comment fixes.
2012-08-26 21:29:26 +02:00
Camilla Berglund
bd5ff15769
Moved error handling to init module.
2012-08-26 18:49:39 +02:00
Camilla Berglund
85ca7ee184
Shortened comment.
2012-08-26 18:42:59 +02:00
Camilla Berglund
5d52ad1548
Replaced GLFWGLOBAL and _init_c_ with extern.
2012-08-26 18:42:15 +02:00
Camilla Berglund
1839c1c73d
Added joystick API error checks for shared and Linux code.
2012-08-26 18:28:30 +02:00
Camilla Berglund
c28fb4ca0c
Cleaned up Linux joystick code.
2012-08-26 18:15:47 +02:00
Camilla Berglund
2b6080fc20
Merge branch 'master' of github.com:elmindreda/glfw
2012-08-26 15:39:10 +02:00
Camilla Berglund
bf3486f077
Comment updates and formatting.
2012-08-26 15:38:18 +02:00
Camilla Berglund
f6a1bbf782
Added GLFW_VISIBLE to glfwWindowParam.
2012-08-21 21:57:13 +02:00
Camilla Berglund
0e63488b40
Cocoa window visibility fixes.
2012-08-21 21:35:42 +02:00
Camilla Berglund
8bb5c59d2d
Added GLFW_VISIBLE window hint and parameter.
2012-08-21 21:19:01 +02:00
Camilla Berglund
3d2722dc4c
Fixed broken call to glfwShowWindow.
2012-08-21 20:32:44 +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
b77bdea734
Merge pull request #18 from madcad/master
...
Fixed compilation issues on OS X.
2012-08-19 18:28:10 -07:00
Camilla Berglund
3f34b091b8
Gave MinGW link library a .a suffix.
2012-08-16 19:23:54 +02:00
Camilla Berglund
84b2787f0d
Formatting.
2012-08-16 19:11:31 +02:00
Torsten Walluhn
3f39c5ae42
Fixed compiling issues on mac os x with llvm-gcc 4.2
2012-08-14 23:34:26 +02:00
Camilla Berglund
8bf5fc72d0
Merge branch 'master' into multi-monitor
2012-08-14 22:00:43 +02:00
Camilla Berglund
0c92fb8500
Added clearing of global joystick data.
2012-08-14 22:00:11 +02:00
Camilla Berglund
ac653761b9
Formatting.
2012-08-14 21:58:22 +02:00
Camilla Berglund
cd6d957eca
Moved internal API code to proper location.
2012-08-14 21:47:09 +02:00
Camilla Berglund
17cac4bfa0
Formatting.
2012-08-14 16:55:48 +02:00
Camilla Berglund
2b0f8c2f1e
Removed 'device' from monitor callback.
2012-08-14 15:15:51 +02:00
Camilla Berglund
39c171a61d
Merge branch 'master' into multi-monitor
...
Conflicts:
tests/modes.c
2012-08-14 14:02:37 +02:00
Camilla Berglund
9af03e141b
Merge branch 'master' into tls
2012-08-14 14:00:19 +02:00
Camilla Berglund
6399fb19fd
Included malloc.h from files using malloc on Win32.
2012-08-14 13:52:48 +02:00
Camilla Berglund
18a5aba8f1
Implemented TLS for all platforms.
2012-08-13 16:03:44 +02:00
Camilla Berglund
a9ed5b141e
Merge branch 'master' of github.com:elmindreda/glfw
2012-08-12 22:32:55 +02:00
Camilla Berglund
b7be8d90d8
Renamed libglfw3.pc to glfw3.pc.
2012-08-12 22:31:47 +02:00
Camilla Berglund
c9896a2f75
Merge branch 'master' into tls
2012-08-12 16:47:40 +02:00
Camilla Berglund
5ce704e60c
Added missing include.
2012-08-12 16:46:29 +02:00
Camilla Berglund
6c449e6e8f
Formatting.
2012-08-12 16:22:18 +02:00
Camilla Berglund
fd125f7e54
Moved inclusion directive to proper location.
2012-08-12 16:06:22 +02:00