gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-30 05:58:52 -05:00
Code Issues Projects Releases Wiki Activity
1,517 Commits 23 Branches 15 Tags 16 MiB
Commit Graph

260 Commits

Author SHA1 Message Date
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
Marcel Metz 3aa4976d6f Removed constant string length for monitor parameters. 2011-10-03 13:54:05 -04:00
Marcel Metz 426df42d00 Replaced display with monitor in monitor related api. 2011-10-03 03:24:35 -04:00
Marcel Metz beacbb3447 Implemented display iteration for x11. Added attributes and queries for physical size, name and logical position. Updated test executable. 2011-10-02 16:47:06 -04: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 e2c58b089b Added GLFW_OPENGL_NO_PROFILE for completeness. 2011-09-19 21:00:29 +02:00
Camilla Berglund d88789e5e3 Added GLFW_INCLUDE_GL3 macro. 2011-09-16 04:44:40 +02:00
Camilla Berglund ca0dbdbb6e Simplified glfwSetGammaFormula to glfwSetGamma. 2011-09-06 15:43:31 +02:00
Camilla Berglund 81cfc1001d Moved glext headers to separate directory for clarity. 2011-09-06 14:33:25 +02:00
Camilla Berglund b1656d7323 Replaced GLFW_MOUSE_CURSOR enable with glfwSetCursorMode. 2011-09-06 13:55:29 +02:00
Camilla Berglund 4fb55781f1 GLFW_OPENGL_REVISION is not a hint. 2011-08-15 01:49:18 +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 4c6e24c911 Added declaration of size_t. 2011-07-26 16:52:57 +02:00
Camilla Berglund d25f9db752 Removed glfwGetGLVersion, added GLFW_OPENGL_REVISION. 2011-05-21 17:16:32 +02:00
Camilla Berglund 8aa8b7c2e4 Added glfwCopyGLState. 2011-05-08 15:29:36 +02:00
Camilla Berglund 6fa2730087 Added dummy struct member. 2011-04-06 20:45:33 +02:00
Camilla Berglund d43e0b50d0 Added initial ARB_robustness support. 2011-03-07 20:51:34 +01:00
Camilla Berglund ccbb956341 Added pluggable memory allocator and threading stub. 2011-03-07 14:09:13 +01:00
Camilla Berglund 897558fdfb Rearranged public types. 2011-03-07 13:34:58 +01:00
Camilla Berglund 6e553c7376 Purged references to GLFW as a framework. 2011-03-06 01:46:39 +01:00
Camilla Berglund e0ba9e4e1f Formatting. 2011-02-09 12:57:11 +01:00
Camilla Berglund a66a4cd1e4 Added confusion for code completion systems like VC++. 2011-02-09 12:37:42 +01:00
marcus256 8943a78a65 Merge branch 'marcus-rawkeys'. Changed handling of raw key codes. 2011-01-15 00:59:55 +01:00
Marcus 3b0084799c Shortened the names of the left/right square bracket keys. 2011-01-03 22:07:01 +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 27ba3c6996 Merge branch 'master' of git://85.24.143.159 2010-11-23 23:43:26 +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 2955cd3afc Formatting. 2010-11-17 15:42:55 +01:00
Camilla Berglund 0529539d44 Updated glext.h header. 2010-11-16 20:42:14 +01:00
Camilla Berglund 07260cb768 Added initial framebuffer sRGB support. 2010-11-16 02:33:21 +01:00
Camilla Berglund 20662dd77b Made OpenGL profile value officially a bitmask. 2010-11-15 21:40:43 +01:00
Camilla Berglund 39dfa7d258 Fixed token sequence gaps. 2010-11-15 21:39:46 +01:00
Camilla Berglund 88194055bb Added support for OpenGL ES 2.0. 2010-11-15 19:28:06 +01:00
Camilla Berglund 36e5409224 Updated inclusion guard to match header name. 2010-11-09 02:58:35 +01:00
Camilla Berglund f8105ed710 Added email address for current maintainer. 2010-11-09 02:57:46 +01:00
Camilla Berglund 3e6d00a0e0 Disabled inclusion of Apple's legacy glext.h header. 2010-10-27 14:13:24 +02:00
Camilla Berglund 4044c2da66 Made callbacks library global. 2010-10-24 18:28:55 +02:00
Camilla Berglund 2630d4968c Initial implementation of experimental gamma ramp API. 2010-10-13 04:04:43 +02:00
Camilla Berglund 52546171d0 Removed some and clarified remaining GLFW error tokens. 2010-10-05 00:08:19 +02:00
Camilla Berglund 419f9f17a1 Added glfwGetCurrentWindow. 2010-10-04 23:13:33 +02:00
Camilla Berglund 99ddce3214 Added context sharing. 2010-10-04 18:17:53 +02:00
Camilla Berglund 19e2be555c Removed internal glxext.h. 2010-10-03 19:50:19 +02:00
Camilla Berglund 8bedd481e6 Added glext.h. 2010-10-03 18:53:59 +02:00
Camilla Berglund 007766bd91 Added two-dimensional scrolling API and X11 implementation. 2010-09-27 02:09:54 +02:00
Camilla Berglund 71ba8cfab6 Replaced scattered partial wglext.h with actual file. 2010-09-20 20:39:44 +02:00
Camilla Berglund 451e0a7e2c Replaced scattered partial glxext.h with actual file. 2010-09-20 20:32:51 +02:00
Camilla Berglund 0d7e1794a5 Added window iconification callback. 2010-09-20 02:33:11 +02:00
Camilla Berglund 20b708541f Merge branch 'master' of ssh://glfw.git.sourceforge.net/gitroot/glfw/glfw 2010-09-20 01:38:23 +02:00
Camilla Berglund 16cf53bb62 Formatting. 2010-09-20 00:38:06 +02:00
Camilla Berglund bc7a8d48da Added window focus callback (Cocoa implementation missing). 2010-09-19 02:49:42 +02:00
Camilla Berglund 8d8eb0c4d5 Comment fixes. 2010-09-16 06:05:50 +02:00
Camilla Berglund 318f731e3e Added glfwGetWindowPos. 2010-09-14 03:53:22 +02:00
Camilla Berglund 0f80e066ea Added window title to glfwOpenWindow. 2010-09-14 03:10:45 +02:00
Camilla Berglund d6fe447ca9 Added glfwGetVersionString. 2010-09-13 18:05:59 +02:00
Camilla Berglund 484a2714fc Renamed GLFW_WINDOW to GLFW_WINDOWED. 2010-09-10 13:24:19 +02:00
Camilla Berglund cfbafc5b39 Renamed glfw.h to glfw3.h to avoid conflicts. 2010-09-10 13:16:03 +02:00
Camilla Berglund 48f5a7e763 Added per-window user pointers. 2010-09-09 22:44:38 +02:00
Camilla Berglund 2c091571d8 Formatting. 2010-09-09 21:09:11 +02:00
Camilla Berglund e28543c930 Added error tokens (oops). 2010-09-09 21:08:50 +02:00
Camilla Berglund f5d74c4f9a Added error management from pre-3.0 branch. 2010-09-09 21:06:59 +02:00
Camilla Berglund 950a3beda2 Moved bits parameters from glfwOpenWindow to glfwOpenWindowHint. 2010-09-09 19:58:51 +02:00