1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-23 18:58:52 -05:00
Commit Graph

339 Commits

Author SHA1 Message Date
Camilla Berglund 692f34b536 Merge branch 'master' into multi-monitor
Conflicts:
	include/GL/glfw3.h
	src/window.c
	tests/glfwinfo.c
2012-12-22 19:40:15 +01:00
Camilla Berglund 9c0e19adca Made error message tags more consistent. 2012-12-13 19:18:04 +01:00
Camilla Berglund 73cdc34df7 Merge branch 'master' into multi-monitor
Conflicts:
	CMakeLists.txt
	readme.html
	src/CMakeLists.txt
	src/cocoa_platform.h
	src/win32_platform.h
	src/x11_platform.h
	tests/events.c
2012-12-02 20:52:03 +01:00
Camilla Berglund 69a900592e Added explicit support for sRGB framebuffers. 2012-12-02 16:10:00 +01:00
Camilla Berglund 41bc0d18f4 Merge branch 'master' into multi-monitor
Conflicts:
	include/GL/glfw3.h
	readme.html
	src/CMakeLists.txt
	src/win32_window.c
	src/window.c
	src/x11_window.c
	tests/clipboard.c
	tests/defaults.c
	tests/events.c
	tests/fsfocus.c
	tests/glfwinfo.c
	tests/joysticks.c
	tests/peter.c
	tests/sharing.c
	tests/tearing.c
	tests/title.c
	tests/windows.c
2012-11-27 16:55:04 +01:00
m@bitsnbites.eu 1c21fc1383 Removed GLFW_SYSTEM_KEYS from the GLFW API
Rationale: Disabling system commands is inherently
dangerous, and should not be encouraged. Also, it's very
difficult to define and implement a reliable and
consistent cross-platform mechanism.
2012-11-10 22:20:47 +01:00
m@bitsnbites.eu 424e7c7b53 Removed glfwSetWindowPos and glfwGetWindowPos
glfwGetWindowPos is superseded by glfwGetWindowParam()
with GLFW_POSITION_X and GLFW_POSITION_Y as parameters.

glfwSetWindowPos can easily lead to bad practices
(moving windows around without the users consent), and
has been replaced with the GLFW_POSITION_X/Y window
hints that allow setting the window position for a
newly created window.
2012-11-10 22:19:55 +01:00
m@bitsnbites.eu c9f4dedd96 Introduced window positioning hints and window position properties 2012-11-10 22:19:55 +01:00
Camilla Berglund 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 b87157ccc1 Merge branch 'master' of github.com:elmindreda/glfw 2012-10-21 21:32:51 +02:00
Camilla Berglund c1dcd29c71 Fixed potential clearing of wrong context. 2012-10-21 21:30:13 +02:00
Camilla Berglund d0afa65813 Formatting. 2012-10-21 16:17:20 +02:00
Camilla Berglund c1bb1d8a6e Merge branch 'master' into multi-monitor
Conflicts:
	tests/iconify.c
2012-10-18 18:42:45 +02:00
Camilla Berglund e6556c7f34 Comment grammar fix. 2012-10-17 17:11:56 +02:00
Camilla Berglund d6210b11f3 Formatting. 2012-10-05 05:42:47 +02:00
Camilla Berglund 2bb62a1467 Bug fix formatting. 2012-10-04 04:08:53 +02:00
Camilla Berglund ae5da60c18 Fixed test for wrong client API. 2012-10-04 04:05:37 +02:00
Camilla Berglund 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 1be1636326 Begun integrating monitor and window. 2012-09-27 21:38:35 +02:00
Camilla Berglund c0dcb5a056 Fixed fullscreen regressions. 2012-09-23 15:08:43 +02:00
Camilla Berglund 9f94286c9a Merge branch 'master' into showwindow
Conflicts:
	readme.html
2012-09-08 21:20:45 +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 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 bf3486f077 Comment updates and formatting. 2012-08-26 15:38:18 +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
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 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 2410e2aaf4 Replaced automatic closing with window parameter. 2012-08-10 13:31:15 +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 1736132bb2 Fixed window parameter refresh. 2012-08-03 15:21:49 +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 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 302037d5b4 Added stub debug context detection. 2012-07-31 23:52:23 +02:00
Camilla Berglund b28298f329 Fixed call to CGPointMake. 2012-07-29 14:07:01 +02:00
Camilla Berglund 52ebc0db85 Fixed use of wrong point type. 2012-07-23 00:50:52 +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 2ac8da7465 Merged patch #3519669. 2012-04-22 12:58:05 +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 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 8e4e70d7a4 Implemented cursor enter/leave for OS X. 2012-03-26 14:46:42 +02:00
Camilla Berglund 29d38c3b64 Increased Cocoa pixel format attribute array size. 2012-03-23 15:27:50 +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 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 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 c0db61bd6e Moved autorelease pool back to glfwInit. 2012-03-05 16:26:15 +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
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 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 ce288a8939 Transformed glfwEnable/Disable/SetCursorMode into glfwGetInputMode/SetInputMode. 2012-02-04 00:51:35 +01:00
Camilla Berglund 017e2b3483 Formatting and cleanup. 2012-02-01 00:48:29 +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 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 d0840bdea1 Added more input functions to clarify internal API. 2011-10-09 17:10:40 +02:00
Camilla Berglund 285ab537f7 Initial implementation of cursor mode on Cocoa. 2011-09-06 17:38:00 +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 cfb9394c73 Copied OS X Lion GL3 support from 2.7.2. 2011-07-27 18:24:27 +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 53f4f54c46 Flattened source tree. 2011-07-26 16:50:12 +02:00