1721 Commits

Author SHA1 Message Date
dcnieho
3c3e3cd234 Initial work on callbacks with user data parameters.
-glutCreateMenuUcall
-glutTimerFuncUcall
-glutIdleFuncUcall

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1808 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-30 23:20:57 +00:00
dcnieho
1941df93b9 freeglut should be spelled lowercase, fixed up all documentation
(cherry picked from commit 16e941b2a2d442492dc2368ec95d85a8cd6416f7)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1807 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-14 20:51:30 +00:00
dcnieho
75854e0698 multi-touch demo: if an index 64 would come in, this would be written in the wrong place in the cursor buffer. Supporting 64 IDs means writing to slots 0--63
(cherry picked from commit bef94a71b19e92de5ff82b620fbac853bf83a15b)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1806 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-14 20:51:20 +00:00
dcnieho
caa5ffe29a resizer demo: adding a bit more output to console to indicate what is going on upon keypress
(cherry picked from commit f04be0c4f22d380e3493b81a6781539e3731b431)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1805 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-14 20:51:14 +00:00
dcnieho
26a9d9ca03 multi-touch callback had a copy paste error in the draw loop (thanks sorav for reporting)
(cherry picked from commit a40f9e9c4efdb519cf623cfb1fde5e5c1156da9b)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1804 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-14 20:51:09 +00:00
jtsiomb
d860b2e225 In glutMainLoop, the checking of ExecState, and wether it's equal to
GLUT_EXEC_STATE_RUNNING should not have been at the top of the loop, but rather
right after glutMainLoopEvent returns, after it processes a single event. As it
was, we would be sleeping, waiting for further events even if the user just
called glutLeaveMainLoop (which sets ExecState to GLUT_EXEC_STATE_STOP).

Also fixed a couple cases if inconsistent use of tabs/spaces for indentation
which was causing gcc to emit bogus warnings about misleading indentation
around braceless ifs.



git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1803 7f0cb862-5218-0410-a997-914c9d46530a
2017-05-25 06:34:57 +00:00
dcnieho
f9acc79690 Update README.md
bit more logical ordering of content

(cherry picked from commit 6cb86e9657e6f21fd0397cf3972403466b772ae0)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1802 7f0cb862-5218-0410-a997-914c9d46530a
2017-05-14 20:52:19 +00:00
dcnieho
d7425510d3 updated text on main website page regarding license of FreeGLUT (reverted from commit 174bd482907f828f7b9a20622b3680400b70aba3)
(cherry picked from commit 5488acab3802fa5129acbe570653e9a04208e3cc)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1801 7f0cb862-5218-0410-a997-914c9d46530a
2017-05-14 20:49:53 +00:00
dcnieho
50212bcb3b Ensure "maximixed" is taken into account when updating window visibility on WM_SIZE
(cherry picked from commit 5b8a164de14fe3de4c67b8348c10e2711f481cd5)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1800 7f0cb862-5218-0410-a997-914c9d46530a
2017-05-14 20:49:46 +00:00
dcnieho
174bd48290 updated text on main website page regarding license of FreeGLUT
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1799 7f0cb862-5218-0410-a997-914c9d46530a
2017-04-26 08:45:38 +00:00
dcnieho
474975bc41 CMake: include/GL/glut.h should only be installed when FREEGLUT_REPLACE_GLUT is ON
(cherry picked from commit a0b77bba49573dab3564ce22a503024098664f04)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1798 7f0cb862-5218-0410-a997-914c9d46530a
2017-04-26 08:45:32 +00:00
dcnieho
585d7bfdee Added templates
(cherry picked from commit a83772981f866143a8c2aca8a1d221f67cb9ca13)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1797 7f0cb862-5218-0410-a997-914c9d46530a
2017-04-26 08:45:26 +00:00
dcnieho
18dffcc4b5 Correct spelling error
(cherry picked from commit fadb3bede994d04d5fde9956f995c4b7b1420de8)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1796 7f0cb862-5218-0410-a997-914c9d46530a
2017-04-22 20:05:18 +00:00
dcnieho
a7930a626e Fixed indentation characters in CMakeLists.txt
(cherry picked from commit c1efb69d4e984fe751840f6446317aca8b458705)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1795 7f0cb862-5218-0410-a997-914c9d46530a
2017-04-22 20:05:12 +00:00
dcnieho
2594b6d6c8 Fixed Cflags variable in pkgconfig file.
(cherry picked from commit bc5471a2f8c9c0c7bcb5b767ee788e2b45ec33e9)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1794 7f0cb862-5218-0410-a997-914c9d46530a
2017-04-22 20:05:06 +00:00
dcnieho
c985322fc0 Added FREEGLUT_REPLACE_GLUT configure option for MS Windows.
It provides back compatibility with older (autotools based) freeglut versions.
Also it simplifies build rules for crossplatform programs: they may be linked
with -lglut regardless of the system and library type (shared/static).

