gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-27 12:38:53 -05:00
Code Issues Projects Releases Wiki Activity
2,887 Commits 23 Branches 15 Tags 16 MiB
Commit Graph

235 Commits

Author SHA1 Message Date
Camilla Berglund 7c426d1c92 Merge branch 'master' into multi-monitor 
Conflicts:
	examples/wave.c
	src/init.c
	src/internal.h
	src/window.c
	tests/accuracy.c
	tests/events.c
	tests/reopen.c
 2012-11-01 00:07:01 +01:00
Camilla Berglund 18d71c2b6d Made window-related callbacks per-window. 
This makes polymorphic behaviour easier to implement and avoids the problem of
events being triggered before the GLFW window object is fully usable.
 2012-10-29 13:36:01 +01:00
Camilla Berglund 5df4df6ca4 Added glfwDefaultWindowHints. 2012-10-22 03:16:14 +02:00
Camilla Berglund 0e170f4902 Merge branch 'master' into multi-monitor 2012-10-22 02:46:06 +02:00
Camilla Berglund 467d501621 Cleanup of context clearing during window destruction. 2012-10-21 21:57:29 +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 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 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 b711b2fc72 Formatting. 2012-09-16 12:42:51 +02:00
Camilla Berglund 6ac58da26e Narrowed criteria for non-standard inclusion. 2012-09-12 21:18:59 +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 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 5e23620c7f Merge branch 'master' into tls 
Conflicts:
	src/x11_window.c
 2012-09-06 15:40:18 +02:00
Camilla Berglund 9a183090e0 Merge branch 'master' into showwindow 
Conflicts:
	src/window.c
 2012-09-06 15:11:50 +02:00
Camilla Berglund 54f1a57f8d Added channel bit depth hint defaults. 2012-08-29 16:00:54 +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 035a8f4a49 Merge branch 'master' into tls 
Conflicts:
	src/x11_window.c
 2012-08-26 21:56:55 +02:00
Camilla Berglund f6a1bbf782 Added GLFW_VISIBLE to glfwWindowParam. 2012-08-21 21:57:13 +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
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 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 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 9e4bc36dd8 Initial TLS implementation (Cocoa broken). 2012-08-12 14:13:18 +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 8ed66ea4d5 Removed calling of callbacks from setters. 2012-08-07 12:45:55 +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 1736132bb2 Fixed window parameter refresh. 2012-08-03 15:21:49 +02:00
Camilla Berglund 59896c327a Context property fixes. 2012-08-02 14:42:24 +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 f2062e06b7 Removed traces of Captain Obvious. 2012-02-09 16:31:01 +01:00
Camilla Berglund 0c3b1b5a0e Removed allocator. 2012-02-07 14:58:58 +01:00
Camilla Berglund ce288a8939 Transformed glfwEnable/Disable/SetCursorMode into glfwGetInputMode/SetInputMode. 2012-02-04 00:51:35 +01:00
Camilla Berglund a18cd1b14c Renamed GLFW_WINDOW_NO_RESIZE to GLFW_WINDOW_RESIZABLE. 2011-11-02 16:56:34 +01: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 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 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 b1656d7323 Replaced GLFW_MOUSE_CURSOR enable with glfwSetCursorMode. 2011-09-06 13:55:29 +02:00
Camilla Berglund e4027f14d0 Rough line-wrapping pass. 2011-07-27 17:48:56 +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 d25f9db752 Removed glfwGetGLVersion, added GLFW_OPENGL_REVISION. 2011-05-21 17:16:32 +02:00
Camilla Berglund f0ef9277ea C strictness fixes. 2011-04-06 20:38:55 +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 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 ccbb956341 Added pluggable memory allocator and threading stub. 2011-03-07 14:09:13 +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 6e553c7376 Purged references to GLFW as a framework. 2011-03-06 01:46:39 +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 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 aae8999ecf Moved OpenGL-related functions into *opengl files. 2011-03-04 14:25:12 +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 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 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 88194055bb Added support for OpenGL ES 2.0. 2010-11-15 19:28:06 +01:00
Camilla Berglund 4044c2da66 Made callbacks library global. 2010-10-24 18:28:55 +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 e5ef93d5ae Removed broken GL 3.2 dependency. 2010-10-03 17:34:13 +02:00
Camilla Berglund 1e97d31441 Added missing read-back of glProfile and glForward. 2010-09-28 21:15:36 +02:00
Camilla Berglund fdcbb402a8 Merged logic fix from 2.7.1 trunk. 2010-09-28 00:22:34 +02:00
Camilla Berglund 007766bd91 Added two-dimensional scrolling API and X11 implementation. 2010-09-27 02:09:54 +02:00
Camilla Berglund 0d7e1794a5 Added window iconification callback. 2010-09-20 02:33:11 +02:00
Camilla Berglund d43057e5bb Removed unintentional execute bits. 2010-09-20 01:40: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 bdc5a44008 Formatting. 2010-09-20 01:38:06 +02:00
Camilla Berglund 8dfbce46fd Added error reporting to glfwSetWindowParam. 2010-09-19 10:37:02 +02:00
Camilla Berglund bc7a8d48da Added window focus callback (Cocoa implementation missing). 2010-09-19 02:49:42 +02:00
Camilla Berglund 40193213e5 Clearing of input state only occurs locally. 2010-09-16 17:45:36 +02:00
Camilla Berglund 867e747add Renamed window close request variable. 2010-09-16 06:02:44 +02:00
Camilla Berglund 33b2195fb9 Formatting and comments. 2010-09-16 02:05:01 +02:00
Camilla Berglund 855b386e46 Removed remnants of Unicode key repeat control. 2010-09-15 16:26:51 +02:00
Camilla Berglund 64f180a324 Removed remnants of Unicode character actions. 2010-09-15 16:18:59 +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 5a8dcead1e Moved flagged window closing into a separate function. 2010-09-14 01:43:31 +02:00
Camilla Berglund 2fc42e9017 Fixed missing NULL in return statement. 2010-09-14 00:15:01 +02:00
Camilla Berglund 819d0446b1 Removed duplicate width and height parameters already included in window struct. 2010-09-13 23:42:51 +02:00
Camilla Berglund c6bd6a7741 Moved window close check to shared code. 2010-09-13 23:25:55 +02:00
Camilla Berglund ae57d13868 Made active window state global. 2010-09-11 15:14:57 +02:00
Camilla Berglund 484a2714fc Renamed GLFW_WINDOW to GLFW_WINDOWED. 2010-09-10 13:24:19 +02:00
Camilla Berglund 44acfaa0b1 Fixed two multi-window bugs. 2010-09-10 00:30:10 +02:00
Camilla Berglund 326d997c1c Initial multi-window support pass. 2010-09-10 00:06:23 +02:00
Camilla Berglund 48f5a7e763 Added per-window user pointers. 2010-09-09 22:44:38 +02:00
Camilla Berglund 941d737636 Added current window check to glfwSwapBuffers. 2010-09-09 21:55:41 +02:00
Camilla Berglund 922cd1011a Added basic error reporting to shared code. 2010-09-09 21:34:42 +02:00
Camilla Berglund 1723c4af07 Function comment header cleanup. 2010-09-09 20:59:50 +02:00
Camilla Berglund 445bf1ea33 Renamed lib directory to src. 2010-09-09 20:01:43 +02:00