Commit Graph

509 Commits

Author SHA1 Message Date
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
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
Camilla Berglund
fa17b7e616 Compatibility fixes. 2012-01-30 00:02:54 +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
Camilla Berglund
e93ae44ee5 Formatting. 2012-01-24 18:28:37 +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
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
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
Camilla Berglund
ec8ee0c6e7 Merge branch 'master' of github.com:elmindreda/glfw 2011-10-09 00:02:14 +02:00
Camilla Berglund
65f074d257 Formatting. 2011-10-08 23:57:03 +02:00
Camilla Berglund
1960d1ebb1 Added error setting for more cases of invalid tokens. 2011-10-08 23:41:30 +02:00
Camilla Berglund
970269cf3a Merge branch 'master' of github.com:elmindreda/glfw 2011-10-05 00:52:45 +02:00
Camilla Berglund
0322d8fba0 Made Win32 port build (functionality soon). 2011-10-05 00:47:39 +02:00
Camilla Berglund
c18eda3a1a Added error messages. 2011-10-04 01:06:43 +02:00
Camilla Berglund
0544afeb06 It is a platform error. 2011-09-26 15:40:18 +02:00
Camilla Berglund
5999a40aaa Improved legibility. 2011-09-26 15:38:11 +02:00
Camilla Berglund
41fe14b5f8 Merge git://github.com/raedwulf/glfw 2011-09-25 16:10:06 +02:00
Tai Chi Minh Ralph Eastwood
5ac752d79d Set the current gamma ramp to original gamma ramp at start. 2011-09-25 15:00:08 +01:00
Camilla Berglund
a98c66c8cb Added glext header explanation. 2011-09-22 14:15:07 +02:00
Camilla Berglund
02200c635e Added missing include. 2011-09-22 14:10:03 +02:00
Ralph Eastwood
a2ffa80e82 Some reformatting with new X11 SelectionRequest event. 2011-09-22 12:09:01 +01:00
Ralph Eastwood
9f41e5b67a X11 copying code and support PRIMARY & CLIPBOARD clipboards. 2011-09-22 12:03:45 +01:00
Ralph Eastwood
57522db6e2 X11 implementation of clipboard pasting. 2011-09-21 15:43:28 +01:00
Ralph Eastwood
31c91545be Added clipboard stubs. 2011-09-21 10:09:47 +01:00
Camilla Berglund
6da82e0ffe Formatting. 2011-09-20 18:52:00 +02:00
Camilla Berglund
554bf5d321 Brought back non-relative gamma ramp generation. 2011-09-20 15:44:54 +02:00
Camilla Berglund
0d0951b7eb Merge branch 'cocoa-gamma' of git://github.com/raedwulf/glfw 2011-09-20 14:26:13 +02:00
Camilla Berglund
eede75fe5e Added initial support for CLOCK_MONOTONIC. 2011-09-20 00:55:20 +02:00
Camilla Berglund
df75a2dc2f Added missing error string. 2011-09-19 21:32:04 +02:00
Camilla Berglund
dbfd59ee7e Comment clarification. 2011-09-19 21:29:02 +02:00
Camilla Berglund
4e9c34952c Pkg-config file generation work. 2011-09-19 18:46:20 +02:00
Sergey Tikhomirov
2357cf6f30 Added initial joystick support on OS X 2011-09-18 22:05:00 +03:00
Camilla Berglund
d0af26cd43 Allow error callback to be set before glfwInit. 2011-09-16 01:16:31 +02:00
Tai Chi Minh Ralph Eastwood
53f64983a9 Take into account the original gamma before applying gamma. 2011-09-15 06:16:33 +01:00
Tai Chi Minh Ralph Eastwood
688772111d Initial implementation of gamma through Cocoa. 2011-09-12 22:16:28 +01:00
Camilla Berglund
dbc9489f38 Fixed regression breaking the dlopen code path. 2011-09-07 14:37:09 +02:00
Camilla Berglund
194e865bd6 Don't duplicate extension preference logic. 2011-09-07 05:41:40 +02:00
Camilla Berglund
285ab537f7 Initial implementation of cursor mode on Cocoa. 2011-09-06 17:38:00 +02:00
Camilla Berglund
3b733b91bb Fixed header include paths. 2011-09-06 17:32:41 +02:00
Camilla Berglund
ad973a5cfe Replaced hard-coded gamma ramp size with public constant. 2011-09-06 15:54:04 +02:00
Camilla Berglund
62f812873c Added gamma value error check. 2011-09-06 15:47:17 +02:00
Camilla Berglund
ca0dbdbb6e Simplified glfwSetGammaFormula to glfwSetGamma. 2011-09-06 15:43:31 +02:00
Camilla Berglund
99712de710 Comment fix. 2011-09-06 14:52:42 +02:00
Camilla Berglund
30e362d435 Shortened native extension boolean names. 2011-09-06 14:51:03 +02:00
Camilla Berglund
f08397a108 Made it an error to not define an entry point retrieval mechanism on X11. 2011-09-06 14:40:39 +02:00
Camilla Berglund
81cfc1001d Moved glext headers to separate directory for clarity. 2011-09-06 14:33:25 +02:00
Camilla Berglund
9ae8c778df Error message updates. 2011-09-06 14:28:28 +02:00
Camilla Berglund
39dc15f737 Corrected error message. 2011-09-06 13:56:05 +02:00
Camilla Berglund
b1656d7323 Replaced GLFW_MOUSE_CURSOR enable with glfwSetCursorMode. 2011-09-06 13:55:29 +02:00
Camilla Berglund
c32fa805d5 Merged bugfix from 2.7.3-pre. 2011-08-14 01:28:54 +02:00
Camilla Berglund
113bc94042 Formatting. 2011-08-14 01:27:48 +02:00
Camilla Berglund
d24acb7f64 Copied Cocoa entry point bugfix from 2.7.2. 2011-07-27 18:40:41 +02:00
Camilla Berglund
cfb9394c73 Copied OS X Lion GL3 support from 2.7.2. 2011-07-27 18:24:27 +02:00
Camilla Berglund
c233e005a8 Copied context property readback from 2.7.1. 2011-07-27 18:20:15 +02:00
Camilla Berglund
e4027f14d0 Rough line-wrapping pass. 2011-07-27 17:48:56 +02:00
Camilla Berglund
4afc67c1df Various Windows and VC++ 2010 fixes. 2011-07-27 17:09:17 +02:00
Camilla Berglund
c1ab73b979 Renamed context-related functions to more closely match underlying APIs. 2011-07-27 16:01:27 +02:00
Camilla Berglund
673b42d8da Formatting. 2011-07-26 16:59:37 +02:00
Camilla Berglund
53f4f54c46 Flattened source tree. 2011-07-26 16:50:12 +02:00
Camilla Berglund
71f4adc3ec Formatting. 2011-05-21 23:13:48 +02:00
Camilla Berglund
b2e8807440 Formatting. 2011-05-21 22:50:25 +02:00
Camilla Berglund
f9e0f6f782 Formatting. 2011-05-21 17:34:17 +02:00
Camilla Berglund
d25f9db752 Removed glfwGetGLVersion, added GLFW_OPENGL_REVISION. 2011-05-21 17:16:32 +02:00
Camilla Berglund
44035f5ef1 Added error check. 2011-05-08 16:29:33 +02:00
Camilla Berglund
8aa8b7c2e4 Added glfwCopyGLState. 2011-05-08 15:29:36 +02:00
Camilla Berglund
f0ef9277ea C strictness fixes. 2011-04-06 20:38:55 +02:00
Camilla Berglund
1412732874 Fixed inverted gamma. 2011-04-01 12:46:03 +02:00
Camilla Berglund
22479e29b7 Removed superfluous comments. 2011-03-30 15:18:02 +02:00
Camilla Berglund
671b0f7803 Removed superfluous comments. 2011-03-30 15:07:44 +02:00
Camilla Berglund
849977c7b2 Allow closing of NULL. 2011-03-08 23:14:42 +01:00
Camilla Berglund
d43e0b50d0 Added initial ARB_robustness support. 2011-03-07 20:51:34 +01:00
Camilla Berglund
fe1db15d31 Formatting. 2011-03-07 14:58:10 +01:00
Camilla Berglund
19be24afb7 Moved more OpenGL logic to opengl.c. 2011-03-07 14:55:11 +01:00
Camilla Berglund
d1d550d1ab Delayed window struct allocation. 2011-03-07 14:30:23 +01:00
Camilla Berglund
98eb79b7d9 Removed function made superfluous by window struct memset. 2011-03-07 14:24:55 +01:00
Camilla Berglund
17d9b5aa8f Comment tweak. 2011-03-07 14:16:39 +01:00
Camilla Berglund
0f481cb09d Renamed window hint reset function for clarity. 2011-03-07 14:16:31 +01:00
Camilla Berglund
3d82683177 Removed indirection made superfluous by introduction of cdecl. 2011-03-07 14:13:47 +01:00
Camilla Berglund
ccbb956341 Added pluggable memory allocator and threading stub. 2011-03-07 14:09:13 +01:00
Camilla Berglund
cf7819df8d Comment tweaks. 2011-03-07 13:58:02 +01:00
Camilla Berglund
596f56fe7b Moved OpenGL related function to opengl.c, minor formatting. 2011-03-07 13:56:28 +01:00
Camilla Berglund
0d50ee749f Added profile enum verification. 2011-03-06 13:28:10 +01:00
Camilla Berglund
6d7d11643a Clarified comment. 2011-03-06 12:18:22 +01:00
Camilla Berglund
ee880bda1b Moved window input boolean to correct block. 2011-03-06 01:56:40 +01:00
Camilla Berglund
6e553c7376 Purged references to GLFW as a framework. 2011-03-06 01:46:39 +01:00
Camilla Berglund
cfcc3da65f Removed macros provided by internal up-to-date glxext.h header. 2011-03-04 22:24:27 +01:00
Camilla Berglund
9b70cec954 Fixed bug #3093443. 2011-03-04 21:53:34 +01:00
Camilla Berglund
f511fa0228 Comment updates. 2011-03-04 17:58:43 +01:00
Camilla Berglund
57eabfd17f Added more strictness to GL version check. 2011-03-04 17:51:12 +01:00
Camilla Berglund
5d2edb2dff Comment updates. 2011-03-04 17:49:36 +01:00
Camilla Berglund
2f7bfb89e4 Formatting. 2011-03-04 15:49:05 +01:00
Camilla Berglund
a5facec0c3 Formatting. 2011-03-04 15:47:57 +01:00
Camilla Berglund
2f2ce22e35 Clarified function name. 2011-03-04 15:00:51 +01:00
Camilla Berglund
7515ee0ef5 Moved OpenGL context config verification into separate function. 2011-03-04 15:00:19 +01:00
Camilla Berglund
9d6660a9ea Made file-local functions static. 2011-03-04 14:52:12 +01:00
Camilla Berglund
ed336b210c Comment tweak. 2011-03-04 14:29:05 +01:00
Camilla Berglund
aae8999ecf Moved OpenGL-related functions into *opengl files. 2011-03-04 14:25:12 +01:00
Camilla Berglund
dd04fa9272 Formatting. 2011-02-27 21:43:46 +01:00
Camilla Berglund
06a4afd7de Fixed loop termination bug. 2011-02-27 21:42:41 +01:00
Camilla Berglund
e0ba9e4e1f Formatting. 2011-02-09 12:57:11 +01:00
Camilla Berglund
508e76e53d Finished confusion for code completion systems. 2011-02-09 12:44:24 +01:00
Camilla Berglund
a66a4cd1e4 Added confusion for code completion systems like VC++. 2011-02-09 12:37:42 +01:00
Camilla Berglund
f02dbd30be Formatting. 2011-02-09 12:33:05 +01:00
Camilla Berglund
230bd371f8 Added permission comment. 2011-02-09 12:17:34 +01:00
Camilla Berglund
ebb69adc36 Silly, silly me. 2011-02-09 12:17:01 +01:00
Camilla Berglund
e43e9609ec Further clarification of error error. 2011-02-09 12:14:24 +01:00
Camilla Berglund
1ff78d0fc9 Various error system fixes. 2011-02-09 12:12:52 +01:00
Camilla Berglund
ed31f1a670 Discard software pixel formats. 2011-02-08 19:50:06 +01:00
Camilla Berglund
08d758ed42 Sorted and added missing WGL extension booleans. 2011-02-08 19:36:21 +01:00
marcus256
8943a78a65 Merge branch 'marcus-rawkeys'. Changed handling of raw key codes. 2011-01-15 00:59:55 +01:00
Marcus
6095e906ab Implemented new key codes for Mac/Cocoa. 2011-01-10 21:56:31 +01:00
unknown
518b3d9526 Fixed some compiler errors under Win32. 2011-01-10 21:38:08 +01:00
Marcus
62e4ff1e91 Updated the key translation logic for Win32. 2011-01-10 21:19:27 +01:00
Marcus
2c169997f5 Moved all the key code translation logic into the LUT (cleaner & less overhead). 2011-01-04 23:07:34 +01:00
Marcus
3b0084799c Shortened the names of the left/right square bracket keys. 2011-01-03 22:07:01 +01:00
Marcus
a44d566057 Added compile time detection of the XKB X11 extension. 2011-01-03 21:44:05 +01:00
Camilla Berglund
e38d451edd Force glx.h not to include its glxext.h header. 2011-01-02 20:20:55 +01:00
Marcus
c0cb4c2fe1 Implemented raw key code support for X11. 2011-01-02 11:18:14 +01:00
Camilla Berglund
77e3b428c5 Revert "Added initial framebuffer sRGB support."
This reverts commit 07260cb768.
2011-01-02 00:11:47 +01:00
Camilla Berglund
15c4a2bd02 Merge branch 'master' of ssh://glfw.git.sourceforge.net/gitroot/glfw/glfw 2011-01-02 00:10:49 +01:00
Camilla Berglund
f1e7d7c0ea Added error callback. 2010-11-23 17:45:23 +01:00
Camilla Berglund
1057630e1f Added internal glxext.h header. 2010-11-17 21:18:05 +01:00
Camilla Berglund
5a112d6cd1 Moved platform identifier define to config header. 2010-11-17 14:59:27 +01:00
Camilla Berglund
3be0c05aaa Added internal use of glext.h header. 2010-11-17 14:52:47 +01:00
Camilla Berglund
22872a2c46 Formatting. 2010-11-17 14:41:39 +01:00
Camilla Berglund
3d951c3f5b Fixed sign mismatch. 2010-11-17 14:40:17 +01:00
Camilla Berglund
b29c4bae53 Added reference to extension. 2010-11-17 14:27:13 +01:00
Camilla Berglund
c4250ca384 Moved scroll offset clearing to shared code. 2010-11-17 14:24:25 +01:00
Camilla Berglund
a4a860057d Clarified default OpenGL version. 2010-11-17 14:18:00 +01:00
Camilla Berglund
07260cb768 Added initial framebuffer sRGB support. 2010-11-16 02:33:21 +01:00
Camilla Berglund
1ee78ecef5 Added support for GLX_EXT_swap_control. 2010-11-15 21:17:42 +01:00
Camilla Berglund
e8f65c3177 Formatting. 2010-11-15 20:21:09 +01:00
Camilla Berglund
890dab3133 Updates to Win32 context re-creation logic. 2010-11-15 20:19:29 +01:00
Camilla Berglund
88194055bb Added support for OpenGL ES 2.0. 2010-11-15 19:28:06 +01:00
Camilla Berglund
fa6f29a4e6 Fixed malplaced endif statements. 2010-11-06 20:25:33 +01:00
Camilla Berglund
79be8c025f Version string fixes. 2010-11-06 13:48:24 +01:00
Camilla Berglund
dc1bb860e7 Fixed missing variable. 2010-11-04 23:16:57 +01:00
Camilla Berglund
c71ae4cc42 Fixed uninitialized value. 2010-10-30 22:58:54 +02:00
Camilla Berglund
53578d7d01 Formatting. 2010-10-27 17:53:24 +02:00
Camilla Berglund
189fd1dc4b Merge branch 'master' of ssh://glfw.git.sourceforge.net/gitroot/glfw/glfw 2010-10-27 17:45:38 +02:00
Camilla Berglund
70b9a1f4f3 Made boolean values use GLboolean. 2010-10-25 12:36:14 +02:00
Camilla Berglund
7eea9b2384 Merge fix. 2010-10-24 23:41:34 +02:00
Camilla Berglund
7e2b014d81 Merge branch 'master' of ssh://glfw.git.sourceforge.net/gitroot/glfw/glfw 2010-10-24 18:34:24 +02:00
Camilla Berglund
37d366dc9f Merge branch 'master' of ssh://glfw.git.sourceforge.net/gitroot/glfw/glfw 2010-10-24 18:31:43 +02:00
Camilla Berglund
4044c2da66 Made callbacks library global. 2010-10-24 18:28:55 +02:00
Camilla Berglund
c5892fee53 Formatting. 2010-10-24 18:09:05 +02:00
Camilla Berglund
dae61bb918 Added TODO. 2010-10-24 16:16:21 +02:00
Camilla Berglund
e0827195a4 Clarified gamma ramp error message. 2010-10-24 16:07:02 +02:00
Camilla Berglund
a4a2eaaa0f Removed whitespace in version string joystick keys. 2010-10-24 14:35:37 +02:00