Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-30 05:47:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,109 Commits 17 Branches 23 Tags 43 MiB
c1bb1d8a6e
Commit Graph

725 Commits

Author SHA1 Message Date
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
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
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
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