1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-23 10:48:51 -05:00
Commit Graph

187 Commits

Author SHA1 Message Date
Camilla Berglund 5e23620c7f Merge branch 'master' into tls
Conflicts:
	src/x11_window.c
2012-09-06 15:40:18 +02:00
Camilla Berglund e10d935efe API tag and error message cleanup. 2012-08-28 15:03:57 +02:00
Riku Salminen 3d6221c490 Added support for multithreaded use of Xlib. 2012-08-12 15:57:52 +02:00
Camilla Berglund 2796ecb556 Updated platform API tags. 2012-07-20 03:28:03 +02:00
Camilla Berglund 5417130f96 Added new options to version string. 2012-07-20 03:05:06 +02:00
Camilla Berglund fbb2f24ebb Merge branch 'context-window-split'
Conflicts:
	src/x11_init.c
	src/x11_platform.h
	src/x11_window.c
2012-06-03 16:31:56 +02:00
Camilla Berglund 322407ae9f Moved X11 gamma ramp termination to gamma module. 2012-05-31 01:34:21 +02:00
Camilla Berglund 79bef68511 Only restore gamma ramp if it has been changed. 2012-05-24 11:46:51 +02:00
Camilla Berglund 1a37788143 Moved X11 gamma ramp init to gamma module. 2012-05-24 11:36:43 +02:00
Camilla Berglund 9614b9b22f Moved OpenGL init and terminate to opengl module. 2012-04-23 13:00:49 +02:00
Camilla Berglund 21e77fe1a6 Split platform-specific global data. 2012-04-22 15:53:02 +02:00
Camilla Berglund f231ed37f0 Re-worked and fixed X11 clipboard support. 2012-04-11 23:32:50 +02:00
Camilla Berglund 952c6b7e82 Merge branch 'master' into clipboard 2012-04-09 15:33:03 +02:00
Camilla Berglund fcd67c69ec Simplified clipboard cache layout. 2012-04-09 15:27:32 +02:00
Camilla Berglund b8676f01db Clarified clipboard format atom use. 2012-04-09 15:21:54 +02:00
Camilla Berglund d55616661d Removed support for primary and secondary selections. 2012-04-09 15:00:52 +02:00
Camilla Berglund b076d858cc Formatting. 2012-04-05 17:34:13 +02:00
Camilla Berglund 906754d3d0 Removed superfluous assignment. 2012-04-05 17:32:38 +02:00
Camilla Berglund 76615bf237 Moved EWMH logic to library init. 2012-04-05 17:29:08 +02:00
Camilla Berglund cbe29b4963 Merge branch 'master' into clipboard 2012-03-29 14:30:21 +02:00
Camilla Berglund dd8b098387 Moved _GLFW_BUILD_DLL into configuration header. 2012-03-29 14:06:26 +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 c2a2114590 Fixed GCC warnings. 2012-03-22 23:30:00 +01:00
Hanmac 7e0ca6705b Added use of XkbKeycodeToKeysym when Xkb is available. 2012-02-23 21:51:57 +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
Tai Chi Minh Ralph Eastwood d561e3a0b0 Merge branch 'master' of github.com:raedwulf/glfw into clipboard
Conflicts:
	tests/CMakeLists.txt
2012-02-19 06:17:52 +00:00
Camilla Berglund 6add995b06 Formatting. 2012-01-18 19:59:42 +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
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 02200c635e Added missing include. 2011-09-22 14:10:03 +02: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
Camilla Berglund eede75fe5e Added initial support for CLOCK_MONOTONIC. 2011-09-20 00:55:20 +02:00
Camilla Berglund e4027f14d0 Rough line-wrapping pass. 2011-07-27 17:48:56 +02:00
Camilla Berglund 53f4f54c46 Flattened source tree. 2011-07-26 16:50:12 +02:00