Camilla Berglund
73cdc34df7
Merge branch 'master' into multi-monitor
...
Conflicts:
CMakeLists.txt
readme.html
src/CMakeLists.txt
src/cocoa_platform.h
src/win32_platform.h
src/x11_platform.h
tests/events.c
2012-12-02 20:52:03 +01:00
Camilla Berglund
5da8ed250a
Cleanup of backend option strings.
2012-12-02 19:01:20 +01:00
Camilla Berglund
14e71833bd
Merge branch 'master' into EGL
2012-12-02 17:11:17 +01:00
Camilla Berglund
821997ad55
Merge branch 'master' into joystickname
2012-12-02 16:36:44 +01:00
Camilla Berglund
da02844457
Merge branch 'master' into EGL
...
Conflicts:
readme.html
src/win32_platform.h
src/x11_platform.h
2012-12-02 16:17:59 +01:00
Camilla Berglund
69a900592e
Added explicit support for sRGB framebuffers.
2012-12-02 16:10:00 +01:00
Camilla Berglund
1a3d47d06d
Added window position callback.
2012-11-30 13:58:05 +01:00
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
34d383399c
Finished initial window/context backend split.
2012-11-27 15:02:26 +01:00
Camilla Berglund
e4ddcefc14
Merge branch 'master' into EGL
...
Conflicts:
CMakeLists.txt
include/GL/glfw3.h
readme.html
src/CMakeLists.txt
src/cocoa_window.m
src/config.h.in
src/glx_opengl.c
src/internal.h
src/opengl.c
src/window.c
tests/glfwinfo.c
2012-11-27 12:21:54 +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
1fd9428287
Merge branch 'master' into joystickname
...
Conflicts:
src/x11_joystick.c
2012-11-08 15:55:25 +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
85cfc6bdd0
Merge branch 'master' into joystickname
...
Conflicts:
src/x11_joystick.c
2012-09-23 15:46:42 +02:00
Camilla Berglund
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
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
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
Camilla Berglund
9f94286c9a
Merge branch 'master' into showwindow
...
Conflicts:
readme.html
2012-09-08 21:20:45 +02:00
Camilla Berglund
93a1d1c226
Added stubs, implemented on Linux and Cocoa.
2012-09-07 01:01:34 +02:00
Camilla Berglund
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
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
7d222030da
Merge branch 'master' into EGL
...
Conflicts:
src/internal.h
src/opengl.c
tests/glfwinfo.c
2012-08-02 02:50:17 +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
3b6ec4e775
Added client API window hint.
2012-07-22 01:16:53 +02:00
Camilla Berglund
b78fd85e11
Moved glext.h inclusion back.
2012-07-21 23:51:08 +02:00
Camilla Berglund
be12cbca15
Added separate platform headers for EGL and GLX.
2012-07-19 23:06:15 +02:00
Cloudef
778a76683a
Add EGL X11 platform header
2012-07-17 22:25:47 +03: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
Camilla Berglund
cef9dea1d2
Unified nomenclature for cursor positions.
2012-06-22 13:57:25 +02:00
Camilla Berglund
bf42c3cfbc
Made glfwGetProcAddress return a function pointer.
2012-06-05 00:16:40 +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
79bef68511
Only restore gamma ramp if it has been changed.
2012-05-24 11:46:51 +02:00
Camilla Berglund
1a99827432
Moved the type declarations.
2012-04-22 21:49:38 +02:00
Camilla Berglund
21e77fe1a6
Split platform-specific global data.
2012-04-22 15:53:02 +02:00
Camilla Berglund
f868712f02
Simplified clipboard API.
2012-04-12 00:51:58 +02:00
Camilla Berglund
bf1ada029b
Added window parameter to clipboard API.
2012-04-09 16:00:54 +02:00
Camilla Berglund
7044ed6f06
Simplified and made clipboard API more type safe.
2012-04-09 15:54:36 +02:00
Camilla Berglund
952c6b7e82
Merge branch 'master' into clipboard
2012-04-09 15:33:03 +02:00
Camilla Berglund
c1dd245d8a
Moved input functions to input section.
2012-04-06 14:37:31 +02:00
Camilla Berglund
92d4c02e07
Merge branch 'master' into clipboard
...
Conflicts:
src/CMakeLists.txt
2012-03-29 13:29:28 +02:00
Camilla Berglund
4ef9aec7e0
Made scrolling deltas floating point.
2012-03-28 21:54:09 +02:00
Camilla Berglund
d022e54934
Merge branch 'master' into clipboard
2012-03-28 14:58:03 +02:00
Camilla Berglund
8109470e72
Merge branch 'master' into cursor-enter-leave
2012-03-22 12:06:00 +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
0c3b1b5a0e
Removed allocator.
2012-02-07 14:58:58 +01:00
Camilla Berglund
f6dfaf50ad
Formatting.
2012-02-05 16:56:26 +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
b016d642ab
Comment fixes.
2012-01-31 15:27:15 +01:00
Camilla Berglund
c4806b9532
Merged cursor enter/leave callbacks.
2012-01-30 22:59:38 +01:00
Camilla Berglund
1ddafc25a6
Moved new cursor input code to other cursor input code.
2012-01-30 22:30:40 +01:00
Hanmac
0b752b84c3
Added API and X11 implementation of cursor enter and leave callbacks.
2012-01-30 22:19:39 +01:00
Marcel Metz
df64773a44
Moved monitor callback to shared implementation.
2012-01-30 14:55:23 +01:00
Marcel Metz
f228d23024
Moved platform specific monitor list creation part to separate functions.
2012-01-30 12:33:32 +01:00
Marcel Metz
6f970f5753
Made monitor list cleanup shared.
2012-01-30 12:04:16 +01:00
Marcel Metz
4c6681bad6
Merge branch 'master' into multi-display-support
...
Conflicts:
src/CMakeLists.txt
src/input.c
2011-11-22 16:06:24 +01:00
Camilla Berglund
a18cd1b14c
Renamed GLFW_WINDOW_NO_RESIZE to GLFW_WINDOW_RESIZABLE.
2011-11-02 16:56:34 +01:00
Camilla Berglund
2660b27cf3
Renamed internal cursor position in preparation of new API.
2011-10-13 15:20:59 +02:00
Camilla Berglund
72ef537425
Added input function for window damage events.
2011-10-09 21:12:13 +02:00
Camilla Berglund
d0840bdea1
Added more input functions to clarify internal API.
2011-10-09 17:10:40 +02:00
Marcel Metz
784f60365e
Stub implementation of monitor callback.
2011-10-09 00:20:34 -04:00
Marcel Metz
ac57be060d
Merge branch 'master' into multi-display-support
...
Conflicts:
src/fullscreen.c
src/win32_window.c
src/x11_fullscreen.c
2011-10-07 00:35:37 -04:00
Camilla Berglund
9738728298
Reshuffling, formatting and shortening.
2011-10-06 23:28:56 +02:00
Marcel Metz
3aa4976d6f
Removed constant string length for monitor parameters.
2011-10-03 13:54:05 -04:00
Marcel Metz
426df42d00
Replaced display with monitor in monitor related api.
2011-10-03 03:24:35 -04:00
Marcel Metz
58d4323ece
Implemented display aware glfwVideoModes function for X11 XRandR and win32.
2011-10-02 16:47:15 -04:00
Marcel Metz
beacbb3447
Implemented display iteration for x11. Added attributes and queries for physical size, name and logical position. Updated test executable.
2011-10-02 16:47:06 -04:00
Marcel Metz
3cb4dea453
Fixed implementation on win32 platform for iteration of video modes.
2011-10-02 16:18:31 -04:00
Camilla Berglund
a98c66c8cb
Added glext header explanation.
2011-09-22 14:15:07 +02:00
Ralph Eastwood
31c91545be
Added clipboard stubs.
2011-09-21 10:09:47 +01:00
Camilla Berglund
d0af26cd43
Allow error callback to be set before glfwInit.
2011-09-16 01:16:31 +02:00
Camilla Berglund
3b733b91bb
Fixed header include paths.
2011-09-06 17:32:41 +02:00
Camilla Berglund
b1656d7323
Replaced GLFW_MOUSE_CURSOR enable with glfwSetCursorMode.
2011-09-06 13:55:29 +02:00
Camilla Berglund
c1ab73b979
Renamed context-related functions to more closely match underlying APIs.
2011-07-27 16:01:27 +02:00
Camilla Berglund
53f4f54c46
Flattened source tree.
2011-07-26 16:50:12 +02:00
Camilla Berglund
8aa8b7c2e4
Added glfwCopyGLState.
2011-05-08 15:29:36 +02:00
Camilla Berglund
d43e0b50d0
Added initial ARB_robustness support.
2011-03-07 20:51:34 +01:00
Camilla Berglund
19be24afb7
Moved more OpenGL logic to opengl.c.
2011-03-07 14:55:11 +01:00
Camilla Berglund
0f481cb09d
Renamed window hint reset function for clarity.
2011-03-07 14:16:31 +01:00
Camilla Berglund
ccbb956341
Added pluggable memory allocator and threading stub.
2011-03-07 14:09:13 +01:00
Camilla Berglund
596f56fe7b
Moved OpenGL related function to opengl.c, minor formatting.
2011-03-07 13:56:28 +01:00
Camilla Berglund
ee880bda1b
Moved window input boolean to correct block.
2011-03-06 01:56:40 +01:00
Camilla Berglund
6e553c7376
Purged references to GLFW as a framework.
2011-03-06 01:46:39 +01:00
Camilla Berglund
77e3b428c5
Revert "Added initial framebuffer sRGB support."
...
This reverts commit 07260cb768
.
2011-01-02 00:11:47 +01:00
Camilla Berglund
15c4a2bd02
Merge branch 'master' of ssh://glfw.git.sourceforge.net/gitroot/glfw/glfw
2011-01-02 00:10:49 +01:00
Camilla Berglund
f1e7d7c0ea
Added error callback.
2010-11-23 17:45:23 +01:00
Camilla Berglund
3be0c05aaa
Added internal use of glext.h header.
2010-11-17 14:52:47 +01:00
Camilla Berglund
07260cb768
Added initial framebuffer sRGB support.
2010-11-16 02:33:21 +01:00
Camilla Berglund
70b9a1f4f3
Made boolean values use GLboolean.
2010-10-25 12:36:14 +02:00
Camilla Berglund
4044c2da66
Made callbacks library global.
2010-10-24 18:28:55 +02:00
Camilla Berglund
e9eb841fab
Added pointers to platform state definitions.
2010-10-14 16:40:10 +02:00
Camilla Berglund
85bcd1fa0c
Renamed internal gamma function.
2010-10-13 22:42:31 +02:00
Camilla Berglund
2630d4968c
Initial implementation of experimental gamma ramp API.
2010-10-13 04:04:43 +02:00
Camilla Berglund
99ddce3214
Added context sharing.
2010-10-04 18:17:53 +02:00
Camilla Berglund
f93801c221
Added missing declaration.
2010-09-27 02:16:17 +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
bc7a8d48da
Added window focus callback (Cocoa implementation missing).
2010-09-19 02:49:42 +02:00
Camilla Berglund
3ca63a0cf3
Replaced platform specific config headers with shared one, updated version strings to include CMake version.
2010-09-17 00:54:11 +02:00
Camilla Berglund
40193213e5
Clearing of input state only occurs locally.
2010-09-16 17:45:36 +02:00
Camilla Berglund
867e747add
Renamed window close request variable.
2010-09-16 06:02:44 +02:00
Camilla Berglund
3089e60fbd
Everyone needs to be able to split BPPs these days.
2010-09-16 03:48:19 +02:00
Camilla Berglund
855b386e46
Removed remnants of Unicode key repeat control.
2010-09-15 16:26:51 +02:00
Camilla Berglund
318f731e3e
Added glfwGetWindowPos.
2010-09-14 03:53:22 +02:00
Camilla Berglund
0f80e066ea
Added window title to glfwOpenWindow.
2010-09-14 03:10:45 +02:00
Camilla Berglund
1bac99625d
Fixed return type for _glfwPlatformMakeWindowCurrent.
2010-09-13 23:47:43 +02:00
Camilla Berglund
819d0446b1
Removed duplicate width and height parameters already included in window struct.
2010-09-13 23:42:51 +02:00
Camilla Berglund
d6fe447ca9
Added glfwGetVersionString.
2010-09-13 18:05:59 +02:00
Camilla Berglund
ae57d13868
Made active window state global.
2010-09-11 15:14:57 +02:00
Camilla Berglund
326d997c1c
Initial multi-window support pass.
2010-09-10 00:06:23 +02:00
Camilla Berglund
48f5a7e763
Added per-window user pointers.
2010-09-09 22:44:38 +02:00
Camilla Berglund
f5d74c4f9a
Added error management from pre-3.0 branch.
2010-09-09 21:06:59 +02:00
Camilla Berglund
3228755895
Separated window GLX state into separate struct.
2010-09-09 20:36:23 +02:00
Camilla Berglund
12d17b9de6
Formatting of internal structs.
2010-09-09 20:18:10 +02:00
Camilla Berglund
445bf1ea33
Renamed lib directory to src.
2010-09-09 20:01:43 +02:00