Patch is originally prepared for MXE project (http://mxe.cc/).

(cherry picked from commit cd9ac605ec4615569121e0e9b6bc058684bebfe3)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1793 7f0cb862-5218-0410-a997-914c9d46530a
2017-04-22 20:05:01 +00:00
dcnieho
979c5ce24d XParseGeometry will always be needed for Windows, no need for cmake to figure this out.
(cherry picked from commit 55e4430113b528ce40447a96f87cb206cdd39e39)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1792 7f0cb862-5218-0410-a997-914c9d46530a
2016-02-21 20:40:10 +00:00
dcnieho
3bed0feb38 fixing up some docs regarding spaceball buttons
(cherry picked from commit c9442fa1197d293f86884dc67d462ac7e55a02a4)

(cherry picked from commit c9442fa1197d293f86884dc67d462ac7e55a02a4)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1791 7f0cb862-5218-0410-a997-914c9d46530a
2016-01-20 19:49:02 +00:00
dcnieho
7e16d00e49 Noted the numerical value for spaceball button macro
(cherry picked from commit 5f6e4fbe6895104f092267307495b3e2887d6d9e)

(cherry picked from commit 5f6e4fbe6895104f092267307495b3e2887d6d9e)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1790 7f0cb862-5218-0410-a997-914c9d46530a
2016-01-20 19:48:55 +00:00
dcnieho
6f764746e1 bug fix
(cherry picked from commit 9dfba8b7de677ee4deaeb1b64d4a426ca7a24260)

(cherry picked from commit 9dfba8b7de677ee4deaeb1b64d4a426ca7a24260)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1789 7f0cb862-5218-0410-a997-914c9d46530a
2016-01-20 19:48:49 +00:00
dcnieho
be5e4ec604 moved spaceball macros from freeglut_std.h to freeglut_ext.h
(cherry picked from commit 13e6cf15916b12166fb98aaac6f3360c2e044f01)

(cherry picked from commit 13e6cf15916b12166fb98aaac6f3360c2e044f01)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1788 7f0cb862-5218-0410-a997-914c9d46530a
2016-01-20 19:48:39 +00:00
dcnieho
8503b82e20 Added API documentation for glutSpaceballXXX functions.
(cherry picked from commit 21cccdf7f36e75e4f365ce314fdbdd75ea54498a)

(cherry picked from commit 21cccdf7f36e75e4f365ce314fdbdd75ea54498a)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1787 7f0cb862-5218-0410-a997-914c9d46530a
2016-01-20 19:48:32 +00:00
dcnieho
6dc4eb9dc2 Added API macros for additional Spaceball buttons.
(cherry picked from commit 1a24699b9a502be238d813e97449214b6acdc863)

(cherry picked from commit 1a24699b9a502be238d813e97449214b6acdc863)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1786 7f0cb862-5218-0410-a997-914c9d46530a
2016-01-20 19:48:25 +00:00
dcnieho
2e7a973056 fixed php syntax error, unexpected end of file in template.php: replaced <?php ?> pair with short open tag <? ?>
(cherry picked from commit f4bc97b6d55db9d69b5a488d427f39d4a8c4ef03)

(cherry picked from commit f4bc97b6d55db9d69b5a488d427f39d4a8c4ef03)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1785 7f0cb862-5218-0410-a997-914c9d46530a
2016-01-20 19:48:18 +00:00
dcnieho
09c97585c9 Added API macros for Spaceball buttons.
(cherry picked from commit 472bc2bf627cd9a607ac6d59c8e6cb36e72e3aaf)

(cherry picked from commit 472bc2bf627cd9a607ac6d59c8e6cb36e72e3aaf)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1784 7f0cb862-5218-0410-a997-914c9d46530a
2016-01-20 19:48:11 +00:00
dcnieho
dc4f2d3847 update comments of WCB_SpaceXXX in fg_internal.h
(cherry picked from commit 1091f89cf64d255a1fae5c331e556ec52dd6aa3c)

(cherry picked from commit 1091f89cf64d255a1fae5c331e556ec52dd6aa3c)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1783 7f0cb862-5218-0410-a997-914c9d46530a
2016-01-20 19:48:04 +00:00
dcnieho
8b07b11dc8 fixed up wrong comment
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1782 7f0cb862-5218-0410-a997-914c9d46530a
2016-01-17 23:53:11 +00:00
dcnieho
a2f7cd975f Emit the correct LIBNAME to .pc files
Irrespective of "FREEGLUT_REPLACE_GLUT" being set to "No" or being on
Win32 where this variable does not even exist, the .pc file contained
Libs: -L${libdir} -lglut

Instead, emit the correct value.

(cherry picked from commit d06589f55c87370d388dec333f4bff35c29762f3)

(cherry picked from commit d06589f55c87370d388dec333f4bff35c29762f3)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1781 7f0cb862-5218-0410-a997-914c9d46530a
2016-01-12 21:09:00 +00:00
dcnieho
1026c5e915 Mention Wayland build requirements in documentation
Following https://github.com/dcnieho/FreeGLUT/issues/38 ;
mention Wayland support in README, Wayland build
instructions and requirements in README.cmake.

Signed-off-by: Manuel Bachmann <manuel.bachmann@iot.bzh>

(cherry picked from commit 18773bcc818714436e3aeb6229b2f84125d6edc4)

(cherry picked from commit 18773bcc818714436e3aeb6229b2f84125d6edc4)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1780 7f0cb862-5218-0410-a997-914c9d46530a
2015-12-14 16:22:51 +00:00
dcnieho
012736d296 Fixed C2275 compiler error in fg_spaceball_mswin.c
- Known to only affect Visual Studio 2010. Visual Studio 2013 and up may have relaxed the error.

(cherry picked from commit 6b8552edbd715eb77921038c85dda46f90038154)

(cherry picked from commit 6b8552edbd715eb77921038c85dda46f90038154)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1779 7f0cb862-5218-0410-a997-914c9d46530a
2015-12-14 16:22:44 +00:00
dcnieho
f812349a8f Additional clarification about GLUT_ALLOW_NEGATIVE_WINDOW_POSITION
(cherry picked from commit 836fe46441ad9fc3ba1e6b2d1dc9da0e26353b21)

(cherry picked from commit 836fe46441ad9fc3ba1e6b2d1dc9da0e26353b21)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1778 7f0cb862-5218-0410-a997-914c9d46530a
2015-12-14 16:22:38 +00:00
dcnieho
5a86d86eef Updated documentation in relation to GLUT_ALLOW_NEGATIVE_WINDOW_POSITION.
(cherry picked from commit 9fa5db9841ecc20300c96e7f6957096c6cf83d9e)

(cherry picked from commit 9fa5db9841ecc20300c96e7f6957096c6cf83d9e)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1777 7f0cb862-5218-0410-a997-914c9d46530a
2015-12-14 16:22:31 +00:00
dcnieho
d8e364d053 Defined logic for glutCreateSubWindow when negative position is allowed
Added check for if fgCreateWindow cannot allocate a window, it will produce an error.

(cherry picked from commit 0ed05f64589fbcc67f225e1dc3ef6f5181fd319f)

(cherry picked from commit 0ed05f64589fbcc67f225e1dc3ef6f5181fd319f)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1776 7f0cb862-5218-0410-a997-914c9d46530a
2015-12-14 16:22:25 +00:00
dcnieho
d898bfe4c6 Added GLUT_ALLOW_NEGATIVE_WINDOW_POSITION so windows can be created with negative position coordinates.
(cherry picked from commit e7f38b763fec763b3887a0dc29d04e9576d18e78)

(cherry picked from commit e7f38b763fec763b3887a0dc29d04e9576d18e78)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1775 7f0cb862-5218-0410-a997-914c9d46530a
2015-12-14 16:22:18 +00:00
jtsiomb
f0facfc489 minor C89 conformity fixes in fg_window_egl.c
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1774 7f0cb862-5218-0410-a997-914c9d46530a
2015-10-20 04:35:28 +00:00
dcnieho
008bc37708 Removed invalid PDB install
(cherry picked from commit 23a12a465b6642b996b47dd3fe025abbafbb19e6)

(cherry picked from commit 23a12a465b6642b996b47dd3fe025abbafbb19e6)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1773 7f0cb862-5218-0410-a997-914c9d46530a
2015-10-17 11:15:29 +00:00
dcnieho
98695e579d Export relevant static compile flags on windows.
Use target_compile_definitions to populate the
INTERFACE_COMPILE_DEFINITIONS property on the freeglut_static target on
windows.

(cherry picked from commit ffc24cfb7607739e49cd2730e44301ef4f3072ae)

(cherry picked from commit ffc24cfb7607739e49cd2730e44301ef4f3072ae)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1772 7f0cb862-5218-0410-a997-914c9d46530a
2015-10-12 09:08:37 +00:00
dcnieho
9825293425 Set public definitions in cmake package.
As with pkg-config, the cmake package now sets "-DFREEGLUT_GLES" when
appropriate.

(cherry picked from commit 792d805542a9a96053e1fb3e49f9518ee462d9b0)

(cherry picked from commit 792d805542a9a96053e1fb3e49f9518ee462d9b0)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1771 7f0cb862-5218-0410-a997-914c9d46530a
2015-07-11 21:27:03 +00:00
dcnieho
866f61ae9c Create cmake package using imported targets.
Create and install the necessary files so that cmake can find FreeGLUT
in config mode ("find_package(FreeGLUT CONFIG)").

This pushes cmake_minimum_required to 3.0.0.

(cherry picked from commit ba7326ce8db20dd52785ef1a08da06d8341fc4c1)

(cherry picked from commit ba7326ce8db20dd52785ef1a08da06d8341fc4c1)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1770 7f0cb862-5218-0410-a997-914c9d46530a
2015-07-11 21:26:56 +00:00
dcnieho
c751a9179d Fix compilation on Linux.
Commit ce15044f7362943aee7d465bf20310ba02991dae introduced an error
"undefined reference to `sball_initialized'" on non-Windows operating
systems.

(cherry picked from commit 989ceddc191419daa02b08f664bbbce11cbc5598)

(cherry picked from commit 989ceddc191419daa02b08f664bbbce11cbc5598)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1769 7f0cb862-5218-0410-a997-914c9d46530a
2015-07-11 21:26:48 +00:00
dcnieho
5d045f4f15 todo note about Windows 8 touch support
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1768 7f0cb862-5218-0410-a997-914c9d46530a
2015-06-29 10:14:05 +00:00
dcnieho
976e05c12f minor fix on CMakeLists for checking MSVC_VERSION
(cherry picked from commit ce15044f7362943aee7d465bf20310ba02991dae)

(cherry picked from commit ce15044f7362943aee7d465bf20310ba02991dae)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1767 7f0cb862-5218-0410-a997-914c9d46530a
2015-06-29 10:09:48 +00:00
dcnieho
e595297daf update CMake file so that it will generate proper _WIN32_WINNT and WINVER definitions in visual studio project setting.
(cherry picked from commit 96e89316b6de6502522f1527b0e132e731af175a)

(cherry picked from commit 96e89316b6de6502522f1527b0e132e731af175a)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1766 7f0cb862-5218-0410-a997-914c9d46530a
2015-06-29 10:09:42 +00:00
dcnieho
5259e6156b fixed unsafe usage of malloc() pointed out by jtsiomb.
(cherry picked from commit 16bc9077353d8c08e5214ec09288ec03f53aed97)

(cherry picked from commit 16bc9077353d8c08e5214ec09288ec03f53aed97)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1765 7f0cb862-5218-0410-a997-914c9d46530a
2015-06-29 10:09:33 +00:00
dcnieho
8cafe7e34c fixed unsafe usage of malloc() pointed out by jtsiomb.
(cherry picked from commit aa5514903def8bcc8ceac2487f629b766d23094d)

(cherry picked from commit aa5514903def8bcc8ceac2487f629b766d23094d)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1764 7f0cb862-5218-0410-a997-914c9d46530a
2015-06-29 10:09:27 +00:00
dcnieho
8dfbfaca71 Minor fix on indentation.
(cherry picked from commit c93cdcdbbd8e3611ad3e8a0ca32bba9be2ff0c2c)

(cherry picked from commit c93cdcdbbd8e3611ad3e8a0ca32bba9be2ff0c2c)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1763 7f0cb862-5218-0410-a997-914c9d46530a
2015-06-29 10:09:20 +00:00
dcnieho
238b0ae02c Minor fix on indentation.
(cherry picked from commit bfe1b60a499ab12e648d9d68c8012b35fa5eec11)

(cherry picked from commit bfe1b60a499ab12e648d9d68c8012b35fa5eec11)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1762 7f0cb862-5218-0410-a997-914c9d46530a
2015-06-29 10:09:13 +00:00
dcnieho
949f7b3747 minor update making code more compact.
(cherry picked from commit 09f401761814677e37e750aeecb9ffee450bd989)

(cherry picked from commit 09f401761814677e37e750aeecb9ffee450bd989)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1761 7f0cb862-5218-0410-a997-914c9d46530a
2015-06-29 10:09:06 +00:00
dcnieho
b593d219d6 Added support for 3Dconnexion Space Navigator.
(cherry picked from commit 5c1e897f1a843963f5f8e49314ce06424a2525b3)

(cherry picked from commit 5c1e897f1a843963f5f8e49314ce06424a2525b3)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1760 7f0cb862-5218-0410-a997-914c9d46530a
2015-06-29 10:09:00 +00:00
dcnieho
c2384ac19e Added support for 3Dconnexion Space Navigator.
(cherry picked from commit 857105a0b4a4c44fcdd9b11a33eff0c910ce41a9)

(cherry picked from commit 857105a0b4a4c44fcdd9b11a33eff0c910ce41a9)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1759 7f0cb862-5218-0410-a997-914c9d46530a
2015-06-29 10:08:53 +00:00