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 
						 
				 
			
				
					
						
							
							
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							2a166c5086 
							
						 
					 
					
						
						
							
							Removed glfwCopyContext to map better against EGL.  
						
						
						
					 
					
						2012-11-22 20:16:48 +01:00 
						 
				 
			
				
					
						
							
							
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							c479124e69 
							
						 
					 
					
						
						
							
							Removed key repeat.  
						
						
						
					 
					
						2012-11-22 17:14:50 +01:00 
						 
				 
			
				
					
						
							
							
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							14355d692f 
							
						 
					 
					
						
						
							
							Fixed active/focused nomenclature mixing.  
						
						
						
					 
					
						2012-11-22 17:04:44 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							4fc32a4bbf 
							
						 
					 
					
						
						
							
							Comment fix.  
						
						
						
					 
					
						2012-10-31 16:11:09 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							2108360671 
							
						 
					 
					
						
						
							
							Removed 'screen' from monitor nomenclature.  
						
						
						
					 
					
						2012-10-22 02:39:22 +02:00 
						 
				 
			
				
					
						
							
							
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							ddeca47117 
							
						 
					 
					
						
						
							
							Removed executable flag from header.  
						
						
						
					 
					
						2012-10-02 17:25: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 
							
						 
					 
					
						
						
						
						
							
						
						
							bf8639e49f 
							
						 
					 
					
						
						
							
							Removed unused struct member.  
						
						
						
					 
					
						2012-09-30 14:54:58 +02:00 
						 
				 
			
				
					
						
							
							
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							1be1636326 
							
						 
					 
					
						
						
							
							Begun integrating monitor and window.  
						
						
						
					 
					
						2012-09-27 21:38:35 +02:00 
						 
				 
			
				
					
						
							
							
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							14f00ffa67 
							
						 
					 
					
						
						
							
							Removed unused struct member.  
						
						
						
					 
					
						2012-09-16 12:43:33 +02:00 
						 
				 
			
				
					
						
							
							
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							20a49a7eee 
							
						 
					 
					
						
						
							
							Improved handling of primary monitor.  
						
						
						
					 
					
						2012-09-13 17:46:40 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							d0ad28f174 
							
						 
					 
					
						
						
							
							Merge branch 'master' into showwindow  
						
						
						
					 
					
						2012-08-28 17:52:31 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							aaaac00aa5 
							
						 
					 
					
						
						
							
							Comment fixes.  
						
						
						
					 
					
						2012-08-26 21:29:26 +02:00 
						 
				 
			
				
					
						
							
							
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							5d52ad1548 
							
						 
					 
					
						
						
							
							Replaced GLFWGLOBAL and _init_c_ with extern.  
						
						
						
					 
					
						2012-08-26 18:42:15 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							9e4bc36dd8 
							
						 
					 
					
						
						
							
							Initial TLS implementation (Cocoa broken).  
						
						
						
					 
					
						2012-08-12 14:13:18 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							871e1a70d7 
							
						 
					 
					
						
						
							
							Made video mode retrieval dynamic.  
						
						
						
					 
					
						2012-08-02 18:03:43 +02:00 
						 
				 
			
				
					
						
							
							
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							ba941b2fc8 
							
						 
					 
					
						
						
							
							Added formatting to error string.  
						
						
						
					 
					
						2012-08-02 15:13:57 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							a0429e4b6e 
							
						 
					 
					
						
						
							
							Removed duplicate type declarations.  
						
						
						
					 
					
						2012-07-11 00:33:19 +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