Commit Graph

53 Commits

Author SHA1 Message Date
Camilla Berglund
1be1636326 Begun integrating monitor and window. 2012-09-27 21:38:35 +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
06700e62bf Don't call OpenGL functions until there's a context. 2012-08-19 02:21:47 +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
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
3216661da7 Removed ill-advised use of glfwGetCurrentContext. 2012-08-07 21:40:40 +02:00
Camilla Berglund
d4e1f98394 Added output of initial window size. 2012-08-07 13:01:19 +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
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
Camilla Berglund
cef9dea1d2 Unified nomenclature for cursor positions. 2012-06-22 13:57:25 +02:00
Camilla Berglund
4ef9aec7e0 Made scrolling deltas floating point. 2012-03-28 21:54:09 +02:00
Camilla Berglund
8109470e72 Merge branch 'master' into cursor-enter-leave 2012-03-22 12:06:00 +01:00
Camilla Berglund
30ae9bdd47 Formatting. 2012-02-07 17:19:38 +01:00
Camilla Berglund
5159cfc2b0 Added window close control. 2012-02-07 16:40:26 +01:00
Camilla Berglund
0c3b1b5a0e Removed allocator. 2012-02-07 14:58:58 +01:00
Camilla Berglund
fb465377e3 Merge remote-tracking branch 'adrian/multi-display-support' into multi-monitor 2012-02-05 02:50:22 +01:00
Camilla Berglund
6b98a04d17 Merge branch 'utf8' into multi-monitor
Conflicts:
	src/CMakeLists.txt
2012-02-04 20:12:28 +01:00
Camilla Berglund
b997db3a8b Removed GLFWthreadmodel and glfwInitWithModels. 2012-02-04 01:38:00 +01:00
Camilla Berglund
ce288a8939 Transformed glfwEnable/Disable/SetCursorMode into glfwGetInputMode/SetInputMode. 2012-02-04 00:51:35 +01:00
Camilla Berglund
c4806b9532 Merged cursor enter/leave callbacks. 2012-01-30 22:59:38 +01:00
Camilla Berglund
3663d62362 Added cursor enter/leave support to events test. 2012-01-30 22:44:51 +01:00
Marcel Metz
a69974403e Added x11 support for monitor PnP detection. 2012-01-30 16:21:21 +01:00
Marcel Metz
784f60365e Stub implementation of monitor callback. 2011-10-09 00:20:34 -04:00
Camilla Berglund
e31042c0dc Removed duplicate word from events test output. 2011-09-20 15:18:03 +02:00
Camilla Berglund
58db28ea83 Moved clear to refresh callback. 2011-09-08 22:58:47 +02:00
Camilla Berglund
bca0283fdd Fixed exit codes. 2011-09-08 22:47:37 +02:00
Camilla Berglund
e20ea6b005 Removed duplicate event processing. 2011-09-08 22:45:35 +02:00
Camilla Berglund
4afc67c1df Various Windows and VC++ 2010 fixes. 2011-07-27 17:09:17 +02:00
Camilla Berglund
3a755b99d0 Moved callback setting to before window creation. 2011-02-27 21:42:09 +01:00
Marcus
e3cb563a28 Fixed key names in the example and test programs. 2011-01-03 22:22:14 +01:00
Marcus
3b0084799c Shortened the names of the left/right square bracket keys. 2011-01-03 22:07:01 +01:00
Marcus
c0cb4c2fe1 Implemented raw key code support for X11. 2011-01-02 11:18:14 +01:00
Camilla Berglund
4044c2da66 Made callbacks library global. 2010-10-24 18:28:55 +02:00
Camilla Berglund
99ddce3214 Added context sharing. 2010-10-04 18:17:53 +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
7ebe76289d Fixed broken file flags. 2010-09-19 02:45:20 +02:00
Camilla Berglund
e244ad3d41 Updated example and test programs to new API. 2010-09-14 03:10:59 +02:00
Camilla Berglund
abaac3ea99 Added GLFW error strings to test programs, various tweaks. 2010-09-11 14:32:05 +02:00
Camilla Berglund
a79a6eb82a Message tweak. 2010-09-11 02:59:50 +02:00
Camilla Berglund
484a2714fc Renamed GLFW_WINDOW to GLFW_WINDOWED. 2010-09-10 13:24:19 +02:00
Camilla Berglund
cfbafc5b39 Renamed glfw.h to glfw3.h to avoid conflicts. 2010-09-10 13:16:03 +02:00
Camilla Berglund
950a3beda2 Moved bits parameters from glfwOpenWindow to glfwOpenWindowHint. 2010-09-09 19:58:51 +02:00
Camilla Berglund
50e6f828d1 Formatting. 2010-09-09 19:39:36 +02:00
Camilla Berglund
96c2d04b11 Formatting, added comment. 2010-09-09 19:36:40 +02:00
Camilla Berglund
93ea341211 Removed Unicode character actions, updated events test. 2010-09-09 19:33:37 +02:00