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
Camilla Berglund
f66e6a6916
Re-enabled cursor re-centering.
2012-08-12 16:05:43 +02:00
Camilla Berglund
208b7f0bb8
Formatting.
2012-08-12 16:04:03 +02:00
Riku Salminen
3d6221c490
Added support for multithreaded use of Xlib.
2012-08-12 15:57:52 +02:00
Camilla Berglund
cd37da470f
Merge branch 'master' into tls
2012-08-12 15:35:06 +02:00
Camilla Berglund
129598eb51
Merge branch 'master' of github.com:elmindreda/glfw
2012-08-12 15:31:34 +02:00
Camilla Berglund
d03c8507e6
Merge branch 'master' into tls
2012-08-12 15:28:26 +02:00
Camilla Berglund
cb447bee81
Cleanup of window resizable flag setting.
2012-08-12 15:28:12 +02:00
Camilla Berglund
25c7ad1706
Removed superfluous MakeContextCurrent.
2012-08-12 14:14:03 +02:00
Camilla Berglund
9e4bc36dd8
Initial TLS implementation (Cocoa broken).
2012-08-12 14:13:18 +02:00
Lambert Clara
c2729181a2
Fix various warnings reported by gcc
...
Shadowed variables, const warnings
2012-08-12 14:02:38 +02:00
Camilla Berglund
ab373308b0
Removed mistaken comment.
2012-08-12 12:50:44 +02:00
jonathan MERCIER
31c0212c25
Able to install to lib64 if LIB_SUFFIX var is set to 64
2012-08-11 17:50:56 +02:00
Camilla Berglund
2f095cc9e3
Removed implicit glfwMakeCurrentContext.
...
Implicitly making the context current makes sense in a
single-window API but less sense in a multi-window one.
2012-08-10 15:29:45 +02:00
Camilla Berglund
2410e2aaf4
Replaced automatic closing with window parameter.
2012-08-10 13:31:15 +02:00
Camilla Berglund
ddcf5d471e
Removed mirroring of default framebuffer attribs.
2012-08-10 13:28:58 +02:00
Camilla Berglund
f71daaa14b
Removed executable flag from source file.
2012-08-07 13:09:31 +02:00
Camilla Berglund
8ed66ea4d5
Removed calling of callbacks from setters.
2012-08-07 12:45:55 +02:00
Riku Salminen
99031a43a2
X11: remove _glfwProcessPendingEvents
...
Remove _glfwProcessPendingEvents, do not call event handlers from
glfwCreateWindow. It is dangerous.
Do not wait for MapNotify event in glfwCreateWindow under X11.
2012-08-06 21:24:53 +03: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
1736132bb2
Fixed window parameter refresh.
2012-08-03 15:21:49 +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
4b9e616cf8
Fixed indexing bug in Cocoa video mode enumeration.
2012-08-02 19:26:00 +02:00
Camilla Berglund
ae586e65d8
Fixed typo.
2012-08-02 19:14:58 +02:00
Camilla Berglund
5f26deaf59
Merge branch 'master' of github.com:elmindreda/glfw
2012-08-02 19:02:42 +02:00
Camilla Berglund
b03e62f6ac
Made X11 resolution enumeration a separate function.
2012-08-02 18:54:47 +02:00
Camilla Löwy Berglund
255e79918e
Merge pull request #11 from arturjpv/master
...
Fixed updateTrackingAreas not calling super.
2012-08-02 09:49:28 -07:00
Camilla Berglund
871e1a70d7
Made video mode retrieval dynamic.
2012-08-02 18:03:43 +02:00
Arturo J. Pérez
287e94cd6b
Behavior differences under Lion and Snow Leopard in updateTrackingAreas.
...
super call added.
According to documentation (NSView Class Reference -> Instance Methods -> updateTrackingAreas):
You should override this method to remove out of date tracking areas and add recomputed tracking areas; your implementation should call super.
2012-08-02 17:45:52 +02:00
Camilla Berglund
957ecdc9a0
Renamed no current context error to match function.
2012-08-02 15:36:15 +02:00
Camilla Berglund
a916997c86
Simplified call to platform-specific extension check.
2012-08-02 15:32:39 +02:00
Camilla Berglund
1bad573c10
Tightened scope of some local variables.
2012-08-02 15:31:08 +02:00
Camilla Berglund
ee3304c09a
Removed check for invalid user, added error setting.
2012-08-02 15:29:13 +02:00
Camilla Berglund
bfc746a847
Error message grammar fix.
2012-08-02 15:14:38 +02:00
Camilla Berglund
ba941b2fc8
Added formatting to error string.
2012-08-02 15:13:57 +02:00
Camilla Berglund
208377d08e
Imported version parsing from EGL branch.
2012-08-02 14:48:06 +02:00
Camilla Berglund
59896c327a
Context property fixes.
2012-08-02 14:42:24 +02:00
Camilla Berglund
f274b329d1
Fixed check for GL_ARB_multisample.
2012-08-02 14:16:07 +02:00
Camilla Berglund
a182acd585
Removed EGL-specific context param refresh.
2012-08-02 03:01:31 +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
053737e660
Use OpenGL to get default framebuffer properties.
2012-08-02 01:37:08 +02:00
Camilla Berglund
3a72f33541
Removed GLFW_ACCELERATED window parameter.
2012-08-02 01:13:05 +02:00
Camilla Berglund
0f1ab5317f
Formatting.
2012-08-01 01:07:08 +02:00
Camilla Berglund
76bd8b79b6
Merge branch 'master' into EGL
...
Conflicts:
src/win32_window.c
tests/glfwinfo.c
2012-08-01 01:04:14 +02:00
Camilla Berglund
302037d5b4
Added stub debug context detection.
2012-07-31 23:52:23 +02:00
Camilla Berglund
669c40f102
Fixed debug context being a hard constraint on WGL.
2012-07-31 23:07:18 +02:00
Camilla Berglund
fc74a5533e
Moved WGL context logic into OpenGL module.
2012-07-31 22:48:28 +02:00
Camilla Berglund
331aa26503
Formatting.
2012-07-31 19:13:27 +02:00
Camilla Berglund
b1de4d6fed
Fixed client API version parsing.
2012-07-31 19:06:48 +02:00
Camilla Berglund
0b25bba5b5
Merge branch 'master' into EGL
2012-07-31 18:55:00 +02:00
Camilla Berglund
6c37c84d91
Reduced the number of conditional blocks.
2012-07-30 20:15:34 +02:00
John Bartholomew
0f0e42b975
Use SOVERSION for shared libraries on Unix-like systems.
2012-07-30 01:04:08 +01:00
John Bartholomew
93ec9fa901
Changed library output name to "glfw3", and pkg-config name to libglfw3.
...
Since the headers are already named differently, this allows
side-by-side installation of GLFW 2.x and GLFW 3.x.
2012-07-30 00:14:09 +01:00
Camilla Berglund
b28298f329
Fixed call to CGPointMake.
2012-07-29 14:07:01 +02:00
Camilla Berglund
a3c4b96c91
Removed commented-out code, added error reporting.
2012-07-23 18:40:31 +02:00
Camilla Berglund
3bb04b3a76
Merge branch 'master' into EGL
2012-07-23 18:04:32 +02:00
Camilla Berglund
52ebc0db85
Fixed use of wrong point type.
2012-07-23 00:50:52 +02:00
Camilla Berglund
dd298ab908
Fixed copypaste errors.
2012-07-23 00:48:30 +02:00
Camilla Berglund
f457223bdf
Minor context creation fixes.
2012-07-22 17:06:37 +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
b069391cc0
Formatting.
2012-07-22 02:01:42 +02:00
Camilla Berglund
ccca5d71fe
Use EGL_KHR_create_context with GLES as well.
2012-07-22 02:00:00 +02:00
Camilla Berglund
bddc95c017
Removed references to GLX in EGL port.
2012-07-22 01:38:15 +02:00
Camilla Berglund
edd554c115
Added support for EGL_KHR_create_context.
2012-07-22 01:33:42 +02:00
Camilla Berglund
3b6ec4e775
Added client API window hint.
2012-07-22 01:16:53 +02:00
Camilla Berglund
e9c82a82b2
Added eglext.h header.
2012-07-21 23:51:44 +02:00
Camilla Berglund
b78fd85e11
Moved glext.h inclusion back.
2012-07-21 23:51:08 +02:00
Camilla Berglund
bd179634dc
Formatting.
2012-07-20 18:11:26 +02:00
Camilla Berglund
ea1506ba67
Fixed EGLConfig nomenclature, simplified refresh.
2012-07-20 18:04:43 +02:00
Camilla Berglund
0f4cdd5194
Fixed invalid attribute list terminator.
2012-07-20 17:40:20 +02:00
Camilla Berglund
2796ecb556
Updated platform API tags.
2012-07-20 03:28:03 +02:00
Camilla Berglund
5417130f96
Added new options to version string.
2012-07-20 03:05:06 +02:00
Camilla Berglund
546124f1fb
Fixed invalid file mode.
2012-07-20 02:10:59 +02:00
Camilla Berglund
1a05d6db70
Renamed GLX implementation file.
2012-07-20 02:10:39 +02:00
Camilla Berglund
c9c94e44d2
Formatting.
2012-07-20 02:08:01 +02:00
Camilla Berglund
ddb497c5d5
Removed hard-coded EGL config limit.
2012-07-20 02:02:20 +02:00
Camilla Berglund
f4880b9206
Merge branch 'multi-monitor' of github.com:elmindreda/glfw into multi-monitor
2012-07-20 01:05:57 +02:00
Camilla Berglund
f559b217af
Merge branch 'master' into multi-monitor
2012-07-20 01:05:09 +02:00
Camilla Berglund
fd688e0332
Formatting.
2012-07-20 00:24:42 +02:00
Camilla Berglund
fd4967b01a
Removed superfluous casts.
2012-07-20 00:17:58 +02:00
Camilla Berglund
d3d972aa9d
Fixed typo in dlopen macro.
2012-07-20 00:15:36 +02:00
Camilla Berglund
251964f84f
Began decoupling EGL code from X11.
2012-07-20 00:14:52 +02:00
Camilla Berglund
26a843043c
Formatting, removed trivial comments.
2012-07-19 23:55:41 +02:00
Camilla Berglund
be12cbca15
Added separate platform headers for EGL and GLX.
2012-07-19 23:06:15 +02:00
Camilla Berglund
311b9df102
Added error for unsupported call.
2012-07-19 22:11:45 +02:00
Jari Vetoniemi
6b1344af3c
Use GLFWglproc return type
2012-07-17 23:06:30 +03:00
Jari Vetoniemi
db0a4b599d
Fix GLubyte warning, by casting to (char*)
2012-07-17 22:29:09 +03:00
Jari Vetoniemi
739be03373
Obey the OPENGL_ES2_PROFILE hint
2012-07-17 22:27:01 +03:00
Jari Vetoniemi
2e7d91ea5a
Only consider OpenGL ES contexes
...
EGL_WINDOW_BIT is compared agaist wrong attribute
2012-07-17 22:27:01 +03:00
Cloudef
5cf8b8d3fa
Remove useless define
2012-07-17 22:27:01 +03:00
Cloudef
2815630688
Reflect X visual changes to EGL code
2012-07-17 22:27:01 +03:00
Cloudef
819b09d479
Add member struct defines for window's context members so code can be shared
2012-07-17 22:25:47 +03:00
Cloudef
478eac2fe0
Create window surface and add fallback for visual info retival
2012-07-17 22:25:47 +03:00
Cloudef
e06515eaa0
Improve OpenGL version parsing from string
2012-07-17 22:25:47 +03:00
Cloudef
28db982d0a
Add x11_fullscreen.c to the source list
2012-07-17 22:25:47 +03:00
Cloudef
d99e2385c1
Add temporary #ifdef in x11_fullscreen so EGL compiles
2012-07-17 22:25:47 +03:00
Cloudef
c878281487
Add EGL platform opengl implentation
2012-07-17 22:25:47 +03:00
Cloudef
812ebe200d
Add EGL X11 platform header
2012-07-17 22:25:47 +03:00
Cloudef
778a76683a
Add EGL X11 platform header
2012-07-17 22:25:47 +03:00
Cloudef
85067ede2e
Add EGL related configurations
2012-07-17 22:25:47 +03:00
Cloudef
1327c124a4
Seperate Context from Window in CMakeLists, add option to build for EGL
2012-07-17 22:25:47 +03:00
Simon Voordouw
173e321ea6
fix MESA_swap_control copy-pasta
2012-07-17 08:28:43 +02:00
Camilla Berglund
aa328c0bbd
Added support for GLX_MESA_swap_interval.
2012-07-15 16:49:05 +02:00
Camilla Berglund
a0429e4b6e
Removed duplicate type declarations.
2012-07-11 00:33:19 +02:00
Camilla Berglund
9498ac52b9
Simplified Win32 video mode enumeration.
2012-07-06 22:52:53 +02:00
Camilla Berglund
c68a4aa2ef
Formatting.
2012-07-06 17:47:09 +02:00
Camilla Berglund
e188f6c4e1
Replaced manual duplication with strdup.
2012-07-06 14:37:02 +02:00
Camilla Berglund
73622a2f3c
Formatting.
2012-07-06 14:36:29 +02:00
Camilla Berglund
db066b4f46
Win32 Unicode fixes.
2012-07-06 14:04:57 +02:00
Camilla Berglund
78bc624ba9
Fixed use of removed functions.
2012-07-05 18:52:06 +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
34c93a5124
Disabled window restoration on Cocoa.
2012-07-02 15:38:29 +02:00
Camilla Berglund
e7c4e77214
Fixed cursor positioning in fullscreen on Cocoa.
2012-07-02 15:23:36 +02:00
Camilla Berglund
ee66e5fa10
Merged fix for bug #3528964 .
2012-07-02 00:36:20 +02:00
Camilla Berglund
cef9dea1d2
Unified nomenclature for cursor positions.
2012-06-22 13:57:25 +02:00
Camilla Berglund
cea0e30499
Fixed cursor centering using wrong mode.
2012-06-21 13:35:35 +02:00
Camilla Berglund
14bcc51f3b
Removed config macro values.
2012-06-12 03:00:16 +02:00
Camilla Berglund
41be34eadf
Fixed window position on Win32.
2012-06-12 02:29:18 +02:00
Camilla Berglund
31b06a0ae0
Win32 window position work.
2012-06-11 14:02:25 +02:00
Camilla Berglund
ed9890f110
Fixed typecast warning.
2012-06-11 13:47:06 +02:00
Camilla Berglund
bf42c3cfbc
Made glfwGetProcAddress return a function pointer.
2012-06-05 00:16:40 +02:00
Camilla Berglund
bc8860dc6a
Made fbconfig conversion more readable.
2012-06-03 16:54:06 +02:00
Camilla Berglund
ae2c63b580
Made fbconfig conversion more readable.
2012-06-03 16:40:54 +02:00
Camilla Berglund
19744bc5de
Added needed include.
2012-06-03 16:33:48 +02:00
Camilla Berglund
fbb2f24ebb
Merge branch 'context-window-split'
...
Conflicts:
src/x11_init.c
src/x11_platform.h
src/x11_window.c
2012-06-03 16:31:56 +02:00
Camilla Berglund
7b4f9f02ca
Commented workaround.
2012-06-03 16:12:35 +02:00
Camilla Berglund
9d5a95add8
Merge branch 'master' of github.com:elmindreda/glfw
2012-06-03 16:09:41 +02:00
Camilla Berglund
fc07e1d7eb
Added workaround for missing window bit in VB GL.
2012-06-03 16:09:13 +02:00
Braden Pellett
6cb89175a7
Emit an error when gamma ramp cannot be get/set due to size not being GLFW_GAMMA_RAMP_SIZE.
2012-06-01 00:08:34 -07:00
Braden Pellett
2558da0b59
Ignore gamma ramp get/set capabilities if size is not GLFW_GAMMA_RAMP_SIZE, similar to what happens currently for the Cocoa implementation.
2012-05-31 17:01:24 -07:00
Camilla Berglund
322407ae9f
Moved X11 gamma ramp termination to gamma module.
2012-05-31 01:34:21 +02:00
Camilla Berglund
20fccd4aa3
Removed unsupported target.
2012-05-24 11:48:50 +02:00
Camilla Berglund
79bef68511
Only restore gamma ramp if it has been changed.
2012-05-24 11:46:51 +02:00
Camilla Berglund
f5eb79ed28
Removed gamma API warning prints.
2012-05-24 11:39:16 +02:00
Camilla Berglund
1a37788143
Moved X11 gamma ramp init to gamma module.
2012-05-24 11:36:43 +02:00
Camilla Berglund
6ff3936101
Fixed source file having executable flag set.
2012-05-07 00:20:53 +02:00
Camilla Berglund
d717c0a5ba
Added bug fix from 2.7.6.
2012-05-07 00:13:38 +02:00
Camilla Berglund
26fc5cacda
Formatting.
2012-05-07 00:11:51 +02:00
Camilla Berglund
904db4c605
Merge branch 'master' of github.com:elmindreda/glfw
2012-04-30 01:59:45 +02:00
Camilla Berglund
a22fbf7e9b
Moved remaining X visual management into opengl module.
2012-04-23 22:31:55 +02:00
Camilla Berglund
f77c8f8b21
Made GLX extension management global instead of per-window.
2012-04-23 13:08:34 +02:00
Camilla Berglund
9614b9b22f
Moved OpenGL init and terminate to opengl module.
2012-04-23 13:00:49 +02:00
Camilla Berglund
49dfbe86b2
Moved the majority of GLX code into opengl module.
2012-04-23 12:50:04 +02:00
Camilla Berglund
1a99827432
Moved the type declarations.
2012-04-22 21:49:38 +02:00
Camilla Berglund
21e77fe1a6
Split platform-specific global data.
2012-04-22 15:53:02 +02:00
Camilla Berglund
2ac8da7465
Merged patch #3519669 .
2012-04-22 12:58:05 +02:00
Camilla Berglund
68122f8134
Merge branch 'master' of github.com:elmindreda/glfw
2012-04-19 16:58:19 +02:00
Camilla Berglund
53fab2f16b
Fixed VC++ errors.
2012-04-17 17:55:11 +02:00
quarnster
a73b45b7a7
Need to include sys/param.h for MAXPATHLEN.
2012-04-16 12:33:34 +03:00
Camilla Berglund
a7d19ed77e
Removed superfluous comment.
2012-04-15 00:40:50 +02:00
Camilla Berglund
4994acb7e1
Removed superfluous test.
2012-04-14 23:01:35 +02:00
Camilla Berglund
bf5b436ca5
Removed unused variables.
2012-04-12 00:55:30 +02:00
Camilla Berglund
f868712f02
Simplified clipboard API.
2012-04-12 00:51:58 +02:00
Camilla Berglund
721e0a7fd0
Clarified comment.
2012-04-11 23:53:47 +02:00
Camilla Berglund
f231ed37f0
Re-worked and fixed X11 clipboard support.
2012-04-11 23:32:50 +02:00
Camilla Berglund
ad48c0e5ef
Added string for new error.
2012-04-10 18:22:15 +02:00
Camilla Berglund
e0c4d81e46
Added function for processing only pending events.
2012-04-10 01:15:50 +02:00
Camilla Berglund
0e9e37bfc4
Simplified string storage.
2012-04-10 00:52:21 +02:00
Camilla Berglund
15e8af1f79
Added initial implementation for Cocoa.
2012-04-10 00:34:08 +02:00
Camilla Berglund
8390121869
Fixed legacy C warnings.
2012-04-09 23:56:14 +02:00
Camilla Berglund
8fe46ac1fe
Formatting.
2012-04-09 23:27:06 +02:00
Camilla Berglund
ab40dab235
Formatting.
2012-04-09 18:00:22 +02:00
Camilla Berglund
ad18589c6c
Added initial implementation for Win32.
2012-04-09 17:55:54 +02:00
Camilla Berglund
877c6337c3
Updated remaining ports.
2012-04-09 16:19:54 +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
2bc8d442f4
Formatting.
2012-04-09 15:36:39 +02:00
Camilla Berglund
952c6b7e82
Merge branch 'master' into clipboard
2012-04-09 15:33:03 +02:00
Camilla Berglund
fcd67c69ec
Simplified clipboard cache layout.
2012-04-09 15:27:32 +02:00
Camilla Berglund
b8676f01db
Clarified clipboard format atom use.
2012-04-09 15:21:54 +02:00
Camilla Berglund
3252829fe0
Replaced iterators with index.
2012-04-09 15:16:56 +02:00
Camilla Berglund
168aba78d4
Formatting.
2012-04-09 15:12:59 +02:00
Camilla Berglund
508207ae04
Removed superfluous function.
2012-04-09 15:04:14 +02:00
Camilla Berglund
d55616661d
Removed support for primary and secondary selections.
2012-04-09 15:00:52 +02:00
Camilla Berglund
77633d8d9a
Added some missing error reporting.
2012-04-06 14:37:40 +02:00
Camilla Berglund
c1dd245d8a
Moved input functions to input section.
2012-04-06 14:37:31 +02:00
Camilla Berglund
b076d858cc
Formatting.
2012-04-05 17:34:13 +02:00
Camilla Berglund
906754d3d0
Removed superfluous assignment.
2012-04-05 17:32:38 +02:00
Camilla Berglund
76615bf237
Moved EWMH logic to library init.
2012-04-05 17:29:08 +02:00
Camilla Berglund
3184e1a70a
Merge branch 'master' of github.com:elmindreda/glfw
2012-04-05 16:52:22 +02:00
Camilla Berglund
61264339a7
Simplified X11 screen handling.
2012-04-05 16:14:01 +02:00
Camilla Berglund
c996b861ba
Merge pull request #2 from fatty/joystick-hats
...
Implemented POV hat support for OS X and Win32.
2012-04-03 09:27:32 -07:00
Camilla Berglund
2753577dbd
Removed dynamic loading of gdi32.
2012-03-30 02:28:15 +02:00
Camilla Berglund
532e0dd2f6
Formatting.
2012-03-30 01:55:28 +02:00
Camilla Berglund
cd44a7182b
Removed re-definitions of Win32 things now ancient.
2012-03-30 01:54:50 +02:00
Matt Arsenault
3bcde7e1cd
Only define Win32 crud macros if not defined already
2012-03-29 17:41:05 -04:00
Camilla Berglund
cbe29b4963
Merge branch 'master' into clipboard
2012-03-29 14:30:21 +02:00
Camilla Berglund
fcf54b4b27
Moved dynamic loading macros to configuration header.
2012-03-29 14:21:04 +02:00
Camilla Berglund
dd8b098387
Moved _GLFW_BUILD_DLL into configuration header.
2012-03-29 14:06:26 +02:00
Camilla Berglund
92d4c02e07
Merge branch 'master' into clipboard
...
Conflicts:
src/CMakeLists.txt
2012-03-29 13:29:28 +02:00
Camilla Berglund
171db6d6cb
Discarded uninteresting scroll events.
2012-03-28 22:39:48 +02:00
Camilla Berglund
c9163e56d1
Merge branch 'master' of github.com:elmindreda/glfw
2012-03-28 21:58:13 +02:00
Camilla Berglund
4ef9aec7e0
Made scrolling deltas floating point.
2012-03-28 21:54:09 +02:00
Camilla Berglund
e4328af790
Formatting.
2012-03-28 16:08:55 +02:00
Camilla Berglund
7f470065fc
Applied coding conventions.
2012-03-28 15:05:17 +02:00
Camilla Berglund
d022e54934
Merge branch 'master' into clipboard
2012-03-28 14:58:03 +02:00
Osman Keskin
f84990bffd
Implemented joystick hat support for OS X and Win32.
2012-03-27 00:24:01 +02:00
Camilla Berglund
77c9baab35
Fixed issues found with static analysis.
2012-03-26 15:29:01 +02:00
Camilla Berglund
d40a3d1617
Renamed Cocoa window object member.
2012-03-26 15:21:41 +02:00
Camilla Berglund
a12b395442
Added headers to project.
2012-03-26 15:21:13 +02:00
Camilla Berglund
c9820b2ba5
Fixed issues found with static analysis.
2012-03-26 15:20:31 +02:00
Camilla Berglund
8e4e70d7a4
Implemented cursor enter/leave for OS X.
2012-03-26 14:46:42 +02:00
Camilla Berglund
466246670f
Merge branch 'master' into cursor-enter-leave
2012-03-26 13:54:28 +02:00
Camilla Berglund
92758e4ac0
Made pkg-config file use version variable.
2012-03-26 13:15:37 +02:00
Camilla Berglund
6fd6c5f7e4
Moved pkg-config file generation.
2012-03-26 03:11:43 +02:00
Camilla Berglund
e53bbfd2dd
Renamed pkg-config file template.
2012-03-26 03:06:45 +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
7fb702a22b
Removed unused code.
2012-03-25 20:45:06 +02:00
Camilla Berglund
2588c9be17
Renamed GLFW_BUILD_DLL to _GLFW_BUILD_DLL.
2012-03-25 17:40:30 +02:00
Camilla Berglund
c097246312
Fixed listing of non-pkg-config libraries.
2012-03-25 17:34:21 +02:00
Camilla Berglund
bd8eb1399a
Put platform detection in a single place.
2012-03-25 16:51:24 +02:00
Camilla Berglund
20e685d37b
Formatted variables not used outside of the local CMake project.
2012-03-25 16:49:15 +02:00
Camilla Berglund
d743793e71
Pkg-config dependency generation fixes.
2012-03-25 14:51:56 +02:00
Camilla Berglund
7b46a184cb
Added standard option to switch between static and dynamic library, dropped dynamic test.
2012-03-25 13:55:39 +02:00
Camilla Berglund
29d38c3b64
Increased Cocoa pixel format attribute array size.
2012-03-23 15:27:50 +01:00
Camilla Berglund
c2a2114590
Fixed GCC warnings.
2012-03-22 23:30:00 +01:00
Camilla Berglund
8d2c2791c2
Added initial Linux MinGW-w64 support.
2012-03-22 16:57:38 +01:00
Camilla Berglund
812ad163eb
Formatting.
2012-03-22 14:29:23 +01:00
Camilla Berglund
742299faaa
Merged implementation for Win32.
2012-03-22 13:17:44 +01:00
Camilla Berglund
8109470e72
Merge branch 'master' into cursor-enter-leave
2012-03-22 12:06:00 +01:00
Camilla Berglund
df1af5ca75
I am POSIXed.
2012-03-20 20:00:04 +01:00
Camilla Berglund
c58750ef92
Applied fix for pixel format creation failure.
2012-03-20 15:30:46 +01:00
Camilla Berglund
61d4cf4f39
Merge branch 'master' of github.com:elmindreda/glfw
2012-03-20 15:24:23 +01:00
Camilla Berglund
eb83a3e8f9
Replaced final deprecated Core Graphics call.
2012-03-20 15:23:35 +01:00
Camilla Berglund
21f2327e56
Formatting.
2012-03-10 16:23:09 +01:00
Camilla Berglund
5fd66f7d30
Free visual list earlier.
2012-03-07 18:38:08 +01:00
Camilla Berglund
339fb7d246
Made key code translation table private to function.
2012-03-07 15:13:41 +01:00
Camilla Berglund
89eec8af09
Made more consistent use of key code conversion.
2012-03-07 15:10:53 +01:00
Camilla Berglund
8155f90bf3
Formatting.
2012-03-07 15:04:14 +01:00
Camilla Berglund
be547da9d2
Replaced more deprecated CoreGraphics calls.
2012-03-06 02:21:01 +01:00
Camilla Berglund
5f854b2bbf
Replaced CFRelease with CGDisplayModeRelease.
2012-03-06 00:58:04 +01:00
Camilla Berglund
a90675c526
Shortened the shortening.
2012-03-05 22:05:40 +01:00
Camilla Berglund
3383e59a73
Renamed function.
2012-03-05 20:30:59 +01:00
Camilla Berglund
cb9bae5c71
Made glfwOpenWindow enforce the forward-compat and profile hints.
2012-03-05 20:27:47 +01:00
Camilla Berglund
e55396d754
Shortened call to setAppleMenu:.
2012-03-05 20:09:06 +01:00
Camilla Berglund
cc15dff98c
Merge branch 'master' of github.com:elmindreda/glfw
2012-03-05 16:29:37 +01:00
Camilla Berglund
7af82fdade
Replaced deprecated CoreGraphics calls in video mode enumeration.
2012-03-05 16:27:53 +01:00
Camilla Berglund
c0db61bd6e
Moved autorelease pool back to glfwInit.
2012-03-05 16:26:15 +01:00
Camilla Berglund
f49119107f
Removed misplaced Win32 configuration macros.
2012-03-01 03:45:06 +01:00
Camilla Berglund
cd7b9b1568
CMake file formatting.
2012-02-29 20:15:39 +01:00
Camilla Berglund
a82598ea24
Disable dynamic loading for Win32 DLL.
2012-02-29 19:52:34 +01:00
Camilla Berglund
98fbc07aa4
Fixed GLFW_WINDOW_NO_RESIZE state not being saved.
2012-02-27 02:21:26 +01:00
Camilla Berglund
a202799f45
Renamed AppKit init function.
2012-02-26 03:24:42 +01:00
Hanmac
7e0ca6705b
Added use of XkbKeycodeToKeysym when Xkb is available.
2012-02-23 21:51:57 +01:00
Camilla Berglund
ea36557b93
Merge remote-tracking branch 'raedwulf/clipboard' into clipboard
...
Conflicts:
src/CMakeLists.txt
2012-02-19 13:43:26 +01:00
Tai Chi Minh Ralph Eastwood
8b7fc5d601
Trailing whitespace.
2012-02-19 06:30:45 +00: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
Tai Chi Minh Ralph Eastwood
d561e3a0b0
Merge branch 'master' of github.com:raedwulf/glfw into clipboard
...
Conflicts:
tests/CMakeLists.txt
2012-02-19 06:17:52 +00:00
Tai Chi Minh Ralph Eastwood
a3430c2dec
No idea why this file changed... or should it be changed at all.
2012-02-19 05:40:11 +00:00
Camilla Berglund
84ea69358f
Removed unused variable, fixed chdir regression.
2012-02-15 01:57:43 +01:00
Camilla Berglund
4a9545317e
Postponed AppKit init to first window creation.
2012-02-15 01:44:55 +01:00
Camilla Berglund
e7f7c19de3
Made C-only modules C.
2012-02-15 01:20:27 +01:00
Camilla Berglund
65f55d03b1
Removed invalid timer set.
2012-02-15 01:11:16 +01:00
Camilla Berglund
7302f761d9
Cleaned up bundle resource directory logic, clarified comment.
2012-02-15 00:33:01 +01:00
Camilla Berglund
f2062e06b7
Removed traces of Captain Obvious.
2012-02-09 16:31:01 +01:00
Camilla Berglund
13a438c91e
Replaced NSDate time source with mach_absolute_time.
2012-02-09 01:53:26 +01:00
Camilla Berglund
cd670c34a2
Fixed Alt+F4 not being translated into WM_CLOSE.
2012-02-07 16:56:06 +01:00
Camilla Berglund
0b34cb1466
Removed unused variable.
2012-02-07 16:21:37 +01:00
Camilla Berglund
bba4a56352
Added missing return value.
2012-02-07 16:21:19 +01:00
Camilla Berglund
ca9633247b
Merge branch 'master' of github.com:elmindreda/glfw
...
Conflicts:
src/win32_window.c
2012-02-07 15:43:29 +01:00
Camilla Berglund
0c3b1b5a0e
Removed allocator.
2012-02-07 14:58:58 +01:00
Camilla Berglund
f6dfaf50ad
Formatting.
2012-02-05 16:56:26 +01:00
Camilla Berglund
fb465377e3
Merge remote-tracking branch 'adrian/multi-display-support' into multi-monitor
2012-02-05 02:50:22 +01:00
Camilla Berglund
32b07923ab
Formatting.
2012-02-05 02:43:49 +01:00
Camilla Berglund
fccef20b76
Added explicit WINVER, avoid redefining UNICODE.
2012-02-05 02:41:52 +01:00
Camilla Berglund
84579305cb
Made string conversions globally available.
2012-02-05 02:07:50 +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
f582746aaa
Merge branch 'utf8'
2012-02-04 02:17:19 +01:00
Camilla Berglund
e937c86893
Added UTF-8 window title support for Cocooa.
2012-02-04 02:15:17 +01:00
Camilla Berglund
fcae55591e
Merge branch 'master' of github.com:elmindreda/glfw
2012-02-04 02:05:38 +01:00
Camilla Berglund
ad55edf114
Merge branch 'master' into utf8
2012-02-04 01:55:46 +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
5a05da441d
Formatting.
2012-02-04 00:52:13 +01:00
Camilla Berglund
ce288a8939
Transformed glfwEnable/Disable/SetCursorMode into glfwGetInputMode/SetInputMode.
2012-02-04 00:51:35 +01:00
Camilla Berglund
9c0c2c6b08
Upgraded Win32 port to Unicode mode.
2012-02-03 20:34:24 +01:00
Camilla Berglund
06074bc698
Added support for _NET_WM_ICON_NAME.
2012-02-02 17:20:14 +01:00
Camilla Berglund
797e936311
Replaced XStoreName and XSetIconName with X*SetWMProperties.
2012-02-02 17:01:11 +01:00
Camilla Berglund
083380884b
Removed declarations made superfluous by our glxext.h header.
2012-02-01 22:00:07 +01:00
Camilla Berglund
78c135606a
Removed error made superfluous by our glxext.h header.
2012-02-01 18:38:06 +01:00
Camilla Berglund
87dfde34a9
Formatting.
2012-02-01 14:43:42 +01:00
Camilla Berglund
a508d21961
Merge remote-tracking branch 'hanmac/utf8Title' into utf8
2012-02-01 14:28:42 +01:00
Camilla Berglund
05173690d0
Merge branch 'master' of github.com:elmindreda/glfw
2012-02-01 14:27:43 +01:00
Camilla Berglund
017e2b3483
Formatting and cleanup.
2012-02-01 00:48:29 +01:00
Hanmac
1be6f17c66
add _NET_WM_NAME to the hasEWMGH check
2012-02-01 00:10:17 +01:00
Camilla Berglund
42cf91a07c
Fixed GLFW_KEY_GRAVE_ACCENT and GLFW_KEY_WORLD_1 on Cocoa.
2012-02-01 00:00:20 +01:00
Marcel Metz
5a16042c8a
Fixed mingw compile errors.
2012-01-31 23:47:01 +01:00
Camilla Berglund
b6c510c9d1
Split window and context creation into separate functions.
2012-01-31 17:53:19 +01:00
Camilla Berglund
b016d642ab
Comment fixes.
2012-01-31 15:27:15 +01:00
Hanmac
8e2f4cfb31
add setting an utf8 string to _NET_WM_NAME for x11
2012-01-31 12:14:59 +01:00
Camilla Berglund
c4806b9532
Merged cursor enter/leave callbacks.
2012-01-30 22:59:38 +01:00
Camilla Berglund
1d2a9790c9
Only show cursor on leave in hidden mode.
2012-01-30 22:44:41 +01:00
Camilla Berglund
7e470518ba
Formatting.
2012-01-30 22:32:14 +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
a69974403e
Added x11 support for monitor PnP detection.
2012-01-30 16:21:21 +01:00
Marcel Metz
df64773a44
Moved monitor callback to shared implementation.
2012-01-30 14:55:23 +01:00
Marcel Metz
f228d23024
Moved platform specific monitor list creation part to separate functions.
2012-01-30 12:33:32 +01:00
Marcel Metz
6f970f5753
Made monitor list cleanup shared.
2012-01-30 12:04:16 +01:00
Camilla Berglund
fa17b7e616
Compatibility fixes.
2012-01-30 00:02:54 +01:00
Camilla Berglund
26c95559d2
Merge remote-tracking branch 'adrian/multi-display-support' into multi-monitor
...
Conflicts:
.gitignore
2012-01-29 19:09:20 +01:00
Camilla Berglund
0cb77a31b6
Formatting.
2012-01-29 17:08:22 +01:00
Camilla Berglund
32f186e82d
Made joystick array static.
2012-01-29 15:51:09 +01:00
Camilla Berglund
ea8c7029a7
Formatting.
2012-01-29 15:41:06 +01:00
Camilla Berglund
e26fd639f9
Disabled debug printing.
2012-01-29 15:39:35 +01:00
Camilla Berglund
58bb6b5288
Formatting.
2012-01-29 15:38:22 +01:00
Camilla Berglund
3ff48b5b47
Formatting.
2012-01-29 15:37:29 +01:00
Camilla Berglund
98173ece03
Removed calls to exit on joystick init failure.
2012-01-29 15:32:16 +01:00
Camilla Berglund
a5b8c8db18
Replaced malloc and free with GLFW allocator.
2012-01-29 15:30:43 +01:00
Camilla Berglund
e05f0c0f53
Formatting.
2012-01-29 15:30:01 +01:00
Camilla Berglund
2935652f48
Merge remote-tracking branch 'tikhomirov/osx_joystick'
...
Conflicts:
.gitignore
src/cocoa_init.m
2012-01-29 15:05:58 +01:00
Marcel Metz
bc237f885c
Merge branch 'master' into multi-display-support
2012-01-28 20:48:38 +01:00
Camilla Berglund
e93ae44ee5
Formatting.
2012-01-24 18:28:37 +01:00
Marcel Metz
c7a5474bfc
Merged with master.
2012-01-24 18:00:51 +01:00
Camilla Berglund
8f3b21eb81
Merge branch 'master' of github.com:elmindreda/glfw
2012-01-20 02:24:17 +01:00
Camilla Berglund
1187c7da62
Ported the temporary cursor jitter fix from 2.7.3.
2012-01-20 02:23:27 +01:00
Camilla Berglund
57f9602b0e
Removed speculation.
2012-01-18 21:13:06 +01:00
Camilla Berglund
1ca5391acd
Removed trailing whitespace.
2012-01-18 21:12:34 +01:00
Camilla Berglund
6add995b06
Formatting.
2012-01-18 19:59:42 +01:00
Camilla Berglund
d322fa1ab4
Added workaround for APIENTRY.
2012-01-18 18:44:28 +01:00
Camilla Berglund
379d0025ec
Removed library name from version string to more closely match OpenGL format.
2012-01-18 18:15:28 +01:00
Camilla Berglund
cde95f72c0
Made X extensions be adjacent in version string.
2012-01-18 18:13:31 +01:00
Camilla Berglund
129ef3f72a
Added Xkb presence to version string.
2012-01-18 17:51:46 +01:00
Camilla Berglund
87f713a5e2
Added glfwInit exception comment.
2012-01-10 21:35:13 +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
85982b2985
Removed Cygwin cross-compilation hacks.
2011-11-03 00:13:49 +01:00
Camilla Berglund
96267c8696
Formatting.
2011-11-02 17:34:27 +01:00
Camilla Berglund
a18cd1b14c
Renamed GLFW_WINDOW_NO_RESIZE to GLFW_WINDOW_RESIZABLE.
2011-11-02 16:56:34 +01:00
Marcel Metz
8e89fff792
Merge branch 'master' into multi-display-support
2011-10-14 14:37:41 -04:00
Marcel Metz
85d4bfcff5
Implemented monitor (dis)connect callback for win32.
2011-10-14 14:32:06 -04:00
Camilla Berglund
2660b27cf3
Renamed internal cursor position in preparation of new API.
2011-10-13 15:20:59 +02:00
Camilla Berglund
3ebe9a4358
Mouse input fixes.
2011-10-13 14:07:52 +02:00
Camilla Berglund
30c43d60a5
Removed superfluous test.
2011-10-13 14:07:24 +02:00
Camilla Berglund
72ef537425
Added input function for window damage events.
2011-10-09 21:12:13 +02:00
Camilla Berglund
de147988f2
Fixed editing mistakes.
2011-10-09 17:40:29 +02:00
Camilla Berglund
30ab9e2058
Moved input-related functions to input file.
2011-10-09 17:13:58 +02:00
Camilla Berglund
d0840bdea1
Added more input functions to clarify internal API.
2011-10-09 17:10:40 +02:00