ff09d3a343
Merge branch 'master' into multi-monitor
2012-10-02 03:11:32 +02:00
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
bf8639e49f
Removed unused struct member.
2012-09-30 14:54:58 +02:00
1be1636326
Begun integrating monitor and window.
2012-09-27 21:38:35 +02:00
85cfc6bdd0
Merge branch 'master' into joystickname
...
Conflicts:
src/x11_joystick.c
2012-09-23 15:46:42 +02:00
9d6945a766
Merge branch 'master' into EGL
...
Conflicts:
CMakeLists.txt
include/GL/glfw3.h
readme.html
src/CMakeLists.txt
src/internal.h
src/window.c
2012-09-23 15:35:45 +02:00
14f00ffa67
Removed unused struct member.
2012-09-16 12:43:33 +02:00
20a49a7eee
Improved handling of primary monitor.
2012-09-13 17:46:40 +02:00
830f2b439c
Cleanup.
2012-09-12 20:41:14 +02:00
83f5b920b9
Merge branch 'master' into multi-monitor
...
Conflicts:
.gitignore
src/CMakeLists.txt
src/x11_window.c
2012-09-12 06:04:17 +02:00
0272ce2e98
Merge branch 'master' into EGL
...
Conflicts:
src/glx_opengl.c
src/opengl.c
tests/glfwinfo.c
2012-09-09 19:52:33 +02:00
9f94286c9a
Merge branch 'master' into showwindow
...
Conflicts:
readme.html
2012-09-08 21:20:45 +02:00
93a1d1c226
Added stubs, implemented on Linux and Cocoa.
2012-09-07 01:01:34 +02:00
cbcab56a25
Merge branch 'master' into EGL
...
Conflicts:
include/GL/glfw3.h
src/opengl.c
src/win32_opengl.c
src/window.c
src/x11_fullscreen.c
src/x11_glx_opengl.c
src/x11_platform.h
src/x11_window.c
tests/glfwinfo.c
2012-09-06 21:05:03 +02:00
5e23620c7f
Merge branch 'master' into tls
...
Conflicts:
src/x11_window.c
2012-09-06 15:40:18 +02:00
9a183090e0
Merge branch 'master' into showwindow
...
Conflicts:
src/window.c
2012-09-06 15:11:50 +02:00
89b42d084d
Replaced glfwGetDesktopMode with glfwGetVideoMode.
2012-08-30 01:54:01 +02:00
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
2502e4d6f3
Renamed glfwGetJoystickPos to glfwGetJoystickAxes.
2012-08-29 18:58:16 +02:00
d0ad28f174
Merge branch 'master' into showwindow
2012-08-28 17:52:31 +02:00
2a8b2ccef4
Split internal prototypes into APIs.
2012-08-27 03:55:45 +02:00
035a8f4a49
Merge branch 'master' into tls
...
Conflicts:
src/x11_window.c
2012-08-26 21:56:55 +02:00
aaaac00aa5
Comment fixes.
2012-08-26 21:29:26 +02:00
5d52ad1548
Replaced GLFWGLOBAL and _init_c_ with extern.
2012-08-26 18:42:15 +02:00
8bb5c59d2d
Added GLFW_VISIBLE window hint and parameter.
2012-08-21 21:19:01 +02:00
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
2b0f8c2f1e
Removed 'device' from monitor callback.
2012-08-14 15:15:51 +02:00
39c171a61d
Merge branch 'master' into multi-monitor
...
Conflicts:
tests/modes.c
2012-08-14 14:02:37 +02:00
9e4bc36dd8
Initial TLS implementation (Cocoa broken).
2012-08-12 14:13:18 +02:00
2410e2aaf4
Replaced automatic closing with window parameter.
2012-08-10 13:31:15 +02:00
ddcf5d471e
Removed mirroring of default framebuffer attribs.
2012-08-10 13:28:58 +02:00
585a840329
Added window parameter to glfwSwapBuffers.
2012-08-06 18:13:37 +02:00
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
1736132bb2
Fixed window parameter refresh.
2012-08-03 15:21:49 +02:00
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
871e1a70d7
Made video mode retrieval dynamic.
2012-08-02 18:03:43 +02:00
ba941b2fc8
Added formatting to error string.
2012-08-02 15:13:57 +02:00
59896c327a
Context property fixes.
2012-08-02 14:42:24 +02:00
7d222030da
Merge branch 'master' into EGL
...
Conflicts:
src/internal.h
src/opengl.c
tests/glfwinfo.c
2012-08-02 02:50:17 +02:00
053737e660
Use OpenGL to get default framebuffer properties.
2012-08-02 01:37:08 +02:00
3a72f33541
Removed GLFW_ACCELERATED window parameter.
2012-08-02 01:13:05 +02:00
3b6ec4e775
Added client API window hint.
2012-07-22 01:16:53 +02:00
b78fd85e11
Moved glext.h inclusion back.
2012-07-21 23:51:08 +02:00
be12cbca15
Added separate platform headers for EGL and GLX.
2012-07-19 23:06:15 +02:00
778a76683a
Add EGL X11 platform header
2012-07-17 22:25:47 +03:00
a0429e4b6e
Removed duplicate type declarations.
2012-07-11 00:33:19 +02:00
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
cef9dea1d2
Unified nomenclature for cursor positions.
2012-06-22 13:57:25 +02:00
bf42c3cfbc
Made glfwGetProcAddress return a function pointer.
2012-06-05 00:16:40 +02:00
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