mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-10 00:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,261 Commits 17 Branches 23 Tags 38 MiB
73cdc34df7
Commit Graph

192 Commits

Author SHA1 Message Date
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
0aaa120f12 Merge branch 'EGL' 2012-12-02 19:02:49 +01:00
Camilla Berglund
d4a08b10fd Documented joystick name caveat. 2012-12-02 17:13:41 +01:00
Camilla Berglund
14e71833bd Merge branch 'master' into EGL 2012-12-02 17:11:17 +01:00
Camilla Berglund
7d9b5c0127 Added documentation for glfwGetJoystickName. 2012-12-02 16:55:09 +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
a3ff29af36 Documentation updates. 2012-12-02 15:47:10 +01:00
Camilla Berglund
1a3d47d06d Added window position callback. 2012-11-30 13:58:05 +01:00
Camilla Berglund
5f68e12b52 Added some documentation for the monitor API. 2012-11-27 17:26:50 +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
4ce92262f7 Reverted bad edit. 2012-11-27 14:31:10 +01:00
Camilla Berglund
10cc85343a Formatting. 2012-11-27 13:38:21 +01:00
Camilla Berglund
0f0f7f7294 Merge branch 'EGL' of github.com:elmindreda/glfw into EGL 
Conflicts:
	include/GL/glfw3.h
 2012-11-27 12:23:25 +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
06c191feea Updated error codes to better reflect multi-API support. 2012-11-23 12:00:49 +01:00
Camilla Berglund
1e9383d039 Documentation work. 2012-11-23 11:41:53 +01:00
Camilla Berglund
2a166c5086 Removed glfwCopyContext to map better against EGL. 2012-11-22 20:16:48 +01:00
Camilla Berglund
06e7a96c61 Fixed documentation spelling errors. 2012-11-22 19:14:27 +01:00
Camilla Berglund
9ad1d979e9 Conservatively tagged functions confined to main thread. 2012-11-22 19:08:30 +01:00
Camilla Berglund
998cb5144e Made glfwSetCursorPos fail silently if lacking focus. 2012-11-22 17:20:16 +01:00
Camilla Berglund
c479124e69 Removed key repeat. 2012-11-22 17:14:50 +01:00
Camilla Berglund
b8c16e49f1 Removed window size DWIM. 2012-11-22 17:04:54 +01:00
Camilla Berglund
14355d692f Fixed active/focused nomenclature mixing. 2012-11-22 17:04:44 +01:00
Camilla Berglund
bce2cd65e1 Begun outlining reference documentation. 2012-11-22 17:04:30 +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
Jari Vetoniemi
38c4a8ef2d Make it possible to use GLESv1 2012-11-10 00:08:44 +02: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
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
da31167193 Renamed glfwGetMonitorString to glfwGetMonitorName. 2012-10-18 23:01:41 +02:00
Camilla Berglund
26480901fd Added glfwGetWindowMonitor. 2012-10-02 17:24:18 +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
508c7fe0e6 Merge branch 'master' into multi-monitor 
Conflicts:
	src/window.c
 2012-09-27 23:32:26 +02:00
Camilla Berglund
410a4e29e1 Moved from gl3.h to glcorearb.h. 2012-09-27 22:28:04 +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
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
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
9a183090e0 Merge branch 'master' into showwindow 
Conflicts:
	src/window.c
 2012-09-06 15:11:50 +02:00
Camilla Berglund
a339098bc0 Formatting. 2012-09-02 15:22:56 +02:00