Diederick Niehorster
eaab7fa509
Merge branch 'trunk' into git_master
2014-09-28 12:04:21 +08:00
dcnieho
f1df2e76d1
drawing join dots on stroke fonts is now optional (and default off)
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1705 7f0cb862-5218-0410-a997-914c9d46530a
2014-09-28 04:04:08 +00:00
Diederick Niehorster
06adf958bd
Merge branch 'trunk' into git_master
2014-08-29 08:42:23 +08:00
dcnieho
804a62ab58
now using _NET_FRAME_EXTENTS if available to get size of window decorations
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1704 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-29 00:41:03 +00:00
Diederick Niehorster
5e82985a07
Merge branch 'trunk' into git_master
2014-08-28 00:14:10 +08:00
dcnieho
b0288518d1
X11: implemented borderless and captionless window style using motif hints
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1703 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-27 16:02:03 +00:00
Diederick Niehorster
1fb598b52d
Merge branch 'trunk' into git_master
2014-08-27 21:43:20 +08:00
dcnieho
80c07e8b65
note on what GLUT_WINDOW_BORDER_HEIGHT is
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1702 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-27 13:42:59 +00:00
Diederick Niehorster
105c4eb685
Merge remote-tracking branch 'svn/trunk' into git_master
2014-08-27 19:46:30 +08:00
dcnieho
9141845a49
glutGet window position should be relative to parent
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1701 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-27 11:45:58 +00:00
dcnieho
b0811138cc
caption height should include the width of the border atop the window
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1700 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-27 10:14:44 +00:00
Diederick Niehorster
07a7dbd8ca
Merge remote-tracking branch 'svn/trunk' into git_master
2014-08-27 13:47:24 +08:00
dcnieho
f57980927a
resizer demo:
...
some breaks missing in keyboard switch
added instruction text for which buttons can be pressed
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1699 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-27 05:47:05 +00:00
dcnieho
a894e63bdd
For builds not using cmake, generate fg_version.h to match cmake-specified version number.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1696 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-18 02:00:40 +00:00
Diederick Niehorster
2204e280c8
Merge remote-tracking branch 'svn/trunk' into git_master
2014-08-18 10:00:34 +08:00
Diederick C. Niehorster
eefd4bc619
Merge pull request #18 from nigels-com/merge-version2
...
For builds not using cmake, generate fg_version.h
2014-08-18 09:59:22 +08:00
jtsiomb
2ed4ed5b52
changed the X11 gamemode code policy. Falling back to xf86vm when xrandr fails
...
was problematic when passing invalid modes. Now instead, if xrandr is
available, we use that, and only that. XF86VM is now only used when XR&R is not
supported at all.
I also added a set of env vars to artificially disable one or the other, or
both. If FREEGLUT_NO_XRANDR is set we completely ignore XR&R, and if
FREEGLUT_NO_XF86VM is set, we completely ignore XF86VidMode. Obviously if both
are defined or missing, game mode can't switch resolutions at all any more, but
that's a nice debugging aid, and may be useful to allow the user to pick which
extension he'd rather use for mode switching.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1695 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-18 00:52:53 +00:00
Nigel Stewart
274af23a3c
For builds not using cmake, generate fg_version.h to match cmake-specified version number.
2014-08-16 13:05:12 +10:00
Diederick C. Niehorster
6a3b4e4771
Merge remote-tracking branch 'svn/trunk' into git_master
2014-06-24 09:03:30 +02:00
dcnieho
c12f6173db
Updated BlackBerry references to make note of the change from FREEGLUT_GLES2/1 to FREEGLUT_GLES.
...
Updated BlackBerry toolchain to support building with Dinkum and to support OS 10.3 and GCC 4.8.2
Updated BlackBerry fg_window_blackberry so that window usages aren't hardcoded based on compile information, since it is now controlled by glutInitContextVersion.
EGL window setup now supports EGL 1.5, Renderable type for ES3, and using the minor version from glutInitContextVersion to have more exact control over which version of OpenGL ES is used (requires EGL 1.5)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1694 7f0cb862-5218-0410-a997-914c9d46530a
2014-06-24 07:03:16 +00:00
Diederick C. Niehorster
3ae17e42da
Merge pull request #14 from rcmaniac25/GLES31
...
Futureproof: EGL 1.5 support, OpenGL ES 3.1 support
2014-06-24 09:01:56 +02:00
Rcmaniac25
2dab5a32a6
Updated BlackBerry references to make note of the change from FREEGLUT_GLES2/1 to FREEGLUT_GLES.
...
Updated BlackBerry toolchain to support building with Dinkum and to support OS 10.3 and GCC 4.8.2
Updated BlackBerry fg_window_blackberry so that window usages aren't hardcoded based on compile information, since it is now controlled by glutInitContextVersion.
EGL window setup now supports EGL 1.5, Renderable type for ES3, and using the minor version from glutInitContextVersion to have more exact control over which version of OpenGL ES is used (requires EGL 1.5)
2014-06-09 22:39:03 -04:00
Diederick Niehorster
d11c062c72
Merge remote-tracking branch 'svn/trunk' into git_master
2014-06-02 21:25:37 +08:00
dcnieho
89cfab41fc
updated api doc
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1693 7f0cb862-5218-0410-a997-914c9d46530a
2014-06-02 13:25:25 +00:00
Diederick Niehorster
8647b9a01e
Merge remote-tracking branch 'svn/trunk' into git_master
2014-06-01 23:31:57 +08:00
beuc
c93af8dfea
Provide Android binaries for testers
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1692 7f0cb862-5218-0410-a997-914c9d46530a
2014-06-01 13:55:34 +00:00
beuc
364d6a4cff
Clarify the problem with Raspberry PI
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1691 7f0cb862-5218-0410-a997-914c9d46530a
2014-06-01 13:37:17 +00:00
beuc
f2a534098c
Rewrite EGL attributes using our ATTRIB/ATTRIB_VAL macros
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1690 7f0cb862-5218-0410-a997-914c9d46530a
2014-06-01 11:04:09 +00:00
beuc
7fee3a3bb3
Update GLES instructions
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1689 7f0cb862-5218-0410-a997-914c9d46530a
2014-06-01 10:43:01 +00:00
beuc
13416c05d6
EGL is always double-buffered
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1688 7f0cb862-5218-0410-a997-914c9d46530a
2014-06-01 09:48:51 +00:00
Diederick Niehorster
27b5dcd000
Merge remote-tracking branch 'svn/trunk' into git_master
2014-06-01 17:34:00 +08:00
beuc
25be478938
Unify GLES1 and GLES2 (libraries are compatible and can be co-linked)
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1687 7f0cb862-5218-0410-a997-914c9d46530a
2014-06-01 09:24:47 +00:00
dcnieho
693b4b8de8
add menu to opengl 3 demo. Should work as menu windows have their own classic context
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1686 7f0cb862-5218-0410-a997-914c9d46530a
2014-06-01 03:50:51 +00:00
beuc
5051e40380
android: update documentation with gles1/gles2 unification
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1685 7f0cb862-5218-0410-a997-914c9d46530a
2014-05-31 22:47:17 +00:00
Diederick Niehorster
368e7efe81
Merge remote-tracking branch 'svn/trunk' into git_master
2014-05-31 19:29:38 +08:00
beuc
c4d5ab086d
Update GLES2 status and instructions
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1684 7f0cb862-5218-0410-a997-914c9d46530a
2014-05-31 10:38:44 +00:00
Diederick Niehorster
2ac0974cf6
Merge branch 'svn/trunk'
2014-05-15 06:02:59 +08:00
dcnieho
98d0182357
KEY_EVENT macro exists in windows 8.1 API: renamed it. Also renamed KEY macro to be safe.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1683 7f0cb862-5218-0410-a997-914c9d46530a
2014-05-14 22:02:41 +00:00
jtsiomb
bca59c67ef
Using the -pedantic flag with gcc uncovered a series of warnings about
...
non-standard C constructs in the code. This commit fixes them.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1682 7f0cb862-5218-0410-a997-914c9d46530a
2014-05-14 18:31:58 +00:00
jtsiomb
ff6255810d
Compiling with -ansi makes a lot of important POSIX (standard UNIX) facilities
...
unavailable. This was masked until recently by an incorrect conditional in the
CMakeLists.txt file, that looked like it would use -ansi on anything other than
android, but it didn't actually use it anywhere. As soon as that was fixed, and
-ansi started being used, build broke on linux.
The intention of the -ansi flag was to help catch portability-reducing mistakes
in the code, so instead of removing it completely I used -pedantic in its place,
which produces a lot of warnings for not strictly ISO/ANSI compliant code that
relies on compiler-specific features.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1681 7f0cb862-5218-0410-a997-914c9d46530a
2014-05-14 18:28:53 +00:00
Diederick Niehorster
79b0981875
Merge branch 'svn/trunk'
2014-04-11 21:42:02 +08:00
dcnieho
18718163db
XPutBackEvent copies an XEvent internally, so the pointer passed in must
...
point to an actual XEvent object, not an XConfigureEvent, which is
smaller. This avoids an invalid stack read.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1680 7f0cb862-5218-0410-a997-914c9d46530a
2014-04-11 13:41:49 +00:00
Diederick C. Niehorster
8a906a7525
Merge pull request #11 from LindleyF/git_master
...
Avoid invalid stack read
2014-04-11 21:40:38 +08:00
Lindley French
94ee505f8a
XPutBackEvent copies an XEvent internally, so the pointer passed in must
...
point to an actual XEvent object, not an XConfigureEvent, which is
smaller. This avoids an invalid stack read.
2014-04-10 16:07:03 -07:00
Diederick Niehorster
ed10f72c86
Merge branch 'svn/trunk'
2014-03-09 11:50:29 +08:00
dcnieho
d0c5d990d7
Docs update related to BlackBerry 10
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1679 7f0cb862-5218-0410-a997-914c9d46530a
2014-03-09 03:49:43 +00:00
Diederick C. Niehorster
a360185861
Merge pull request #10 from rcmaniac25/blackberry
...
Docs update related to BlackBerry 10
2014-03-09 11:48:51 +08:00
Rcmaniac25
48aaf2d0d5
Docs update related to BlackBerry 10
2014-03-08 20:58:10 -05:00
Diederick Niehorster
58fa5fa87e
Merge branch 'svn/trunk'
2014-03-05 09:41:19 +08:00
dcnieho
2c025ce66d
Fix issues with context lost on Android
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1678 7f0cb862-5218-0410-a997-914c9d46530a
2014-03-05 01:40:18 +00:00