1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-27 04:28:52 -05:00
Commit Graph

121 Commits

Author SHA1 Message Date
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 69a900592e Added explicit support for sRGB framebuffers. 2012-12-02 16:10:00 +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 10cc85343a Formatting. 2012-11-27 13:38:21 +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
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 c9f4dedd96 Introduced window positioning hints and window position properties 2012-11-10 22:19:55 +01:00
Camilla Berglund 85cfc6bdd0 Merge branch 'master' into joystickname
Conflicts:
	src/x11_joystick.c
2012-09-23 15:46:42 +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 7493bbe0c8 Removed X11 prefix from EGL and GLX files. 2012-09-09 19:33:40 +02:00
Camilla Berglund 74488bec67 Further isolated X11-specific parts of EGL code. 2012-09-09 19:21:14 +02:00
Camilla Berglund 0ca1e67d7a Moved X11-specific defines to X11 header. 2012-09-09 19:03:17 +02:00
Camilla Berglund 4cb569b5b3 Replaced guessing with dirent and regex. 2012-09-07 15:27:41 +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 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 c28fb4ca0c Cleaned up Linux joystick code. 2012-08-26 18:15:47 +02:00
Camilla Berglund bf3486f077 Comment updates and formatting. 2012-08-26 15:38:18 +02:00
Camilla Berglund f559b217af Merge branch 'master' into multi-monitor 2012-07-20 01:05:09 +02:00
Camilla Berglund be12cbca15 Added separate platform headers for EGL and GLX. 2012-07-19 23:06:15 +02:00
Cloudef 819b09d479 Add member struct defines for window's context members so code can be shared 2012-07-17 22:25:47 +03:00
Camilla Berglund aa328c0bbd Added support for GLX_MESA_swap_interval. 2012-07-15 16:49:05 +02:00
Camilla Berglund 73622a2f3c Formatting. 2012-07-06 14:36:29 +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 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 322407ae9f Moved X11 gamma ramp termination to gamma module. 2012-05-31 01:34:21 +02:00
Camilla Berglund 1a37788143 Moved X11 gamma ramp init to gamma module. 2012-05-24 11:36:43 +02:00
Camilla Berglund a22fbf7e9b Moved remaining X visual management into opengl module. 2012-04-23 22:31:55 +02:00
Camilla Berglund f77c8f8b21 Made GLX extension management global instead of per-window. 2012-04-23 13:08:34 +02:00
Camilla Berglund 9614b9b22f Moved OpenGL init and terminate to opengl module. 2012-04-23 13:00:49 +02:00
Camilla Berglund 49dfbe86b2 Moved the majority of GLX code into opengl module. 2012-04-23 12:50:04 +02:00
Camilla Berglund 21e77fe1a6 Split platform-specific global data. 2012-04-22 15:53:02 +02:00
Camilla Berglund f231ed37f0 Re-worked and fixed X11 clipboard support. 2012-04-11 23:32:50 +02:00
Camilla Berglund e0c4d81e46 Added function for processing only pending events. 2012-04-10 01:15:50 +02:00
Camilla Berglund 952c6b7e82 Merge branch 'master' into clipboard 2012-04-09 15:33:03 +02:00
Camilla Berglund fcd67c69ec Simplified clipboard cache layout. 2012-04-09 15:27:32 +02:00
Camilla Berglund b8676f01db Clarified clipboard format atom use. 2012-04-09 15:21:54 +02:00
Camilla Berglund d55616661d Removed support for primary and secondary selections. 2012-04-09 15:00:52 +02:00
Camilla Berglund 76615bf237 Moved EWMH logic to library init. 2012-04-05 17:29:08 +02:00
Camilla Berglund 61264339a7 Simplified X11 screen handling. 2012-04-05 16:14:01 +02:00
Camilla Berglund e4328af790 Formatting. 2012-03-28 16:08:55 +02: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 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 ad55edf114 Merge branch 'master' into utf8 2012-02-04 01:55:46 +01:00
Camilla Berglund 06074bc698 Added support for _NET_WM_ICON_NAME. 2012-02-02 17:20:14 +01:00
Camilla Berglund 78c135606a Removed error made superfluous by our glxext.h header. 2012-02-01 18:38:06 +01:00
Hanmac 1be6f17c66 add _NET_WM_NAME to the hasEWMGH check 2012-02-01 00:10:17 +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 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 f89feefa46 Added define guards for XRandR code. 2011-10-03 12:48:59 -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
Camilla Berglund a98c66c8cb Added glext header explanation. 2011-09-22 14:15:07 +02:00
Ralph Eastwood 9f41e5b67a X11 copying code and support PRIMARY & CLIPBOARD clipboards. 2011-09-22 12:03:45 +01:00
Ralph Eastwood 57522db6e2 X11 implementation of clipboard pasting. 2011-09-21 15:43:28 +01:00
Camilla Berglund 6da82e0ffe Formatting. 2011-09-20 18:52:00 +02:00
Camilla Berglund eede75fe5e Added initial support for CLOCK_MONOTONIC. 2011-09-20 00:55:20 +02:00
Camilla Berglund dbc9489f38 Fixed regression breaking the dlopen code path. 2011-09-07 14:37:09 +02:00
Camilla Berglund 3b733b91bb Fixed header include paths. 2011-09-06 17:32:41 +02:00
Camilla Berglund 30e362d435 Shortened native extension boolean names. 2011-09-06 14:51:03 +02:00
Camilla Berglund b1656d7323 Replaced GLFW_MOUSE_CURSOR enable with glfwSetCursorMode. 2011-09-06 13:55:29 +02:00
Camilla Berglund 0f93e8f252 Flattened source tree. 2011-07-26 15:16:34 +02:00